Changeset 86eec5c in tol

Timestamp:

May 20, 2013, 1:40:37 PM (13 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f18e2c2

Parents:

be8fad2

Message:

Removing private hash

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

Location:

tol/btol/bgrammar

Files:

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

tol/btol/bgrammar/nameblock.cpp

@@ -117 +117 @@
 : BObject  (),
   public_  (),
-  private_ (), 
+//private_ (), 
   evLevel_ (BGrammar::Level()),
   level_   (-999999999),
@@ -131 +131 @@
 {
   SetEmptyKey(public_ ,emptyHashKey_);
-  SetEmptyKey(private_,emptyHashKey_);
+//SetEmptyKey(private_,emptyHashKey_);
 #if (__USE_POOL__==__POOL_BFSMEM__)
   short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
@@ -145 +145 @@
 : BObject  (fullName), 
   public_  (),
-  private_ (),
+//private_ (),
   evLevel_ (BGrammar::Level()),
   level_   (-999999999),
@@ -159 +159 @@
 {
   SetEmptyKey(public_ ,emptyHashKey_);
-  SetEmptyKey(private_,emptyHashKey_);
+//SetEmptyKey(private_,emptyHashKey_);
 #if (__USE_POOL__==__POOL_BFSMEM__)
   short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
@@ -173 +173 @@
 : BObject  (), 
   public_  (),
-  private_ (),
+//private_ (),
   evLevel_ (BGrammar::Level()),
   level_   (-999999999),
@@ -187 +187 @@
 {
   SetEmptyKey(public_ ,emptyHashKey_);
-  SetEmptyKey(private_,emptyHashKey_);
+//SetEmptyKey(private_,emptyHashKey_);
 #if (__USE_POOL__==__POOL_BFSMEM__)
   short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
@@ -232 +232 @@
   }
   public_.clear();
-  private_.clear();
+//private_.clear();
   set_.Delete();
   father_ = NULL;
@@ -473 +473 @@
   if(oldBuilding && !BStandardOperator::evaluatingFunctionArgument_)
   {
-    assert(name.HasName());
+  //assert(name.HasName());
     oldBuildingLevel = oldBuilding->Level();
     ns_resultLevel = ns_result->Level();
@@ -794 +794 @@
 
     }
-    private_[name] = obj;
+  //private_[name] = obj;
+    public_[name] = obj;
   }
   if(obj->Grammar()==GraCode())
@@ -865 +866 @@
     }
   }
+/*
   for(iter=private_.begin(); iter!=private_.end(); iter++)
   {
@@ -889 +891 @@
     }
   }
+*/
   return(true);
 }
@@ -958 +961 @@
 {
 /* */
+  if(memberName[0]!='_') { return(NULL); }
+//if(memberName[1]=='.') { return(NULL); }
+//if(memberName=="_this") { result = owner_; }
   BSyntaxObject* result = NULL;
   if(Class())
@@ -974 +980 @@
     } 
   }
+  if(!result)
+  {
+//  BObjByNameHash::const_iterator found = private_.find(memberName);
+//  if(found==private_.end())
+    BObjByNameHash::const_iterator found = public_.find(memberName);
+    if(found==public_.end())
+    {
+      if(memberName=="_this")
+      {
+        result = owner_;
+      }
+    }
+    else
+    {
+      result = found->second;
+    }
+  }
 /* */
-  if(!result)
-  {
-    BObjByNameHash::const_iterator found = private_.find(memberName);
-    if(found==private_.end())
-    {
-      if(memberName=="_this")
-      {
-        result = owner_;
-      }
-    }
-    else
-    {
-      result = found->second;
-    }
-  }
   return(result);
 }
@@ -1098 +1106 @@
   for(iter=pbm.begin(); iter!=pbm.end(); iter++)
   {
-    ok = add_using_symbol(name, iter, false, false, usingAlsoSpecial);
-  }
+    bool uPr = false;
+    bool uRO = false;
+    if(name[0]=='_') 
+    {
+      if(name[1]=='.') 
+      {
+        uRO = usingAlsoReadOnly;
+      }
+      else
+      {
+        uPr = usingAlsoPrivate;
+      }
+    }
+    ok = add_using_symbol(name, iter, uRO, uPr, usingAlsoSpecial);
+  }
+/*
   BObjByNameHash& prm = ns.Private();
   for(iter=prm.begin(); iter!=prm.end(); iter++)
@@ -1106 +1128 @@
      usingAlsoReadOnly, usingAlsoPrivate, usingAlsoSpecial);
   }
+*/
   return(ok);
 }
@@ -1236 +1259 @@
     }
   }
+/*
   for(iter=private_.begin(); iter!=private_.end(); iter++)
   {
@@ -1254 +1278 @@
     }
   }
+*/
   return(lst);
 }
@@ -1274 +1299 @@
     }
   }
+/*
   for(iter=private_.begin(); iter!=private_.end(); iter++)
   {
@@ -1284 +1310 @@
     }
   }
+*/
   return(lst);
 }
@@ -1322 +1349 @@
     }
   }
+/*
   for(iter=private_.begin(); iter!=private_.end(); iter++)
   {
@@ -1332 +1360 @@
     }
   }
+*/
   doingRebuildFullNameDeep = false;
 }

tol/btol/bgrammar/tol_bnameblock.h

@@ -76 +76 @@
   static BRequiredPackage globalRequiredPackages_;
   BObjByNameHash public_;
-  BObjByNameHash private_;
+//BObjByNameHash private_;
   BSet set_;
   const BNameBlock* father_;
@@ -131 +131 @@
   const BObjByNameHash& Public () const { return(public_ ); }
         BObjByNameHash& Public ()       { return(public_ ); }
-  const BObjByNameHash& Private() const { return(private_); }
-        BObjByNameHash& Private()       { return(private_); }
+//const BObjByNameHash& Private() const { return(private_); }
+//      BObjByNameHash& Private()       { return(private_); }
   const BSet&       Set     () const { return(set_); }
         BSet&       Set     ()       { return(set_); }