summaryrefslogtreecommitdiffstats
path: root/generic/tclCompCmds.c
diff options
context:
space:
mode:
authordonal.k.fellows@manchester.ac.uk <dkf>2013-01-03 14:07:24 (GMT)
committerdonal.k.fellows@manchester.ac.uk <dkf>2013-01-03 14:07:24 (GMT)
commit830a18d4d8114998c98667bceaa37e2f084503ff (patch)
tree54dad526f36acf29f43fabc0987a1a640026950d /generic/tclCompCmds.c
parentbc87bbb4d9b94ea5b2716adde55d18f632b82768 (diff)
parentec27f9439e22b89d891eda22d06f2840aafbcb10 (diff)
downloadtcl-830a18d4d8114998c98667bceaa37e2f084503ff.zip
tcl-830a18d4d8114998c98667bceaa37e2f084503ff.tar.gz
tcl-830a18d4d8114998c98667bceaa37e2f084503ff.tar.bz2
merge main dev branch
Diffstat (limited to 'generic/tclCompCmds.c')
-rw-r--r--generic/tclCompCmds.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 917fd20..67f92b0 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -5791,7 +5791,7 @@ TclCompileVariableCmd(
*/
valueTokenPtr = parsePtr->tokenPtr;
- for (i=2; i<=numWords; i+=2) {
+ for (i=1; i<numWords; i+=2) {
varTokenPtr = TokenAfter(valueTokenPtr);
valueTokenPtr = TokenAfter(varTokenPtr);
@@ -5801,15 +5801,15 @@ TclCompileVariableCmd(
return TCL_ERROR;
}
- CompileWord(envPtr, varTokenPtr, interp, 1);
+ CompileWord(envPtr, varTokenPtr, interp, i);
TclEmitInstInt4( INST_VARIABLE, localIndex, envPtr);
- if (i != numWords) {
+ if (i+1 < numWords) {
/*
* A value has been given: set the variable, pop the value
*/
- CompileWord(envPtr, valueTokenPtr, interp, 1);
+ CompileWord(envPtr, valueTokenPtr, interp, i+1);
Emit14Inst( INST_STORE_SCALAR, localIndex, envPtr);
TclEmitOpcode( INST_POP, envPtr);
}