Changeset d1f11cd in tol

Timestamp:

Sep 19, 2011, 3:22:45 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

c6e98e2

Parents:

7860d11

Message:

Fixes #1307

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

File:

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

tol/btol/bgrammar/oprimp.cpp

@@ -580 +580 @@
   else if((tok->TokenType()==BINARY)&&(tok->Name()=="::"))
   {
+    if(BParser::Unparse(left_orig)=="BysMcmc::NameBlock config")
+      printf("");
   //BText expr = BParser::Unparse(left);
   //Std(BText("Unparse(left)=\n")<<BParser::Unparse(left)+"\n");
@@ -594 +596 @@
     {
       tok = BParser::treToken(left);
-      BSyntaxObject* member = unb->Contens().Member(tok->Name());
-      if(!member) { Error(err_msg); }
-      else if(member->Mode()== BSTRUCTMODE)
-      {
-        str = (BStruct*)member;
-        gra = GraSet(); 
+      const BText& tokName = tok->Name();
+      //VBR: Misteriosamente aprecen en los OIS expresiones como BysMcmc::NameBlock
+      BGrammar* g = BGrammar::FindByName(tokName,false);
+      if(g)
+      {
+        gra = g;
         unb = NULL;
         left = Tree::treLeft(left);
       }
-      else if(member->Mode() == BCLASSMODE)
-      {
-        cls = (BClass*)member;
-        gra = GraNameBlock();
-        unb = NULL;
-        left = Tree::treLeft(left);
-      }
-      else if((member->Mode() == BOBJECTMODE) && (member->Grammar() == GraNameBlock()))
-      {
-        unb = (BUserNameBlock*)member;
-        left = Tree::treRight(left);
-      }
       else
       {
-        Error(err_msg);
-      }
-    }
-
+        BSyntaxObject* member = unb->Contens().Member(tokName);
+        if(!member) { Error(err_msg); }
+        else if(member->Mode()== BSTRUCTMODE)
+        {
+          str = (BStruct*)member;
+          gra = GraSet(); 
+          unb = NULL;
+          left = Tree::treLeft(left);
+        }
+        else if(member->Mode() == BCLASSMODE)
+        {
+          cls = (BClass*)member;
+          gra = GraNameBlock();
+          unb = NULL;
+          left = Tree::treLeft(left);
+        }
+        else if((member->Mode() == BOBJECTMODE) && (member->Grammar() == GraNameBlock()))
+        {
+          unb = (BUserNameBlock*)member;
+          left = Tree::treRight(left);
+        }
+        else
+        {
+          Error(err_msg);
+        }
+      }
+    }
   }
   else if(tok->TokenType()!=FUNCTION)