Author: Manuel Jacob
Branch: refactor-translator
Changeset: r61775:318a8ed33733
Date: 2013-02-25 14:58 +0100
http://bitbucket.org/pypy/pypy/changeset/318a8ed33733/
Log: Fix interactive translator.
diff --git a/rpython/translator/interactive.py
b/rpython/translator/interactive.py
--- a/rpython/translator/interactive.py
+++ b/rpython/translator/interactive.py
@@ -3,8 +3,6 @@
DEFAULTS = {
- 'translation.backend': None,
- 'translation.type_system': None,
'translation.verbose': True,
}
@@ -91,61 +89,57 @@
def rtype(self, **kwds):
self.update_options(kwds)
- ts = self.ensure_type_system()
- return getattr(self.driver, 'rtype_' + ts)()
+ return self.driver.rtype()
def backendopt(self, **kwds):
self.update_options(kwds)
- ts = self.ensure_type_system('lltype')
- return getattr(self.driver, 'backendopt_' + ts)()
+ return self.driver.backendopt()
# backend depedent
def source(self, **kwds):
self.update_options(kwds)
- backend = self.ensure_backend()
- getattr(self.driver, 'source_' + backend)()
+ return self.driver.source()
def source_c(self, **kwds):
self.update_options(kwds)
self.ensure_backend('c')
- self.driver.source_c()
+ self.driver.source()
def source_cl(self, **kwds):
self.update_options(kwds)
self.ensure_backend('cl')
- self.driver.source_cl()
+ self.driver.source()
def compile(self, **kwds):
self.update_options(kwds)
- backend = self.ensure_backend()
- getattr(self.driver, 'compile_' + backend)()
+ self.driver.compile()
return self.driver.c_entryp
def compile_c(self, **kwds):
self.update_options(kwds)
self.ensure_backend('c')
- self.driver.compile_c()
+ self.driver.compile()
return self.driver.c_entryp
def compile_cli(self, **kwds):
self.update_options(kwds)
self.ensure_backend('cli')
- self.driver.compile_cli()
+ self.driver.compile()
return self.driver.c_entryp
def source_cli(self, **kwds):
self.update_options(kwds)
self.ensure_backend('cli')
- self.driver.source_cli()
+ self.driver.source()
def compile_jvm(self, **kwds):
self.update_options(kwds)
self.ensure_backend('jvm')
- self.driver.compile_jvm()
+ self.driver.compile()
return self.driver.c_entryp
def source_jvm(self, **kwds):
self.update_options(kwds)
self.ensure_backend('jvm')
- self.driver.source_jvm()
+ self.driver.source()
diff --git a/rpython/translator/test/test_interactive.py
b/rpython/translator/test/test_interactive.py
--- a/rpython/translator/test/test_interactive.py
+++ b/rpython/translator/test/test_interactive.py
@@ -27,7 +27,7 @@
t.annotate()
t.rtype()
- assert 'rtype_lltype' in t.driver.done
+ assert 'rtype_lltype' in t.driver.done
def test_simple_backendopt():
def f(x, y):
@@ -35,7 +35,7 @@
t = Translation(f, [int, int], backend='c')
t.backendopt()
-
+
assert 'backendopt_lltype' in t.driver.done
def test_simple_source():
@@ -51,9 +51,6 @@
t.source_c()
assert 'source_c' in t.driver.done
- t = Translation(f, [int, int])
- py.test.raises(Exception, "t.source()")
-
def test_disable_logic():
def f(x,y):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
