[pypy-svn] r43397 - in pypy/dist/pypy/lang/js: . test test/ecma

[santagada at codespeak.net]

Author: santagada
Date: Tue May 15 03:34:15 2007
New Revision: 43397

Removed:
   pypy/dist/pypy/lang/js/test/test_new_parser.py
Modified:
   pypy/dist/pypy/lang/js/operations.py
   pypy/dist/pypy/lang/js/test/ecma/conftest.py
Log:
some mistakes

Modified: pypy/dist/pypy/lang/js/operations.py
==============================================================================
--- pypy/dist/pypy/lang/js/operations.py	(original)
+++ pypy/dist/pypy/lang/js/operations.py	Tue May 15 03:34:15 2007
@@ -6,7 +6,6 @@
 
 #XXX * imports are bad
 from pypy.lang.js.jsobj import *
-from pypy.lang.js.jsparser import JsSyntaxError
 from pypy.rlib.parsing.ebnfparse import Symbol, Nonterminal
 from pypy.rlib.rarithmetic import r_uint, intmask
 from constants import unescapedict, SLASH

Modified: pypy/dist/pypy/lang/js/test/ecma/conftest.py
==============================================================================
--- pypy/dist/pypy/lang/js/test/ecma/conftest.py	(original)
+++ pypy/dist/pypy/lang/js/test/ecma/conftest.py	Tue May 15 03:34:15 2007
@@ -1,7 +1,7 @@
 import py
 from pypy.lang.js.interpreter import *
 from pypy.lang.js.jsobj import W_Array, JsBaseExcept
-from pypy.lang.js.jsparser import JsSyntaxError
+from pypy.rlib.parsing.parsing import ParseError
 from py.__.test.outcome import Failed, ExceptionFailure
 import pypy.lang.js as js
 
@@ -57,7 +57,7 @@
         t = load_file(str(self.fspath))
         try:
             t.execute(self.interp.global_context)
-        except JsSyntaxError:
+        except ParseError:
             raise Failed(msg="Syntax Error",excinfo=py.code.ExceptionInfo())
         except JsBaseExcept:
             raise Failed(msg="Javascript Error", excinfo=py.code.ExceptionInfo())