yet another small cleanup and obscure bugfix related to #2333

jashkenas · May 16, 2012 · df54c63 · df54c63 · michaelficarra · May 16, 2012
1 parent 1810d9f
commit df54c63
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 62 deletions.
diff --git a/lib/coffee-script/helpers.js b/lib/coffee-script/helpers.js
diff --git a/lib/coffee-script/nodes.js b/lib/coffee-script/nodes.js
diff --git a/lib/coffee-script/repl.js b/lib/coffee-script/repl.js
diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -806,13 +806,10 @@ exports.Obj = class Obj extends Base
       quoteNormalised = switch s[0]
         when '"' then s[1...-1].replace /\\"/g, '"'
         when "'" then s[1...-1].replace /\\'/g, "'"
-      octalNormalised = quoteNormalised.replace /\\([0abtnvfr\n\\])/, (match, c) ->
-        map =
-          0:"\0", a:"\a", b:"\b", t:"\t", n:"\n", v:"\v",
-          f:"\f", r:"\r", "\\":"\\", "\n":""
-        map[c]
-      octalNormalised.replace /\\x([0-9a-f]{2})|\\u([0-9a-f]{4})/i, (match, h, u) ->
+      escapeNormalised = quoteNormalised.replace /\\x([0-9a-f]{2})|\\u([0-9a-f]{4})/ig, (match, h, u) ->
         String.fromCharCode parseInt (h ? u), 16
+      escapeNormalised.replace /\\([\s\S])/g, (match, c) ->
+        {0:"\0", b:"\b", t:"\t", n:"\n", v:"\v", f:"\f", r:"\r", "\\":"\\", "\n":""}[c] ? c
     isDuplicate = (x) ->
       mx = x.match /^['"]/
       (y) ->

diff --git a/test/strict.coffee b/test/strict.coffee
@@ -70,10 +70,13 @@ test "#2333: more duplicate property prohibitions", ->
   strict '{.1:0, 1e-1:0}'
   strict '{100:0, 1e2:0}'
   strict '{"\\0":0, "\\x00":0}'
-  strict '{"\\n":0, "\\x0A":0}'
-  strict '{"\\a", "\\u0061"}'
+  strict '{"\\t":0, "\\x09":0}'
+  strict '{"c":0, "\\c":0}'
   strict '{"\\\\":0, "\\x5c":0}'
   strict "{'\n0':0, 0:0}"
+  strict '{"\n0":0, 0:0}'
+  strict "{'\\\n0':0, 0:0}"
+  strict '{"\\\n0":0, "\\x00":0}'
   strict 'a = 0; {a, "a":0}'
   strict "{'\\'a':0, \"'a\":0}"
   strict "{'\\\\a':0, '\\\\a':0}"