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