Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 21:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement PEP 380 - 'yield from' (closes #11682)

Browse source
This commit is contained in:
Nick Coghlan 2012-01-13 21:43:40 +10:00
parent e51757f6de
commit 1f7ce62bd6
33 changed files with 872 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Python/ceval.c
View file

@ -1828,6 +1828,52 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
why = WHY_RETURN;
goto fast_block_end;
TARGET(YIELD_FROM)
u = POP();
x = PyObject_GetIter(u);
Py_DECREF(u);
if (x == NULL)
break;
/* x is now the iterator, make the first next() call */
retval = (*Py_TYPE(x)->tp_iternext)(x);
if (!retval) {
/* iter may be exhausted */
Py_CLEAR(x);
if (!PyErr_ExceptionMatches(PyExc_StopIteration)) {
/* some other exception */
break;
}
/* try to get return value from exception */
PyObject *et, *ev, *tb;
PyErr_Fetch(&et, &ev, &tb);
Py_XDECREF(et);
Py_XDECREF(tb);
/* u is return value */
u = NULL;
if (ev) {
u = PyObject_GetAttrString(ev, "value");
Py_DECREF(ev);
if (u == NULL) {
if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
/* some other exception */
break;
}
PyErr_Clear();
}
}
if (u == NULL) {
u = Py_None;
Py_INCREF(u);
}
PUSH(u);
continue;
}
/* x is iterator, retval is value to be yielded */
f->f_yieldfrom = x;
f->f_stacktop = stack_pointer;
why = WHY_YIELD;
goto fast_yield;
TARGET(YIELD_VALUE)
retval = POP();
f->f_stacktop = stack_pointer;