Changeset a6ea59f in tol

Timestamp:

Feb 16, 2010, 5:44:42 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

2cab927

Parents:

11d460a

Message:

Fixed #872
Destroying temporary objects in EvMember with syntax "... (...) ::"

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

File:

• tol/btol/bgrammar/spfuninst.cpp (modified) (9 diffs)

tol/btol/bgrammar/spfuninst.cpp

@@ -1553 +1553 @@
         BOperator* opr   = GetOperator(uCode);
         result = opr->Evaluate(branch2->cdr());
+        DESTROY(opr);
       }
     }
@@ -1559 +1560 @@
       BStruct* str = (BStruct*)result;
       result = str->Function()->Evaluate(branch2->cdr());
+      DESTROY(str);
     }
     if((tt==TYPE)&&(result->Mode()==BCLASSMODE))
@@ -1573 +1575 @@
         errMsg = I2("It was expected an instance of Class ",
                  "Se esperaba una instancia de Class ") +cls->Name();
+        DESTROY(result);
         result=NULL;
       }
+      DESTROY(cls);
     }
   }
@@ -1592 +1596 @@
   static BText _name_ = "::";
   BSyntaxObject* result = NIL;
+  int stackPos = BGrammar::StackSize();
   BInt nb = BSpecialFunction::NumBranches(tre);
   BText errMsg;
+  BSyntaxObject* uns = NULL;
+  bool needsDeleteUns = false;
   if(BSpecialFunction::TestNumArg(_name_, 2, nb, 2))
   {
@@ -1610 +1617 @@
 /* */
     bool oldEnabled = BOut::Disable();
-    BSyntaxObject* uns = GraNameBlock()->LeftEvaluateTree(branch1);
+    int nObjOld = BSyntaxObject::NSyntaxObject();
+    uns = GraNameBlock()->LeftEvaluateTree(branch1);
     if(!uns) { uns = GraSet()->LeftEvaluateTree(branch1); }
     if(!uns) 
@@ -1630 +1638 @@
       }
     }
+    int nObjNew = BSyntaxObject::NSyntaxObject();
+    needsDeleteUns = (uns!=NULL) && (nObjNew>nObjOld);
     if(oldEnabled) { BOut::Enable(); }
     BToken* arg2 = BParser::treToken(branch2);
@@ -1639 +1649 @@
         BClass* cls = (BClass*)uns;
         result = cls->FindStatic(memberName,false);
-        result = EvMemberArg
+        BSyntaxObject* r = EvMemberArg
          (_name_, gra, branch2, arg2, memberName,cls->Name(), errMsg, result);
+        DESTROY(result);
+        result = r;
       }
       else if(uns->Grammar()==GraSet())
@@ -1666 +1678 @@
           result = ns.PublicMember(memberName);
         }
-        result = EvMemberArg
+        BSyntaxObject* r = EvMemberArg
           (_name_, gra, branch2, arg2, memberName, ns.Name(), errMsg, result);
+        DESTROY(result);
+        result = r;
       }
     }
@@ -1679 +1693 @@
   }
   result=BSpecialFunction::TestResult(_name_,result,tre,NIL,BTRUE);
+  if(needsDeleteUns) { DESTROY(uns); }
+  BGrammar::DestroyStackUntil(stackPos, result);    
   return(result);
 }