Author: Armin Rigo <[email protected]>
Branch:
Changeset: r61994:a6f10254f3ef
Date: 2013-03-04 10:42 +0100
http://bitbucket.org/pypy/pypy/changeset/a6f10254f3ef/
Log: Don't ever call makerepr()! That's always bogus.
diff --git a/rpython/rlib/rweakref.py b/rpython/rlib/rweakref.py
--- a/rpython/rlib/rweakref.py
+++ b/rpython/rlib/rweakref.py
@@ -95,7 +95,7 @@
def rtyper_makerepr(self, rtyper):
from rpython.rlib import _rweakvaldict
return _rweakvaldict.WeakValueDictRepr(rtyper,
- rtyper.makerepr(self.s_key))
+ rtyper.getrepr(self.s_key))
def rtyper_makekey_ex(self, rtyper):
return self.__class__,
diff --git a/rpython/rtyper/rint.py b/rpython/rtyper/rint.py
--- a/rpython/rtyper/rint.py
+++ b/rpython/rtyper/rint.py
@@ -232,7 +232,7 @@
if not s_int1.nonneg or not s_int2.nonneg:
raise TyperError("comparing a signed and an unsigned number")
- repr = hop.rtyper.makerepr(annmodel.unionof(s_int1, s_int2)).as_int
+ repr = hop.rtyper.getrepr(annmodel.unionof(s_int1, s_int2)).as_int
vlist = hop.inputargs(repr, repr)
hop.exception_is_here()
return hop.genop(repr.opprefix+func, vlist, resulttype=Bool)
diff --git a/rpython/rtyper/rtyper.py b/rpython/rtyper/rtyper.py
--- a/rpython/rtyper/rtyper.py
+++ b/rpython/rtyper/rtyper.py
@@ -162,7 +162,7 @@
def makekey(self, s_obj):
return pair(self.type_system, s_obj).rtyper_makekey(self)
- def makerepr(self, s_obj):
+ def _makerepr(self, s_obj):
return pair(self.type_system, s_obj).rtyper_makerepr(self)
def getrepr(self, s_obj):
@@ -173,7 +173,7 @@
result = self.reprs[key]
except KeyError:
self.reprs[key] = None
- result = self.makerepr(s_obj)
+ result = self._makerepr(s_obj)
assert not isinstance(result.lowleveltype, ContainerType), (
"missing a Ptr in the type specification "
"of %s:\n%r" % (s_obj, result.lowleveltype))
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
