Changeset bfa6580 in tol

Timestamp:

Mar 9, 2012, 2:57:24 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

84af815

Parents:

ba38983

Message:

Fixes #1474

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

File:

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

tol/btol/bgrammar/oprimp.cpp

@@ -1196 +1196 @@
   const BText& name       = BParser::treToken(argList)->Name();
   BGrammar*    setGrammar = GraSet();
-  BStruct*     str        = FindStruct(name);
-  if(str && str->NameBlock())
+  BStruct*     str        = FindStruct(name); 
+  if(str && str->NameBlock()  && !BNameBlock::Building())
   {
     Warning(I2("Global structure ","La estructura global")+
@@ -1206 +1206 @@
     str = NULL;
   }
+  if(str && BNameBlock::Building())
+  {
+    str = NULL;
+  }
+  if(str && (str->Level()<BGrammar::Level()))
+  {
+    str = NULL;
+  }
   if(str)
   {
-    if(!argList->cdr()) { return(str); }
+  //if(!argList->cdr()) { return(str); }
     BText path = str->SourcePath();
 #ifndef UNIX