diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-11-27 17:01:44 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-11-29 14:25:35 +0000 |
| commit | 999cedb90ff0827cdb9dfe0e4faa6ebc1739d271 (patch) | |
| tree | 897eb07b82f1893cfd413b9ef7f625cd996f859d /py/objobject.c | |
| parent | cbf7674025814797f5c537d6d1c195efe58ccaaf (diff) | |
py: Wrap all obj-ptr conversions in MP_OBJ_TO_PTR/MP_OBJ_FROM_PTR.
This allows the mp_obj_t type to be configured to something other than a
pointer-sized primitive type.
This patch also includes additional changes to allow the code to compile
when sizeof(mp_uint_t) != sizeof(void*), such as using size_t instead of
mp_uint_t, and various casts.
Diffstat (limited to 'py/objobject.c')
| -rw-r--r-- | py/objobject.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/py/objobject.c b/py/objobject.c index 6e4d5d4cc..afb9d5af7 100644 --- a/py/objobject.c +++ b/py/objobject.c @@ -37,8 +37,8 @@ STATIC mp_obj_t object_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_ (void)args; mp_arg_check_num(n_args, n_kw, 0, 0, false); mp_obj_object_t *o = m_new_obj(mp_obj_object_t); - o->base.type = type_in; - return o; + o->base.type = MP_OBJ_TO_PTR(type_in); + return MP_OBJ_FROM_PTR(o); } #if MICROPY_CPYTHON_COMPAT @@ -49,7 +49,7 @@ STATIC mp_obj_t object___init__(mp_obj_t self) { STATIC MP_DEFINE_CONST_FUN_OBJ_1(object___init___obj, object___init__); STATIC mp_obj_t object___new__(mp_obj_t cls) { - if (!MP_OBJ_IS_TYPE(cls, &mp_type_type) || !mp_obj_is_instance_type((mp_obj_type_t*)cls)) { + if (!MP_OBJ_IS_TYPE(cls, &mp_type_type) || !mp_obj_is_instance_type((mp_obj_type_t*)MP_OBJ_TO_PTR(cls))) { nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "__new__ arg must be a user-type")); } @@ -77,6 +77,6 @@ const mp_obj_type_t mp_type_object = { .name = MP_QSTR_object, .make_new = object_make_new, #if MICROPY_CPYTHON_COMPAT - .locals_dict = (mp_obj_t)&object_locals_dict, + .locals_dict = (mp_obj_dict_t*)&object_locals_dict, #endif }; |