diff options
author | Damien George <damien.p.george@gmail.com> | 2014-02-02 13:13:29 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-02-02 13:13:29 +0000 |
commit | 09e1f43200ec28082456042a58d9f39f483f3ad0 (patch) | |
tree | a61fff4a0fbad891177d64bf311c9cb0882b4e1b /py/objlist.c | |
parent | cd82e02e84df5f9f2f3082d865beae25217af2a1 (diff) | |
parent | ea2509d92cbb222854ceb0b323b616b807dd221b (diff) | |
download | micropython-09e1f43200ec28082456042a58d9f39f483f3ad0.tar.gz micropython-09e1f43200ec28082456042a58d9f39f483f3ad0.zip |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/objlist.c')
-rw-r--r-- | py/objlist.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/py/objlist.c b/py/objlist.c index b28ca81279..59a4ad6b12 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -136,7 +136,17 @@ static mp_obj_t list_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) { switch (op) { case RT_BINARY_OP_SUBSCR: { - // list load +#if MICROPY_ENABLE_SLICE + if (MP_OBJ_IS_TYPE(rhs, &slice_type)) { + machine_uint_t start, stop; + if (!m_seq_get_fast_slice_indexes(o->len, rhs, &start, &stop)) { + assert(0); + } + mp_obj_list_t *res = list_new(stop - start); + m_seq_copy(res->items, o->items + start, res->len, mp_obj_t); + return res; + } +#endif uint index = mp_get_index(o->base.type, o->len, rhs); return o->items[index]; } |