2014-05-03 23:27:38 +01:00
|
|
|
/*
|
|
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
|
|
*
|
|
|
|
* The MIT License (MIT)
|
|
|
|
*
|
|
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
2014-05-13 06:44:45 +01:00
|
|
|
* Copyright (c) 2014 Paul Sokolovsky
|
2014-05-03 23:27:38 +01:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2014-01-18 17:24:47 +00:00
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
2014-10-28 16:20:52 +00:00
|
|
|
#include <stdint.h>
|
2014-01-18 17:24:47 +00:00
|
|
|
|
2015-01-01 20:27:54 +00:00
|
|
|
#include "py/nlr.h"
|
|
|
|
#include "py/runtime0.h"
|
|
|
|
#include "py/runtime.h"
|
|
|
|
#include "py/binary.h"
|
2014-01-18 17:24:47 +00:00
|
|
|
|
2014-10-23 13:34:35 +01:00
|
|
|
#if MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_BUILTINS_MEMORYVIEW
|
2014-06-27 18:39:09 +01:00
|
|
|
|
2014-10-26 13:20:50 +00:00
|
|
|
// 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
|
|
|
|
#define TYPECODE_MASK (~(mp_uint_t)1)
|
|
|
|
#endif
|
|
|
|
|
2014-01-18 17:24:47 +00:00
|
|
|
typedef struct _mp_obj_array_t {
|
|
|
|
mp_obj_base_t base;
|
2014-07-03 13:25:24 +01:00
|
|
|
mp_uint_t typecode : 8;
|
2014-02-26 17:40:52 +00:00
|
|
|
// free is number of unused elements after len used elements
|
|
|
|
// alloc size = len + free
|
2014-07-03 13:25:24 +01:00
|
|
|
mp_uint_t free : (8 * sizeof(mp_uint_t) - 8);
|
|
|
|
mp_uint_t len; // in elements
|
2014-01-18 17:24:47 +00:00
|
|
|
void *items;
|
|
|
|
} mp_obj_array_t;
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
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);
|
2014-11-30 00:00:55 +00:00
|
|
|
STATIC mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in);
|
2014-08-30 14:28:06 +01:00
|
|
|
STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags);
|
2014-01-18 17:24:47 +00:00
|
|
|
|
|
|
|
/******************************************************************************/
|
2014-10-23 13:34:35 +01:00
|
|
|
// array
|
2014-01-18 17:24:47 +00:00
|
|
|
|
2014-10-23 13:34:35 +01:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC void array_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) {
|
2014-01-18 17:24:47 +00:00
|
|
|
mp_obj_array_t *o = o_in;
|
|
|
|
if (o->typecode == BYTEARRAY_TYPECODE) {
|
2014-07-17 21:56:32 +01:00
|
|
|
print(env, "bytearray(b");
|
2014-06-13 19:23:00 +01:00
|
|
|
mp_str_print_quoted(print, env, o->items, o->len, true);
|
2014-01-18 17:24:47 +00:00
|
|
|
} else {
|
2014-01-28 01:14:20 +00:00
|
|
|
print(env, "array('%c'", o->typecode);
|
2014-01-28 01:40:48 +00:00
|
|
|
if (o->len > 0) {
|
2014-04-18 22:04:06 +01:00
|
|
|
print(env, ", [");
|
2014-10-03 18:44:14 +01:00
|
|
|
for (mp_uint_t i = 0; i < o->len; i++) {
|
2014-01-28 01:40:48 +00:00
|
|
|
if (i > 0) {
|
|
|
|
print(env, ", ");
|
|
|
|
}
|
2014-04-11 01:46:09 +01:00
|
|
|
mp_obj_print_helper(print, env, mp_binary_get_val_array(o->typecode, o->items, i), PRINT_REPR);
|
2014-01-28 01:14:20 +00:00
|
|
|
}
|
2014-01-28 01:40:48 +00:00
|
|
|
print(env, "]");
|
2014-01-18 17:24:47 +00:00
|
|
|
}
|
|
|
|
}
|
2014-01-28 01:14:20 +00:00
|
|
|
print(env, ")");
|
2014-01-18 17:24:47 +00:00
|
|
|
}
|
2014-10-23 13:34:35 +01:00
|
|
|
#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);
|
|
|
|
if (typecode_size <= 0) {
|
|
|
|
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;
|
|
|
|
o->items = m_malloc(typecode_size * o->len);
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
#endif
|
2014-01-18 17:24:47 +00:00
|
|
|
|
2014-10-23 13:34:35 +01:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t array_construct(char typecode, mp_obj_t initializer) {
|
2014-12-04 15:46:14 +00:00
|
|
|
// 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)
|
|
|
|
|| MP_OBJ_IS_TYPE(initializer, &mp_type_bytearray))))
|
|
|
|
&& 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)
|
|
|
|
int sz = mp_binary_get_size('@', typecode, NULL);
|
|
|
|
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;
|
2014-01-18 17:24:47 +00:00
|
|
|
// 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);
|
|
|
|
|
2014-03-30 13:35:08 +01:00
|
|
|
mp_obj_t iterable = mp_getiter(initializer);
|
2014-01-18 17:24:47 +00:00
|
|
|
mp_obj_t item;
|
2014-10-03 18:44:14 +01:00
|
|
|
mp_uint_t i = 0;
|
2014-04-17 23:19:36 +01:00
|
|
|
while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
|
2014-01-18 17:24:47 +00:00
|
|
|
if (len == 0) {
|
|
|
|
array_append(array, item);
|
|
|
|
} else {
|
2014-04-11 01:46:09 +01:00
|
|
|
mp_binary_set_val_array(typecode, array->items, i++, item);
|
2014-01-18 17:24:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return array;
|
|
|
|
}
|
2014-10-23 13:34:35 +01:00
|
|
|
#endif
|
2014-01-18 17:24:47 +00:00
|
|
|
|
2014-10-23 13:34:35 +01:00
|
|
|
#if MICROPY_PY_ARRAY
|
2014-08-30 00:35:11 +01:00
|
|
|
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) {
|
2014-04-20 00:13:22 +01:00
|
|
|
mp_arg_check_num(n_args, n_kw, 1, 2, false);
|
2014-04-18 22:04:06 +01:00
|
|
|
|
|
|
|
// get typecode
|
2014-08-30 14:19:41 +01:00
|
|
|
mp_uint_t l;
|
2014-02-08 18:17:23 +00:00
|
|
|
const char *typecode = mp_obj_str_get_data(args[0], &l);
|
2014-04-18 22:04:06 +01:00
|
|
|
|
2014-01-28 00:31:52 +00:00
|
|
|
if (n_args == 1) {
|
2014-04-18 22:04:06 +01:00
|
|
|
// 1 arg: make an empty array
|
2014-01-28 00:31:52 +00:00
|
|
|
return array_new(*typecode, 0);
|
2014-04-18 22:04:06 +01:00
|
|
|
} else {
|
2014-12-04 15:46:14 +00:00
|
|
|
// 2 args: construct the array from the given object
|
2014-04-18 22:04:06 +01:00
|
|
|
return array_construct(*typecode, args[1]);
|
2014-01-28 00:31:52 +00:00
|
|
|
}
|
2014-01-18 17:24:47 +00:00
|
|
|
}
|
2014-10-23 13:34:35 +01:00
|
|
|
#endif
|
2014-01-18 17:24:47 +00:00
|
|
|
|
2014-10-23 13:34:35 +01:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY
|
2014-08-30 00:35:11 +01:00
|
|
|
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) {
|
2014-04-20 00:13:22 +01:00
|
|
|
mp_arg_check_num(n_args, n_kw, 0, 1, false);
|
2014-04-08 20:09:14 +01:00
|
|
|
|
2014-04-18 22:04:06 +01:00
|
|
|
if (n_args == 0) {
|
|
|
|
// no args: construct an empty bytearray
|
|
|
|
return array_new(BYTEARRAY_TYPECODE, 0);
|
2015-01-04 15:19:16 +00:00
|
|
|
} else if (MP_OBJ_IS_INT(args[0])) {
|
2014-04-18 22:04:06 +01:00
|
|
|
// 1 arg, an integer: construct a blank bytearray of that length
|
2015-01-04 15:19:16 +00:00
|
|
|
mp_uint_t len = mp_obj_get_int(args[0]);
|
2014-04-08 02:42:44 +01:00
|
|
|
mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, len);
|
|
|
|
memset(o->items, 0, len);
|
|
|
|
return o;
|
2014-04-18 22:04:06 +01:00
|
|
|
} else {
|
2014-12-04 15:46:14 +00:00
|
|
|
// 1 arg: construct the bytearray from that
|
2014-04-18 22:04:06 +01:00
|
|
|
return array_construct(BYTEARRAY_TYPECODE, args[0]);
|
2014-04-08 02:42:44 +01:00
|
|
|
}
|
2014-01-18 17:24:47 +00:00
|
|
|
}
|
2014-10-23 13:34:35 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
|
|
|
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) {
|
|
|
|
// 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);
|
|
|
|
|
|
|
|
mp_obj_array_t *self = m_new_obj(mp_obj_array_t);
|
|
|
|
self->base.type = type_in;
|
|
|
|
self->typecode = bufinfo.typecode;
|
|
|
|
self->free = 0;
|
|
|
|
self->len = bufinfo.len / mp_binary_get_size('@', bufinfo.typecode, NULL); // element len
|
|
|
|
self->items = bufinfo.buf;
|
|
|
|
|
|
|
|
// test if the object can be written to
|
|
|
|
if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_RW)) {
|
2014-10-26 13:20:50 +00:00
|
|
|
self->typecode |= 0x80; // used to indicate writable buffer
|
2014-10-23 13:34:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
#endif
|
2014-01-18 17:24:47 +00:00
|
|
|
|
2014-08-30 00:35:11 +01:00
|
|
|
STATIC mp_obj_t array_unary_op(mp_uint_t op, mp_obj_t o_in) {
|
2014-01-30 02:37:19 +00:00
|
|
|
mp_obj_array_t *o = o_in;
|
|
|
|
switch (op) {
|
2014-03-30 13:35:08 +01:00
|
|
|
case MP_UNARY_OP_BOOL: return MP_BOOL(o->len != 0);
|
|
|
|
case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(o->len);
|
2014-05-21 19:42:43 +01:00
|
|
|
default: return MP_OBJ_NULL; // op not supported
|
2014-01-30 02:37:19 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-30 00:35:11 +01:00
|
|
|
STATIC mp_obj_t array_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
|
2014-11-30 00:00:55 +00:00
|
|
|
mp_obj_array_t *lhs = lhs_in;
|
2014-08-10 09:49:23 +01:00
|
|
|
switch (op) {
|
2014-11-30 00:00:55 +00:00
|
|
|
case MP_BINARY_OP_ADD: {
|
2014-11-30 14:01:33 +00:00
|
|
|
// 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);
|
|
|
|
|
|
|
|
int sz = mp_binary_get_size('@', lhs_bufinfo.typecode, NULL);
|
|
|
|
|
|
|
|
// 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);
|
2014-11-30 00:00:55 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2014-08-10 09:49:23 +01:00
|
|
|
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)) {
|
2014-10-26 13:20:50 +00:00
|
|
|
return mp_const_false;
|
2014-08-10 09:49:23 +01:00
|
|
|
}
|
|
|
|
return MP_BOOL(mp_seq_cmp_bytes(op, lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_bufinfo.len));
|
|
|
|
}
|
2014-11-30 00:00:55 +00:00
|
|
|
|
2014-08-10 09:49:23 +01:00
|
|
|
default:
|
|
|
|
return MP_OBJ_NULL; // op not supported
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-30 00:00:55 +00:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg) {
|
2014-11-30 00:00:55 +00:00
|
|
|
// self is not a memoryview, so we don't need to use (& TYPECODE_MASK)
|
2014-04-08 20:09:14 +01:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_array) || MP_OBJ_IS_TYPE(self_in, &mp_type_bytearray));
|
2014-01-18 17:24:47 +00:00
|
|
|
mp_obj_array_t *self = self_in;
|
2014-11-30 00:00:55 +00:00
|
|
|
|
2014-01-18 17:24:47 +00:00
|
|
|
if (self->free == 0) {
|
2014-04-18 23:25:49 +01:00
|
|
|
int item_sz = mp_binary_get_size('@', self->typecode, NULL);
|
2014-01-18 17:24:47 +00:00
|
|
|
// TODO: alloc policy
|
|
|
|
self->free = 8;
|
|
|
|
self->items = m_realloc(self->items, item_sz * self->len, item_sz * (self->len + self->free));
|
2014-04-27 22:16:57 +01:00
|
|
|
mp_seq_clear(self->items, self->len + 1, self->len + self->free, item_sz);
|
2014-01-18 17:24:47 +00:00
|
|
|
}
|
2014-04-11 01:46:09 +01:00
|
|
|
mp_binary_set_val_array(self->typecode, self->items, self->len++, arg);
|
2014-01-18 17:24:47 +00:00
|
|
|
self->free--;
|
|
|
|
return mp_const_none; // return None, as per CPython
|
|
|
|
}
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(array_append_obj, array_append);
|
2014-01-18 17:24:47 +00:00
|
|
|
|
2014-11-30 00:00:55 +00:00
|
|
|
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)
|
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_array) || MP_OBJ_IS_TYPE(self_in, &mp_type_bytearray));
|
|
|
|
mp_obj_array_t *self = self_in;
|
|
|
|
|
2014-11-30 14:01:33 +00:00
|
|
|
// 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);
|
2014-11-30 00:00:55 +00:00
|
|
|
|
|
|
|
int sz = mp_binary_get_size('@', self->typecode, NULL);
|
|
|
|
|
2014-11-30 14:01:33 +00:00
|
|
|
// convert byte count to element count
|
|
|
|
mp_uint_t len = arg_bufinfo.len / sz;
|
|
|
|
|
2014-11-30 00:00:55 +00:00
|
|
|
// make sure we have enough room to extend
|
2014-11-30 14:01:33 +00:00
|
|
|
// TODO: alloc policy; at the moment we go conservative
|
|
|
|
if (self->free < len) {
|
|
|
|
self->items = m_realloc(self->items, (self->len + self->free) * sz, (self->len + len) * sz);
|
|
|
|
self->free = 0;
|
|
|
|
} else {
|
|
|
|
self->free -= len;
|
2014-11-30 00:00:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// extend
|
2014-11-30 14:01:33 +00:00
|
|
|
mp_seq_copy((byte*)self->items + self->len * sz, arg_bufinfo.buf, len * sz, byte);
|
|
|
|
self->len += len;
|
2014-11-30 00:00:55 +00:00
|
|
|
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(array_extend_obj, array_extend);
|
|
|
|
#endif
|
|
|
|
|
2014-04-17 22:10:53 +01:00
|
|
|
STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
|
2014-04-08 21:32:29 +01:00
|
|
|
if (value == MP_OBJ_NULL) {
|
2014-04-18 22:04:06 +01:00
|
|
|
// delete item
|
|
|
|
// TODO implement
|
2014-04-20 18:58:33 +01:00
|
|
|
// TODO: confirmed that both bytearray and array.array support
|
|
|
|
// slice deletion
|
2014-05-21 19:42:43 +01:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-04-17 22:10:53 +01:00
|
|
|
} else {
|
|
|
|
mp_obj_array_t *o = self_in;
|
2014-06-01 13:49:35 +01:00
|
|
|
if (0) {
|
|
|
|
#if MICROPY_PY_BUILTINS_SLICE
|
|
|
|
} else if (MP_OBJ_IS_TYPE(index_in, &mp_type_slice)) {
|
2014-04-20 18:58:33 +01:00
|
|
|
if (value != MP_OBJ_SENTINEL) {
|
|
|
|
// Only getting a slice is suported so far, not assignment
|
|
|
|
// TODO: confirmed that both bytearray and array.array support
|
|
|
|
// slice assignment (incl. of different size)
|
2014-05-21 19:42:43 +01:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-04-20 18:58:33 +01:00
|
|
|
}
|
2014-05-25 19:21:57 +01:00
|
|
|
mp_bound_slice_t slice;
|
|
|
|
if (!mp_seq_get_fast_slice_indexes(o->len, index_in, &slice)) {
|
2014-05-25 20:12:56 +01:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,
|
2014-06-05 18:57:38 +01:00
|
|
|
"only slices with step=1 (aka None) are supported"));
|
2014-04-19 18:06:57 +01:00
|
|
|
}
|
2014-10-23 13:34:35 +01:00
|
|
|
mp_obj_array_t *res;
|
2014-10-26 13:20:50 +00:00
|
|
|
int sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL);
|
2014-04-19 18:06:57 +01:00
|
|
|
assert(sz > 0);
|
2014-10-23 13:34:35 +01:00
|
|
|
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;
|
2014-10-26 13:20:50 +00:00
|
|
|
res->free += slice.start;
|
2014-10-23 13:34:35 +01:00
|
|
|
res->len = slice.stop - slice.start;
|
|
|
|
#endif
|
|
|
|
} else {
|
|
|
|
res = array_new(o->typecode, slice.stop - slice.start);
|
2014-10-28 16:20:52 +00:00
|
|
|
memcpy(res->items, (uint8_t*)o->items + slice.start * sz, (slice.stop - slice.start) * sz);
|
2014-10-23 13:34:35 +01:00
|
|
|
}
|
2014-04-19 18:06:57 +01:00
|
|
|
return res;
|
2014-06-01 13:49:35 +01:00
|
|
|
#endif
|
2014-04-17 22:10:53 +01:00
|
|
|
} else {
|
2014-10-03 18:44:14 +01:00
|
|
|
mp_uint_t index = mp_get_index(o->base.type, o->len, index_in, false);
|
2014-10-26 13:20:50 +00:00
|
|
|
#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
|
2014-04-19 18:06:57 +01:00
|
|
|
if (value == MP_OBJ_SENTINEL) {
|
|
|
|
// load
|
2014-10-26 13:20:50 +00:00
|
|
|
return mp_binary_get_val_array(o->typecode & TYPECODE_MASK, o->items, index);
|
2014-04-19 18:06:57 +01:00
|
|
|
} else {
|
|
|
|
// store
|
2014-10-26 13:20:50 +00:00
|
|
|
mp_binary_set_val_array(o->typecode & TYPECODE_MASK, o->items, index, value);
|
2014-04-19 18:06:57 +01:00
|
|
|
return mp_const_none;
|
|
|
|
}
|
2014-04-17 22:10:53 +01:00
|
|
|
}
|
2014-04-08 21:32:29 +01:00
|
|
|
}
|
2014-01-18 17:24:47 +00:00
|
|
|
}
|
|
|
|
|
2014-08-30 14:28:06 +01:00
|
|
|
STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
|
2014-01-18 17:24:47 +00:00
|
|
|
mp_obj_array_t *o = o_in;
|
2014-10-26 13:20:50 +00:00
|
|
|
int sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL);
|
|
|
|
bufinfo->buf = o->items;
|
|
|
|
bufinfo->len = o->len * sz;
|
|
|
|
bufinfo->typecode = o->typecode & TYPECODE_MASK;
|
2014-10-23 13:34:35 +01:00
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
2014-10-26 13:20:50 +00:00
|
|
|
if (o->base.type == &mp_type_memoryview) {
|
|
|
|
if ((o->typecode & 0x80) == 0 && (flags & MP_BUFFER_WRITE)) {
|
|
|
|
// read-only memoryview
|
|
|
|
return 1;
|
|
|
|
}
|
2014-10-28 16:20:52 +00:00
|
|
|
bufinfo->buf = (uint8_t*)bufinfo->buf + (mp_uint_t)o->free * sz;
|
2014-10-23 13:34:35 +01:00
|
|
|
}
|
|
|
|
#endif
|
2014-01-18 17:24:47 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-10-23 13:34:35 +01:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
|
2014-03-26 21:47:19 +00:00
|
|
|
STATIC const mp_map_elem_t array_locals_dict_table[] = {
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_append), (mp_obj_t)&array_append_obj },
|
2014-11-30 00:00:55 +00:00
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_extend), (mp_obj_t)&array_extend_obj },
|
2014-01-18 17:24:47 +00:00
|
|
|
};
|
|
|
|
|
2014-03-26 21:47:19 +00:00
|
|
|
STATIC MP_DEFINE_CONST_DICT(array_locals_dict, array_locals_dict_table);
|
2014-10-23 13:34:35 +01:00
|
|
|
#endif
|
2014-03-26 21:47:19 +00:00
|
|
|
|
2014-10-23 13:34:35 +01:00
|
|
|
#if MICROPY_PY_ARRAY
|
2014-03-25 14:18:18 +00:00
|
|
|
const mp_obj_type_t mp_type_array = {
|
2014-02-15 16:10:44 +00:00
|
|
|
{ &mp_type_type },
|
2014-02-15 11:34:50 +00:00
|
|
|
.name = MP_QSTR_array,
|
2014-01-18 17:24:47 +00:00
|
|
|
.print = array_print,
|
|
|
|
.make_new = array_make_new,
|
2014-01-21 21:45:19 +00:00
|
|
|
.getiter = array_iterator_new,
|
2014-01-30 02:37:19 +00:00
|
|
|
.unary_op = array_unary_op,
|
2014-08-10 09:49:23 +01:00
|
|
|
.binary_op = array_binary_op,
|
2014-04-17 22:10:53 +01:00
|
|
|
.subscr = array_subscr,
|
2014-01-18 17:24:47 +00:00
|
|
|
.buffer_p = { .get_buffer = array_get_buffer },
|
2014-03-26 21:47:19 +00:00
|
|
|
.locals_dict = (mp_obj_t)&array_locals_dict,
|
2014-01-18 17:24:47 +00:00
|
|
|
};
|
2014-10-23 13:34:35 +01:00
|
|
|
#endif
|
2014-01-18 17:24:47 +00:00
|
|
|
|
2014-10-23 13:34:35 +01:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY
|
2014-04-08 20:09:14 +01:00
|
|
|
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,
|
2014-08-10 09:49:23 +01:00
|
|
|
.binary_op = array_binary_op,
|
2014-04-17 22:10:53 +01:00
|
|
|
.subscr = array_subscr,
|
2014-04-08 20:09:14 +01:00
|
|
|
.buffer_p = { .get_buffer = array_get_buffer },
|
|
|
|
.locals_dict = (mp_obj_t)&array_locals_dict,
|
|
|
|
};
|
2014-10-23 13:34:35 +01:00
|
|
|
#endif
|
2014-04-08 20:09:14 +01:00
|
|
|
|
2014-10-23 13:34:35 +01:00
|
|
|
#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
|
2014-01-18 17:24:47 +00:00
|
|
|
|
2014-10-23 13:34:35 +01:00
|
|
|
/* unused
|
2014-08-30 14:19:41 +01:00
|
|
|
mp_uint_t mp_obj_array_len(mp_obj_t self_in) {
|
2014-01-21 21:30:10 +00:00
|
|
|
return ((mp_obj_array_t *)self_in)->len;
|
|
|
|
}
|
2014-10-23 13:34:35 +01:00
|
|
|
*/
|
2014-01-21 21:30:10 +00:00
|
|
|
|
2014-10-23 13:34:35 +01:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY
|
2014-08-30 14:59:21 +01:00
|
|
|
mp_obj_t mp_obj_new_bytearray(mp_uint_t n, void *items) {
|
2014-01-18 17:24:47 +00:00
|
|
|
mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, n);
|
|
|
|
memcpy(o->items, items, n);
|
|
|
|
return o;
|
|
|
|
}
|
2014-01-21 21:45:19 +00:00
|
|
|
|
2014-01-28 22:21:41 +00:00
|
|
|
// Create bytearray which references specified memory area
|
2014-08-30 14:19:41 +01:00
|
|
|
mp_obj_t mp_obj_new_bytearray_by_ref(mp_uint_t n, void *items) {
|
2014-01-28 22:21:41 +00:00
|
|
|
mp_obj_array_t *o = m_new_obj(mp_obj_array_t);
|
2014-10-23 13:34:35 +01:00
|
|
|
o->base.type = &mp_type_bytearray;
|
2014-01-28 22:21:41 +00:00
|
|
|
o->typecode = BYTEARRAY_TYPECODE;
|
|
|
|
o->free = 0;
|
|
|
|
o->len = n;
|
|
|
|
o->items = items;
|
|
|
|
return o;
|
|
|
|
}
|
2014-10-23 13:34:35 +01:00
|
|
|
#endif
|
2014-01-28 22:21:41 +00:00
|
|
|
|
2014-01-21 21:45:19 +00:00
|
|
|
/******************************************************************************/
|
2014-10-23 13:34:35 +01:00
|
|
|
// array iterator
|
2014-01-21 21:45:19 +00:00
|
|
|
|
|
|
|
typedef struct _mp_obj_array_it_t {
|
|
|
|
mp_obj_base_t base;
|
|
|
|
mp_obj_array_t *array;
|
2014-10-26 13:20:50 +00:00
|
|
|
mp_uint_t offset;
|
2014-07-03 13:25:24 +01:00
|
|
|
mp_uint_t cur;
|
2014-01-21 21:45:19 +00:00
|
|
|
} mp_obj_array_it_t;
|
|
|
|
|
2014-03-25 14:18:18 +00:00
|
|
|
STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) {
|
2014-01-21 21:45:19 +00:00
|
|
|
mp_obj_array_it_t *self = self_in;
|
|
|
|
if (self->cur < self->array->len) {
|
2014-10-26 13:20:50 +00:00
|
|
|
return mp_binary_get_val_array(self->array->typecode & TYPECODE_MASK, self->array->items, self->offset + self->cur++);
|
2014-01-21 21:45:19 +00:00
|
|
|
} else {
|
2014-04-17 23:19:36 +01:00
|
|
|
return MP_OBJ_STOP_ITERATION;
|
2014-01-21 21:45:19 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 16:15:40 +00:00
|
|
|
STATIC const mp_obj_type_t array_it_type = {
|
2014-02-15 16:10:44 +00:00
|
|
|
{ &mp_type_type },
|
2014-02-15 11:34:50 +00:00
|
|
|
.name = MP_QSTR_iterator,
|
2014-03-30 20:00:12 +01:00
|
|
|
.getiter = mp_identity,
|
2014-01-21 21:45:19 +00:00
|
|
|
.iternext = array_it_iternext,
|
|
|
|
};
|
|
|
|
|
2014-03-25 14:18:18 +00:00
|
|
|
STATIC mp_obj_t array_iterator_new(mp_obj_t array_in) {
|
2014-01-21 21:45:19 +00:00
|
|
|
mp_obj_array_t *array = array_in;
|
2014-10-26 13:20:50 +00:00
|
|
|
mp_obj_array_it_t *o = m_new0(mp_obj_array_it_t, 1);
|
2014-01-21 21:45:19 +00:00
|
|
|
o->base.type = &array_it_type;
|
|
|
|
o->array = array;
|
2014-10-26 13:20:50 +00:00
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
|
|
|
if (array->base.type == &mp_type_memoryview) {
|
|
|
|
o->offset = array->free;
|
|
|
|
}
|
|
|
|
#endif
|
2014-01-21 21:45:19 +00:00
|
|
|
return o;
|
|
|
|
}
|
2014-06-27 18:39:09 +01:00
|
|
|
|
2014-10-23 13:34:35 +01:00
|
|
|
#endif // MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_BUILTINS_MEMORYVIEW
|