[pypy-svn] r37719 - in pypy/dist/pypy/translator: . goal js js/test test tool transformer
fijal at codespeak.net
fijal at codespeak.net
Thu Feb 1 12:13:50 CET 2007
Author: fijal
Date: Thu Feb 1 12:13:47 2007
New Revision: 37719
Removed:
pypy/dist/pypy/translator/js/test/test_transformer.py
pypy/dist/pypy/translator/transformer/
Modified:
pypy/dist/pypy/translator/driver.py
pypy/dist/pypy/translator/goal/translate.py
pypy/dist/pypy/translator/js/main.py
pypy/dist/pypy/translator/js/test/runtest.py
pypy/dist/pypy/translator/test/test_driver.py
pypy/dist/pypy/translator/tool/pdbplus.py
Log:
Kill transformer, it seems to be louse attempt to make RPython exceptions.
Modified: pypy/dist/pypy/translator/driver.py
==============================================================================
--- pypy/dist/pypy/translator/driver.py (original)
+++ pypy/dist/pypy/translator/driver.py Thu Feb 1 12:13:47 2007
@@ -29,7 +29,6 @@
'translation.fork_before': None,
'translation.backendopt.raisingop2direct_call' : False,
'translation.backendopt.merge_if_blocks': True,
- 'translation.debug_transform' : False,
}
@@ -275,11 +274,6 @@
s = annotator.build_types(self.entry_point, self.inputtypes)
- if self.config.translation.debug_transform:
- from pypy.translator.transformer.debug import DebugTransformer
- dt = DebugTransformer(translator)
- dt.transform_all()
-
self.sanity_check_annotation()
if self.standalone and s.knowntype != int:
raise Exception("stand-alone program entry point must return an "
@@ -550,8 +544,7 @@
def task_source_js(self):
from pypy.translator.js.js import JS
self.gen = JS(self.translator, functions=[self.entry_point],
- stackless=self.config.translation.stackless,
- use_debug=self.config.translation.debug_transform)
+ stackless=self.config.translation.stackless)
filename = self.gen.write_source()
self.log.info("Wrote %s" % (filename,))
task_source_js = taskdef(task_source_js,
Modified: pypy/dist/pypy/translator/goal/translate.py
==============================================================================
--- pypy/dist/pypy/translator/goal/translate.py (original)
+++ pypy/dist/pypy/translator/goal/translate.py Thu Feb 1 12:13:47 2007
@@ -77,8 +77,6 @@
'translation.cc': None,
'translation.profopt': None,
'translation.output': None,
-
- 'translation.debug_transform': False,
}
import py
Modified: pypy/dist/pypy/translator/js/main.py
==============================================================================
--- pypy/dist/pypy/translator/js/main.py (original)
+++ pypy/dist/pypy/translator/js/main.py Thu Feb 1 12:13:47 2007
@@ -20,9 +20,6 @@
default=False, cmdline="--view"),
BoolOption("use_pdb", "Use debugger",
default=False, cmdline="--pdb"),
- BoolOption("debug_transform",
- "Use !EXPERIMENTAL! debug transform to produce tracebacks",
- default=False, cmdline="-d --debug"),
StrOption("output", "File to save results (default output.js)",
default="output.js", cmdline="--output")])
@@ -65,7 +62,6 @@
import %(module_name)s
from pypy.translator.js.helper import __show_traceback
-from pypy.translator.transformer.debug import traceback_handler
from pypy.rlib.nonconst import NonConstant as NonConst
%(function_defs)s
@@ -91,7 +87,7 @@
function_base = "%(module_name)s.%(fun_name)s(%(args)s)"
wrapped_function_base = "%(fun_name)s(%(args)s)"
-def get_source_ssf(mod, module_name, function_names, use_debug=True):
+def get_source_ssf(mod, module_name, function_names):
#source_ssf = "\n".join(["import %s" % module_name, "def some_strange_function_which_will_never_be_called():"] + [" "+\
# module_name+"."+fun_name+get_args(mod.__dict__[fun_name]) for fun_name in function_names])
function_list = []
@@ -99,12 +95,7 @@
for fun_name in function_names:
args = get_args(mod.__dict__[fun_name])
arg_names = get_arg_names(mod.__dict__[fun_name])
- if not use_debug:
- base = function_base
- else:
- base = wrapped_function_base
- function_def_list.append(py.code.Source(wrapped_function_def_base %
- locals()))
+ base = function_base
function_list.append(py.code.Source(base % locals()))
function_defs = "\n\n".join([str(i) for i in function_def_list])
functions = "\n".join([str(i.indent()) for i in function_list])
@@ -140,16 +131,13 @@
if func_code.func_code.co_argcount > 0 and func_code.func_code. \
co_argcount != lgt:
raise BadSignature("Function %s does not have default arguments" % func_name)
- source_ssf = get_source_ssf(mod, module_name, function_names,
- jsconfig.debug_transform)
+ source_ssf = get_source_ssf(mod, module_name, function_names)
exec(source_ssf) in globals()
# now we gonna just cut off not needed function
# XXX: Really do that
#options = optparse.Values(defaults=DEFAULT_OPTIONS)
- #options.debug_transform = opts.debug_transform
from pypy.config.pypyoption import get_pypy_config
config = get_pypy_config(translating=True)
- config.translation.debug_transform = jsconfig.debug_transform
driver = TranslationDriver(config=config)
try:
driver.setup(some_strange_function_which_will_never_be_called, [], policy = JsPolicy())
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 Thu Feb 1 12:13:47 2007
@@ -11,7 +11,6 @@
from pypy.translator.js.log import log
from pypy.conftest import option
from pypy.rpython.test.tool import BaseRtypingTest, OORtypeMixin
-from pypy.translator.transformer.debug import DebugTransformer
from pypy.rlib.nonconst import NonConstant
from pypy.rpython.llinterp import LLException
@@ -28,7 +27,7 @@
return True
class compile_function(object):
- def __init__(self, function, annotations, stackless=False, view=False, html=None, is_interactive=False, root = None, run_browser = True, debug_transform = False):
+ def __init__(self, function, annotations, stackless=False, view=False, html=None, is_interactive=False, root = None, run_browser = True):
if not use_browsertest and not _CLI_is_on_path():
py.test.skip('Javascript CLI (js) not found')
@@ -37,8 +36,6 @@
t = TranslationContext()
ann = t.buildannotator()
ann.build_types(function, annotations)
- if debug_transform:
- DebugTransformer(t).transform_all()
if view or option.view:
t.view()
t.buildrtyper(type_system="ootype").specialize()
Modified: pypy/dist/pypy/translator/test/test_driver.py
==============================================================================
--- pypy/dist/pypy/translator/test/test_driver.py (original)
+++ pypy/dist/pypy/translator/test/test_driver.py Thu Feb 1 12:13:47 2007
@@ -34,8 +34,7 @@
assert td.backend_select_goals(['backendopt_lltype']) == [
'backendopt_lltype']
- assert cmpl(td.exposed,
- ['annotate', 'backendopt_lltype',
+ assert cmpl(td.exposed, ['annotate', 'backendopt_lltype',
'backendopt_ootype',
'llinterpret_lltype',
'rtype_ootype', 'rtype_lltype', 'source_cl', 'source_js',
@@ -55,7 +54,8 @@
assert td.backend_select_goals(['backendopt_lltype']) == [
'backendopt_lltype']
- assert cmpl(td.exposed,
- ['annotate', 'backendopt', 'llinterpret', 'rtype', 'source_c',
+ expected = ['annotate', 'backendopt', 'llinterpret', 'rtype', 'source_c',
'source_llvm', 'compile_c', 'compile_llvm', 'run_llvm',
- 'run_c'])
+ 'run_c']
+
+ assert cmpl(td.exposed, expected)
Modified: pypy/dist/pypy/translator/tool/pdbplus.py
==============================================================================
--- pypy/dist/pypy/translator/tool/pdbplus.py (original)
+++ pypy/dist/pypy/translator/tool/pdbplus.py Thu Feb 1 12:13:47 2007
@@ -337,7 +337,7 @@
def do_flowg(self, arg):
- """callg obj
+ """flowg obj
show flow graph for function obj, obj can be an expression or a dotted name
(in which case prefixing with some packages in pypy is tried (see help pypyprefixes))"""
from pypy.translator.tool import graphpage
More information about the Pypy-commit
mailing list