Changeset 5ae0b15 in tol

Timestamp:

May 31, 2011, 9:14:57 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

3130ef1

Parents:

2ed326d

Message:

Fixes #1224

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

File:

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

tol/btol/bgrammar/spfuninst.cpp

@@ -996 +996 @@
   if(BSpecialFunction::TestNumArg(_name_, 2, nb, 3))
   {
-    BSyntaxObject* desObj = GraText    ()->EvaluateTree(Branch(tre,1));
+    BSyntaxObject* desObj = GraText()->EvaluateTree(Branch(tre,1));
     if(!desObj) { return(NULL); }
     BText desc = Text(desObj);
@@ -1005 +1005 @@
     {
       tokenName = tokenName.SubString(1,tokenName.Length());
-      obj = FindStruct(tokenName);
+      obj = FindClass(tokenName,-1);
       if(obj && nb==3)
-      {  
+      {
+        BText memberName = BParser::treToken(Branch(tre,3))->Name();
+        if(memberName[0]=='\"')
+        {
+          memberName = memberName.SubString(1,memberName.Length());
+          BClass* cls = (BClass*)obj;
+          if(!cls->PutMemberDescription(memberName, desc, false))
+          {
+            BSpecialFunction::TestResult(_name_,NIL,tre,NIL,BTRUE);
+          }
+          SAFE_DESTROY(desObj,obj);
+          return(NULL);
+        }
+        else
+        {  
+          Error(third_arg_error);
+        }
+      } 
+      else if(nb==3)
+      {
         Error(third_arg_error);
       }
-      if(!obj)
-      {
-        obj = FindClass(tokenName,-1);
-        if(obj && nb==3)
-        {
-          BText memberName = BParser::treToken(Branch(tre,3))->Name();
-          if(memberName[0]=='\"')
-          {
-            memberName = memberName.SubString(1,memberName.Length());
-            BClass* cls = (BClass*)obj;
-            if(!cls->PutMemberDescription(memberName, desc, false))
-            {
-              BSpecialFunction::TestResult(_name_,NIL,tre,NIL,BTRUE);
-            }
-            SAFE_DESTROY(desObj,obj);
-            return(NULL);
-          }
-          else
-          {  
-            Error(third_arg_error);
-          }
-        } 
+      else
+      {
+        obj = gra->LeftEvaluateExpr(tokenName);      
       }
     }
@@ -1040 +1040 @@
     if(!obj)
     {
-      obj = GraAnything()->LeftEvaluateTree(Branch(tre,2));
+      obj = gra->LeftEvaluateTree(Branch(tre,2));
     };
     BGrammar::PutLast(gra);