Changeset 492d323 in tol

Timestamp:

Feb 23, 2011, 8:51:11 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

5430aa8

Parents:

de1c7d8

Message:

Fixes #1018
When a syntax error is found but an object is already created, it must be destroyed

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

File:

• tol/btol/bgrammar/graimp.cpp (modified) (5 diffs)

tol/btol/bgrammar/graimp.cpp

@@ -451 +451 @@
       if (!(gra1->Name()==gra2->Name())) 
       {
-        Error(name + I2(" is not a reference.",
-                        " no es una referencia de tipo ") + gra1->Name()+
-                     I2(" but it's a reference of type ",
-                        " sino de tipo ")+gra2->Name());
-         error = true;
-         result = NIL;
+        if(BOut::IsEnabled()) 
+        { 
+          Error(name + I2(" is not a reference.",
+                          " no es una referencia de tipo ") + gra1->Name()+
+                       I2(" but it's a reference of type ",
+                          " sino de tipo ")+gra2->Name());
+        }
+        error = true;
+        DESTROY(result);
       }
     }
@@ -539 +542 @@
                  "Expresión no válida para formación de matrices : \n") +
               BParser::Unparse(tre, "  ", "\n"));
+      DESTROY(result);
         return(NIL);
     }
@@ -710 +714 @@
   else if((type == TYPE) && (name=="#Require"))
   {
+    DESTROY(result);
     return(NULL);  
   }
@@ -817 +822 @@
       else     
       {
-        BGrammar* rg = result->Grammar();
-      //if(!rg && (name=="::"))
-        BText rgn = (rg)?rg->Name():"UNKNOWN TYPE";
-        BText tgn = this->Name();
-        BText rid = (rg)?result->Identify():BParser::Unparse(tre, "  ", "\n");
-        TRACE_SHOW_MEDIUM(fun,"3.3.1.2");
-        BText en = BText("It has not been possible to convert from ")+ 
-                   rgn+ " to "+
-                   tgn+ " for object '"+
-                   rid+"'";
-        BText es = BText("No ha sido posible convertir de ")+
-                   rgn+ " hacia "+
-                   tgn + " para el objeto '"+
-                   rid+"'";
-        Error(I2(en,es));
-        result = NIL;
+        if(BOut::IsEnabled()) 
+        { 
+          BGrammar* rg = result->Grammar();
+        //if(!rg && (name=="::"))
+          BText rgn = (rg)?rg->Name():"UNKNOWN TYPE";
+          BText tgn = this->Name();
+          BText rid = (rg)?result->Identify():BParser::Unparse(tre, "  ", "\n");
+          TRACE_SHOW_MEDIUM(fun,"3.3.1.2");
+          BText en = BText("It has not been possible to convert from ")+ 
+                     rgn+ " to "+
+                     tgn+ " for object '"+
+                     rid+"'";
+          BText es = BText("No ha sido posible convertir de ")+
+                     rgn+ " hacia "+
+                     tgn + " para el objeto '"+
+                     rid+"'";
+          Error(I2(en,es));
+        }
+        DESTROY(result);
       }
     }
@@ -894 +902 @@
   {
     BClass* cls = (BClass*) result;
-    if(!cls->isDefined_) { result = NULL; }
+    if(!cls->isDefined_) 
+    { 
+      DESTROY(result);
+      result = NULL; 
+    }
   }
   return(result);