[pypy-commit] pypy ClassRepr: cleanup

rlamy noreply at buildbot.pypy.org
Mon Oct 13 21:00:13 CEST 2014


Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: ClassRepr
Changeset: r73927:4cdddbeb4416
Date: 2014-10-13 19:59 +0100
http://bitbucket.org/pypy/pypy/changeset/4cdddbeb4416/

Log:	cleanup

diff --git a/rpython/rtyper/exceptiondata.py b/rpython/rtyper/exceptiondata.py
--- a/rpython/rtyper/exceptiondata.py
+++ b/rpython/rtyper/exceptiondata.py
@@ -22,7 +22,7 @@
     def __init__(self, rtyper):
         self.make_standard_exceptions(rtyper)
         # (NB. rclass identifies 'Exception' and 'object')
-        r_type = getclassrepr(rtyper, None)
+        r_type = rtyper.rootclass_repr
         r_instance = getinstancerepr(rtyper, None)
         r_type.setup()
         r_instance.setup()
diff --git a/rpython/rtyper/rclass.py b/rpython/rtyper/rclass.py
--- a/rpython/rtyper/rclass.py
+++ b/rpython/rtyper/rclass.py
@@ -437,7 +437,7 @@
         self.fill_vtable_root(self.vtable)
 
 def get_type_repr(rtyper):
-    return getclassrepr(rtyper, None)
+    return rtyper.rootclass_repr
 
 # ____________________________________________________________
 
diff --git a/rpython/rtyper/rpbc.py b/rpython/rtyper/rpbc.py
--- a/rpython/rtyper/rpbc.py
+++ b/rpython/rtyper/rpbc.py
@@ -642,7 +642,7 @@
             attr = hop.args_s[1].const
             if attr == '__name__':
                 from rpython.rtyper.lltypesystem import rstr
-                class_repr = rclass.getclassrepr(self.rtyper, None)
+                class_repr = self.rtyper.rootclass_repr
                 vcls, vattr = hop.inputargs(class_repr, lltype.Void)
                 cname = inputconst(lltype.Void, 'name')
                 return hop.genop('getfield', [vcls, cname],


More information about the pypy-commit mailing list