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 | |
Damien George | 51dfcb4 | 2015-01-01 20:27:54 +0000 | [diff] [blame] | 30 | #include "py/nlr.h" |
| 31 | #include "py/objlist.h" |
| 32 | #include "py/runtime0.h" |
| 33 | #include "py/runtime.h" |
Damien George | 744e767 | 2015-02-02 15:14:22 +0000 | [diff] [blame] | 34 | #include "py/stackctrl.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 35 | |
Damien George | ae8d867 | 2016-01-09 23:14:54 +0000 | [diff] [blame] | 36 | STATIC mp_obj_t mp_obj_new_list_iterator(mp_obj_t list, size_t cur, mp_obj_iter_buf_t *iter_buf); |
Damien George | 58d9eeb | 2017-02-16 16:12:41 +1100 | [diff] [blame] | 37 | STATIC mp_obj_list_t *list_new(size_t n); |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 38 | STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in); |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 39 | STATIC mp_obj_t list_pop(size_t n_args, const mp_obj_t *args); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 40 | |
Paul Sokolovsky | ddf1aa9 | 2014-01-27 01:06:23 +0200 | [diff] [blame] | 41 | // TODO: Move to mpconfig.h |
| 42 | #define LIST_MIN_ALLOC 4 |
| 43 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 44 | /******************************************************************************/ |
| 45 | /* list */ |
| 46 | |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 47 | STATIC void list_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 48 | mp_obj_list_t *o = MP_OBJ_TO_PTR(o_in); |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 49 | if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) { |
| 50 | kind = PRINT_REPR; |
| 51 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 52 | mp_print_str(print, "["); |
Damien George | 58d9eeb | 2017-02-16 16:12:41 +1100 | [diff] [blame] | 53 | for (size_t i = 0; i < o->len; i++) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 54 | if (i > 0) { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 55 | mp_print_str(print, ", "); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 56 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 57 | mp_obj_print_helper(print, o->items[i], kind); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 58 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 59 | mp_print_str(print, "]"); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 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) { |
Damien George | e6003f4 | 2017-02-13 15:44:31 +1100 | [diff] [blame] | 63 | mp_obj_t iter = mp_getiter(iterable, NULL); |
Paul Sokolovsky | aa6666c | 2014-04-13 03:20:10 +0300 | [diff] [blame] | 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 | |
Damien George | 5b3f0b7 | 2016-01-03 15:55:55 +0000 | [diff] [blame] | 71 | STATIC mp_obj_t list_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) { |
Damien George | ff8dd3f | 2015-01-20 12:47:20 +0000 | [diff] [blame] | 72 | (void)type_in; |
Damien George | ee7a880 | 2014-05-11 18:37:21 +0100 | [diff] [blame] | 73 | mp_arg_check_num(n_args, n_kw, 0, 1, false); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 74 | |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 75 | switch (n_args) { |
| 76 | case 0: |
| 77 | // return a new, empty list |
Damien George | ebde0b8 | 2014-01-19 00:47:40 +0000 | [diff] [blame] | 78 | return mp_obj_new_list(0, NULL); |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 79 | |
| 80 | case 1: |
Damien George | ee7a880 | 2014-05-11 18:37:21 +0100 | [diff] [blame] | 81 | default: { |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 82 | // make list from iterable |
Paul Sokolovsky | aa6666c | 2014-04-13 03:20:10 +0300 | [diff] [blame] | 83 | // TODO: optimize list/tuple |
Damien George | ebde0b8 | 2014-01-19 00:47:40 +0000 | [diff] [blame] | 84 | mp_obj_t list = mp_obj_new_list(0, NULL); |
Paul Sokolovsky | aa6666c | 2014-04-13 03:20:10 +0300 | [diff] [blame] | 85 | return list_extend_from_iter(list, args[0]); |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 86 | } |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 87 | } |
| 88 | } |
| 89 | |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 90 | // Don't pass MP_BINARY_OP_NOT_EQUAL here |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 91 | STATIC bool list_cmp_helper(mp_uint_t op, mp_obj_t self_in, mp_obj_t another_in) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 92 | mp_check_self(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 93 | if (!MP_OBJ_IS_TYPE(another_in, &mp_type_list)) { |
Paul Sokolovsky | 1945e60 | 2014-01-12 02:01:00 +0200 | [diff] [blame] | 94 | return false; |
| 95 | } |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 96 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
| 97 | mp_obj_list_t *another = MP_OBJ_TO_PTR(another_in); |
Paul Sokolovsky | 1945e60 | 2014-01-12 02:01:00 +0200 | [diff] [blame] | 98 | |
Paul Sokolovsky | 1a996c4 | 2014-02-08 22:49:46 +0200 | [diff] [blame] | 99 | 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] | 100 | } |
| 101 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 102 | STATIC mp_obj_t list_unary_op(mp_uint_t op, mp_obj_t self_in) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 103 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 104 | switch (op) { |
Paul Sokolovsky | 1b586f3 | 2015-10-11 12:09:43 +0300 | [diff] [blame] | 105 | case MP_UNARY_OP_BOOL: return mp_obj_new_bool(self->len != 0); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 106 | 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] | 107 | default: return MP_OBJ_NULL; // op not supported |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 108 | } |
| 109 | } |
| 110 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 111 | STATIC mp_obj_t list_binary_op(mp_uint_t op, mp_obj_t lhs, mp_obj_t rhs) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 112 | mp_obj_list_t *o = MP_OBJ_TO_PTR(lhs); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 113 | switch (op) { |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 114 | case MP_BINARY_OP_ADD: { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 115 | if (!MP_OBJ_IS_TYPE(rhs, &mp_type_list)) { |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 116 | return MP_OBJ_NULL; // op not supported |
John R. Lenton | 81ad89c | 2014-01-03 02:32:40 +0000 | [diff] [blame] | 117 | } |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 118 | mp_obj_list_t *p = MP_OBJ_TO_PTR(rhs); |
John R. Lenton | 81ad89c | 2014-01-03 02:32:40 +0000 | [diff] [blame] | 119 | mp_obj_list_t *s = list_new(o->len + p->len); |
Paul Sokolovsky | d915a52 | 2014-05-10 21:36:33 +0300 | [diff] [blame] | 120 | mp_seq_cat(s->items, o->items, o->len, p->items, p->len, mp_obj_t); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 121 | return MP_OBJ_FROM_PTR(s); |
John R. Lenton | 4cb8058 | 2014-01-03 02:27:08 +0000 | [diff] [blame] | 122 | } |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 123 | case MP_BINARY_OP_INPLACE_ADD: { |
Paul Sokolovsky | c698d26 | 2014-01-12 00:51:05 +0200 | [diff] [blame] | 124 | list_extend(lhs, rhs); |
Paul Sokolovsky | 3d59825 | 2015-03-25 09:25:41 +0200 | [diff] [blame] | 125 | return lhs; |
Paul Sokolovsky | c698d26 | 2014-01-12 00:51:05 +0200 | [diff] [blame] | 126 | } |
Damien George | 8270e38 | 2014-04-03 11:00:54 +0000 | [diff] [blame] | 127 | case MP_BINARY_OP_MULTIPLY: { |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 128 | mp_int_t n; |
Damien George | 8270e38 | 2014-04-03 11:00:54 +0000 | [diff] [blame] | 129 | if (!mp_obj_get_int_maybe(rhs, &n)) { |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 130 | return MP_OBJ_NULL; // op not supported |
Paul Sokolovsky | 074d3b5 | 2014-01-10 18:12:25 +0200 | [diff] [blame] | 131 | } |
Damien George | 9b7a8ee | 2014-08-13 13:22:24 +0100 | [diff] [blame] | 132 | if (n < 0) { |
| 133 | n = 0; |
| 134 | } |
Paul Sokolovsky | 439542f | 2014-01-21 00:19:19 +0200 | [diff] [blame] | 135 | mp_obj_list_t *s = list_new(o->len * n); |
| 136 | mp_seq_multiply(o->items, sizeof(*o->items), o->len, n, s->items); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 137 | return MP_OBJ_FROM_PTR(s); |
Paul Sokolovsky | 074d3b5 | 2014-01-10 18:12:25 +0200 | [diff] [blame] | 138 | } |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 139 | case MP_BINARY_OP_EQUAL: |
| 140 | case MP_BINARY_OP_LESS: |
| 141 | case MP_BINARY_OP_LESS_EQUAL: |
| 142 | case MP_BINARY_OP_MORE: |
| 143 | case MP_BINARY_OP_MORE_EQUAL: |
Paul Sokolovsky | 1b586f3 | 2015-10-11 12:09:43 +0300 | [diff] [blame] | 144 | return mp_obj_new_bool(list_cmp_helper(op, lhs, rhs)); |
Paul Sokolovsky | 1945e60 | 2014-01-12 02:01:00 +0200 | [diff] [blame] | 145 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 146 | default: |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 147 | return MP_OBJ_NULL; // op not supported |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 148 | } |
| 149 | } |
| 150 | |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 151 | 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] | 152 | if (value == MP_OBJ_NULL) { |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 153 | // delete |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame] | 154 | #if MICROPY_PY_BUILTINS_SLICE |
Paul Sokolovsky | 3f8d34c | 2014-05-10 23:03:30 +0300 | [diff] [blame] | 155 | if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 156 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 157 | mp_bound_slice_t slice; |
| 158 | if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 159 | mp_not_implemented(""); |
Paul Sokolovsky | 3f8d34c | 2014-05-10 23:03:30 +0300 | [diff] [blame] | 160 | } |
| 161 | |
Damien George | 42f3de9 | 2014-10-03 17:44:14 +0000 | [diff] [blame] | 162 | mp_int_t len_adj = slice.start - slice.stop; |
Paul Sokolovsky | 3f8d34c | 2014-05-10 23:03:30 +0300 | [diff] [blame] | 163 | //printf("Len adj: %d\n", len_adj); |
| 164 | assert(len_adj <= 0); |
Paul Sokolovsky | cefcbb2 | 2015-02-27 22:16:05 +0200 | [diff] [blame] | 165 | mp_seq_replace_slice_no_grow(self->items, self->len, slice.start, slice.stop, self->items/*NULL*/, 0, sizeof(*self->items)); |
Paul Sokolovsky | 3f8d34c | 2014-05-10 23:03:30 +0300 | [diff] [blame] | 166 | // Clear "freed" elements at the end of list |
| 167 | mp_seq_clear(self->items, self->len + len_adj, self->len, sizeof(*self->items)); |
| 168 | self->len += len_adj; |
| 169 | return mp_const_none; |
| 170 | } |
| 171 | #endif |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 172 | mp_obj_t args[2] = {self_in, index}; |
| 173 | list_pop(2, args); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 174 | return mp_const_none; |
| 175 | } else if (value == MP_OBJ_SENTINEL) { |
| 176 | // load |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 177 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame] | 178 | #if MICROPY_PY_BUILTINS_SLICE |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 179 | if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) { |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 180 | mp_bound_slice_t slice; |
| 181 | if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) { |
Paul Sokolovsky | 5fd5af9 | 2014-05-25 22:12:56 +0300 | [diff] [blame] | 182 | return mp_seq_extract_slice(self->len, self->items, &slice); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 183 | } |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 184 | mp_obj_list_t *res = list_new(slice.stop - slice.start); |
| 185 | mp_seq_copy(res->items, self->items + slice.start, res->len, mp_obj_t); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 186 | return MP_OBJ_FROM_PTR(res); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 187 | } |
| 188 | #endif |
Damien George | 9c4cbe2 | 2014-08-30 14:04:14 +0100 | [diff] [blame] | 189 | mp_uint_t index_val = mp_get_index(self->base.type, self->len, index, false); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 190 | return self->items[index_val]; |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 191 | } else { |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame] | 192 | #if MICROPY_PY_BUILTINS_SLICE |
Paul Sokolovsky | 94d8246 | 2014-05-10 22:23:00 +0300 | [diff] [blame] | 193 | if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 194 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
Damien George | 8926788 | 2017-02-20 15:09:59 +1100 | [diff] [blame] | 195 | mp_uint_t value_len; mp_obj_t *value_items; |
| 196 | mp_obj_get_array(value, &value_len, &value_items); |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 197 | mp_bound_slice_t slice_out; |
| 198 | if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice_out)) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 199 | mp_not_implemented(""); |
Paul Sokolovsky | 94d8246 | 2014-05-10 22:23:00 +0300 | [diff] [blame] | 200 | } |
Damien George | 8926788 | 2017-02-20 15:09:59 +1100 | [diff] [blame] | 201 | mp_int_t len_adj = value_len - (slice_out.stop - slice_out.start); |
Paul Sokolovsky | 94d8246 | 2014-05-10 22:23:00 +0300 | [diff] [blame] | 202 | //printf("Len adj: %d\n", len_adj); |
Paul Sokolovsky | 2705f4c | 2014-05-25 02:36:12 +0300 | [diff] [blame] | 203 | if (len_adj > 0) { |
| 204 | if (self->len + len_adj > self->alloc) { |
| 205 | // TODO: Might optimize memory copies here by checking if block can |
| 206 | // be grown inplace or not |
| 207 | self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + len_adj); |
| 208 | self->alloc = self->len + len_adj; |
| 209 | } |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 210 | mp_seq_replace_slice_grow_inplace(self->items, self->len, |
Damien George | 8926788 | 2017-02-20 15:09:59 +1100 | [diff] [blame] | 211 | slice_out.start, slice_out.stop, value_items, value_len, len_adj, sizeof(*self->items)); |
Paul Sokolovsky | 2705f4c | 2014-05-25 02:36:12 +0300 | [diff] [blame] | 212 | } else { |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 213 | mp_seq_replace_slice_no_grow(self->items, self->len, |
Damien George | 8926788 | 2017-02-20 15:09:59 +1100 | [diff] [blame] | 214 | slice_out.start, slice_out.stop, value_items, value_len, sizeof(*self->items)); |
Paul Sokolovsky | 2705f4c | 2014-05-25 02:36:12 +0300 | [diff] [blame] | 215 | // Clear "freed" elements at the end of list |
| 216 | mp_seq_clear(self->items, self->len + len_adj, self->len, sizeof(*self->items)); |
| 217 | // TODO: apply allocation policy re: alloc_size |
| 218 | } |
Paul Sokolovsky | 94d8246 | 2014-05-10 22:23:00 +0300 | [diff] [blame] | 219 | self->len += len_adj; |
Paul Sokolovsky | 94d8246 | 2014-05-10 22:23:00 +0300 | [diff] [blame] | 220 | return mp_const_none; |
| 221 | } |
| 222 | #endif |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 223 | mp_obj_list_store(self_in, index, value); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 224 | return mp_const_none; |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 225 | } |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 226 | } |
| 227 | |
Damien George | ae8d867 | 2016-01-09 23:14:54 +0000 | [diff] [blame] | 228 | STATIC mp_obj_t list_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) { |
| 229 | return mp_obj_new_list_iterator(o_in, 0, iter_buf); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 230 | } |
| 231 | |
| 232 | mp_obj_t mp_obj_list_append(mp_obj_t self_in, mp_obj_t arg) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 233 | mp_check_self(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 234 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 235 | if (self->len >= self->alloc) { |
Damien | 732407f | 2013-12-29 19:33:23 +0000 | [diff] [blame] | 236 | 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] | 237 | self->alloc *= 2; |
Paul Sokolovsky | a224067 | 2014-04-28 00:16:57 +0300 | [diff] [blame] | 238 | mp_seq_clear(self->items, self->len + 1, self->alloc, sizeof(*self->items)); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 239 | } |
| 240 | self->items[self->len++] = arg; |
| 241 | return mp_const_none; // return None, as per CPython |
| 242 | } |
| 243 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 244 | STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 245 | mp_check_self(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
Paul Sokolovsky | aa6666c | 2014-04-13 03:20:10 +0300 | [diff] [blame] | 246 | if (MP_OBJ_IS_TYPE(arg_in, &mp_type_list)) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 247 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
| 248 | mp_obj_list_t *arg = MP_OBJ_TO_PTR(arg_in); |
Paul Sokolovsky | c698d26 | 2014-01-12 00:51:05 +0200 | [diff] [blame] | 249 | |
Paul Sokolovsky | aa6666c | 2014-04-13 03:20:10 +0300 | [diff] [blame] | 250 | if (self->len + arg->len > self->alloc) { |
| 251 | // TODO: use alloc policy for "4" |
| 252 | self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + arg->len + 4); |
| 253 | self->alloc = self->len + arg->len + 4; |
Paul Sokolovsky | a224067 | 2014-04-28 00:16:57 +0300 | [diff] [blame] | 254 | 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] | 255 | } |
| 256 | |
| 257 | memcpy(self->items + self->len, arg->items, sizeof(mp_obj_t) * arg->len); |
| 258 | self->len += arg->len; |
| 259 | } else { |
| 260 | list_extend_from_iter(self_in, arg_in); |
Paul Sokolovsky | c698d26 | 2014-01-12 00:51:05 +0200 | [diff] [blame] | 261 | } |
Paul Sokolovsky | c698d26 | 2014-01-12 00:51:05 +0200 | [diff] [blame] | 262 | return mp_const_none; // return None, as per CPython |
| 263 | } |
| 264 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 265 | STATIC mp_obj_t list_pop(size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 266 | mp_check_self(MP_OBJ_IS_TYPE(args[0], &mp_type_list)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 267 | mp_obj_list_t *self = MP_OBJ_TO_PTR(args[0]); |
John R. Lenton | 25f417c | 2014-01-03 22:53:18 +0000 | [diff] [blame] | 268 | if (self->len == 0) { |
Damien George | 7d0d721 | 2016-10-17 12:17:37 +1100 | [diff] [blame] | 269 | mp_raise_msg(&mp_type_IndexError, "pop from empty list"); |
John R. Lenton | 25f417c | 2014-01-03 22:53:18 +0000 | [diff] [blame] | 270 | } |
Damien George | 9c4cbe2 | 2014-08-30 14:04:14 +0100 | [diff] [blame] | 271 | mp_uint_t 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; |
Damien George | 17ae239 | 2014-08-29 21:07:54 +0100 | [diff] [blame] | 274 | memmove(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 | |
Damien George | 744e767 | 2015-02-02 15:14:22 +0000 | [diff] [blame] | 284 | STATIC void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, mp_obj_t binop_less_result) { |
| 285 | MP_STACK_CHECK(); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 286 | while (head < tail) { |
| 287 | mp_obj_t *h = head - 1; |
| 288 | mp_obj_t *t = tail; |
Damien George | 744e767 | 2015-02-02 15:14:22 +0000 | [diff] [blame] | 289 | mp_obj_t v = key_fn == MP_OBJ_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] | 290 | for (;;) { |
Damien George | 744e767 | 2015-02-02 15:14:22 +0000 | [diff] [blame] | 291 | do ++h; while (h < t && mp_binary_op(MP_BINARY_OP_LESS, key_fn == MP_OBJ_NULL ? h[0] : mp_call_function_1(key_fn, h[0]), v) == binop_less_result); |
| 292 | do --t; while (h < t && mp_binary_op(MP_BINARY_OP_LESS, v, key_fn == MP_OBJ_NULL ? t[0] : mp_call_function_1(key_fn, t[0])) == binop_less_result); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 293 | if (h >= t) break; |
| 294 | mp_obj_t x = h[0]; |
| 295 | h[0] = t[0]; |
| 296 | t[0] = x; |
| 297 | } |
| 298 | mp_obj_t x = h[0]; |
| 299 | h[0] = tail[0]; |
| 300 | tail[0] = x; |
Damien George | 744e767 | 2015-02-02 15:14:22 +0000 | [diff] [blame] | 301 | // do the smaller recursive call first, to keep stack within O(log(N)) |
| 302 | if (t - head < tail - h - 1) { |
| 303 | mp_quicksort(head, t, key_fn, binop_less_result); |
| 304 | head = h + 1; |
| 305 | } else { |
| 306 | mp_quicksort(h + 1, tail, key_fn, binop_less_result); |
| 307 | tail = t; |
| 308 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 309 | } |
| 310 | } |
| 311 | |
Damien George | 744e767 | 2015-02-02 15:14:22 +0000 | [diff] [blame] | 312 | // TODO Python defines sort to be stable but ours is not |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 313 | mp_obj_t mp_obj_list_sort(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { |
Damien George | 744e767 | 2015-02-02 15:14:22 +0000 | [diff] [blame] | 314 | static const mp_arg_t allowed_args[] = { |
Damien George | cbf7674 | 2015-11-27 13:38:15 +0000 | [diff] [blame] | 315 | { MP_QSTR_key, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} }, |
Damien George | 744e767 | 2015-02-02 15:14:22 +0000 | [diff] [blame] | 316 | { MP_QSTR_reverse, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} }, |
| 317 | }; |
| 318 | |
| 319 | // parse args |
Damien George | 22d85ec | 2016-01-13 15:47:56 +0000 | [diff] [blame] | 320 | struct { |
| 321 | mp_arg_val_t key, reverse; |
| 322 | } args; |
| 323 | mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, |
| 324 | MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t*)&args); |
Damien George | 744e767 | 2015-02-02 15:14:22 +0000 | [diff] [blame] | 325 | |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 326 | mp_check_self(MP_OBJ_IS_TYPE(pos_args[0], &mp_type_list)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 327 | mp_obj_list_t *self = MP_OBJ_TO_PTR(pos_args[0]); |
Damien George | 744e767 | 2015-02-02 15:14:22 +0000 | [diff] [blame] | 328 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 329 | if (self->len > 1) { |
John R. Lenton | c06763a | 2014-01-07 17:29:16 +0000 | [diff] [blame] | 330 | mp_quicksort(self->items, self->items + self->len - 1, |
Damien George | 22d85ec | 2016-01-13 15:47:56 +0000 | [diff] [blame] | 331 | args.key.u_obj == mp_const_none ? MP_OBJ_NULL : args.key.u_obj, |
| 332 | args.reverse.u_bool ? mp_const_false : mp_const_true); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 333 | } |
Damien George | 744e767 | 2015-02-02 15:14:22 +0000 | [diff] [blame] | 334 | |
| 335 | return mp_const_none; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 336 | } |
| 337 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 338 | STATIC mp_obj_t list_clear(mp_obj_t self_in) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 339 | mp_check_self(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 340 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
John R. Lenton | 069ded9 | 2014-01-03 23:22:53 +0000 | [diff] [blame] | 341 | self->len = 0; |
Paul Sokolovsky | ddf1aa9 | 2014-01-27 01:06:23 +0200 | [diff] [blame] | 342 | self->items = m_renew(mp_obj_t, self->items, self->alloc, LIST_MIN_ALLOC); |
| 343 | self->alloc = LIST_MIN_ALLOC; |
Paul Sokolovsky | a224067 | 2014-04-28 00:16:57 +0300 | [diff] [blame] | 344 | mp_seq_clear(self->items, 0, self->alloc, sizeof(*self->items)); |
John R. Lenton | 069ded9 | 2014-01-03 23:22:53 +0000 | [diff] [blame] | 345 | return mp_const_none; |
| 346 | } |
| 347 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 348 | STATIC mp_obj_t list_copy(mp_obj_t self_in) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 349 | mp_check_self(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 350 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
John R. Lenton | 26c2116 | 2014-01-03 23:42:17 +0000 | [diff] [blame] | 351 | return mp_obj_new_list(self->len, self->items); |
| 352 | } |
| 353 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 354 | STATIC mp_obj_t list_count(mp_obj_t self_in, mp_obj_t value) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 355 | mp_check_self(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 356 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
Paul Sokolovsky | ac0134d | 2014-02-10 07:10:55 +0200 | [diff] [blame] | 357 | return mp_seq_count_obj(self->items, self->len, value); |
John R. Lenton | e241e8c | 2014-01-03 23:57:28 +0000 | [diff] [blame] | 358 | } |
| 359 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 360 | STATIC mp_obj_t list_index(size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 361 | mp_check_self(MP_OBJ_IS_TYPE(args[0], &mp_type_list)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 362 | mp_obj_list_t *self = MP_OBJ_TO_PTR(args[0]); |
Paul Sokolovsky | 0cd1dc0 | 2014-02-10 06:37:11 +0200 | [diff] [blame] | 363 | 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] | 364 | } |
| 365 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 366 | STATIC mp_obj_t list_insert(mp_obj_t self_in, mp_obj_t idx, mp_obj_t obj) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 367 | mp_check_self(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 368 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
John R. Lenton | 45a8744 | 2014-01-04 01:15:01 +0000 | [diff] [blame] | 369 | // insert has its own strange index logic |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 370 | mp_int_t index = MP_OBJ_SMALL_INT_VALUE(idx); |
John R. Lenton | 45a8744 | 2014-01-04 01:15:01 +0000 | [diff] [blame] | 371 | if (index < 0) { |
| 372 | index += self->len; |
| 373 | } |
| 374 | if (index < 0) { |
| 375 | index = 0; |
| 376 | } |
Damien George | 58d9eeb | 2017-02-16 16:12:41 +1100 | [diff] [blame] | 377 | if ((size_t)index > self->len) { |
John R. Lenton | 45a8744 | 2014-01-04 01:15:01 +0000 | [diff] [blame] | 378 | index = self->len; |
| 379 | } |
| 380 | |
| 381 | mp_obj_list_append(self_in, mp_const_none); |
| 382 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 383 | for (mp_int_t i = self->len-1; i > index; i--) { |
John R. Lenton | 45a8744 | 2014-01-04 01:15:01 +0000 | [diff] [blame] | 384 | self->items[i] = self->items[i-1]; |
| 385 | } |
| 386 | self->items[index] = obj; |
| 387 | |
| 388 | return mp_const_none; |
| 389 | } |
| 390 | |
Damien George | eff359e | 2015-02-21 14:47:02 +0000 | [diff] [blame] | 391 | mp_obj_t mp_obj_list_remove(mp_obj_t self_in, mp_obj_t value) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 392 | mp_check_self(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
John R. Lenton | 49fb6e5 | 2014-01-04 01:56:53 +0000 | [diff] [blame] | 393 | mp_obj_t args[] = {self_in, value}; |
| 394 | args[1] = list_index(2, args); |
| 395 | list_pop(2, args); |
| 396 | |
| 397 | return mp_const_none; |
| 398 | } |
| 399 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 400 | STATIC mp_obj_t list_reverse(mp_obj_t self_in) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 401 | mp_check_self(MP_OBJ_IS_TYPE(self_in, &mp_type_list)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 402 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
John R. Lenton | 6e1e98f | 2014-01-04 02:10:29 +0000 | [diff] [blame] | 403 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 404 | mp_int_t len = self->len; |
| 405 | for (mp_int_t i = 0; i < len/2; i++) { |
Paul Sokolovsky | 69922c6 | 2015-03-20 23:24:25 +0200 | [diff] [blame] | 406 | mp_obj_t a = self->items[i]; |
John R. Lenton | 6e1e98f | 2014-01-04 02:10:29 +0000 | [diff] [blame] | 407 | self->items[i] = self->items[len-i-1]; |
| 408 | self->items[len-i-1] = a; |
| 409 | } |
| 410 | |
| 411 | return mp_const_none; |
| 412 | } |
| 413 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 414 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_append_obj, mp_obj_list_append); |
| 415 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_extend_obj, list_extend); |
| 416 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_clear_obj, list_clear); |
| 417 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_copy_obj, list_copy); |
| 418 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_count_obj, list_count); |
| 419 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_index_obj, 2, 4, list_index); |
| 420 | STATIC MP_DEFINE_CONST_FUN_OBJ_3(list_insert_obj, list_insert); |
| 421 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop); |
Damien George | eff359e | 2015-02-21 14:47:02 +0000 | [diff] [blame] | 422 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, mp_obj_list_remove); |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 423 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse); |
Damien George | 744e767 | 2015-02-02 15:14:22 +0000 | [diff] [blame] | 424 | STATIC MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 1, mp_obj_list_sort); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 425 | |
Damien George | cbf7674 | 2015-11-27 13:38:15 +0000 | [diff] [blame] | 426 | STATIC const mp_rom_map_elem_t list_locals_dict_table[] = { |
| 427 | { MP_ROM_QSTR(MP_QSTR_append), MP_ROM_PTR(&list_append_obj) }, |
| 428 | { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&list_clear_obj) }, |
| 429 | { MP_ROM_QSTR(MP_QSTR_copy), MP_ROM_PTR(&list_copy_obj) }, |
| 430 | { MP_ROM_QSTR(MP_QSTR_count), MP_ROM_PTR(&list_count_obj) }, |
| 431 | { MP_ROM_QSTR(MP_QSTR_extend), MP_ROM_PTR(&list_extend_obj) }, |
| 432 | { MP_ROM_QSTR(MP_QSTR_index), MP_ROM_PTR(&list_index_obj) }, |
| 433 | { MP_ROM_QSTR(MP_QSTR_insert), MP_ROM_PTR(&list_insert_obj) }, |
| 434 | { MP_ROM_QSTR(MP_QSTR_pop), MP_ROM_PTR(&list_pop_obj) }, |
| 435 | { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&list_remove_obj) }, |
| 436 | { MP_ROM_QSTR(MP_QSTR_reverse), MP_ROM_PTR(&list_reverse_obj) }, |
| 437 | { MP_ROM_QSTR(MP_QSTR_sort), MP_ROM_PTR(&list_sort_obj) }, |
ian-v | 7a16fad | 2014-01-06 09:52:29 -0800 | [diff] [blame] | 438 | }; |
Damien George | 97209d3 | 2014-01-07 15:58:30 +0000 | [diff] [blame] | 439 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 440 | STATIC MP_DEFINE_CONST_DICT(list_locals_dict, list_locals_dict_table); |
| 441 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 442 | const mp_obj_type_t mp_type_list = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 443 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 444 | .name = MP_QSTR_list, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 445 | .print = list_print, |
| 446 | .make_new = list_make_new, |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 447 | .unary_op = list_unary_op, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 448 | .binary_op = list_binary_op, |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 449 | .subscr = list_subscr, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 450 | .getiter = list_getiter, |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 451 | .locals_dict = (mp_obj_dict_t*)&list_locals_dict, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 452 | }; |
| 453 | |
Damien George | 58d9eeb | 2017-02-16 16:12:41 +1100 | [diff] [blame] | 454 | void mp_obj_list_init(mp_obj_list_t *o, size_t n) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 455 | o->base.type = &mp_type_list; |
Paul Sokolovsky | ddf1aa9 | 2014-01-27 01:06:23 +0200 | [diff] [blame] | 456 | o->alloc = n < LIST_MIN_ALLOC ? LIST_MIN_ALLOC : n; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 457 | o->len = n; |
| 458 | o->items = m_new(mp_obj_t, o->alloc); |
Paul Sokolovsky | a224067 | 2014-04-28 00:16:57 +0300 | [diff] [blame] | 459 | mp_seq_clear(o->items, n, o->alloc, sizeof(*o->items)); |
Paul Sokolovsky | 18bef25 | 2014-04-13 06:17:29 +0300 | [diff] [blame] | 460 | } |
| 461 | |
Damien George | 58d9eeb | 2017-02-16 16:12:41 +1100 | [diff] [blame] | 462 | STATIC mp_obj_list_t *list_new(size_t n) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 463 | mp_obj_list_t *o = m_new_obj(mp_obj_list_t); |
Paul Sokolovsky | 18bef25 | 2014-04-13 06:17:29 +0300 | [diff] [blame] | 464 | mp_obj_list_init(o, n); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 465 | return o; |
| 466 | } |
| 467 | |
Damien George | 58d9eeb | 2017-02-16 16:12:41 +1100 | [diff] [blame] | 468 | mp_obj_t mp_obj_new_list(size_t n, mp_obj_t *items) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 469 | mp_obj_list_t *o = list_new(n); |
Paul Sokolovsky | e5a15cb | 2014-02-04 09:44:10 +0200 | [diff] [blame] | 470 | if (items != NULL) { |
Damien George | 58d9eeb | 2017-02-16 16:12:41 +1100 | [diff] [blame] | 471 | for (size_t i = 0; i < n; i++) { |
Paul Sokolovsky | e5a15cb | 2014-02-04 09:44:10 +0200 | [diff] [blame] | 472 | o->items[i] = items[i]; |
| 473 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 474 | } |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 475 | return MP_OBJ_FROM_PTR(o); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 476 | } |
| 477 | |
Damien George | 9c4cbe2 | 2014-08-30 14:04:14 +0100 | [diff] [blame] | 478 | void mp_obj_list_get(mp_obj_t self_in, mp_uint_t *len, mp_obj_t **items) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 479 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 480 | *len = self->len; |
| 481 | *items = self->items; |
| 482 | } |
| 483 | |
Damien George | 58d9eeb | 2017-02-16 16:12:41 +1100 | [diff] [blame] | 484 | void mp_obj_list_set_len(mp_obj_t self_in, size_t len) { |
Damien George | 495d781 | 2014-04-08 17:51:47 +0100 | [diff] [blame] | 485 | // trust that the caller knows what it's doing |
| 486 | // TODO realloc if len got much smaller than alloc |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 487 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
Damien George | 495d781 | 2014-04-08 17:51:47 +0100 | [diff] [blame] | 488 | self->len = len; |
| 489 | } |
| 490 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 491 | void mp_obj_list_store(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 492 | mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); |
Damien George | 9c4cbe2 | 2014-08-30 14:04:14 +0100 | [diff] [blame] | 493 | mp_uint_t i = mp_get_index(self->base.type, self->len, index, false); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 494 | self->items[i] = value; |
| 495 | } |
| 496 | |
| 497 | /******************************************************************************/ |
| 498 | /* list iterator */ |
| 499 | |
| 500 | typedef struct _mp_obj_list_it_t { |
| 501 | mp_obj_base_t base; |
Damien George | 8212d97 | 2016-01-03 16:27:55 +0000 | [diff] [blame] | 502 | mp_fun_1_t iternext; |
Paul Sokolovsky | 3d59825 | 2015-03-25 09:25:41 +0200 | [diff] [blame] | 503 | mp_obj_t list; |
Damien George | 58d9eeb | 2017-02-16 16:12:41 +1100 | [diff] [blame] | 504 | size_t cur; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 505 | } mp_obj_list_it_t; |
| 506 | |
Damien George | 969a6b3 | 2014-12-10 22:07:04 +0000 | [diff] [blame] | 507 | STATIC mp_obj_t list_it_iternext(mp_obj_t self_in) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 508 | mp_obj_list_it_t *self = MP_OBJ_TO_PTR(self_in); |
| 509 | mp_obj_list_t *list = MP_OBJ_TO_PTR(self->list); |
Paul Sokolovsky | 3d59825 | 2015-03-25 09:25:41 +0200 | [diff] [blame] | 510 | if (self->cur < list->len) { |
| 511 | mp_obj_t o_out = list->items[self->cur]; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 512 | self->cur += 1; |
| 513 | return o_out; |
| 514 | } else { |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 515 | return MP_OBJ_STOP_ITERATION; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 516 | } |
| 517 | } |
| 518 | |
Damien George | ae8d867 | 2016-01-09 23:14:54 +0000 | [diff] [blame] | 519 | mp_obj_t mp_obj_new_list_iterator(mp_obj_t list, size_t cur, mp_obj_iter_buf_t *iter_buf) { |
| 520 | assert(sizeof(mp_obj_list_it_t) <= sizeof(mp_obj_iter_buf_t)); |
| 521 | mp_obj_list_it_t *o = (mp_obj_list_it_t*)iter_buf; |
Damien George | 8212d97 | 2016-01-03 16:27:55 +0000 | [diff] [blame] | 522 | o->base.type = &mp_type_polymorph_iter; |
| 523 | o->iternext = list_it_iternext; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 524 | o->list = list; |
| 525 | o->cur = cur; |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 526 | return MP_OBJ_FROM_PTR(o); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 527 | } |