Merge pull request #2629 from masatake/tcl-var-recognition

Tcl: strict the way to recognize variable expansions

Units/parser-tcl.r/dollar-in-regex.d/expected.tags

@@ -0,0 +1,4 @@
+proc1	input.tcl	/^proc proc1 {} {$/;"	p
+proc2	input.tcl	/^proc proc2 {} {}$/;"	p
+proc3	input.tcl	/^proc proc3 {} {$/;"	p
+proc4	input.tcl	/^proc proc4 {} {}$/;"	p

Units/parser-tcl.r/dollar-in-regex.d/input.tcl

@@ -0,0 +1,17 @@
+# Taken from #2627 submitted by @surmish
+proc proc1 {} {
+  if {[regexp {[0-9]$} ""]} {
+    echo "matched"
+  }
+}
+
+proc proc2 {} {}
+
+proc proc3 {} {
+    set abc "hello"
+    puts ${abc}
+}
+
+proc proc4 {} {}
+
+proc3

Units/parser-tcl.r/escaping.d/expected.tags

@@ -0,0 +1,2 @@
+proc1	input.tcl	/^proc proc1 {} {$/;"	p
+proc2	input.tcl	/^proc proc2  {} {}$/;"	p

Units/parser-tcl.r/escaping.d/input.tcl

@@ -0,0 +1,6 @@
+# Taken from a comment in #2627 submitted by @surmish.
+proc proc1 {} {
+  expr {[string first "\\" $varName]==0}
+}
+
+proc proc2  {} {}

parsers/tcl.c

@@ -148,8 +148,13 @@ static void readString (vString *string)
 		case EOF:
 			return;
 		case '\\':
-			vStringPut (string, c);
-			escaped = true;
+			if (escaped)
+			{
+				vStringPut (string, c);
+				escaped = false;
+			}
+			else
+				escaped = true;
 			break;
 		case '"':
 			vStringPut (string, c);
@@ -283,19 +288,23 @@ static void readToken0 (tokenInfo *const token, struct sTclParserState *pstate)
 			if (c0 == EOF)
 				break;
 
-			tokenPutc (token, c0);
 			if (c0 == '{')
 			{
-
+				tokenPutc (token, c0);
 				while ((c0 = getcFromInputFile ()) != EOF)
 				{
 					tokenPutc (token, c0);
 					if (c0 == '}')
 						break;
 				}
 			}
-			else
+			else if (isalnum (c0))
+			{
+				tokenPutc (token, c0);
 				readIdentifier (token->string);
+			}
+			else
+				ungetcToInputFile (c0);
 			break;
 		}
 	default: