Changeset 1f1b109 in tol

Timestamp:

May 10, 2011, 10:55:08 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

eb88c70

Parents:

10adcbf

Message:

Fixed #1199

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

Location:

tol

Files:

• OIS/oiscreator.cpp (modified) (1 diff)
• OIS/oisloader.cpp (modified) (3 diffs)
• bbasic/out.cpp (modified) (3 diffs)
• bbasic/tol_bout.h (modified) (1 diff)

tol/OIS/oiscreator.cpp

@@ -1034 +1034 @@
     {
       EWrite(saveTree,timeset_); 
-      #ifdef WARNING_NON_TREE_NOR_BOUNDED
       Warning(I2("Cannot save virtual definition non bounded TimeSet ",
                  "No se puede salvar la definición virtual del TimeSet ")+v->Identify()+
               I2(" due to its expression is unknown at this evaluation level.",
                  " no acotado porque su expresión es desconocida en este nivel de evaluación.")); 
-      #endif
     }  
+    else
+    {
+      int oldLevel = BGrammar::Level();
+      BGrammar::PutLevel(0);
+      bool oldEnabled = BOut::Disable();
+      BDat numErr0 = TOLErrorTryNumber();
+      BUserTimeSet* aux = (BUserTimeSet*)GraTimeSet()->EvaluateTree(tree); 
+      BDat numErr1 = TOLErrorTryNumber(); 
+      if(oldEnabled) { BOut::Enable(); }
+      DESTROY(aux);
+      if(numErr1>numErr0)
+      {
+        BText expr = Compact(BParser::Unparse(tree,"  ","\n"));
+        if(v->HasName()) { expr = v->Name()+" = "+expr; }
+        Warning(I2("Expression of non bounded TimeSet ",
+                   "La expresión del TimeSet no acotado ")+ 
+                "\n"+expr+";\n"+
+                I2("seems to be dependent on non globally accessible symbols.\n"
+                   "So, just cached data will be available at OIS loading time.\n"
+                   "Current cache interval is ",
+                   "parece depender de símbolos que no son accesibles globalmente.\n"
+                   "Por este motivo, a la hora de cargar el OIS, sólo podrán usarse "
+                   "los datos de la caché, que actualmente abarca el intervalo ")+
+                   "["+beginCache+","+endCache+"]"); 
+      }           
+      BGrammar::PutLevel(oldLevel);
+    }
     saveTree = true;
     EWrite(saveTree,timeset_);

tol/OIS/oisloader.cpp

@@ -1419 +1419 @@
                      name+"' description='"+description+"')")); 
             }
-            BText expr = Compact(BParser::Unparse(tree,"  ","\n"));
-          //bool oldEnabled = BOut::Disable();
-            BDat numErr0 = TOLErrorNumber();
+            bool oldEnabled = BOut::Disable();
+            BDat numErr0 = TOLErrorTryNumber();
             x = (BUserTimeSet*)GraTimeSet()->EvaluateTree(tree); 
-            BDat numErr1 = TOLErrorNumber();
+            BDat numErr1 = TOLErrorTryNumber();
             if(numErr0<numErr1) { DESTROY(x); }
-          //if(oldEnabled) { BOut::Enable(); }
+            if(oldEnabled) { BOut::Enable(); }
             if(x) 
             { 
@@ -1435 +1434 @@
                   x->PutCache(h, beginCache, endCache);
                 }
+                x->PutOisTree(tree); 
               }
-              x->PutOisTree(tree); 
               tree->Destroy();
             }
@@ -1442 +1441 @@
             {
               BText expr = Compact(BParser::Unparse(tree,"  ","\n"));
-             #ifndef NDEBUG
+              if(name.HasName()) { expr = name+" = "+expr; }
               Warning(BText("Cannot rebuild virtual expression of non "
-                      "bounded TimeSet ")+name+"="+expr+ "\nOnly cached "
+                      "bounded TimeSet ")+expr+ "\nOnly cached "
                       "dates will be accessible between ["+beginCache+","+
                       endCache+"]\nTo avoid this problem save just "
-                      "bounded time sets " );
-             #endif
+                      "bounded time sets or use expressions that could "
+                      "be evaluated at OIS loading time." );
               if(tree) { tree->Destroy(); }
             } 

tol/bbasic/out.cpp

@@ -233 +233 @@
 };
 
+//--------------------------------------------------------------------
+BDat& TOLErrorTryNumber()
+//--------------------------------------------------------------------
+{
+  static BDat aux_ = 0;
+  return(aux_);
+};
+
+//--------------------------------------------------------------------
+BDat& TOLWarningTryNumber()
+//--------------------------------------------------------------------
+{
+  static BDat aux_ = 0;
+  return(aux_);
+};
+
 
 //--------------------------------------------------------------------
@@ -427 +443 @@
 //--------------------------------------------------------------------
 {
+  TOLErrorTryNumber()+=1;
   if(!BOut::IsEnabled() || 
      (!BOut::errorHci_ && !BOut::errorTerm_ && !BOut::errorLog_)) { return; }
@@ -448 +465 @@
 //--------------------------------------------------------------------
 {
+  TOLWarningTryNumber()+=1;
   if(!BOut::IsEnabled()  || 
     (!BOut::warningHci_ && !BOut::warningTerm_ && !BOut::warningLog_)) { return; }

tol/bbasic/tol_bout.h

@@ -36 +36 @@
 TOL_API BDat& TOLErrorNumber();
 TOL_API BDat& TOLWarningNumber();
+TOL_API BDat& TOLErrorTryNumber();
+TOL_API BDat& TOLWarningTryNumber();
 
 //--------------------------------------------------------------------