Author: Stephan <step...@stzal.com>
Branch:
Changeset: r355:09ec22ba4517
Date: 2013-02-17 15:29 +0100
http://bitbucket.org/pypy/lang-js/changeset/09ec22ba4517/
Log: updated imports from pypy to rpython
diff --git a/js/astbuilder.py b/js/astbuilder.py
--- a/js/astbuilder.py
+++ b/js/astbuilder.py
@@ -1,6 +1,6 @@
-from pypy.rlib.rarithmetic import ovfcheck_float_to_int
-from pypy.rlib.parsing.tree import RPythonVisitor, Symbol
-from pypy.rlib.objectmodel import enforceargs
+from rpython.rlib.rarithmetic import ovfcheck_float_to_int
+from rpython.rlib.parsing.tree import RPythonVisitor, Symbol
+from rpython.rlib.objectmodel import enforceargs
from js import operations
diff --git a/js/baseop.py b/js/baseop.py
--- a/js/baseop.py
+++ b/js/baseop.py
@@ -5,8 +5,8 @@
from js.jsobj import W_String, W_IntNumber, W_FloatNumber
from js.object_space import _w
-from pypy.rlib.rarithmetic import ovfcheck
-from pypy.rlib.rfloat import isnan, isinf
+from rpython.rlib.rarithmetic import ovfcheck
+from rpython.rlib.rfloat import isnan, isinf
from js.builtins.number import w_NAN, w_POSITIVE_INFINITY, w_NEGATIVE_INFINITY
import math
diff --git a/js/builtins/date.py b/js/builtins/date.py
--- a/js/builtins/date.py
+++ b/js/builtins/date.py
@@ -1,9 +1,9 @@
-from pypy.rlib.rfloat import NAN, isnan
+from rpython.rlib.rfloat import NAN, isnan
+from rpython.rlib.objectmodel import we_are_translated
import datetime
from js.builtins import get_arg
from js.object_space import w_return, hide_on_translate, _w
-from pypy.rlib.objectmodel import we_are_translated
def setup(global_object):
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
@@ -1,16 +1,16 @@
# -*- coding: utf-8 -*-
-from pypy.rlib.rfloat import NAN, INFINITY, isnan, isinf
+from rpython.rlib.rfloat import NAN, INFINITY, isnan, isinf
from js.builtins import get_arg
from js.object_space import w_return
from pypy.module.unicodedata import unicodedb
def setup(global_object):
+ from rpython.rlib.objectmodel import we_are_translated
from js.builtins import put_intimate_function, put_native_function,
put_property
from js.builtins.number import w_NAN
from js.builtins.number import w_POSITIVE_INFINITY
- from pypy.rlib.objectmodel import we_are_translated
from js.object_space import newundefined
# 15.1.1.1
@@ -167,7 +167,7 @@
try:
number = int(num_str, r)
try:
- from pypy.rlib.rarithmetic import ovfcheck_float_to_int
+ from rpython.rlib.rarithmetic import ovfcheck_float_to_int
ovfcheck_float_to_int(number)
except OverflowError:
number = float(number)
@@ -221,7 +221,7 @@
if len(args) == 0:
return
- from pypy.rlib.rstring import UnicodeBuilder
+ from rpython.rlib.rstring import UnicodeBuilder
from js.runistr import encode_unicode_utf8
builder = UnicodeBuilder()
@@ -336,13 +336,14 @@
# 15.1.2.1
def js_eval(ctx):
+ from rpython.rlib.parsing.parsing import ParseError
+ from rpython.rlib.parsing.deterministic import LexerError
+
from js.astbuilder import parse_to_ast
from js.jscode import ast_to_bytecode
from js.jsobj import W_String
from js.functions import JsEvalCode
from js.execution_context import EvalExecutionContext
- from pypy.rlib.parsing.parsing import ParseError
- from pypy.rlib.parsing.deterministic import LexerError
from js.astbuilder import FakeParseError
from js.exception import JsSyntaxError
diff --git a/js/builtins/js_math.py b/js/builtins/js_math.py
--- a/js/builtins/js_math.py
+++ b/js/builtins/js_math.py
@@ -1,6 +1,6 @@
import math
-from pypy.rlib.rfloat import NAN, INFINITY, isnan, isinf
+from rpython.rlib.rfloat import NAN, INFINITY, isnan, isinf
from js.builtins import get_arg
from js.object_space import w_return, _w
@@ -429,7 +429,7 @@
return math.exp(x)
import time
-from pypy.rlib import rrandom
+from rpython.rlib import rrandom
random = rrandom.Random(int(time.time()))
diff --git a/js/builtins/number.py b/js/builtins/number.py
--- a/js/builtins/number.py
+++ b/js/builtins/number.py
@@ -1,4 +1,4 @@
-from pypy.rlib.rfloat import NAN, INFINITY
+from rpython.rlib.rfloat import NAN, INFINITY
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,9 +1,10 @@
+from rpython.rlib.rfloat import NAN
+from rpython.rlib.rstring import UnicodeBuilder
+
from js.jsobj import W_String, W_StringObject
-from pypy.rlib.rfloat import NAN
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
def setup(global_object):
@@ -181,7 +182,7 @@
search_str = search_string.to_string()
num_pos = position.ToNumber()
- from pypy.rlib.rfloat import INFINITY, isnan, isinf
+ from rpython.rlib.rfloat import INFINITY, isnan, isinf
if isnan(num_pos):
pos = INFINITY
diff --git a/js/constants.py b/js/constants.py
--- a/js/constants.py
+++ b/js/constants.py
@@ -1,4 +1,4 @@
-from pypy.rlib.rsre.rsre_re import compile
+from rpython.rlib.rsre.rsre_re import compile
num_lit_exp =
r'(?:[+-]?((?:(?:\d+)(?:\.\d*)?)|Infinity|(?:\.[0-9]+))(?:[eE][\+\-]?[0-9]*)?)'
num_lit_rexp = compile(num_lit_exp)
diff --git a/js/execution_context.py b/js/execution_context.py
--- a/js/execution_context.py
+++ b/js/execution_context.py
@@ -1,6 +1,6 @@
from js.utils import StackMixin
from js.object_space import newundefined
-from pypy.rlib import jit
+from rpython.rlib import jit
class ExecutionContext(StackMixin):
diff --git a/js/interpreter.py b/js/interpreter.py
--- a/js/interpreter.py
+++ b/js/interpreter.py
@@ -1,4 +1,4 @@
-from pypy.rlib.streamio import open_file_as_stream
+from rpython.rlib.streamio import open_file_as_stream
def load_file(filename):
diff --git a/js/jscode.py b/js/jscode.py
--- a/js/jscode.py
+++ b/js/jscode.py
@@ -1,6 +1,6 @@
#from pypy.rlib.jit import hint
#from pypy.rlib.objectmodel import we_are_translated
-from pypy.rlib import jit
+from rpython.rlib import jit
from js.exception import JsThrowException
from js.opcodes import opcodes, LABEL, BaseJump
diff --git a/js/jsobj.py b/js/jsobj.py
--- a/js/jsobj.py
+++ b/js/jsobj.py
@@ -1,14 +1,13 @@
# encoding: utf-8
-from pypy.rlib.rarithmetic import intmask
-from pypy.rlib.rfloat import isnan, isinf, NAN, formatd, INFINITY
-from js.exception import JsTypeError, JsRangeError
-
-from pypy.rlib.objectmodel import enforceargs
-from pypy.rlib import jit
+from rpython.rlib.rarithmetic import intmask
+from rpython.rlib.rfloat import isnan, isinf, NAN, formatd, INFINITY
+from rpython.rlib.objectmodel import enforceargs
+from rpython.rlib import jit
from js.property_descriptor import PropertyDescriptor, DataPropertyDescriptor,
AccessorPropertyDescriptor, is_data_descriptor, is_generic_descriptor,
is_accessor_descriptor
from js.property import DataProperty, AccessorProperty
from js.object_map import new_map
+from js.exception import JsTypeError, JsRangeError
@jit.elidable
diff --git a/js/jsparser.py b/js/jsparser.py
--- a/js/jsparser.py
+++ b/js/jsparser.py
@@ -1,5 +1,5 @@
-from pypy.rlib.parsing.ebnfparse import parse_ebnf, make_parse_function
-from pypy.rlib.parsing.parsing import ParseError
+from rpython.rlib.parsing.ebnfparse import parse_ebnf, make_parse_function
+from rpython.rlib.parsing.parsing import ParseError
import py
import sys
diff --git a/js/lexical_environment.py b/js/lexical_environment.py
--- a/js/lexical_environment.py
+++ b/js/lexical_environment.py
@@ -1,4 +1,4 @@
-from pypy.rlib import jit
+#from rpython.rlib import jit
from js.reference import Reference
diff --git a/js/object_map.py b/js/object_map.py
--- a/js/object_map.py
+++ b/js/object_map.py
@@ -1,4 +1,4 @@
-from pypy.rlib import jit
+from rpython.rlib import jit
class Map(object):
diff --git a/js/object_space.py b/js/object_space.py
--- a/js/object_space.py
+++ b/js/object_space.py
@@ -1,5 +1,5 @@
-from pypy.rlib.objectmodel import specialize, enforceargs
-from pypy.rlib import jit
+from rpython.rlib.objectmodel import specialize, enforceargs
+from rpython.rlib import jit
@enforceargs(int)
@@ -201,7 +201,7 @@
def _wrap(f):
def _wrapped_f(*args):
- from pypy.rlib.objectmodel import we_are_translated
+ from rpython.rlib.objectmodel import we_are_translated
if not we_are_translated():
return f(*args)
diff --git a/js/opcodes.py b/js/opcodes.py
--- a/js/opcodes.py
+++ b/js/opcodes.py
@@ -1,11 +1,11 @@
+from rpython.rlib.rarithmetic import intmask
+from rpython.rlib import jit
+
from js.object_space import _w
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
-
from js.jsobj import put_property
-from pypy.rlib import jit
class Opcode(object):
@@ -363,7 +363,7 @@
rnum = rval.ToUInt32()
lnum = lval.ToUInt32()
- from pypy.rlib.rarithmetic import ovfcheck_float_to_int
+ from rpython.rlib.rarithmetic import ovfcheck_float_to_int
shift_count = rnum & 0x1F
res = lnum >> shift_count
@@ -797,7 +797,7 @@
# ------------ iterator support ----------------
-from pypy.rlib.listsort import make_timsort_class
+from rpython.rlib.listsort import make_timsort_class
TimSort = make_timsort_class()
diff --git a/js/operations.py b/js/operations.py
--- a/js/operations.py
+++ b/js/operations.py
@@ -3,10 +3,10 @@
operations.py
Implements the javascript operations nodes for the interpretation tree
"""
+from rpython.rlib.unroll import unrolling_iterable
+from rpython.rlib.objectmodel import enforceargs
from js.exception import JsTypeError, JsException
-from pypy.rlib.unroll import unrolling_iterable
-from pypy.rlib.objectmodel import enforceargs
class Position(object):
diff --git a/js/property.py b/js/property.py
--- a/js/property.py
+++ b/js/property.py
@@ -1,6 +1,6 @@
-from pypy.rlib import jit
+#from rpython.rlib import jit
+#from rpython.rlib.objectmodel import enforceargs
from js.property_descriptor import PropertyDescriptor, DataPropertyDescriptor,
AccessorPropertyDescriptor
-#from pypy.rlib.objectmodel import enforceargs
NOT_SET = -1
diff --git a/js/runistr.py b/js/runistr.py
--- a/js/runistr.py
+++ b/js/runistr.py
@@ -1,5 +1,5 @@
-from pypy.rlib.objectmodel import enforceargs
-from pypy.rlib import runicode
+from rpython.rlib.objectmodel import enforceargs
+from rpython.rlib import runicode
@enforceargs(str)
@@ -36,7 +36,7 @@
errorhandler = unescape_errorhandler
errors = 'strict'
- from pypy.rlib.rstring import UnicodeBuilder
+ from rpython.rlib.rstring import UnicodeBuilder
if size == 0:
return u''
@@ -120,8 +120,8 @@
def hexescape(builder, s, pos, digits, encoding, errorhandler, message,
errors):
- from pypy.rlib.rarithmetic import r_uint
- from pypy.rlib.runicode import MAXUNICODE, UNICHR
+ from rpython.rlib.rarithmetic import r_uint
+ from rpython.rlib.runicode import MAXUNICODE, UNICHR
chr = 0
if pos + digits > len(s):
diff --git a/js/utils.py b/js/utils.py
--- a/js/utils.py
+++ b/js/utils.py
@@ -1,6 +1,6 @@
# encoding: utf-8
#from pypy.rlib.jit import hint
-from pypy.rlib import jit # , debug
+from rpython.rlib import jit # , debug
class StackMixin(object):
diff --git a/py-js.py b/py-js.py
--- a/py-js.py
+++ b/py-js.py
@@ -1,10 +1,12 @@
#!/usr/bin/env python
import os
+
+from rpython.rlib.objectmodel import enforceargs
+from rpython.rlib.parsing.parsing import ParseError
+from rpython.rlib.parsing.deterministic import LexerError
+
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
def main(argv):
@@ -144,7 +146,7 @@
def jitpolicy(driver):
- from pypy.jit.codewriter.policy import JitPolicy
+ from rpython.jit.codewriter.policy import JitPolicy
return JitPolicy()
diff --git a/test/ecma/conftest.py b/test/ecma/conftest.py
--- a/test/ecma/conftest.py
+++ b/test/ecma/conftest.py
@@ -1,11 +1,11 @@
import pytest
import py
+from _pytest.runner import Failed
+from rpython.rlib.parsing.parsing import ParseError
from js.interpreter import Interpreter, load_file
-from _pytest.runner import Failed
from js.object_space import _w
from js.exception import JsException
-from pypy.rlib.parsing.parsing import ParseError
EXCLUSIONLIST = ['shell.js', 'browser.js']
SKIP = [
@@ -247,7 +247,7 @@
if self.do_compile:
if self.compiled_interpreter is None:
- from pypy.translator.c.test.test_genc import compile
+ from rpython.translator.c.test.test_genc import compile
self.compiled_interpreter = compile(f, [str])
return self.compiled_interpreter
else:
diff --git a/test/jit_view.py b/test/jit_view.py
--- a/test/jit_view.py
+++ b/test/jit_view.py
@@ -6,8 +6,8 @@
viewloops = True
conftest.option = o
-from pypy.jit.metainterp.test.support import LLJitMixin
-from pypy.rlib import jit
+from rpython.jit.metainterp.test.support import LLJitMixin
+from rpython.rlib import jit
from js import interpreter
diff --git a/test/test_parser.py b/test/test_parser.py
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -1,15 +1,14 @@
from __future__ import division
import py
-from pypy.rlib.parsing.ebnfparse import parse_ebnf, make_parse_function
-from pypy.rlib.parsing.parsing import Rule
-from pypy.rlib.parsing.tree import RPythonVisitor
+from rpython.rlib.parsing.ebnfparse import parse_ebnf, make_parse_function
+from rpython.rlib.parsing.parsing import Rule, ParseError
+from rpython.rlib.parsing.tree import RPythonVisitor
from pypy import conftest
from js.astbuilder import FakeParseError
from js.astbuilder import ASTBuilder
from js.jscode import JsCode
-from pypy.rlib.parsing.parsing import ParseError
xfail = py.test.mark.xfail
@@ -311,7 +310,7 @@
def test_get_pos(self):
from js import operations
- from pypy.rlib.parsing.tree import Symbol
+ from rpython.rlib.parsing.tree import Symbol
astb = ASTBuilder()
t = self.parse('6')
assert isinstance(t, Symbol)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
