Author: Lars Wassermann <[email protected]>
Branch:
Changeset: r378:b1e526621495
Date: 2013-05-06 14:59 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/b1e526621495/
Log: using method_str for stack_printing instead of short_str added block
switch to method_str
diff --git a/spyvm/shadow.py b/spyvm/shadow.py
--- a/spyvm/shadow.py
+++ b/spyvm/shadow.py
@@ -712,7 +712,7 @@
padding = ret_str = ''
if self.s_sender() is not None:
padding, ret_str = self.s_sender().print_stack()
- return padding + ' ', '%s\n%s%s' % (ret_str, padding,
self.short_str(0))
+ return padding + ' ', '%s\n%s%s' % (ret_str, padding,
self.method_str())
class BlockContextShadow(ContextPartShadow):
@@ -963,10 +963,8 @@
return retval
def short_str(self, argcount):
- block = '[] of ' if self.is_closure_context() else ''
if argcount == 0:
- return '%s%s (rcvr: %s) [pc: %d]' % (
- block,
+ return '%s (rcvr: %s) [pc: %d]' % (
self.method_str(),
self.w_receiver().as_repr_string(),
self.pc() + 1
@@ -974,8 +972,7 @@
args = '%d' % argcount
for i in range(argcount - 1, -1, -1):
args += ': %s' % self.peek(i).as_repr_string()
- return '%s%s (rcvr: %s) [pc: %d] (%s)' % (
- block,
+ return '%s (rcvr: %s) [pc: %d] (%s)' % (
self.method_str(),
self.w_receiver().as_repr_string(),
self.pc() + 1,
@@ -983,7 +980,8 @@
)
def method_str(self):
- return self.w_method().get_identifier_string()
+ block = '[] of ' if self.is_closure_context() else ''
+ return '%s%s' % (block, self.w_method().get_identifier_string())
class CompiledMethodShadow(object):
_attr_ = ["_w_self", "bytecode",
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
