Changeset 7c62e8b in tol

Timestamp:

Feb 4, 2009, 9:23:23 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

a2f5d0f

Parents:

7e2783d

Message:

Updates owner relation of NameBlock's

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

File:

• tol/btol/bgrammar/graimp.cpp (modified) (1 diff)

tol/btol/bgrammar/graimp.cpp

@@ -738 +738 @@
 //TRACE_SHOW_LOW(fun,BText("End with result type: ")<<BText((result!=NULL)?result->Grammar()->Name():BText("NULL")));
   TRACE_SHOW_LOW(fun,"END");
+  if(result && (result->Grammar()==GraNameBlock()))
+  {
+    BUserNameBlock* unb = (BUserNameBlock*)result;
+    BUserNameBlock* own = unb->Contens().Owner();
+    if(unb->HasName() && (own!=unb))
+    {
+      if(unb->Name()=="root")
+        printf("");
+      BNameBlock& nb = unb->Contens();
+      if(!own || (own->Level()>unb->Level()))
+      {
+        nb.PutOwner(unb);
+        BText fatherName = "";
+        const BNameBlock* father = nb.Father();
+        if(father && father->EnsureIsAssigned())
+        {
+          fatherName = nb.Father()->Name();
+        }
+        nb.PutLocalName(unb->Name());
+        nb.RebuildFullNameDeep(fatherName);
+      }
+    }
+  }
   return(result);
 }