mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py: Use MP_OBJ_NULL instead of NULL when appropriate.

Browse Source
This commit is contained in:
Damien George 2015-11-20 14:09:20 +00:00
parent 54df549b5f
commit 83229d3ffe
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/map.c
View File

@ -306,7 +306,7 @@ mp_obj_t mp_set_lookup(mp_set_t *set, mp_obj_t index, mp_map_lookup_kind_t looku
if (lookup_kind & MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) { if (lookup_kind & MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
mp_set_rehash(set); mp_set_rehash(set);
} else { } else {
return NULL; return MP_OBJ_NULL;
} }
} }
mp_uint_t hash = MP_OBJ_SMALL_INT_VALUE(mp_unary_op(MP_UNARY_OP_HASH, index)); mp_uint_t hash = MP_OBJ_SMALL_INT_VALUE(mp_unary_op(MP_UNARY_OP_HASH, index));

4
py/objdict.c
View File

@ -251,7 +251,7 @@ STATIC mp_obj_t dict_fromkeys(mp_uint_t n_args, const mp_obj_t *args) {
mp_obj_t iter = mp_getiter(args[1]); mp_obj_t iter = mp_getiter(args[1]);
mp_obj_t len = mp_obj_len_maybe(iter); mp_obj_t len = mp_obj_len_maybe(iter);
mp_obj_t value = mp_const_none; mp_obj_t value = mp_const_none;
mp_obj_t next = NULL; mp_obj_t next = MP_OBJ_NULL;
mp_obj_t self_out; mp_obj_t self_out;
if (n_args > 2) { if (n_args > 2) {
@ -374,7 +374,7 @@ STATIC mp_obj_t dict_update(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw
} else { } else {
// update from a generic iterable of pairs // update from a generic iterable of pairs
mp_obj_t iter = mp_getiter(args[1]); mp_obj_t iter = mp_getiter(args[1]);
mp_obj_t next = NULL; mp_obj_t next = MP_OBJ_NULL;
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) { while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
mp_obj_t inneriter = mp_getiter(next); mp_obj_t inneriter = mp_getiter(next);
mp_obj_t key = mp_iternext(inneriter); mp_obj_t key = mp_iternext(inneriter);