diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-06-25 15:01:31 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-06-25 15:01:31 (GMT) |
| commit | 8b2bced1ffad549c34ddbc5e95a5eaeed7197058 (patch) | |
| tree | e4e0c2aaf35699214ceeb52f81da4ed8675dab9c | |
| parent | 0e6dbfcf9977281189ce5a639d1ea673a6a29eda (diff) | |
| parent | edc81d994ec2f31a92dec97ec8dd28d5de990c93 (diff) | |
| download | tcl-8b2bced1ffad549c34ddbc5e95a5eaeed7197058.zip tcl-8b2bced1ffad549c34ddbc5e95a5eaeed7197058.tar.gz tcl-8b2bced1ffad549c34ddbc5e95a5eaeed7197058.tar.bz2 | |
merge trunk
| -rw-r--r-- | generic/tclCompExpr.c | 3 | ||||
| -rw-r--r-- | generic/tclCompile.c | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c index efdc2b0..2a48117 100644 --- a/generic/tclCompExpr.c +++ b/generic/tclCompExpr.c @@ -2486,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: diff --git a/generic/tclCompile.c b/generic/tclCompile.c index eafecbc..01320cf 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -2059,8 +2059,7 @@ TclCompileScript( * The word is not a simple string of characters. */ - TclCompileTokens(interp, tokenPtr+1, - tokenPtr->numComponents, envPtr); + CompileTokens(envPtr, tokenPtr, interp); if (expand && tokenPtr->type == TCL_TOKEN_EXPAND_WORD) { TclEmitInstInt4(INST_EXPAND_STKTOP, envPtr->currStackDepth, envPtr); @@ -2702,7 +2701,7 @@ TclCompileExprWords( wordPtr = tokenPtr; for (i = 0; i < numWords; i++) { - TclCompileTokens(interp, wordPtr+1, wordPtr->numComponents, envPtr); + CompileTokens(envPtr, wordPtr, interp); if (i < (numWords - 1)) { PushStringLiteral(envPtr, " "); } @@ -2754,8 +2753,7 @@ TclCompileNoOp( tokenPtr = tokenPtr + tokenPtr->numComponents + 1; if (tokenPtr->type != TCL_TOKEN_SIMPLE_WORD) { - TclCompileTokens(interp, tokenPtr+1, tokenPtr->numComponents, - envPtr); + CompileTokens(envPtr, tokenPtr, interp); TclEmitOpcode(INST_POP, envPtr); } } |