Fix a dict sugar parse bug with backslashed chars

Signed-off-by: Steve Bennett <steveb@workware.net.au>

2 files changed, 64 insertions, 8 deletions

diff --git a/jim.c b/jim.c
index feabf25..ca090e6 100644
--- a/jim.c
+++ b/jim.c
@@ -1339,28 +1339,34 @@ static int JimParseVar(struct JimParserCtx *pc)
         /* Parse [dict get] syntax sugar. */
         if (*pc->p == '(') {
             int count = 1;
+            const char *paren = NULL;
 
             while (count && pc->len) {
                 pc->p++;
                 pc->len--;
-                if (*pc->p == '\\' && pc->len >= 2) {
-                    pc->p += 2;
-                    pc->len -= 2;
+                if (*pc->p == '\\' && pc->len >= 1) {
+                    pc->p++;
+                    pc->len--;
                 }
                 else if (*pc->p == '(') {
                     count++;
                 }
                 else if (*pc->p == ')') {
+                    paren = pc->p;
                     count--;
                 }
             }
-            ttype = (*pc->tstart == '(') ? JIM_TT_EXPRSUGAR : JIM_TT_DICTSUGAR;
             if (count == 0) {
-                if (*pc->p != '\0') {
-                    pc->p++;
-                    pc->len--;
-                }
+                pc->p++;
+                pc->len--;
             }
+            else if (paren) {
+                /* Did not find a matching paren. Back up */
+                paren++;
+                pc->len += (pc->p - paren);
+                pc->p = paren;
+            }
+            ttype = (*pc->tstart == '(') ? JIM_TT_EXPRSUGAR : JIM_TT_DICTSUGAR;
         }
         pc->tend = pc->p - 1;
     }
diff --git a/tests/parse.test b/tests/parse.test
index 870d4ff..d8e6035 100644
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -256,4 +256,54 @@ test parse-1.50 "backslash newline in quotes" {
 def"
 } "abc def"
 
+test parse-1.51 "special chars in dict sugar" {
+	unset -nocomplain a
+	set a(x$) 5
+	array names a
+} {{x$}}
+
+test parse-1.52 "special chars in dict sugar" {
+	set x $a(x$)
+} 5
+
+test parse-1.53 "special chars in dict sugar" {
+	unset -nocomplain a
+	set a(x\[) 5
+	array names a
+} {{x[}}
+
+test parse-1.52 "special chars in dict sugar" {
+	set x $a(x\[)
+} 5
+
+test parse-1.53 "special chars in dict sugar" {
+	unset -nocomplain a
+	set a(x\() 5
+	array names a
+} {x(}
+
+test parse-1.52 "special chars in dict sugar" {
+	set x $a(x\()
+} 5
+
+test parse-1.53 "special chars in dict sugar" {
+	unset -nocomplain a
+	set a(x() 5
+	array names a
+} {x(}
+
+test parse-1.52 "special chars in dict sugar" {
+	set x $a(x()
+} 5
+
+test parse-1.53 "special chars in dict sugar" {
+	unset -nocomplain a
+	set a(x") 5
+	lindex [array names a] 0
+} {x"}
+
+test parse-1.52 "special chars in dict sugar" {
+	set x $a(x")
+} 5
+
 testreport