Changeset 239a237 in tol

Timestamp:

Dec 27, 2010, 3:38:01 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f01ced8c

Parents:

6306f69

Message:

Fixes #1043

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

File:

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

tol/btol/bgrammar/spfuninst.cpp

@@ -448 +448 @@
     if(args.Card()==1)
     {
-        result  = gra->EvaluateExpr(Text(args[1]));
+      const BText& expr = Text(args[1]);
+      if(gra==GraAnything())
+      {
+        int posBlank = expr.Find(" ");
+        if(posBlank>0)
+        {
+          BText usedGraNam(expr,0,posBlank-1);
+          BGrammar* usedGra = BGrammar::FindByName(usedGraNam,false);
+          if(usedGra) 
+          {  
+            result = usedGra->EvaluateExpr(expr);
+          }
+        }
+      }
+            if(!result)
+      {
+        result = gra->EvaluateExpr(expr);
+      }
     }
     result=BSpecialFunction::TestResult(_name_,result,tre,gra->Defect(),BTRUE);