Merge pull request #379 from pfalcon/reraise

vm: Implement raise statement w/o args (reraising last exception).
This commit is contained in:
Damien George 2014-03-26 18:59:15 +00:00
commit 688e220d26
2 changed files with 20 additions and 2 deletions

10
py/vm.c
View File

@ -605,8 +605,14 @@ unwind_return:
case MP_BC_RAISE_VARARGS:
unum = *ip++;
assert(unum == 1);
obj1 = POP();
assert(unum <= 1);
if (unum == 0) {
// This assumes that nlr.ret_val holds last raised
// exception and is not overwritten since then.
obj1 = nlr.ret_val;
} else {
obj1 = POP();
}
nlr_jump(rt_make_raise_obj(obj1));
case MP_BC_YIELD_VALUE:

View File

@ -0,0 +1,12 @@
# Re-reraising last exception with raise w/o args
def f():
try:
raise ValueError("val", 3)
except:
raise
try:
f()
except ValueError as e:
print(repr(e))