Author: Lars Wassermann <[email protected]>
Branch:
Changeset: r303:825096a81bc1
Date: 2013-04-21 13:31 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/825096a81bc1/
Log: added as_repr_string to word_objects to have the correct class-
string part
diff --git a/spyvm/model.py b/spyvm/model.py
--- a/spyvm/model.py
+++ b/spyvm/model.py
@@ -442,8 +442,8 @@
def as_embellished_string(self, className, additionalInformation):
from rpython.rlib.objectmodel import current_object_addr_as_int
name = self.shadow_of_my_class(self.space).name or "?"
- return "<%s (a %s) %s>" % (className, name,
- #hex(current_object_addr_as_int(self)),
+ return "<%s (a %s) %s>" % (className, name,
+ #hex(current_object_addr_as_int(self)),
additionalInformation)
def invariant(self):
@@ -634,8 +634,8 @@
@jit.elidable
def as_repr_string(self):
- return W_AbstractObjectWithClassReference.as_embellished_string(self,
- className='W_PointersObject',
+ return W_AbstractObjectWithClassReference.as_embellished_string(self,
+ className='W_PointersObject',
additionalInformation='len=%d' % self.size())
def fieldtype(self):
@@ -676,7 +676,7 @@
return self.as_string()
def as_repr_string(self):
- return W_AbstractObjectWithClassReference.as_embellished_string(self,
+ return W_AbstractObjectWithClassReference.as_embellished_string(self,
className='W_BytesObject', additionalInformation=self.as_string())
def as_string(self):
@@ -706,7 +706,7 @@
# XXX Probably we want to allow all subclasses
if not
self.getclass(space).is_same_object(space.w_LargePositiveInteger):
raise error.UnwrappingError("Failed to convert bytes to word")
- word = 0
+ word = 0
for i in range(self.size()):
word += r_uint(ord(self.getchar(i))) << 8*i
return word
@@ -750,6 +750,10 @@
w_result.words = list(self.words)
return w_result
+ def as_repr_string(self):
+ return W_AbstractObjectWithClassReference.as_embellished_string(self,
+ className='W_WordsObject', additionalInformation=('len=%d' %
self.size()))
+
NATIVE_DEPTH = 32
class W_DisplayBitmap(W_AbstractObjectWithClassReference):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
