djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py/vm: Make "if" control flow more obvious in YIELD_FROM opcode.

Browse Source
This commit is contained in:
Damien George 2017-07-04 02:14:25 +10:00
parent 9d2c72ad4f
commit 9ed5e80eea
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
py/vm.c
View File

@ -1159,8 +1159,7 @@ yield:
ip--; ip--;
PUSH(ret_value); PUSH(ret_value);
goto yield; goto yield;
} } else if (ret_kind == MP_VM_RETURN_NORMAL) {
if (ret_kind == MP_VM_RETURN_NORMAL) {
// Pop exhausted gen // Pop exhausted gen
sp--; sp--;
// TODO: When ret_value can be MP_OBJ_NULL here?? // TODO: When ret_value can be MP_OBJ_NULL here??
@ -1176,8 +1175,8 @@ yield:
// if it was swallowed, we re-raise GeneratorExit // if it was swallowed, we re-raise GeneratorExit
GENERATOR_EXIT_IF_NEEDED(t_exc); GENERATOR_EXIT_IF_NEEDED(t_exc);
DISPATCH(); DISPATCH();
} } else {
if (ret_kind == MP_VM_RETURN_EXCEPTION) { assert(ret_kind == MP_VM_RETURN_EXCEPTION);
// Pop exhausted gen // Pop exhausted gen
sp--; sp--;
if (EXC_MATCH(ret_value, MP_OBJ_FROM_PTR(&mp_type_StopIteration))) { if (EXC_MATCH(ret_value, MP_OBJ_FROM_PTR(&mp_type_StopIteration))) {