Changeset 1e7e8f0 in tol

Timestamp:

Jul 21, 2009, 11:34:40 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

2a805f8

Parents:

7333f89

Message:

Fixes #715

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

File:

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

tol/btol/bgrammar/oprimp.cpp

@@ -576 +576 @@
     if(unb)
     {
-      const BNameBlock* oldNameBlock = BNameBlock::Current();
-      BNameBlock::SetCurrent(&unb->Contens());
+      const BNameBlock* oldNameBlock = BNameBlock::SetCurrent(&unb->Contens());
       left = Tree::treRight(left);
       grammar=GetLeft(grammar,left,name,rest,str, cls);
@@ -706 +705 @@
                    "oculta el miembro de NameBlock publicado")+
                 " "+result->FullName());
+        BUserFunction::ShowCallStack();
         result = NULL;
       }
@@ -940 +940 @@
   {
     result = gra->FindOperator(name); 
-    if(result && result->NameBlock())
-    {
-      Warning(I2("Global function","La función global")+
+    if(result && result->NameBlock() && !BNameBlock::Building())
+    {
+      Warning(I2("Function ","La función ")+
               " "+gra->Name()+" "+name+" "+
               I2("hides published NameBlock member",
                  "oculta el miembro de NameBlock publicado")+
               " "+result->FullName());
+      BUserFunction::ShowCallStack();
+      result = NULL;
+    }
+    if(result && BNameBlock::Building())
+    {
       result = NULL;
     }