Changeset e6d6935 in tol

Timestamp:

Feb 8, 2012, 7:01:46 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

bedce5a

Parents:

258606d

Message:

Setting specific pointer emptyHashKey_ instead of generic NULL

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

File:

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

tol/btol/bgrammar/nameblock.cpp

@@ -64 +64 @@
 static BStruct* strNameBlockMemberInfo_  = NULL;
 static BStruct* strClassMemberInfo_  = NULL;
+static char* emptyHashKey_ = NULL;
 
 //--------------------------------------------------------------------
@@ -85 +86 @@
   if(BNameBlock_IsInitialized()) { return(false); }
   unknown_ = new BNameBlock;
-  SetEmptyKey  (using_,               NULL);
+//emptyHashKey_ = new char(64);
+//sprintf(emptyHashKey_, "_#_&¬!?_NameBlock_empty_hash_key_");
+  SetEmptyKey  (using_,               emptyHashKey_);
   SetEmptyKey  (usingSymbolsByClass_, BObjClassify::null_);
-  SetEmptyKey  (usingSymbols_,        NULL);
+  SetEmptyKey  (usingSymbols_,        emptyHashKey_);
   SetDeletedKey(usingSymbols_,        name_del_key());
 
@@ -127 +130 @@
   startedPackage(false)
 {
-  SetEmptyKey(public_ ,NULL);
-  SetEmptyKey(private_,NULL);
+  SetEmptyKey(public_ ,emptyHashKey_);
+  SetEmptyKey(private_,emptyHashKey_);
 #if (__USE_POOL__==__POOL_BFSMEM__)
   short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
@@ -155 +158 @@
   startedPackage(false)
 {
-  SetEmptyKey(public_ ,NULL);
-  SetEmptyKey(private_,NULL);
+  SetEmptyKey(public_ ,emptyHashKey_);
+  SetEmptyKey(private_,emptyHashKey_);
 #if (__USE_POOL__==__POOL_BFSMEM__)
   short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
@@ -183 +186 @@
   startedPackage(false)
 {
+  SetEmptyKey(public_ ,emptyHashKey_);
+  SetEmptyKey(private_,emptyHashKey_);
 #if (__USE_POOL__==__POOL_BFSMEM__)
   short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
@@ -580 +585 @@
         if(cls && cls->Name()=="BlockSamplerStdLinear" && name=="aux")
         {
-          Std(BText("\nTRACE BNameBlock::EvaluateTree member [")+(n+1)+"]"+
+        //Std(BText("\nTRACE BNameBlock::EvaluateTree member [")+(n+1)+"]"+
             fullName+"::"+mbr->name_+
             "  position_="+(memberOwner.member_[n]->position_+1)+"\n");