Changeset 990c4f3 in tol

Timestamp:

Apr 8, 2009, 7:46:45 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

4c00cc7

Parents:

1737efa

Message:

Allowing multiple use of :: in GetLeft
Warning of local variables hiding members
Fixed bug in currentFullName_ recovering

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

File:

• tol/btol/bgrammar/oprimp.cpp (modified) (9 diffs)

tol/btol/bgrammar/oprimp.cpp

@@ -539 +539 @@
   str=NULL;
   cls = NULL;
+  rest = NULL;
   if((tok->TokenType() == TYPE))
   {
@@ -568 +569 @@
   else if((tok->TokenType()==BINARY)&&(tok->Name()=="::"))
   {
+  //BText expr = BParser::Unparse(left);
+  //Std(BText("Unparse(left)=\n")<<BParser::Unparse(left)+"\n");
     List* nbLst = Tree::treLeft(left);
-    BToken* nbTok = BParser::treToken(nbLst);
-    const BText& nbName = nbTok->Name();
-    BUserNameBlock* unb = (BUserNameBlock*)GraNameBlock()->FindOperand(nbName,false);
+  //Std(BText("Unparse(nbLst)=\n")<<BParser::Unparse(nbLst)+"\n");
+    BUserNameBlock* unb = (BUserNameBlock*)GraNameBlock()->LeftEvaluateTree(nbLst);
     if(unb)
     {
@@ -672 +674 @@
     {
       TRACE_SHOW_MEDIUM(fun," 6");
-      result = BGrammar::FindLocal(name);
-      TRACE_SHOW_MEDIUM(fun," 7");
-      if(result && (result->Level()!=level)) { result = NIL; }
+
+      if(!BEqualOperator::CreatingName().HasName())
+      {
+        result = BNameBlock::LocalMember(name); 
+        if(result && result->NameBlock())
+        {
+          Warning(I2("Local variable","La variable local")+
+                  " "+gra->Name()+" "+name+" "+
+                  I2("hides published NameBlock member",
+                     "oculta el miembro de NameBlock publicado")+
+                  " "+result->FullName());
+          BUserFunction::ShowCallStack();
+          result = NULL; 
+        }
+      }
+      if(!result) 
+      { 
+        result = BGrammar::FindLocal(name); 
+        TRACE_SHOW_MEDIUM(fun," 7");
+        if(result && (result->Level()!=level)) { result = NIL; }
+      }
     } 
-    else result = gra->FindVariable(name);
-    if(result && result->NameBlock())
-    {
-      Warning(I2("Global variable","La variable global")+
-              " "+gra->Name()+" "+name+" "+
-              I2("hides published NameBlock member",
-                 "oculta el miembro de NameBlock publicado")+
-              " "+result->FullName());
-      result = NULL;
+    else 
+    {
+      result = gra->FindVariable(name);
+      if(result && result->NameBlock())
+      {
+        Warning(I2("Global variable","La variable global")+
+                " "+gra->Name()+" "+name+" "+
+                I2("hides published NameBlock member",
+                   "oculta el miembro de NameBlock publicado")+
+                " "+result->FullName());
+        result = NULL;
+      }
     }
     if(result) // send an error messages
@@ -691 +714 @@
       BText functionName = "";
       BText functionPath = "";
-      BText sentence = result->Description();
+      BText sentence = result->FullName() + " " +result->Description();
 #     ifdef WINDOWS
       path += BText("\n")+SysPath(path);
@@ -711 +734 @@
                 I2("' already defined as ",
                    "' ya definida como \"") + sentence + "\"\n");
-        } 
+          } 
         else 
         {
@@ -844 +867 @@
     {
       currentFullName_ = currentFullName_ + "::" +name;
+    //Std(BText("\nTRACE currentFullName_ <- ")<<currentFullName_+"\n");
     }
     else
     {
       currentFullName_ = name;
+    //Std(BText("\nTRACE currentFullName_ <- ")<<currentFullName_+"\n");
     }
     creatingClass_ = cls;
@@ -853 +878 @@
   if(!rest && gra) 
   {
-    if(defInst)
-    {
-            result = CreateObject(left, gra, name);
-    }
-    else
-    {
-            result = CreateObject(left, gra, name);
-    }
+    result = CreateObject(left, gra, name);
     if(str && result)
     {
@@ -887 +905 @@
   if(isNameBlock) 
   { 
-    currentFullName_ = currentFatherName_;
+    currentFullName_ = oldFullName;
+  //Std(BText("\nTRACE currentFullName_ <- ")<<currentFullName_+"\n");
     creatingName_    = oldName; 
     creatingClass_   = oldClass;
@@ -1425 +1444 @@
     BStruct*  str  = NIL;
     BClass*   cls  = NIL;
+    bool carIsList = dec->car()->IsListClass();
+    List* decLst = carIsList?Tree::treNode((List*) dec):(List*)dec;
     BGrammar* gra  = GetLeft
     (
-      NIL, Tree::treNode(dec),
+      NIL, decLst,
       names_[n], rest, str, cls
     );