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