Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
micropython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
micropython
Commits
83229d3f
Commit
83229d3f
authored
Nov 20, 2015
by
Damien George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
py: Use MP_OBJ_NULL instead of NULL when appropriate.
parent
54df549b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
py/map.c
py/map.c
+1
-1
py/objdict.c
py/objdict.c
+2
-2
No files found.
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
...
@@ -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
));
...
...
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) {
...
@@ -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
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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