djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

objlist: Make .extend accept arbitrary iterable.

This commit is contained in:
Paul Sokolovsky 2014-04-13 03:20:10 +03:00
parent fe6ded4d17
commit aa6666c45e
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
py/objlist.c
View File

@ -39,6 +39,15 @@ STATIC void list_print(void (*print)(void *env, const char *fmt, ...), void *env
print(env, "]"); print(env, "]");
} }
STATIC mp_obj_t list_extend_from_iter(mp_obj_t list, mp_obj_t iterable) {
mp_obj_t iter = mp_getiter(iterable);
mp_obj_t item;
while ((item = mp_iternext(iter)) != MP_OBJ_NULL) {
mp_obj_list_append(list, item);
}
return list;
}
STATIC mp_obj_t list_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { STATIC mp_obj_t list_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
// TODO check n_kw == 0 // TODO check n_kw == 0
@ -50,13 +59,9 @@ STATIC mp_obj_t list_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp
case 1: case 1:
{ {
// make list from iterable // make list from iterable
mp_obj_t iterable = mp_getiter(args[0]); // TODO: optimize list/tuple
mp_obj_t list = mp_obj_new_list(0, NULL); mp_obj_t list = mp_obj_new_list(0, NULL);
mp_obj_t item; return list_extend_from_iter(list, args[0]);
while ((item = mp_iternext(iterable)) != MP_OBJ_NULL) {
mp_obj_list_append(list, item);
}
return list;
} }
default: default:
@ -173,18 +178,21 @@ mp_obj_t mp_obj_list_append(mp_obj_t self_in, mp_obj_t arg) {
STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in) { STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in) {
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
assert(MP_OBJ_IS_TYPE(arg_in, &mp_type_list)); if (MP_OBJ_IS_TYPE(arg_in, &mp_type_list)) {
mp_obj_list_t *self = self_in; mp_obj_list_t *self = self_in;
mp_obj_list_t *arg = arg_in; mp_obj_list_t *arg = arg_in;
if (self->len + arg->len > self->alloc) { if (self->len + arg->len > self->alloc) {
// TODO: use alloc policy for "4" // TODO: use alloc policy for "4"
self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + arg->len + 4); self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + arg->len + 4);
self->alloc = self->len + arg->len + 4; self->alloc = self->len + arg->len + 4;
}
memcpy(self->items + self->len, arg->items, sizeof(mp_obj_t) * arg->len);
self->len += arg->len;
} else {
list_extend_from_iter(self_in, arg_in);
} }
memcpy(self->items + self->len, arg->items, sizeof(mp_obj_t) * arg->len);
self->len += arg->len;
return mp_const_none; // return None, as per CPython return mp_const_none; // return None, as per CPython
} }

2
tests/basics/list1.py
View File

@ -13,6 +13,8 @@ print(x)
x.extend([100, 200]) x.extend([100, 200])
print(x) print(x)
x.extend(range(3))
print(x)
x += [2, 1] x += [2, 1]
print(x) print(x)