Changeset 7d4ba03 in tol

Timestamp:

Feb 29, 2012, 3:46:47 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

27ccb470

Parents:

e259ad9

Message:

Refs #1430
Handling stop signal in all cycles

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4223 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/set_type/setgra.cpp (modified) (24 diffs)

tol/btol/set_type/setgra.cpp

@@ -720 +720 @@
     BInt n, N = (BInt)Real(Arg(1));
     BSyntaxObject* obj = Arg(2);
-    for(n=1; n<=N; n++) { lst = Cons(obj->CopyContens(), lst); }
+    for(n=1; n<=N; n++) 
+    { 
+      lst = Cons(obj->CopyContens(), lst); 
+      if(BGrammar::StopFlag()) { break; }
+    }
     contens_.RobElement(lst);
 }
@@ -753 +757 @@
       totCard += set.Card(); 
     }
+    if(BGrammar::StopFlag()) { return; }
   }
   contens_.PrepareStore(totCard);
@@ -763 +768 @@
       {
         contens_.AddElement(set[k]);
+        if(BGrammar::StopFlag()) { return; }
       }
     }
+    if(BGrammar::StopFlag()) { return; }
   }
 }
@@ -908 +915 @@
   { 
     module[n] = module[n+1] * Set(setOfSets[n+1]).Card(); 
+    if(BGrammar::StopFlag()) { return; }
   }
   contens_.PrepareStore(module[0]);
@@ -918 +926 @@
       BInt m = 1 + ((k-1) / module[n]) % Set(setOfSets[n]).Card();
       set.AddElement(Set(setOfSets[n])[m]);
+      if(BGrammar::StopFlag()) { return; }
     }
     contens_.AddElement(new BSetTuple("", set));
+    if(BGrammar::StopFlag()) { return; }
   }
 }
@@ -942 +952 @@
 {
     BList* lst = NIL;
-    for(BInt n=0; n<Dat(Arg(2)); n++) { lst = Cons(Arg(1), lst); }
+    for(BInt n=0; n<Dat(Arg(2)); n++) 
+    { 
+      lst = Cons(Arg(1), lst); 
+      if(BGrammar::StopFlag()) { return; }
+    }
     BSetCartesianProduct set(lst);
     contens_ = set.Contens();
@@ -1008 +1022 @@
     x = 1.0 + (from + step*k) -1.0;
     LstFastAppend(result, aux, new BContensDat("",x));
+    if(BGrammar::StopFlag()) { break; }
   }
   contens_.RobElement(result);
@@ -1631 +1646 @@
       //Std(Out()+"\nObject "+ n + " = " +sorted[n]->Dump());
         LstFastAppend(classLst, classAux, sorted[n]);
+        if(BGrammar::StopFlag()) { break; }
       }
       LstFastAppend(result, aux, NewSet("",BText("Class ")+m,classLst,
@@ -1666 +1682 @@
         }
         contens_.AddElement(cl);
+        if(BGrammar::StopFlag()) { break; }
       }
     }
@@ -1755 +1772 @@
                 LstFastAppend(result, aux, set[m]);
             }
+      if(BGrammar::StopFlag()) { break; }
         }
     }
@@ -1791 +1809 @@
     }
     for(n=1; n<=n1; n++)
-    { LstFastAppend(result,aux,new BSetTuple("",Set(set1[n])<<Set(set2[n]))); }
+    { 
+      LstFastAppend(result,aux,new BSetTuple("",Set(set1[n])<<Set(set2[n]))); 
+      if(BGrammar::StopFlag()) { break; }
+    }
     contens_.RobElement(result);
 }
@@ -1836 +1857 @@
         for(m=1; m<=col; m++) {
             LstFastAppend(resCol, auxCol, Set(set[m])[n]); 
+      if(BGrammar::StopFlag()) { break; }
         }
         LstFastAppend(result, aux, NewSet("","",resCol,NIL,BSet::Generic));
