diff options
Diffstat (limited to 'py/objset.c')
| -rw-r--r-- | py/objset.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/py/objset.c b/py/objset.c index bdc8d7f382..db3683f608 100644 --- a/py/objset.c +++ b/py/objset.c @@ -59,7 +59,7 @@ STATIC mp_obj_t set_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_ mp_obj_t set = mp_obj_new_set(0, NULL); mp_obj_t iterable = mp_getiter(args[0]); mp_obj_t item; - while ((item = mp_iternext(iterable)) != MP_OBJ_NULL) { + while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) { mp_obj_set_store(set, item); } return set; @@ -90,7 +90,7 @@ STATIC mp_obj_t set_it_iternext(mp_obj_t self_in) { } } - return MP_OBJ_NULL; + return MP_OBJ_STOP_ITERATION; } STATIC mp_obj_t set_getiter(mp_obj_t set_in) { @@ -163,7 +163,7 @@ STATIC mp_obj_t set_diff_int(int n_args, const mp_obj_t *args, bool update) { } else { mp_obj_t iter = mp_getiter(other); mp_obj_t next; - while ((next = mp_iternext(iter)) != MP_OBJ_NULL) { + while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) { set_discard(self, next); } } @@ -194,7 +194,7 @@ STATIC mp_obj_t set_intersect_int(mp_obj_t self_in, mp_obj_t other, bool update) mp_obj_t iter = mp_getiter(other); mp_obj_t next; - while ((next = mp_iternext(iter)) != MP_OBJ_NULL) { + while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) { if (mp_set_lookup(&self->set, next, MP_MAP_LOOKUP)) { set_add(out, next); } @@ -226,7 +226,7 @@ STATIC mp_obj_t set_isdisjoint(mp_obj_t self_in, mp_obj_t other) { mp_obj_t iter = mp_getiter(other); mp_obj_t next; - while ((next = mp_iternext(iter)) != MP_OBJ_NULL) { + while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) { if (mp_set_lookup(&self->set, next, MP_MAP_LOOKUP)) { return mp_const_false; } @@ -259,7 +259,7 @@ STATIC mp_obj_t set_issubset_internal(mp_obj_t self_in, mp_obj_t other_in, bool } else { mp_obj_t iter = set_getiter(self); mp_obj_t next; - while ((next = set_it_iternext(iter)) != MP_OBJ_NULL) { + while ((next = set_it_iternext(iter)) != MP_OBJ_STOP_ITERATION) { if (!mp_set_lookup(&other->set, next, MP_MAP_LOOKUP)) { out = false; break; @@ -331,7 +331,7 @@ STATIC mp_obj_t set_symmetric_difference_update(mp_obj_t self_in, mp_obj_t other mp_obj_set_t *self = self_in; mp_obj_t iter = mp_getiter(other_in); mp_obj_t next; - while ((next = mp_iternext(iter)) != MP_OBJ_NULL) { + while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) { mp_set_lookup(&self->set, next, MP_MAP_LOOKUP_REMOVE_IF_FOUND | MP_MAP_LOOKUP_ADD_IF_NOT_FOUND); } return mp_const_none; @@ -349,7 +349,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(set_symmetric_difference_obj, set_symmetric_dif STATIC void set_update_int(mp_obj_set_t *self, mp_obj_t other_in) { mp_obj_t iter = mp_getiter(other_in); mp_obj_t next; - while ((next = mp_iternext(iter)) != MP_OBJ_NULL) { + while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) { mp_set_lookup(&self->set, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND); } } @@ -379,7 +379,7 @@ STATIC mp_obj_t set_unary_op(int op, mp_obj_t self_in) { switch (op) { case MP_UNARY_OP_BOOL: return MP_BOOL(self->set.used != 0); case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT((machine_int_t)self->set.used); - default: return MP_OBJ_NULL; // op not supported for None + default: return MP_OBJ_NOT_SUPPORTED; } } |