[pypy-svn] rev 2678 - pypy/trunk/src/pypy/interpreter

[alex at codespeak.net]

Author: alex
Date: Mon Dec 22 17:09:24 2003
New Revision: 2678

Modified:
   pypy/trunk/src/pypy/interpreter/generator.py
   pypy/trunk/src/pypy/interpreter/pyopcode.py
Log:
removed the now-useles hook for generators raising StopIteration (the
issue is now covered in a more general way in pypy_next).



Modified: pypy/trunk/src/pypy/interpreter/generator.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/generator.py	(original)
+++ pypy/trunk/src/pypy/interpreter/generator.py	Mon Dec 22 17:09:24 2003
@@ -35,13 +35,6 @@
         raise SYieldValue(w_yieldedvalue)
     YIELD_STMT = YIELD_VALUE  # misnamed in old versions of dis.opname
 
-    def _make_op_err(f, w_type, w_value):
-        # hook to let a "raise StopIteration" in a generator be a
-        # normal termination for that generator:
-        if w_type is f.space.w_StopIteration:
-            raise SGeneratorReturn()
-        else:
-            raise OperationError(w_type, w_value)
 
 class GeneratorIterator(object):
     "An iterator created by a generator."

Modified: pypy/trunk/src/pypy/interpreter/pyopcode.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/pyopcode.py	(original)
+++ pypy/trunk/src/pypy/interpreter/pyopcode.py	Mon Dec 22 17:09:24 2003
@@ -302,12 +302,6 @@
         if nbargs >= 1: w_type      = f.valuestack.pop()
         w_resulttuple = prepare_raise(f.space, w_type, w_value, w_traceback)
         w_type, w_value, w_traceback = f.space.unpacktuple(w_resulttuple, 3)
-        # XXX the three-arguments 'raise' is not supported yet
-        raise f._make_op_err(w_type, w_value)
-
-    def _make_op_err(f, w_type, w_value):
-        # hook to let a "raise StopIteration" in a generator be a
-        # normal termination for that generator:
         raise OperationError(w_type, w_value)
 
     def LOAD_LOCALS(f):