+      if(BGrammar::StopFlag()) { break; }
     }
     contens_.RobStruct(result,NIL,BSet::Table);
@@ -1895 +1918 @@
           Error(I2(en ,es));
         }
+        if(BGrammar::StopFlag()) { break; }
       }
     }
@@ -1947 +1971 @@
             LstFastAppend(result, aux, objCode);
             n++;
+      if(BGrammar::StopFlag()) { break; }
           }
           while(n<=set.Card());
@@ -2021 +2046 @@
       LstFastAppend(result, aux3, objCode);
       k++;
+      if(BGrammar::StopFlag()) { break; }
     }
     while(k<=K);
@@ -2073 +2099 @@
       LstFastAppend(result, aux, objCode);
     }
+    if(BGrammar::StopFlag()) { break; }
   }
   contens_.RobElement(result);
@@ -2133 +2160 @@
     DESTROY(objCode);
     if(valid) { LstFastAppend(result, aux, set[n]); }
+    if(BGrammar::StopFlag()) { break; }
   }
   contens_.RobElement(result);
@@ -2191 +2219 @@
       dte.PutHash(hash[k]); 
       LstFastAppend(result, aux, new BContensDate("",dte,""));
+      if(BGrammar::StopFlag()) { break; }
     }
   }
@@ -2259 +2288 @@
 //--------------------------------------------------------------------
 {
-    BMat        mat    = Mat (Arg(1));
-    BList*      result = NIL;
-    BList*      aux    = NIL;
-    BInt        i,j;
-    for(i = 0; i < mat.Rows(); i++)
-    {
-        BList* lsta       = NIL;
-        BList* auxa       = NIL;
-        for(j = 0; j < mat.Columns(); j++)
-        { LstFastAppend(lsta, auxa, new BContensDat("",mat(i,j),""));  }
-        LstFastAppend(result, aux,  NewSet("","",lsta,NIL,BSet::Generic));
-    }
-    contens_.RobStruct(result,NIL,BSet::Table);
+  BMat  mat    = Mat (Arg(1));
+  BList*        result = NIL;
+  BList*        aux    = NIL;
+  BInt  i,j;
+  for(i = 0; i < mat.Rows(); i++)
+  {
+    BList* lsta   = NIL;
+    BList* auxa   = NIL;
+    for(j = 0; j < mat.Columns(); j++)
+    { 
+      LstFastAppend(lsta, auxa, new BContensDat("",mat(i,j),""));  
+      if(BGrammar::StopFlag()) { break; }
+    }
+    LstFastAppend(result, aux,  NewSet("","",lsta,NIL,BSet::Generic));
+    if(BGrammar::StopFlag()) { break; }
+  }
+  contens_.RobStruct(result,NIL,BSet::Table);
 }
 
@@ -2303 +2336 @@
     serie->PutName(BText("S")+(i+1));
     LstFastAppend(result, aux, serie);
+    if(BGrammar::StopFlag()) { break; }
   }
   contens_.RobStruct(result,NIL,BSet::Table);
@@ -2338 +2372 @@
       BText f = dir.FileName(i);
       files.AddElement(new BContensText("",f,f));
+      if(BGrammar::StopFlag()) { break; }
           }
           for(i = 0; i < dir.NumDirs(); i++)
@@ -2343 +2378 @@
       BText d = dir.DirName(i);
             dirs.AddElement(new BContensText("",d,d));
+      if(BGrammar::StopFlag()) { break; }
           }
           contens_.AddElement(new BContensSet("",files,"Files"));
@@ -2570 +2606 @@
 //          ABranch   = TreBranch((BList*)ATree,BranchIdx);
             ABranch = Tree::treBranch((List*)ATree, BranchIdx);
+    if(BGrammar::StopFlag()) { break; }
         } // end while
         
@@ -2871 +2908 @@
     //Std(BText(""\nBOisCreator::Write BMemberOwner parent ")+fn);
       contens_.AddElement(new BContensText("",fn,""));
+      if(BGrammar::StopFlag()) { break; }
     }
   }