[pypy-svn] r28701 - in pypy/dist/pypy/translator/js: . modules/test test
ericvrp at codespeak.net
ericvrp at codespeak.net
Mon Jun 12 12:59:47 CEST 2006
Author: ericvrp
Date: Mon Jun 12 12:59:40 2006
New Revision: 28701
Added:
pypy/dist/pypy/translator/js/modules/test/
Modified:
pypy/dist/pypy/translator/js/asmgen.py
pypy/dist/pypy/translator/js/database.py
pypy/dist/pypy/translator/js/function.py
pypy/dist/pypy/translator/js/js.py
pypy/dist/pypy/translator/js/jsbuiltin.py
pypy/dist/pypy/translator/js/jts.py
pypy/dist/pypy/translator/js/log.py
pypy/dist/pypy/translator/js/metavm.py
pypy/dist/pypy/translator/js/opcodes.py
pypy/dist/pypy/translator/js/support.py
pypy/dist/pypy/translator/js/test/browsertest.py
pypy/dist/pypy/translator/js/test/runtest.py
pypy/dist/pypy/translator/js/test/test_bltn.py
pypy/dist/pypy/translator/js/test/test_class.py
pypy/dist/pypy/translator/js/test/test_dom.py
pypy/dist/pypy/translator/js/test/test_exc_operation.py
pypy/dist/pypy/translator/js/test/test_exception.py
pypy/dist/pypy/translator/js/test/test_genllvm.py
pypy/dist/pypy/translator/js/test/test_genllvm1.py
pypy/dist/pypy/translator/js/test/test_jseval.py
pypy/dist/pypy/translator/js/test/test_loops.py
pypy/dist/pypy/translator/js/test/test_merge_if_blocks.py
pypy/dist/pypy/translator/js/test/test_runtest.py
pypy/dist/pypy/translator/js/test/test_seq.py
pypy/dist/pypy/translator/js/test/test_snippet.py
pypy/dist/pypy/translator/js/test/test_typed.py
Log:
Made necessary changes to reflect the move from js2 -> js
Modified: pypy/dist/pypy/translator/js/asmgen.py
==============================================================================
--- pypy/dist/pypy/translator/js/asmgen.py (original)
+++ pypy/dist/pypy/translator/js/asmgen.py Mon Jun 12 12:59:40 2006
@@ -2,7 +2,7 @@
""" backend generator routines
"""
-from pypy.translator.js2.log import log
+from pypy.translator.js.log import log
from pypy.objspace.flow.model import Variable
Modified: pypy/dist/pypy/translator/js/database.py
==============================================================================
--- pypy/dist/pypy/translator/js/database.py (original)
+++ pypy/dist/pypy/translator/js/database.py Mon Jun 12 12:59:40 2006
@@ -3,12 +3,12 @@
"""
from pypy.rpython.ootypesystem import ootype
-from pypy.translator.js2.opcodes import opcodes
-from pypy.translator.js2.function import Function
-from pypy.translator.js2.log import log
-from pypy.translator.js2.jts import JTS
-from pypy.translator.js2._class import Class
-from pypy.translator.js2.support import JavascriptNameManager
+from pypy.translator.js.opcodes import opcodes
+from pypy.translator.js.function import Function
+from pypy.translator.js.log import log
+from pypy.translator.js.jts import JTS
+from pypy.translator.js._class import Class
+from pypy.translator.js.support import JavascriptNameManager
from pypy.rpython.lltypesystem.lltype import Signed, Unsigned, Void, Bool, Float
from pypy.rpython.lltypesystem.lltype import SignedLongLong, UnsignedLongLong, typeOf
@@ -16,7 +16,7 @@
from pypy.rpython.ootypesystem import ootype
from pypy.objspace.flow.model import Variable, Constant
-from pypy.translator.js2.modules import dom
+from pypy.translator.js.modules import dom
try:
set
Modified: pypy/dist/pypy/translator/js/function.py
==============================================================================
--- pypy/dist/pypy/translator/js/function.py (original)
+++ pypy/dist/pypy/translator/js/function.py Mon Jun 12 12:59:40 2006
@@ -14,7 +14,7 @@
from pypy.translator.cli.node import Node
from pypy.translator.cli.class_ import Class
-from pypy.translator.js2.log import log
+from pypy.translator.js.log import log
import re
Modified: pypy/dist/pypy/translator/js/js.py
==============================================================================
--- pypy/dist/pypy/translator/js/js.py (original)
+++ pypy/dist/pypy/translator/js/js.py Mon Jun 12 12:59:40 2006
@@ -15,13 +15,13 @@
from pypy.rpython.lltypesystem import lltype
from pypy.rpython.ootypesystem import ootype
from pypy.tool.udir import udir
-from pypy.translator.js2.log import log
+from pypy.translator.js.log import log
-from pypy.translator.js2.asmgen import AsmGen
-from pypy.translator.js2.jts import JTS
-from pypy.translator.js2.opcodes import opcodes
-from pypy.translator.js2.function import Function
-from pypy.translator.js2.database import LowLevelDatabase
+from pypy.translator.js.asmgen import AsmGen
+from pypy.translator.js.jts import JTS
+from pypy.translator.js.opcodes import opcodes
+from pypy.translator.js.function import Function
+from pypy.translator.js.database import LowLevelDatabase
from pypy.translator.oosupport.genoo import GenOO
Modified: pypy/dist/pypy/translator/js/jsbuiltin.py
==============================================================================
--- pypy/dist/pypy/translator/js/jsbuiltin.py (original)
+++ pypy/dist/pypy/translator/js/jsbuiltin.py Mon Jun 12 12:59:40 2006
@@ -1,9 +1,8 @@
-
""" JavaScript builtin mappings
"""
from pypy.translator.oosupport.metavm import InstructionList, PushAllArgs
-from pypy.translator.js2.metavm import SetBuiltinField, ListGetitem, ListSetitem, \
+from pypy.translator.js.metavm import SetBuiltinField, ListGetitem, ListSetitem, \
GetBuiltinField, CallBuiltin, Call, SetTimeout, XmlSetCallback
from pypy.rpython.ootypesystem import ootype
Modified: pypy/dist/pypy/translator/js/jts.py
==============================================================================
--- pypy/dist/pypy/translator/js/jts.py (original)
+++ pypy/dist/pypy/translator/js/jts.py Mon Jun 12 12:59:40 2006
@@ -1,4 +1,3 @@
-
""" JavaScript type system
"""
@@ -11,7 +10,7 @@
from pypy.rpython.lltypesystem.lltype import Char, UniChar
from pypy.rpython.ootypesystem.ootype import String, _string, List, StaticMethod
-from pypy.translator.js2.log import log
+from pypy.translator.js.log import log
try:
set
Modified: pypy/dist/pypy/translator/js/log.py
==============================================================================
--- pypy/dist/pypy/translator/js/log.py (original)
+++ pypy/dist/pypy/translator/js/log.py Mon Jun 12 12:59:40 2006
@@ -1,4 +1,4 @@
import py
from pypy.tool.ansi_print import ansi_log
-log = py.log.Producer("js2")
-py.log.setconsumer("js2", ansi_log)
+log = py.log.Producer("js")
+py.log.setconsumer("js", ansi_log)
Modified: pypy/dist/pypy/translator/js/metavm.py
==============================================================================
--- pypy/dist/pypy/translator/js/metavm.py (original)
+++ pypy/dist/pypy/translator/js/metavm.py Mon Jun 12 12:59:40 2006
@@ -1,12 +1,11 @@
-
""" Opcode meaning objects, descendants of MicroInstruction
"""
-#from pypy.translator.js2.jsbuiltin import Builtins
+#from pypy.translator.js.jsbuiltin import Builtins
from pypy.translator.oosupport.metavm import PushArg, PushAllArgs, StoreResult,\
InstructionList, New, SetField, GetField, MicroInstruction
-from pypy.translator.js2.log import log
+from pypy.translator.js.log import log
from pypy.rpython.ootypesystem import ootype
class _ListSetitem(MicroInstruction):
Modified: pypy/dist/pypy/translator/js/opcodes.py
==============================================================================
--- pypy/dist/pypy/translator/js/opcodes.py (original)
+++ pypy/dist/pypy/translator/js/opcodes.py Mon Jun 12 12:59:40 2006
@@ -1,4 +1,3 @@
-
""" opcode definitions
"""
@@ -8,15 +7,15 @@
from pypy.translator.oosupport.metavm import _GetFieldDispatcher, _SetFieldDispatcher, \
_CallDispatcher, _MethodDispatcher
-from pypy.translator.js2.metavm import SameAs, IsInstance, Call, CallMethod, CopyName, CastString,\
+from pypy.translator.js.metavm import SameAs, IsInstance, Call, CallMethod, CopyName, CastString,\
_Prefix, _CastFun, _NotImplemented, CallBuiltin, CallBuiltinObject, GetBuiltinField, SetBuiltinField,\
IndirectCall
-from pypy.translator.js2.jsbuiltin import Builtins
+from pypy.translator.js.jsbuiltin import Builtins
DoNothing = [PushAllArgs]
-from pypy.translator.js2.log import log
+from pypy.translator.js.log import log
class_map = { 'Call' : Call,
'CallMethod' : CallMethod,
Modified: pypy/dist/pypy/translator/js/support.py
==============================================================================
--- pypy/dist/pypy/translator/js/support.py (original)
+++ pypy/dist/pypy/translator/js/support.py Mon Jun 12 12:59:40 2006
@@ -1,5 +1,5 @@
from pypy.translator.gensupp import NameManager
-#from pypy.translator.js2.optimize import is_optimized_function
+#from pypy.translator.js.optimize import is_optimized_function
class JavascriptNameManager(NameManager):
def __init__(self, db):
Modified: pypy/dist/pypy/translator/js/test/browsertest.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/browsertest.py (original)
+++ pypy/dist/pypy/translator/js/test/browsertest.py Mon Jun 12 12:59:40 2006
@@ -5,7 +5,7 @@
from sys import platform
from time import sleep
import webbrowser
-from pypy.translator.js2.log import log
+from pypy.translator.js.log import log
log = log.browsertest
class HTTPServer(BaseHTTPServer):
Modified: pypy/dist/pypy/translator/js/test/runtest.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/runtest.py (original)
+++ pypy/dist/pypy/translator/js/test/runtest.py Mon Jun 12 12:59:40 2006
@@ -6,10 +6,10 @@
import py, os
from pypy.translator.translator import TranslationContext
from pypy.translator.backendopt.all import backend_optimizations
-from pypy.translator.js2.js import JS
-from pypy.translator.js2.test.browsertest import jstest
-from pypy.translator.js2 import conftest
-from pypy.translator.js2.log import log
+from pypy.translator.js.js import JS
+from pypy.translator.js.test.browsertest import jstest
+from pypy.translator.js import conftest
+from pypy.translator.js.log import log
from pypy.conftest import option
log = log.runtest
use_browsertest = conftest.option.browser
@@ -61,7 +61,7 @@
log("Used html: %r" % self.html)
output = jstest(self.js.filename, function_call, use_browsertest, self.html, self.is_interactive)
else:
- from pypy.translator.js2.test.tgtest import run_tgtest
+ from pypy.translator.js.test.tgtest import run_tgtest
out = run_tgtest(self, None).results
assert out[1] == 'undefined'
output = out[0]
Modified: pypy/dist/pypy/translator/js/test/test_bltn.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_bltn.py (original)
+++ pypy/dist/pypy/translator/js/test/test_bltn.py Mon Jun 12 12:59:40 2006
@@ -1,11 +1,10 @@
-
""" blttest
"""
import py
#from pypy.rpython.ootypesystem.bltregistry import BasicExternal
-from pypy.translator.js2.test.runtest import compile_function
+from pypy.translator.js.test.runtest import compile_function
from pypy.rpython.ootypesystem.ootype import Signed, Void, Float, List, String
Modified: pypy/dist/pypy/translator/js/test/test_class.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_class.py (original)
+++ pypy/dist/pypy/translator/js/test/test_class.py Mon Jun 12 12:59:40 2006
@@ -1,7 +1,7 @@
from __future__ import division
import py
-from pypy.translator.js2.test.runtest import compile_function
+from pypy.translator.js.test.runtest import compile_function
from pypy.translator.llvm.test import llvmsnippet
class TestClass(object):
Modified: pypy/dist/pypy/translator/js/test/test_dom.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_dom.py (original)
+++ pypy/dist/pypy/translator/js/test/test_dom.py Mon Jun 12 12:59:40 2006
@@ -1,13 +1,12 @@
-
""" test of DOM related functions
"""
import py
-from pypy.translator.js2.test.runtest import compile_function
-from pypy.translator.js2.modules.dom import Node, get_document, setTimeout, alert
-from pypy.translator.js2.modules.xmlhttp import XMLHttpRequest
-from pypy.translator.js2 import conftest
+from pypy.translator.js.test.runtest import compile_function
+from pypy.translator.js.modules.dom import Node, get_document, setTimeout, alert
+from pypy.translator.js.modules.xmlhttp import XMLHttpRequest
+from pypy.translator.js import conftest
import time
Modified: pypy/dist/pypy/translator/js/test/test_exc_operation.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_exc_operation.py (original)
+++ pypy/dist/pypy/translator/js/test/test_exc_operation.py Mon Jun 12 12:59:40 2006
@@ -1,6 +1,6 @@
import py
import sys
-from pypy.translator.js2.test.runtest import compile_function
+from pypy.translator.js.test.runtest import compile_function
from pypy.rpython.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
from pypy.translator.test import snippet
Modified: pypy/dist/pypy/translator/js/test/test_exception.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_exception.py (original)
+++ pypy/dist/pypy/translator/js/test/test_exception.py Mon Jun 12 12:59:40 2006
@@ -1,6 +1,6 @@
import py
-from pypy.translator.js2.test.runtest import compile_function
+from pypy.translator.js.test.runtest import compile_function
from pypy.translator.test.snippet import try_raise_choose
from pypy.rpython.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
Modified: pypy/dist/pypy/translator/js/test/test_genllvm.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_genllvm.py (original)
+++ pypy/dist/pypy/translator/js/test/test_genllvm.py Mon Jun 12 12:59:40 2006
@@ -4,7 +4,7 @@
import py
from pypy.rpython.rarithmetic import r_uint
-from pypy.translator.js2.test.runtest import compile_function
+from pypy.translator.js.test.runtest import compile_function
def test_simple_function_pointer():
#py.test.skip("ootypesystem problems with lists")
Modified: pypy/dist/pypy/translator/js/test/test_genllvm1.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_genllvm1.py (original)
+++ pypy/dist/pypy/translator/js/test/test_genllvm1.py Mon Jun 12 12:59:40 2006
@@ -4,7 +4,7 @@
import py
from pypy.objspace.flow.model import Constant, Variable
-from pypy.translator.js2.test.runtest import compile_function
+from pypy.translator.js.test.runtest import compile_function
from pypy.translator.llvm.test import llvmsnippet
class TestGenLLVM(object):
Modified: pypy/dist/pypy/translator/js/test/test_jseval.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_jseval.py (original)
+++ pypy/dist/pypy/translator/js/test/test_jseval.py Mon Jun 12 12:59:40 2006
@@ -1,10 +1,10 @@
from __future__ import division
import py
-from pypy.translator.js2.test.runtest import compile_function
+from pypy.translator.js.test.runtest import compile_function
from pypy.rpython.lltypesystem import lltype
from pypy.rpython.rjs import jseval
-from pypy.translator.js2 import conftest
+from pypy.translator.js import conftest
def jsnative(cmd):
def do():
Modified: pypy/dist/pypy/translator/js/test/test_loops.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_loops.py (original)
+++ pypy/dist/pypy/translator/js/test/test_loops.py Mon Jun 12 12:59:40 2006
@@ -1,6 +1,6 @@
import py
-from pypy.translator.js2.test.runtest import compile_function
+from pypy.translator.js.test.runtest import compile_function
import sys
Modified: pypy/dist/pypy/translator/js/test/test_merge_if_blocks.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_merge_if_blocks.py (original)
+++ pypy/dist/pypy/translator/js/test/test_merge_if_blocks.py Mon Jun 12 12:59:40 2006
@@ -1,6 +1,6 @@
import py
-from pypy.translator.js2.test.runtest import compile_function
+from pypy.translator.js.test.runtest import compile_function
import sys
Modified: pypy/dist/pypy/translator/js/test/test_runtest.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_runtest.py (original)
+++ pypy/dist/pypy/translator/js/test/test_runtest.py Mon Jun 12 12:59:40 2006
@@ -1,5 +1,5 @@
import py
-from pypy.translator.js2.test.runtest import compile_function
+from pypy.translator.js.test.runtest import compile_function
#test returntypes
def test_bool_return():
Modified: pypy/dist/pypy/translator/js/test/test_seq.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_seq.py (original)
+++ pypy/dist/pypy/translator/js/test/test_seq.py Mon Jun 12 12:59:40 2006
@@ -2,7 +2,7 @@
import py
from pypy.objspace.flow.model import Constant, Variable
-from pypy.translator.js2.test.runtest import compile_function
+from pypy.translator.js.test.runtest import compile_function
from pypy.translator.llvm.test import llvmsnippet
py.test.skip("Need to reinvestigate it")
Modified: pypy/dist/pypy/translator/js/test/test_snippet.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_snippet.py (original)
+++ pypy/dist/pypy/translator/js/test/test_snippet.py Mon Jun 12 12:59:40 2006
@@ -1,6 +1,6 @@
from __future__ import division
-from pypy.translator.js2.test.runtest import compile_function
+from pypy.translator.js.test.runtest import compile_function
from pypy.translator.test import snippet as test
import py
Modified: pypy/dist/pypy/translator/js/test/test_typed.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_typed.py (original)
+++ pypy/dist/pypy/translator/js/test/test_typed.py Mon Jun 12 12:59:40 2006
@@ -4,7 +4,7 @@
from pypy.translator.test import snippet
from pypy.rpython.rarithmetic import r_uint, ovfcheck, ovfcheck_lshift
-from pypy.translator.js2.test.runtest import compile_function
+from pypy.translator.js.test.runtest import compile_function
def test_call_five():
def wrapper():
More information about the Pypy-commit
mailing list