mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

objlist: Support list slice deletion.

This commit is contained in:
Paul Sokolovsky 2014-05-10 23:03:30 +03:00
parent 94d8246272
commit 3f8d34ca83
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
py/objlist.c
View File

@ -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) { STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
if (value == MP_OBJ_NULL) { if (value == MP_OBJ_NULL) {
// delete // 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}; mp_obj_t args[2] = {self_in, index};
list_pop(2, args); list_pop(2, args);
return mp_const_none; return mp_const_none;

9
tests/basics/list_slice_assign.py
View File

@ -11,6 +11,9 @@ print(l)
l = list(x) l = list(x)
l[1:3] = [] l[1:3] = []
print(l) print(l)
l = list(x)
del l[1:3]
print(l)
l = list(x) l = list(x)
l[:3] = [10, 20] l[:3] = [10, 20]
@ -18,6 +21,9 @@ print(l)
l = list(x) l = list(x)
l[:3] = [] l[:3] = []
print(l) print(l)
l = list(x)
del l[:3]
print(l)
l = list(x) l = list(x)
l[:-3] = [10, 20] l[:-3] = [10, 20]
@ -25,3 +31,6 @@ print(l)
l = list(x) l = list(x)
l[:-3] = [] l[:-3] = []
print(l) print(l)
l = list(x)
del l[:-3]
print(l)