[pypy-svn] r76151 - pypy/trunk/pypy/interpreter

[arigo at codespeak.net]

Author: arigo
Date: Mon Jul 12 17:01:11 2010
New Revision: 76151

Modified:
   pypy/trunk/pypy/interpreter/pyopcode.py
Log:
No-op change: remove special-casing of YIELD_VALUE in the interpreter.


Modified: pypy/trunk/pypy/interpreter/pyopcode.py
==============================================================================
--- pypy/trunk/pypy/interpreter/pyopcode.py	(original)
+++ pypy/trunk/pypy/interpreter/pyopcode.py	Mon Jul 12 17:01:11 2010
@@ -211,10 +211,6 @@
                     next_instr = block.handle(self, unroller)
                     return next_instr    # now inside a 'finally' block
 
-            if opcode == self.opcodedesc.YIELD_VALUE.index:
-                #self.last_instr = intmask(next_instr - 1) XXX clean up!
-                raise Yield
-
             if opcode == self.opcodedesc.END_FINALLY.index:
                 unroller = self.end_finally()
                 if isinstance(unroller, SuspendedUnroller):
@@ -239,7 +235,7 @@
                     if not opdesc.is_enabled(space):
                         continue
                     if opdesc.methodname in (
-                        'EXTENDED_ARG', 'RETURN_VALUE', 'YIELD_VALUE',
+                        'EXTENDED_ARG', 'RETURN_VALUE',
                         'END_FINALLY', 'JUMP_ABSOLUTE'):
                         continue   # opcodes implemented above
 
@@ -814,6 +810,9 @@
                                   self.space.str_w(w_name))
         self.pushvalue(w_obj)
 
+    def YIELD_VALUE(self, oparg, next_instr):
+        raise Yield
+
     def jump_absolute(self, jumpto, next_instr, ec):
         return jumpto