djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make dict_len use the map's used count

Browse Source
This commit is contained in:
John R. Lenton 2014-01-06 17:54:04 +00:00
parent 4ce6ceadca
commit 7d21d516d2
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
py/objdict.c
View File

@ -128,12 +128,12 @@ static mp_obj_t dict_clear(mp_obj_t self_in) {
return mp_const_none;
}
static MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
/******************************************************************************/
/* dict constructors & etc */
static MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
const mp_obj_type_t dict_type = {
{ &mp_const_type },
"dict",
@ -156,13 +156,7 @@ mp_obj_t mp_obj_new_dict(int n_args) {
uint mp_obj_dict_len(mp_obj_t self_in) {
mp_obj_dict_t *self = self_in;
uint len = 0;
for (int i = 0; i < self->map.alloc; i++) {
if (self->map.table[i].key != NULL) {
len += 1;
}
}
return len;
return self->map.used;
}
mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {