Changeset c5f245d in tol

Timestamp:

Mar 3, 2009, 9:44:32 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

936e243

Parents:

46c93bf

Message:

Separating NameBlock father from current that is used for scope rules.
Themes related to father and full name are now solved in operator = (BEqualOperator::Evaluate)

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

File:

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

tol/btol/bgrammar/oprimp.cpp

@@ -51 +51 @@
 BTraceInit("oprimp.cpp");
 
-      BText   BEqualOperator::creatingName_;
+BText BEqualOperator::creatingName_;
+BText BEqualOperator::currentFatherName_;
+bool   BEqualOperator::isCreatingNameBlock_= false;
+BText BEqualOperator::currentFullName_;
 const BClass* BEqualOperator::creatingClass_ = NULL;
 
@@ -812 +815 @@
                           name, rest, str, cls);
   creatingClass_ = NULL;
-  if(gra==GraNameBlock()) 
+  bool oldIsCreatingNameBlock = isCreatingNameBlock_;
+  bool isNameBlock = gra==GraNameBlock();
+  isCreatingNameBlock_ = isNameBlock;
+
+  BText oldName, oldFullName;
+  const BClass* oldClass;
+  if(isNameBlock) 
   { 
+    oldFullName = currentFullName_;
+    currentFatherName_ = oldFullName;
+    oldName = creatingName_;
+    oldClass = creatingClass_;
     creatingName_  = name; 
+    if(currentFullName_.HasName())
+    {
+      currentFullName_ = currentFullName_ + "::" +name;
+    }
+    else
+    {
+      currentFullName_ = name;
+    }
     creatingClass_ = cls;
   }
@@ -843 +864 @@
           Error(I2("Bad use for \"=\" in\n", "Uso indebido de \"=\" en\n") +
                 BParser::Unparse(argList));
+  }
+  if(isNameBlock) 
+  { 
+    currentFullName_ = currentFatherName_;
+    creatingName_    = oldName; 
+    creatingClass_   = oldClass;
+    isCreatingNameBlock_ = oldIsCreatingNameBlock;
   }
   return(result);