Implement proper exception type hierarchy.
Each built-in exception is now a type, with base type BaseException.
C exceptions are created by passing a pointer to the exception type to
make an instance of. When raising an exception from the VM, an
instance is created automatically if an exception type is raised (as
opposed to an exception instance).
Exception matching (RT_BINARY_OP_EXCEPTION_MATCH) is now proper.
Handling of parse error changed to match new exceptions.
mp_const_type renamed to mp_type_type for consistency.
diff --git a/py/objarray.c b/py/objarray.c
index 4a70f9f..9e36196 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -82,7 +82,7 @@
STATIC mp_obj_t array_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
if (n_args < 1 || n_args > 2) {
- nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "unexpected # of arguments, %d given", n_args));
+ nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "unexpected # of arguments, %d given", n_args));
}
// TODO check args
uint l;
@@ -160,7 +160,7 @@
};
const mp_obj_type_t array_type = {
- { &mp_const_type },
+ { &mp_type_type },
.name = MP_QSTR_array,
.print = array_print,
.make_new = array_make_new,
@@ -222,7 +222,7 @@
}
STATIC const mp_obj_type_t array_it_type = {
- { &mp_const_type },
+ { &mp_type_type },
.name = MP_QSTR_iterator,
.iternext = array_it_iternext,
};