objarray.c 22.3 KB
Newer Older
1
2
3
4
5
6
/*
 * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
 * Copyright (c) 2013, 2014 Damien P. George
7
 * Copyright (c) 2014 Paul Sokolovsky
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */

28
29
#include <string.h>
#include <assert.h>
30
#include <stdint.h>
31

32
33
34
35
#include "py/nlr.h"
#include "py/runtime0.h"
#include "py/runtime.h"
#include "py/binary.h"
36

37
#if MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_BUILTINS_MEMORYVIEW
38

39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
// About memoryview object: We want to reuse as much code as possible from
// array, and keep the memoryview object 4 words in size so it fits in 1 GC
// block.  Also, memoryview must keep a pointer to the base of the buffer so
// that the buffer is not GC'd if the original parent object is no longer
// around (we are assuming that all memoryview'able objects return a pointer
// which points to the start of a GC chunk).  Given the above constraints we
// do the following:
//  - typecode high bit is set if the buffer is read-write (else read-only)
//  - free is the offset in elements to the first item in the memoryview
//  - len is the length in elements
//  - items points to the start of the original buffer
// Note that we don't handle the case where the original buffer might change
// size due to a resize of the original parent object.

// make (& TYPECODE_MASK) a null operation if memorview not enabled
#if MICROPY_PY_BUILTINS_MEMORYVIEW
#define TYPECODE_MASK (0x7f)
#else
57
#define TYPECODE_MASK (~(mp_uint_t)0)
58
59
#endif

60
61
typedef struct _mp_obj_array_t {
    mp_obj_base_t base;
62
    mp_uint_t typecode : 8;
63
64
    // free is number of unused elements after len used elements
    // alloc size = len + free
65
66
    mp_uint_t free : (8 * sizeof(mp_uint_t) - 8);
    mp_uint_t len; // in elements
67
68
69
    void *items;
} mp_obj_array_t;

70
71
STATIC mp_obj_t array_iterator_new(mp_obj_t array_in);
STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg);
72
STATIC mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in);
73
STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags);
74
75

/******************************************************************************/
76
// array
77

78
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
79
STATIC void array_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
80
    (void)kind;
81
82
    mp_obj_array_t *o = o_in;
    if (o->typecode == BYTEARRAY_TYPECODE) {
83
84
        mp_print_str(print, "bytearray(b");
        mp_str_print_quoted(print, o->items, o->len, true);
85
    } else {
86
        mp_printf(print, "array('%c'", o->typecode);
87
        if (o->len > 0) {
88
            mp_print_str(print, ", [");
89
            for (mp_uint_t i = 0; i < o->len; i++) {
90
                if (i > 0) {
91
                    mp_print_str(print, ", ");
92
                }
93
                mp_obj_print_helper(print, mp_binary_get_val_array(o->typecode, o->items, i), PRINT_REPR);
94
            }
95
            mp_print_str(print, "]");
96
97
        }
    }
98
    mp_print_str(print, ")");
99
}
100
101
102
103
104
#endif

#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
STATIC mp_obj_array_t *array_new(char typecode, mp_uint_t n) {
    int typecode_size = mp_binary_get_size('@', typecode, NULL);
105
    if (typecode_size == 0) {
106
107
108
109
110
111
112
113
114
115
116
117
118
        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "bad typecode"));
    }
    mp_obj_array_t *o = m_new_obj(mp_obj_array_t);
    #if MICROPY_PY_BUILTINS_BYTEARRAY && MICROPY_PY_ARRAY
    o->base.type = (typecode == BYTEARRAY_TYPECODE) ? &mp_type_bytearray : &mp_type_array;
    #elif MICROPY_PY_BUILTINS_BYTEARRAY
    o->base.type = &mp_type_bytearray;
    #else
    o->base.type = &mp_type_array;
    #endif
    o->typecode = typecode;
    o->free = 0;
    o->len = n;
119
    o->items = m_new(byte, typecode_size * o->len);
120
121
122
    return o;
}
#endif
123

