Author: Brian Kearns <[email protected]>
Branch:
Changeset: r70016:084cf842f3c1
Date: 2014-03-17 10:49 -0400
http://bitbucket.org/pypy/pypy/changeset/084cf842f3c1/
Log: cleanup repr of resops with descr but no args
diff --git a/rpython/jit/metainterp/resoperation.py
b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -119,10 +119,11 @@
descr = self.getdescr()
if descr is None or we_are_translated():
return '%s%s%s(%s)' % (prefix, sres, self.getopname(),
- ', '.join([str(a) for a in args]))
+ ', '.join([str(a) for a in args]))
else:
- return '%s%s%s(%s, descr=%r)' % (prefix, sres, self.getopname(),
- ', '.join([str(a) for a in
args]), descr)
+ return '%s%s%s(%s)' % (prefix, sres, self.getopname(),
+ ', '.join([str(a) for a in args] +
+ ['descr=%r' % descr]))
def getopname(self):
try:
diff --git a/rpython/jit/metainterp/test/test_resoperation.py
b/rpython/jit/metainterp/test/test_resoperation.py
--- a/rpython/jit/metainterp/test/test_resoperation.py
+++ b/rpython/jit/metainterp/test/test_resoperation.py
@@ -1,6 +1,7 @@
import py
+import re
from rpython.jit.metainterp import resoperation as rop
-from rpython.jit.metainterp.history import AbstractDescr
+from rpython.jit.metainterp.history import AbstractDescr, AbstractFailDescr
def test_arity_mixins():
cases = [
@@ -55,12 +56,18 @@
op = rop.ResOperation(rop.rop.INT_ADD, ['a', 'b'], 'c')
assert op.getarglist() == ['a', 'b']
assert op.result == 'c'
+ assert repr(op) == "c = int_add(a, b)"
mydescr = AbstractDescr()
op = rop.ResOperation(rop.rop.CALL, ['a', 'b'], 'c', descr=mydescr)
assert op.getarglist() == ['a', 'b']
assert op.result == 'c'
assert op.getdescr() is mydescr
+ assert re.match("c = call\(a, b, descr=<.+>\)$", repr(op))
+
+ mydescr = AbstractFailDescr()
+ op = rop.ResOperation(rop.rop.GUARD_NO_EXCEPTION, [], None, descr=mydescr)
+ assert re.match("guard_no_exception\(descr=<.+>\)$", repr(op))
def test_can_malloc():
mydescr = AbstractDescr()
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
