Changeset 2ea3271 in tol

Timestamp:

May 18, 2011, 4:59:44 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

3a7f880

Parents:

e3da30d

Message:

Refs #1209

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

File:

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

tol/btol/bgrammar/spfuninst.cpp

@@ -1932 +1932 @@
     List* branch2 = Branch(tre,2);
 /* * /
-    Std(BText("\nTRACE EvMember branch1=")+BParser::treWrite(branch1,"  ")+"'\n"); 
-    Std(BText("\nTRACE EvMember branch2=")+BParser::treWrite(branch2,"  ")+"'\n"); 
+    printf((BText("\nTRACE EvMember branch1=")+BParser::treWrite(branch1,"  ")+"'\n").String()); 
+    printf((BText("\nTRACE EvMember branch2=")+BParser::treWrite(branch2,"  ")+"'\n").String()); 
 /* */
-    bool oldEnabled = BOut::Disable();
     int nObjOld = BSyntaxObject::NSyntaxObject();
-    uns = GraNameBlock()->LeftEvaluateTree(branch1);
-    if(!uns) { uns = GraSet()->LeftEvaluateTree(branch1); }
+    BToken* arg1 = BParser::treToken(branch1);
+    if(arg1->TokenType()==ARGUMENT)
+    {
+      uns = GraNameBlock()->FindOperand(arg1->Name(),false);
+      if(!uns)
+      {
+        uns = GraSet()->FindOperand(arg1->Name(),false);
+      }
+    }
+    if(!uns)
+    {
+      uns = GraAnything()->LeftEvaluateTree(branch1,false);
+      BGrammar* uns_gra = uns->Grammar();
+      if(uns && (uns_gra!=GraNameBlock()) && (uns_gra!=GraSet()))
+      {
+        Error(I2("Evaluating expression ",
+                 "Evaluando la expresión ")+
+                 gra->Name()+" '"+BParser::Unparse(tre)+"'\n"+
+              I2("Left term is not a valid Set or NameBlock but a ",
+                 "El término a la izquierda no es un Set ni un NameBlock sino un")+
+                 uns_gra->Name()+" '"+BParser::Unparse(branch1)+"'\n");
+        DESTROY(uns);
+        return(NULL);
+      }
+    }
     if(!uns) 
     { 
       if(!branch1->cdr())
       {
-        BToken* arg1 = BParser::treToken(branch1);
         if(arg1->TokenType()==TYPE)
         {
@@ -1953 +1974 @@
     int nObjNew = BSyntaxObject::NSyntaxObject();
     needsDeleteUns = (uns!=NULL) && (nObjNew>nObjOld);
-    if(oldEnabled) { BOut::Enable(); }
     BToken* arg2 = BParser::treToken(branch2);
     if(uns && arg2)