Changeset 9247be0 in tol

Timestamp:

Mar 16, 2011, 3:03:48 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

3fdcd40

Parents:

12a919e

Message:

Refs #1111
Refs #1121
Fixing bugs wich were hiding by solved memory leak

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

Location:

tol

Files:

• bbasic/txtalgeb.cpp (modified) (1 diff)
• btol/bgrammar/oprimp.cpp (modified) (1 diff)
• btol/bgrammar/tol_bgentmp.h (modified) (1 diff)

tol/bbasic/txtalgeb.cpp

@@ -106 +106 @@
 {
 //InitTotalTime("BText::Copy BChar*");
-  if(this!=&txt)
+  
+  if(&txt && (this!=&txt))
   {
     if(!buffer_) { AllocateBuffer(0); } 

tol/btol/bgrammar/oprimp.cpp

@@ -677 +677 @@
   TRACE_SHOW_MEDIUM(fun," 3");
   BGrammar::PutLast(gra);
-        if(!(rightResult = gra->EvaluateTree(tre))) 
+  rightResult = gra->EvaluateTree(tre); 
+        if(!rightResult || ((rightResult->Mode()!=BOBJECTMODE) && 
+                      (rightResult->Mode()!=BBUILTINFUNMODE) && 
+                      (rightResult->Mode()!=BUSERFUNMODE))) 
   {
     TRACE_SHOW_MEDIUM(fun," 4");

tol/btol/bgrammar/tol_bgentmp.h

@@ -60 +60 @@
     }
   }
+  Any* GetResult() const 
+  { 
+    if(result_->Mode()!=BOBJECTMODE)
+    {
+      Error("[FATAL] Non expect mode of syntax object.");
+      return(NULL);
+    }
+    return(result_); 
+  }
  const BText& Expression  () const 
   { 
-    if(result_) { return(result_->Expression()); }
-    else        { return(this->CBTextNullRef()); }
+    if(GetResult()) { return(result_->Expression()); }
+    else            { return(this->CBTextNullRef()); }
   }
   const BText& TolPath     () const
   { 
-    if(result_) { return(result_->TolPath()); }
-    else        { return(this->CBTextNullRef()); }
+    if(GetResult()) { return(result_->TolPath()); }
+    else            { return(this->CBTextNullRef()); }
   }
   BText Dump() const 
   {
-        if(result_) { return(result_->Dump()); }
-        else          { return("NULL"); }
+        if(GetResult()) { return(result_->Dump()); }
+        else              { return("NULL"); }
   }
   BText Info() const 
   {
-        if(result_) { return(result_->Info()); }
-        else          { return("NULL"); }
+        if(GetResult()) { return(result_->Info()); }
+        else              { return("NULL"); }
   }
   void ReCalc() 
   { 
-        if(result_) { result_->ReCalc(); } 
-  }
-  Any* GetResult() const { return(result_); }
+        if(GetResult()) { result_->ReCalc(); } 
+  }
 };