Line numbers wrong in compiled [dict get].

2 files changed, 9 insertions, 4 deletions

diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 4c4d458..8f72367 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -965,7 +965,7 @@ TclCompileDictGetCmd(
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
     Tcl_Token *tokenPtr;
-    int numWords, i;
+    int i;
     DefineLineInformation;	/* TIP #280 */
 
     /*
@@ -978,17 +978,16 @@ TclCompileDictGetCmd(
 	return TCL_ERROR;
     }
     tokenPtr = TokenAfter(parsePtr->tokenPtr);
-    numWords = parsePtr->numWords-1;
 
     /*
      * Only compile this because we need INST_DICT_GET anyway.
      */
 
-    for (i=0 ; i<numWords ; i++) {
+    for (i=1 ; i<parsePtr->numWords ; i++) {
 	CompileWord(envPtr, tokenPtr, interp, i);
 	tokenPtr = TokenAfter(tokenPtr);
     }
-    TclEmitInstInt4(INST_DICT_GET, numWords-1, envPtr);
+    TclEmitInstInt4(INST_DICT_GET, parsePtr->numWords-2, envPtr);
     TclAdjustStackDepth(-1, envPtr);
     return TCL_OK;
 }
diff --git a/tests/dict.test b/tests/dict.test
index 1b1fc31..3d86668 100644
--- a/tests/dict.test
+++ b/tests/dict.test
@@ -1881,6 +1881,12 @@ test dict-23.5 {CompileWord OBOE} {
     apply {{} {tcl::dict::incr foo \
 	[format bar]}}
 } {bar 1}
+test dict-23.6 {CompileWord OBOE} {
+    apply {n {
+	dict get {a b} {*}{
+	} [return [incr n -[linenumber]]]
+    }} [linenumber]
+} 1
 
 rename linenumber {}
 test dict-24.22 {dict map results (non-compiled)} {