10000 py/objdict: Get rid of asserts (remove/replace with mp_check_self()). · sparkfun/circuitpython@83e0eba · GitHub
[go: up one dir, main page]
Skip to content

Commit 83e0eba

Browse files
pfalconpfalcon
committed
py/objdict: Get rid of asserts (remove/replace with mp_check_self()).
1 parent 8c50f93 commit 83e0eba

File tree

1 file changed

+14
-18
lines changed

1 file changed

+14
-18
lines changed

‎py/objdict.c

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ STATIC mp_obj_t dict_getiter(mp_obj_t self_in) {
223223
/* dict methods */
224224

225225
STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
226-
assert(MP_OBJ_IS_DICT_TYPE(self_in));
226+
mp_check_self(MP_OBJ_IS_DICT_TYPE(self_in));
227227
mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
228228

229229
mp_map_clear(&self->map);
@@ -233,7 +233,7 @@ STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
233233
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
234234

235235
STATIC mp_obj_t dict_copy(mp_obj_t self_in) {
236-
asser 10000 t(MP_OBJ_IS_DICT_TYPE(self_in));
236+
mp_check_self(MP_OBJ_IS_DICT_TYPE(self_in));
237237
mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
238238
mp_obj_t other_out = mp_obj_new_dict(self->map.alloc);
239239
mp_obj_dict_t *other = MP_OBJ_TO_PTR(other_out);
@@ -249,7 +249,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy);
249249

250250
// this is a classmethod
251251
STATIC mp_obj_t dict_fromkeys(size_t n_args, const mp_obj_t *args) {
252-
assert(2 <= n_args && n_args <= 3);
253252
mp_obj_t iter = mp_getiter(args[1]);
254253
mp_obj_t len = mp_obj_len_maybe(iter);
255254
mp_obj_t value = mp_const_none;
@@ -303,8 +302,7 @@ STATIC mp_obj_t dict_get_helper(mp_map_t *self, mp_obj_t key, mp_obj_t deflt, mp
303302
}
304303

305304
STATIC mp_obj_t dict_get(size_t n_args, const mp_obj_t *args) {
306-
assert(2 <= n_args && n_args <= 3);
307-
assert(MP_OBJ_IS_DICT_TYPE(args[0]));
305+
mp_check_self(MP_OBJ_IS_DICT_TYPE(args[0]));
308306
mp_obj_dict_t *self = MP_OBJ_TO_PTR(args[0]);
309307

310308
return dict_get_helper(&self->map,
@@ -315,8 +313,7 @@ STATIC mp_obj_t dict_get(size_t n_args, const mp_obj_t *args) {
315313
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get);
316314

317315
STATIC mp_obj_t dict_pop(size_t n_args, const mp_obj_t *args) {
318-
assert(2 <= n_args && n_args <= 3);
319-
assert(MP_OBJ_IS_DICT_TYPE(args[0]));
316+
mp_check_self(MP_OBJ_IS_DICT_TYPE(args[0]));
320317
mp_obj_dict_t *self = MP_OBJ_TO_PTR(args[0]);
321318

322319
return dict_get_helper(&self->map,
@@ -328,8 +325,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop);
328325

329326

330327
STATIC mp_obj_t dict_setdefault(size_t n_args, const mp_obj_t *args) {
331-
assert(2 <= n_args && n_args <= 3);
332-
assert(MP_OBJ_IS_DICT_TYPE(args[0]));
328+
mp_check_self(MP_OBJ_IS_DICT_TYPE(args[0]));
333329
mp_obj_dict_t *self = MP_OBJ_TO_PTR(args[0]);
334330

335331
return dict_get_helper(&self->map,
@@ -341,7 +337,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_setdefault_obj, 2, 3, dict_setde
341337

342338

343339
STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
344-
assert(MP_OBJ_IS_DICT_TYPE(self_in));
340+
mp_check_self(MP_OBJ_IS_DICT_TYPE(self_in));
345341
mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
346342
mp_uint_t cur = 0;
347343
mp_map_elem_t *next = dict_iter_next(self, &cur);
@@ -359,7 +355,7 @@ STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
359355
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_popitem_obj, dict_popitem);
360356

361357
STATIC mp_obj_t dict_update(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
362-
assert(MP_OBJ_IS_DICT_TYPE(args[0]));
358+
mp_check_self(MP_OBJ_IS_DICT_TYPE(args[0]));
363359
mp_obj_dict_t *self = MP_OBJ_TO_PTR(args[0]);
364360

365361
mp_arg_check_num(n_args, kwargs->used, 1, 2, true);
@@ -438,7 +434,7 @@ typedef struct _mp_obj_dict_view_t {
438434
} mp_obj_dict_view_t;
439435

440436
STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
441-
assert(MP_OBJ_IS_TYPE(self_in, &dict_view_it_type));
437+
mp_check_self(MP_OBJ_IS_TYPE(self_in, &dict_view_it_type));
442438
mp_obj_dict_view_it_t *self = MP_OBJ_TO_PTR(self_in);
443439
mp_map_elem_t *next = dict_iter_next(MP_OBJ_TO_PTR(self->dict), &self->cur);
444440

@@ -467,7 +463,7 @@ STATIC const mp_obj_type_t dict_view_it_type = {
467463
};
468464

469465
STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in) {
470-
assert(MP_OBJ_IS_TYPE(view_in, &dict_view_type));
466+
mp_check_self(MP_OBJ_IS_TYPE(view_in, &dict_view_type));
471467
mp_obj_dict_view_t *view = MP_OBJ_TO_PTR(view_in);
472468
mp_obj_dict_view_it_t *o = m_new_obj(mp_obj_dict_view_it_t);
473469
o->base.type = &dict_view_it_type;
@@ -479,7 +475,7 @@ STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in) {
479475

480476
STATIC void dict_view_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
481477
(void)kind;
482-
assert(MP_OBJ_IS_TYPE(self_in, &dict_view_type));
478+
mp_check_self(MP_OBJ_IS_TYPE(self_in, &dict_view_type));
483479
mp_obj_dict_view_t *self = MP_OBJ_TO_PTR(self_in);
484480
bool first = true;
485481
mp_print_str(print, mp_dict_view_names[self->kind]);
@@ -525,7 +521,7 @@ STATIC mp_obj_t mp_obj_new_dict_view(mp_obj_t dict, mp_dict_view_kind_t kind) {
525521
}
526522

527523
STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) {
528-
assert(MP_OBJ_IS_DICT_TYPE(self_in));
524+
mp_check_self(MP_OBJ_IS_DICT_TYPE(self_in));
529525
return mp_obj_new_dict_view(self_in, kind);
530526
}
531527

@@ -612,21 +608,21 @@ mp_uint_t mp_obj_dict_len(mp_obj_t self_in) {
612608
}
613609

614610
mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {
615-
assert(MP_OBJ_IS_DICT_TYPE(self_in));
611+
mp_check_self(MP_OBJ_IS_DICT_TYPE(self_in));
616612
mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
617613
mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
618614
return self_in;
619615
}
620616

621617
mp_obj_t mp_obj_dict_delete(mp_obj_t self_in, mp_obj_t key) {
622-
assert(MP_OBJ_IS_DICT_TYPE(self_in));
618+
mp_check_self(MP_OBJ_IS_DICT_TYPE(self_in));
623619
mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
624620
dict_get_helper(&self->map, key, MP_OBJ_NULL, MP_MAP_LOOKUP_REMOVE_IF_FOUND);
625621
return self_in;
626622
}
627623

628624
mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) {
629-
assert(MP_OBJ_IS_DICT_TYPE(self_in));
625+
mp_check_self(MP_OBJ_IS_DICT_TYPE(self_in));
630626
mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
631627
return &self->map;
632628
}

0 commit comments

Comments
 (0)
0