Revert commit ebfa961 and close #1849 (#1851)

gnudatalanguage · Jul 8, 2024 · 926c7a2 · 926c7a2
1 parent 8a15672
commit 926c7a2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 28 deletions.
diff --git a/src/dpro.hpp b/src/dpro.hpp
@@ -35,9 +35,6 @@
       extern bool posixpaths;
     }
 #endif
-
-#define MAX_LOOPS_NUMBER 32
-
   typedef struct _SCC_STRUCT_ { //semicompiled code, small memory imprint (instead of a copy of the DNodes)
 	u_int nodeType = 0;
 	u_int ligne = 0;
@@ -595,8 +592,8 @@ class DPro: public DSubUD
 {
 public:
   // for main function, not inserted into proList
-  // should be fine (way too much): MAX_LOOPS_NUMBER (32?) NESTED loops in $MAIN$ (elswhere: unlimited)
-  DPro(): DSubUD("$MAIN$","","") { this->nForLoops = MAX_LOOPS_NUMBER;}
+  // should be fine (way too much): 32 NESTED loops in $MAIN$ (elswhere: unlimited)
+  DPro(): DSubUD("$MAIN$","","") { this->nForLoops = 32;}
 
   DPro(const std::string& n,const std::string& o="",const std::string& f=""): 
     DSubUD(n,o,f)

diff --git a/src/envt.cpp b/src/envt.cpp
@@ -208,7 +208,7 @@ EnvUDT::EnvUDT( ProgNodeP cN, BaseGDL* self,
 
   DSubUD* proUD=static_cast<DSubUD*>(pro);
 
-  forLoopInfo.InitSize(proUD->NForLoops());
+  forLoopInfo.InitSize( proUD->NForLoops());
 
   SizeT envSize;
   //   SizeT keySize;
@@ -264,7 +264,7 @@ EnvUDT::EnvUDT( BaseGDL* self, ProgNodeP cN, const string& parent, CallContext l
 
   DSubUD* proUD=static_cast<DSubUD*>(pro);
 
-  forLoopInfo.InitSize(proUD->NForLoops());
+  forLoopInfo.InitSize( proUD->NForLoops());
 
   SizeT envSize=proUD->var.size();
   parIx=proUD->key.size();
@@ -318,7 +318,7 @@ EnvUDT::EnvUDT( ProgNodeP callingNode_, DSubUD* newPro, DObjGDL** self):
 
   DSubUD* proUD= newPro; //static_cast<DSubUD*>(pro);
 
-  forLoopInfo.InitSize(proUD->NForLoops());
+  forLoopInfo.InitSize( proUD->NForLoops());
 
   SizeT envSize;
   //   SizeT keySize;

diff --git a/src/envt.hpp b/src/envt.hpp
@@ -372,14 +372,12 @@ template< typename T, SizeT defaultLength> class ForInfoListT
 private:
   T* eArr;
   char buf[defaultLength * sizeof(T)]; // prevent constructor calls
-  SizeT currentMaxLength;
   SizeT sz;
 
 public:
 
   ForInfoListT(): eArr( reinterpret_cast<T*>(buf)), sz( 0)
-  { 
-    currentMaxLength=defaultLength;
+  {
   }
 
   ~ForInfoListT()
@@ -397,51 +395,42 @@ template< typename T, SizeT defaultLength> class ForInfoListT
   // must be called before access
   void InitSize( SizeT s)
   {
-//    std::cerr<<this<<": InitSize("<<s<<")\n";
     assert( sz == 0);
     if( s == 0)
       return;
-    sz = 0;
-    if( s <= currentMaxLength) //initialise currentMaxLength objects
+    sz = s;
+    if( s < defaultLength)
       {
-	for( SizeT i=0; i<currentMaxLength; ++i)
+	for( SizeT i=0; i<s; ++i)
 	  eArr[ i].Init();
 	return;
       }
     eArr = new T[ s]; // constructor called
-    currentMaxLength=s;
   }
   // only needed for EXECUTE
   void resize( SizeT s)
   {
-//    std::cerr<<this<<": resize("<<s<<"): ";
-    if( s == sz) {
-//    std::cerr<<" == "<<sz<<": return.\n";
+    if( s == sz)
       return;
-    }
     if( s < sz) // shrink
       {
-//      std::cerr << " < " << sz << ": shrink.\n";
 	for( SizeT i=s; i<sz; ++i)
 	  eArr[ i].ClearInit(); // in case eArr was allocated
 	sz = s;
 	return;
       }
     // s > sz -> grow
-    if( s <= currentMaxLength && eArr == reinterpret_cast<T*>(buf))
+    if( s <= defaultLength && eArr == reinterpret_cast<T*>(buf))
       {
-//      std::cerr << " > " << sz << " but <= currentMaxLength : grow.\n";
 	for( SizeT i=sz; i<s; ++i)
 	  eArr[ i].Init();
 	sz = s;
 	return;
       }
     // this should never happen (or only in extreme rarely cases)
     // the performance will go down
-    // s > currentMaxLength
-//    std::cerr << " > " << sz << " and > currentMaxLength : should not happen.\n";
+    // s > defaultLength
     T* newArr = new T[ s]; // ctor called
-    currentMaxLength=s;
     if( eArr != reinterpret_cast<T*>(buf))
       {
 	for( SizeT i=0; i<sz; ++i)
@@ -462,7 +451,7 @@ template< typename T, SizeT defaultLength> class ForInfoListT
     sz = s;
   }
   // T operator[]( SizeT i) const { assert( i<sz);  return eArr[i];}
-  T& operator[]( SizeT i) { assert( i<currentMaxLength);  return eArr[i];}
+  T& operator[]( SizeT i) { assert( i<sz);  return eArr[i];}
   SizeT size() const { return sz;}
   iterator begin() const { return &eArr[0];}
   iterator end() const { return &eArr[sz];}
@@ -474,6 +463,7 @@ template< typename T, SizeT defaultLength> class ForInfoListT
 };
 
 
+
 // for UD subroutines (written in GDL) ********************************
 class EnvUDT: public EnvBaseT
 {
@@ -491,7 +481,8 @@ class EnvUDT: public EnvBaseT
   };
 
 private:
-   ForInfoListT<ForLoopInfoT, MAX_LOOPS_NUMBER> forLoopInfo;  //defaults to $MAIN$ values in dpro.hpp
+  ForInfoListT<ForLoopInfoT, 32> forLoopInfo;
+  // std::vector<ForLoopInfoT> forLoopInfo;
 
   ProgNodeP         ioError; 
   DLong             onError; // on_error setting