Changeset 40ab5b3 in tol

Timestamp:

Sep 22, 2009, 2:10:05 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

e12a62e

Parents:

3139bb3

Message:

BStandardOperator::EvaluateArgument must restore old value of evaluatingFunctionArgument_

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

File:

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

tol/btol/bgrammar/oprimp.cpp

@@ -1184 +1184 @@
 //--------------------------------------------------------------------
 {
+  bool oldEvFunArg = evaluatingFunctionArgument_; 
   evaluatingFunctionArgument_ = true;
+//Std(BText("\nBStandardOperator::EvaluateArgument ")+Name()+
+//    " starting evaluatingFunctionArgument_="+int(evaluatingFunctionArgument_));
   BText oldCreatingName = BEqualOperator::creatingName_;
   BText oldCreatingFullName = BEqualOperator::currentFullName_;
@@ -1195 +1198 @@
   BEqualOperator::currentFullName_ =  oldCreatingFullName;
   BEqualOperator::creatingClass_ = oldCreatinClass;
-  evaluatingFunctionArgument_ = false;
+  evaluatingFunctionArgument_ = oldEvFunArg;
+//Std(BText("\nBStandardOperator::EvaluateArgument ")+Name()+
+//    " ending evaluatingFunctionArgument_="+int(evaluatingFunctionArgument_));
   return(var);
 }
@@ -1284 +1289 @@
           BGrammar* g = GrammarForArg(n,k);
           BGrammar::PutLast(g);
-          evaluatingFunctionArgument_ = true;
           var = EvaluateArgument(g,b);
           if(!var) { BGrammar::CleanTreeCache(b, true); }