diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-02-15 16:10:44 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-02-15 16:10:44 +0000 |
| commit | c5966128c7c8a768f6726f299d85d5daef6bed48 (patch) | |
| tree | fea6913ae43d722078a837d8c7fd9a1e459f3891 /py/objmap.c | |
| parent | a71c83a1d1aeca1d81d7c673929f8e836dec131e (diff) | |
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.
Diffstat (limited to 'py/objmap.c')
| -rw-r--r-- | py/objmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/objmap.c b/py/objmap.c index 012f0aadb..cbaef6fb9 100644 --- a/py/objmap.c +++ b/py/objmap.c @@ -17,7 +17,7 @@ typedef struct _mp_obj_map_t { STATIC mp_obj_t map_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { if (n_args < 2 || n_kw != 0) { - nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError, "map must have at least 2 arguments and no keyword arguments")); + nlr_jump(mp_obj_new_exception_msg(&mp_type_TypeError, "map must have at least 2 arguments and no keyword arguments")); } assert(n_args >= 2); mp_obj_map_t *o = m_new_obj_var(mp_obj_map_t, mp_obj_t, n_args - 1); @@ -51,7 +51,7 @@ STATIC mp_obj_t map_iternext(mp_obj_t self_in) { } const mp_obj_type_t map_type = { - { &mp_const_type }, + { &mp_type_type }, .name = MP_QSTR_map, .make_new = map_make_new, .getiter = map_getiter, |