Changeset af23d24 in tol

Timestamp:

Feb 23, 2011, 9:04:37 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

97d09a0

Parents:

3f6d71f

Message:

Fixes #1101
User functions will return a copy of the result for allowed types

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

File:

• tol/btol/bgrammar/oprimp.cpp (modified) (2 diffs)

tol/btol/bgrammar/oprimp.cpp

@@ -1298 +1298 @@
           BGrammar* g = GrammarForArg(n,k);
           BGrammar::PutLast(g);
+          int stackPos = BGrammar::StackSize();
           var = EvaluateArgument(g,b);
-          if(!var) { BGrammar::CleanTreeCache(b, true); }
+          if(!var) 
+          { 
+            BGrammar::CleanTreeCache(b, true); 
+            BGrammar::DestroyStackUntil(stackPos, NULL);    
+          }
         }
         BOut::Enable();
@@ -1710 +1715 @@
 
   BGrammar::PutLevel(save_level);
+  if(result)
+  {
+    BGrammar* rg = result->Grammar();
+    if(rg && rg->IsAutoContens())
+    {
+      if((rg!=GraNameBlock())&&(rg!=GraSet())&&(rg!=GraCode()))
+      {
+        BSyntaxObject* copy = result->CopyContens();
+        if(result->HasName()) { copy->PutName(result->Name()); }
+        if(result->Description().HasName()) { copy->PutDescription(result->Description()); }
+        DESTROY(result);
+        result = copy;
+      }
+    }
+  }
   return(result);
 }