Changeset 0fd52fc in tol

Timestamp:

Mar 9, 2012, 4:27:05 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

e71f0a2

Parents:

84af815

Message:

Fixes #1475

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

File:

• tol/btol/bgrammar/spfuninst.cpp (modified) (1 diff)

tol/btol/bgrammar/spfuninst.cpp

@@ -2164 +2164 @@
   const BText& globalName = arg->Name();
   BText errMsg;
-  if(gra==GraAnything())
-  {
-    result = gra->FindOperand(globalName, false);
-    if(!result) { result = gra->FindOperator(globalName); }
-  }
-  else if(BSpecialFunction::TestNumArg(_name_, 1, nb, 1))
-  {
-    BObjClassify oc(gra,BOBJECTMODE);
-    result = BGrammar::SymbolTable().Search(oc, globalName);
+  if(gra!=GraAnything())
+  {
+    result = gra->FindVariable(globalName);   
+  }
+  else 
+  {
+    result = BGrammar::Last()->FindVariable(globalName);
+    int gid;
+    for(gid=BGI_Anything+1; !result && gid<BGI_LastId; gid++)
+    {
+      BGrammar* g = BGrammar::Gra((BGrammarId)gid);
+      if(g!=BGrammar::Last())
+      {
+        result = g->FindVariable(globalName);   
+      }
+    }
   }
   if(errMsg.HasName())