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

Merge pull request #70 from chipaca/list_count

Browse Source 
Implements list.count. Fixes isue #55.
This commit is contained in:
Damien George 2014-01-04 10:09:40 -08:00
commit 4d4bc9533e
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
py/objlist.c
View File

@ -141,9 +141,23 @@ static mp_obj_t list_copy(mp_obj_t self_in) {
return mp_obj_new_list(self->len, self->items);
}
static mp_obj_t list_count(mp_obj_t self_in, mp_obj_t value) {
assert(MP_OBJ_IS_TYPE(self_in, &list_type));
mp_obj_list_t *self = self_in;
int count = 0;
for (int i = 0; i < self->len; i++) {
if (mp_obj_equal(self->items[i], value)) {
count++;
}
}
return mp_obj_new_int(count);
}
static MP_DEFINE_CONST_FUN_OBJ_2(list_append_obj, mp_obj_list_append);
static MP_DEFINE_CONST_FUN_OBJ_1(list_clear_obj, list_clear);
static MP_DEFINE_CONST_FUN_OBJ_1(list_copy_obj, list_copy);
static MP_DEFINE_CONST_FUN_OBJ_2(list_count_obj, list_count);
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop);
static MP_DEFINE_CONST_FUN_OBJ_2(list_sort_obj, list_sort);
@ -160,6 +174,7 @@ const mp_obj_type_t list_type = {
{ "append", &list_append_obj },
{ "clear", &list_clear_obj },
{ "copy", &list_copy_obj },
{ "count", &list_count_obj },
{ "pop", &list_pop_obj },
{ "sort", &list_sort_obj },
{ NULL, NULL }, // end-of-list sentinel

6
tests/basics/tests/list_count.py Normal file
View File

@ -0,0 +1,6 @@
# list count tests
a = [1, 2, 3]
a = a + a + a
b = [0, 0, a, 0, a, 0]
print(a.count(2))
print(b.count(a))