Author: Stephan <step...@stzal.com>
Branch:
Changeset: r343:ede3ac137de0
Date: 2013-01-18 14:28 +0100
http://bitbucket.org/pypy/lang-js/changeset/ede3ac137de0/
Log: renamed js.execution to js.exception
diff --git a/js/builtins/array.py b/js/builtins/array.py
--- a/js/builtins/array.py
+++ b/js/builtins/array.py
@@ -218,7 +218,7 @@
if not isundefined(comparefn):
if not comparefn.is_callable():
- from js.execution import JsTypeError
+ from js.exception import JsTypeError
raise JsTypeError(u'')
from js.jsobj import W_BasicFunction
diff --git a/js/builtins/boolean.py b/js/builtins/boolean.py
--- a/js/builtins/boolean.py
+++ b/js/builtins/boolean.py
@@ -1,5 +1,5 @@
from js.jsobj import W_Boolean, W_BooleanObject
-from js.execution import JsTypeError
+from js.exception import JsTypeError
from js.object_space import w_return, _w
diff --git a/js/builtins/function.py b/js/builtins/function.py
--- a/js/builtins/function.py
+++ b/js/builtins/function.py
@@ -1,4 +1,4 @@
-from js.execution import JsTypeError
+from js.exception import JsTypeError
from js.builtins import get_arg
from js.completion import NormalCompletion
from js.object_space import w_return, _w
diff --git a/js/builtins/js_global.py b/js/builtins/js_global.py
--- a/js/builtins/js_global.py
+++ b/js/builtins/js_global.py
@@ -344,7 +344,7 @@
from pypy.rlib.parsing.parsing import ParseError
from pypy.rlib.parsing.deterministic import LexerError
from js.astbuilder import FakeParseError
- from js.execution import JsSyntaxError
+ from js.exception import JsSyntaxError
args = ctx.argv()
x = get_arg(args, 0)
diff --git a/js/builtins/number.py b/js/builtins/number.py
--- a/js/builtins/number.py
+++ b/js/builtins/number.py
@@ -1,5 +1,5 @@
from pypy.rlib.rfloat import NAN, INFINITY
-from js.execution import JsRangeError, JsTypeError
+from js.exception import JsRangeError, JsTypeError
from js.jsobj import W_Number, W_NumericObject
from js.object_space import w_return, _w
diff --git a/js/builtins/string.py b/js/builtins/string.py
--- a/js/builtins/string.py
+++ b/js/builtins/string.py
@@ -1,6 +1,6 @@
from js.jsobj import W_String, W_StringObject
from pypy.rlib.rfloat import NAN
-from js.execution import JsTypeError
+from js.exception import JsTypeError
from js.builtins import get_arg
from js.object_space import w_return, _w
from pypy.rlib.rstring import UnicodeBuilder
diff --git a/js/environment_record.py b/js/environment_record.py
--- a/js/environment_record.py
+++ b/js/environment_record.py
@@ -101,7 +101,7 @@
assert identifier is not None and isinstance(identifier, unicode)
assert self.has_binding(identifier)
if not self._is_mutable_binding(identifier):
- from js.execution import JsTypeError
+ from js.exception import JsTypeError
raise JsTypeError(u'immutable binding')
self._set_binding(identifier, value)
@@ -111,7 +111,7 @@
assert identifier is not None and isinstance(identifier, unicode)
if not self.has_binding(identifier):
if strict:
- from js.execution import JsReferenceError
+ from js.exception import JsReferenceError
raise JsReferenceError(identifier)
else:
return newundefined()
@@ -191,7 +191,7 @@
if s is False:
return newundefined()
else:
- from execution import JsReferenceError
+ from js.exception import JsReferenceError
raise JsReferenceError(self.__class__)
return bindings.get(n)
diff --git a/js/execution.py b/js/exception.py
rename from js/execution.py
rename to js/exception.py
diff --git a/js/jscode.py b/js/jscode.py
--- a/js/jscode.py
+++ b/js/jscode.py
@@ -3,7 +3,7 @@
from pypy.rlib.jit import JitDriver
from pypy.rlib import jit
-from js.execution import JsThrowException
+from js.exception import JsThrowException
from js.opcodes import opcodes, LABEL, BaseJump
from js.jsobj import W_String
from js.astbuilder import empty_symbols
diff --git a/js/jsobj.py b/js/jsobj.py
--- a/js/jsobj.py
+++ b/js/jsobj.py
@@ -1,7 +1,7 @@
# encoding: utf-8
from pypy.rlib.rarithmetic import intmask
from pypy.rlib.rfloat import isnan, isinf, NAN, formatd, INFINITY
-from js.execution import JsTypeError, JsRangeError
+from js.exception import JsTypeError, JsRangeError
from pypy.rlib.objectmodel import enforceargs
from pypy.rlib import jit
diff --git a/js/opcodes.py b/js/opcodes.py
--- a/js/opcodes.py
+++ b/js/opcodes.py
@@ -1,5 +1,5 @@
from js.object_space import _w
-from js.execution import JsTypeError
+from js.exception import JsTypeError
from js.baseop import plus, sub, compare, AbstractEC, StrictEC,\
compare_e, increment, decrement, mult, division, uminus, mod
from pypy.rlib.rarithmetic import intmask
@@ -686,7 +686,7 @@
def eval(self, ctx):
val = ctx.stack_pop()
- from js.execution import JsThrowException
+ from js.exception import JsThrowException
raise JsThrowException(val)
@@ -715,7 +715,7 @@
def eval(self, ctx):
from js.completion import is_return_completion, is_completion,
NormalCompletion
- from js.execution import JsException
+ from js.exception import JsException
tryexec = self.tryexec
catchexec = self.catchexec
@@ -894,7 +894,7 @@
def eval(self, ctx):
from js.reference import Reference
- from js.execution import JsSyntaxError
+ from js.exception import JsSyntaxError
# 11.4.1
ref = ctx.get_ref(self.name, self.index)
diff --git a/js/operations.py b/js/operations.py
--- a/js/operations.py
+++ b/js/operations.py
@@ -4,7 +4,7 @@
Implements the javascript operations nodes for the interpretation tree
"""
-from js.execution import JsTypeError, JsException
+from js.exception import JsTypeError, JsException
from pypy.rlib.unroll import unrolling_iterable
from pypy.rlib.objectmodel import enforceargs
diff --git a/js/reference.py b/js/reference.py
--- a/js/reference.py
+++ b/js/reference.py
@@ -1,4 +1,4 @@
-from js.execution import JsReferenceError
+from js.exception import JsReferenceError
#from pypy.rlib import jit
diff --git a/js/runistr.py b/js/runistr.py
--- a/js/runistr.py
+++ b/js/runistr.py
@@ -56,7 +56,7 @@
pos += 1
if pos >= size:
message = u"\\ at end of string"
- from js.execution import JsSyntaxError
+ from js.exception import JsSyntaxError
raise JsSyntaxError(message)
ch = s[pos]
diff --git a/py-js.py b/py-js.py
--- a/py-js.py
+++ b/py-js.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
import os
-from js.execution import JsException
+from js.exception import JsException
from pypy.rlib.objectmodel import enforceargs
from pypy.rlib.parsing.parsing import ParseError
from pypy.rlib.parsing.deterministic import LexerError
diff --git a/test/ecma/conftest.py b/test/ecma/conftest.py
--- a/test/ecma/conftest.py
+++ b/test/ecma/conftest.py
@@ -4,7 +4,7 @@
from js.interpreter import Interpreter, load_file
from _pytest.runner import Failed
from js.object_space import _w
-from js.execution import JsException
+from js.exception import JsException
from pypy.rlib.parsing.parsing import ParseError
EXCLUSIONLIST = ['shell.js', 'browser.js']
diff --git a/test/test_interp.py b/test/test_interp.py
--- a/test/test_interp.py
+++ b/test/test_interp.py
@@ -236,7 +236,7 @@
def test_throw(capsys):
- from js.execution import JsThrowException
+ from js.exception import JsThrowException
asserte("throw(3);", JsThrowException)
@@ -413,7 +413,7 @@
def test_eval_syntax_error():
- from js.execution import JsSyntaxError
+ from js.exception import JsSyntaxError
asserte("eval('var do =true;');", JsSyntaxError)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
