Changeset 7333f89 in tol

Timestamp:

Jul 21, 2009, 11:33:53 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

1e7e8f0

Parents:

d57f819

Message:

New member const NameBlock* building_ and related methods to store address of NameBlock that is being built at this moment

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

Location:

tol/btol/bgrammar

Files:

• nameblock.cpp (modified) (5 diffs)
• tol_bnameblock.h (modified) (2 diffs)

tol/btol/bgrammar/nameblock.cpp

@@ -49 +49 @@
 BTraceInit("nameblock.cpp");
 
-const BNameBlock*         BNameBlock::current_ = NULL;
-      BNameBlock*         BNameBlock::unknown_ = NULL;
+const BNameBlock*         BNameBlock::current_  = NULL;
+const BNameBlock*         BNameBlock::building_ = NULL;
+      BNameBlock*         BNameBlock::unknown_  = NULL;
       BObjClassify        BObjClassify::null_;
       BObjByNameHash      BNameBlock::using_;
@@ -278 +279 @@
   const BNameBlock* old = current_; 
   current_ = ns; 
-  return(current_); 
-}
+  return(ns); 
+}
+
+//--------------------------------------------------------------------
+  const BNameBlock* BNameBlock::Building() 
+//--------------------------------------------------------------------
+{ 
+  if(building_ && 
+     building_->createdWithNew_ &&
+     !(BFSMEM_Hndlr->IsAssigned(building_,building_->_bfsm_PageNum__)))
+  {
+    BFSMEM_Hndlr->IsAssigned(building_,building_->_bfsm_PageNum__);
+    building_ = NULL;
+  }
+  return(building_); 
+}
+
+//--------------------------------------------------------------------
+  const BNameBlock* BNameBlock::SetBuilding(const BNameBlock* ns) 
+//--------------------------------------------------------------------
+{ 
+  const BNameBlock* old = building_; 
+  building_ = ns; 
+  return(ns); 
+}
+
+
+
 
 //--------------------------------------------------------------------
@@ -324 +351 @@
     newNameBlock.PutName(fullName);
     newNameBlock.PutLocalName(name);
+    const BNameBlock* oldBuilding = BNameBlock::SetBuilding(&newNameBlock);
     int oldErr = (int)TOLErrorNumber().Value();
     BSyntaxObject* set_result = NULL;
@@ -378 +406 @@
         {
           BMember* mbr = newNameBlock.member_[n]->member_; 
-        //Std(BText("\nTRACE BNameBlock::EvaluateTree member ")+
-        // fullName+"::"+newNameBlock.member_[n]->member_->name_);
+          Std(BText("\nTRACE BNameBlock::EvaluateTree member ")+
+            fullName+"::"+newNameBlock.member_[n]->member_->name_);
           BSyntaxObject* obj = GraAnything()->EvaluateTree(mbr->branch_);
           if(!obj) 
@@ -437 +465 @@
       DESTROY(set_result);
     }
+    BNameBlock::SetBuilding(oldBuilding);
   }
   return(ns_result);

tol/btol/bgrammar/tol_bnameblock.h

@@ -53 +53 @@
   BClass* class_;
   static const BNameBlock* current_;
+  static const BNameBlock* building_;
   static BNameBlock* unknown_;
   static BObjByNameHash using_;
@@ -69 +70 @@
   static const BNameBlock* Current();
   static const BNameBlock* SetCurrent(const BNameBlock* ns);
+  static const BNameBlock* Building();
+  static const BNameBlock* SetBuilding(const BNameBlock* ns);
   static BSyntaxObject* EvaluateTree(const List* tre);
   static bool Using  (const BSyntaxObject* uns);