Changeset 47bb2da in tol

Timestamp:

Jul 21, 2009, 5:56:05 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

176c3d90

Parents:

4d5581d

Message:

Adding argument BText memberName to method RebuildFullNameDeep in order to set correct global FullName to deep members.
Fixes #716

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

Location:

tol/btol/bgrammar

Files:

• graimp.cpp (modified) (1 diff)
• nameblock.cpp (modified) (5 diffs)
• tol_bnameblock.h (modified) (1 diff)

tol/btol/bgrammar/graimp.cpp

@@ -871 +871 @@
           fatherName = BEqualOperator::CurrentFatherName();
         }
-        nb.RebuildFullNameDeep(fatherName);
+        nb.RebuildFullNameDeep(fatherName,"");
       }
     }

tol/btol/bgrammar/nameblock.cpp

@@ -856 +856 @@
 
 //--------------------------------------------------------------------
-  void BNameBlock::RebuildFullNameDeep(BText parentFullName)
+  void BNameBlock::RebuildFullNameDeep(BText parentFullName, BText memberName)
 //--------------------------------------------------------------------
 {
@@ -863 +863 @@
   BUserNameBlock* unb;
   BObjByNameHash::const_iterator iter;
+  if(!memberName.HasName()) 
+  {
+    memberName = LocalName();
+  } 
   if(parentFullName.HasName()) 
   { 
-    parentFullName = parentFullName+"::"+LocalName(); 
+    parentFullName = parentFullName+"::"+memberName; 
   }
   else
   {
-    parentFullName = LocalName(); 
+    parentFullName = memberName; 
   }
   PutName(parentFullName);
@@ -889 +893 @@
       unb = (BUserNameBlock*)obj;
       unb->Contens().father_ = this;
-      unb->Contens().RebuildFullNameDeep(parentFullName);
+      unb->Contens().RebuildFullNameDeep(parentFullName, obj->Name());
     }
   }
@@ -899 +903 @@
       unb = (BUserNameBlock*)obj;
       unb->Contens().father_ = this;
-      unb->Contens().RebuildFullNameDeep(parentFullName);
+      unb->Contens().RebuildFullNameDeep(parentFullName, obj->Name());
     }
   }
@@ -1031 +1035 @@
     contens_.PutLocalName(name);
     contens_.Fill(set);
-    contens_.RebuildFullNameDeep(currentFullName);
+    contens_.RebuildFullNameDeep(currentFullName,"");
   }
 }

tol/btol/bgrammar/tol_bnameblock.h

@@ -124 +124 @@
   BList* SelectMembers(BList* lst, const BObjClassify&  oc);
   BList* SelectMembersDeep(BList* lst, const BObjClassify&  oc);
-  void RebuildFullNameDeep(BText parentFullName);
+  void RebuildFullNameDeep(BText parentFullName, BText memberName);
 
   short EnsureIsAssigned() const;