From e241e8c1698e5299deb10b718ffa30e2cca39301 Mon Sep 17 00:00:00 2001 From: "John R. Lenton" Date: Fri, 3 Jan 2014 23:57:28 +0000 Subject: [PATCH] Implemented list.count --- py/objlist.c | 15 +++++++++++++++ tests/basics/tests/list_count.py | 6 ++++++ 2 files changed, 21 insertions(+) create mode 100644 tests/basics/tests/list_count.py diff --git a/py/objlist.c b/py/objlist.c index e37105798..8b841d4bf 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -140,9 +140,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); @@ -159,6 +173,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 diff --git a/tests/basics/tests/list_count.py b/tests/basics/tests/list_count.py new file mode 100644 index 000000000..db93b3a2f --- /dev/null +++ b/tests/basics/tests/list_count.py @@ -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))