mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

PEP 342 implementation. Per Guido's comments, the generator throw()

Browse source 
method still needs to support string exceptions, and allow None for the
third argument.  Documentation updates are needed, too.
This commit is contained in:
Phillip J. Eby 2005-08-02 00:46:46 +00:00
parent d794666048
commit 0d6615fd29
16 changed files with 862 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Python/ceval.c
View file

@ -499,7 +499,14 @@ PyEval_EvalCode(PyCodeObject *co, PyObject *globals, PyObject *locals)
/* Interpreter main loop */
PyObject *
PyEval_EvalFrame(PyFrameObject *f)
PyEval_EvalFrame(PyFrameObject *f) {
/* This is for backward compatibility with extension modules that
used this API; core interpreter code should call PyEval_EvalFrameEx() */
return PyEval_EvalFrameEx(f, 0);
}
PyObject *
PyEval_EvalFrameEx(PyFrameObject *f, int throw)
{
#ifdef DXPAIRS
int lastopcode = 0;
@ -747,6 +754,11 @@ PyEval_EvalFrame(PyFrameObject *f)
x = Py_None; /* Not a reference, just anything non-NULL */
w = NULL;
if (throw) { /* support for generator.throw() */
why = WHY_EXCEPTION;
goto on_error;
}
for (;;) {
#ifdef WITH_TSC
if (inst1 == 0) {
@ -2733,7 +2745,7 @@ PyEval_EvalCodeEx(PyCodeObject *co, PyObject *globals, PyObject *locals,
return PyGen_New(f);
}
retval = PyEval_EvalFrame(f);
retval = PyEval_EvalFrameEx(f,0);
fail: /* Jump here from prelude on failure */
@ -3636,7 +3648,7 @@ fast_function(PyObject *func, PyObject ***pp_stack, int n, int na, int nk)
Py_INCREF(*stack);
fastlocals[i] = *stack++;
}
retval = PyEval_EvalFrame(f);
retval = PyEval_EvalFrameEx(f,0);
assert(tstate != NULL);
++tstate->recursion_depth;
Py_DECREF(f);