summaryrefslogtreecommitdiffstatshomepage
path: root/py/vm.c
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-03-30 23:14:55 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-03-30 23:30:16 +0300
commitf39d3b93da4b9205a095430e12472051c6b22ef6 (patch)
treeb2f56443f9646bef8035b4a527f1d1f533e6196e /py/vm.c
parenta30cf9f3aff671ada1c84a1977ecf96d473d7256 (diff)
downloadmicropython-f39d3b93da4b9205a095430e12472051c6b22ef6.tar.gz
micropython-f39d3b93da4b9205a095430e12472051c6b22ef6.zip
py: Implement support for generalized generator protocol.
Iterators and ducktype objects can now be arguments of yield from.
Diffstat (limited to 'py/vm.c')
-rw-r--r--py/vm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/py/vm.c b/py/vm.c
index 52d9268184..edcad39565 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -808,9 +808,9 @@ yield:
if (inject_exc != MP_OBJ_NULL) {
t_exc = inject_exc;
inject_exc = MP_OBJ_NULL;
- ret_kind = mp_obj_gen_resume(TOP(), mp_const_none, t_exc, &obj2);
+ ret_kind = mp_resume(TOP(), mp_const_none, t_exc, &obj2);
} else {
- ret_kind = mp_obj_gen_resume(TOP(), obj1, MP_OBJ_NULL, &obj2);
+ ret_kind = mp_resume(TOP(), obj1, MP_OBJ_NULL, &obj2);
}
if (ret_kind == MP_VM_RETURN_YIELD) {