diff options
| -rw-r--r-- | py/objlist.c | 18 | ||||
| -rw-r--r-- | tests/basics/list_slice_assign.py | 9 |
2 files changed, 27 insertions, 0 deletions
diff --git a/py/objlist.c b/py/objlist.c index 4432b2447b..9e30ebb4aa 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -153,6 +153,24 @@ STATIC mp_obj_t list_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) { STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { if (value == MP_OBJ_NULL) { // delete +#if MICROPY_ENABLE_SLICE + if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) { + mp_obj_list_t *self = self_in; + machine_uint_t start, stop; + if (!mp_seq_get_fast_slice_indexes(self->len, index, &start, &stop)) { + assert(0); + } + + int len_adj = start - stop; + //printf("Len adj: %d\n", len_adj); + assert(len_adj <= 0); + mp_seq_replace_slice_no_grow(self->items, self->len, start, stop, self->items/*NULL*/, 0, mp_obj_t); + // Clear "freed" elements at the end of list + mp_seq_clear(self->items, self->len + len_adj, self->len, sizeof(*self->items)); + self->len += len_adj; + return mp_const_none; + } +#endif mp_obj_t args[2] = {self_in, index}; list_pop(2, args); return mp_const_none; diff --git a/tests/basics/list_slice_assign.py b/tests/basics/list_slice_assign.py index f880520461..baa9a00810 100644 --- a/tests/basics/list_slice_assign.py +++ b/tests/basics/list_slice_assign.py @@ -11,6 +11,9 @@ print(l) l = list(x) l[1:3] = [] print(l) +l = list(x) +del l[1:3] +print(l) l = list(x) l[:3] = [10, 20] @@ -18,6 +21,9 @@ print(l) l = list(x) l[:3] = [] print(l) +l = list(x) +del l[:3] +print(l) l = list(x) l[:-3] = [10, 20] @@ -25,3 +31,6 @@ print(l) l = list(x) l[:-3] = [] print(l) +l = list(x) +del l[:-3] +print(l) |