diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-05 23:58:49 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-05 23:58:49 +0000 |
| commit | 8137b004b004d8e3a594eab90afccb72b779273a (patch) | |
| tree | 194364c2d286c23a17182bca062261817be91d96 | |
| parent | aa35fc60d77085781ab862fa9a048d3c35823d83 (diff) | |
| parent | d52a0318ce266e1d9ce0d877f64a8fe097cef080 (diff) | |
| download | micropython-8137b004b004d8e3a594eab90afccb72b779273a.tar.gz micropython-8137b004b004d8e3a594eab90afccb72b779273a.zip | |
Merge branch 'list_remove' of git://github.com/chipaca/micropython into chipaca-list_remove
| -rw-r--r-- | py/objlist.c | 11 | ||||
| -rw-r--r-- | tests/basics/tests/list_remove.py | 9 |
2 files changed, 20 insertions, 0 deletions
diff --git a/py/objlist.c b/py/objlist.c index df03d9ae17..dc7ff3e176 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -226,6 +226,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); @@ -233,6 +242,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 = { @@ -251,6 +261,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") |