124
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
125
STATIC mp_obj_t array_construct(char typecode, mp_obj_t initializer) {
126
127
128
129
130
131
132
    // bytearrays can be raw-initialised from anything with the buffer protocol
    // other arrays can only be raw-initialised from bytes and bytearray objects
    mp_buffer_info_t bufinfo;
    if (((MICROPY_PY_BUILTINS_BYTEARRAY
            && typecode == BYTEARRAY_TYPECODE)
        || (MICROPY_PY_ARRAY
            && (MP_OBJ_IS_TYPE(initializer, &mp_type_bytes)
133
                || (MICROPY_PY_BUILTINS_BYTEARRAY && MP_OBJ_IS_TYPE(initializer, &mp_type_bytearray)))))
134
135
136
        && mp_get_buffer(initializer, &bufinfo, MP_BUFFER_READ)) {
        // construct array from raw bytes
        // we round-down the len to make it a multiple of sz (CPython raises error)
137
        size_t sz = mp_binary_get_size('@', typecode, NULL);
138
139
140
141
142
143
144
        mp_uint_t len = bufinfo.len / sz;
        mp_obj_array_t *o = array_new(typecode, len);
        memcpy(o->items, bufinfo.buf, len * sz);
        return o;
    }

    mp_uint_t len;
145
146
147
148
149
150
151
152
153
154
    // Try to create array of exact len if initializer len is known
    mp_obj_t len_in = mp_obj_len_maybe(initializer);
    if (len_in == MP_OBJ_NULL) {
        len = 0;
    } else {
        len = MP_OBJ_SMALL_INT_VALUE(len_in);
    }

    mp_obj_array_t *array = array_new(typecode, len);

Damien George's avatar
Damien George committed
155
    mp_obj_t iterable = mp_getiter(initializer);
156
    mp_obj_t item;
157
    mp_uint_t i = 0;
158
    while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
159
160
161
        if (len == 0) {
            array_append(array, item);
        } else {
162
            mp_binary_set_val_array(typecode, array->items, i++, item);
163
164
165
166
167
        }
    }

    return array;
}
168
#endif
169

170
#if MICROPY_PY_ARRAY
171
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) {
172
    (void)type_in;
173
    mp_arg_check_num(n_args, n_kw, 1, 2, false);
174
175

    // get typecode
176
    mp_uint_t l;
177
    const char *typecode = mp_obj_str_get_data(args[0], &l);
178

179
    if (n_args == 1) {
180
        // 1 arg: make an empty array
181
        return array_new(*typecode, 0);
182
    } else {
183
        // 2 args: construct the array from the given object
184
        return array_construct(*typecode, args[1]);
185
    }
186
}
187
#endif
188

189
#if MICROPY_PY_BUILTINS_BYTEARRAY
190
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) {
191
    (void)type_in;
192
    mp_arg_check_num(n_args, n_kw, 0, 1, false);
193

194
195
196
    if (n_args == 0) {
        // no args: construct an empty bytearray
        return array_new(BYTEARRAY_TYPECODE, 0);
197
    } else if (MP_OBJ_IS_INT(args[0])) {
198
        // 1 arg, an integer: construct a blank bytearray of that length
199
        mp_uint_t len = mp_obj_get_int(args[0]);
200
201
202
        mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, len);
        memset(o->items, 0, len);
        return o;
203
    } else {
204
        // 1 arg: construct the bytearray from that
205
        return array_construct(BYTEARRAY_TYPECODE, args[0]);
206
    }
207
}
208
209
210
#endif

#if MICROPY_PY_BUILTINS_MEMORYVIEW
211
212
213
214
215
216
217
218
219
220
221

mp_obj_t mp_obj_new_memoryview(byte typecode, mp_uint_t nitems, void *items) {
    mp_obj_array_t *self = m_new_obj(mp_obj_array_t);
    self->base.type = &mp_type_memoryview;
    self->typecode = typecode;
    self->free = 0;
    self->len = nitems;
    self->items = items;
    return self;
}

222
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) {
223
224
    (void)type_in;

225
226
227
228
229
230
231
232
    // TODO possibly allow memoryview constructor to take start/stop so that one
    // can do memoryview(b, 4, 8) instead of memoryview(b)[4:8] (uses less RAM)

    mp_arg_check_num(n_args, n_kw, 1, 1, false);

    mp_buffer_info_t bufinfo;
    mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);

233
234
235
    mp_obj_array_t *self = mp_obj_new_memoryview(bufinfo.typecode,
        bufinfo.len / mp_binary_get_size('@', bufinfo.typecode, NULL),
        bufinfo.buf);
