[pypy-svn] rev 2074 - pypy/trunk/src/pypy/objspace/flow

[arigo at codespeak.net]

Author: arigo
Date: Sat Oct 25 23:33:13 2003
New Revision: 2074

Modified:
   pypy/trunk/src/pypy/objspace/flow/flowcontext.py
   pypy/trunk/src/pypy/objspace/flow/model.py
Log:
Forgot to check these in, needed for simplify.py.


Modified: pypy/trunk/src/pypy/objspace/flow/flowcontext.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/flow/flowcontext.py	(original)
+++ pypy/trunk/src/pypy/objspace/flow/flowcontext.py	Sat Oct 25 23:33:13 2003
@@ -113,8 +113,7 @@
                 block.dead = True
                 block.operations = ()
                 outputargs = block.framestate.getoutputargs(newstate)
-                block.exits = []
-                block.closeblock(Link(outputargs, newblock))
+                block.recloseblock(Link(outputargs, newblock))
             newblock.patchframe(frame, self)
             self.joinpoints[next_instr] = newblock
 

Modified: pypy/trunk/src/pypy/objspace/flow/model.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/flow/model.py	(original)
+++ pypy/trunk/src/pypy/objspace/flow/model.py	Sat Oct 25 23:33:13 2003
@@ -42,10 +42,14 @@
 
     def closeblock(self, *exits):
         assert self.exits == [], "block already closed"
+        self.recloseblock(*exits)
+        
+    def recloseblock(self, *exits):
         for exit in exits:
             exit.prevblock = self
         self.exits = exits
 
+
 class Variable:
     counter = 0
     def __init__(self, name=None):