From 6e6e7b2c773fb61f034c68c04bf90e48cacce161 Mon Sep 17 00:00:00 2001
From: Miguel Sofer <miguel.sofer@gmail.com>
Date: Wed, 3 Dec 2014 13:22:53 +0000
Subject: adding a test for the bug

---
 tests/compile.test | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/compile.test b/tests/compile.test
index 22ebc7d..8150622 100644
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -455,14 +455,22 @@ test compile-13.1 {testing underestimate of maxStackSize in list cmd} {exec} {
     list [catch {exec [interpreter] << $script} msg] $msg
 } {0 OK}
 
-# Special test for compiling tokens from a copy of the source string. [Bug
-# 599788]
+# Tests compile-14.* for compiling tokens from a copy of the source string. 
+# [Bug 599788] [Bug 0c043a175a47da8c2342]
 test compile-14.1 {testing errors in element name; segfault?} {} {
      catch {set a([error])} msg1
      catch {set bubba([join $abba $jubba]) $vol} msg2
      list $msg1 $msg2
 } {{wrong # args: should be "error message ?errorInfo? ?errorCode?"} {can't read "abba": no such variable}}
 
+test compile-14.2 {testing element name "$"} -body {
+    unset a
+    set a() 1
+    set a($) 2
+    list [set a()] [set a($)] [unset a(); lindex [array names a] 0]
+} -cleanup {unset a} -result {1 2 $}
+
+
 # Tests compile-15.* cover Tcl Bug 633204
 test compile-15.1 {proper TCL_RETURN code from [return]} {
     apply {{} {catch return}}
-- 
cgit v0.12


From 3e76a216e3a989a6dbaefd832a0a2dc795672e2e Mon Sep 17 00:00:00 2001
From: Miguel Sofer <miguel.sofer@gmail.com>
Date: Wed, 3 Dec 2014 23:17:16 +0000
Subject: test and fix (thx dgp)

---
 generic/tclCompCmds.c | 2 +-
 tests/compile.test    | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 18f4564..4e7ef97 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -3373,7 +3373,7 @@ TclPushVarName(
 	    nameChars = p - varTokenPtr[1].start;
 	    elName = p + 1;
 	    remainingChars = (varTokenPtr[2].start - p) - 1;
-	    elNameChars = (varTokenPtr[n].start-p) + varTokenPtr[n].size - 2;
+	    elNameChars = (varTokenPtr[n].start-p) + varTokenPtr[n].size - 1;
 
 	    if (remainingChars) {
 		/*
diff --git a/tests/compile.test b/tests/compile.test
index 8150622..45d69e9 100644
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -464,11 +464,12 @@ test compile-14.1 {testing errors in element name; segfault?} {} {
 } {{wrong # args: should be "error message ?errorInfo? ?errorCode?"} {can't read "abba": no such variable}}
 
 test compile-14.2 {testing element name "$"} -body {
-    unset a
+    unset -nocomplain a
     set a() 1
-    set a($) 2
-    list [set a()] [set a($)] [unset a(); lindex [array names a] 0]
-} -cleanup {unset a} -result {1 2 $}
+    set a(1) 2 
+    set a($) 3
+    list [set a()] [set a(1)] [set a($)] [unset a(); lindex [array names a] 0]
+} -cleanup {unset a} -result [list 1 2 3 {$}]
 
 
 # Tests compile-15.* cover Tcl Bug 633204
-- 
cgit v0.12