diff options
| author | Damien George <damien.p.george@gmail.com> | 2020-02-11 11:48:28 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2020-02-13 11:52:40 +1100 |
| commit | ad7213d3c31bccb26a3f54f7492ccf4b0cc920f3 (patch) | |
| tree | 2ab64a805c05d790579052f557a8168061afcebe /py/builtinimport.c | |
| parent | 97eca38c4f03e76bd464fb25974544a043af2a9e (diff) | |
py: Add mp_raise_msg_varg helper and use it where appropriate.
This commit adds mp_raise_msg_varg(type, fmt, ...) as a helper for
nlr_raise(mp_obj_new_exception_msg_varg(type, fmt, ...)). It makes the
C-level API for raising exceptions more consistent, and reduces code size
on most ports:
bare-arm: +28 +0.042%
minimal x86: +100 +0.067%
unix x64: -56 -0.011%
unix nanbox: -300 -0.068%
stm32: -204 -0.054% PYBV10
cc3200: +0 +0.000%
esp8266: -64 -0.010% GENERIC
esp32: -104 -0.007% GENERIC
nrf: -136 -0.094% pca10040
samd: +0 +0.000% ADAFRUIT_ITSYBITSY_M4_EXPRESS
Diffstat (limited to 'py/builtinimport.c')
| -rw-r--r-- | py/builtinimport.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/py/builtinimport.c b/py/builtinimport.c index 9d91b2059..aef1a8017 100644 --- a/py/builtinimport.c +++ b/py/builtinimport.c @@ -401,8 +401,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { mp_raise_msg(&mp_type_ImportError, "module not found"); } else { - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, - "no module named '%q'", mod_name)); + mp_raise_msg_varg(&mp_type_ImportError, "no module named '%q'", mod_name); } } } else { @@ -505,8 +504,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { mp_raise_msg(&mp_type_ImportError, "module not found"); } else { - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, - "no module named '%q'", module_name_qstr)); + mp_raise_msg_varg(&mp_type_ImportError, "no module named '%q'", module_name_qstr); } } |