Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
83229d3f
Commit
83229d3f
authored
Nov 20, 2015
by
Damien George
Browse files
py: Use MP_OBJ_NULL instead of NULL when appropriate.
parent
54df549b
Changes
2
Hide whitespace changes
Inline
Side-by-side
py/map.c
View file @
83229d3f
...
...
@@ -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
)
{
mp_set_rehash
(
set
);
}
else
{
return
NULL
;
return
MP_OBJ_
NULL
;
}
}
mp_uint_t
hash
=
MP_OBJ_SMALL_INT_VALUE
(
mp_unary_op
(
MP_UNARY_OP_HASH
,
index
));
...
...
py/objdict.c
View file @
83229d3f
...
...
@@ -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
len
=
mp_obj_len_maybe
(
iter
);
mp_obj_t
value
=
mp_const_none
;
mp_obj_t
next
=
NULL
;
mp_obj_t
next
=
MP_OBJ_
NULL
;
mp_obj_t
self_out
;
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
{
// update from a generic iterable of pairs
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
)
{
mp_obj_t
inneriter
=
mp_getiter
(
next
);
mp_obj_t
key
=
mp_iternext
(
inneriter
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment