bsjs: fix handling of escape seq in strings

veged · Jan 29, 2013 · fb7d51c · fb7d51c
1 parent ccebf52
commit fb7d51c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/lib/ometajs/grammars/bsjs.js b/lib/ometajs/grammars/bsjs.js
@@ -757,7 +757,11 @@ BSJSParser._isReserved = function(k) {
 };
 
 function preparseString(str) {
-    return str.replace(/\\x([0-9a-f]{2})/ig, "\\u00$1");
+    return str.replace(/\\x([0-9a-f]{2})/ig, "\\u00$1").replace(/\\([0-9]{3})/ig, function(all, num) {
+        var str = parseInt(num, 8).toString("hex");
+        while (str.length < 4) str = "0" + str;
+        return "\\u" + str;
+    }).replace(/\\([^bfnOrtv'\\])|(\\.)/ig, "$1");
 }
 
 var BSSemActionParser = function BSSemActionParser(source, opts) {

diff --git a/lib/ometajs/grammars/bsjs.ometajs b/lib/ometajs/grammars/bsjs.ometajs
@@ -192,7 +192,13 @@ return BSJSParser.reserved.hasOwnProperty(k);
 };
 
 function preparseString(str) {
-  return str.replace(/\\x([0-9a-f]{2})/ig, '\\u00$1');
+  return str.replace(/\\x([0-9a-f]{2})/ig, '\\u00$1')
+            .replace(/\\([0-9]{3})/ig, function(all, num) {
+              var str = parseInt(num, 8).toString('hex');
+              while (str.length < 4) str = '0' + str;
+              return '\\u' + str;
+            })
+            .replace(/\\([^bfnOrtv'\\])|(\\.)/ig, '$1');
 }
 
 

diff --git a/test/unit/functional-test.js b/test/unit/functional-test.js
@@ -132,6 +132,11 @@ suite('Ometajs module', function() {
            'begin',
            ['stmt',['parens', ['get', 'a']]]
         ]);
+
+        js('"a\\-b\\-c"', [
+           'begin',
+           ['stmt',['string', 'a-b-c']]
+        ]);
       });
 
       suite('should parse real javascript like', function() {