Merge pull request adafruit#379 from pfalcon/reraise

dpgeorge · dpgeorge · commit 688e220d2686 · 2014-03-26T18:59:15.000Z
vm: Implement raise statement w/o args (reraising last exception).
diff --git a/py/vm.c b/py/vm.c
@@ -605,8 +605,14 @@ mp_vm_return_kind_t mp_execute_byte_code_2(const byte *code_info, const byte **i
 
                     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:
diff --git a/tests/basics/try-reraise.py b/tests/basics/try-reraise.py
@@ -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))
