summaryrefslogtreecommitdiffstats
path: root/generic/tclCompile.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-06-25 15:01:31 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-06-25 15:01:31 (GMT)
commit8b2bced1ffad549c34ddbc5e95a5eaeed7197058 (patch)
treee4e0c2aaf35699214ceeb52f81da4ed8675dab9c /generic/tclCompile.c
parent0e6dbfcf9977281189ce5a639d1ea673a6a29eda (diff)
parentedc81d994ec2f31a92dec97ec8dd28d5de990c93 (diff)
downloadtcl-8b2bced1ffad549c34ddbc5e95a5eaeed7197058.zip
tcl-8b2bced1ffad549c34ddbc5e95a5eaeed7197058.tar.gz
tcl-8b2bced1ffad549c34ddbc5e95a5eaeed7197058.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclCompile.c')
-rw-r--r--generic/tclCompile.c8
1 files changed, 3 insertions, 5 deletions
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);
}
}