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/argcheck.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/argcheck.c')
| -rw-r--r-- | py/argcheck.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/py/argcheck.c b/py/argcheck.c index c2b1b6c07..3b3f9eea8 100644 --- a/py/argcheck.c +++ b/py/argcheck.c @@ -50,9 +50,9 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { mp_arg_error_terse_mismatch(); } else { - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, + mp_raise_msg_varg(&mp_type_TypeError, "function takes %d positional arguments but %d were given", - n_args_min, n_args)); + n_args_min, n_args); } } } else { @@ -60,17 +60,17 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { mp_arg_error_terse_mismatch(); } else { - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, + mp_raise_msg_varg(&mp_type_TypeError, "function missing %d required positional arguments", - n_args_min - n_args)); + n_args_min - n_args); } } else if (n_args > n_args_max) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { mp_arg_error_terse_mismatch(); } else { - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, + mp_raise_msg_varg(&mp_type_TypeError, "function expected at most %d arguments, got %d", - n_args_max, n_args)); + n_args_max, n_args); } } } @@ -93,8 +93,7 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { mp_arg_error_terse_mismatch(); } else { - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, - "'%q' argument required", allowed[i].qst)); + mp_raise_msg_varg(&mp_type_TypeError, "'%q' argument required", allowed[i].qst); } } out_vals[i] = allowed[i].defval; |