Changeset 936e243 in tol

Timestamp:

Mar 3, 2009, 9:44:52 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

5f2f46b

Parents:

c5f245d

Message:

Separating NameBlock father from current that is used for scope rules.
Themes related to father and full name are now solved in operator = (BEqualOperator::Evaluate)

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

File:

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

tol/btol/bgrammar/graimp.cpp

@@ -545 +545 @@
   BGrammar* newGrammar = NIL;
   BBool enableCasting=BTRUE;
+  bool isCreatingNameBlock = BEqualOperator::IsCreatingNameBlock();
   BToken* tok  = BParser::treToken(tre);
   if(!tok || BGrammar::StopFlag()) { return(NIL); } 
@@ -781 +782 @@
     if(unb->HasName() && (own!=unb))
     {
-      if(unb->Name()=="root")
-        printf("");
       BNameBlock& nb = unb->Contens();
       if(!own || (own->Level()>unb->Level()))
       {
         nb.PutOwner(unb);
+        nb.PutLocalName(unb->Name());
         BText fatherName = "";
-        const BNameBlock* father = nb.Father();
-        if(father && father->EnsureIsAssigned())
+        if(isCreatingNameBlock)
         {
-          fatherName = nb.Father()->Name();
+          fatherName = BEqualOperator::CurrentFatherName();
         }
-        nb.PutLocalName(unb->Name());
         nb.RebuildFullNameDeep(fatherName);
       }