Damien George | 04b9147 | 2014-05-03 23:27:38 +0100 | [diff] [blame] | 1 | /* |
| 2 | * This file is part of the Micro Python project, http://micropython.org/ |
| 3 | * |
| 4 | * The MIT License (MIT) |
| 5 | * |
| 6 | * Copyright (c) 2013, 2014 Damien P. George |
| 7 | * |
| 8 | * Permission is hereby granted, free of charge, to any person obtaining a copy |
| 9 | * of this software and associated documentation files (the "Software"), to deal |
| 10 | * in the Software without restriction, including without limitation the rights |
| 11 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
| 12 | * copies of the Software, and to permit persons to whom the Software is |
| 13 | * furnished to do so, subject to the following conditions: |
| 14 | * |
| 15 | * The above copyright notice and this permission notice shall be included in |
| 16 | * all copies or substantial portions of the Software. |
| 17 | * |
| 18 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 19 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 20 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| 21 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 22 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| 23 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| 24 | * THE SOFTWARE. |
| 25 | */ |
| 26 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 27 | #include <string.h> |
| 28 | #include <assert.h> |
| 29 | |
Paul Sokolovsky | f54bcbf | 2014-05-02 17:47:01 +0300 | [diff] [blame] | 30 | #include "mpconfig.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 31 | #include "nlr.h" |
| 32 | #include "misc.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 33 | #include "qstr.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 34 | #include "obj.h" |
| 35 | #include "runtime0.h" |
| 36 | #include "runtime.h" |
Paul Sokolovsky | 18bef25 | 2014-04-13 06:17:29 +0300 | [diff] [blame] | 37 | #include "objlist.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 38 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 39 | STATIC mp_obj_t mp_obj_new_list_iterator(mp_obj_list_t *list, int cur); |
| 40 | STATIC mp_obj_list_t *list_new(uint n); |
| 41 | STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in); |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 42 | STATIC mp_obj_t list_pop(uint n_args, const mp_obj_t *args); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 43 | |
Paul Sokolovsky | ddf1aa9 | 2014-01-27 01:06:23 +0200 | [diff] [blame] | 44 | // TODO: Move to mpconfig.h |
| 45 | #define LIST_MIN_ALLOC 4 |
| 46 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 47 | /******************************************************************************/ |
| 48 | /* list */ |
| 49 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 50 | 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] | 51 | mp_obj_list_t *o = o_in; |
| 52 | print(env, "["); |
| 53 | for (int i = 0; i < o->len; i++) { |
| 54 | if (i > 0) { |
| 55 | print(env, ", "); |
| 56 | } |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 57 | mp_obj_print_helper(print, env, o->items[i], PRINT_REPR); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 58 | } |
| 59 | print(env, "]"); |
| 60 | } |
| 61 | |
Paul Sokolovsky | aa6666c | 2014-04-13 03:20:10 +0300 | [diff] [blame] | 62 | STATIC mp_obj_t list_extend_from_iter(mp_obj_t list, mp_obj_t iterable) { |
| 63 | mp_obj_t iter = mp_getiter(iterable); |
| 64 | mp_obj_t item; |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 65 | while ((item = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) { |
Paul Sokolovsky | aa6666c | 2014-04-13 03:20:10 +0300 | [diff] [blame] | 66 | mp_obj_list_append(list, item); |
| 67 | } |
| 68 | return list; |
| 69 | } |
| 70 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 71 | 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 | ee7a880 | 2014-05-11 18:37:21 +0100 | [diff] [blame] | 72 | mp_arg_check_num(n_args, n_kw, 0, 1, false); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 73 | |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 74 | switch (n_args) { |
| 75 | case 0: |
| 76 | // return a new, empty list |
Damien George | ebde0b8 | 2014-01-19 00:47:40 +0000 | [diff] [blame] | 77 | return mp_obj_new_list(0, NULL); |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 78 | |
| 79 | case 1: |
Damien George | ee7a880 | 2014-05-11 18:37:21 +0100 | [diff] [blame] | 80 | default: { |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 81 | // make list from iterable |
Paul Sokolovsky | aa6666c | 2014-04-13 03:20:10 +0300 | [diff] [blame] | 82 | // TODO: optimize list/tuple |
Damien George | ebde0b8 | 2014-01-19 00:47:40 +0000 | [diff] [blame] | 83 | mp_obj_t list = mp_obj_new_list(0, NULL); |
Paul Sokolovsky | aa6666c | 2014-04-13 03:20:10 +0300 | [diff] [blame] | 84 | return list_extend_from_iter(list, args[0]); |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 85 | } |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 86 | } |
| 87 | } |
| 88 | |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 89 | // Don't pass MP_BINARY_OP_NOT_EQUAL here |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 90 | 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] | 91 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
| 92 | if (!MP_OBJ_IS_TYPE(another_in, &mp_type_list)) { |
Paul Sokolovsky | 1945e60 | 2014-01-12 02:01:00 +0200 | [diff] [blame] | 93 | return false; |
| 94 | } |
| 95 | mp_obj_list_t *self = self_in; |
| 96 | mp_obj_list_t *another = another_in; |
Paul Sokolovsky | 1945e60 | 2014-01-12 02:01:00 +0200 | [diff] [blame] | 97 | |
Paul Sokolovsky | 1a996c4 | 2014-02-08 22:49:46 +0200 | [diff] [blame] | 98 | 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] | 99 | } |
| 100 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 101 | 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] | 102 | mp_obj_list_t *self = self_in; |
| 103 | switch (op) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 104 | case MP_UNARY_OP_BOOL: return MP_BOOL(self->len != 0); |
| 105 | case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->len); |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 106 | default: return MP_OBJ_NULL; // op not supported |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 107 | } |
| 108 | } |
| 109 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 110 | 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] | 111 | mp_obj_list_t *o = lhs; |
| 112 | switch (op) { |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 113 | case MP_BINARY_OP_ADD: { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 114 | if (!MP_OBJ_IS_TYPE(rhs, &mp_type_list)) { |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 115 | return MP_OBJ_NULL; // op not supported |
John R. Lenton | 81ad89c | 2014-01-03 02:32:40 +0000 | [diff] [blame] | 116 | } |
| 117 | mp_obj_list_t *p = rhs; |
| 118 | mp_obj_list_t *s = list_new(o->len + p->len); |
Paul Sokolovsky | d915a52 | 2014-05-10 21:36:33 +0300 | [diff] [blame] | 119 | mp_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] | 120 | return s; |
John R. Lenton | 4cb8058 | 2014-01-03 02:27:08 +0000 | [diff] [blame] | 121 | } |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 122 | case MP_BINARY_OP_INPLACE_ADD: { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 123 | if (!MP_OBJ_IS_TYPE(rhs, &mp_type_list)) { |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 124 | return MP_OBJ_NULL; // op not supported |
Paul Sokolovsky | c698d26 | 2014-01-12 00:51:05 +0200 | [diff] [blame] | 125 | } |
| 126 | list_extend(lhs, rhs); |
| 127 | return o; |
| 128 | } |
Damien George | 8270e38 | 2014-04-03 11:00:54 +0000 | [diff] [blame] | 129 | case MP_BINARY_OP_MULTIPLY: { |
| 130 | machine_int_t n; |
| 131 | if (!mp_obj_get_int_maybe(rhs, &n)) { |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 132 | return MP_OBJ_NULL; // op not supported |
Paul Sokolovsky | 074d3b5 | 2014-01-10 18:12:25 +0200 | [diff] [blame] | 133 | } |
Paul Sokolovsky | 439542f | 2014-01-21 00:19:19 +0200 | [diff] [blame] | 134 | mp_obj_list_t *s = list_new(o->len * n); |
| 135 | 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] | 136 | return s; |
| 137 | } |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 138 | case MP_BINARY_OP_EQUAL: |
| 139 | case MP_BINARY_OP_LESS: |
| 140 | case MP_BINARY_OP_LESS_EQUAL: |
| 141 | case MP_BINARY_OP_MORE: |
| 142 | case MP_BINARY_OP_MORE_EQUAL: |
Paul Sokolovsky | 1945e60 | 2014-01-12 02:01:00 +0200 | [diff] [blame] | 143 | return MP_BOOL(list_cmp_helper(op, 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: |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 146 | return MP_OBJ_NULL; // op not supported |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 147 | } |
| 148 | } |
| 149 | |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 150 | STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 151 | if (value == MP_OBJ_NULL) { |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 152 | // delete |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame^] | 153 | #if MICROPY_PY_BUILTINS_SLICE |
Paul Sokolovsky | 3f8d34c | 2014-05-10 23:03:30 +0300 | [diff] [blame] | 154 | if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) { |
| 155 | mp_obj_list_t *self = self_in; |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 156 | mp_bound_slice_t slice; |
| 157 | if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) { |
Paul Sokolovsky | 3f8d34c | 2014-05-10 23:03:30 +0300 | [diff] [blame] | 158 | assert(0); |
| 159 | } |
| 160 | |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 161 | int len_adj = slice.start - slice.stop; |
Paul Sokolovsky | 3f8d34c | 2014-05-10 23:03:30 +0300 | [diff] [blame] | 162 | //printf("Len adj: %d\n", len_adj); |
| 163 | assert(len_adj <= 0); |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 164 | mp_seq_replace_slice_no_grow(self->items, self->len, slice.start, slice.stop, self->items/*NULL*/, 0, mp_obj_t); |
Paul Sokolovsky | 3f8d34c | 2014-05-10 23:03:30 +0300 | [diff] [blame] | 165 | // Clear "freed" elements at the end of list |
| 166 | mp_seq_clear(self->items, self->len + len_adj, self->len, sizeof(*self->items)); |
| 167 | self->len += len_adj; |
| 168 | return mp_const_none; |
| 169 | } |
| 170 | #endif |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 171 | mp_obj_t args[2] = {self_in, index}; |
| 172 | list_pop(2, args); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 173 | return mp_const_none; |
| 174 | } else if (value == MP_OBJ_SENTINEL) { |
| 175 | // load |
| 176 | mp_obj_list_t *self = self_in; |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame^] | 177 | #if MICROPY_PY_BUILTINS_SLICE |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 178 | if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) { |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 179 | mp_bound_slice_t slice; |
| 180 | if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) { |
Paul Sokolovsky | 5fd5af9 | 2014-05-25 22:12:56 +0300 | [diff] [blame] | 181 | return mp_seq_extract_slice(self->len, self->items, &slice); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 182 | } |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 183 | mp_obj_list_t *res = list_new(slice.stop - slice.start); |
| 184 | mp_seq_copy(res->items, self->items + slice.start, res->len, mp_obj_t); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 185 | return res; |
| 186 | } |
| 187 | #endif |
| 188 | uint index_val = mp_get_index(self->base.type, self->len, index, false); |
| 189 | return self->items[index_val]; |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 190 | } else { |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame^] | 191 | #if MICROPY_PY_BUILTINS_SLICE |
Paul Sokolovsky | 94d8246 | 2014-05-10 22:23:00 +0300 | [diff] [blame] | 192 | if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) { |
| 193 | mp_obj_list_t *self = self_in; |
| 194 | assert(MP_OBJ_IS_TYPE(value, &mp_type_list)); |
| 195 | mp_obj_list_t *slice = value; |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 196 | mp_bound_slice_t slice_out; |
| 197 | if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice_out)) { |
Paul Sokolovsky | 94d8246 | 2014-05-10 22:23:00 +0300 | [diff] [blame] | 198 | assert(0); |
| 199 | } |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 200 | int len_adj = slice->len - (slice_out.stop - slice_out.start); |
Paul Sokolovsky | 94d8246 | 2014-05-10 22:23:00 +0300 | [diff] [blame] | 201 | //printf("Len adj: %d\n", len_adj); |
Paul Sokolovsky | 2705f4c | 2014-05-25 02:36:12 +0300 | [diff] [blame] | 202 | if (len_adj > 0) { |
| 203 | if (self->len + len_adj > self->alloc) { |
| 204 | // TODO: Might optimize memory copies here by checking if block can |
| 205 | // be grown inplace or not |
| 206 | self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + len_adj); |
| 207 | self->alloc = self->len + len_adj; |
| 208 | } |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 209 | mp_seq_replace_slice_grow_inplace(self->items, self->len, |
| 210 | slice_out.start, slice_out.stop, slice->items, slice->len, len_adj, mp_obj_t); |
Paul Sokolovsky | 2705f4c | 2014-05-25 02:36:12 +0300 | [diff] [blame] | 211 | } else { |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 212 | mp_seq_replace_slice_no_grow(self->items, self->len, |
| 213 | slice_out.start, slice_out.stop, slice->items, slice->len, mp_obj_t); |
Paul Sokolovsky | 2705f4c | 2014-05-25 02:36:12 +0300 | [diff] [blame] | 214 | // Clear "freed" elements at the end of list |
| 215 | mp_seq_clear(self->items, self->len + len_adj, self->len, sizeof(*self->items)); |
| 216 | // TODO: apply allocation policy re: alloc_size |
| 217 | } |
Paul Sokolovsky | 94d8246 | 2014-05-10 22:23:00 +0300 | [diff] [blame] | 218 | self->len += len_adj; |
Paul Sokolovsky | 94d8246 | 2014-05-10 22:23:00 +0300 | [diff] [blame] | 219 | return mp_const_none; |
| 220 | } |
| 221 | #endif |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 222 | mp_obj_list_store(self_in, index, value); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 223 | return mp_const_none; |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 224 | } |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 225 | } |
| 226 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 227 | STATIC mp_obj_t list_getiter(mp_obj_t o_in) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 228 | return mp_obj_new_list_iterator(o_in, 0); |
| 229 | } |
| 230 | |
| 231 | 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] | 232 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 233 | mp_obj_list_t *self = self_in; |
| 234 | if (self->len >= self->alloc) { |
Damien | 732407f | 2013-12-29 19:33:23 +0000 | [diff] [blame] | 235 | self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc * 2); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 236 | self->alloc *= 2; |
Paul Sokolovsky | a224067 | 2014-04-28 00:16:57 +0300 | [diff] [blame] | 237 | mp_seq_clear(self->items, self->len + 1, self->alloc, sizeof(*self->items)); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 238 | } |
| 239 | self->items[self->len++] = arg; |
| 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_extend(mp_obj_t self_in, mp_obj_t arg_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 244 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
Paul Sokolovsky | aa6666c | 2014-04-13 03:20:10 +0300 | [diff] [blame] | 245 | if (MP_OBJ_IS_TYPE(arg_in, &mp_type_list)) { |
| 246 | mp_obj_list_t *self = self_in; |
| 247 | mp_obj_list_t *arg = arg_in; |
Paul Sokolovsky | c698d26 | 2014-01-12 00:51:05 +0200 | [diff] [blame] | 248 | |
Paul Sokolovsky | aa6666c | 2014-04-13 03:20:10 +0300 | [diff] [blame] | 249 | if (self->len + arg->len > self->alloc) { |
| 250 | // TODO: use alloc policy for "4" |
| 251 | self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + arg->len + 4); |
| 252 | self->alloc = self->len + arg->len + 4; |
Paul Sokolovsky | a224067 | 2014-04-28 00:16:57 +0300 | [diff] [blame] | 253 | mp_seq_clear(self->items, self->len + arg->len, self->alloc, sizeof(*self->items)); |
Paul Sokolovsky | aa6666c | 2014-04-13 03:20:10 +0300 | [diff] [blame] | 254 | } |
| 255 | |
| 256 | memcpy(self->items + self->len, arg->items, sizeof(mp_obj_t) * arg->len); |
| 257 | self->len += arg->len; |
| 258 | } else { |
| 259 | list_extend_from_iter(self_in, arg_in); |
Paul Sokolovsky | c698d26 | 2014-01-12 00:51:05 +0200 | [diff] [blame] | 260 | } |
Paul Sokolovsky | c698d26 | 2014-01-12 00:51:05 +0200 | [diff] [blame] | 261 | return mp_const_none; // return None, as per CPython |
| 262 | } |
| 263 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 264 | 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] | 265 | assert(1 <= n_args && n_args <= 2); |
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 | 25f417c | 2014-01-03 22:53:18 +0000 | [diff] [blame] | 267 | mp_obj_list_t *self = args[0]; |
| 268 | if (self->len == 0) { |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 269 | nlr_raise(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] | 270 | } |
Paul Sokolovsky | 48bf6b3 | 2014-04-27 23:07:37 +0300 | [diff] [blame] | 271 | uint index = mp_get_index(self->base.type, self->len, n_args == 1 ? MP_OBJ_NEW_SMALL_INT(-1) : args[1], false); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 272 | mp_obj_t ret = self->items[index]; |
| 273 | self->len -= 1; |
| 274 | memcpy(self->items + index, self->items + index + 1, (self->len - index) * sizeof(mp_obj_t)); |
Paul Sokolovsky | a224067 | 2014-04-28 00:16:57 +0300 | [diff] [blame] | 275 | // Clear stale pointer from slot which just got freed to prevent GC issues |
| 276 | self->items[self->len] = MP_OBJ_NULL; |
Paul Sokolovsky | ddf1aa9 | 2014-01-27 01:06:23 +0200 | [diff] [blame] | 277 | if (self->alloc > LIST_MIN_ALLOC && self->alloc > 2 * self->len) { |
John R. Lenton | 25f417c | 2014-01-03 22:53:18 +0000 | [diff] [blame] | 278 | self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc/2); |
| 279 | self->alloc /= 2; |
| 280 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 281 | return ret; |
| 282 | } |
| 283 | |
| 284 | // TODO make this conform to CPython's definition of sort |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 285 | STATIC void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, bool reversed) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 286 | int op = reversed ? MP_BINARY_OP_MORE : MP_BINARY_OP_LESS; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 287 | while (head < tail) { |
| 288 | mp_obj_t *h = head - 1; |
| 289 | mp_obj_t *t = tail; |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 290 | mp_obj_t v = key_fn == NULL ? tail[0] : mp_call_function_1(key_fn, tail[0]); // get pivot using key_fn |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 291 | for (;;) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 292 | do ++h; while (mp_binary_op(op, key_fn == NULL ? h[0] : mp_call_function_1(key_fn, h[0]), v) == mp_const_true); |
| 293 | 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); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 294 | if (h >= t) break; |
| 295 | mp_obj_t x = h[0]; |
| 296 | h[0] = t[0]; |
| 297 | t[0] = x; |
| 298 | } |
| 299 | mp_obj_t x = h[0]; |
| 300 | h[0] = tail[0]; |
| 301 | tail[0] = x; |
John R. Lenton | c06763a | 2014-01-07 17:29:16 +0000 | [diff] [blame] | 302 | mp_quicksort(head, t, key_fn, reversed); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 303 | head = h + 1; |
| 304 | } |
| 305 | } |
| 306 | |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 307 | mp_obj_t mp_obj_list_sort(uint n_args, const mp_obj_t *args, mp_map_t *kwargs) { |
| 308 | assert(n_args >= 1); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 309 | assert(MP_OBJ_IS_TYPE(args[0], &mp_type_list)); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 310 | if (n_args > 1) { |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 311 | nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, |
John R. Lenton | c06763a | 2014-01-07 17:29:16 +0000 | [diff] [blame] | 312 | "list.sort takes no positional arguments")); |
| 313 | } |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 314 | mp_obj_list_t *self = args[0]; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 315 | if (self->len > 1) { |
Damien George | 7d0bfbe | 2014-02-08 19:01:47 +0000 | [diff] [blame] | 316 | mp_map_elem_t *keyfun = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(MP_QSTR_key), MP_MAP_LOOKUP); |
| 317 | 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] | 318 | mp_quicksort(self->items, self->items + self->len - 1, |
| 319 | keyfun ? keyfun->value : NULL, |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 320 | reverse && reverse->value ? mp_obj_is_true(reverse->value) : false); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 321 | } |
| 322 | return mp_const_none; // return None, as per CPython |
| 323 | } |
| 324 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 325 | STATIC mp_obj_t list_clear(mp_obj_t self_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 326 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
John R. Lenton | 069ded9 | 2014-01-03 23:22:53 +0000 | [diff] [blame] | 327 | mp_obj_list_t *self = self_in; |
| 328 | self->len = 0; |
Paul Sokolovsky | ddf1aa9 | 2014-01-27 01:06:23 +0200 | [diff] [blame] | 329 | self->items = m_renew(mp_obj_t, self->items, self->alloc, LIST_MIN_ALLOC); |
| 330 | self->alloc = LIST_MIN_ALLOC; |
Paul Sokolovsky | a224067 | 2014-04-28 00:16:57 +0300 | [diff] [blame] | 331 | mp_seq_clear(self->items, 0, self->alloc, sizeof(*self->items)); |
John R. Lenton | 069ded9 | 2014-01-03 23:22:53 +0000 | [diff] [blame] | 332 | return mp_const_none; |
| 333 | } |
| 334 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 335 | STATIC mp_obj_t list_copy(mp_obj_t self_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 336 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
John R. Lenton | 26c2116 | 2014-01-03 23:42:17 +0000 | [diff] [blame] | 337 | mp_obj_list_t *self = self_in; |
| 338 | return mp_obj_new_list(self->len, self->items); |
| 339 | } |
| 340 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 341 | 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] | 342 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
John R. Lenton | e241e8c | 2014-01-03 23:57:28 +0000 | [diff] [blame] | 343 | mp_obj_list_t *self = self_in; |
Paul Sokolovsky | ac0134d | 2014-02-10 07:10:55 +0200 | [diff] [blame] | 344 | return mp_seq_count_obj(self->items, self->len, value); |
John R. Lenton | e241e8c | 2014-01-03 23:57:28 +0000 | [diff] [blame] | 345 | } |
| 346 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 347 | 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] | 348 | assert(2 <= n_args && n_args <= 4); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 349 | assert(MP_OBJ_IS_TYPE(args[0], &mp_type_list)); |
John R. Lenton | 5d4a821 | 2014-01-04 00:26:30 +0000 | [diff] [blame] | 350 | mp_obj_list_t *self = args[0]; |
Paul Sokolovsky | 0cd1dc0 | 2014-02-10 06:37:11 +0200 | [diff] [blame] | 351 | 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] | 352 | } |
| 353 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 354 | 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] | 355 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
John R. Lenton | 45a8744 | 2014-01-04 01:15:01 +0000 | [diff] [blame] | 356 | mp_obj_list_t *self = self_in; |
| 357 | // insert has its own strange index logic |
| 358 | int index = MP_OBJ_SMALL_INT_VALUE(idx); |
| 359 | if (index < 0) { |
| 360 | index += self->len; |
| 361 | } |
| 362 | if (index < 0) { |
| 363 | index = 0; |
| 364 | } |
| 365 | if (index > self->len) { |
| 366 | index = self->len; |
| 367 | } |
| 368 | |
| 369 | mp_obj_list_append(self_in, mp_const_none); |
| 370 | |
| 371 | for (int i = self->len-1; i > index; i--) { |
| 372 | self->items[i] = self->items[i-1]; |
| 373 | } |
| 374 | self->items[index] = obj; |
| 375 | |
| 376 | return mp_const_none; |
| 377 | } |
| 378 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 379 | 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] | 380 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
John R. Lenton | 49fb6e5 | 2014-01-04 01:56:53 +0000 | [diff] [blame] | 381 | mp_obj_t args[] = {self_in, value}; |
| 382 | args[1] = list_index(2, args); |
| 383 | list_pop(2, args); |
| 384 | |
| 385 | return mp_const_none; |
| 386 | } |
| 387 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 388 | STATIC mp_obj_t list_reverse(mp_obj_t self_in) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 389 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
John R. Lenton | 6e1e98f | 2014-01-04 02:10:29 +0000 | [diff] [blame] | 390 | mp_obj_list_t *self = self_in; |
| 391 | |
| 392 | int len = self->len; |
| 393 | for (int i = 0; i < len/2; i++) { |
| 394 | mp_obj_t *a = self->items[i]; |
| 395 | self->items[i] = self->items[len-i-1]; |
| 396 | self->items[len-i-1] = a; |
| 397 | } |
| 398 | |
| 399 | return mp_const_none; |
| 400 | } |
| 401 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 402 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_append_obj, mp_obj_list_append); |
| 403 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_extend_obj, list_extend); |
| 404 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_clear_obj, list_clear); |
| 405 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_copy_obj, list_copy); |
| 406 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_count_obj, list_count); |
| 407 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_index_obj, 2, 4, list_index); |
| 408 | STATIC MP_DEFINE_CONST_FUN_OBJ_3(list_insert_obj, list_insert); |
| 409 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop); |
| 410 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, list_remove); |
| 411 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse); |
| 412 | 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] | 413 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 414 | STATIC const mp_map_elem_t list_locals_dict_table[] = { |
| 415 | { MP_OBJ_NEW_QSTR(MP_QSTR_append), (mp_obj_t)&list_append_obj }, |
| 416 | { MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&list_clear_obj }, |
| 417 | { MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&list_copy_obj }, |
| 418 | { MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&list_count_obj }, |
| 419 | { MP_OBJ_NEW_QSTR(MP_QSTR_extend), (mp_obj_t)&list_extend_obj }, |
| 420 | { MP_OBJ_NEW_QSTR(MP_QSTR_index), (mp_obj_t)&list_index_obj }, |
| 421 | { MP_OBJ_NEW_QSTR(MP_QSTR_insert), (mp_obj_t)&list_insert_obj }, |
| 422 | { MP_OBJ_NEW_QSTR(MP_QSTR_pop), (mp_obj_t)&list_pop_obj }, |
| 423 | { MP_OBJ_NEW_QSTR(MP_QSTR_remove), (mp_obj_t)&list_remove_obj }, |
| 424 | { MP_OBJ_NEW_QSTR(MP_QSTR_reverse), (mp_obj_t)&list_reverse_obj }, |
| 425 | { 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] | 426 | }; |
Damien George | 97209d3 | 2014-01-07 15:58:30 +0000 | [diff] [blame] | 427 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 428 | STATIC MP_DEFINE_CONST_DICT(list_locals_dict, list_locals_dict_table); |
| 429 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 430 | const mp_obj_type_t mp_type_list = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 431 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 432 | .name = MP_QSTR_list, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 433 | .print = list_print, |
| 434 | .make_new = list_make_new, |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 435 | .unary_op = list_unary_op, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 436 | .binary_op = list_binary_op, |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 437 | .subscr = list_subscr, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 438 | .getiter = list_getiter, |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 439 | .locals_dict = (mp_obj_t)&list_locals_dict, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 440 | }; |
| 441 | |
Paul Sokolovsky | 18bef25 | 2014-04-13 06:17:29 +0300 | [diff] [blame] | 442 | void mp_obj_list_init(mp_obj_list_t *o, uint n) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 443 | o->base.type = &mp_type_list; |
Paul Sokolovsky | ddf1aa9 | 2014-01-27 01:06:23 +0200 | [diff] [blame] | 444 | o->alloc = n < LIST_MIN_ALLOC ? LIST_MIN_ALLOC : n; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 445 | o->len = n; |
| 446 | o->items = m_new(mp_obj_t, o->alloc); |
Paul Sokolovsky | a224067 | 2014-04-28 00:16:57 +0300 | [diff] [blame] | 447 | mp_seq_clear(o->items, n, o->alloc, sizeof(*o->items)); |
Paul Sokolovsky | 18bef25 | 2014-04-13 06:17:29 +0300 | [diff] [blame] | 448 | } |
| 449 | |
| 450 | STATIC mp_obj_list_t *list_new(uint n) { |
| 451 | mp_obj_list_t *o = m_new_obj(mp_obj_list_t); |
| 452 | mp_obj_list_init(o, n); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 453 | return o; |
| 454 | } |
| 455 | |
| 456 | mp_obj_t mp_obj_new_list(uint n, mp_obj_t *items) { |
| 457 | mp_obj_list_t *o = list_new(n); |
Paul Sokolovsky | e5a15cb | 2014-02-04 09:44:10 +0200 | [diff] [blame] | 458 | if (items != NULL) { |
| 459 | for (int i = 0; i < n; i++) { |
| 460 | o->items[i] = items[i]; |
| 461 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 462 | } |
| 463 | return o; |
| 464 | } |
| 465 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 466 | void mp_obj_list_get(mp_obj_t self_in, uint *len, mp_obj_t **items) { |
| 467 | mp_obj_list_t *self = self_in; |
| 468 | *len = self->len; |
| 469 | *items = self->items; |
| 470 | } |
| 471 | |
Damien George | 495d781 | 2014-04-08 17:51:47 +0100 | [diff] [blame] | 472 | void mp_obj_list_set_len(mp_obj_t self_in, uint len) { |
| 473 | // trust that the caller knows what it's doing |
| 474 | // TODO realloc if len got much smaller than alloc |
| 475 | mp_obj_list_t *self = self_in; |
| 476 | self->len = len; |
| 477 | } |
| 478 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 479 | void mp_obj_list_store(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { |
| 480 | mp_obj_list_t *self = self_in; |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 481 | uint i = mp_get_index(self->base.type, self->len, index, false); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 482 | self->items[i] = value; |
| 483 | } |
| 484 | |
| 485 | /******************************************************************************/ |
| 486 | /* list iterator */ |
| 487 | |
| 488 | typedef struct _mp_obj_list_it_t { |
| 489 | mp_obj_base_t base; |
| 490 | mp_obj_list_t *list; |
| 491 | machine_uint_t cur; |
| 492 | } mp_obj_list_it_t; |
| 493 | |
| 494 | mp_obj_t list_it_iternext(mp_obj_t self_in) { |
| 495 | mp_obj_list_it_t *self = self_in; |
| 496 | if (self->cur < self->list->len) { |
| 497 | mp_obj_t o_out = self->list->items[self->cur]; |
| 498 | self->cur += 1; |
| 499 | return o_out; |
| 500 | } else { |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 501 | return MP_OBJ_STOP_ITERATION; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 502 | } |
| 503 | } |
| 504 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 505 | STATIC const mp_obj_type_t mp_type_list_it = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 506 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 507 | .name = MP_QSTR_iterator, |
Paul Sokolovsky | f7eaf60 | 2014-03-30 22:00:12 +0300 | [diff] [blame] | 508 | .getiter = mp_identity, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 509 | .iternext = list_it_iternext, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 510 | }; |
| 511 | |
| 512 | mp_obj_t mp_obj_new_list_iterator(mp_obj_list_t *list, int cur) { |
| 513 | 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] | 514 | o->base.type = &mp_type_list_it; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 515 | o->list = list; |
| 516 | o->cur = cur; |
| 517 | return o; |
| 518 | } |