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 | |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 40 | #if MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_BUILTINS_MEMORYVIEW |
Paul Sokolovsky | cb78f86 | 2014-06-27 20:39:09 +0300 | [diff] [blame] | 41 | |
Damien George | de3c806 | 2014-10-26 13:20:50 +0000 | [diff] [blame^] | 42 | // About memoryview object: We want to reuse as much code as possible from |
| 43 | // array, and keep the memoryview object 4 words in size so it fits in 1 GC |
| 44 | // block. Also, memoryview must keep a pointer to the base of the buffer so |
| 45 | // that the buffer is not GC'd if the original parent object is no longer |
| 46 | // around (we are assuming that all memoryview'able objects return a pointer |
| 47 | // which points to the start of a GC chunk). Given the above constraints we |
| 48 | // do the following: |
| 49 | // - typecode high bit is set if the buffer is read-write (else read-only) |
| 50 | // - free is the offset in elements to the first item in the memoryview |
| 51 | // - len is the length in elements |
| 52 | // - items points to the start of the original buffer |
| 53 | // Note that we don't handle the case where the original buffer might change |
| 54 | // size due to a resize of the original parent object. |
| 55 | |
| 56 | // make (& TYPECODE_MASK) a null operation if memorview not enabled |
| 57 | #if MICROPY_PY_BUILTINS_MEMORYVIEW |
| 58 | #define TYPECODE_MASK (0x7f) |
| 59 | #else |
| 60 | #define TYPECODE_MASK (~(mp_uint_t)1) |
| 61 | #endif |
| 62 | |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 63 | typedef struct _mp_obj_array_t { |
| 64 | mp_obj_base_t base; |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 65 | mp_uint_t typecode : 8; |
Damien George | 5104775 | 2014-02-26 17:40:52 +0000 | [diff] [blame] | 66 | // free is number of unused elements after len used elements |
| 67 | // alloc size = len + free |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 68 | mp_uint_t free : (8 * sizeof(mp_uint_t) - 8); |
| 69 | mp_uint_t len; // in elements |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 70 | void *items; |
| 71 | } mp_obj_array_t; |
| 72 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 73 | STATIC mp_obj_t array_iterator_new(mp_obj_t array_in); |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 74 | 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] | 75 | 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] | 76 | |
| 77 | /******************************************************************************/ |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 78 | // array |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 79 | |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 80 | #if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 81 | 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] | 82 | mp_obj_array_t *o = o_in; |
| 83 | if (o->typecode == BYTEARRAY_TYPECODE) { |
Damien George | 5467186 | 2014-07-17 21:56:32 +0100 | [diff] [blame] | 84 | print(env, "bytearray(b"); |
Paul Sokolovsky | 2ec38a1 | 2014-06-13 21:23:00 +0300 | [diff] [blame] | 85 | mp_str_print_quoted(print, env, o->items, o->len, true); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 86 | } else { |
Paul Sokolovsky | 7e652af | 2014-01-28 03:14:20 +0200 | [diff] [blame] | 87 | print(env, "array('%c'", o->typecode); |
Paul Sokolovsky | 1801421 | 2014-01-28 03:40:48 +0200 | [diff] [blame] | 88 | if (o->len > 0) { |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 89 | print(env, ", ["); |
Damien George | 42f3de9 | 2014-10-03 17:44:14 +0000 | [diff] [blame] | 90 | for (mp_uint_t i = 0; i < o->len; i++) { |
Paul Sokolovsky | 1801421 | 2014-01-28 03:40:48 +0200 | [diff] [blame] | 91 | if (i > 0) { |
| 92 | print(env, ", "); |
| 93 | } |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame] | 94 | 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] | 95 | } |
Paul Sokolovsky | 1801421 | 2014-01-28 03:40:48 +0200 | [diff] [blame] | 96 | print(env, "]"); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 97 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 98 | } |
Paul Sokolovsky | 7e652af | 2014-01-28 03:14:20 +0200 | [diff] [blame] | 99 | print(env, ")"); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 100 | } |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 101 | #endif |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 102 | |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 103 | #if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY |
| 104 | STATIC mp_obj_array_t *array_new(char typecode, mp_uint_t n) { |
| 105 | int typecode_size = mp_binary_get_size('@', typecode, NULL); |
| 106 | if (typecode_size <= 0) { |
| 107 | nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "bad typecode")); |
| 108 | } |
| 109 | mp_obj_array_t *o = m_new_obj(mp_obj_array_t); |
| 110 | #if MICROPY_PY_BUILTINS_BYTEARRAY && MICROPY_PY_ARRAY |
| 111 | o->base.type = (typecode == BYTEARRAY_TYPECODE) ? &mp_type_bytearray : &mp_type_array; |
| 112 | #elif MICROPY_PY_BUILTINS_BYTEARRAY |
| 113 | o->base.type = &mp_type_bytearray; |
| 114 | #else |
| 115 | o->base.type = &mp_type_array; |
| 116 | #endif |
| 117 | o->typecode = typecode; |
| 118 | o->free = 0; |
| 119 | o->len = n; |
| 120 | o->items = m_malloc(typecode_size * o->len); |
| 121 | return o; |
| 122 | } |
| 123 | #endif |
| 124 | |
| 125 | #if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 126 | STATIC mp_obj_t array_construct(char typecode, mp_obj_t initializer) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 127 | uint len; |
| 128 | // Try to create array of exact len if initializer len is known |
| 129 | mp_obj_t len_in = mp_obj_len_maybe(initializer); |
| 130 | if (len_in == MP_OBJ_NULL) { |
| 131 | len = 0; |
| 132 | } else { |
| 133 | len = MP_OBJ_SMALL_INT_VALUE(len_in); |
| 134 | } |
| 135 | |
| 136 | mp_obj_array_t *array = array_new(typecode, len); |
| 137 | |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 138 | mp_obj_t iterable = mp_getiter(initializer); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 139 | mp_obj_t item; |
Damien George | 42f3de9 | 2014-10-03 17:44:14 +0000 | [diff] [blame] | 140 | mp_uint_t i = 0; |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 141 | while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 142 | if (len == 0) { |
| 143 | array_append(array, item); |
| 144 | } else { |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame] | 145 | mp_binary_set_val_array(typecode, array->items, i++, item); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 146 | } |
| 147 | } |
| 148 | |
| 149 | return array; |
| 150 | } |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 151 | #endif |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 152 | |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 153 | #if MICROPY_PY_ARRAY |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 154 | 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] | 155 | mp_arg_check_num(n_args, n_kw, 1, 2, false); |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 156 | |
| 157 | // get typecode |
Damien George | d182b98 | 2014-08-30 14:19:41 +0100 | [diff] [blame] | 158 | mp_uint_t l; |
Damien George | 698ec21 | 2014-02-08 18:17:23 +0000 | [diff] [blame] | 159 | const char *typecode = mp_obj_str_get_data(args[0], &l); |
Paul Sokolovsky | 11973b4 | 2014-01-28 02:31:52 +0200 | [diff] [blame] | 160 | |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 161 | if (n_args == 1) { |
| 162 | // 1 arg: make an empty array |
| 163 | return array_new(*typecode, 0); |
| 164 | } else { |
| 165 | // 2 args: construct the array from the given iterator |
| 166 | return array_construct(*typecode, args[1]); |
| 167 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 168 | } |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 169 | #endif |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 170 | |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 171 | #if MICROPY_PY_BUILTINS_BYTEARRAY |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 172 | 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] | 173 | mp_arg_check_num(n_args, n_kw, 0, 1, false); |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 174 | |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 175 | if (n_args == 0) { |
| 176 | // no args: construct an empty bytearray |
| 177 | return array_new(BYTEARRAY_TYPECODE, 0); |
| 178 | } else if (MP_OBJ_IS_SMALL_INT(args[0])) { |
| 179 | // 1 arg, an integer: construct a blank bytearray of that length |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 180 | uint len = MP_OBJ_SMALL_INT_VALUE(args[0]); |
Paul Sokolovsky | b9cf3d3 | 2014-04-08 04:42:44 +0300 | [diff] [blame] | 181 | mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, len); |
| 182 | memset(o->items, 0, len); |
| 183 | return o; |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 184 | } else { |
| 185 | // 1 arg, an iterator: construct the bytearray from that |
| 186 | return array_construct(BYTEARRAY_TYPECODE, args[0]); |
Paul Sokolovsky | b9cf3d3 | 2014-04-08 04:42:44 +0300 | [diff] [blame] | 187 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 188 | } |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 189 | #endif |
| 190 | |
| 191 | #if MICROPY_PY_BUILTINS_MEMORYVIEW |
| 192 | STATIC mp_obj_t memoryview_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) { |
| 193 | // TODO possibly allow memoryview constructor to take start/stop so that one |
| 194 | // can do memoryview(b, 4, 8) instead of memoryview(b)[4:8] (uses less RAM) |
| 195 | |
| 196 | mp_arg_check_num(n_args, n_kw, 1, 1, false); |
| 197 | |
| 198 | mp_buffer_info_t bufinfo; |
| 199 | mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ); |
| 200 | |
| 201 | mp_obj_array_t *self = m_new_obj(mp_obj_array_t); |
| 202 | self->base.type = type_in; |
| 203 | self->typecode = bufinfo.typecode; |
| 204 | self->free = 0; |
| 205 | self->len = bufinfo.len / mp_binary_get_size('@', bufinfo.typecode, NULL); // element len |
| 206 | self->items = bufinfo.buf; |
| 207 | |
| 208 | // test if the object can be written to |
| 209 | if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_RW)) { |
Damien George | de3c806 | 2014-10-26 13:20:50 +0000 | [diff] [blame^] | 210 | self->typecode |= 0x80; // used to indicate writable buffer |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 211 | } |
| 212 | |
| 213 | return self; |
| 214 | } |
| 215 | #endif |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 216 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 217 | 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] | 218 | mp_obj_array_t *o = o_in; |
| 219 | switch (op) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 220 | case MP_UNARY_OP_BOOL: return MP_BOOL(o->len != 0); |
| 221 | 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] | 222 | default: return MP_OBJ_NULL; // op not supported |
Paul Sokolovsky | c1d9bbc | 2014-01-30 04:37:19 +0200 | [diff] [blame] | 223 | } |
| 224 | } |
| 225 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 226 | 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] | 227 | switch (op) { |
| 228 | case MP_BINARY_OP_EQUAL: { |
| 229 | mp_buffer_info_t lhs_bufinfo; |
| 230 | mp_buffer_info_t rhs_bufinfo; |
| 231 | array_get_buffer(lhs_in, &lhs_bufinfo, MP_BUFFER_READ); |
| 232 | if (!mp_get_buffer(rhs_in, &rhs_bufinfo, MP_BUFFER_READ)) { |
Damien George | de3c806 | 2014-10-26 13:20:50 +0000 | [diff] [blame^] | 233 | return mp_const_false; |
Paul Sokolovsky | 5f93033 | 2014-08-10 11:49:23 +0300 | [diff] [blame] | 234 | } |
| 235 | return MP_BOOL(mp_seq_cmp_bytes(op, lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_bufinfo.len)); |
| 236 | } |
| 237 | default: |
| 238 | return MP_OBJ_NULL; // op not supported |
| 239 | } |
| 240 | } |
| 241 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 242 | 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] | 243 | 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] | 244 | mp_obj_array_t *self = self_in; |
| 245 | if (self->free == 0) { |
Paul Sokolovsky | 1355cf4 | 2014-04-19 01:25:49 +0300 | [diff] [blame] | 246 | int item_sz = mp_binary_get_size('@', self->typecode, NULL); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 247 | // TODO: alloc policy |
| 248 | self->free = 8; |
| 249 | 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] | 250 | 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] | 251 | } |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame] | 252 | mp_binary_set_val_array(self->typecode, self->items, self->len++, arg); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 253 | self->free--; |
| 254 | return mp_const_none; // return None, as per CPython |
| 255 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 256 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(array_append_obj, array_append); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 257 | |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 258 | 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] | 259 | if (value == MP_OBJ_NULL) { |
Damien George | 32ca164 | 2014-04-18 22:04:06 +0100 | [diff] [blame] | 260 | // delete item |
| 261 | // TODO implement |
Paul Sokolovsky | 2690525 | 2014-04-20 20:58:33 +0300 | [diff] [blame] | 262 | // TODO: confirmed that both bytearray and array.array support |
| 263 | // slice deletion |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 264 | return MP_OBJ_NULL; // op not supported |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 265 | } else { |
| 266 | mp_obj_array_t *o = self_in; |
Damien George | c49ddb9 | 2014-06-01 13:49:35 +0100 | [diff] [blame] | 267 | if (0) { |
| 268 | #if MICROPY_PY_BUILTINS_SLICE |
| 269 | } else if (MP_OBJ_IS_TYPE(index_in, &mp_type_slice)) { |
Paul Sokolovsky | 2690525 | 2014-04-20 20:58:33 +0300 | [diff] [blame] | 270 | if (value != MP_OBJ_SENTINEL) { |
| 271 | // Only getting a slice is suported so far, not assignment |
| 272 | // TODO: confirmed that both bytearray and array.array support |
| 273 | // slice assignment (incl. of different size) |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 274 | return MP_OBJ_NULL; // op not supported |
Paul Sokolovsky | 2690525 | 2014-04-20 20:58:33 +0300 | [diff] [blame] | 275 | } |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 276 | mp_bound_slice_t slice; |
| 277 | if (!mp_seq_get_fast_slice_indexes(o->len, index_in, &slice)) { |
Paul Sokolovsky | 5fd5af9 | 2014-05-25 22:12:56 +0300 | [diff] [blame] | 278 | nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError, |
Damien George | 11de839 | 2014-06-05 18:57:38 +0100 | [diff] [blame] | 279 | "only slices with step=1 (aka None) are supported")); |
Paul Sokolovsky | d6e1272 | 2014-04-19 20:06:57 +0300 | [diff] [blame] | 280 | } |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 281 | mp_obj_array_t *res; |
Damien George | de3c806 | 2014-10-26 13:20:50 +0000 | [diff] [blame^] | 282 | int sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL); |
Paul Sokolovsky | d6e1272 | 2014-04-19 20:06:57 +0300 | [diff] [blame] | 283 | assert(sz > 0); |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 284 | if (0) { |
| 285 | // dummy |
| 286 | #if MICROPY_PY_BUILTINS_MEMORYVIEW |
| 287 | } else if (o->base.type == &mp_type_memoryview) { |
| 288 | res = m_new_obj(mp_obj_array_t); |
| 289 | *res = *o; |
Damien George | de3c806 | 2014-10-26 13:20:50 +0000 | [diff] [blame^] | 290 | res->free += slice.start; |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 291 | res->len = slice.stop - slice.start; |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 292 | #endif |
| 293 | } else { |
| 294 | res = array_new(o->typecode, slice.stop - slice.start); |
| 295 | memcpy(res->items, o->items + slice.start * sz, (slice.stop - slice.start) * sz); |
| 296 | } |
Paul Sokolovsky | d6e1272 | 2014-04-19 20:06:57 +0300 | [diff] [blame] | 297 | return res; |
Damien George | c49ddb9 | 2014-06-01 13:49:35 +0100 | [diff] [blame] | 298 | #endif |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 299 | } else { |
Damien George | 42f3de9 | 2014-10-03 17:44:14 +0000 | [diff] [blame] | 300 | mp_uint_t index = mp_get_index(o->base.type, o->len, index_in, false); |
Damien George | de3c806 | 2014-10-26 13:20:50 +0000 | [diff] [blame^] | 301 | #if MICROPY_PY_BUILTINS_MEMORYVIEW |
| 302 | if (o->base.type == &mp_type_memoryview) { |
| 303 | index += o->free; |
| 304 | if (value != MP_OBJ_SENTINEL && (o->typecode & 0x80) == 0) { |
| 305 | // store to read-only memoryview |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 306 | return MP_OBJ_NULL; |
| 307 | } |
Damien George | de3c806 | 2014-10-26 13:20:50 +0000 | [diff] [blame^] | 308 | } |
| 309 | #endif |
| 310 | if (value == MP_OBJ_SENTINEL) { |
| 311 | // load |
| 312 | return mp_binary_get_val_array(o->typecode & TYPECODE_MASK, o->items, index); |
| 313 | } else { |
| 314 | // store |
| 315 | mp_binary_set_val_array(o->typecode & TYPECODE_MASK, o->items, index, value); |
Paul Sokolovsky | d6e1272 | 2014-04-19 20:06:57 +0300 | [diff] [blame] | 316 | return mp_const_none; |
| 317 | } |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 318 | } |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 319 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 320 | } |
| 321 | |
Damien George | 4d91723 | 2014-08-30 14:28:06 +0100 | [diff] [blame] | 322 | 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] | 323 | mp_obj_array_t *o = o_in; |
Damien George | de3c806 | 2014-10-26 13:20:50 +0000 | [diff] [blame^] | 324 | int sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL); |
| 325 | bufinfo->buf = o->items; |
| 326 | bufinfo->len = o->len * sz; |
| 327 | bufinfo->typecode = o->typecode & TYPECODE_MASK; |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 328 | #if MICROPY_PY_BUILTINS_MEMORYVIEW |
Damien George | de3c806 | 2014-10-26 13:20:50 +0000 | [diff] [blame^] | 329 | if (o->base.type == &mp_type_memoryview) { |
| 330 | if ((o->typecode & 0x80) == 0 && (flags & MP_BUFFER_WRITE)) { |
| 331 | // read-only memoryview |
| 332 | return 1; |
| 333 | } |
| 334 | bufinfo->buf += (mp_uint_t)o->free * sz; |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 335 | } |
| 336 | #endif |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 337 | return 0; |
| 338 | } |
| 339 | |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 340 | #if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 341 | STATIC const mp_map_elem_t array_locals_dict_table[] = { |
| 342 | { 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] | 343 | }; |
| 344 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 345 | STATIC MP_DEFINE_CONST_DICT(array_locals_dict, array_locals_dict_table); |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 346 | #endif |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 347 | |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 348 | #if MICROPY_PY_ARRAY |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 349 | const mp_obj_type_t mp_type_array = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 350 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 351 | .name = MP_QSTR_array, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 352 | .print = array_print, |
| 353 | .make_new = array_make_new, |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 354 | .getiter = array_iterator_new, |
Paul Sokolovsky | c1d9bbc | 2014-01-30 04:37:19 +0200 | [diff] [blame] | 355 | .unary_op = array_unary_op, |
Paul Sokolovsky | 5f93033 | 2014-08-10 11:49:23 +0300 | [diff] [blame] | 356 | .binary_op = array_binary_op, |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 357 | .subscr = array_subscr, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 358 | .buffer_p = { .get_buffer = array_get_buffer }, |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 359 | .locals_dict = (mp_obj_t)&array_locals_dict, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 360 | }; |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 361 | #endif |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 362 | |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 363 | #if MICROPY_PY_BUILTINS_BYTEARRAY |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 364 | const mp_obj_type_t mp_type_bytearray = { |
| 365 | { &mp_type_type }, |
| 366 | .name = MP_QSTR_bytearray, |
| 367 | .print = array_print, |
| 368 | .make_new = bytearray_make_new, |
| 369 | .getiter = array_iterator_new, |
| 370 | .unary_op = array_unary_op, |
Paul Sokolovsky | 5f93033 | 2014-08-10 11:49:23 +0300 | [diff] [blame] | 371 | .binary_op = array_binary_op, |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 372 | .subscr = array_subscr, |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 373 | .buffer_p = { .get_buffer = array_get_buffer }, |
| 374 | .locals_dict = (mp_obj_t)&array_locals_dict, |
| 375 | }; |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 376 | #endif |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 377 | |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 378 | #if MICROPY_PY_BUILTINS_MEMORYVIEW |
| 379 | const mp_obj_type_t mp_type_memoryview = { |
| 380 | { &mp_type_type }, |
| 381 | .name = MP_QSTR_memoryview, |
| 382 | .make_new = memoryview_make_new, |
| 383 | .getiter = array_iterator_new, |
| 384 | .unary_op = array_unary_op, |
| 385 | .binary_op = array_binary_op, |
| 386 | .subscr = array_subscr, |
| 387 | .buffer_p = { .get_buffer = array_get_buffer }, |
| 388 | }; |
| 389 | #endif |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 390 | |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 391 | /* unused |
Damien George | d182b98 | 2014-08-30 14:19:41 +0100 | [diff] [blame] | 392 | mp_uint_t mp_obj_array_len(mp_obj_t self_in) { |
Paul Sokolovsky | 3399668 | 2014-01-21 23:30:10 +0200 | [diff] [blame] | 393 | return ((mp_obj_array_t *)self_in)->len; |
| 394 | } |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 395 | */ |
Paul Sokolovsky | 3399668 | 2014-01-21 23:30:10 +0200 | [diff] [blame] | 396 | |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 397 | #if MICROPY_PY_BUILTINS_BYTEARRAY |
Damien George | 4abff75 | 2014-08-30 14:59:21 +0100 | [diff] [blame] | 398 | mp_obj_t mp_obj_new_bytearray(mp_uint_t n, void *items) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 399 | mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, n); |
| 400 | memcpy(o->items, items, n); |
| 401 | return o; |
| 402 | } |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 403 | |
Paul Sokolovsky | 7f11c79 | 2014-01-29 00:21:41 +0200 | [diff] [blame] | 404 | // Create bytearray which references specified memory area |
Damien George | d182b98 | 2014-08-30 14:19:41 +0100 | [diff] [blame] | 405 | 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] | 406 | mp_obj_array_t *o = m_new_obj(mp_obj_array_t); |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 407 | o->base.type = &mp_type_bytearray; |
Paul Sokolovsky | 7f11c79 | 2014-01-29 00:21:41 +0200 | [diff] [blame] | 408 | o->typecode = BYTEARRAY_TYPECODE; |
| 409 | o->free = 0; |
| 410 | o->len = n; |
| 411 | o->items = items; |
| 412 | return o; |
| 413 | } |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 414 | #endif |
Paul Sokolovsky | 7f11c79 | 2014-01-29 00:21:41 +0200 | [diff] [blame] | 415 | |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 416 | /******************************************************************************/ |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 417 | // array iterator |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 418 | |
| 419 | typedef struct _mp_obj_array_it_t { |
| 420 | mp_obj_base_t base; |
| 421 | mp_obj_array_t *array; |
Damien George | de3c806 | 2014-10-26 13:20:50 +0000 | [diff] [blame^] | 422 | mp_uint_t offset; |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 423 | mp_uint_t cur; |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 424 | } mp_obj_array_it_t; |
| 425 | |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 426 | STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) { |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 427 | mp_obj_array_it_t *self = self_in; |
| 428 | if (self->cur < self->array->len) { |
Damien George | de3c806 | 2014-10-26 13:20:50 +0000 | [diff] [blame^] | 429 | return mp_binary_get_val_array(self->array->typecode & TYPECODE_MASK, self->array->items, self->offset + self->cur++); |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 430 | } else { |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 431 | return MP_OBJ_STOP_ITERATION; |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 432 | } |
| 433 | } |
| 434 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 435 | STATIC const mp_obj_type_t array_it_type = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 436 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 437 | .name = MP_QSTR_iterator, |
Paul Sokolovsky | f7eaf60 | 2014-03-30 22:00:12 +0300 | [diff] [blame] | 438 | .getiter = mp_identity, |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 439 | .iternext = array_it_iternext, |
| 440 | }; |
| 441 | |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 442 | STATIC mp_obj_t array_iterator_new(mp_obj_t array_in) { |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 443 | mp_obj_array_t *array = array_in; |
Damien George | de3c806 | 2014-10-26 13:20:50 +0000 | [diff] [blame^] | 444 | mp_obj_array_it_t *o = m_new0(mp_obj_array_it_t, 1); |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 445 | o->base.type = &array_it_type; |
| 446 | o->array = array; |
Damien George | de3c806 | 2014-10-26 13:20:50 +0000 | [diff] [blame^] | 447 | #if MICROPY_PY_BUILTINS_MEMORYVIEW |
| 448 | if (array->base.type == &mp_type_memoryview) { |
| 449 | o->offset = array->free; |
| 450 | } |
| 451 | #endif |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 452 | return o; |
| 453 | } |
Paul Sokolovsky | cb78f86 | 2014-06-27 20:39:09 +0300 | [diff] [blame] | 454 | |
Damien George | dd4f453 | 2014-10-23 13:34:35 +0100 | [diff] [blame] | 455 | #endif // MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_BUILTINS_MEMORYVIEW |