diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-08-14 18:44:51 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-08-14 18:44:51 (GMT) |
| commit | 1f563ae9a011345574fb277fe6e8eb7f58916981 (patch) | |
| tree | 91e5021d194cf249b14156bcd8d1560dce949c2c /generic/tclCompExpr.c | |
| parent | 6f7f64c938f98f268b7e606cf668c40ca66e98c9 (diff) | |
| parent | 2b3657769b1d0b9ae6e10113b1d3c038b4967899 (diff) | |
| download | tcl-1f563ae9a011345574fb277fe6e8eb7f58916981.zip tcl-1f563ae9a011345574fb277fe6e8eb7f58916981.tar.gz tcl-1f563ae9a011345574fb277fe6e8eb7f58916981.tar.bz2 | |
merge trunkbug_3610404
Diffstat (limited to 'generic/tclCompExpr.c')
| -rw-r--r-- | generic/tclCompExpr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c index 3597abe..2a48117 100644 --- a/generic/tclCompExpr.c +++ b/generic/tclCompExpr.c @@ -2401,6 +2401,7 @@ CompileExprTree( (nodePtr->lexeme == AND) ? "1" : "0", 1), envPtr); TclEmitForwardJump(envPtr, TCL_UNCONDITIONAL_JUMP, &jumpPtr->next->next->jump); + TclAdjustStackDepth(-1, envPtr); TclFixupForwardJumpToHere(envPtr, &jumpPtr->next->jump, 127); if (TclFixupForwardJumpToHere(envPtr, &jumpPtr->jump, 127)) { jumpPtr->next->next->jump.codeOffset += 3; @@ -2485,8 +2486,7 @@ CompileExprTree( break; } case OT_TOKENS: - TclCompileTokens(interp, tokenPtr+1, tokenPtr->numComponents, - envPtr); + CompileTokens(envPtr, tokenPtr, interp); tokenPtr += tokenPtr->numComponents + 1; break; default: |