From c5966128c7c8a768f6726f299d85d5daef6bed48 Mon Sep 17 00:00:00 2001 From: Damien George Date: Sat, 15 Feb 2014 16:10:44 +0000 Subject: 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. --- py/objtuple.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'py/objtuple.c') diff --git a/py/objtuple.c b/py/objtuple.c index de49ce74ef..41ad8a5d58 100644 --- a/py/objtuple.c +++ b/py/objtuple.c @@ -70,7 +70,7 @@ STATIC mp_obj_t tuple_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const m } default: - nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "tuple takes at most 1 argument, %d given", n_args)); + nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "tuple takes at most 1 argument, %d given", n_args)); } } @@ -174,7 +174,7 @@ STATIC const mp_method_t tuple_type_methods[] = { }; const mp_obj_type_t tuple_type = { - { &mp_const_type }, + { &mp_type_type }, .name = MP_QSTR_tuple, .print = tuple_print, .make_new = tuple_make_new, @@ -241,7 +241,7 @@ STATIC mp_obj_t tuple_it_iternext(mp_obj_t self_in) { } STATIC const mp_obj_type_t tuple_it_type = { - { &mp_const_type }, + { &mp_type_type }, .name = MP_QSTR_iterator, .iternext = tuple_it_iternext, }; -- cgit v1.2.3