summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tclCompExpr.c3
-rw-r--r--generic/tclExecute.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index 593de97..b7e3404 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCompExpr.c,v 1.77 2007/08/16 19:19:50 dgp Exp $
+ * RCS: @(#) $Id: tclCompExpr.c,v 1.78 2007/08/22 14:04:16 dgp Exp $
*/
#include "tclInt.h"
@@ -587,6 +587,7 @@ ParseExpr(
nodes->lexeme = START;
nodes->precedence = prec[START];
nodes->mark = MARK_RIGHT;
+ nodes->constant = 1;
incomplete = lastParsed = nodesUsed;
nodesUsed++;
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index d61131e..99d7144 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclExecute.c,v 1.320 2007/08/22 13:30:45 msofer Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.321 2007/08/22 14:04:16 dgp Exp $
*/
#include "tclInt.h"
@@ -1731,9 +1731,7 @@ TclExecuteByteCode(
}
case INST_PUSH1:
-#if !TCL_COMPILE_DEBUG
instPush1Peephole:
-#endif
PUSH_OBJECT(codePtr->objArrayPtr[TclGetUInt1AtPtr(pc+1)]);
TRACE_WITH_OBJ(("%u => ", TclGetInt1AtPtr(pc+1)), OBJ_AT_TOS);
pc += 2;