236
237
238

    // test if the object can be written to
    if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_RW)) {
239
        self->typecode |= 0x80; // used to indicate writable buffer
240
241
242
243
244
    }

    return self;
}
#endif
245

246
STATIC mp_obj_t array_unary_op(mp_uint_t op, mp_obj_t o_in) {
247
248
    mp_obj_array_t *o = o_in;
    switch (op) {
Damien George's avatar
Damien George committed
249
250
        case MP_UNARY_OP_BOOL: return MP_BOOL(o->len != 0);
        case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(o->len);
251
        default: return MP_OBJ_NULL; // op not supported
252
253
254
    }
}

255
STATIC mp_obj_t array_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
256
    mp_obj_array_t *lhs = lhs_in;
257
    switch (op) {
258
        case MP_BINARY_OP_ADD: {
259
260
261
262
263
264
            // allow to add anything that has the buffer protocol (extension to CPython)
            mp_buffer_info_t lhs_bufinfo;
            mp_buffer_info_t rhs_bufinfo;
            array_get_buffer(lhs_in, &lhs_bufinfo, MP_BUFFER_READ);
            mp_get_buffer_raise(rhs_in, &rhs_bufinfo, MP_BUFFER_READ);

265
            size_t sz = mp_binary_get_size('@', lhs_bufinfo.typecode, NULL);
266
267
268
269
270
271
272

            // convert byte count to element count (in case rhs is not multiple of sz)
            mp_uint_t rhs_len = rhs_bufinfo.len / sz;

            // note: lhs->len is element count of lhs, lhs_bufinfo.len is byte count
            mp_obj_array_t *res = array_new(lhs_bufinfo.typecode, lhs->len + rhs_len);
            mp_seq_cat((byte*)res->items, lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_len * sz, byte);
273
274
275
276
277
278
279
280
281
282
283
284
285
            return res;
        }

        case MP_BINARY_OP_INPLACE_ADD: {
            #if MICROPY_PY_BUILTINS_MEMORYVIEW
            if (lhs->base.type == &mp_type_memoryview) {
                return MP_OBJ_NULL; // op not supported
            }
            #endif
            array_extend(lhs, rhs_in);
            return lhs;
        }

286
287
288
289
290
        case MP_BINARY_OP_EQUAL: {
            mp_buffer_info_t lhs_bufinfo;
            mp_buffer_info_t rhs_bufinfo;
            array_get_buffer(lhs_in, &lhs_bufinfo, MP_BUFFER_READ);
            if (!mp_get_buffer(rhs_in, &rhs_bufinfo, MP_BUFFER_READ)) {
291
                return mp_const_false;
292
293
294
            }
            return MP_BOOL(mp_seq_cmp_bytes(op, lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_bufinfo.len));
        }
295

296
297
298
299
300
        default:
            return MP_OBJ_NULL; // op not supported
    }
}

301
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
302
STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg) {
303
    // self is not a memoryview, so we don't need to use (& TYPECODE_MASK)
304
305
    assert((MICROPY_PY_BUILTINS_BYTEARRAY && MP_OBJ_IS_TYPE(self_in, &mp_type_bytearray))
        || (MICROPY_PY_ARRAY && MP_OBJ_IS_TYPE(self_in, &mp_type_array)));
306
    mp_obj_array_t *self = self_in;
307

308
    if (self->free == 0) {
309
        size_t item_sz = mp_binary_get_size('@', self->typecode, NULL);
310
311
        // TODO: alloc policy
        self->free = 8;
312
        self->items = m_renew(byte, self->items, item_sz * self->len, item_sz * (self->len + self->free));
313
        mp_seq_clear(self->items, self->len + 1, self->len + self->free, item_sz);
314
    }
315
    mp_binary_set_val_array(self->typecode, self->items, self->len++, arg);
316
317
318
    self->free--;
    return mp_const_none; // return None, as per CPython
}
319
STATIC MP_DEFINE_CONST_FUN_OBJ_2(array_append_obj, array_append);
320

