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 |
Paul Sokolovsky | da9f092 | 2014-05-13 08:44:45 +0300 | [diff] [blame] | 7 | * Copyright (c) 2014 Paul Sokolovsky |
Damien George | 04b9147 | 2014-05-03 23:27:38 +0100 | [diff] [blame] | 8 | * |
| 9 | * Permission is hereby granted, free of charge, to any person obtaining a copy |
| 10 | * of this software and associated documentation files (the "Software"), to deal |
| 11 | * in the Software without restriction, including without limitation the rights |
| 12 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
| 13 | * copies of the Software, and to permit persons to whom the Software is |
| 14 | * furnished to do so, subject to the following conditions: |
| 15 | * |
| 16 | * The above copyright notice and this permission notice shall be included in |
| 17 | * all copies or substantial portions of the Software. |
| 18 | * |
| 19 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 20 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 21 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| 22 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 23 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| 24 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| 25 | * THE SOFTWARE. |
| 26 | */ |
| 27 | |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 28 | #include <string.h> |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 29 | #include <assert.h> |
| 30 | |
Paul Sokolovsky | f54bcbf | 2014-05-02 17:47:01 +0300 | [diff] [blame] | 31 | #include "mpconfig.h" |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 32 | #include "nlr.h" |
| 33 | #include "misc.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 34 | #include "qstr.h" |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 35 | #include "obj.h" |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 36 | #include "runtime0.h" |
| 37 | #include "runtime.h" |
Paul Sokolovsky | c203324 | 2014-02-14 20:21:50 +0200 | [diff] [blame] | 38 | #include "binary.h" |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 39 | |
Paul Sokolovsky | cb78f86 | 2014-06-27 20:39:09 +0300 | [diff] [blame] | 40 | #if MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY |
| 41 | |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 42 | typedef struct _mp_obj_array_t { |
| 43 | mp_obj_base_t base; |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 44 | mp_uint_t typecode : 8; |
Damien George | 5104775 | 2014-02-26 17:40:52 +0000 | [diff] [blame] | 45 | // free is number of unused elements after len used elements |
| 46 | // alloc size = len + free |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 47 | mp_uint_t free : (8 * sizeof(mp_uint_t) - 8); |
| 48 | mp_uint_t len; // in elements |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 49 | void *items; |
| 50 | } mp_obj_array_t; |
| 51 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 52 | STATIC mp_obj_t array_iterator_new(mp_obj_t array_in); |
| 53 | STATIC mp_obj_array_t *array_new(char typecode, uint n); |
| 54 | STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg); |
Damien George | 4d91723 | 2014-08-30 14:28:06 +0100 | [diff] [blame^] | 55 | STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 56 | |
| 57 | /******************************************************************************/ |
| 58 | /* array */ |
| 59 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 60 | 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] | 61 | mp_obj_array_t *o = o_in; |
| 62 | if (o->typecode == BYTEARRAY_TYPECODE) { |
Damien George | 5467186 | 2014-07-17 21:56:32 +0100 | [diff] [blame] | 63 | print(env, "bytearray(b"); |
Paul Sokolovsky | 2ec38a1 | 2014-06-13 21:23:00 +0300 | [diff] [blame] | 64 | mp_str_print_quoted(print, env, o->items, o->len, true); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 65 | } else { |
Paul Sokolovsky | 7e652af | 2014-01-28 03:14:20 +0200 | [diff] [blame] | 66 | print(env, "array('%c'", o->typecode); |
Paul Sokolovsky | 1801421 | 2014-01-28 03:40:48 +0200 | [diff] [blame] | 67 | if (o->len > 0) { |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 68 | print(env, ", ["); |
Paul Sokolovsky | 1801421 | 2014-01-28 03:40:48 +0200 | [diff] [blame] | 69 | for (int i = 0; i < o->len; i++) { |
| 70 | if (i > 0) { |
| 71 | print(env, ", "); |
| 72 | } |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame] | 73 | 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] | 74 | } |
Paul Sokolovsky | 1801421 | 2014-01-28 03:40:48 +0200 | [diff] [blame] | 75 | print(env, "]"); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 76 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 77 | } |
Paul Sokolovsky | 7e652af | 2014-01-28 03:14:20 +0200 | [diff] [blame] | 78 | print(env, ")"); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 79 | } |
| 80 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 81 | STATIC mp_obj_t array_construct(char typecode, mp_obj_t initializer) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 82 | uint len; |
| 83 | // Try to create array of exact len if initializer len is known |
| 84 | mp_obj_t len_in = mp_obj_len_maybe(initializer); |
| 85 | if (len_in == MP_OBJ_NULL) { |
| 86 | len = 0; |
| 87 | } else { |
| 88 | len = MP_OBJ_SMALL_INT_VALUE(len_in); |
| 89 | } |
| 90 | |
| 91 | mp_obj_array_t *array = array_new(typecode, len); |
| 92 | |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 93 | mp_obj_t iterable = mp_getiter(initializer); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 94 | mp_obj_t item; |
| 95 | int i = 0; |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 96 | while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 97 | if (len == 0) { |
| 98 | array_append(array, item); |
| 99 | } else { |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame] | 100 | mp_binary_set_val_array(typecode, array->items, i++, item); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 101 | } |
| 102 | } |
| 103 | |
| 104 | return array; |
| 105 | } |
| 106 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 107 | STATIC mp_obj_t array_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) { |
Damien George | a3f94e0 | 2014-04-20 00:13:22 +0100 | [diff] [blame] | 108 | mp_arg_check_num(n_args, n_kw, 1, 2, false); |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 109 | |
| 110 | // get typecode |
Damien George | d182b98 | 2014-08-30 14:19:41 +0100 | [diff] [blame] | 111 | mp_uint_t l; |
Damien George | 698ec21 | 2014-02-08 18:17:23 +0000 | [diff] [blame] | 112 | const char *typecode = mp_obj_str_get_data(args[0], &l); |
Paul Sokolovsky | 11973b4 | 2014-01-28 02:31:52 +0200 | [diff] [blame] | 113 | |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 114 | if (n_args == 1) { |
| 115 | // 1 arg: make an empty array |
| 116 | return array_new(*typecode, 0); |
| 117 | } else { |
| 118 | // 2 args: construct the array from the given iterator |
| 119 | return array_construct(*typecode, args[1]); |
| 120 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 121 | } |
| 122 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 123 | STATIC mp_obj_t bytearray_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) { |
Damien George | a3f94e0 | 2014-04-20 00:13:22 +0100 | [diff] [blame] | 124 | mp_arg_check_num(n_args, n_kw, 0, 1, false); |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 125 | |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 126 | if (n_args == 0) { |
| 127 | // no args: construct an empty bytearray |
| 128 | return array_new(BYTEARRAY_TYPECODE, 0); |
| 129 | } else if (MP_OBJ_IS_SMALL_INT(args[0])) { |
| 130 | // 1 arg, an integer: construct a blank bytearray of that length |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 131 | uint len = MP_OBJ_SMALL_INT_VALUE(args[0]); |
Paul Sokolovsky | b9cf3d3 | 2014-04-08 04:42:44 +0300 | [diff] [blame] | 132 | mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, len); |
| 133 | memset(o->items, 0, len); |
| 134 | return o; |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 135 | } else { |
| 136 | // 1 arg, an iterator: construct the bytearray from that |
| 137 | return array_construct(BYTEARRAY_TYPECODE, args[0]); |
Paul Sokolovsky | b9cf3d3 | 2014-04-08 04:42:44 +0300 | [diff] [blame] | 138 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 139 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 140 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 141 | STATIC mp_obj_t array_unary_op(mp_uint_t op, mp_obj_t o_in) { |
Paul Sokolovsky | c1d9bbc | 2014-01-30 04:37:19 +0200 | [diff] [blame] | 142 | mp_obj_array_t *o = o_in; |
| 143 | switch (op) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 144 | case MP_UNARY_OP_BOOL: return MP_BOOL(o->len != 0); |
| 145 | case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(o->len); |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 146 | default: return MP_OBJ_NULL; // op not supported |
Paul Sokolovsky | c1d9bbc | 2014-01-30 04:37:19 +0200 | [diff] [blame] | 147 | } |
| 148 | } |
| 149 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 150 | STATIC mp_obj_t array_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { |
Paul Sokolovsky | 5f93033 | 2014-08-10 11:49:23 +0300 | [diff] [blame] | 151 | switch (op) { |
| 152 | case MP_BINARY_OP_EQUAL: { |
| 153 | mp_buffer_info_t lhs_bufinfo; |
| 154 | mp_buffer_info_t rhs_bufinfo; |
| 155 | array_get_buffer(lhs_in, &lhs_bufinfo, MP_BUFFER_READ); |
| 156 | if (!mp_get_buffer(rhs_in, &rhs_bufinfo, MP_BUFFER_READ)) { |
| 157 | return mp_const_false; |
| 158 | } |
| 159 | return MP_BOOL(mp_seq_cmp_bytes(op, lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_bufinfo.len)); |
| 160 | } |
| 161 | default: |
| 162 | return MP_OBJ_NULL; // op not supported |
| 163 | } |
| 164 | } |
| 165 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 166 | 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] | 167 | 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] | 168 | mp_obj_array_t *self = self_in; |
| 169 | if (self->free == 0) { |
Paul Sokolovsky | 1355cf4 | 2014-04-19 01:25:49 +0300 | [diff] [blame] | 170 | int item_sz = mp_binary_get_size('@', self->typecode, NULL); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 171 | // TODO: alloc policy |
| 172 | self->free = 8; |
| 173 | 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] | 174 | 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] | 175 | } |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame] | 176 | mp_binary_set_val_array(self->typecode, self->items, self->len++, arg); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 177 | self->free--; |
| 178 | return mp_const_none; // return None, as per CPython |
| 179 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 180 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(array_append_obj, array_append); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 181 | |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 182 | 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] | 183 | if (value == MP_OBJ_NULL) { |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 184 | // delete item |
| 185 | // TODO implement |
Paul Sokolovsky | 2690525 | 2014-04-20 20:58:33 +0300 | [diff] [blame] | 186 | // TODO: confirmed that both bytearray and array.array support |
| 187 | // slice deletion |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 188 | return MP_OBJ_NULL; // op not supported |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 189 | } else { |
| 190 | mp_obj_array_t *o = self_in; |
Damien George | c49ddb9 | 2014-06-01 13:49:35 +0100 | [diff] [blame] | 191 | if (0) { |
| 192 | #if MICROPY_PY_BUILTINS_SLICE |
| 193 | } else if (MP_OBJ_IS_TYPE(index_in, &mp_type_slice)) { |
Paul Sokolovsky | 2690525 | 2014-04-20 20:58:33 +0300 | [diff] [blame] | 194 | if (value != MP_OBJ_SENTINEL) { |
| 195 | // Only getting a slice is suported so far, not assignment |
| 196 | // TODO: confirmed that both bytearray and array.array support |
| 197 | // slice assignment (incl. of different size) |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 198 | return MP_OBJ_NULL; // op not supported |
Paul Sokolovsky | 2690525 | 2014-04-20 20:58:33 +0300 | [diff] [blame] | 199 | } |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 200 | mp_bound_slice_t slice; |
| 201 | if (!mp_seq_get_fast_slice_indexes(o->len, index_in, &slice)) { |
Paul Sokolovsky | 5fd5af9 | 2014-05-25 22:12:56 +0300 | [diff] [blame] | 202 | nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError, |
Damien George | 11de839 | 2014-06-05 18:57:38 +0100 | [diff] [blame] | 203 | "only slices with step=1 (aka None) are supported")); |
Paul Sokolovsky | d6e1272 | 2014-04-19 20:06:57 +0300 | [diff] [blame] | 204 | } |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 205 | mp_obj_array_t *res = array_new(o->typecode, slice.stop - slice.start); |
Paul Sokolovsky | d6e1272 | 2014-04-19 20:06:57 +0300 | [diff] [blame] | 206 | int sz = mp_binary_get_size('@', o->typecode, NULL); |
| 207 | assert(sz > 0); |
| 208 | byte *p = o->items; |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 209 | memcpy(res->items, p + slice.start * sz, (slice.stop - slice.start) * sz); |
Paul Sokolovsky | d6e1272 | 2014-04-19 20:06:57 +0300 | [diff] [blame] | 210 | return res; |
Damien George | c49ddb9 | 2014-06-01 13:49:35 +0100 | [diff] [blame] | 211 | #endif |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 212 | } else { |
Paul Sokolovsky | d6e1272 | 2014-04-19 20:06:57 +0300 | [diff] [blame] | 213 | uint index = mp_get_index(o->base.type, o->len, index_in, false); |
| 214 | if (value == MP_OBJ_SENTINEL) { |
| 215 | // load |
| 216 | return mp_binary_get_val_array(o->typecode, o->items, index); |
| 217 | } else { |
| 218 | // store |
| 219 | mp_binary_set_val_array(o->typecode, o->items, index, value); |
| 220 | return mp_const_none; |
| 221 | } |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 222 | } |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 223 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 224 | } |
| 225 | |
Damien George | 4d91723 | 2014-08-30 14:28:06 +0100 | [diff] [blame^] | 226 | STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 227 | mp_obj_array_t *o = o_in; |
| 228 | bufinfo->buf = o->items; |
Paul Sokolovsky | 1355cf4 | 2014-04-19 01:25:49 +0300 | [diff] [blame] | 229 | bufinfo->len = o->len * mp_binary_get_size('@', o->typecode, NULL); |
Damien George | 57a4b4f | 2014-04-18 22:29:21 +0100 | [diff] [blame] | 230 | bufinfo->typecode = o->typecode; |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 231 | return 0; |
| 232 | } |
| 233 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 234 | STATIC const mp_map_elem_t array_locals_dict_table[] = { |
| 235 | { 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] | 236 | }; |
| 237 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 238 | STATIC MP_DEFINE_CONST_DICT(array_locals_dict, array_locals_dict_table); |
| 239 | |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 240 | const mp_obj_type_t mp_type_array = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 241 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 242 | .name = MP_QSTR_array, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 243 | .print = array_print, |
| 244 | .make_new = array_make_new, |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 245 | .getiter = array_iterator_new, |
Paul Sokolovsky | c1d9bbc | 2014-01-30 04:37:19 +0200 | [diff] [blame] | 246 | .unary_op = array_unary_op, |
Paul Sokolovsky | 5f93033 | 2014-08-10 11:49:23 +0300 | [diff] [blame] | 247 | .binary_op = array_binary_op, |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 248 | .subscr = array_subscr, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 249 | .buffer_p = { .get_buffer = array_get_buffer }, |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 250 | .locals_dict = (mp_obj_t)&array_locals_dict, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 251 | }; |
| 252 | |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 253 | const mp_obj_type_t mp_type_bytearray = { |
| 254 | { &mp_type_type }, |
| 255 | .name = MP_QSTR_bytearray, |
| 256 | .print = array_print, |
| 257 | .make_new = bytearray_make_new, |
| 258 | .getiter = array_iterator_new, |
| 259 | .unary_op = array_unary_op, |
Paul Sokolovsky | 5f93033 | 2014-08-10 11:49:23 +0300 | [diff] [blame] | 260 | .binary_op = array_binary_op, |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 261 | .subscr = array_subscr, |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 262 | .buffer_p = { .get_buffer = array_get_buffer }, |
| 263 | .locals_dict = (mp_obj_t)&array_locals_dict, |
| 264 | }; |
| 265 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 266 | STATIC mp_obj_array_t *array_new(char typecode, uint n) { |
Paul Sokolovsky | 1355cf4 | 2014-04-19 01:25:49 +0300 | [diff] [blame] | 267 | int typecode_size = mp_binary_get_size('@', typecode, NULL); |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 268 | if (typecode_size <= 0) { |
| 269 | nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "bad typecode")); |
| 270 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 271 | mp_obj_array_t *o = m_new_obj(mp_obj_array_t); |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 272 | o->base.type = (typecode == BYTEARRAY_TYPECODE) ? &mp_type_bytearray : &mp_type_array; |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 273 | o->typecode = typecode; |
| 274 | o->free = 0; |
| 275 | o->len = n; |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 276 | o->items = m_malloc(typecode_size * o->len); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 277 | return o; |
| 278 | } |
| 279 | |
Damien George | d182b98 | 2014-08-30 14:19:41 +0100 | [diff] [blame] | 280 | mp_uint_t mp_obj_array_len(mp_obj_t self_in) { |
Paul Sokolovsky | 3399668 | 2014-01-21 23:30:10 +0200 | [diff] [blame] | 281 | return ((mp_obj_array_t *)self_in)->len; |
| 282 | } |
| 283 | |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 284 | mp_obj_t mp_obj_new_bytearray(uint n, void *items) { |
| 285 | mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, n); |
| 286 | memcpy(o->items, items, n); |
| 287 | return o; |
| 288 | } |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 289 | |
Paul Sokolovsky | 7f11c79 | 2014-01-29 00:21:41 +0200 | [diff] [blame] | 290 | // Create bytearray which references specified memory area |
Damien George | d182b98 | 2014-08-30 14:19:41 +0100 | [diff] [blame] | 291 | mp_obj_t mp_obj_new_bytearray_by_ref(mp_uint_t n, void *items) { |
Paul Sokolovsky | 7f11c79 | 2014-01-29 00:21:41 +0200 | [diff] [blame] | 292 | mp_obj_array_t *o = m_new_obj(mp_obj_array_t); |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 293 | o->base.type = &mp_type_array; |
Paul Sokolovsky | 7f11c79 | 2014-01-29 00:21:41 +0200 | [diff] [blame] | 294 | o->typecode = BYTEARRAY_TYPECODE; |
| 295 | o->free = 0; |
| 296 | o->len = n; |
| 297 | o->items = items; |
| 298 | return o; |
| 299 | } |
| 300 | |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 301 | /******************************************************************************/ |
| 302 | /* array iterator */ |
| 303 | |
| 304 | typedef struct _mp_obj_array_it_t { |
| 305 | mp_obj_base_t base; |
| 306 | mp_obj_array_t *array; |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 307 | mp_uint_t cur; |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 308 | } mp_obj_array_it_t; |
| 309 | |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 310 | STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) { |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 311 | mp_obj_array_it_t *self = self_in; |
| 312 | if (self->cur < self->array->len) { |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame] | 313 | 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] | 314 | } else { |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 315 | return MP_OBJ_STOP_ITERATION; |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 316 | } |
| 317 | } |
| 318 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 319 | STATIC const mp_obj_type_t array_it_type = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 320 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 321 | .name = MP_QSTR_iterator, |
Paul Sokolovsky | f7eaf60 | 2014-03-30 22:00:12 +0300 | [diff] [blame] | 322 | .getiter = mp_identity, |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 323 | .iternext = array_it_iternext, |
| 324 | }; |
| 325 | |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 326 | STATIC mp_obj_t array_iterator_new(mp_obj_t array_in) { |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 327 | mp_obj_array_t *array = array_in; |
| 328 | mp_obj_array_it_t *o = m_new_obj(mp_obj_array_it_t); |
| 329 | o->base.type = &array_it_type; |
| 330 | o->array = array; |
| 331 | o->cur = 0; |
| 332 | return o; |
| 333 | } |
Paul Sokolovsky | cb78f86 | 2014-06-27 20:39:09 +0300 | [diff] [blame] | 334 | |
| 335 | #endif // MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY |