Changeset ea1d4f6 in tol

Timestamp:

Jan 26, 2009, 3:58:42 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

75f1ea4

Parents:

d0b30d4

Message:

Member bool createdWithNew_ to distingish objects created in scope from created in stack with new operator.
Method short EnsureIsAssigned() const returns true for objects created in scope and calls IsAssigned method for objects created in stack
Member BText localName_ to difference between full and local name
Metohd void RebuildFullNameDeep(BText parentFullName) that rebuilds recursively full names of members of a NameBlock

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

File:

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

tol/btol/bgrammar/nameblock.cpp

@@ -84 +84 @@
 BNameBlock::BNameBlock() 
 //--------------------------------------------------------------------
-: BObject(),
-  public_(),
-  private_(), 
-  evLevel_(BGrammar::Level()),
-  level_(-999999999),
-  father_(current_)
+: BObject   (),
+  public_   (),
+  private_  (), 
+  set_      (),
+  evLevel_  (BGrammar::Level()),
+  level_    (-999999999),
+  father_   (current_),
+  localName_()
 {
   SetEmptyKey(public_ ,NULL);
@@ -96 +98 @@
 
 //--------------------------------------------------------------------
-BNameBlock::BNameBlock(const BText& fullName) 
-//--------------------------------------------------------------------
-: BObject (fullName), 
-  public_ (),
-  private_(),
-  set_    (),
-  father_ (current_)
+BNameBlock::BNameBlock(const BText& fullName, const BText& localName) 
+//--------------------------------------------------------------------
+: BObject   (fullName), 
+  public_   (),
+  private_  (),
+  set_      (),
+  evLevel_  (BGrammar::Level()),
+  level_    (-999999999),
+  father_   (current_),
+  localName_(localName)
 {
   SetEmptyKey(public_ ,NULL);
   SetEmptyKey(private_,NULL);
-}
-//--------------------------------------------------------------------
-BNameBlock::~BNameBlock() 
-//--------------------------------------------------------------------
-{
+  short isAssigned = BObject::IsAssigned();
+  createdWithNew_ = isAssigned!=-1;
 }
 
@@ -116 +118 @@
 BNameBlock::BNameBlock(const BNameBlock& ns) 
 //--------------------------------------------------------------------
-: BObject (ns.Name    ()), 
-  public_ (ns.Public  ()),
-  private_(ns.Private ()),
-  set_    (ns.Set     ()),
-  father_ (ns.Father  ())
-{
+: BObject   (ns.Name    ()), 
+  public_   (ns.Public  ()),
+  private_  (ns.Private ()),
+  set_      (ns.Set     ()),
+  father_   (ns.Father  ()),
+  localName_(ns.LocalName())
+{
+  short isAssigned = BObject::IsAssigned();
+  createdWithNew_ = isAssigned!=-1;
   //VBR: La copia de NameBlock tiene un problema si los miembros
   //referenciados en ambos son los mismos, ¿cuál es su padre?
@@ -127 +132 @@
 
 //--------------------------------------------------------------------
+BNameBlock::~BNameBlock() 
+//--------------------------------------------------------------------
+{
+}
+
+//--------------------------------------------------------------------
 BNameBlock& BNameBlock:: operator= (const BNameBlock& ns)
 //--------------------------------------------------------------------
 {
   PutName(ns.Name());
-  set_      = ns.Set();
-  father_   = ns.Father();
-  public_   = ns.Public();
-  private_  = ns.Private();
+  set_       = ns.Set();
+  father_    = ns.Father();
+  public_    = ns.Public();
+  private_   = ns.Private();
+  localName_ = ns.LocalName();
   //VBR: La copia de NameBlock tiene un problema si los miembros
   //referenciados en ambos son los mismos, ¿cuál es su padre?
   return(*this);
+}
+
+//--------------------------------------------------------------------
+  short BNameBlock::EnsureIsAssigned() const
+//--------------------------------------------------------------------
+{
+  if(createdWithNew_) { return(BObject::IsAssigned()); }
+  else                { return(true); }
 }
 
@@ -211 +231 @@
     BNameBlock& newNameBlock  = ns_result->Contens();
     newNameBlock.PutName(fullName);
+    newNameBlock.PutLocalName(name);
   //BNameBlock::current_ = &newNameBlock;
     int oldErr = (int)TOLErrorNumber().Value();
@@ -312 +333 @@
           BUserCode* uCode = UCode(obj);
           BOperator* opr   = GetOperator(uCode);
-          opr->PutNameBlock(this);
+          if(!opr->System() && !opr->NameBlock())
+          {
+            opr->PutNameBlock(this);
+          }
         }
       }
@@ -564 +588 @@
 
 //--------------------------------------------------------------------
+  void BNameBlock::RebuildFullNameDeep(BText parentFullName)
+//--------------------------------------------------------------------
+{
+//Std(BText("\n")+"BNameBlock::SelectMembersDeep Exploring NameBlock "+Name());
+  BSyntaxObject* obj;
+  BUserNameBlock* unb;
+  BObjByNameHash::const_iterator iter;
+  if(parentFullName.HasName()) 
+  { 
+    parentFullName = parentFullName+"::"+LocalName(); 
+  }
+  else
+  {
+    parentFullName = LocalName(); 
+  }
+  PutName(parentFullName);
+  for(iter=public_.begin(); iter!=public_.end(); iter++)
+  {
+    obj = iter->second;
+    if((obj->Grammar()==GraNameBlock()) && (obj->Mode()==BOBJECTMODE))
+    {
+      unb = (BUserNameBlock*)obj;
+      unb->Contens().RebuildFullNameDeep(parentFullName);
+    }
+  }
+}
+
+
+//--------------------------------------------------------------------
   BList* BNameBlock::Select(BList* lst, const BObjClassify&  oc)
 //--------------------------------------------------------------------
@@ -674 +727 @@
   {
     const BText& name = BEqualOperator::CreatingName();
-    contens_.PutName(name);
+    BText fullName = name;
+    BText currentFullName = "";
+    if(BNameBlock::Current())
+    {
+      currentFullName = BNameBlock::Current()->Name();
+      fullName = currentFullName+"::"+name;
+    }
+    else
+    {
+      currentFullName = "";
+      fullName = name;
+    }
+    contens_.PutName(fullName);
+    contens_.PutLocalName(name);
     contens_.Fill(set);
+    contens_.RebuildFullNameDeep(currentFullName);
   }
 }