commit ea13f407a392593e7746131952a57bad222ee882
author Damien George <damien.p.george@gmail.com> Sat Apr 05 18:32:08 2014 +0100
committer Damien George <damien.p.george@gmail.com> Sat Apr 05 18:32:08 2014 +0100
tree 240fb586f678808bb5039a22e06a6214408adfc3
parent 2a037408af77d4c9e9cc98f5f12ea77fab93cc0e

py: Change nlr_jump to nlr_raise, to aid in debugging.

This does not affect code size or performance when debugging turned off.

To address issue #420.

py/objset.c

diff --git a/py/objset.c b/py/objset.c
index 222f76e..12c8cd2 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -65,7 +65,7 @@
         }
 
         default:
-            nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "set takes at most 1 argument, %d given", n_args));
+            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "set takes at most 1 argument, %d given", n_args));
     }
 }
 
@@ -309,7 +309,7 @@
     mp_obj_set_t *self = self_in;
     mp_obj_t obj = mp_set_remove_first(&self->set);
     if (obj == MP_OBJ_NULL) {
-        nlr_jump(mp_obj_new_exception_msg(&mp_type_KeyError, "pop from an empty set"));
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "pop from an empty set"));
     }
     return obj;
 }
@@ -319,7 +319,7 @@
     assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set));
     mp_obj_set_t *self = self_in;
     if (mp_set_lookup(&self->set, item, MP_MAP_LOOKUP_REMOVE_IF_FOUND) == MP_OBJ_NULL) {
-        nlr_jump(mp_obj_new_exception(&mp_type_KeyError));
+        nlr_raise(mp_obj_new_exception(&mp_type_KeyError));
     }
     return mp_const_none;
 }