Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 1 | #include <string.h> |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 2 | #include <assert.h> |
| 3 | |
| 4 | #include "nlr.h" |
| 5 | #include "misc.h" |
| 6 | #include "mpconfig.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 7 | #include "qstr.h" |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 8 | #include "obj.h" |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 9 | #include "runtime0.h" |
| 10 | #include "runtime.h" |
Paul Sokolovsky | c203324 | 2014-02-14 20:21:50 +0200 | [diff] [blame] | 11 | #include "binary.h" |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 12 | |
| 13 | typedef struct _mp_obj_array_t { |
| 14 | mp_obj_base_t base; |
Damien George | 5104775 | 2014-02-26 17:40:52 +0000 | [diff] [blame] | 15 | machine_uint_t typecode : 8; |
| 16 | // free is number of unused elements after len used elements |
| 17 | // alloc size = len + free |
| 18 | machine_uint_t free : (8 * sizeof(machine_uint_t) - 8); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 19 | machine_uint_t len; // in elements |
| 20 | void *items; |
| 21 | } mp_obj_array_t; |
| 22 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 23 | STATIC mp_obj_t array_iterator_new(mp_obj_t array_in); |
| 24 | STATIC mp_obj_array_t *array_new(char typecode, uint n); |
| 25 | 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] | 26 | |
| 27 | /******************************************************************************/ |
| 28 | /* array */ |
| 29 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 30 | 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] | 31 | mp_obj_array_t *o = o_in; |
| 32 | if (o->typecode == BYTEARRAY_TYPECODE) { |
Paul Sokolovsky | 1801421 | 2014-01-28 03:40:48 +0200 | [diff] [blame] | 33 | print(env, "bytearray(b", o->typecode); |
| 34 | mp_str_print_quoted(print, env, o->items, o->len); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 35 | } else { |
Paul Sokolovsky | 7e652af | 2014-01-28 03:14:20 +0200 | [diff] [blame] | 36 | print(env, "array('%c'", o->typecode); |
Paul Sokolovsky | 1801421 | 2014-01-28 03:40:48 +0200 | [diff] [blame] | 37 | if (o->len > 0) { |
| 38 | print(env, ", [", o->typecode); |
| 39 | for (int i = 0; i < o->len; i++) { |
| 40 | if (i > 0) { |
| 41 | print(env, ", "); |
| 42 | } |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame^] | 43 | 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] | 44 | } |
Paul Sokolovsky | 1801421 | 2014-01-28 03:40:48 +0200 | [diff] [blame] | 45 | print(env, "]"); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 46 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 47 | } |
Paul Sokolovsky | 7e652af | 2014-01-28 03:14:20 +0200 | [diff] [blame] | 48 | print(env, ")"); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 49 | } |
| 50 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 51 | STATIC mp_obj_t array_construct(char typecode, mp_obj_t initializer) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 52 | uint len; |
| 53 | // Try to create array of exact len if initializer len is known |
| 54 | mp_obj_t len_in = mp_obj_len_maybe(initializer); |
| 55 | if (len_in == MP_OBJ_NULL) { |
| 56 | len = 0; |
| 57 | } else { |
| 58 | len = MP_OBJ_SMALL_INT_VALUE(len_in); |
| 59 | } |
| 60 | |
| 61 | mp_obj_array_t *array = array_new(typecode, len); |
| 62 | |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 63 | mp_obj_t iterable = mp_getiter(initializer); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 64 | mp_obj_t item; |
| 65 | int i = 0; |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 66 | while ((item = mp_iternext(iterable)) != MP_OBJ_NULL) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 67 | if (len == 0) { |
| 68 | array_append(array, item); |
| 69 | } else { |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame^] | 70 | mp_binary_set_val_array(typecode, array->items, i++, item); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 71 | } |
| 72 | } |
| 73 | |
| 74 | return array; |
| 75 | } |
| 76 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 77 | STATIC mp_obj_t array_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { |
Paul Sokolovsky | 11973b4 | 2014-01-28 02:31:52 +0200 | [diff] [blame] | 78 | if (n_args < 1 || n_args > 2) { |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 79 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "unexpected # of arguments, %d given", n_args)); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 80 | } |
Paul Sokolovsky | 11973b4 | 2014-01-28 02:31:52 +0200 | [diff] [blame] | 81 | // TODO check args |
| 82 | uint l; |
Damien George | 698ec21 | 2014-02-08 18:17:23 +0000 | [diff] [blame] | 83 | const char *typecode = mp_obj_str_get_data(args[0], &l); |
Paul Sokolovsky | 11973b4 | 2014-01-28 02:31:52 +0200 | [diff] [blame] | 84 | if (n_args == 1) { |
| 85 | return array_new(*typecode, 0); |
| 86 | } |
| 87 | |
| 88 | return array_construct(*typecode, args[1]); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 89 | } |
| 90 | |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 91 | STATIC mp_obj_t bytearray_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { |
| 92 | if (n_args > 1) { |
| 93 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "unexpected # of arguments, %d given", n_args)); |
| 94 | } |
| 95 | |
| 96 | if (MP_OBJ_IS_SMALL_INT(args[0])) { |
| 97 | uint len = MP_OBJ_SMALL_INT_VALUE(args[0]); |
Paul Sokolovsky | b9cf3d3 | 2014-04-08 04:42:44 +0300 | [diff] [blame] | 98 | mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, len); |
| 99 | memset(o->items, 0, len); |
| 100 | return o; |
| 101 | } |
| 102 | |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 103 | return array_construct(BYTEARRAY_TYPECODE, args[0]); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 104 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 105 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 106 | 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] | 107 | mp_obj_array_t *o = o_in; |
| 108 | switch (op) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 109 | case MP_UNARY_OP_BOOL: return MP_BOOL(o->len != 0); |
| 110 | case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(o->len); |
Paul Sokolovsky | c1d9bbc | 2014-01-30 04:37:19 +0200 | [diff] [blame] | 111 | default: return MP_OBJ_NULL; // op not supported |
| 112 | } |
| 113 | } |
| 114 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 115 | STATIC mp_obj_t array_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 116 | mp_obj_array_t *o = lhs; |
| 117 | switch (op) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 118 | case MP_BINARY_OP_SUBSCR: |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 119 | { |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 120 | uint index = mp_get_index(o->base.type, o->len, rhs, false); |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame^] | 121 | return mp_binary_get_val_array(o->typecode, o->items, index); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 122 | } |
| 123 | |
| 124 | default: |
| 125 | // op not supported |
| 126 | return MP_OBJ_NULL; |
| 127 | } |
| 128 | } |
| 129 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 130 | 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] | 131 | 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] | 132 | mp_obj_array_t *self = self_in; |
| 133 | if (self->free == 0) { |
Paul Sokolovsky | c203324 | 2014-02-14 20:21:50 +0200 | [diff] [blame] | 134 | int item_sz = mp_binary_get_size(self->typecode); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 135 | // TODO: alloc policy |
| 136 | self->free = 8; |
| 137 | self->items = m_realloc(self->items, item_sz * self->len, item_sz * (self->len + self->free)); |
| 138 | } |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame^] | 139 | mp_binary_set_val_array(self->typecode, self->items, self->len++, arg); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 140 | self->free--; |
| 141 | return mp_const_none; // return None, as per CPython |
| 142 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 143 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(array_append_obj, array_append); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 144 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 145 | STATIC bool array_store_item(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] | 146 | if (value == MP_OBJ_NULL) { |
| 147 | // delete item; does this need to be implemented? |
| 148 | return false; |
| 149 | } |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 150 | mp_obj_array_t *o = self_in; |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 151 | uint index = mp_get_index(o->base.type, o->len, index_in, false); |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame^] | 152 | mp_binary_set_val_array(o->typecode, o->items, index, value); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 153 | return true; |
| 154 | } |
| 155 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 156 | STATIC machine_int_t array_get_buffer(mp_obj_t o_in, buffer_info_t *bufinfo, int flags) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 157 | mp_obj_array_t *o = o_in; |
| 158 | bufinfo->buf = o->items; |
Paul Sokolovsky | c203324 | 2014-02-14 20:21:50 +0200 | [diff] [blame] | 159 | bufinfo->len = o->len * mp_binary_get_size(o->typecode); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 160 | return 0; |
| 161 | } |
| 162 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 163 | STATIC const mp_map_elem_t array_locals_dict_table[] = { |
| 164 | { 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] | 165 | }; |
| 166 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 167 | STATIC MP_DEFINE_CONST_DICT(array_locals_dict, array_locals_dict_table); |
| 168 | |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 169 | const mp_obj_type_t mp_type_array = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 170 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 171 | .name = MP_QSTR_array, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 172 | .print = array_print, |
| 173 | .make_new = array_make_new, |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 174 | .getiter = array_iterator_new, |
Paul Sokolovsky | c1d9bbc | 2014-01-30 04:37:19 +0200 | [diff] [blame] | 175 | .unary_op = array_unary_op, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 176 | .binary_op = array_binary_op, |
| 177 | .store_item = array_store_item, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 178 | .buffer_p = { .get_buffer = array_get_buffer }, |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 179 | .locals_dict = (mp_obj_t)&array_locals_dict, |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 180 | }; |
| 181 | |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 182 | const mp_obj_type_t mp_type_bytearray = { |
| 183 | { &mp_type_type }, |
| 184 | .name = MP_QSTR_bytearray, |
| 185 | .print = array_print, |
| 186 | .make_new = bytearray_make_new, |
| 187 | .getiter = array_iterator_new, |
| 188 | .unary_op = array_unary_op, |
| 189 | .binary_op = array_binary_op, |
| 190 | .store_item = array_store_item, |
| 191 | .buffer_p = { .get_buffer = array_get_buffer }, |
| 192 | .locals_dict = (mp_obj_t)&array_locals_dict, |
| 193 | }; |
| 194 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 195 | STATIC mp_obj_array_t *array_new(char typecode, uint n) { |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 196 | mp_obj_array_t *o = m_new_obj(mp_obj_array_t); |
Paul Sokolovsky | 4dcb605 | 2014-04-08 22:09:14 +0300 | [diff] [blame] | 197 | o->base.type = (typecode == BYTEARRAY_TYPECODE) ? &mp_type_bytearray : &mp_type_array; |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 198 | o->typecode = typecode; |
| 199 | o->free = 0; |
| 200 | o->len = n; |
Paul Sokolovsky | c203324 | 2014-02-14 20:21:50 +0200 | [diff] [blame] | 201 | o->items = m_malloc(mp_binary_get_size(typecode) * o->len); |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 202 | return o; |
| 203 | } |
| 204 | |
Paul Sokolovsky | 3399668 | 2014-01-21 23:30:10 +0200 | [diff] [blame] | 205 | uint mp_obj_array_len(mp_obj_t self_in) { |
| 206 | return ((mp_obj_array_t *)self_in)->len; |
| 207 | } |
| 208 | |
Paul Sokolovsky | 427905c | 2014-01-18 19:24:47 +0200 | [diff] [blame] | 209 | mp_obj_t mp_obj_new_bytearray(uint n, void *items) { |
| 210 | mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, n); |
| 211 | memcpy(o->items, items, n); |
| 212 | return o; |
| 213 | } |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 214 | |
Paul Sokolovsky | 7f11c79 | 2014-01-29 00:21:41 +0200 | [diff] [blame] | 215 | // Create bytearray which references specified memory area |
| 216 | mp_obj_t mp_obj_new_bytearray_by_ref(uint n, void *items) { |
| 217 | mp_obj_array_t *o = m_new_obj(mp_obj_array_t); |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 218 | o->base.type = &mp_type_array; |
Paul Sokolovsky | 7f11c79 | 2014-01-29 00:21:41 +0200 | [diff] [blame] | 219 | o->typecode = BYTEARRAY_TYPECODE; |
| 220 | o->free = 0; |
| 221 | o->len = n; |
| 222 | o->items = items; |
| 223 | return o; |
| 224 | } |
| 225 | |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 226 | /******************************************************************************/ |
| 227 | /* array iterator */ |
| 228 | |
| 229 | typedef struct _mp_obj_array_it_t { |
| 230 | mp_obj_base_t base; |
| 231 | mp_obj_array_t *array; |
| 232 | machine_uint_t cur; |
| 233 | } mp_obj_array_it_t; |
| 234 | |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 235 | STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) { |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 236 | mp_obj_array_it_t *self = self_in; |
| 237 | if (self->cur < self->array->len) { |
Paul Sokolovsky | ef9124f | 2014-04-11 03:46:09 +0300 | [diff] [blame^] | 238 | 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] | 239 | } else { |
Damien George | 66eaf84 | 2014-03-26 19:27:58 +0000 | [diff] [blame] | 240 | return MP_OBJ_NULL; |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 241 | } |
| 242 | } |
| 243 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 244 | STATIC const mp_obj_type_t array_it_type = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 245 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 246 | .name = MP_QSTR_iterator, |
Paul Sokolovsky | f7eaf60 | 2014-03-30 22:00:12 +0300 | [diff] [blame] | 247 | .getiter = mp_identity, |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 248 | .iternext = array_it_iternext, |
| 249 | }; |
| 250 | |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 251 | STATIC mp_obj_t array_iterator_new(mp_obj_t array_in) { |
Paul Sokolovsky | 09ce059 | 2014-01-21 23:45:19 +0200 | [diff] [blame] | 252 | mp_obj_array_t *array = array_in; |
| 253 | mp_obj_array_it_t *o = m_new_obj(mp_obj_array_it_t); |
| 254 | o->base.type = &array_it_type; |
| 255 | o->array = array; |
| 256 | o->cur = 0; |
| 257 | return o; |
| 258 | } |