Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 1 | #include <string.h> |
| 2 | #include <assert.h> |
| 3 | |
| 4 | #include "nlr.h" |
| 5 | #include "misc.h" |
| 6 | #include "mpconfig.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 7 | #include "qstr.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 8 | #include "obj.h" |
John R. Lenton | c06763a | 2014-01-07 17:29:16 +0000 | [diff] [blame] | 9 | #include "map.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 10 | #include "runtime0.h" |
| 11 | #include "runtime.h" |
| 12 | |
| 13 | typedef struct _mp_obj_list_t { |
| 14 | mp_obj_base_t base; |
| 15 | machine_uint_t alloc; |
| 16 | machine_uint_t len; |
| 17 | mp_obj_t *items; |
| 18 | } mp_obj_list_t; |
| 19 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 20 | STATIC mp_obj_t mp_obj_new_list_iterator(mp_obj_list_t *list, int cur); |
| 21 | STATIC mp_obj_list_t *list_new(uint n); |
| 22 | STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 23 | |
Paul Sokolovsky | ddf1aa9 | 2014-01-27 01:06:23 +0200 | [diff] [blame] | 24 | // TODO: Move to mpconfig.h |
| 25 | #define LIST_MIN_ALLOC 4 |
| 26 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 27 | /******************************************************************************/ |
| 28 | /* list */ |
| 29 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 30 | STATIC void list_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 31 | mp_obj_list_t *o = o_in; |
| 32 | print(env, "["); |
| 33 | for (int i = 0; i < o->len; i++) { |
| 34 | if (i > 0) { |
| 35 | print(env, ", "); |
| 36 | } |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 37 | mp_obj_print_helper(print, env, o->items[i], PRINT_REPR); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 38 | } |
| 39 | print(env, "]"); |
| 40 | } |
| 41 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 42 | STATIC mp_obj_t list_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 43 | // TODO check n_kw == 0 |
| 44 | |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 45 | switch (n_args) { |
| 46 | case 0: |
| 47 | // return a new, empty list |
Damien George | ebde0b8 | 2014-01-19 00:47:40 +0000 | [diff] [blame] | 48 | return mp_obj_new_list(0, NULL); |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 49 | |
| 50 | case 1: |
| 51 | { |
| 52 | // make list from iterable |
| 53 | mp_obj_t iterable = rt_getiter(args[0]); |
Damien George | ebde0b8 | 2014-01-19 00:47:40 +0000 | [diff] [blame] | 54 | mp_obj_t list = mp_obj_new_list(0, NULL); |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 55 | mp_obj_t item; |
Damien George | 66eaf84 | 2014-03-26 19:27:58 +0000 | [diff] [blame] | 56 | while ((item = rt_iternext(iterable)) != MP_OBJ_NULL) { |
Damien George | ebde0b8 | 2014-01-19 00:47:40 +0000 | [diff] [blame] | 57 | mp_obj_list_append(list, item); |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 58 | } |
| 59 | return list; |
| 60 | } |
| 61 | |
| 62 | default: |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 63 | nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "list takes at most 1 argument, %d given", n_args)); |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 64 | } |
ian-v | 5fd8fd2 | 2014-01-06 13:51:53 -0800 | [diff] [blame] | 65 | return NULL; |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 66 | } |
| 67 | |
Damien George | 9aa2a52 | 2014-02-01 23:04:09 +0000 | [diff] [blame] | 68 | // Don't pass RT_BINARY_OP_NOT_EQUAL here |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 69 | STATIC bool list_cmp_helper(int op, mp_obj_t self_in, mp_obj_t another_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 70 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
| 71 | if (!MP_OBJ_IS_TYPE(another_in, &mp_type_list)) { |
Paul Sokolovsky | 1945e60 | 2014-01-12 02:01:00 +0200 | [diff] [blame] | 72 | return false; |
| 73 | } |
| 74 | mp_obj_list_t *self = self_in; |
| 75 | mp_obj_list_t *another = another_in; |
Paul Sokolovsky | 1945e60 | 2014-01-12 02:01:00 +0200 | [diff] [blame] | 76 | |
Paul Sokolovsky | 1a996c4 | 2014-02-08 22:49:46 +0200 | [diff] [blame] | 77 | return mp_seq_cmp_objs(op, self->items, self->len, another->items, another->len); |
Paul Sokolovsky | 1945e60 | 2014-01-12 02:01:00 +0200 | [diff] [blame] | 78 | } |
| 79 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 80 | STATIC mp_obj_t list_unary_op(int op, mp_obj_t self_in) { |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 81 | mp_obj_list_t *self = self_in; |
| 82 | switch (op) { |
Paul Sokolovsky | c1d9bbc | 2014-01-30 04:37:19 +0200 | [diff] [blame] | 83 | case RT_UNARY_OP_BOOL: return MP_BOOL(self->len != 0); |
| 84 | case RT_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->len); |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 85 | default: return MP_OBJ_NULL; // op not supported for None |
| 86 | } |
| 87 | } |
| 88 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 89 | STATIC mp_obj_t list_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 90 | mp_obj_list_t *o = lhs; |
| 91 | switch (op) { |
| 92 | case RT_BINARY_OP_SUBSCR: |
| 93 | { |
Paul Sokolovsky | 13cfabd | 2014-02-02 03:32:55 +0200 | [diff] [blame] | 94 | #if MICROPY_ENABLE_SLICE |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 95 | if (MP_OBJ_IS_TYPE(rhs, &mp_type_slice)) { |
Paul Sokolovsky | 13cfabd | 2014-02-02 03:32:55 +0200 | [diff] [blame] | 96 | machine_uint_t start, stop; |
Paul Sokolovsky | ea2509d | 2014-02-02 08:57:05 +0200 | [diff] [blame] | 97 | if (!m_seq_get_fast_slice_indexes(o->len, rhs, &start, &stop)) { |
| 98 | assert(0); |
| 99 | } |
Paul Sokolovsky | 13cfabd | 2014-02-02 03:32:55 +0200 | [diff] [blame] | 100 | mp_obj_list_t *res = list_new(stop - start); |
| 101 | m_seq_copy(res->items, o->items + start, res->len, mp_obj_t); |
| 102 | return res; |
| 103 | } |
| 104 | #endif |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 105 | uint index = mp_get_index(o->base.type, o->len, rhs, false); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 106 | return o->items[index]; |
| 107 | } |
John R. Lenton | 4cb8058 | 2014-01-03 02:27:08 +0000 | [diff] [blame] | 108 | case RT_BINARY_OP_ADD: |
| 109 | { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 110 | if (!MP_OBJ_IS_TYPE(rhs, &mp_type_list)) { |
John R. Lenton | 81ad89c | 2014-01-03 02:32:40 +0000 | [diff] [blame] | 111 | return NULL; |
| 112 | } |
| 113 | mp_obj_list_t *p = rhs; |
| 114 | mp_obj_list_t *s = list_new(o->len + p->len); |
Paul Sokolovsky | ee4aaf7 | 2014-02-08 23:17:51 +0200 | [diff] [blame] | 115 | m_seq_cat(s->items, o->items, o->len, p->items, p->len, mp_obj_t); |
John R. Lenton | 81ad89c | 2014-01-03 02:32:40 +0000 | [diff] [blame] | 116 | return s; |
John R. Lenton | 4cb8058 | 2014-01-03 02:27:08 +0000 | [diff] [blame] | 117 | } |
Paul Sokolovsky | c698d26 | 2014-01-12 00:51:05 +0200 | [diff] [blame] | 118 | case RT_BINARY_OP_INPLACE_ADD: |
| 119 | { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 120 | if (!MP_OBJ_IS_TYPE(rhs, &mp_type_list)) { |
Paul Sokolovsky | c698d26 | 2014-01-12 00:51:05 +0200 | [diff] [blame] | 121 | return NULL; |
| 122 | } |
| 123 | list_extend(lhs, rhs); |
| 124 | return o; |
| 125 | } |
Paul Sokolovsky | 074d3b5 | 2014-01-10 18:12:25 +0200 | [diff] [blame] | 126 | case RT_BINARY_OP_MULTIPLY: |
| 127 | { |
| 128 | if (!MP_OBJ_IS_SMALL_INT(rhs)) { |
| 129 | return NULL; |
| 130 | } |
| 131 | int n = MP_OBJ_SMALL_INT_VALUE(rhs); |
Paul Sokolovsky | 439542f | 2014-01-21 00:19:19 +0200 | [diff] [blame] | 132 | mp_obj_list_t *s = list_new(o->len * n); |
| 133 | mp_seq_multiply(o->items, sizeof(*o->items), o->len, n, s->items); |
Paul Sokolovsky | 074d3b5 | 2014-01-10 18:12:25 +0200 | [diff] [blame] | 134 | return s; |
| 135 | } |
Damien George | 9aa2a52 | 2014-02-01 23:04:09 +0000 | [diff] [blame] | 136 | case RT_BINARY_OP_EQUAL: |
| 137 | case RT_BINARY_OP_LESS: |
| 138 | case RT_BINARY_OP_LESS_EQUAL: |
| 139 | case RT_BINARY_OP_MORE: |
| 140 | case RT_BINARY_OP_MORE_EQUAL: |
Paul Sokolovsky | 1945e60 | 2014-01-12 02:01:00 +0200 | [diff] [blame] | 141 | return MP_BOOL(list_cmp_helper(op, lhs, rhs)); |
Damien George | 9aa2a52 | 2014-02-01 23:04:09 +0000 | [diff] [blame] | 142 | case RT_BINARY_OP_NOT_EQUAL: |
| 143 | return MP_BOOL(!list_cmp_helper(RT_BINARY_OP_EQUAL, lhs, rhs)); |
Paul Sokolovsky | 1945e60 | 2014-01-12 02:01:00 +0200 | [diff] [blame] | 144 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 145 | default: |
| 146 | // op not supported |
| 147 | return NULL; |
| 148 | } |
| 149 | } |
| 150 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 151 | STATIC mp_obj_t list_getiter(mp_obj_t o_in) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 152 | return mp_obj_new_list_iterator(o_in, 0); |
| 153 | } |
| 154 | |
| 155 | mp_obj_t mp_obj_list_append(mp_obj_t self_in, mp_obj_t arg) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 156 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 157 | mp_obj_list_t *self = self_in; |
| 158 | if (self->len >= self->alloc) { |
Damien | 732407f | 2013-12-29 19:33:23 +0000 | [diff] [blame] | 159 | self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc * 2); |
Paul Sokolovsky | ddf1aa9 | 2014-01-27 01:06:23 +0200 | [diff] [blame] | 160 | assert(self->items); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 161 | self->alloc *= 2; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 162 | } |
| 163 | self->items[self->len++] = arg; |
| 164 | return mp_const_none; // return None, as per CPython |
| 165 | } |
| 166 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 167 | STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 168 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
| 169 | assert(MP_OBJ_IS_TYPE(arg_in, &mp_type_list)); |
Paul Sokolovsky | c698d26 | 2014-01-12 00:51:05 +0200 | [diff] [blame] | 170 | mp_obj_list_t *self = self_in; |
| 171 | mp_obj_list_t *arg = arg_in; |
| 172 | |
| 173 | if (self->len + arg->len > self->alloc) { |
| 174 | // TODO: use alloc policy for "4" |
| 175 | self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + arg->len + 4); |
| 176 | self->alloc = self->len + arg->len + 4; |
| 177 | } |
| 178 | |
| 179 | memcpy(self->items + self->len, arg->items, sizeof(mp_obj_t) * arg->len); |
| 180 | self->len += arg->len; |
| 181 | return mp_const_none; // return None, as per CPython |
| 182 | } |
| 183 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 184 | STATIC mp_obj_t list_pop(uint n_args, const mp_obj_t *args) { |
John R. Lenton | 25f417c | 2014-01-03 22:53:18 +0000 | [diff] [blame] | 185 | assert(1 <= n_args && n_args <= 2); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 186 | assert(MP_OBJ_IS_TYPE(args[0], &mp_type_list)); |
John R. Lenton | 25f417c | 2014-01-03 22:53:18 +0000 | [diff] [blame] | 187 | mp_obj_list_t *self = args[0]; |
| 188 | if (self->len == 0) { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 189 | nlr_jump(mp_obj_new_exception_msg(&mp_type_IndexError, "pop from empty list")); |
John R. Lenton | 25f417c | 2014-01-03 22:53:18 +0000 | [diff] [blame] | 190 | } |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 191 | uint index = mp_get_index(self->base.type, self->len, n_args == 1 ? mp_obj_new_int(-1) : args[1], false); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 192 | mp_obj_t ret = self->items[index]; |
| 193 | self->len -= 1; |
| 194 | memcpy(self->items + index, self->items + index + 1, (self->len - index) * sizeof(mp_obj_t)); |
Paul Sokolovsky | ddf1aa9 | 2014-01-27 01:06:23 +0200 | [diff] [blame] | 195 | if (self->alloc > LIST_MIN_ALLOC && self->alloc > 2 * self->len) { |
John R. Lenton | 25f417c | 2014-01-03 22:53:18 +0000 | [diff] [blame] | 196 | self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc/2); |
| 197 | self->alloc /= 2; |
| 198 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 199 | return ret; |
| 200 | } |
| 201 | |
| 202 | // TODO make this conform to CPython's definition of sort |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 203 | STATIC void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, bool reversed) { |
Damien George | 9aa2a52 | 2014-02-01 23:04:09 +0000 | [diff] [blame] | 204 | int op = reversed ? RT_BINARY_OP_MORE : RT_BINARY_OP_LESS; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 205 | while (head < tail) { |
| 206 | mp_obj_t *h = head - 1; |
| 207 | mp_obj_t *t = tail; |
John R. Lenton | c06763a | 2014-01-07 17:29:16 +0000 | [diff] [blame] | 208 | mp_obj_t v = key_fn == NULL ? tail[0] : rt_call_function_1(key_fn, tail[0]); // get pivot using key_fn |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 209 | for (;;) { |
John R. Lenton | b8698fc | 2014-01-11 00:58:59 +0000 | [diff] [blame] | 210 | do ++h; while (rt_binary_op(op, key_fn == NULL ? h[0] : rt_call_function_1(key_fn, h[0]), v) == mp_const_true); |
| 211 | do --t; while (h < t && rt_binary_op(op, v, key_fn == NULL ? t[0] : rt_call_function_1(key_fn, t[0])) == mp_const_true); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 212 | if (h >= t) break; |
| 213 | mp_obj_t x = h[0]; |
| 214 | h[0] = t[0]; |
| 215 | t[0] = x; |
| 216 | } |
| 217 | mp_obj_t x = h[0]; |
| 218 | h[0] = tail[0]; |
| 219 | tail[0] = x; |
John R. Lenton | c06763a | 2014-01-07 17:29:16 +0000 | [diff] [blame] | 220 | mp_quicksort(head, t, key_fn, reversed); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 221 | head = h + 1; |
| 222 | } |
| 223 | } |
| 224 | |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 225 | mp_obj_t mp_obj_list_sort(uint n_args, const mp_obj_t *args, mp_map_t *kwargs) { |
| 226 | assert(n_args >= 1); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 227 | assert(MP_OBJ_IS_TYPE(args[0], &mp_type_list)); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 228 | if (n_args > 1) { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 229 | nlr_jump(mp_obj_new_exception_msg(&mp_type_TypeError, |
John R. Lenton | c06763a | 2014-01-07 17:29:16 +0000 | [diff] [blame] | 230 | "list.sort takes no positional arguments")); |
| 231 | } |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 232 | mp_obj_list_t *self = args[0]; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 233 | if (self->len > 1) { |
Damien George | 7d0bfbe | 2014-02-08 19:01:47 +0000 | [diff] [blame] | 234 | mp_map_elem_t *keyfun = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(MP_QSTR_key), MP_MAP_LOOKUP); |
| 235 | mp_map_elem_t *reverse = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(MP_QSTR_reverse), MP_MAP_LOOKUP); |
John R. Lenton | c06763a | 2014-01-07 17:29:16 +0000 | [diff] [blame] | 236 | mp_quicksort(self->items, self->items + self->len - 1, |
| 237 | keyfun ? keyfun->value : NULL, |
| 238 | reverse && reverse->value ? rt_is_true(reverse->value) : false); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 239 | } |
| 240 | return mp_const_none; // return None, as per CPython |
| 241 | } |
| 242 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 243 | STATIC mp_obj_t list_clear(mp_obj_t self_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 244 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
John R. Lenton | 069ded9 | 2014-01-03 23:22:53 +0000 | [diff] [blame] | 245 | mp_obj_list_t *self = self_in; |
| 246 | self->len = 0; |
Paul Sokolovsky | ddf1aa9 | 2014-01-27 01:06:23 +0200 | [diff] [blame] | 247 | self->items = m_renew(mp_obj_t, self->items, self->alloc, LIST_MIN_ALLOC); |
| 248 | self->alloc = LIST_MIN_ALLOC; |
John R. Lenton | 069ded9 | 2014-01-03 23:22:53 +0000 | [diff] [blame] | 249 | return mp_const_none; |
| 250 | } |
| 251 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 252 | STATIC mp_obj_t list_copy(mp_obj_t self_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 253 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
John R. Lenton | 26c2116 | 2014-01-03 23:42:17 +0000 | [diff] [blame] | 254 | mp_obj_list_t *self = self_in; |
| 255 | return mp_obj_new_list(self->len, self->items); |
| 256 | } |
| 257 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 258 | STATIC mp_obj_t list_count(mp_obj_t self_in, mp_obj_t value) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 259 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
John R. Lenton | e241e8c | 2014-01-03 23:57:28 +0000 | [diff] [blame] | 260 | mp_obj_list_t *self = self_in; |
Paul Sokolovsky | ac0134d | 2014-02-10 07:10:55 +0200 | [diff] [blame] | 261 | return mp_seq_count_obj(self->items, self->len, value); |
John R. Lenton | e241e8c | 2014-01-03 23:57:28 +0000 | [diff] [blame] | 262 | } |
| 263 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 264 | STATIC mp_obj_t list_index(uint n_args, const mp_obj_t *args) { |
John R. Lenton | 5d4a821 | 2014-01-04 00:26:30 +0000 | [diff] [blame] | 265 | assert(2 <= n_args && n_args <= 4); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 266 | assert(MP_OBJ_IS_TYPE(args[0], &mp_type_list)); |
John R. Lenton | 5d4a821 | 2014-01-04 00:26:30 +0000 | [diff] [blame] | 267 | mp_obj_list_t *self = args[0]; |
Paul Sokolovsky | 0cd1dc0 | 2014-02-10 06:37:11 +0200 | [diff] [blame] | 268 | return mp_seq_index_obj(self->items, self->len, n_args, args); |
John R. Lenton | 5d4a821 | 2014-01-04 00:26:30 +0000 | [diff] [blame] | 269 | } |
| 270 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 271 | STATIC mp_obj_t list_insert(mp_obj_t self_in, mp_obj_t idx, mp_obj_t obj) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 272 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
John R. Lenton | 45a8744 | 2014-01-04 01:15:01 +0000 | [diff] [blame] | 273 | mp_obj_list_t *self = self_in; |
| 274 | // insert has its own strange index logic |
| 275 | int index = MP_OBJ_SMALL_INT_VALUE(idx); |
| 276 | if (index < 0) { |
| 277 | index += self->len; |
| 278 | } |
| 279 | if (index < 0) { |
| 280 | index = 0; |
| 281 | } |
| 282 | if (index > self->len) { |
| 283 | index = self->len; |
| 284 | } |
| 285 | |
| 286 | mp_obj_list_append(self_in, mp_const_none); |
| 287 | |
| 288 | for (int i = self->len-1; i > index; i--) { |
| 289 | self->items[i] = self->items[i-1]; |
| 290 | } |
| 291 | self->items[index] = obj; |
| 292 | |
| 293 | return mp_const_none; |
| 294 | } |
| 295 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 296 | STATIC mp_obj_t list_remove(mp_obj_t self_in, mp_obj_t value) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 297 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
John R. Lenton | 49fb6e5 | 2014-01-04 01:56:53 +0000 | [diff] [blame] | 298 | mp_obj_t args[] = {self_in, value}; |
| 299 | args[1] = list_index(2, args); |
| 300 | list_pop(2, args); |
| 301 | |
| 302 | return mp_const_none; |
| 303 | } |
| 304 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 305 | STATIC mp_obj_t list_reverse(mp_obj_t self_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 306 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
John R. Lenton | 6e1e98f | 2014-01-04 02:10:29 +0000 | [diff] [blame] | 307 | mp_obj_list_t *self = self_in; |
| 308 | |
| 309 | int len = self->len; |
| 310 | for (int i = 0; i < len/2; i++) { |
| 311 | mp_obj_t *a = self->items[i]; |
| 312 | self->items[i] = self->items[len-i-1]; |
| 313 | self->items[len-i-1] = a; |
| 314 | } |
| 315 | |
| 316 | return mp_const_none; |
| 317 | } |
| 318 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 319 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_append_obj, mp_obj_list_append); |
| 320 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_extend_obj, list_extend); |
| 321 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_clear_obj, list_clear); |
| 322 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_copy_obj, list_copy); |
| 323 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_count_obj, list_count); |
| 324 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_index_obj, 2, 4, list_index); |
| 325 | STATIC MP_DEFINE_CONST_FUN_OBJ_3(list_insert_obj, list_insert); |
| 326 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop); |
| 327 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, list_remove); |
| 328 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse); |
| 329 | STATIC MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 0, mp_obj_list_sort); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 330 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 331 | STATIC const mp_map_elem_t list_locals_dict_table[] = { |
| 332 | { MP_OBJ_NEW_QSTR(MP_QSTR_append), (mp_obj_t)&list_append_obj }, |
| 333 | { MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&list_clear_obj }, |
| 334 | { MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&list_copy_obj }, |
| 335 | { MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&list_count_obj }, |
| 336 | { MP_OBJ_NEW_QSTR(MP_QSTR_extend), (mp_obj_t)&list_extend_obj }, |
| 337 | { MP_OBJ_NEW_QSTR(MP_QSTR_index), (mp_obj_t)&list_index_obj }, |
| 338 | { MP_OBJ_NEW_QSTR(MP_QSTR_insert), (mp_obj_t)&list_insert_obj }, |
| 339 | { MP_OBJ_NEW_QSTR(MP_QSTR_pop), (mp_obj_t)&list_pop_obj }, |
| 340 | { MP_OBJ_NEW_QSTR(MP_QSTR_remove), (mp_obj_t)&list_remove_obj }, |
| 341 | { MP_OBJ_NEW_QSTR(MP_QSTR_reverse), (mp_obj_t)&list_reverse_obj }, |
| 342 | { MP_OBJ_NEW_QSTR(MP_QSTR_sort), (mp_obj_t)&list_sort_obj }, |
ian-v | 7a16fad | 2014-01-06 09:52:29 -0800 | [diff] [blame] | 343 | }; |
Damien George | 97209d3 | 2014-01-07 15:58:30 +0000 | [diff] [blame] | 344 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 345 | STATIC MP_DEFINE_CONST_DICT(list_locals_dict, list_locals_dict_table); |
| 346 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 347 | const mp_obj_type_t mp_type_list = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 348 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 349 | .name = MP_QSTR_list, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 350 | .print = list_print, |
| 351 | .make_new = list_make_new, |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 352 | .unary_op = list_unary_op, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 353 | .binary_op = list_binary_op, |
| 354 | .getiter = list_getiter, |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 355 | .locals_dict = (mp_obj_t)&list_locals_dict, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 356 | }; |
| 357 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 358 | STATIC mp_obj_list_t *list_new(uint n) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 359 | mp_obj_list_t *o = m_new_obj(mp_obj_list_t); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 360 | o->base.type = &mp_type_list; |
Paul Sokolovsky | ddf1aa9 | 2014-01-27 01:06:23 +0200 | [diff] [blame] | 361 | o->alloc = n < LIST_MIN_ALLOC ? LIST_MIN_ALLOC : n; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 362 | o->len = n; |
| 363 | o->items = m_new(mp_obj_t, o->alloc); |
| 364 | return o; |
| 365 | } |
| 366 | |
| 367 | mp_obj_t mp_obj_new_list(uint n, mp_obj_t *items) { |
| 368 | mp_obj_list_t *o = list_new(n); |
Paul Sokolovsky | e5a15cb | 2014-02-04 09:44:10 +0200 | [diff] [blame] | 369 | if (items != NULL) { |
| 370 | for (int i = 0; i < n; i++) { |
| 371 | o->items[i] = items[i]; |
| 372 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 373 | } |
| 374 | return o; |
| 375 | } |
| 376 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 377 | void mp_obj_list_get(mp_obj_t self_in, uint *len, mp_obj_t **items) { |
| 378 | mp_obj_list_t *self = self_in; |
| 379 | *len = self->len; |
| 380 | *items = self->items; |
| 381 | } |
| 382 | |
| 383 | void mp_obj_list_store(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { |
| 384 | mp_obj_list_t *self = self_in; |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 385 | uint i = mp_get_index(self->base.type, self->len, index, false); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 386 | self->items[i] = value; |
| 387 | } |
| 388 | |
| 389 | /******************************************************************************/ |
| 390 | /* list iterator */ |
| 391 | |
| 392 | typedef struct _mp_obj_list_it_t { |
| 393 | mp_obj_base_t base; |
| 394 | mp_obj_list_t *list; |
| 395 | machine_uint_t cur; |
| 396 | } mp_obj_list_it_t; |
| 397 | |
| 398 | mp_obj_t list_it_iternext(mp_obj_t self_in) { |
| 399 | mp_obj_list_it_t *self = self_in; |
| 400 | if (self->cur < self->list->len) { |
| 401 | mp_obj_t o_out = self->list->items[self->cur]; |
| 402 | self->cur += 1; |
| 403 | return o_out; |
| 404 | } else { |
Damien George | 66eaf84 | 2014-03-26 19:27:58 +0000 | [diff] [blame] | 405 | return MP_OBJ_NULL; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 406 | } |
| 407 | } |
| 408 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 409 | STATIC const mp_obj_type_t mp_type_list_it = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 410 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 411 | .name = MP_QSTR_iterator, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 412 | .iternext = list_it_iternext, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 413 | }; |
| 414 | |
| 415 | mp_obj_t mp_obj_new_list_iterator(mp_obj_list_t *list, int cur) { |
| 416 | mp_obj_list_it_t *o = m_new_obj(mp_obj_list_it_t); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame^] | 417 | o->base.type = &mp_type_list_it; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 418 | o->list = list; |
| 419 | o->cur = cur; |
| 420 | return o; |
| 421 | } |