From 49fb6e53b35f991d79caadbb6320a39452944b4d Mon Sep 17 00:00:00 2001 From: "John R. Lenton" Date: Sat, 4 Jan 2014 01:56:53 +0000 Subject: [PATCH] Implements list.remove (in terms of list.index and list.pop). Fixes issue #63. --- py/objlist.c | 11 +++++++++++ tests/basics/tests/list_remove.py | 9 +++++++++ 2 files changed, 20 insertions(+) create mode 100644 tests/basics/tests/list_remove.py diff --git a/py/objlist.c b/py/objlist.c index f5299ddc86..0a795a2b08 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -198,6 +198,15 @@ static mp_obj_t list_insert(mp_obj_t self_in, mp_obj_t idx, mp_obj_t obj) { return mp_const_none; } +static mp_obj_t list_remove(mp_obj_t self_in, mp_obj_t value) { + assert(MP_OBJ_IS_TYPE(self_in, &list_type)); + mp_obj_t args[] = {self_in, value}; + args[1] = list_index(2, args); + list_pop(2, args); + + return mp_const_none; +} + 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); @@ -205,6 +214,7 @@ static MP_DEFINE_CONST_FUN_OBJ_2(list_count_obj, list_count); static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_index_obj, 2, 4, list_index); static MP_DEFINE_CONST_FUN_OBJ_3(list_insert_obj, list_insert); static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop); +static MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, list_remove); static MP_DEFINE_CONST_FUN_OBJ_2(list_sort_obj, list_sort); const mp_obj_type_t list_type = { @@ -224,6 +234,7 @@ const mp_obj_type_t list_type = { { "index", &list_index_obj }, { "insert", &list_insert_obj }, { "pop", &list_pop_obj }, + { "remove", &list_remove_obj }, { "sort", &list_sort_obj }, { NULL, NULL }, // end-of-list sentinel }, diff --git a/tests/basics/tests/list_remove.py b/tests/basics/tests/list_remove.py new file mode 100644 index 0000000000..81b2b3d973 --- /dev/null +++ b/tests/basics/tests/list_remove.py @@ -0,0 +1,9 @@ +a = [1, 2, 3] +print(a.remove(2)) +print(a) +try: + a.remove(2) +except ValueError: + print("Raised ValueError") +else: + raise AssertionError("Did not raise ValueError")