[pypy-commit] pypy translation-cleanup: Remove FlowSpaceFrame.run()

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: translation-cleanup
Changeset: r56991:3353ffe836be
Date: 2012-08-11 04:42 +0100
http://bitbucket.org/pypy/pypy/changeset/3353ffe836be/

Log:	Remove FlowSpaceFrame.run()

	Put its code back into FlowExecutionContext.build_flow().

diff --git a/pypy/objspace/flow/flowcontext.py b/pypy/objspace/flow/flowcontext.py
--- a/pypy/objspace/flow/flowcontext.py
+++ b/pypy/objspace/flow/flowcontext.py
@@ -206,7 +206,11 @@
             block = self.pendingblocks.popleft()
             try:
                 self.recorder = frame.recording(block)
-                frame.run(self)
+                frame.frame_finished_execution = False
+                next_instr = frame.last_instr
+                while True:
+                    next_instr = frame.handle_bytecode(code.co_code,
+                            next_instr, self)
 
             except operation.OperationThatShouldNotBePropagatedError, e:
                 raise Exception(
@@ -430,13 +434,6 @@
             prevblock = parent
         return recorder
 
-    def run(self, ec):
-        self.frame_finished_execution = False
-        co_code = self.pycode.co_code
-        next_instr = self.last_instr
-        while True:
-            next_instr = self.handle_bytecode(co_code, next_instr, ec)
-
     def YIELD_VALUE(self, _, next_instr):
         assert self.is_generator
         w_result = self.popvalue()