[pypy-commit] lang-js default: 7.1-1

[stepahn]

Author: Stephan <stephan at stzal.com>
Branch: 
Changeset: r194:9cdcbf4ec963
Date: 2012-05-21 13:43 +0200
http://bitbucket.org/pypy/lang-js/changeset/9cdcbf4ec963/

Log:	7.1-1

diff --git a/js/jsgrammar.txt b/js/jsgrammar.txt
--- a/js/jsgrammar.txt
+++ b/js/jsgrammar.txt
@@ -1,6 +1,6 @@
 # tokens
 # 
-IGNORE: "([ \f\t\n]*)|(//[^\n]*\n)|(/\*([^\*]|\*[^/])*\*?\*/)";
+IGNORE: "([ \f\t\n\v]*)|(//[^\n]*\n)|(/\*([^\*]|\*[^/])*\*?\*/)";
 
 program : sourceelements EOF
         ;
diff --git a/js/operations.py b/js/operations.py
--- a/js/operations.py
+++ b/js/operations.py
@@ -643,6 +643,7 @@
             assert s.startswith("'")
             assert s.endswith("'")
         s = s[1:-1]
+        s = s.replace('\\ ', ' ')
         return s
 
 class ObjectInit(ListOp):