321
322
STATIC mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in) {
    // self is not a memoryview, so we don't need to use (& TYPECODE_MASK)
323
324
    assert((MICROPY_PY_BUILTINS_BYTEARRAY && MP_OBJ_IS_TYPE(self_in, &mp_type_bytearray))
        || (MICROPY_PY_ARRAY && MP_OBJ_IS_TYPE(self_in, &mp_type_array)));
325
326
    mp_obj_array_t *self = self_in;

327
328
329
    // allow to extend by anything that has the buffer protocol (extension to CPython)
    mp_buffer_info_t arg_bufinfo;
    mp_get_buffer_raise(arg_in, &arg_bufinfo, MP_BUFFER_READ);
330

331
    size_t sz = mp_binary_get_size('@', self->typecode, NULL);
332

333
334
335
    // convert byte count to element count
    mp_uint_t len = arg_bufinfo.len / sz;

336
    // make sure we have enough room to extend
337
338
    // TODO: alloc policy; at the moment we go conservative
    if (self->free < len) {
339
        self->items = m_renew(byte, self->items, (self->len + self->free) * sz, (self->len + len) * sz);
340
341
342
        self->free = 0;
    } else {
        self->free -= len;
343
344
345
    }

    // extend
346
347
    mp_seq_copy((byte*)self->items + self->len * sz, arg_bufinfo.buf, len * sz, byte);
    self->len += len;
348
349
350
351
352
353

    return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(array_extend_obj, array_extend);
#endif

354
STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
355
    if (value == MP_OBJ_NULL) {
356
357
        // delete item
        // TODO implement
358
359
        // TODO: confirmed that both bytearray and array.array support
        // slice deletion
360
        return MP_OBJ_NULL; // op not supported
361
362
    } else {
        mp_obj_array_t *o = self_in;
363
364
365
        if (0) {
#if MICROPY_PY_BUILTINS_SLICE
        } else if (MP_OBJ_IS_TYPE(index_in, &mp_type_slice)) {
366
367
            mp_bound_slice_t slice;
            if (!mp_seq_get_fast_slice_indexes(o->len, index_in, &slice)) {
368
                mp_not_implemented("only slices with step=1 (aka None) are supported");
369
            }
370
371
372
            if (value != MP_OBJ_SENTINEL) {
                #if MICROPY_PY_ARRAY_SLICE_ASSIGN
                // Assign
373
374
                mp_uint_t src_len;
                void *src_items;
375
                size_t item_sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL);
376
377
                if (MP_OBJ_IS_OBJ(value) && ((mp_obj_base_t*)value)->type->subscr == array_subscr) {
                    // value is array, bytearray or memoryview
378
                    mp_obj_array_t *src_slice = value;
379
                    if (item_sz != mp_binary_get_size('@', src_slice->typecode & TYPECODE_MASK, NULL)) {
380
                    compat_error:
381
                        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "lhs and rhs should be compatible"));
382
383
384
                    }
                    src_len = src_slice->len;
                    src_items = src_slice->items;
385
386
387
388
389
                    #if MICROPY_PY_BUILTINS_MEMORYVIEW
                    if (MP_OBJ_IS_TYPE(value, &mp_type_memoryview)) {
                        src_items = (uint8_t*)src_items + (src_slice->free * item_sz);
                    }
                    #endif
390
391
392
393
394
395
396
397
398
399
                } else if (MP_OBJ_IS_TYPE(value, &mp_type_bytes)) {
                    if (item_sz != 1) {
                        goto compat_error;
                    }
                    mp_buffer_info_t bufinfo;
                    mp_get_buffer_raise(value, &bufinfo, MP_BUFFER_READ);
                    src_len = bufinfo.len;
                    src_items = bufinfo.buf;
                } else {
                    mp_not_implemented("array/bytes required on right side");
400
401
402
                }

                // TODO: check src/dst compat
403
                mp_int_t len_adj = src_len - (slice.stop - slice.start);
404
405
406
407
                uint8_t* dest_items = o->items;
                #if MICROPY_PY_BUILTINS_MEMORYVIEW
                if (o->base.type == &mp_type_memoryview) {
                    if (len_adj != 0) {
408
409
                        goto compat_error;
                    }
410
411
412
413
                    dest_items += o->free * item_sz;
                }
                #endif
                if (len_adj > 0) {
414
415
                    if (len_adj > o->free) {
                        // TODO: alloc policy; at the moment we go conservative
416
                        o->items = m_renew(byte, o->items, (o->len + o->free) * item_sz, (o->len + len_adj) * item_sz);
417
418
                        o->free = 0;
                    }
419
                    mp_seq_replace_slice_grow_inplace(dest_items, o->len,
420
                        slice.start, slice.stop, src_items, src_len, len_adj, item_sz);
421
                } else {
422
423
424
425
426
427
                    mp_seq_replace_slice_no_grow(dest_items, o->len,
                        slice.start, slice.stop, src_items, src_len, item_sz);
                    // Clear "freed" elements at the end of list
                    // TODO: This is actually only needed for typecode=='O'
                    mp_seq_clear(dest_items, o->len + len_adj, o->len, item_sz);
                    // TODO: alloc policy after shrinking
428
429
430
431
432
433
434
435
                }
                o->len += len_adj;
                return mp_const_none;
                #else
                return MP_OBJ_NULL; // op not supported
                #endif
            }

