[pypy-svn] r23696 - in pypy/dist/pypy: objspace/flow translator/tool

[arigo at codespeak.net]

Author: arigo
Date: Mon Feb 27 18:12:14 2006
New Revision: 23696

Modified:
   pypy/dist/pypy/objspace/flow/model.py
   pypy/dist/pypy/translator/tool/make_dot.py
Log:
Remove the useless SpamBlock/EggBlock distinction from the displayed flow
graphs.



Modified: pypy/dist/pypy/objspace/flow/model.py
==============================================================================
--- pypy/dist/pypy/objspace/flow/model.py	(original)
+++ pypy/dist/pypy/objspace/flow/model.py	Mon Feb 27 18:12:14 2006
@@ -171,7 +171,7 @@
         self.exc_handler = False          # block at the start of exception handling code
 
     def at(self):
-        if self.operations:
+        if self.operations and self.operations[0].offset >= 0:
             return "@%d" % self.operations[0].offset
         else:
             return ""

Modified: pypy/dist/pypy/translator/tool/make_dot.py
==============================================================================
--- pypy/dist/pypy/translator/tool/make_dot.py	(original)
+++ pypy/dist/pypy/translator/tool/make_dot.py	Mon Feb 27 18:12:14 2006
@@ -143,10 +143,10 @@
 
         iargs = " ".join(map(repr, block.inputargs))
         if block.exc_handler:
-            eh = 'EH'
+            eh = ' (EH)'
         else:
             eh = ''
-        data = "%s%s(%s %s)\\ninputargs: %s\\n\\n" % (name, block.at(), block.__class__.__name__, eh, iargs)
+        data = "%s%s%s\\ninputargs: %s\\n\\n" % (name, block.at(), eh, iargs)
         if block.operations and self.func:
             maxoffs = max([op.offset for op in block.operations])
             if maxoffs >= 0: