Changeset f18e2c2 in tol

Timestamp:

May 20, 2013, 3:58:32 PM (13 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

d60d28c

Parents:

86eec5c

Message:

Fixes #1690
Removing private methods and members from SelectMembersDeep

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

File:

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

tol/btol/bgrammar/nameblock.cpp

@@ -1245 +1245 @@
   {
     obj = iter->second;
+    const BText& name = obj->Name();
+    if(name[0]=='_'&&name[1]!='.') { continue; }
     if((oc.mode_==BUSERFUNMODE) && 
        (obj->Mode()==BOBJECTMODE) && 
@@ -1259 +1261 @@
     }
   }
-/*
-  for(iter=private_.begin(); iter!=private_.end(); iter++)
-  {
-    obj = iter->second;
-    if((obj->Name()[2]=='.')&&
-       (oc.mode_==BUSERFUNMODE) && 
-       (obj->Mode()==BOBJECTMODE) && 
-       (obj->Grammar()==GraCode()))
-    {
-      BUserCode* uc = (BUserCode*)obj;
-      obj = uc->Contens().Operator();
-    }
-    bool match = (obj->Grammar()==oc.grammar_) && (obj->Mode()==oc.mode_);
-    if(match)
-    {
-    //Std(BText("\n")+"  "+GetModeName(obj->Mode())+" "+obj->Grammar()->Name()+" "+obj->Name()+" matches? "+int(match));
-      lst = Cons(obj,lst);
-    }
-  }
-*/
   return(lst);
 }
@@ -1293 +1275 @@
   {
     obj = iter->second;
+    const BText& name = obj->Name();
+    if(name[0]=='_'&&name[1]!='.') { continue; }
     if((obj->Grammar()==GraNameBlock()) && (obj->Mode()==BOBJECTMODE))
     {
@@ -1299 +1283 @@
     }
   }
-/*
-  for(iter=private_.begin(); iter!=private_.end(); iter++)
-  {
-    obj = iter->second;
-    if((obj->Name()[2]=='.')&&
-       (obj->Grammar()==GraNameBlock()) && (obj->Mode()==BOBJECTMODE))
-    {
-      BUserNameBlock* unb = (BUserNameBlock*)obj;
-      lst = unb->Contens().SelectMembersDeep(lst, oc);
-    }
-  }
-*/
   return(lst);
 }