correcting broken fix for #2333 regarding string escape sequences

Sorry for all the commits! It should really be done this time.
jashkenas · May 16, 2012 · 29b9c3b · 29b9c3b · michaelficarra · May 16, 2012
1 parent da22989
commit 29b9c3b
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 17 deletions.
diff --git a/lib/coffee-script/nodes.js b/lib/coffee-script/nodes.js
diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -802,20 +802,25 @@ exports.Obj = class Obj extends Base
   compileNode: (o) ->
     props = @properties
     propNames = []
-    normalise = (s) -> switch s[0]
-      when '"' then s[1...-1].replace /\\"/g, '"'
-      when "'" then s[1...-1].replace /\\'/g, "'"
+    normaliseString = (s) ->
+      quoteNormalised = switch s[0]
+        when '"' then s[1...-1].replace /\\"/g, '"'
+        when "'" then s[1...-1].replace /\\'/g, "'"
+      octalNormalised = quoteNormalised.replace /\\([0btnvfr\\])/, (match, c) ->
+        {0:"\0", b:"\b", t:"\t", n:"\n", v:"\v", f:"\f", r:"\r", "\\":"\\"}[c]
+      octalNormalised.replace /\\x([0-9a-f]{2})|\\u([0-9a-f]{4})/i, (match, h, u) ->
+        String.fromCharCode parseInt (h ? u), 16
     isDuplicate = (x) ->
       mx = x.match /^['"]/
       (y) ->
         return true if y is x or +y is +x
         my = y.match /^['"]/
         if mx and my
-          return true if normalise(x) is normalise y
+          return true if normaliseString(x) is normaliseString y
         else if mx
-          return true if y is x[1...-1]
+          return true if y is normaliseString x
         else if my
-          return true if x is y[1...-1]
+          return true if x is normaliseString y
         false
     for prop in @properties
       prop = prop.variable if prop.isComplex()

diff --git a/test/strict.coffee b/test/strict.coffee
@@ -70,7 +70,11 @@ 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 '{"\\\\":0, "\\x5c":0}'
   strict 'a = 0; {a, "a":0}'
+  strict "{'\\'a':0, \"'a\":0}"
+  strict "{'\\\\a':0, '\\\\a':0}"
   strictOk '{0:0, "0x0":0}'
   strictOk '{"a":0, "\'a\'":0}'