Changeset 70a78b2 in tol

Timestamp:

Mar 19, 2012, 8:52:30 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f74a7e6

Parents:

e8b0203

Message:

Fixes #1487

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

Location:

tol/btol/bgrammar

Files:

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

tol/btol/bgrammar/nameblock.cpp

@@ -1004 +1004 @@
 
 //--------------------------------------------------------------------
+static bool isSpecial(const BText& name)
+//--------------------------------------------------------------------
+{
+  return(name=="StartActions");
+}
+
+//--------------------------------------------------------------------
 bool BNameBlock::add_using_symbol(
   const BText& name,
   BObjByNameHash::const_iterator iter,
   bool usingAlsoReadOnly,
-  bool usingAlsoPrivate
+  bool usingAlsoPrivate,
+  bool usingAlsoSpecial
 )
 //--------------------------------------------------------------------
@@ -1017 +1025 @@
     if(!usingAlsoPrivate  && ((iter->first)[1]!='.')) { return(true); }
   }
+  if(!usingAlsoSpecial && isSpecial(name)) { return(true); }
   bool ok = true;
   BObjByNameHash::const_iterator found ;
@@ -1058 +1067 @@
     const BSyntaxObject* obj,
     bool usingAlsoReadOnly,
-    bool usingAlsoPrivate)
+    bool usingAlsoPrivate,
+    bool usingAlsoSpecial)
 //--------------------------------------------------------------------
 {
@@ -1084 +1094 @@
   for(iter=pbm.begin(); iter!=pbm.end(); iter++)
   {
-    ok = add_using_symbol(name, iter, false, false);
+    ok = add_using_symbol(name, iter, false, false, usingAlsoSpecial);
   }
   BObjByNameHash& prm = ns.Private();
   for(iter=prm.begin(); iter!=prm.end(); iter++)
   {
-    ok = add_using_symbol(name, iter, usingAlsoReadOnly, usingAlsoPrivate);
+    ok = add_using_symbol(name, iter, 
+     usingAlsoReadOnly, usingAlsoPrivate, usingAlsoSpecial);
   }
   return(ok);
@@ -1698 +1709 @@
       bool usingAlsoReadOnly = false;
       bool usingAlsoPrivate = false;
+      bool usingAlsoSpecial = false;
       if(lst && lst->Car())
       {
@@ -1708 +1720 @@
         lst = lst->Cdr();
       }
-      contens_ = BNameBlock::Using(uns_,usingAlsoReadOnly,usingAlsoPrivate); 
+      if(lst && lst->Car())
+      {
+        usingAlsoSpecial = Real(lst->Car())!=0.0;
+        lst = lst->Cdr();
+      }
+      contens_ = BNameBlock::Using(uns_,usingAlsoReadOnly,usingAlsoPrivate,usingAlsoSpecial); 
     }
   }
@@ -1722 +1739 @@
 
 //--------------------------------------------------------------------
-  DefExtOpr(1, BDatUsingNameBlock, "UsingNameBlock",1,3,
+  DefExtOpr(1, BDatUsingNameBlock, "UsingNameBlock",1,4,
   "NameBlock Real Real",
   "(NameBlock nameBlock [, "
     "Real usingAlsoReadOnly = False,"
-    "Real usingAlsoPrivate = False])",
+    "Real usingAlsoPrivate = False,"
+    "Real usingAlsoSpecial = False])",
   I2("In certain circumstances the public members of a NameBlock can "
      "pass to the global scope, that is to say, it is possible to "
@@ -1749 +1767 @@
      "If usingAlsoPrivate is true then private members will be "
      "also exported.\n"
+     "If usingAlsoSpecial is true then special members and methods "
+     "as StartActions of packages will be also exported.\n"
      ,
      "En determinadas circunstancias los miembros públicos de un "
@@ -1770 +1790 @@
      "también serán exportados.\n"
      "Si usingAlsoPrivate es cierto los miembros privados "
-     "también serán exportados.\n"),
+     "también serán exportados.\n"
+     "Si usingAlsoSpecial es cierto los miembros y métodos especiales "
+     "como StartActions también serán exportados.\n"),
   BOperClassify::System_);
 

tol/btol/bgrammar/tol_bnameblock.h

@@ -103 +103 @@
     const BSyntaxObject* uns,
     bool usingAlsoReadOnly,
-    bool usingAlsoPrivate);
+    bool usingAlsoPrivate,
+    bool usingAlsoSpecial);
   static void Unusing(const BSyntaxObject* uns);
   static BSyntaxObject* LocalMember(const BText& memberName);
@@ -177 +178 @@
     BObjByNameHash::const_iterator iter,
     bool usingAlsoReadOnly,
-    bool usingAlsoPrivate
+    bool usingAlsoPrivate,
+    bool usingAlsoSpecial
   );
 };