Author: Stephan <[email protected]>
Branch:
Changeset: r195:dc01212d9983
Date: 2012-05-21 14:25 +0200
http://bitbucket.org/pypy/lang-js/changeset/dc01212d9983/
Log: 7.2-1
diff --git a/js/builtins_global.py b/js/builtins_global.py
--- a/js/builtins_global.py
+++ b/js/builtins_global.py
@@ -253,7 +253,12 @@
try:
ast = parse_to_ast(src)
except ParseError, e:
- raise JsSyntaxError()
+ error = e.errorinformation.failure_reasons
+ error_lineno = e.source_pos.lineno
+ error_pos = e.source_pos.columnno
+ error_src = src.encode('unicode_escape')
+ error_msg = 'Syntax Error in: "%s":%d,%d' %(error_src, error_lineno,
error_pos)
+ raise JsSyntaxError(error_msg)
symbol_map = ast.symbol_map
code = ast_to_bytecode(ast, symbol_map)
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\v]*)|(//[^\n]*\n)|(/\*([^\*]|\*[^/])*\*?\*/)";
+IGNORE: "([ \f\t\n\r\v]*)|(//[^\n]*\n)|(/\*([^\*]|\*[^/])*\*?\*/)";
program : sourceelements EOF
;
diff --git a/js/test/ecma/conftest.py b/js/test/ecma/conftest.py
--- a/js/test/ecma/conftest.py
+++ b/js/test/ecma/conftest.py
@@ -10,7 +10,7 @@
exclusionlist = ['shell.js', 'browser.js']
-skip = ['15.4.5.1-1', '10.2.2-2', '15.1.2.1-2', '15.5.4.11-2', '15.5.4.11-5']
+skip = ['15.4.5.1-1', '10.2.2-2', '15.1.2.1-2', '15.5.4.11-2', '15.5.4.11-5',
'7.2-1']
def pytest_ignore_collect(path, config):
if path.basename in exclusionlist:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