436
            mp_obj_array_t *res;
437
            size_t sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL);
438
            assert(sz > 0);
439
440
441
442
443
444
            if (0) {
                // dummy
            #if MICROPY_PY_BUILTINS_MEMORYVIEW
            } else if (o->base.type == &mp_type_memoryview) {
                res = m_new_obj(mp_obj_array_t);
                *res = *o;
445
                res->free += slice.start;
446
447
448
449
                res->len = slice.stop - slice.start;
            #endif
            } else {
                res = array_new(o->typecode, slice.stop - slice.start);
450
                memcpy(res->items, (uint8_t*)o->items + slice.start * sz, (slice.stop - slice.start) * sz);
451
            }
452
            return res;
453
#endif
454
        } else {
455
            mp_uint_t index = mp_get_index(o->base.type, o->len, index_in, false);
456
457
458
459
460
461
462
463
464
            #if MICROPY_PY_BUILTINS_MEMORYVIEW
            if (o->base.type == &mp_type_memoryview) {
                index += o->free;
                if (value != MP_OBJ_SENTINEL && (o->typecode & 0x80) == 0) {
                    // store to read-only memoryview
                    return MP_OBJ_NULL;
                }
            }
            #endif
465
466
            if (value == MP_OBJ_SENTINEL) {
                // load
467
                return mp_binary_get_val_array(o->typecode & TYPECODE_MASK, o->items, index);
468
469
            } else {
                // store
470
                mp_binary_set_val_array(o->typecode & TYPECODE_MASK, o->items, index, value);
471
472
                return mp_const_none;
            }
473
        }
474
    }
475
476
}

477
STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
478
    mp_obj_array_t *o = o_in;
479
    size_t sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL);
480
481
482
    bufinfo->buf = o->items;
    bufinfo->len = o->len * sz;
    bufinfo->typecode = o->typecode & TYPECODE_MASK;
483
    #if MICROPY_PY_BUILTINS_MEMORYVIEW
484
485
486
487
488
    if (o->base.type == &mp_type_memoryview) {
        if ((o->typecode & 0x80) == 0 && (flags & MP_BUFFER_WRITE)) {
            // read-only memoryview
            return 1;
        }
489
        bufinfo->buf = (uint8_t*)bufinfo->buf + (mp_uint_t)o->free * sz;
490
491
    }
    #endif
492
493
494
    return 0;
}

495
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
496
497
STATIC const mp_map_elem_t array_locals_dict_table[] = {
    { MP_OBJ_NEW_QSTR(MP_QSTR_append), (mp_obj_t)&array_append_obj },
498
    { MP_OBJ_NEW_QSTR(MP_QSTR_extend), (mp_obj_t)&array_extend_obj },
499
500
};

501
STATIC MP_DEFINE_CONST_DICT(array_locals_dict, array_locals_dict_table);
502
#endif
503

504
#if MICROPY_PY_ARRAY
505
const mp_obj_type_t mp_type_array = {
506
    { &mp_type_type },
507
    .name = MP_QSTR_array,
508
509
    .print = array_print,
    .make_new = array_make_new,
Paul Sokolovsky's avatar
Paul Sokolovsky committed
510
    .getiter = array_iterator_new,
511
    .unary_op = array_unary_op,
512
    .binary_op = array_binary_op,
513
    .subscr = array_subscr,
514
    .buffer_p = { .get_buffer = array_get_buffer },
515
    .locals_dict = (mp_obj_t)&array_locals_dict,
516
};
517
#endif
518

