Escaping in strings.

corywalker · Jul 23, 2017 · 15e98a5 · 15e98a5
1 parent cc073ae
commit 15e98a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/expreduce/tokenizer.go b/expreduce/tokenizer.go
@@ -639,7 +639,12 @@ yyrule5: // {S}
 	{
 
 		tmps := string(y.buf)
-		lval.val = &String{tmps[1 : len(tmps)-1]}
+		tmps = tmps[1 : len(tmps)-1]
+		// Handle some escape characters
+		tmps = strings.Replace(tmps, "\\\"", "\"", -1)
+		tmps = strings.Replace(tmps, "\\n", "\n", -1)
+		tmps = strings.Replace(tmps, "\\t", "\t", -1)
+		lval.val = &String{tmps}
 		return STRING
 	}
 yyrule6: // \(

diff --git a/expreduce/tokenizer.l b/expreduce/tokenizer.l
@@ -97,7 +97,12 @@ comment         "(*"([^*\x80]|\*+[^*)\x80])*\*+\)
 
 {S}
     tmps := string(y.buf)
-    lval.val = &String{tmps[1:len(tmps)-1]}
+    tmps = tmps[1:len(tmps)-1]
+    // Handle some escape characters
+    tmps = strings.Replace(tmps, "\\\"", "\"", -1)
+    tmps = strings.Replace(tmps, "\\n", "\n", -1)
+    tmps = strings.Replace(tmps, "\\t", "\t", -1)
+    lval.val = &String{tmps}
     return STRING
 
 \( return LPARSYM /* skipped */