Changeset 42033f3 in tol

Timestamp:

Jan 21, 2009, 1:27:04 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

804f404

Parents:

a6201a5

Message:

fixing some problems in NameBlock

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

File:

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

tol/btol/bgrammar/nameblock.cpp

@@ -109 +109 @@
   const BText& name = BEqualOperator::CreatingName();
 //Std(BText("BNameBlock::EvaluateTree:\n")+BParser::treWrite((List*)tre,"  "));
+  BBool hasName = name.HasName();
   BText fullName = name;
-  if(BNameBlock::current_) 
+  if(BNameBlock::current_ && hasName) 
   {
     fullName = BNameBlock::current_->Name()+"::"+name; 
@@ -116 +117 @@
   BSyntaxObject* result = NULL;
   int level = BGrammar::Level();
-  if(level>0) 
+  if((level>0) && hasName)
   {
     result = BGrammar::FindLocal(name);
@@ -136 +137 @@
              " ya está siendo usado\n")+ ((!BNameBlock::current_)?"":
           I2("Current NameBlock is ",
-             "El NamSpace en curso es ")+BNameBlock::current_->Name()));
+             "El NameBlock en curso es ")+BNameBlock::current_->Name()));
     return(NULL);
   }
-  
-  const BNameBlock* oldNameBlock = BNameBlock::current_;
+//const BNameBlock* oldNameBlock = BNameBlock::current_;
   BUserNameBlock* ns_result = new BGraContensP<BNameBlock>(new BNameBlock);
   BNameBlock& newNameBlock  = ns_result->Contens();
   newNameBlock.PutName(fullName);
-  BNameBlock::current_ = &newNameBlock;
+//BNameBlock::current_ = &newNameBlock;
   int oldErr = (int)TOLErrorNumber().Value();
   BGrammar::IncLevel();
   int stackPos = BGrammar::StackSize();
   BSyntaxObject* set_result = GraSet()->EvaluateTree(tre);
-  BGrammar::DestroyStackUntil(stackPos, 0);
+  BGrammar::DestroyStackUntil(stackPos, set_result);
   BGrammar::DecLevel();
   int numErr = (int)TOLErrorNumber().Value()-oldErr;
@@ -166 +166 @@
     }
   }
-  BNameBlock::current_ = oldNameBlock;
+//BNameBlock::current_ = oldNameBlock;
   if(!set_result)
   {