kopia lustrzana https://github.com/micropython/micropython
vm: Properly handle StopIteration raised in user instance iterator.
I.e. in bytecode Python functions.pull/1247/merge
rodzic
d5e629ad0e
commit
6738c1dded
6
py/vm.c
6
py/vm.c
|
@ -1249,6 +1249,12 @@ exception_handler:
|
||||||
code_state->ip = ip + ulab; // jump to after for-block
|
code_state->ip = ip + ulab; // jump to after for-block
|
||||||
code_state->sp -= 1; // pop the exhausted iterator
|
code_state->sp -= 1; // pop the exhausted iterator
|
||||||
goto outer_dispatch_loop; // continue with dispatch loop
|
goto outer_dispatch_loop; // continue with dispatch loop
|
||||||
|
} else if (*code_state->ip == MP_BC_YIELD_FROM) {
|
||||||
|
// StopIteration inside yield from call means return a value of
|
||||||
|
// yield from, so inject exception's value as yield from's result
|
||||||
|
*++code_state->sp = mp_obj_exception_get_value(nlr.ret_val);
|
||||||
|
code_state->ip++; // yield from is over, move to next instruction
|
||||||
|
goto outer_dispatch_loop; // continue with dispatch loop
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,3 +42,25 @@ g = gen3()
|
||||||
print(next(g))
|
print(next(g))
|
||||||
print(g.send(5))
|
print(g.send(5))
|
||||||
print(g.send(100))
|
print(g.send(100))
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# Test proper handling of StopIteration vs other exceptions
|
||||||
|
#
|
||||||
|
class MyIter:
|
||||||
|
def __iter__(self):
|
||||||
|
return self
|
||||||
|
def __next__(self):
|
||||||
|
raise StopIteration(42)
|
||||||
|
|
||||||
|
def gen4():
|
||||||
|
global ret
|
||||||
|
ret = yield from MyIter()
|
||||||
|
1//0
|
||||||
|
|
||||||
|
ret = None
|
||||||
|
try:
|
||||||
|
print(list(gen4()))
|
||||||
|
except ZeroDivisionError:
|
||||||
|
print("ZeroDivisionError")
|
||||||
|
print(ret)
|
||||||
|
|
Ładowanie…
Reference in New Issue