519
#if MICROPY_PY_BUILTINS_BYTEARRAY
520
521
522
523
524
525
526
const mp_obj_type_t mp_type_bytearray = {
    { &mp_type_type },
    .name = MP_QSTR_bytearray,
    .print = array_print,
    .make_new = bytearray_make_new,
    .getiter = array_iterator_new,
    .unary_op = array_unary_op,
527
    .binary_op = array_binary_op,
528
    .subscr = array_subscr,
529
530
531
    .buffer_p = { .get_buffer = array_get_buffer },
    .locals_dict = (mp_obj_t)&array_locals_dict,
};
532
#endif
533

534
535
536
537
538
539
540
541
542
543
544
545
#if MICROPY_PY_BUILTINS_MEMORYVIEW
const mp_obj_type_t mp_type_memoryview = {
    { &mp_type_type },
    .name = MP_QSTR_memoryview,
    .make_new = memoryview_make_new,
    .getiter = array_iterator_new,
    .unary_op = array_unary_op,
    .binary_op = array_binary_op,
    .subscr = array_subscr,
    .buffer_p = { .get_buffer = array_get_buffer },
};
#endif
546

547
/* unused
548
mp_uint_t mp_obj_array_len(mp_obj_t self_in) {
549
550
    return ((mp_obj_array_t *)self_in)->len;
}
551
*/
552

553
#if MICROPY_PY_BUILTINS_BYTEARRAY
554
mp_obj_t mp_obj_new_bytearray(mp_uint_t n, void *items) {
555
556
557
558
    mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, n);
    memcpy(o->items, items, n);
    return o;
}
Paul Sokolovsky's avatar
Paul Sokolovsky committed
559

560
// Create bytearray which references specified memory area
561
mp_obj_t mp_obj_new_bytearray_by_ref(mp_uint_t n, void *items) {
562
    mp_obj_array_t *o = m_new_obj(mp_obj_array_t);
563
    o->base.type = &mp_type_bytearray;
564
565
566
567
568
569
    o->typecode = BYTEARRAY_TYPECODE;
    o->free = 0;
    o->len = n;
    o->items = items;
    return o;
}
570
#endif
571

Paul Sokolovsky's avatar
Paul Sokolovsky committed
572
/******************************************************************************/
573
// array iterator
Paul Sokolovsky's avatar
Paul Sokolovsky committed
574
575
576
577

typedef struct _mp_obj_array_it_t {
    mp_obj_base_t base;
    mp_obj_array_t *array;
578
    mp_uint_t offset;
579
    mp_uint_t cur;
Paul Sokolovsky's avatar
Paul Sokolovsky committed
580
581
} mp_obj_array_it_t;

582
STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) {
Paul Sokolovsky's avatar
Paul Sokolovsky committed
583
584
    mp_obj_array_it_t *self = self_in;
    if (self->cur < self->array->len) {
585
        return mp_binary_get_val_array(self->array->typecode & TYPECODE_MASK, self->array->items, self->offset + self->cur++);
Paul Sokolovsky's avatar
Paul Sokolovsky committed
586
    } else {
587
        return MP_OBJ_STOP_ITERATION;
Paul Sokolovsky's avatar
Paul Sokolovsky committed
588
589
590
    }
}

591
STATIC const mp_obj_type_t array_it_type = {
592
    { &mp_type_type },
593
    .name = MP_QSTR_iterator,
594
    .getiter = mp_identity,
Paul Sokolovsky's avatar
Paul Sokolovsky committed
595
596
597
    .iternext = array_it_iternext,
};

598
STATIC mp_obj_t array_iterator_new(mp_obj_t array_in) {
Paul Sokolovsky's avatar
Paul Sokolovsky committed
599
    mp_obj_array_t *array = array_in;
600
    mp_obj_array_it_t *o = m_new0(mp_obj_array_it_t, 1);
Paul Sokolovsky's avatar
Paul Sokolovsky committed
601
602
    o->base.type = &array_it_type;
    o->array = array;
603
604
605
606
607
    #if MICROPY_PY_BUILTINS_MEMORYVIEW
    if (array->base.type == &mp_type_memoryview) {
        o->offset = array->free;
    }
    #endif
Paul Sokolovsky's avatar
Paul Sokolovsky committed
608
609
    return o;
}
610

611
#endif // MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_BUILTINS_MEMORYVIEW