Line numbers wrong in compiled [unset].

1 files changed, 7 insertions, 7 deletions

diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index d1eb9db..6c55e2e 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -2814,26 +2814,26 @@ TclCompileUnsetCmd(
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
     Tcl_Token *varTokenPtr;
-    int isScalar, localIndex, numWords, flags, i;
+    int isScalar, localIndex, flags, i;
     Tcl_Obj *leadingWord;
     DefineLineInformation;	/* TIP #280 */
 
     /* TODO: Consider support for compiling expanded args. */
-    numWords = parsePtr->numWords-1;
     flags = 1;
+    i = 1;
     varTokenPtr = TokenAfter(parsePtr->tokenPtr);
     leadingWord = Tcl_NewObj();
-    if (numWords > 0 && TclWordKnownAtCompileTime(varTokenPtr, leadingWord)) {
+    if (parsePtr->numWords > 1 && TclWordKnownAtCompileTime(varTokenPtr, leadingWord)) {
 	int len;
 	const char *bytes = Tcl_GetStringFromObj(leadingWord, &len);
 
 	if (len == 11 && !strncmp("-nocomplain", bytes, 11)) {
 	    flags = 0;
 	    varTokenPtr = TokenAfter(varTokenPtr);
-	    numWords--;
+	    i++;
 	} else if (len == 2 && !strncmp("--", bytes, 2)) {
 	    varTokenPtr = TokenAfter(varTokenPtr);
-	    numWords--;
+	    i++;
 	}
     } else {
 	/*
@@ -2846,7 +2846,7 @@ TclCompileUnsetCmd(
     }
     TclDecrRefCount(leadingWord);
 
-    for (i=0 ; i<numWords ; i++) {
+    for ( ; i<parsePtr->numWords ; i++) {
 	/*
 	 * Decide if we can use a frame slot for the var/array name or if we
 	 * need to emit code to compute and push the name at runtime. We use a
@@ -2856,7 +2856,7 @@ TclCompileUnsetCmd(
 	 */
 
 	PushVarNameWord(interp, varTokenPtr, envPtr, 0,
-		&localIndex, &isScalar, 1);
+		&localIndex, &isScalar, i);
 
 	/*
 	 * Emit instructions to unset the variable.