Changeset dc4d2e6 in tol

Timestamp:

Jun 17, 2011, 5:19:35 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

ad4a32d

Parents:

fb786f4

Message:

Fixes #1260

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

Location:

tol

Files:

• OIS/oisloader.cpp (modified) (6 diffs)
• btol/bgrammar/graimp.cpp (modified) (2 diffs)
• btol/bgrammar/oprimp.cpp (modified) (1 diff)

tol/OIS/oisloader.cpp

@@ -1363 +1363 @@
                 x->GetDataBuffer() = d;
                 x->PutFirstCache(beginCache);
-                x->PutOisTree(tree);
+                if(!x->GetOisTree())
+                {
+                  x->PutOisTree(tree);
+                }
                 tree->Destroy();
               }
@@ -1399 +1402 @@
           BINT64 offset;
           ERead(offset, object_);
+                    if(name=="Cuatrimestral")
+                      printf("");
+
           timeset_->SetPos(offset);
           BDate inf, sup, beginCache, endCache;
@@ -1411 +1417 @@
           char loadTree;
           ERead(loadTree,timeset_);
+          List* tree = NULL;
           if(loadTree)
           {
-            List* tree = ReadTree(timeset_);
+            tree = ReadTree(timeset_);
             if(!tree) 
             { 
@@ -1434 +1441 @@
                   x->PutCache(h, beginCache, endCache);
                 }
-                x->PutOisTree(tree); 
               }
-              tree->Destroy();
             }
             else 
@@ -1448 +1453 @@
                       "bounded time sets or use expressions that could "
                       "be evaluated at OIS loading time." );
-              if(tree) { tree->Destroy(); }
             } 
           }
@@ -1461 +1465 @@
           }
           else                
-          { result = x; }
+          { 
+            result = x; 
+          }
+          if(tree) 
+          {
+            if(result && !result->GetOisTree()) { result->PutOisTree(tree); }
+            tree->Destroy(); 
+          }
         }
         BNameBlock::SetBuilding(oldBuilding);

tol/btol/bgrammar/graimp.cpp

@@ -873 +873 @@
   }
 
-  TRACE_SHOW_MEDIUM(fun,"6");
-  if(result && !result->GetOisTree()) 
-  { 
-    TRACE_SHOW_MEDIUM(fun,"6.1");
-    result->PutOisTree(tre); 
-  }
-
-//TRACE_SHOW_LOW(fun,BText("End with result type: ")<<BText((result!=NULL)?result->Grammar()->Name():BText("NULL")));
-  TRACE_SHOW_LOW(fun,"END");
   if(result && (result->Grammar()==GraNameBlock()))
   {
@@ -908 +899 @@
     if(!cls->isDefined_) { result = NULL; }
   }
+  if(result && !result->GetOisTree()) 
+  { 
+    TRACE_SHOW_MEDIUM(fun,"6.1");
+    result->PutOisTree(tre); 
+  }
+//TRACE_SHOW_LOW(fun,BText("End with result type: ")<<BText((result!=NULL)?result->Grammar()->Name():BText("NULL")));
+  TRACE_SHOW_LOW(fun,"END");
   return(result);
 }

tol/btol/bgrammar/oprimp.cpp

@@ -825 +825 @@
       }
       TRACE_SHOW_MEDIUM(fun," 24");
-      if(result)
+      if(result && !result->GetOisTree())
       {
         result->PutOisTree(tre);