Changeset 170ff1f in tol

Timestamp:

Mar 13, 2012, 9:50:31 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

2c7071c

Parents:

a4cc221

Message:

Fixes #1478
If BUserCode has different Name or Level than BOperator, it can't be a method

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

File:

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

tol/btol/bgrammar/nameblock.cpp

@@ -510 +510 @@
           if(obj)
           {
+            if(obj->Name()=="CmdInvoke")
+              printf("");
             newNameBlock.AddElement(obj,true,false);
           }
@@ -793 +795 @@
       BUserCode* uCode = UCode(obj);
       BOperator* opr   = GetOperator(uCode);
-      if(opr && !opr->System() && !opr->NameBlock())
+      if(opr && !opr->System() && !opr->NameBlock() && 
+        (opr->Name()==obj->Name()) && 
+        (opr->Level()==obj->Level()))
       {
         opr->PutNameBlock(this);