2014-05-03 23:27:38 +01:00
|
|
|
/*
|
|
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
|
|
*
|
|
|
|
* The MIT License (MIT)
|
|
|
|
*
|
|
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2013-12-21 18:17:45 +00:00
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
2014-05-02 15:47:01 +01:00
|
|
|
#include "mpconfig.h"
|
2013-12-21 18:17:45 +00:00
|
|
|
#include "nlr.h"
|
|
|
|
#include "misc.h"
|
2014-01-21 21:40:13 +00:00
|
|
|
#include "qstr.h"
|
2013-12-21 18:17:45 +00:00
|
|
|
#include "obj.h"
|
|
|
|
#include "runtime0.h"
|
|
|
|
#include "runtime.h"
|
2014-04-13 04:17:29 +01:00
|
|
|
#include "objlist.h"
|
2013-12-21 18:17:45 +00:00
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t mp_obj_new_list_iterator(mp_obj_list_t *list, int cur);
|
|
|
|
STATIC mp_obj_list_t *list_new(uint n);
|
|
|
|
STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in);
|
2014-04-08 21:32:29 +01:00
|
|
|
STATIC mp_obj_t list_pop(uint n_args, const mp_obj_t *args);
|
2013-12-21 18:17:45 +00:00
|
|
|
|
2014-01-26 23:06:23 +00:00
|
|
|
// TODO: Move to mpconfig.h
|
|
|
|
#define LIST_MIN_ALLOC 4
|
|
|
|
|
2013-12-21 18:17:45 +00:00
|
|
|
/******************************************************************************/
|
|
|
|
/* list */
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC void list_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) {
|
2013-12-21 18:17:45 +00:00
|
|
|
mp_obj_list_t *o = o_in;
|
|
|
|
print(env, "[");
|
|
|
|
for (int i = 0; i < o->len; i++) {
|
|
|
|
if (i > 0) {
|
|
|
|
print(env, ", ");
|
|
|
|
}
|
2014-01-13 17:19:16 +00:00
|
|
|
mp_obj_print_helper(print, env, o->items[i], PRINT_REPR);
|
2013-12-21 18:17:45 +00:00
|
|
|
}
|
|
|
|
print(env, "]");
|
|
|
|
}
|
|
|
|
|
2014-04-13 01:20:10 +01:00
|
|
|
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;
|
2014-04-17 23:19:36 +01:00
|
|
|
while ((item = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
|
2014-04-13 01:20:10 +01:00
|
|
|
mp_obj_list_append(list, item);
|
|
|
|
}
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t list_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
|
2014-05-11 18:37:21 +01:00
|
|
|
mp_arg_check_num(n_args, n_kw, 0, 1, false);
|
2014-01-18 14:10:48 +00:00
|
|
|
|
2014-01-04 20:21:15 +00:00
|
|
|
switch (n_args) {
|
|
|
|
case 0:
|
|
|
|
// return a new, empty list
|
2014-01-19 00:47:40 +00:00
|
|
|
return mp_obj_new_list(0, NULL);
|
2014-01-04 20:21:15 +00:00
|
|
|
|
|
|
|
case 1:
|
2014-05-11 18:37:21 +01:00
|
|
|
default: {
|
2014-01-04 20:21:15 +00:00
|
|
|
// make list from iterable
|
2014-04-13 01:20:10 +01:00
|
|
|
// TODO: optimize list/tuple
|
2014-01-19 00:47:40 +00:00
|
|
|
mp_obj_t list = mp_obj_new_list(0, NULL);
|
2014-04-13 01:20:10 +01:00
|
|
|
return list_extend_from_iter(list, args[0]);
|
2014-01-04 20:21:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-30 13:35:08 +01:00
|
|
|
// Don't pass MP_BINARY_OP_NOT_EQUAL here
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC bool list_cmp_helper(int op, mp_obj_t self_in, mp_obj_t another_in) {
|
2014-03-29 13:43:38 +00:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
|
|
|
|
if (!MP_OBJ_IS_TYPE(another_in, &mp_type_list)) {
|
2014-01-12 00:01:00 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
mp_obj_list_t *self = self_in;
|
|
|
|
mp_obj_list_t *another = another_in;
|
|
|
|
|
2014-02-08 20:49:46 +00:00
|
|
|
return mp_seq_cmp_objs(op, self->items, self->len, another->items, another->len);
|
2014-01-12 00:01:00 +00:00
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t list_unary_op(int op, mp_obj_t self_in) {
|
2014-01-27 23:15:32 +00:00
|
|
|
mp_obj_list_t *self = self_in;
|
|
|
|
switch (op) {
|
2014-03-30 13:35:08 +01:00
|
|
|
case MP_UNARY_OP_BOOL: return MP_BOOL(self->len != 0);
|
|
|
|
case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->len);
|
2014-05-21 19:42:43 +01:00
|
|
|
default: return MP_OBJ_NULL; // op not supported
|
2014-01-27 23:15:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t list_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
|
2013-12-21 18:17:45 +00:00
|
|
|
mp_obj_list_t *o = lhs;
|
|
|
|
switch (op) {
|
2014-04-17 22:10:53 +01:00
|
|
|
case MP_BINARY_OP_ADD: {
|
2014-03-29 13:43:38 +00:00
|
|
|
if (!MP_OBJ_IS_TYPE(rhs, &mp_type_list)) {
|
2014-05-21 19:42:43 +01:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-01-03 02:32:40 +00:00
|
|
|
}
|
|
|
|
mp_obj_list_t *p = rhs;
|
|
|
|
mp_obj_list_t *s = list_new(o->len + p->len);
|
2014-05-10 19:36:33 +01:00
|
|
|
mp_seq_cat(s->items, o->items, o->len, p->items, p->len, mp_obj_t);
|
2014-01-03 02:32:40 +00:00
|
|
|
return s;
|
2014-01-03 02:27:08 +00:00
|
|
|
}
|
2014-04-17 22:10:53 +01:00
|
|
|
case MP_BINARY_OP_INPLACE_ADD: {
|
2014-03-29 13:43:38 +00:00
|
|
|
if (!MP_OBJ_IS_TYPE(rhs, &mp_type_list)) {
|
2014-05-21 19:42:43 +01:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-01-11 22:51:05 +00:00
|
|
|
}
|
|
|
|
list_extend(lhs, rhs);
|
|
|
|
return o;
|
|
|
|
}
|
2014-04-03 12:00:54 +01:00
|
|
|
case MP_BINARY_OP_MULTIPLY: {
|
|
|
|
machine_int_t n;
|
|
|
|
if (!mp_obj_get_int_maybe(rhs, &n)) {
|
2014-05-21 19:42:43 +01:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-01-10 16:12:25 +00:00
|
|
|
}
|
2014-01-20 22:19:19 +00:00
|
|
|
mp_obj_list_t *s = list_new(o->len * n);
|
|
|
|
mp_seq_multiply(o->items, sizeof(*o->items), o->len, n, s->items);
|
2014-01-10 16:12:25 +00:00
|
|
|
return s;
|
|
|
|
}
|
2014-03-30 13:35:08 +01:00
|
|
|
case MP_BINARY_OP_EQUAL:
|
|
|
|
case MP_BINARY_OP_LESS:
|
|
|
|
case MP_BINARY_OP_LESS_EQUAL:
|
|
|
|
case MP_BINARY_OP_MORE:
|
|
|
|
case MP_BINARY_OP_MORE_EQUAL:
|
2014-01-12 00:01:00 +00:00
|
|
|
return MP_BOOL(list_cmp_helper(op, lhs, rhs));
|
|
|
|
|
2013-12-21 18:17:45 +00:00
|
|
|
default:
|
2014-05-21 19:42:43 +01:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2013-12-21 18:17:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-17 22:10:53 +01:00
|
|
|
STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
|
2014-04-08 21:32:29 +01:00
|
|
|
if (value == MP_OBJ_NULL) {
|
2014-04-17 22:10:53 +01:00
|
|
|
// delete
|
2014-06-01 13:32:54 +01:00
|
|
|
#if MICROPY_PY_BUILTINS_SLICE
|
2014-05-10 21:03:30 +01:00
|
|
|
if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
|
|
|
|
mp_obj_list_t *self = self_in;
|
2014-05-25 19:21:57 +01:00
|
|
|
mp_bound_slice_t slice;
|
|
|
|
if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) {
|
2014-05-10 21:03:30 +01:00
|
|
|
assert(0);
|
|
|
|
}
|
|
|
|
|
2014-05-25 19:21:57 +01:00
|
|
|
int len_adj = slice.start - slice.stop;
|
2014-05-10 21:03:30 +01:00
|
|
|
//printf("Len adj: %d\n", len_adj);
|
|
|
|
assert(len_adj <= 0);
|
2014-05-25 19:21:57 +01:00
|
|
|
mp_seq_replace_slice_no_grow(self->items, self->len, slice.start, slice.stop, self->items/*NULL*/, 0, mp_obj_t);
|
2014-05-10 21:03:30 +01:00
|
|
|
// 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
|
2014-04-08 21:32:29 +01:00
|
|
|
mp_obj_t args[2] = {self_in, index};
|
|
|
|
list_pop(2, args);
|
2014-04-17 22:10:53 +01:00
|
|
|
return mp_const_none;
|
|
|
|
} else if (value == MP_OBJ_SENTINEL) {
|
|
|
|
// load
|
|
|
|
mp_obj_list_t *self = self_in;
|
2014-06-01 13:32:54 +01:00
|
|
|
#if MICROPY_PY_BUILTINS_SLICE
|
2014-04-17 22:10:53 +01:00
|
|
|
if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
|
2014-05-25 19:21:57 +01:00
|
|
|
mp_bound_slice_t slice;
|
|
|
|
if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) {
|
2014-05-25 20:12:56 +01:00
|
|
|
return mp_seq_extract_slice(self->len, self->items, &slice);
|
2014-04-17 22:10:53 +01:00
|
|
|
}
|
2014-05-25 19:21:57 +01:00
|
|
|
mp_obj_list_t *res = list_new(slice.stop - slice.start);
|
|
|
|
mp_seq_copy(res->items, self->items + slice.start, res->len, mp_obj_t);
|
2014-04-17 22:10:53 +01:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
uint index_val = mp_get_index(self->base.type, self->len, index, false);
|
|
|
|
return self->items[index_val];
|
2014-04-08 21:32:29 +01:00
|
|
|
} else {
|
2014-06-01 13:32:54 +01:00
|
|
|
#if MICROPY_PY_BUILTINS_SLICE
|
2014-05-10 20:23:00 +01:00
|
|
|
if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
|
|
|
|
mp_obj_list_t *self = self_in;
|
|
|
|
assert(MP_OBJ_IS_TYPE(value, &mp_type_list));
|
|
|
|
mp_obj_list_t *slice = value;
|
2014-05-25 19:21:57 +01:00
|
|
|
mp_bound_slice_t slice_out;
|
|
|
|
if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice_out)) {
|
2014-05-10 20:23:00 +01:00
|
|
|
assert(0);
|
|
|
|
}
|
2014-05-25 19:21:57 +01:00
|
|
|
int len_adj = slice->len - (slice_out.stop - slice_out.start);
|
2014-05-10 20:23:00 +01:00
|
|
|
//printf("Len adj: %d\n", len_adj);
|
2014-05-25 00:36:12 +01:00
|
|
|
if (len_adj > 0) {
|
|
|
|
if (self->len + len_adj > self->alloc) {
|
|
|
|
// TODO: Might optimize memory copies here by checking if block can
|
|
|
|
// be grown inplace or not
|
|
|
|
self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + len_adj);
|
|
|
|
self->alloc = self->len + len_adj;
|
|
|
|
}
|
2014-05-25 19:21:57 +01:00
|
|
|
mp_seq_replace_slice_grow_inplace(self->items, self->len,
|
|
|
|
slice_out.start, slice_out.stop, slice->items, slice->len, len_adj, mp_obj_t);
|
2014-05-25 00:36:12 +01:00
|
|
|
} else {
|
2014-05-25 19:21:57 +01:00
|
|
|
mp_seq_replace_slice_no_grow(self->items, self->len,
|
|
|
|
slice_out.start, slice_out.stop, slice->items, slice->len, mp_obj_t);
|
2014-05-25 00:36:12 +01:00
|
|
|
// Clear "freed" elements at the end of list
|
|
|
|
mp_seq_clear(self->items, self->len + len_adj, self->len, sizeof(*self->items));
|
|
|
|
// TODO: apply allocation policy re: alloc_size
|
|
|
|
}
|
2014-05-10 20:23:00 +01:00
|
|
|
self->len += len_adj;
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
|
|
|
#endif
|
2014-04-08 21:32:29 +01:00
|
|
|
mp_obj_list_store(self_in, index, value);
|
2014-04-17 22:10:53 +01:00
|
|
|
return mp_const_none;
|
2014-04-08 21:32:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t list_getiter(mp_obj_t o_in) {
|
2013-12-21 18:17:45 +00:00
|
|
|
return mp_obj_new_list_iterator(o_in, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t mp_obj_list_append(mp_obj_t self_in, mp_obj_t arg) {
|
2014-03-29 13:43:38 +00:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
|
2013-12-21 18:17:45 +00:00
|
|
|
mp_obj_list_t *self = self_in;
|
|
|
|
if (self->len >= self->alloc) {
|
2013-12-29 19:33:23 +00:00
|
|
|
self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc * 2);
|
2013-12-21 18:17:45 +00:00
|
|
|
self->alloc *= 2;
|
2014-04-27 22:16:57 +01:00
|
|
|
mp_seq_clear(self->items, self->len + 1, self->alloc, sizeof(*self->items));
|
2013-12-21 18:17:45 +00:00
|
|
|
}
|
|
|
|
self->items[self->len++] = arg;
|
|
|
|
return mp_const_none; // return None, as per CPython
|
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in) {
|
2014-03-29 13:43:38 +00:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
|
2014-04-13 01:20:10 +01:00
|
|
|
if (MP_OBJ_IS_TYPE(arg_in, &mp_type_list)) {
|
|
|
|
mp_obj_list_t *self = self_in;
|
|
|
|
mp_obj_list_t *arg = arg_in;
|
|
|
|
|
|
|
|
if (self->len + arg->len > self->alloc) {
|
|
|
|
// TODO: use alloc policy for "4"
|
|
|
|
self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + arg->len + 4);
|
|
|
|
self->alloc = self->len + arg->len + 4;
|
2014-04-27 22:16:57 +01:00
|
|
|
mp_seq_clear(self->items, self->len + arg->len, self->alloc, sizeof(*self->items));
|
2014-04-13 01:20:10 +01:00
|
|
|
}
|
2014-01-11 22:51:05 +00:00
|
|
|
|
2014-04-13 01:20:10 +01:00
|
|
|
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);
|
2014-01-11 22:51:05 +00:00
|
|
|
}
|
|
|
|
return mp_const_none; // return None, as per CPython
|
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t list_pop(uint n_args, const mp_obj_t *args) {
|
2014-01-03 22:53:18 +00:00
|
|
|
assert(1 <= n_args && n_args <= 2);
|
2014-03-29 13:43:38 +00:00
|
|
|
assert(MP_OBJ_IS_TYPE(args[0], &mp_type_list));
|
2014-01-03 22:53:18 +00:00
|
|
|
mp_obj_list_t *self = args[0];
|
|
|
|
if (self->len == 0) {
|
2014-04-05 18:32:08 +01:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "pop from empty list"));
|
2014-01-03 22:53:18 +00:00
|
|
|
}
|
2014-04-27 21:07:37 +01:00
|
|
|
uint index = mp_get_index(self->base.type, self->len, n_args == 1 ? MP_OBJ_NEW_SMALL_INT(-1) : args[1], false);
|
2013-12-21 18:17:45 +00:00
|
|
|
mp_obj_t ret = self->items[index];
|
|
|
|
self->len -= 1;
|
|
|
|
memcpy(self->items + index, self->items + index + 1, (self->len - index) * sizeof(mp_obj_t));
|
2014-04-27 22:16:57 +01:00
|
|
|
// Clear stale pointer from slot which just got freed to prevent GC issues
|
|
|
|
self->items[self->len] = MP_OBJ_NULL;
|
2014-01-26 23:06:23 +00:00
|
|
|
if (self->alloc > LIST_MIN_ALLOC && self->alloc > 2 * self->len) {
|
2014-01-03 22:53:18 +00:00
|
|
|
self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc/2);
|
|
|
|
self->alloc /= 2;
|
|
|
|
}
|
2013-12-21 18:17:45 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO make this conform to CPython's definition of sort
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, bool reversed) {
|
2014-03-30 13:35:08 +01:00
|
|
|
int op = reversed ? MP_BINARY_OP_MORE : MP_BINARY_OP_LESS;
|
2013-12-21 18:17:45 +00:00
|
|
|
while (head < tail) {
|
|
|
|
mp_obj_t *h = head - 1;
|
|
|
|
mp_obj_t *t = tail;
|
2014-03-30 13:35:08 +01:00
|
|
|
mp_obj_t v = key_fn == NULL ? tail[0] : mp_call_function_1(key_fn, tail[0]); // get pivot using key_fn
|
2013-12-21 18:17:45 +00:00
|
|
|
for (;;) {
|
2014-03-30 13:35:08 +01:00
|
|
|
do ++h; while (mp_binary_op(op, key_fn == NULL ? h[0] : mp_call_function_1(key_fn, h[0]), v) == mp_const_true);
|
|
|
|
do --t; while (h < t && mp_binary_op(op, v, key_fn == NULL ? t[0] : mp_call_function_1(key_fn, t[0])) == mp_const_true);
|
2013-12-21 18:17:45 +00:00
|
|
|
if (h >= t) break;
|
|
|
|
mp_obj_t x = h[0];
|
|
|
|
h[0] = t[0];
|
|
|
|
t[0] = x;
|
|
|
|
}
|
|
|
|
mp_obj_t x = h[0];
|
|
|
|
h[0] = tail[0];
|
|
|
|
tail[0] = x;
|
2014-01-07 17:29:16 +00:00
|
|
|
mp_quicksort(head, t, key_fn, reversed);
|
2013-12-21 18:17:45 +00:00
|
|
|
head = h + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-18 14:10:48 +00:00
|
|
|
mp_obj_t mp_obj_list_sort(uint n_args, const mp_obj_t *args, mp_map_t *kwargs) {
|
|
|
|
assert(n_args >= 1);
|
2014-03-29 13:43:38 +00:00
|
|
|
assert(MP_OBJ_IS_TYPE(args[0], &mp_type_list));
|
2014-01-18 14:10:48 +00:00
|
|
|
if (n_args > 1) {
|
2014-04-05 18:32:08 +01:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
|
2014-01-07 17:29:16 +00:00
|
|
|
"list.sort takes no positional arguments"));
|
|
|
|
}
|
2014-01-18 14:10:48 +00:00
|
|
|
mp_obj_list_t *self = args[0];
|
2013-12-21 18:17:45 +00:00
|
|
|
if (self->len > 1) {
|
2014-02-08 19:01:47 +00:00
|
|
|
mp_map_elem_t *keyfun = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(MP_QSTR_key), MP_MAP_LOOKUP);
|
|
|
|
mp_map_elem_t *reverse = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(MP_QSTR_reverse), MP_MAP_LOOKUP);
|
2014-01-07 17:29:16 +00:00
|
|
|
mp_quicksort(self->items, self->items + self->len - 1,
|
|
|
|
keyfun ? keyfun->value : NULL,
|
2014-03-30 13:35:08 +01:00
|
|
|
reverse && reverse->value ? mp_obj_is_true(reverse->value) : false);
|
2013-12-21 18:17:45 +00:00
|
|
|
}
|
|
|
|
return mp_const_none; // return None, as per CPython
|
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t list_clear(mp_obj_t self_in) {
|
2014-03-29 13:43:38 +00:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
|
2014-01-03 23:22:53 +00:00
|
|
|
mp_obj_list_t *self = self_in;
|
|
|
|
self->len = 0;
|
2014-01-26 23:06:23 +00:00
|
|
|
self->items = m_renew(mp_obj_t, self->items, self->alloc, LIST_MIN_ALLOC);
|
|
|
|
self->alloc = LIST_MIN_ALLOC;
|
2014-04-27 22:16:57 +01:00
|
|
|
mp_seq_clear(self->items, 0, self->alloc, sizeof(*self->items));
|
2014-01-03 23:22:53 +00:00
|
|
|
return mp_const_none;
|
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t list_copy(mp_obj_t self_in) {
|
2014-03-29 13:43:38 +00:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
|
2014-01-03 23:42:17 +00:00
|
|
|
mp_obj_list_t *self = self_in;
|
|
|
|
return mp_obj_new_list(self->len, self->items);
|
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t list_count(mp_obj_t self_in, mp_obj_t value) {
|
2014-03-29 13:43:38 +00:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
|
2014-01-03 23:57:28 +00:00
|
|
|
mp_obj_list_t *self = self_in;
|
2014-02-10 05:10:55 +00:00
|
|
|
return mp_seq_count_obj(self->items, self->len, value);
|
2014-01-03 23:57:28 +00:00
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t list_index(uint n_args, const mp_obj_t *args) {
|
2014-01-04 00:26:30 +00:00
|
|
|
assert(2 <= n_args && n_args <= 4);
|
2014-03-29 13:43:38 +00:00
|
|
|
assert(MP_OBJ_IS_TYPE(args[0], &mp_type_list));
|
2014-01-04 00:26:30 +00:00
|
|
|
mp_obj_list_t *self = args[0];
|
2014-02-10 04:37:11 +00:00
|
|
|
return mp_seq_index_obj(self->items, self->len, n_args, args);
|
2014-01-04 00:26:30 +00:00
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t list_insert(mp_obj_t self_in, mp_obj_t idx, mp_obj_t obj) {
|
2014-03-29 13:43:38 +00:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
|
2014-01-04 01:15:01 +00:00
|
|
|
mp_obj_list_t *self = self_in;
|
|
|
|
// insert has its own strange index logic
|
|
|
|
int index = MP_OBJ_SMALL_INT_VALUE(idx);
|
|
|
|
if (index < 0) {
|
|
|
|
index += self->len;
|
|
|
|
}
|
|
|
|
if (index < 0) {
|
|
|
|
index = 0;
|
|
|
|
}
|
|
|
|
if (index > self->len) {
|
|
|
|
index = self->len;
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_list_append(self_in, mp_const_none);
|
|
|
|
|
|
|
|
for (int i = self->len-1; i > index; i--) {
|
|
|
|
self->items[i] = self->items[i-1];
|
|
|
|
}
|
|
|
|
self->items[index] = obj;
|
|
|
|
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t list_remove(mp_obj_t self_in, mp_obj_t value) {
|
2014-03-29 13:43:38 +00:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
|
2014-01-04 01:56:53 +00:00
|
|
|
mp_obj_t args[] = {self_in, value};
|
|
|
|
args[1] = list_index(2, args);
|
|
|
|
list_pop(2, args);
|
|
|
|
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t list_reverse(mp_obj_t self_in) {
|
2014-03-29 13:43:38 +00:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
|
2014-01-04 02:10:29 +00:00
|
|
|
mp_obj_list_t *self = self_in;
|
|
|
|
|
|
|
|
int len = self->len;
|
|
|
|
for (int i = 0; i < len/2; i++) {
|
|
|
|
mp_obj_t *a = self->items[i];
|
|
|
|
self->items[i] = self->items[len-i-1];
|
|
|
|
self->items[len-i-1] = a;
|
|
|
|
}
|
|
|
|
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_append_obj, mp_obj_list_append);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_extend_obj, list_extend);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_clear_obj, list_clear);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_copy_obj, list_copy);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_count_obj, list_count);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_index_obj, 2, 4, list_index);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_3(list_insert_obj, list_insert);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, list_remove);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 0, mp_obj_list_sort);
|
|
|
|
|
2014-03-26 21:47:19 +00:00
|
|
|
STATIC const mp_map_elem_t list_locals_dict_table[] = {
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_append), (mp_obj_t)&list_append_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&list_clear_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&list_copy_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&list_count_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_extend), (mp_obj_t)&list_extend_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_index), (mp_obj_t)&list_index_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_insert), (mp_obj_t)&list_insert_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_pop), (mp_obj_t)&list_pop_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_remove), (mp_obj_t)&list_remove_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_reverse), (mp_obj_t)&list_reverse_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_sort), (mp_obj_t)&list_sort_obj },
|
2014-01-06 17:52:29 +00:00
|
|
|
};
|
2014-01-07 15:58:30 +00:00
|
|
|
|
2014-03-26 21:47:19 +00:00
|
|
|
STATIC MP_DEFINE_CONST_DICT(list_locals_dict, list_locals_dict_table);
|
|
|
|
|
2014-03-29 13:43:38 +00:00
|
|
|
const mp_obj_type_t mp_type_list = {
|
2014-02-15 16:10:44 +00:00
|
|
|
{ &mp_type_type },
|
2014-02-15 11:34:50 +00:00
|
|
|
.name = MP_QSTR_list,
|
2014-01-05 20:34:09 +00:00
|
|
|
.print = list_print,
|
|
|
|
.make_new = list_make_new,
|
2014-01-27 23:15:32 +00:00
|
|
|
.unary_op = list_unary_op,
|
2014-01-05 20:34:09 +00:00
|
|
|
.binary_op = list_binary_op,
|
2014-04-17 22:10:53 +01:00
|
|
|
.subscr = list_subscr,
|
2014-01-05 20:34:09 +00:00
|
|
|
.getiter = list_getiter,
|
2014-03-26 21:47:19 +00:00
|
|
|
.locals_dict = (mp_obj_t)&list_locals_dict,
|
2013-12-21 18:17:45 +00:00
|
|
|
};
|
|
|
|
|
2014-04-13 04:17:29 +01:00
|
|
|
void mp_obj_list_init(mp_obj_list_t *o, uint n) {
|
2014-03-29 13:43:38 +00:00
|
|
|
o->base.type = &mp_type_list;
|
2014-01-26 23:06:23 +00:00
|
|
|
o->alloc = n < LIST_MIN_ALLOC ? LIST_MIN_ALLOC : n;
|
2013-12-21 18:17:45 +00:00
|
|
|
o->len = n;
|
|
|
|
o->items = m_new(mp_obj_t, o->alloc);
|
2014-04-27 22:16:57 +01:00
|
|
|
mp_seq_clear(o->items, n, o->alloc, sizeof(*o->items));
|
2014-04-13 04:17:29 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
STATIC mp_obj_list_t *list_new(uint n) {
|
|
|
|
mp_obj_list_t *o = m_new_obj(mp_obj_list_t);
|
|
|
|
mp_obj_list_init(o, n);
|
2013-12-21 18:17:45 +00:00
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t mp_obj_new_list(uint n, mp_obj_t *items) {
|
|
|
|
mp_obj_list_t *o = list_new(n);
|
2014-02-04 07:44:10 +00:00
|
|
|
if (items != NULL) {
|
|
|
|
for (int i = 0; i < n; i++) {
|
|
|
|
o->items[i] = items[i];
|
|
|
|
}
|
2013-12-21 18:17:45 +00:00
|
|
|
}
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
|
|
|
void mp_obj_list_get(mp_obj_t self_in, uint *len, mp_obj_t **items) {
|
|
|
|
mp_obj_list_t *self = self_in;
|
|
|
|
*len = self->len;
|
|
|
|
*items = self->items;
|
|
|
|
}
|
|
|
|
|
2014-04-08 17:51:47 +01:00
|
|
|
void mp_obj_list_set_len(mp_obj_t self_in, uint len) {
|
|
|
|
// trust that the caller knows what it's doing
|
|
|
|
// TODO realloc if len got much smaller than alloc
|
|
|
|
mp_obj_list_t *self = self_in;
|
|
|
|
self->len = len;
|
|
|
|
}
|
|
|
|
|
2013-12-21 18:17:45 +00:00
|
|
|
void mp_obj_list_store(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
|
|
|
|
mp_obj_list_t *self = self_in;
|
2014-03-13 05:57:16 +00:00
|
|
|
uint i = mp_get_index(self->base.type, self->len, index, false);
|
2013-12-21 18:17:45 +00:00
|
|
|
self->items[i] = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
/* list iterator */
|
|
|
|
|
|
|
|
typedef struct _mp_obj_list_it_t {
|
|
|
|
mp_obj_base_t base;
|
|
|
|
mp_obj_list_t *list;
|
|
|
|
machine_uint_t cur;
|
|
|
|
} mp_obj_list_it_t;
|
|
|
|
|
|
|
|
mp_obj_t list_it_iternext(mp_obj_t self_in) {
|
|
|
|
mp_obj_list_it_t *self = self_in;
|
|
|
|
if (self->cur < self->list->len) {
|
|
|
|
mp_obj_t o_out = self->list->items[self->cur];
|
|
|
|
self->cur += 1;
|
|
|
|
return o_out;
|
|
|
|
} else {
|
2014-04-17 23:19:36 +01:00
|
|
|
return MP_OBJ_STOP_ITERATION;
|
2013-12-21 18:17:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-29 13:43:38 +00:00
|
|
|
STATIC const mp_obj_type_t mp_type_list_it = {
|
2014-02-15 16:10:44 +00:00
|
|
|
{ &mp_type_type },
|
2014-02-15 11:34:50 +00:00
|
|
|
.name = MP_QSTR_iterator,
|
2014-03-30 20:00:12 +01:00
|
|
|
.getiter = mp_identity,
|
2014-01-05 20:34:09 +00:00
|
|
|
.iternext = list_it_iternext,
|
2013-12-21 18:17:45 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
mp_obj_t mp_obj_new_list_iterator(mp_obj_list_t *list, int cur) {
|
|
|
|
mp_obj_list_it_t *o = m_new_obj(mp_obj_list_it_t);
|
2014-03-29 13:43:38 +00:00
|
|
|
o->base.type = &mp_type_list_it;
|
2013-12-21 18:17:45 +00:00
|
|
|
o->list = list;
|
|
|
|
o->cur = cur;
|
|
|
|
return o;
|
|
|
|
}
|