Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2025-08-08 03:31:53 +02:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

objslice: Support arbitrary objects start, stop, and step.

Browse Source 
Older int-only encoding is not expressive enough to support arbitrary slice
assignment operations.
This commit is contained in:
Paul Sokolovsky
2014-05-25 01:39:27 +03:00
parent 7a4ddd2428
commit afaaf535e6
5 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
py/sequence.c
View File

@@ -52,12 +52,24 @@ void mp_seq_multiply(const void *items, uint item_sz, uint len, uint times, void
}
bool mp_seq_get_fast_slice_indexes(machine_uint_t len, mp_obj_t slice, machine_uint_t *begin, machine_uint_t *end) {
machine_int_t start, stop, step;
mp_obj_slice_get(slice, &start, &stop, &step);
if (step != 1) {
mp_obj_t ostart, ostop, ostep;
machine_int_t start, stop;
mp_obj_slice_get(slice, &ostart, &ostop, &ostep);
if (ostep != mp_const_none && ostep != MP_OBJ_NEW_SMALL_INT(1)) {
return false;
}
if (ostart == mp_const_none) {
start = 0;
} else {
start = MP_OBJ_SMALL_INT_VALUE(ostart);
}
if (ostop == mp_const_none) {
stop = len;
} else {
stop = MP_OBJ_SMALL_INT_VALUE(ostop);
}
// Unlike subscription, out-of-bounds slice indexes are never error
if (start < 0) {
start = len + start;
@@ -67,7 +79,7 @@ bool mp_seq_get_fast_slice_indexes(machine_uint_t len, mp_obj_t slice, machine_u
} else if (start > len) {
start = len;
}
if (stop <= 0) {
if (stop < 0) {
stop = len + stop;
// CPython returns empty sequence in such case
if (stop < 0) {