diff options
author | Damien George <damien.p.george@gmail.com> | 2016-01-13 15:47:56 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2016-01-13 15:47:56 +0000 |
commit | 22d85ec5be77e7ee6b703221d51113f7f21a995b (patch) | |
tree | 52741900f09b57b78c568188b3d7f38f0200eaf0 /py/objenumerate.c | |
parent | 8bb4931fec1d3661487e126ff541479948d50d2e (diff) |
py: Use new code pattern for parsing kw args with mp_arg_parse_all.
Makes code easier to read and more maintainable.
Diffstat (limited to 'py/objenumerate.c')
-rw-r--r-- | py/objenumerate.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/py/objenumerate.c b/py/objenumerate.c index 26a5740a1..2b646ca45 100644 --- a/py/objenumerate.c +++ b/py/objenumerate.c @@ -39,23 +39,25 @@ typedef struct _mp_obj_enumerate_t { STATIC mp_obj_t enumerate_iternext(mp_obj_t self_in); -STATIC const mp_arg_t enumerate_make_new_args[] = { - { MP_QSTR_iterable, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, - { MP_QSTR_start, MP_ARG_INT, {.u_int = 0} }, -}; -#define ENUMERATE_MAKE_NEW_NUM_ARGS MP_ARRAY_SIZE(enumerate_make_new_args) - STATIC mp_obj_t enumerate_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { #if MICROPY_CPYTHON_COMPAT + static const mp_arg_t allowed_args[] = { + { MP_QSTR_iterable, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_start, MP_ARG_INT, {.u_int = 0} }, + }; + // parse args - mp_arg_val_t vals[ENUMERATE_MAKE_NEW_NUM_ARGS]; - mp_arg_parse_all_kw_array(n_args, n_kw, args, ENUMERATE_MAKE_NEW_NUM_ARGS, enumerate_make_new_args, vals); + struct { + mp_arg_val_t iterable, start; + } arg_vals; + mp_arg_parse_all_kw_array(n_args, n_kw, args, + MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t*)&arg_vals); // create enumerate object mp_obj_enumerate_t *o = m_new_obj(mp_obj_enumerate_t); o->base.type = type; - o->iter = mp_getiter(vals[0].u_obj); - o->cur = vals[1].u_int; + o->iter = mp_getiter(arg_vals.iterable.u_obj); + o->cur = arg_vals.start.u_int; #else (void)n_kw; mp_obj_enumerate_t *o = m_new_obj(mp_obj_enumerate_t); |