Changeset 50c4377 in tol

Timestamp:

Jan 16, 2012, 12:30:18 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f50c5f3

Parents:

35458ba

Message:

Fixes #1394

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

Location:

tol

Files:

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

tol/btol/bgrammar/spfuninst.cpp

@@ -2045 +2045 @@
   BSyntaxObject* result = NIL;
   BInt nb = BSpecialFunction::NumBranches(tre);
+  List* branch = Branch(tre,1);
+  BToken* arg = BParser::treToken(branch);
+  const BText& globalName = arg->Name();
   BText errMsg;
   if(gra==GraAnything())
   {
-    errMsg = I2("Cannot apply monary global find operator ::<global_variable> "
-    "to type Anything",
-    "No se puede aplicar el operador de búsqueda global ::<variable_global> "
-    "al tipo Anything");
+    result = gra->FindOperand(globalName, false);
+    if(!result) { result = gra->FindOperator(globalName); }
   }
   else if(BSpecialFunction::TestNumArg(_name_, 1, nb, 1))
   {
-    List* branch = Branch(tre,1);
-    BToken* arg = BParser::treToken(branch);
-    const BText& globalName = arg->Name();
     BObjClassify oc(gra,BOBJECTMODE);
     result = BGrammar::SymbolTable().Search(oc, globalName);

tol/tol_version_def.h

@@ -25 +25 @@
 #define VERSION_MINOR   0
 #define VERSION_RELEASE 2
-#define VERSION_BUILD   "0.21.alpha"
+#define VERSION_BUILD   "0.22.alpha"
 
 #if defined(_MSC_VER)