diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-02-15 21:05:25 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-02-15 21:05:25 +0000 |
| commit | 22a0865d54579253c97a0d5916cc7b93bf8a049c (patch) | |
| tree | ee4adb0bcc4b1ba3ae2f6072778d0a41528de0c2 /py/objexcept.c | |
| parent | 8725f8f7debb9b798783f5aae291d00a3950d8fc (diff) | |
| download | micropython-22a0865d54579253c97a0d5916cc7b93bf8a049c.tar.gz micropython-22a0865d54579253c97a0d5916cc7b93bf8a049c.zip | |
py: Improve exception bases, reduces ROM usage.
Thanks to @pfalcon for the tip!
Diffstat (limited to 'py/objexcept.c')
| -rw-r--r-- | py/objexcept.c | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/py/objexcept.c b/py/objexcept.c index d5c056a8d9..dbe702fa9e 100644 --- a/py/objexcept.c +++ b/py/objexcept.c @@ -66,30 +66,34 @@ const mp_obj_type_t mp_type_BaseException = { .make_new = mp_obj_exception_make_new, }; -#define MP_DEFINE_EXCEPTION(exc_name) \ -STATIC const mp_obj_tuple_t mp_type_ ## exc_name ## _bases_tuple = {{&tuple_type}, 1, {(mp_obj_t)&mp_type_BaseException}};\ +#define MP_DEFINE_EXCEPTION_BASE(base_name) \ +STATIC const mp_obj_tuple_t mp_type_ ## base_name ## _base_tuple = {{&tuple_type}, 1, {(mp_obj_t)&mp_type_ ## base_name}};\ + +#define MP_DEFINE_EXCEPTION(exc_name, base_name) \ const mp_obj_type_t mp_type_ ## exc_name = { \ { &mp_type_type }, \ .name = MP_QSTR_ ## exc_name, \ .print = mp_obj_exception_print, \ .make_new = mp_obj_exception_make_new, \ - .bases_tuple = (mp_obj_t)&mp_type_ ## exc_name ## _bases_tuple, \ + .bases_tuple = (mp_obj_t)&mp_type_ ## base_name ## _base_tuple, \ }; -MP_DEFINE_EXCEPTION(AssertionError) -MP_DEFINE_EXCEPTION(AttributeError) -MP_DEFINE_EXCEPTION(ImportError) -MP_DEFINE_EXCEPTION(IndentationError) -MP_DEFINE_EXCEPTION(IndexError) -MP_DEFINE_EXCEPTION(KeyError) -MP_DEFINE_EXCEPTION(NameError) -MP_DEFINE_EXCEPTION(SyntaxError) -MP_DEFINE_EXCEPTION(TypeError) -MP_DEFINE_EXCEPTION(ValueError) -MP_DEFINE_EXCEPTION(OverflowError) -MP_DEFINE_EXCEPTION(OSError) -MP_DEFINE_EXCEPTION(NotImplementedError) -MP_DEFINE_EXCEPTION(StopIteration) +MP_DEFINE_EXCEPTION_BASE(BaseException) + +MP_DEFINE_EXCEPTION(AssertionError, BaseException) +MP_DEFINE_EXCEPTION(AttributeError, BaseException) +MP_DEFINE_EXCEPTION(ImportError, BaseException) +MP_DEFINE_EXCEPTION(IndentationError, BaseException) +MP_DEFINE_EXCEPTION(IndexError, BaseException) +MP_DEFINE_EXCEPTION(KeyError, BaseException) +MP_DEFINE_EXCEPTION(NameError, BaseException) +MP_DEFINE_EXCEPTION(SyntaxError, BaseException) +MP_DEFINE_EXCEPTION(TypeError, BaseException) +MP_DEFINE_EXCEPTION(ValueError, BaseException) +MP_DEFINE_EXCEPTION(OverflowError, BaseException) +MP_DEFINE_EXCEPTION(OSError, BaseException) +MP_DEFINE_EXCEPTION(NotImplementedError, BaseException) +MP_DEFINE_EXCEPTION(StopIteration, BaseException) mp_obj_t mp_obj_new_exception(const mp_obj_type_t *exc_type) { return mp_obj_new_exception_msg_varg(exc_type, NULL); |