diff options
author | Damien George <damien.p.george@gmail.com> | 2016-01-03 15:55:55 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2016-01-11 00:49:27 +0000 |
commit | 5b3f0b7f39bd67cc9182993c288f09f67a0890df (patch) | |
tree | d26730229745746b47e536a789a54f989d4ecffd /py/objenumerate.c | |
parent | 4b72b3a133ea87a1ef8b964508dc25c551ccf093 (diff) | |
download | micropython-5b3f0b7f39bd67cc9182993c288f09f67a0890df.tar.gz micropython-5b3f0b7f39bd67cc9182993c288f09f67a0890df.zip |
py: Change first arg of type.make_new from mp_obj_t to mp_obj_type_t*.
The first argument to the type.make_new method is naturally a uPy type,
and all uses of this argument cast it directly to a pointer to a type
structure. So it makes sense to just have it a pointer to a type from
the very beginning (and a const pointer at that). This patch makes
such a change, and removes all unnecessary casting to/from mp_obj_t.
Diffstat (limited to 'py/objenumerate.c')
-rw-r--r-- | py/objenumerate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/py/objenumerate.c b/py/objenumerate.c index 46c3e801df..26a5740a16 100644 --- a/py/objenumerate.c +++ b/py/objenumerate.c @@ -45,7 +45,7 @@ STATIC const mp_arg_t enumerate_make_new_args[] = { }; #define ENUMERATE_MAKE_NEW_NUM_ARGS MP_ARRAY_SIZE(enumerate_make_new_args) -STATIC mp_obj_t enumerate_make_new(mp_obj_t type_in, size_t n_args, size_t n_kw, const mp_obj_t *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 // parse args mp_arg_val_t vals[ENUMERATE_MAKE_NEW_NUM_ARGS]; @@ -53,13 +53,13 @@ STATIC mp_obj_t enumerate_make_new(mp_obj_t type_in, size_t n_args, size_t n_kw, // create enumerate object mp_obj_enumerate_t *o = m_new_obj(mp_obj_enumerate_t); - o->base.type = MP_OBJ_TO_PTR(type_in); + o->base.type = type; o->iter = mp_getiter(vals[0].u_obj); o->cur = vals[1].u_int; #else (void)n_kw; mp_obj_enumerate_t *o = m_new_obj(mp_obj_enumerate_t); - o->base.type = type_in; + o->base.type = type; o->iter = mp_getiter(args[0]); o->cur = n_args > 1 ? mp_obj_get_int(args[1]) : 0; #endif |