Changeset 6e30ee1 in tol

Timestamp:

Jan 23, 2009, 11:35:13 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

1f5af94

Parents:

3ac3a3f

Message:

New methods to make a list of selected members in plain (SelectMembers) and recursive (SelectMembersDeep) modes

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

Location:

tol/btol/bgrammar

Files:

• nameblock.cpp (modified) (3 diffs)
• tol_bnameblock.h (modified) (1 diff)

tol/btol/bgrammar/nameblock.cpp

@@ -107 +107 @@
 //--------------------------------------------------------------------
 {
+  static BText currentFullName = "";
   const BText& name = BEqualOperator::CreatingName();
 //Std(BText("BNameBlock::EvaluateTree:\n")+BParser::treWrite((List*)tre,"  "));
   BBool hasName = name.HasName();
   BText fullName = name;
-  if(BNameBlock::current_ && hasName) 
-  {
-    fullName = BNameBlock::current_->Name()+"::"+name; 
-  }
+  BText oldFullName = currentFullName;
+  if(hasName) 
+  {
+    if(currentFullName.HasName())
+    {
+      fullName = currentFullName+"::"+name; 
+    }
+    currentFullName = fullName;
+  }
+  BUserNameBlock* ns_result = NULL;
   BSyntaxObject* result = NULL;
   int level = BGrammar::Level();
@@ -138 +145 @@
           I2("Current NameBlock is ",
              "El NameBlock en curso es ")+BNameBlock::current_->Name()));
-    return(NULL);
-  }
-//const BNameBlock* oldNameBlock = BNameBlock::current_;
-  BUserNameBlock* ns_result = new BGraContensP<BNameBlock>(new BNameBlock);
-  BNameBlock& newNameBlock  = ns_result->Contens();
-  newNameBlock.PutName(fullName);
-//BNameBlock::current_ = &newNameBlock;
-  int oldErr = (int)TOLErrorNumber().Value();
-  BGrammar::IncLevel();
-  int stackPos = BGrammar::StackSize();
-  BSyntaxObject* set_result = GraSet()->EvaluateTree(tre);
-  BGrammar::DestroyStackUntil(stackPos, set_result);
-  BGrammar::DecLevel();
-  int numErr = (int)TOLErrorNumber().Value()-oldErr;
-  if(!set_result || (set_result->Grammar()!=GraSet()))
-  {
-    DESTROY(set_result);
-    DESTROY(ns_result);
-  }
-  if(set_result)
-  {
-    BUserSet* uSet = USet(set_result);
-    if(!newNameBlock.Fill(uSet->Contens()))
+  }
+  else
+  {
+  //const BNameBlock* oldNameBlock = BNameBlock::current_;
+    ns_result = new BGraContensP<BNameBlock>(new BNameBlock);
+    BNameBlock& newNameBlock  = ns_result->Contens();
+    newNameBlock.PutName(fullName);
+  //BNameBlock::current_ = &newNameBlock;
+    int oldErr = (int)TOLErrorNumber().Value();
+    BGrammar::IncLevel();
+    int stackPos = BGrammar::StackSize();
+    BSyntaxObject* set_result = GraSet()->EvaluateTree(tre);
+    BGrammar::DestroyStackUntil(stackPos, set_result);
+    BGrammar::DecLevel();
+    int numErr = (int)TOLErrorNumber().Value()-oldErr;
+    if(!set_result || (set_result->Grammar()!=GraSet()))
     {
       DESTROY(set_result);
       DESTROY(ns_result);
     }
-  }
-//BNameBlock::current_ = oldNameBlock;
-  if(!set_result)
-  {
-    Error(I2("Cannot build NameBlock ",
-             "No se puede contruir el NameBlock  ")+name);
-    bool assigned = (ns_result && (ns_result->IsAssigned()==1));
-    if(assigned) { DESTROY(ns_result); }
-  }
-  else 
-  {
-    if(numErr)
-    {
-      Warning(BText("NameBlock ")+name+" "+
-              I2("has been built with",
-                 "se ha construido con") + " "+numErr+" "+
-              I2("errors.","errores."));
-    }
-    DESTROY(set_result);
-  }
+    if(set_result)
+    {
+      BUserSet* uSet = USet(set_result);
+      if(!newNameBlock.Fill(uSet->Contens()))
+      {
+        DESTROY(set_result);
+        DESTROY(ns_result);
+      }
+    }
+  //BNameBlock::current_ = oldNameBlock;
+    if(!set_result)
+    {
+      Error(I2("Cannot build NameBlock ",
+               "No se puede contruir el NameBlock  ")+name);
+      bool assigned = (ns_result && (ns_result->IsAssigned()==1));
+      if(assigned) { DESTROY(ns_result); }
+    }
+    else 
+    {
+      if(numErr)
+      {
+        Warning(BText("NameBlock ")+name+" "+
+                I2("has been built with",
+                   "se ha construido con") + " "+numErr+" "+
+                I2("errors.","errores."));
+      }
+      DESTROY(set_result);
+    }
+  }
+  currentFullName = oldFullName;
   return(ns_result);
 }
@@ -444 +454 @@
   }
 }
+
+//--------------------------------------------------------------------
+  BList* BNameBlock::SelectMembers(BList* lst, const BObjClassify&  oc)
+//--------------------------------------------------------------------
+{
+//Std(BText("\n")+"BNameBlock::SelectMembers Exploring NameBlock "+Name());
+  BSyntaxObject* obj;
+  BObjByNameHash::const_iterator iter;
+//Std(BText("\n")+" Seaching for "+GetModeName(oc.mode_)+" "+oc.grammar_->Name());
+  for(iter=public_.begin(); iter!=public_.end(); iter++)
+  {
+    obj = iter->second;
+    if((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);
+}
+
+//--------------------------------------------------------------------
+  BList* BNameBlock::SelectMembersDeep(BList* lst, const BObjClassify&  oc)
+//--------------------------------------------------------------------
+{
+//Std(BText("\n")+"BNameBlock::SelectMembersDeep Exploring NameBlock "+Name());
+  lst = SelectMembers(lst, oc);
+  BSyntaxObject* obj;
+  BObjByNameHash::const_iterator iter;
+  for(iter=public_.begin(); iter!=public_.end(); iter++)
+  {
+    obj = iter->second;
+    if((obj->Grammar()==GraNameBlock()) && (obj->Mode()==BOBJECTMODE))
+    {
+      BUserNameBlock* unb = (BUserNameBlock*)obj;
+      lst = unb->Contens().SelectMembersDeep(lst, oc);
+    }
+  }
+  return(lst);
+}
+
 
 //--------------------------------------------------------------------

tol/btol/bgrammar/tol_bnameblock.h

@@ -131 +131 @@
   BSyntaxObject* PublicMember (const BText& memberName) const;
   BSyntaxObject* PrivateMember(const BText& memberName) const;
+  BList* SelectMembers(BList* lst, const BObjClassify&  oc);
+  BList* SelectMembersDeep(BList* lst, const BObjClassify&  oc);
 
   DeclareClassNewDelete(BNameBlock);