Author: Ronan Lamy <[email protected]>
Branch: kill-typesystem
Changeset: r65747:d4e96e6dcae7
Date: 2013-07-28 18:47 +0100
http://bitbucket.org/pypy/pypy/changeset/d4e96e6dcae7/
Log: Actually remove type_system argument from RPythonTyper.__init__()
diff --git a/rpython/jit/metainterp/test/test_virtualizable.py
b/rpython/jit/metainterp/test/test_virtualizable.py
--- a/rpython/jit/metainterp/test/test_virtualizable.py
+++ b/rpython/jit/metainterp/test/test_virtualizable.py
@@ -1069,7 +1069,7 @@
if getattr(graph, 'func', None) is f]
init_graph = t._graphof(Frame.__init__.im_func)
- deref = t.rtyper.type_system_deref
+ deref = t.rtyper.type_system.deref
def direct_calls(graph):
return [deref(op.args[0].value)._callable.func_name
diff --git a/rpython/rtyper/rtyper.py b/rpython/rtyper/rtyper.py
--- a/rpython/rtyper/rtyper.py
+++ b/rpython/rtyper/rtyper.py
@@ -32,19 +32,10 @@
class RPythonTyper(object):
from rpython.rtyper.rmodel import log
- def __init__(self, annotator, type_system="lltype"):
+ def __init__(self, annotator):
self.annotator = annotator
-
self.lowlevel_ann_policy = LowLevelAnnotatorPolicy(self)
-
- if isinstance(type_system, str):
- if type_system == "lltype":
- self.type_system = LowLevelTypeSystem.instance
- else:
- raise TyperError("Unknown type system %r!" % type_system)
- else:
- self.type_system = type_system
- self.type_system_deref = self.type_system.deref
+ self.type_system = LowLevelTypeSystem.instance
self.reprs = {}
self._reprs_must_call_setup = []
self._seen_reprs_must_call_setup = {}
@@ -940,7 +931,7 @@
# build the 'direct_call' operation
f = self.rtyper.getcallable(graph)
c = inputconst(typeOf(f), f)
- fobj = self.rtyper.type_system_deref(f)
+ fobj = self.rtyper.type_system.deref(f)
return self.genop('direct_call', [c]+newargs_v,
resulttype = typeOf(fobj).RESULT)
diff --git a/rpython/rtyper/test/test_rvirtualizable2.py
b/rpython/rtyper/test/test_rvirtualizable2.py
--- a/rpython/rtyper/test/test_rvirtualizable2.py
+++ b/rpython/rtyper/test/test_rvirtualizable2.py
@@ -339,7 +339,7 @@
g(a)
t, typer, graph = self.gengraph(f, [])
- deref = typer.type_system_deref
+ deref = typer.type_system.deref
desc = typer.annotator.bookkeeper.getdesc(g)
g_graphs = desc._cache.items()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
