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 | |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 27 | #include <string.h> |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 28 | #include <assert.h> |
| 29 | |
Paul Sokolovsky | f54bcbf | 2014-05-02 17:47:01 +0300 | [diff] [blame] | 30 | #include "mpconfig.h" |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [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" |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 34 | #include "obj.h" |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 35 | #include "runtime0.h" |
| 36 | #include "runtime.h" |
Paul Sokolovsky | c203324 | 2014-02-14 20:21:50 +0200 | [diff] [blame] | 37 | #include "binary.h" |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 38 | |
| 39 | typedef struct _mp_obj_array_t { |
| 40 | mp_obj_base_t base; |
Damien George | 5104775 | 2014-02-26 17:40:52 +0000 | [diff] [blame] | 41 | machine_uint_t typecode : 8; |
| 42 | // free is number of unused elements after len used elements |
| 43 | // alloc size = len + free |
| 44 | machine_uint_t free : (8 * sizeof(machine_uint_t) - 8); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 45 | machine_uint_t len; // in elements |
| 46 | void *items; |
| 47 | } mp_obj_array_t; |
| 48 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 49 | STATIC mp_obj_t array_iterator_new(mp_obj_t array_in); |
| 50 | STATIC mp_obj_array_t *array_new(char typecode, uint n); |
| 51 | STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 52 | |
| 53 | /******************************************************************************/ |
| 54 | /* array */ |
| 55 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 56 | STATIC void array_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 57 | mp_obj_array_t *o = o_in; |
| 58 | if (o->typecode == BYTEARRAY_TYPECODE) { |
Paul Sokolovsky | 1801421 | 2014-01-28 03:40:48 +0200 | [diff] [blame] | 59 | print(env, "bytearray(b", o->typecode); |
| 60 | mp_str_print_quoted(print, env, o->items, o->len); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 61 | } else { |
Paul Sokolovsky | 7e652af | 2014-01-28 03:14:20 +0200 | [diff] [blame] | 62 | print(env, "array('%c'", o->typecode); |
Paul Sokolovsky | 1801421 | 2014-01-28 03:40:48 +0200 | [diff] [blame] | 63 | if (o->len > 0) { |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 64 | print(env, ", ["); |
Paul Sokolovsky | 1801421 | 2014-01-28 03:40:48 +0200 | [diff] [blame] | 65 | for (int i = 0; i < o->len; i++) { |
| 66 | if (i > 0) { |
| 67 | print(env, ", "); |
| 68 | } |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame] | 69 | mp_obj_print_helper(print, env, mp_binary_get_val_array(o->typecode, o->items, i), PRINT_REPR); |
Paul Sokolovsky | 7e652af | 2014-01-28 03:14:20 +0200 | [diff] [blame] | 70 | } |
Paul Sokolovsky | 1801421 | 2014-01-28 03:40:48 +0200 | [diff] [blame] | 71 | print(env, "]"); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 72 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 73 | } |
Paul Sokolovsky | 7e652af | 2014-01-28 03:14:20 +0200 | [diff] [blame] | 74 | print(env, ")"); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 75 | } |
| 76 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 77 | STATIC mp_obj_t array_construct(char typecode, mp_obj_t initializer) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 78 | uint len; |
| 79 | // Try to create array of exact len if initializer len is known |
| 80 | mp_obj_t len_in = mp_obj_len_maybe(initializer); |
| 81 | if (len_in == MP_OBJ_NULL) { |
| 82 | len = 0; |
| 83 | } else { |
| 84 | len = MP_OBJ_SMALL_INT_VALUE(len_in); |
| 85 | } |
| 86 | |
| 87 | mp_obj_array_t *array = array_new(typecode, len); |
| 88 | |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 89 | mp_obj_t iterable = mp_getiter(initializer); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 90 | mp_obj_t item; |
| 91 | int i = 0; |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 92 | while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 93 | if (len == 0) { |
| 94 | array_append(array, item); |
| 95 | } else { |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame] | 96 | mp_binary_set_val_array(typecode, array->items, i++, item); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 97 | } |
| 98 | } |
| 99 | |
| 100 | return array; |
| 101 | } |
| 102 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 103 | STATIC mp_obj_t array_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { |
Damien George | a3f94e0 | 2014-04-20 00:13:22 +0100 | [diff] [blame] | 104 | mp_arg_check_num(n_args, n_kw, 1, 2, false); |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 105 | |
| 106 | // get typecode |
Paul Sokolovsky | 11973b4 | 2014-01-28 02:31:52 +0200 | [diff] [blame] | 107 | uint l; |
Damien George | 698ec21 | 2014-02-08 18:17:23 +0000 | [diff] [blame] | 108 | const char *typecode = mp_obj_str_get_data(args[0], &l); |
Paul Sokolovsky | 11973b4 | 2014-01-28 02:31:52 +0200 | [diff] [blame] | 109 | |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 110 | if (n_args == 1) { |
| 111 | // 1 arg: make an empty array |
| 112 | return array_new(*typecode, 0); |
| 113 | } else { |
| 114 | // 2 args: construct the array from the given iterator |
| 115 | return array_construct(*typecode, args[1]); |
| 116 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 117 | } |
| 118 | |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 119 | STATIC mp_obj_t bytearray_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { |
Damien George | a3f94e0 | 2014-04-20 00:13:22 +0100 | [diff] [blame] | 120 | mp_arg_check_num(n_args, n_kw, 0, 1, false); |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 121 | |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 122 | if (n_args == 0) { |
| 123 | // no args: construct an empty bytearray |
| 124 | return array_new(BYTEARRAY_TYPECODE, 0); |
| 125 | } else if (MP_OBJ_IS_SMALL_INT(args[0])) { |
| 126 | // 1 arg, an integer: construct a blank bytearray of that length |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 127 | uint len = MP_OBJ_SMALL_INT_VALUE(args[0]); |
Paul Sokolovsky | b9cf3d3 | 2014-04-08 04:42:44 +0300 | [diff] [blame] | 128 | mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, len); |
| 129 | memset(o->items, 0, len); |
| 130 | return o; |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 131 | } else { |
| 132 | // 1 arg, an iterator: construct the bytearray from that |
| 133 | return array_construct(BYTEARRAY_TYPECODE, args[0]); |
Paul Sokolovsky | b9cf3d3 | 2014-04-08 04:42:44 +0300 | [diff] [blame] | 134 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 135 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 136 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 137 | STATIC mp_obj_t array_unary_op(int op, mp_obj_t o_in) { |
Paul Sokolovsky | c1d9bbc | 2014-01-30 04:37:19 +0200 | [diff] [blame] | 138 | mp_obj_array_t *o = o_in; |
| 139 | switch (op) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 140 | case MP_UNARY_OP_BOOL: return MP_BOOL(o->len != 0); |
| 141 | case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(o->len); |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 142 | default: return MP_OBJ_NOT_SUPPORTED; |
Paul Sokolovsky | c1d9bbc | 2014-01-30 04:37:19 +0200 | [diff] [blame] | 143 | } |
| 144 | } |
| 145 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 146 | STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg) { |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 147 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_array) || MP_OBJ_IS_TYPE(self_in, &mp_type_bytearray)); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 148 | mp_obj_array_t *self = self_in; |
| 149 | if (self->free == 0) { |
Paul Sokolovsky | 1355cf4 | 2014-04-19 01:25:49 +0300 | [diff] [blame] | 150 | int item_sz = mp_binary_get_size('@', self->typecode, NULL); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 151 | // TODO: alloc policy |
| 152 | self->free = 8; |
| 153 | self->items = m_realloc(self->items, item_sz * self->len, item_sz * (self->len + self->free)); |
Paul Sokolovsky | a224067 | 2014-04-28 00:16:57 +0300 | [diff] [blame] | 154 | mp_seq_clear(self->items, self->len + 1, self->len + self->free, item_sz); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 155 | } |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame] | 156 | mp_binary_set_val_array(self->typecode, self->items, self->len++, arg); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 157 | self->free--; |
| 158 | return mp_const_none; // return None, as per CPython |
| 159 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 160 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(array_append_obj, array_append); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 161 | |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 162 | STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) { |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 163 | if (value == MP_OBJ_NULL) { |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 164 | // delete item |
| 165 | // TODO implement |
Paul Sokolovsky | 2690525 | 2014-04-20 20:58:33 +0300 | [diff] [blame] | 166 | // TODO: confirmed that both bytearray and array.array support |
| 167 | // slice deletion |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 168 | return MP_OBJ_NOT_SUPPORTED; |
| 169 | } else { |
| 170 | mp_obj_array_t *o = self_in; |
Paul Sokolovsky | d6e1272 | 2014-04-19 20:06:57 +0300 | [diff] [blame] | 171 | if (MP_OBJ_IS_TYPE(index_in, &mp_type_slice)) { |
Paul Sokolovsky | 2690525 | 2014-04-20 20:58:33 +0300 | [diff] [blame] | 172 | if (value != MP_OBJ_SENTINEL) { |
| 173 | // Only getting a slice is suported so far, not assignment |
| 174 | // TODO: confirmed that both bytearray and array.array support |
| 175 | // slice assignment (incl. of different size) |
| 176 | return MP_OBJ_NOT_SUPPORTED; |
| 177 | } |
Paul Sokolovsky | d6e1272 | 2014-04-19 20:06:57 +0300 | [diff] [blame] | 178 | machine_uint_t start, stop; |
Paul Sokolovsky | d915a52 | 2014-05-10 21:36:33 +0300 | [diff] [blame^] | 179 | if (!mp_seq_get_fast_slice_indexes(o->len, index_in, &start, &stop)) { |
Paul Sokolovsky | d6e1272 | 2014-04-19 20:06:57 +0300 | [diff] [blame] | 180 | assert(0); |
| 181 | } |
| 182 | mp_obj_array_t *res = array_new(o->typecode, stop - start); |
| 183 | int sz = mp_binary_get_size('@', o->typecode, NULL); |
| 184 | assert(sz > 0); |
| 185 | byte *p = o->items; |
| 186 | memcpy(res->items, p + start * sz, (stop - start) * sz); |
| 187 | return res; |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 188 | } else { |
Paul Sokolovsky | d6e1272 | 2014-04-19 20:06:57 +0300 | [diff] [blame] | 189 | uint index = mp_get_index(o->base.type, o->len, index_in, false); |
| 190 | if (value == MP_OBJ_SENTINEL) { |
| 191 | // load |
| 192 | return mp_binary_get_val_array(o->typecode, o->items, index); |
| 193 | } else { |
| 194 | // store |
| 195 | mp_binary_set_val_array(o->typecode, o->items, index, value); |
| 196 | return mp_const_none; |
| 197 | } |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 198 | } |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 199 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 200 | } |
| 201 | |
Damien George | 57a4b4f | 2014-04-18 22:29:21 +0100 | [diff] [blame] | 202 | STATIC machine_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, int flags) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 203 | mp_obj_array_t *o = o_in; |
| 204 | bufinfo->buf = o->items; |
Paul Sokolovsky | 1355cf4 | 2014-04-19 01:25:49 +0300 | [diff] [blame] | 205 | bufinfo->len = o->len * mp_binary_get_size('@', o->typecode, NULL); |
Damien George | 57a4b4f | 2014-04-18 22:29:21 +0100 | [diff] [blame] | 206 | bufinfo->typecode = o->typecode; |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 207 | return 0; |
| 208 | } |
| 209 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 210 | STATIC const mp_map_elem_t array_locals_dict_table[] = { |
| 211 | { MP_OBJ_NEW_QSTR(MP_QSTR_append), (mp_obj_t)&array_append_obj }, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 212 | }; |
| 213 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 214 | STATIC MP_DEFINE_CONST_DICT(array_locals_dict, array_locals_dict_table); |
| 215 | |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 216 | const mp_obj_type_t mp_type_array = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 217 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 218 | .name = MP_QSTR_array, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 219 | .print = array_print, |
| 220 | .make_new = array_make_new, |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 221 | .getiter = array_iterator_new, |
Paul Sokolovsky | c1d9bbc | 2014-01-30 04:37:19 +0200 | [diff] [blame] | 222 | .unary_op = array_unary_op, |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 223 | .subscr = array_subscr, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 224 | .buffer_p = { .get_buffer = array_get_buffer }, |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 225 | .locals_dict = (mp_obj_t)&array_locals_dict, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 226 | }; |
| 227 | |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 228 | const mp_obj_type_t mp_type_bytearray = { |
| 229 | { &mp_type_type }, |
| 230 | .name = MP_QSTR_bytearray, |
| 231 | .print = array_print, |
| 232 | .make_new = bytearray_make_new, |
| 233 | .getiter = array_iterator_new, |
| 234 | .unary_op = array_unary_op, |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 235 | .subscr = array_subscr, |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 236 | .buffer_p = { .get_buffer = array_get_buffer }, |
| 237 | .locals_dict = (mp_obj_t)&array_locals_dict, |
| 238 | }; |
| 239 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 240 | STATIC mp_obj_array_t *array_new(char typecode, uint n) { |
Paul Sokolovsky | 1355cf4 | 2014-04-19 01:25:49 +0300 | [diff] [blame] | 241 | int typecode_size = mp_binary_get_size('@', typecode, NULL); |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 242 | if (typecode_size <= 0) { |
| 243 | nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "bad typecode")); |
| 244 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 245 | mp_obj_array_t *o = m_new_obj(mp_obj_array_t); |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 246 | o->base.type = (typecode == BYTEARRAY_TYPECODE) ? &mp_type_bytearray : &mp_type_array; |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 247 | o->typecode = typecode; |
| 248 | o->free = 0; |
| 249 | o->len = n; |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 250 | o->items = m_malloc(typecode_size * o->len); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 251 | return o; |
| 252 | } |
| 253 | |
Paul Sokolovsky | 3399668 | 2014-01-21 23:30:10 +0200 | [diff] [blame] | 254 | uint mp_obj_array_len(mp_obj_t self_in) { |
| 255 | return ((mp_obj_array_t *)self_in)->len; |
| 256 | } |
| 257 | |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 258 | mp_obj_t mp_obj_new_bytearray(uint n, void *items) { |
| 259 | mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, n); |
| 260 | memcpy(o->items, items, n); |
| 261 | return o; |
| 262 | } |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 263 | |
Paul Sokolovsky | 7f11c79 | 2014-01-29 00:21:41 +0200 | [diff] [blame] | 264 | // Create bytearray which references specified memory area |
| 265 | mp_obj_t mp_obj_new_bytearray_by_ref(uint n, void *items) { |
| 266 | mp_obj_array_t *o = m_new_obj(mp_obj_array_t); |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 267 | o->base.type = &mp_type_array; |
Paul Sokolovsky | 7f11c79 | 2014-01-29 00:21:41 +0200 | [diff] [blame] | 268 | o->typecode = BYTEARRAY_TYPECODE; |
| 269 | o->free = 0; |
| 270 | o->len = n; |
| 271 | o->items = items; |
| 272 | return o; |
| 273 | } |
| 274 | |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 275 | /******************************************************************************/ |
| 276 | /* array iterator */ |
| 277 | |
| 278 | typedef struct _mp_obj_array_it_t { |
| 279 | mp_obj_base_t base; |
| 280 | mp_obj_array_t *array; |
| 281 | machine_uint_t cur; |
| 282 | } mp_obj_array_it_t; |
| 283 | |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 284 | STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) { |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 285 | mp_obj_array_it_t *self = self_in; |
| 286 | if (self->cur < self->array->len) { |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame] | 287 | return mp_binary_get_val_array(self->array->typecode, self->array->items, self->cur++); |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 288 | } else { |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 289 | return MP_OBJ_STOP_ITERATION; |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 290 | } |
| 291 | } |
| 292 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 293 | STATIC const mp_obj_type_t array_it_type = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 294 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 295 | .name = MP_QSTR_iterator, |
Paul Sokolovsky | f7eaf60 | 2014-03-30 22:00:12 +0300 | [diff] [blame] | 296 | .getiter = mp_identity, |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 297 | .iternext = array_it_iternext, |
| 298 | }; |
| 299 | |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 300 | STATIC mp_obj_t array_iterator_new(mp_obj_t array_in) { |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 301 | mp_obj_array_t *array = array_in; |
| 302 | mp_obj_array_it_t *o = m_new_obj(mp_obj_array_it_t); |
| 303 | o->base.type = &array_it_type; |
| 304 | o->array = array; |
| 305 | o->cur = 0; |
| 306 | return o; |
| 307 | } |