Changeset cb09f07 in tol

Timestamp:

Apr 4, 2009, 4:37:32 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

07081c8

Parents:

2d8895b

Message:

BNameBlock::RebuildFullNameDeep handles with _.autodoc.member. feature to avoid referential integrity in BSyntaxObject::Description

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

Location:

tol/btol/bgrammar

Files:

• nameblock.cpp (modified) (1 diff)
• syn.cpp (modified) (1 diff)

tol/btol/bgrammar/nameblock.cpp

@@ -814 +814 @@
   {
     obj = iter->second;
+    if(!obj->Description().HasName())
+    {
+      BSyntaxObject* autodoc = Member(BText("_.autodoc.member.")+Name());
+      if(autodoc && autodoc->Grammar()==GraText())
+      {
+        BText& desc = Text(autodoc);
+        obj->PutDescription(desc);
+      }
+    }
     if((obj->Grammar()==GraNameBlock()) && (obj->Mode()==BOBJECTMODE))
     {

tol/btol/bgrammar/syn.cpp

@@ -384 +384 @@
     }
   }
-  else 
-  {
-    const BNameBlock* nb = NameBlock();
-    if(nb && nb->EnsureIsAssigned())
-    {
-      BSyntaxObject* autodoc = nb->Member(BText("_.autodoc.member.")+Name());
-      if(autodoc && autodoc->Grammar()==GraText())
-      {
-        BText& desc = Text(autodoc);
-        BSyntaxObject* T = (BSyntaxObject*)this;
-        T->PutDescription(desc);
-        return(optInfo_->description_);
-      }
-    }
-  }
 #endif
   return(CBTextNullRef());