Changeset c31ee19 in tol

Timestamp:

Feb 24, 2011, 4:41:02 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

c585b86

Parents:

fd127bc

Message:

Fixes #1104

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

File:

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

tol/btol/bgrammar/spfuninst.cpp

@@ -1814 +1814 @@
     {
       BStruct* str = (BStruct*)result;
-      result = str->Function()->Evaluate(branch2->cdr());
-      DESTROY(str);
+      BSyntaxObject* instance = str->Function()->Evaluate(branch2->cdr());
+      if(instance)
+      {
+        result = instance;
+        DESTROY(str);
+      }
     }
     if(result && (tt==TYPE)&&(result->Mode()==BCLASSMODE))
     {
       BClass* cls = (BClass*)result;
-      result = GraNameBlock()->EvaluateTree(branch2->cdr());
-      BUserNameBlock* unb = NULL;
-      if(result && (result->Grammar()==GraNameBlock()))
-      {
-        unb = (BUserNameBlock*)result;
-      }
-      if(!unb || (unb->Contens().Class()!=cls))
-      {
-        errMsg = I2("It was expected an instance of Class ",
-                 "Se esperaba una instancia de Class ") +cls->Name();
-        DESTROY(result);
-        result=NULL;
-      }
-      DESTROY(cls);
+      BSyntaxObject* instance = GraNameBlock()->EvaluateTree(branch2->cdr());
+      if(instance)
+      {  
+        result = instance;
+        BUserNameBlock* unb = NULL;
+        if(result && (result->Grammar()==GraNameBlock()))
+        {
+          unb = (BUserNameBlock*)result;
+        }
+        if(!unb || (unb->Contens().Class()!=cls))
+        {
+          errMsg = I2("It was expected an instance of Class ",
+                   "Se esperaba una instancia de Class ") +cls->Name();
+          DESTROY(result);
+          result=NULL;
+        }
+        DESTROY(cls);
+      }
     }
   }
@@ -1856 +1864 @@
   //Std(BText("\nEvMember branch2='")+BParser::Unparse(branch2,"  ")+"'\n"); 
     int nObject0 = BSyntaxObject::NSyntaxObject();
-  //Std(BText("\nTRACE EvMember BEGIN NObject=")+nObject0+" tre='"+ups+"'\n"); 
+    Std(BText("\nTRACE EvMember BEGIN NObject=")+nObject0+" tre='"+ups+"'\n"); 
 /* */
   BSyntaxObject* result = NIL;