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/objnamedtuple.c | |
parent | 4b72b3a133ea87a1ef8b964508dc25c551ccf093 (diff) |
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/objnamedtuple.c')
-rw-r--r-- | py/objnamedtuple.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c index 3e3460326..62289f50f 100644 --- a/py/objnamedtuple.c +++ b/py/objnamedtuple.c @@ -44,7 +44,7 @@ typedef struct _mp_obj_namedtuple_t { mp_obj_tuple_t tuple; } mp_obj_namedtuple_t; -STATIC mp_uint_t namedtuple_find_field(mp_obj_namedtuple_type_t *type, qstr name) { +STATIC mp_uint_t namedtuple_find_field(const mp_obj_namedtuple_type_t *type, qstr name) { for (mp_uint_t i = 0; i < type->n_fields; i++) { if (type->fields[i] == name) { return i; @@ -77,8 +77,8 @@ STATIC void namedtuple_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) { } } -STATIC mp_obj_t namedtuple_make_new(mp_obj_t type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) { - mp_obj_namedtuple_type_t *type = MP_OBJ_TO_PTR(type_in); +STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) { + const mp_obj_namedtuple_type_t *type = (const mp_obj_namedtuple_type_t*)type_in; mp_uint_t num_fields = type->n_fields; if (n_args + n_kw != num_fields) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { @@ -130,7 +130,7 @@ STATIC mp_obj_t namedtuple_make_new(mp_obj_t type_in, size_t n_args, size_t n_kw } mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(num_fields, arg_objects)); - tuple->base.type = MP_OBJ_TO_PTR(type_in); + tuple->base.type = type_in; return MP_OBJ_FROM_PTR(tuple); } |