Changeset 3a7f880 in tol

Timestamp:

May 18, 2011, 5:21:37 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

16264c8

Parents:

2ea3271

Message:

Refs #1209

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

File:

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

tol/btol/bgrammar/spfuninst.cpp

@@ -1937 +1937 @@
     int nObjOld = BSyntaxObject::NSyntaxObject();
     BToken* arg1 = BParser::treToken(branch1);
-    if(arg1->TokenType()==ARGUMENT)
-    {
-      uns = GraNameBlock()->FindOperand(arg1->Name(),false);
-      if(!uns)
-      {
-        uns = GraSet()->FindOperand(arg1->Name(),false);
+    if(!branch1->cdr())
+    {
+      if(arg1->TokenType()==ARGUMENT)
+      {
+        uns = GraNameBlock()->FindOperand(arg1->Name(),false);
+        if(!uns)
+        {
+          uns = GraSet()->FindOperand(arg1->Name(),false);
+        }
+      }
+      else if(arg1->TokenType()==TYPE)
+      {
+        BTypeToken* tt = (BTypeToken*)arg1;
+        uns = FindClass(tt->Name(),1); 
       }
     }
@@ -1951 +1959 @@
       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())
-      {
-        if(arg1->TokenType()==TYPE)
-        {
-          BTypeToken* tt = (BTypeToken*)arg1;
-          uns = FindClass(tt->Name(),1); 
+        int mode = uns->Mode();
+        if(mode!=BCLASSMODE)
+        {
+          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);
         }
       }