2014-05-03 18:27:38 -04:00
|
|
|
/*
|
2017-06-30 03:22:17 -04:00
|
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
2014-05-03 18:27:38 -04:00
|
|
|
*
|
|
|
|
* The MIT License (MIT)
|
|
|
|
*
|
|
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
2014-05-13 01:44:45 -04:00
|
|
|
* Copyright (c) 2014 Paul Sokolovsky
|
2014-05-03 18:27:38 -04: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 12:24:47 -05:00
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
2014-10-28 12:20:52 -04:00
|
|
|
#include <stdint.h>
|
2014-01-18 12:24:47 -05:00
|
|
|
|
2015-01-01 15:27:54 -05:00
|
|
|
#include "py/runtime.h"
|
|
|
|
#include "py/binary.h"
|
2016-02-14 11:55:16 -05:00
|
|
|
#include "py/objstr.h"
|
2016-07-06 11:18:46 -04:00
|
|
|
#include "py/objarray.h"
|
2014-01-18 12:24:47 -05:00
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
#if MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_BUILTINS_MEMORYVIEW
|
2014-06-27 13:39:09 -04:00
|
|
|
|
2014-10-26 09:20:50 -04: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.
|
|
|
|
|
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
|
|
|
#define TYPECODE_MASK (0x7f)
|
2018-09-16 06:41:30 -04:00
|
|
|
#define memview_offset free
|
2022-08-07 02:24:37 -04:00
|
|
|
#define memview_offset_max ((1LL << MP_OBJ_ARRAY_FREE_SIZE_BITS) - 1)
|
2014-10-26 09:20:50 -04:00
|
|
|
#else
|
2018-09-16 06:41:30 -04:00
|
|
|
// make (& TYPECODE_MASK) a null operation if memorview not enabled
|
2017-02-16 00:31:43 -05:00
|
|
|
#define TYPECODE_MASK (~(size_t)0)
|
2018-09-16 06:41:30 -04:00
|
|
|
// memview_offset should not be accessed if memoryview is not enabled,
|
|
|
|
// so not defined to catch errors
|
2014-10-26 09:20:50 -04:00
|
|
|
#endif
|
|
|
|
|
2016-01-09 18:14:54 -05:00
|
|
|
STATIC mp_obj_t array_iterator_new(mp_obj_t array_in, mp_obj_iter_buf_t *iter_buf);
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg);
|
2014-11-29 19:00:55 -05:00
|
|
|
STATIC mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in);
|
2014-08-30 09:28:06 -04:00
|
|
|
STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags);
|
2023-10-19 16:42:36 -04:00
|
|
|
// CIRCUITPY-CHANGE
|
2020-05-15 00:16:26 -04:00
|
|
|
#if MICROPY_CPYTHON_COMPAT
|
|
|
|
STATIC mp_obj_t array_decode(size_t n_args, const mp_obj_t *args);
|
|
|
|
#endif
|
|
|
|
|
2014-01-18 12:24:47 -05:00
|
|
|
|
|
|
|
/******************************************************************************/
|
2014-10-23 08:34:35 -04:00
|
|
|
// array
|
2014-01-18 12:24:47 -05:00
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
|
2015-04-09 18:56:15 -04:00
|
|
|
STATIC void array_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
|
2015-01-20 07:47:20 -05:00
|
|
|
(void)kind;
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_array_t *o = MP_OBJ_TO_PTR(o_in);
|
2014-01-18 12:24:47 -05:00
|
|
|
if (o->typecode == BYTEARRAY_TYPECODE) {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, "bytearray(b");
|
|
|
|
mp_str_print_quoted(print, o->items, o->len, true);
|
2014-01-18 12:24:47 -05:00
|
|
|
} else {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_printf(print, "array('%c'", o->typecode);
|
2014-01-27 20:40:48 -05:00
|
|
|
if (o->len > 0) {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, ", [");
|
2017-02-16 00:31:43 -05:00
|
|
|
for (size_t i = 0; i < o->len; i++) {
|
2014-01-27 20:40:48 -05:00
|
|
|
if (i > 0) {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, ", ");
|
2014-01-27 20:40:48 -05:00
|
|
|
}
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_obj_print_helper(print, mp_binary_get_val_array(o->typecode, o->items, i), PRINT_REPR);
|
2014-01-27 20:14:20 -05:00
|
|
|
}
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, "]");
|
2014-01-18 12:24:47 -05:00
|
|
|
}
|
|
|
|
}
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, ")");
|
2014-01-18 12:24:47 -05:00
|
|
|
}
|
2014-10-23 08:34:35 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
|
2017-02-16 00:31:43 -05:00
|
|
|
STATIC mp_obj_array_t *array_new(char typecode, size_t n) {
|
2023-10-19 16:42:36 -04:00
|
|
|
// CIRCUITPY-CHANGE
|
modstruct: Improve compliance with python3
While checking whether we can enable -Wimplicit-fallthrough, I encountered
a diagnostic in mp_binary_set_val_array_from_int which led to discovering
the following bug:
```
>>> struct.pack("xb", 3)
b'\x03\x03'
```
That is, the next value (3) was used as the value of a padding byte, while
standard Python always fills "x" bytes with zeros. I initially thought
this had to do with the unintentional fallthrough, but it doesn't.
Instead, this code would relate to an array.array with a typecode of
padding ('x'), which is ALSO not desktop Python compliant:
```
>>> array.array('x', (1, 2, 3))
array('x', [1, 0, 0])
```
Possibly this is dead code that used to be shared between struct-setting
and array-setting, but it no longer is.
I also discovered that the argument list length for struct.pack
and struct.pack_into were not checked, and that the length of binary data
passed to array.array was not checked to be a multiple of the element
size.
I have corrected all of these to conform more closely to standard Python
and revised some tests where necessary. Some tests for micropython-specific
behavior that does not conform to standard Python and is not present
in CircuitPython was deleted outright.
2020-09-12 14:57:31 -04:00
|
|
|
if (typecode == 'x') {
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("bad typecode"));
|
modstruct: Improve compliance with python3
While checking whether we can enable -Wimplicit-fallthrough, I encountered
a diagnostic in mp_binary_set_val_array_from_int which led to discovering
the following bug:
```
>>> struct.pack("xb", 3)
b'\x03\x03'
```
That is, the next value (3) was used as the value of a padding byte, while
standard Python always fills "x" bytes with zeros. I initially thought
this had to do with the unintentional fallthrough, but it doesn't.
Instead, this code would relate to an array.array with a typecode of
padding ('x'), which is ALSO not desktop Python compliant:
```
>>> array.array('x', (1, 2, 3))
array('x', [1, 0, 0])
```
Possibly this is dead code that used to be shared between struct-setting
and array-setting, but it no longer is.
I also discovered that the argument list length for struct.pack
and struct.pack_into were not checked, and that the length of binary data
passed to array.array was not checked to be a multiple of the element
size.
I have corrected all of these to conform more closely to standard Python
and revised some tests where necessary. Some tests for micropython-specific
behavior that does not conform to standard Python and is not present
in CircuitPython was deleted outright.
2020-09-12 14:57:31 -04:00
|
|
|
}
|
2014-10-23 08:34:35 -04:00
|
|
|
int typecode_size = mp_binary_get_size('@', typecode, NULL);
|
|
|
|
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;
|
2015-02-27 04:34:51 -05:00
|
|
|
o->items = m_new(byte, typecode_size * o->len);
|
2014-10-23 08:34:35 -04:00
|
|
|
return o;
|
|
|
|
}
|
|
|
|
#endif
|
2014-01-18 12:24:47 -05:00
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t array_construct(char typecode, mp_obj_t initializer) {
|
2014-12-04 10:46:14 -05: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
|
2021-03-15 09:57:36 -04:00
|
|
|
&& typecode == BYTEARRAY_TYPECODE)
|
|
|
|
|| (MICROPY_PY_ARRAY
|
2021-04-22 20:55:39 -04:00
|
|
|
&& (mp_obj_is_type(initializer, &mp_type_bytes)
|
|
|
|
|| (MICROPY_PY_BUILTINS_BYTEARRAY && mp_obj_is_type(initializer, &mp_type_bytearray)))))
|
2014-12-04 10:46:14 -05:00
|
|
|
&& mp_get_buffer(initializer, &bufinfo, MP_BUFFER_READ)) {
|
|
|
|
// construct array from raw bytes
|
2015-05-10 07:04:38 -04:00
|
|
|
size_t sz = mp_binary_get_size('@', typecode, NULL);
|
2023-10-19 16:42:36 -04:00
|
|
|
// CIRCUITPY-CHANGE
|
modstruct: Improve compliance with python3
While checking whether we can enable -Wimplicit-fallthrough, I encountered
a diagnostic in mp_binary_set_val_array_from_int which led to discovering
the following bug:
```
>>> struct.pack("xb", 3)
b'\x03\x03'
```
That is, the next value (3) was used as the value of a padding byte, while
standard Python always fills "x" bytes with zeros. I initially thought
this had to do with the unintentional fallthrough, but it doesn't.
Instead, this code would relate to an array.array with a typecode of
padding ('x'), which is ALSO not desktop Python compliant:
```
>>> array.array('x', (1, 2, 3))
array('x', [1, 0, 0])
```
Possibly this is dead code that used to be shared between struct-setting
and array-setting, but it no longer is.
I also discovered that the argument list length for struct.pack
and struct.pack_into were not checked, and that the length of binary data
passed to array.array was not checked to be a multiple of the element
size.
I have corrected all of these to conform more closely to standard Python
and revised some tests where necessary. Some tests for micropython-specific
behavior that does not conform to standard Python and is not present
in CircuitPython was deleted outright.
2020-09-12 14:57:31 -04:00
|
|
|
if (bufinfo.len % sz) {
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("bytes length not a multiple of item size"));
|
modstruct: Improve compliance with python3
While checking whether we can enable -Wimplicit-fallthrough, I encountered
a diagnostic in mp_binary_set_val_array_from_int which led to discovering
the following bug:
```
>>> struct.pack("xb", 3)
b'\x03\x03'
```
That is, the next value (3) was used as the value of a padding byte, while
standard Python always fills "x" bytes with zeros. I initially thought
this had to do with the unintentional fallthrough, but it doesn't.
Instead, this code would relate to an array.array with a typecode of
padding ('x'), which is ALSO not desktop Python compliant:
```
>>> array.array('x', (1, 2, 3))
array('x', [1, 0, 0])
```
Possibly this is dead code that used to be shared between struct-setting
and array-setting, but it no longer is.
I also discovered that the argument list length for struct.pack
and struct.pack_into were not checked, and that the length of binary data
passed to array.array was not checked to be a multiple of the element
size.
I have corrected all of these to conform more closely to standard Python
and revised some tests where necessary. Some tests for micropython-specific
behavior that does not conform to standard Python and is not present
in CircuitPython was deleted outright.
2020-09-12 14:57:31 -04:00
|
|
|
}
|
2017-02-16 00:31:43 -05:00
|
|
|
size_t len = bufinfo.len / sz;
|
2014-12-04 10:46:14 -05:00
|
|
|
mp_obj_array_t *o = array_new(typecode, len);
|
|
|
|
memcpy(o->items, bufinfo.buf, len * sz);
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-12-04 10:46:14 -05:00
|
|
|
}
|
|
|
|
|
2017-02-16 00:31:43 -05:00
|
|
|
size_t len;
|
2014-01-18 12:24:47 -05: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);
|
|
|
|
|
2017-02-12 23:44:31 -05:00
|
|
|
mp_obj_t iterable = mp_getiter(initializer, NULL);
|
2014-01-18 12:24:47 -05:00
|
|
|
mp_obj_t item;
|
2017-02-16 00:31:43 -05:00
|
|
|
size_t i = 0;
|
2014-04-17 18:19:36 -04:00
|
|
|
while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
|
2014-01-18 12:24:47 -05:00
|
|
|
if (len == 0) {
|
2015-11-27 12:01:44 -05:00
|
|
|
array_append(MP_OBJ_FROM_PTR(array), item);
|
2014-01-18 12:24:47 -05:00
|
|
|
} else {
|
2014-04-10 20:46:09 -04:00
|
|
|
mp_binary_set_val_array(typecode, array->items, i++, item);
|
2014-01-18 12:24:47 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(array);
|
2014-01-18 12:24:47 -05:00
|
|
|
}
|
2014-10-23 08:34:35 -04:00
|
|
|
#endif
|
2014-01-18 12:24:47 -05:00
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
#if MICROPY_PY_ARRAY
|
2016-01-03 10:55:55 -05:00
|
|
|
STATIC mp_obj_t array_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
2015-01-20 07:47:20 -05:00
|
|
|
(void)type_in;
|
2014-04-19 19:13:22 -04:00
|
|
|
mp_arg_check_num(n_args, n_kw, 1, 2, false);
|
2014-04-18 17:04:06 -04:00
|
|
|
|
|
|
|
// get typecode
|
2017-03-25 04:53:31 -04:00
|
|
|
const char *typecode = mp_obj_str_get_str(args[0]);
|
2014-04-18 17:04:06 -04:00
|
|
|
|
2014-01-27 19:31:52 -05:00
|
|
|
if (n_args == 1) {
|
2014-04-18 17:04:06 -04:00
|
|
|
// 1 arg: make an empty array
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(array_new(*typecode, 0));
|
2014-04-18 17:04:06 -04:00
|
|
|
} else {
|
2014-12-04 10:46:14 -05:00
|
|
|
// 2 args: construct the array from the given object
|
2014-04-18 17:04:06 -04:00
|
|
|
return array_construct(*typecode, args[1]);
|
2014-01-27 19:31:52 -05:00
|
|
|
}
|
2014-01-18 12:24:47 -05:00
|
|
|
}
|
2014-10-23 08:34:35 -04:00
|
|
|
#endif
|
2014-01-18 12:24:47 -05:00
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY
|
2016-01-03 10:55:55 -05:00
|
|
|
STATIC mp_obj_t bytearray_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
2015-01-20 07:47:20 -05:00
|
|
|
(void)type_in;
|
py/objarray: bytearray: Allow 2nd/3rd arg to constructor.
If bytearray is constructed from str, a second argument of encoding is
required (in CPython), and third arg of Unicode error handling is allowed,
e.g.:
bytearray("str", "utf-8", "strict")
This is similar to bytes:
bytes("str", "utf-8", "strict")
This patch just allows to pass 2nd/3rd arguments to bytearray, but
doesn't try to validate them to not impact code size. (This is also
similar to how bytes constructor is handled, though it does a bit
more validation, e.g. check that in case of str arg, encoding argument
is passed.)
2018-09-03 14:52:35 -04:00
|
|
|
// Can take 2nd/3rd arg if constructs from str
|
|
|
|
mp_arg_check_num(n_args, n_kw, 0, 3, false);
|
2014-04-08 15:09:14 -04:00
|
|
|
|
2014-04-18 17:04:06 -04:00
|
|
|
if (n_args == 0) {
|
|
|
|
// no args: construct an empty bytearray
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(array_new(BYTEARRAY_TYPECODE, 0));
|
2021-04-22 20:55:39 -04:00
|
|
|
} else if (mp_obj_is_int(args[0])) {
|
2023-10-19 16:42:36 -04:00
|
|
|
// CIRCUITPY-CHANGE: error checks this
|
2021-06-29 10:29:44 -04:00
|
|
|
if (n_args > 1) {
|
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("wrong number of arguments"));
|
|
|
|
}
|
2014-04-18 17:04:06 -04:00
|
|
|
// 1 arg, an integer: construct a blank bytearray of that length
|
2015-01-04 10:19:16 -05:00
|
|
|
mp_uint_t len = mp_obj_get_int(args[0]);
|
2014-04-07 21:42:44 -04:00
|
|
|
mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, len);
|
|
|
|
memset(o->items, 0, len);
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-04-18 17:04:06 -04:00
|
|
|
} else {
|
2014-12-04 10:46:14 -05:00
|
|
|
// 1 arg: construct the bytearray from that
|
2022-11-06 20:55:31 -05:00
|
|
|
if (mp_obj_is_str(args[0]) && n_args == 1) {
|
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
|
|
|
// Match bytes_make_new.
|
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("wrong number of arguments"));
|
|
|
|
#else
|
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("string argument without an encoding"));
|
|
|
|
#endif
|
|
|
|
}
|
2014-04-18 17:04:06 -04:00
|
|
|
return array_construct(BYTEARRAY_TYPECODE, args[0]);
|
2014-04-07 21:42:44 -04:00
|
|
|
}
|
2014-01-18 12:24:47 -05:00
|
|
|
}
|
2014-10-23 08:34:35 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
2015-03-06 14:35:26 -05:00
|
|
|
|
2017-02-16 00:31:43 -05:00
|
|
|
mp_obj_t mp_obj_new_memoryview(byte typecode, size_t nitems, void *items) {
|
2015-03-06 14:35:26 -05:00
|
|
|
mp_obj_array_t *self = m_new_obj(mp_obj_array_t);
|
2021-05-17 10:22:53 -04:00
|
|
|
mp_obj_memoryview_init(self, typecode, 0, nitems, items);
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(self);
|
2015-03-06 14:35:26 -05:00
|
|
|
}
|
|
|
|
|
2016-01-03 10:55:55 -05:00
|
|
|
STATIC mp_obj_t memoryview_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
2015-03-18 20:21:29 -04:00
|
|
|
(void)type_in;
|
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
// 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);
|
|
|
|
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_array_t *self = MP_OBJ_TO_PTR(mp_obj_new_memoryview(bufinfo.typecode,
|
2015-03-06 14:35:26 -05:00
|
|
|
bufinfo.len / mp_binary_get_size('@', bufinfo.typecode, NULL),
|
2015-11-27 12:01:44 -05:00
|
|
|
bufinfo.buf));
|
2014-10-23 08:34:35 -04:00
|
|
|
|
2021-05-17 10:23:13 -04:00
|
|
|
// If the input object is a memoryview then need to point the items of the
|
|
|
|
// new memoryview to the start of the buffer so the GC can trace it.
|
|
|
|
if (mp_obj_get_type(args[0]) == &mp_type_memoryview) {
|
|
|
|
mp_obj_array_t *other = MP_OBJ_TO_PTR(args[0]);
|
|
|
|
self->memview_offset = other->memview_offset;
|
|
|
|
self->items = other->items;
|
|
|
|
}
|
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
// test if the object can be written to
|
|
|
|
if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_RW)) {
|
2018-06-17 23:40:53 -04:00
|
|
|
self->typecode |= MP_OBJ_ARRAY_TYPECODE_FLAG_RW; // indicate writable buffer
|
2014-10-23 08:34:35 -04:00
|
|
|
}
|
|
|
|
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(self);
|
2014-10-23 08:34:35 -04:00
|
|
|
}
|
2021-02-20 11:35:27 -05:00
|
|
|
|
2023-10-19 16:42:36 -04:00
|
|
|
// CIRCUITPY-CHANGE: adds cast
|
2021-02-20 18:41:08 -05:00
|
|
|
#if MICROPY_CPYTHON_COMPAT
|
2021-02-20 11:35:27 -05:00
|
|
|
STATIC mp_obj_t memoryview_cast(const mp_obj_t self_in, const mp_obj_t typecode_in) {
|
|
|
|
mp_obj_array_t *self = MP_OBJ_TO_PTR(self_in);
|
|
|
|
const char *typecode = mp_obj_str_get_str(typecode_in);
|
2023-05-18 16:24:50 -04:00
|
|
|
size_t new_element_size = mp_binary_get_size('@', typecode[0], NULL);
|
|
|
|
size_t old_element_size = mp_binary_get_size('@', self->typecode & ~MP_OBJ_ARRAY_TYPECODE_FLAG_RW, NULL);
|
|
|
|
size_t bytelen = self->len * old_element_size;
|
|
|
|
if (bytelen % new_element_size != 0) {
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("memoryview: length is not a multiple of itemsize"));
|
2021-02-20 11:35:27 -05:00
|
|
|
}
|
2023-05-18 16:24:50 -04:00
|
|
|
mp_obj_array_t *result = MP_OBJ_TO_PTR(mp_obj_new_memoryview(*typecode, bytelen / new_element_size, self->items));
|
|
|
|
result->memview_offset = (self->memview_offset * old_element_size) / new_element_size;
|
2021-02-20 11:35:27 -05:00
|
|
|
|
|
|
|
// test if the object can be written to
|
|
|
|
if (self->typecode & MP_OBJ_ARRAY_TYPECODE_FLAG_RW) {
|
|
|
|
result->typecode |= MP_OBJ_ARRAY_TYPECODE_FLAG_RW; // indicate writable buffer
|
|
|
|
}
|
|
|
|
return MP_OBJ_FROM_PTR(result);
|
|
|
|
}
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(memoryview_cast_obj, memoryview_cast);
|
2014-10-23 08:34:35 -04:00
|
|
|
#endif
|
2021-04-22 20:55:39 -04:00
|
|
|
|
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
|
2019-05-08 10:16:17 -04:00
|
|
|
STATIC void memoryview_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
|
|
|
if (dest[0] != MP_OBJ_NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (attr == MP_QSTR_itemsize) {
|
|
|
|
mp_obj_array_t *self = MP_OBJ_TO_PTR(self_in);
|
|
|
|
dest[0] = MP_OBJ_NEW_SMALL_INT(mp_binary_get_size('@', self->typecode & TYPECODE_MASK, NULL));
|
|
|
|
}
|
2023-09-19 11:10:12 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTES_HEX || MICROPY_CPYTHON_COMPAT
|
2021-07-13 04:01:12 -04:00
|
|
|
else {
|
|
|
|
// Need to forward to locals dict.
|
|
|
|
dest[1] = MP_OBJ_SENTINEL;
|
|
|
|
}
|
|
|
|
#endif
|
2021-04-22 20:55:39 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2021-02-20 18:41:08 -05:00
|
|
|
#endif
|
2014-01-18 12:24:47 -05:00
|
|
|
|
2017-08-28 23:04:01 -04:00
|
|
|
STATIC mp_obj_t array_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_array_t *o = MP_OBJ_TO_PTR(o_in);
|
2014-01-29 21:37:19 -05:00
|
|
|
switch (op) {
|
2021-03-15 09:57:36 -04:00
|
|
|
case MP_UNARY_OP_BOOL:
|
|
|
|
return mp_obj_new_bool(o->len != 0);
|
|
|
|
case MP_UNARY_OP_LEN:
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(o->len);
|
|
|
|
default:
|
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-01-29 21:37:19 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-10 10:40:51 -04:00
|
|
|
STATIC int typecode_for_comparison(int typecode, bool *is_unsigned) {
|
2021-05-12 11:02:06 -04:00
|
|
|
if (typecode == BYTEARRAY_TYPECODE) {
|
|
|
|
typecode = 'B';
|
|
|
|
}
|
|
|
|
if (typecode <= 'Z') {
|
|
|
|
typecode += 32; // to lowercase
|
2021-05-10 10:40:51 -04:00
|
|
|
*is_unsigned = true;
|
2021-05-12 11:02:06 -04:00
|
|
|
}
|
|
|
|
return typecode;
|
|
|
|
}
|
|
|
|
|
2017-08-28 23:04:01 -04:00
|
|
|
STATIC mp_obj_t array_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_array_t *lhs = MP_OBJ_TO_PTR(lhs_in);
|
2014-08-10 04:49:23 -04:00
|
|
|
switch (op) {
|
2023-10-19 16:42:36 -04:00
|
|
|
// CIRCUITPY-CHANGE: does multiply
|
2018-03-22 22:52:25 -04:00
|
|
|
case MP_BINARY_OP_MULTIPLY:
|
|
|
|
case MP_BINARY_OP_INPLACE_MULTIPLY: {
|
2021-04-22 20:55:39 -04:00
|
|
|
if (!mp_obj_is_int(rhs_in)) {
|
2018-03-22 22:52:25 -04:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
|
|
|
}
|
|
|
|
mp_uint_t repeat = mp_obj_get_int(rhs_in);
|
|
|
|
bool inplace = (op == MP_BINARY_OP_INPLACE_MULTIPLY);
|
|
|
|
mp_buffer_info_t lhs_bufinfo;
|
|
|
|
array_get_buffer(lhs_in, &lhs_bufinfo, MP_BUFFER_READ);
|
|
|
|
mp_obj_array_t *res;
|
|
|
|
byte *ptr;
|
|
|
|
size_t orig_lhs_bufinfo_len = lhs_bufinfo.len;
|
2021-03-15 09:57:36 -04:00
|
|
|
if (inplace) {
|
2018-03-22 22:52:25 -04:00
|
|
|
res = lhs;
|
|
|
|
size_t item_sz = mp_binary_get_size('@', lhs->typecode, NULL);
|
|
|
|
lhs->items = m_renew(byte, lhs->items, (lhs->len + lhs->free) * item_sz, lhs->len * repeat * item_sz);
|
|
|
|
lhs->len = lhs->len * repeat;
|
|
|
|
lhs->free = 0;
|
2021-03-15 09:57:36 -04:00
|
|
|
if (!repeat) {
|
2018-03-22 22:52:25 -04:00
|
|
|
return MP_OBJ_FROM_PTR(res);
|
2021-03-15 09:57:36 -04:00
|
|
|
}
|
2018-03-22 22:52:25 -04:00
|
|
|
repeat--;
|
2021-03-15 09:57:36 -04:00
|
|
|
ptr = (byte *)res->items + orig_lhs_bufinfo_len;
|
2018-03-22 22:52:25 -04:00
|
|
|
} else {
|
|
|
|
res = array_new(lhs_bufinfo.typecode, lhs->len * repeat);
|
2021-03-15 09:57:36 -04:00
|
|
|
ptr = (byte *)res->items;
|
2018-03-22 22:52:25 -04:00
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
if (orig_lhs_bufinfo_len) {
|
|
|
|
for (; repeat--; ptr += orig_lhs_bufinfo_len) {
|
2018-03-22 22:52:25 -04:00
|
|
|
memcpy(ptr, lhs_bufinfo.buf, orig_lhs_bufinfo_len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return MP_OBJ_FROM_PTR(res);
|
|
|
|
}
|
2014-11-29 19:00:55 -05:00
|
|
|
case MP_BINARY_OP_ADD: {
|
2023-05-12 09:14:44 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
|
|
|
if (lhs->base.type == &mp_type_memoryview) {
|
|
|
|
return MP_OBJ_NULL; // op not supported
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-11-30 09:01:33 -05: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);
|
|
|
|
|
2015-05-10 07:04:38 -04:00
|
|
|
size_t sz = mp_binary_get_size('@', lhs_bufinfo.typecode, NULL);
|
2014-11-30 09:01:33 -05:00
|
|
|
|
|
|
|
// convert byte count to element count (in case rhs is not multiple of sz)
|
2017-02-16 00:31:43 -05:00
|
|
|
size_t rhs_len = rhs_bufinfo.len / sz;
|
2014-11-30 09:01:33 -05:00
|
|
|
|
|
|
|
// 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);
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_seq_cat((byte *)res->items, lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_len * sz, byte);
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(res);
|
2014-11-29 19:00:55 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
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
|
2015-11-27 12:01:44 -05:00
|
|
|
array_extend(lhs_in, rhs_in);
|
|
|
|
return lhs_in;
|
2014-11-29 19:00:55 -05:00
|
|
|
}
|
|
|
|
|
2017-11-23 21:04:24 -05:00
|
|
|
case MP_BINARY_OP_CONTAINS: {
|
2018-08-14 02:23:21 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY
|
|
|
|
// Can search string only in bytearray
|
2016-02-14 11:55:16 -05:00
|
|
|
mp_buffer_info_t lhs_bufinfo;
|
|
|
|
mp_buffer_info_t rhs_bufinfo;
|
|
|
|
if (mp_get_buffer(rhs_in, &rhs_bufinfo, MP_BUFFER_READ)) {
|
2021-04-22 20:55:39 -04:00
|
|
|
if (!mp_obj_is_type(lhs_in, &mp_type_bytearray)) {
|
2016-02-14 11:55:16 -05:00
|
|
|
return mp_const_false;
|
|
|
|
}
|
|
|
|
array_get_buffer(lhs_in, &lhs_bufinfo, MP_BUFFER_READ);
|
|
|
|
return mp_obj_new_bool(
|
|
|
|
find_subbytes(lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_bufinfo.len, 1) != NULL);
|
|
|
|
}
|
2018-08-14 02:23:21 -04:00
|
|
|
#endif
|
2016-02-14 11:55:16 -05:00
|
|
|
|
|
|
|
// Otherwise, can only look for a scalar numeric value in an array
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_int(rhs_in) || mp_obj_is_float(rhs_in)) {
|
2017-10-24 07:39:36 -04:00
|
|
|
mp_raise_NotImplementedError(NULL);
|
2016-02-14 11:55:16 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return mp_const_false;
|
|
|
|
}
|
|
|
|
|
2021-05-10 10:40:51 -04:00
|
|
|
case MP_BINARY_OP_EQUAL:
|
|
|
|
case MP_BINARY_OP_LESS:
|
|
|
|
case MP_BINARY_OP_LESS_EQUAL:
|
|
|
|
case MP_BINARY_OP_MORE:
|
|
|
|
case MP_BINARY_OP_MORE_EQUAL: {
|
2014-08-10 04:49:23 -04:00
|
|
|
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 09:20:50 -04:00
|
|
|
return mp_const_false;
|
2014-08-10 04:49:23 -04:00
|
|
|
}
|
2021-05-12 11:02:06 -04:00
|
|
|
// mp_seq_cmp_bytes is used so only compatible representations can be correctly compared.
|
|
|
|
// The type doesn't matter: array/bytearray/str/bytes all have the same buffer layout, so
|
|
|
|
// just check if the typecodes are compatible; for testing equality the types should have the
|
|
|
|
// same code except for signedness, and not be floating point because nan never equals nan.
|
2021-05-10 10:40:51 -04:00
|
|
|
// For > and < the types should be the same and unsigned.
|
2021-05-12 11:02:06 -04:00
|
|
|
// Note that typecode_for_comparison always returns lowercase letters to save code size.
|
|
|
|
// No need for (& TYPECODE_MASK) here: xxx_get_buffer already takes care of that.
|
2021-05-10 10:40:51 -04:00
|
|
|
bool is_unsigned = false;
|
|
|
|
const int lhs_code = typecode_for_comparison(lhs_bufinfo.typecode, &is_unsigned);
|
|
|
|
const int rhs_code = typecode_for_comparison(rhs_bufinfo.typecode, &is_unsigned);
|
|
|
|
if (lhs_code == rhs_code && lhs_code != 'f' && lhs_code != 'd' && (op == MP_BINARY_OP_EQUAL || is_unsigned)) {
|
2021-05-12 11:02:06 -04:00
|
|
|
return mp_obj_new_bool(mp_seq_cmp_bytes(op, lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_bufinfo.len));
|
|
|
|
}
|
|
|
|
// mp_obj_equal_not_equal treats returning MP_OBJ_NULL as 'fall back to pointer comparison'
|
|
|
|
// for MP_BINARY_OP_EQUAL but that is incompatible with CPython.
|
|
|
|
mp_raise_NotImplementedError(NULL);
|
2014-08-10 04:49:23 -04:00
|
|
|
}
|
2014-11-29 19:00:55 -05:00
|
|
|
|
2014-08-10 04:49:23 -04:00
|
|
|
default:
|
|
|
|
return MP_OBJ_NULL; // op not supported
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-29 19:00:55 -05:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg) {
|
2014-11-29 19:00:55 -05:00
|
|
|
// self is not a memoryview, so we don't need to use (& TYPECODE_MASK)
|
2021-04-22 20:55:39 -04:00
|
|
|
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)));
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_array_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-11-29 19:00:55 -05:00
|
|
|
|
2014-01-18 12:24:47 -05:00
|
|
|
if (self->free == 0) {
|
2015-05-10 07:04:38 -04:00
|
|
|
size_t item_sz = mp_binary_get_size('@', self->typecode, NULL);
|
2014-01-18 12:24:47 -05:00
|
|
|
// TODO: alloc policy
|
|
|
|
self->free = 8;
|
2015-02-27 04:34:51 -05:00
|
|
|
self->items = m_renew(byte, self->items, item_sz * self->len, item_sz * (self->len + self->free));
|
2014-04-27 17:16:57 -04:00
|
|
|
mp_seq_clear(self->items, self->len + 1, self->len + self->free, item_sz);
|
2014-01-18 12:24:47 -05:00
|
|
|
}
|
2016-04-07 04:03:33 -04:00
|
|
|
mp_binary_set_val_array(self->typecode, self->items, self->len, arg);
|
|
|
|
// only update length/free if set succeeded
|
|
|
|
self->len++;
|
2014-01-18 12:24:47 -05:00
|
|
|
self->free--;
|
|
|
|
return mp_const_none; // return None, as per CPython
|
|
|
|
}
|
2023-09-20 12:46:51 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_2(mp_obj_array_append_obj, array_append);
|
2014-01-18 12:24:47 -05:00
|
|
|
|
2014-11-29 19:00:55 -05: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)
|
2021-04-22 20:55:39 -04:00
|
|
|
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)));
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_array_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-11-29 19:00:55 -05:00
|
|
|
|
2014-11-30 09:01:33 -05:00
|
|
|
// allow to extend by anything that has the buffer protocol (extension to CPython)
|
|
|
|
mp_buffer_info_t arg_bufinfo;
|
2023-10-19 16:42:36 -04:00
|
|
|
// CIRCUITPY-CHANGE: allow appending an iterable
|
2023-02-06 18:07:26 -05:00
|
|
|
if (mp_get_buffer(arg_in, &arg_bufinfo, MP_BUFFER_READ)) {
|
|
|
|
size_t sz = mp_binary_get_size('@', self->typecode, NULL);
|
2014-11-29 19:00:55 -05:00
|
|
|
|
2023-02-06 18:07:26 -05:00
|
|
|
// convert byte count to element count
|
|
|
|
size_t len = arg_bufinfo.len / sz;
|
2014-11-29 19:00:55 -05:00
|
|
|
|
2023-02-06 18:07:26 -05:00
|
|
|
// make sure we have enough room to extend
|
|
|
|
// TODO: alloc policy; at the moment we go conservative
|
|
|
|
if (self->free < len) {
|
|
|
|
self->items = m_renew(byte, self->items, (self->len + self->free) * sz, (self->len + len) * sz);
|
|
|
|
self->free = 0;
|
|
|
|
} else {
|
|
|
|
self->free -= len;
|
|
|
|
}
|
2014-11-30 09:01:33 -05:00
|
|
|
|
2023-02-06 18:07:26 -05:00
|
|
|
// extend
|
|
|
|
mp_seq_copy((byte *)self->items + self->len * sz, arg_bufinfo.buf, len * sz, byte);
|
|
|
|
self->len += len;
|
2014-11-30 09:01:33 -05:00
|
|
|
} else {
|
2023-02-06 18:07:26 -05:00
|
|
|
// Otherwise argument must be an iterable of items to append
|
|
|
|
mp_obj_t iterable = mp_getiter(arg_in, NULL);
|
|
|
|
mp_obj_t item;
|
|
|
|
while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
|
|
|
|
array_append(self_in, item);
|
|
|
|
}
|
2014-11-29 19:00:55 -05:00
|
|
|
}
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
2023-09-20 12:46:51 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_2(mp_obj_array_extend_obj, array_extend);
|
2014-11-29 19:00:55 -05:00
|
|
|
#endif
|
|
|
|
|
2020-07-21 18:40:51 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY && MICROPY_CPYTHON_COMPAT
|
2020-07-15 20:59:11 -04:00
|
|
|
STATIC mp_obj_t buffer_finder(size_t n_args, const mp_obj_t *args, int direction, bool is_index) {
|
2021-04-22 20:55:39 -04:00
|
|
|
mp_check_self(mp_obj_is_type(args[0], &mp_type_bytearray));
|
2020-07-15 20:59:11 -04:00
|
|
|
const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
|
|
|
|
|
|
|
|
mp_buffer_info_t haystack_bufinfo;
|
|
|
|
mp_get_buffer_raise(args[0], &haystack_bufinfo, MP_BUFFER_READ);
|
|
|
|
|
|
|
|
mp_buffer_info_t needle_bufinfo;
|
|
|
|
mp_get_buffer_raise(args[1], &needle_bufinfo, MP_BUFFER_READ);
|
|
|
|
|
|
|
|
if (mp_binary_get_size('@', needle_bufinfo.typecode, NULL) != 1) {
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("a bytes-like object is required"));
|
2020-07-15 20:59:11 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
const byte *start = haystack_bufinfo.buf;
|
2021-03-15 09:57:36 -04:00
|
|
|
const byte *end = ((const byte *)haystack_bufinfo.buf) + haystack_bufinfo.len;
|
2020-07-15 20:59:11 -04:00
|
|
|
if (n_args >= 3 && args[2] != mp_const_none) {
|
|
|
|
start += mp_get_index(self_type, haystack_bufinfo.len, args[2], true);
|
|
|
|
}
|
|
|
|
if (n_args >= 4 && args[3] != mp_const_none) {
|
2021-03-15 09:57:36 -04:00
|
|
|
end = ((const byte *)haystack_bufinfo.buf) + mp_get_index(self_type, haystack_bufinfo.len, args[3], true);
|
2020-07-15 20:59:11 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
const byte *p = NULL;
|
|
|
|
if (end >= start) {
|
|
|
|
p = find_subbytes(start, end - start, needle_bufinfo.buf, needle_bufinfo.len, direction);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p == NULL) {
|
|
|
|
if (is_index) {
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("substring not found"));
|
2020-07-15 20:59:11 -04:00
|
|
|
} else {
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(-1);
|
|
|
|
}
|
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
return MP_OBJ_NEW_SMALL_INT(p - (const byte *)haystack_bufinfo.buf);
|
2020-07-15 20:59:11 -04:00
|
|
|
}
|
|
|
|
|
2023-10-19 16:42:36 -04:00
|
|
|
// CIRCUITPY-CHANGE: provides find, rfind, index
|
2020-07-15 20:59:11 -04:00
|
|
|
STATIC mp_obj_t buffer_find(size_t n_args, const mp_obj_t *args) {
|
|
|
|
return buffer_finder(n_args, args, 1, false);
|
|
|
|
}
|
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(buffer_find_obj, 2, 4, buffer_find);
|
|
|
|
|
|
|
|
STATIC mp_obj_t buffer_rfind(size_t n_args, const mp_obj_t *args) {
|
|
|
|
return buffer_finder(n_args, args, -1, false);
|
|
|
|
}
|
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(buffer_rfind_obj, 2, 4, buffer_rfind);
|
|
|
|
|
|
|
|
STATIC mp_obj_t buffer_index(size_t n_args, const mp_obj_t *args) {
|
|
|
|
return buffer_finder(n_args, args, 1, true);
|
|
|
|
}
|
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(buffer_index_obj, 2, 4, buffer_index);
|
|
|
|
|
|
|
|
STATIC mp_obj_t buffer_rindex(size_t n_args, const mp_obj_t *args) {
|
|
|
|
return buffer_finder(n_args, args, -1, true);
|
|
|
|
}
|
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(buffer_rindex_obj, 2, 4, buffer_rindex);
|
2020-07-21 16:08:42 -04:00
|
|
|
#endif
|
2020-07-15 20:59:11 -04:00
|
|
|
|
2014-04-17 17:10:53 -04:00
|
|
|
STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
|
2014-04-08 16:32:29 -04:00
|
|
|
if (value == MP_OBJ_NULL) {
|
2014-04-18 17:04:06 -04:00
|
|
|
// delete item
|
|
|
|
// TODO implement
|
2014-04-20 13:58:33 -04:00
|
|
|
// TODO: confirmed that both bytearray and array.array support
|
|
|
|
// slice deletion
|
2014-05-21 14:42:43 -04:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-04-17 17:10:53 -04:00
|
|
|
} else {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_array_t *o = MP_OBJ_TO_PTR(self_in);
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_SLICE
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_type(index_in, &mp_type_slice)) {
|
2014-05-25 14:21:57 -04:00
|
|
|
mp_bound_slice_t slice;
|
|
|
|
if (!mp_seq_get_fast_slice_indexes(o->len, index_in, &slice)) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_NotImplementedError(MP_ERROR_TEXT("only slices with step=1 (aka None) are supported"));
|
2014-04-19 13:06:57 -04:00
|
|
|
}
|
2015-02-27 15:16:05 -05:00
|
|
|
if (value != MP_OBJ_SENTINEL) {
|
|
|
|
#if MICROPY_PY_ARRAY_SLICE_ASSIGN
|
|
|
|
// Assign
|
2017-02-16 00:31:43 -05:00
|
|
|
size_t src_len;
|
2015-04-15 17:48:36 -04:00
|
|
|
void *src_items;
|
2015-06-03 01:07:35 -04:00
|
|
|
size_t item_sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL);
|
2021-07-14 03:14:16 -04:00
|
|
|
if (mp_obj_is_obj(value) && MP_OBJ_TYPE_GET_SLOT_OR_NULL(((mp_obj_base_t *)MP_OBJ_TO_PTR(value))->type, subscr) == array_subscr) {
|
2015-07-20 11:12:26 -04:00
|
|
|
// value is array, bytearray or memoryview
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_array_t *src_slice = MP_OBJ_TO_PTR(value);
|
2015-06-03 01:07:35 -04:00
|
|
|
if (item_sz != mp_binary_get_size('@', src_slice->typecode & TYPECODE_MASK, NULL)) {
|
2015-04-15 17:48:36 -04:00
|
|
|
compat_error:
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("lhs and rhs should be compatible"));
|
2015-04-15 17:48:36 -04:00
|
|
|
}
|
|
|
|
src_len = src_slice->len;
|
|
|
|
src_items = src_slice->items;
|
2015-07-20 11:12:26 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_type(value, &mp_type_memoryview)) {
|
2021-04-20 01:22:44 -04:00
|
|
|
src_items = (uint8_t *)src_items + (src_slice->memview_offset * item_sz);
|
2015-07-20 11:12:26 -04:00
|
|
|
}
|
|
|
|
#endif
|
2021-04-22 20:55:39 -04:00
|
|
|
} else if (mp_obj_is_type(value, &mp_type_bytes)) {
|
2015-04-15 17:48:36 -04:00
|
|
|
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 {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_NotImplementedError(MP_ERROR_TEXT("array/bytes required on right side"));
|
2015-02-27 15:16:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: check src/dst compat
|
2015-04-15 17:48:36 -04:00
|
|
|
mp_int_t len_adj = src_len - (slice.stop - slice.start);
|
2021-03-15 09:57:36 -04:00
|
|
|
uint8_t *dest_items = o->items;
|
2015-06-06 14:14:08 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
|
|
|
if (o->base.type == &mp_type_memoryview) {
|
2018-06-17 23:40:53 -04:00
|
|
|
if (!(o->typecode & MP_OBJ_ARRAY_TYPECODE_FLAG_RW)) {
|
2017-02-27 00:09:57 -05:00
|
|
|
// store to read-only memoryview not allowed
|
|
|
|
return MP_OBJ_NULL;
|
|
|
|
}
|
2015-06-06 14:14:08 -04:00
|
|
|
if (len_adj != 0) {
|
2015-06-03 01:07:35 -04:00
|
|
|
goto compat_error;
|
|
|
|
}
|
2018-09-16 06:41:30 -04:00
|
|
|
dest_items += o->memview_offset * item_sz;
|
2015-06-06 14:14:08 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (len_adj > 0) {
|
2020-03-31 08:19:52 -04:00
|
|
|
if ((size_t)len_adj > o->free) {
|
2015-02-27 15:16:05 -05:00
|
|
|
// TODO: alloc policy; at the moment we go conservative
|
2015-02-27 04:54:12 -05:00
|
|
|
o->items = m_renew(byte, o->items, (o->len + o->free) * item_sz, (o->len + len_adj) * item_sz);
|
2021-04-23 15:26:42 -04:00
|
|
|
o->free = len_adj;
|
2016-03-14 19:12:54 -04:00
|
|
|
dest_items = o->items;
|
2015-02-27 15:16:05 -05:00
|
|
|
}
|
2015-06-06 14:14:08 -04:00
|
|
|
mp_seq_replace_slice_grow_inplace(dest_items, o->len,
|
2015-04-15 17:48:36 -04:00
|
|
|
slice.start, slice.stop, src_items, src_len, len_adj, item_sz);
|
2015-02-27 15:16:05 -05:00
|
|
|
} else {
|
2015-06-06 14:14:08 -04:00
|
|
|
mp_seq_replace_slice_no_grow(dest_items, o->len,
|
|
|
|
slice.start, slice.stop, src_items, src_len, item_sz);
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_NONSTANDARD_TYPECODES
|
2015-06-06 14:14:08 -04:00
|
|
|
// 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);
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2015-06-06 14:14:08 -04:00
|
|
|
// TODO: alloc policy after shrinking
|
2015-02-27 15:16:05 -05:00
|
|
|
}
|
2021-04-23 15:26:42 -04:00
|
|
|
o->free -= len_adj;
|
2015-02-27 15:16:05 -05:00
|
|
|
o->len += len_adj;
|
|
|
|
return mp_const_none;
|
|
|
|
#else
|
|
|
|
return MP_OBJ_NULL; // op not supported
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
mp_obj_array_t *res;
|
2015-05-10 07:04:38 -04:00
|
|
|
size_t sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL);
|
2014-04-19 13:06:57 -04:00
|
|
|
assert(sz > 0);
|
2014-10-23 08:34:35 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
2021-04-22 20:55:39 -04:00
|
|
|
if (o->base.type == &mp_type_memoryview) {
|
2022-08-07 02:24:37 -04:00
|
|
|
if (slice.start > memview_offset_max) {
|
|
|
|
mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("memoryview offset too large"));
|
|
|
|
}
|
2014-10-23 08:34:35 -04:00
|
|
|
res = m_new_obj(mp_obj_array_t);
|
|
|
|
*res = *o;
|
2018-09-16 06:41:30 -04:00
|
|
|
res->memview_offset += slice.start;
|
2014-10-23 08:34:35 -04:00
|
|
|
res->len = slice.stop - slice.start;
|
2021-04-22 20:55:39 -04:00
|
|
|
} else
|
2014-10-23 08:34:35 -04:00
|
|
|
#endif
|
2021-04-22 20:55:39 -04:00
|
|
|
{
|
2014-10-23 08:34:35 -04:00
|
|
|
res = array_new(o->typecode, slice.stop - slice.start);
|
2021-03-15 09:57:36 -04:00
|
|
|
memcpy(res->items, (uint8_t *)o->items + slice.start * sz, (slice.stop - slice.start) * sz);
|
2014-10-23 08:34:35 -04:00
|
|
|
}
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(res);
|
2021-04-22 20:55:39 -04:00
|
|
|
} else
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2021-04-22 20:55:39 -04:00
|
|
|
{
|
2017-03-23 01:17:40 -04:00
|
|
|
size_t index = mp_get_index(o->base.type, o->len, index_in, false);
|
2014-10-26 09:20:50 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
|
|
|
if (o->base.type == &mp_type_memoryview) {
|
2018-09-16 06:41:30 -04:00
|
|
|
index += o->memview_offset;
|
2018-06-17 23:40:53 -04:00
|
|
|
if (value != MP_OBJ_SENTINEL && !(o->typecode & MP_OBJ_ARRAY_TYPECODE_FLAG_RW)) {
|
2014-10-26 09:20:50 -04:00
|
|
|
// store to read-only memoryview
|
|
|
|
return MP_OBJ_NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2014-04-19 13:06:57 -04:00
|
|
|
if (value == MP_OBJ_SENTINEL) {
|
|
|
|
// load
|
2014-10-26 09:20:50 -04:00
|
|
|
return mp_binary_get_val_array(o->typecode & TYPECODE_MASK, o->items, index);
|
2014-04-19 13:06:57 -04:00
|
|
|
} else {
|
|
|
|
// store
|
2014-10-26 09:20:50 -04:00
|
|
|
mp_binary_set_val_array(o->typecode & TYPECODE_MASK, o->items, index, value);
|
2014-04-19 13:06:57 -04:00
|
|
|
return mp_const_none;
|
|
|
|
}
|
2014-04-17 17:10:53 -04:00
|
|
|
}
|
2014-04-08 16:32:29 -04:00
|
|
|
}
|
2014-01-18 12:24:47 -05:00
|
|
|
}
|
|
|
|
|
2014-08-30 09:28:06 -04:00
|
|
|
STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_array_t *o = MP_OBJ_TO_PTR(o_in);
|
2015-05-10 07:04:38 -04:00
|
|
|
size_t sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL);
|
2014-10-26 09:20:50 -04:00
|
|
|
bufinfo->buf = o->items;
|
|
|
|
bufinfo->len = o->len * sz;
|
|
|
|
bufinfo->typecode = o->typecode & TYPECODE_MASK;
|
2014-10-23 08:34:35 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
2014-10-26 09:20:50 -04:00
|
|
|
if (o->base.type == &mp_type_memoryview) {
|
2018-06-17 23:40:53 -04:00
|
|
|
if (!(o->typecode & MP_OBJ_ARRAY_TYPECODE_FLAG_RW) && (flags & MP_BUFFER_WRITE)) {
|
2014-10-26 09:20:50 -04:00
|
|
|
// read-only memoryview
|
|
|
|
return 1;
|
|
|
|
}
|
2021-04-20 01:22:44 -04:00
|
|
|
bufinfo->buf = (uint8_t *)bufinfo->buf + (size_t)o->memview_offset * sz;
|
2014-10-23 08:34:35 -04:00
|
|
|
}
|
2015-09-04 11:53:46 -04:00
|
|
|
#else
|
|
|
|
(void)flags;
|
2014-10-23 08:34:35 -04:00
|
|
|
#endif
|
2014-01-18 12:24:47 -05:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-05-15 00:16:26 -04:00
|
|
|
|
2023-10-19 16:42:36 -04:00
|
|
|
// CIRCUITPY-CHANGE
|
2020-05-15 17:32:44 -04:00
|
|
|
#if MICROPY_CPYTHON_COMPAT && MICROPY_PY_BUILTINS_BYTEARRAY
|
2020-05-15 00:16:26 -04:00
|
|
|
// Directly lifted from objstr.c
|
|
|
|
STATIC mp_obj_t array_decode(size_t n_args, const mp_obj_t *args) {
|
|
|
|
mp_obj_t new_args[2];
|
|
|
|
if (n_args == 1) {
|
|
|
|
new_args[0] = args[0];
|
|
|
|
new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
|
|
|
|
args = new_args;
|
|
|
|
n_args++;
|
|
|
|
}
|
Merge tag 'v1.17' into merge-1.17
F-strings, new machine.I2S class, ESP32-C3 support and LEGO_HUB_NO6 board
This release of MicroPython adds support for f-strings (PEP-498), with a
few limitations compared to normal Python. F-strings are essentially
syntactic sugar for "".format() and make formatting strings a lot more
convenient. Other improvements to the core runtime include pretty printing
OSError when it has two arguments (an errno code and a string), scheduling
of KeyboardInterrupt on the main thread, and support for a single argument
to the optimised form of StopIteration.
In the machine module a new I2S class has been added, with support for
esp32 and stm32 ports. This provides a consistent API for transmit and
receive of audio data in blocking, non-blocking and asyncio-based
operation. Also, the json module has support for the "separators" argument
in the dump and dumps functions, and framebuf now includes a way to blit
between frame buffers of different formats using a palette. A new,
portable machine.bitstream function is also added which can output a stream
of bits with configurable timing, and is used as the basis for driving
WS2812 LEDs in a common way across ports.
There has been some restructuring of the repository directory layout, with
all third-party code now in the lib/ directory. And a new top-level
directory shared/ has been added with first-party code that was previously
in lib/ moved there.
The docs have seen further improvement with enhancements and additions to
the rp2 parts, as well as a new quick reference for the zephyr port.
The terms master/slave have been replaced with controller/peripheral,
mainly relating to I2C and SPI usage. And u-module references have been
replaced with just the module name without the u-prefix to help clear up
the intended usage of modules in MicroPython.
For the esp8266 and esp32 ports, hidden networks are now included in WLAN
scan results. On the esp32 the RMT class is enhanced with idle_level and
write_pulses modes. There is initial support for ESP32-C3 chips with
GENERIC_C3 and GENERIC_C3_USB boards.
The javascript port has had its Makefile and garbage collector
implementation reworked so it compiles and runs with latest the Emscripten
using asyncify.
The mimxrt port sees the addition of hardware I2C and SPI support, as well
as some additional methods to the machine module. There is also support
for Hyperflash chips.
The nrf port now has full VFS storage support, enables source-line on
traceback, and has .mpy features consistent with other ports.
For the rp2 port there is now more configurability for boards, and more
boards added.
The stm32 port has a new LEGO_HUB_NO6 board definition with detailed
information how to get this LEGO Hub running stock MicroPython. There is
also now support to change the CPU frequency on STM32WB MCUs. And USBD_xxx
descriptor options have been renamed to MICROPY_HW_USB_xxx.
Thanks to everyone who contributed to this release: Amir Gonnen, Andrew
Scheller, Bryan Tong Minh, Chris Wilson, Damien George, Daniel Mizyrycki,
David Lechner, David P, Fernando, finefoot, Frank Pilhofer, Glenn Ruben
Bakke, iabdalkader, Jeff Epler, Jim Mussared, Jonathan Hogg, Josh Klar,
Josh Lloyd, Julia Hathaway, Krzysztof Adamski, Matúš Olekšák, Michael
Weiss, Michel Bouwmans, Mike Causer, Mike Teachman, Ned Konz, NitiKaur,
oclyke, Patrick Van Oosterwijck, Peter Hinch, Peter Züger, Philipp
Ebensberger, robert-hh, Roberto Colistete Jr, Sashkoiv, Seon Rozenblum,
Tobias Thyrrestrup, Tom McDermott, Will Sowerbutts, Yonatan Goldschmidt.
What follows is a detailed list of changes, generated from the git commit
history, and organised into sections.
Main components
===============
all:
- fix signed shifts and NULL access errors from -fsanitize=undefined
- update to point to files in new shared/ directory
py core:
- mpstate: make exceptions thread-local
- mpstate: schedule KeyboardInterrupt on main thread
- mperrno: add MP_ECANCELED error code
- makeqstrdefs.py: don't include .h files explicitly in preprocessing
- mark unused arguments from bytecode decoding macros
- objexcept: pretty print OSError also when it has 2 arguments
- makeversionhdr: add --tags arg to git describe
- vm: simplify handling of MP_OBJ_STOP_ITERATION in yield-from opcode
- objexcept: make mp_obj_exception_get_value support subclassed excs
- support single argument to optimised MP_OBJ_STOP_ITERATION
- introduce and use mp_raise_type_arg helper
- modsys: optimise sys.exit for code size by using exception helpers
- objexcept: make mp_obj_new_exception_arg1 inline
- obj: fix formatting of comment for mp_obj_is_integer
- emitnative: reuse need_reg_all func in need_stack_settled
- emitnative: ensure stack settling is safe mid-branch
- runtime: fix bool unary op for subclasses of native types
- builtinimport: fix condition for including do_execute_raw_code()
- mkrules: automatically build mpy-cross if it doesn't exist
- implement partial PEP-498 (f-string) support
- lexer: clear fstring_args vstr on lexer free
- mkrules.mk: do submodule sync in "make submodules"
extmod:
- btstack: add missing call to mp_bluetooth_hci_uart_deinit
- btstack: check that BLE is active before performing operations
- uasyncio: get addr and bind server socket before creating task
- axtls-include: add axtls_os_port.h to customise axTLS
- update for move of crypto-algorithms, re1.5, uzlib to lib
- moduselect: conditionally compile select()
- nimble: fix leak in l2cap_send if send-while-stalled
- btstack/btstack.mk: use -Wno-implicit-fallthrough, not =0
- utime: always invoke mp_hal_delay_ms when >= to 0ms
- modbluetooth: clamp MTU values to 32->UINT16_MAX
- nimble: allow modbluetooth binding to hook "sent HCI packet"
- nimble: add "memory stalling" mechanism for l2cap_send
- uasyncio: in open_connection use address info in socket creation
- modujson: add support for dump/dumps separators keyword-argument
- modlwip: fix close and clean up of UDP and raw sockets
- modbluetooth: add send_update arg to gatts_write
- add machine.bitstream
- modframebuf: enable blit between different formats via a palette
lib:
- tinyusb: update to version 0.10.1
- pico-sdk: update to version 1.2.0
- utils/stdout_helpers: make mp_hal_stdout_tx_strn_cooked efficient
- axtls: switch to repo at micropython/axtls
- axtls: update to latest axtls 2.1.5 wih additional commits
- re1.5: move re1.5 code from extmod to lib
- uzlib: move uzlib code from extmod to lib
- crypto-algorithms: move crypto-algorithms code from extmod to lib
- update README's based on contents of these dirs
drivers:
- neopixel: add common machine.bitstream-based neopixel module
- neopixel: optimize fill() for speed
- neopixel: reduce code size of driver
- cyw43: fix cyw43_deinit so it can be called many times in a row
- cyw43: make wifi join fail if interface is not active
mpy-cross:
- disable stack check when building with Emscripten
Support components
==================
docs:
- library: document new esp32.RMT features and fix wait_done
- library: warn that ustruct doesn't handle spaces in format strings
- esp8266/tutorial: change flash mode from dio to dout
- replace master/slave with controller/peripheral in I2C and SPI
- rp2: enhance quickref and change image to Pico pinout
- rp2: update general section to give a brief technical overview
- library/utime.rst: clarify behaviour and precision of sleep ms/us
- library/uasyncio.rst: document stream readexactly() method
- library/machine.I2S.rst: fix use of sd pin in examples
- zephyr: add quick reference for the Zephyr port
- library/zephyr: add libraries specific to the Zephyr port
- templates: add unix and zephyr quickref links to top-index
- rename ufoo.rst to foo.rst
- replace ufoo with foo in all docs
- library/index.rst: clarify module naming and purpose
- library/builtins.rst: add module title
- library/network.rst: simplify socket import
- add docs for machine.bitstream and neopixel module
- library: fix usage of :term: for frozen module reference
- esp8266: use monospace for software tools
- reference: mention that slicing a memoryview causes allocation
examples: no changes specific to this component/port
tests:
- extmod: make uasyncio_heaplock test more deterministic
- cpydiff/modules_struct_whitespace_in_format: run black
- extmod/ujson: add tests for dump/dumps separators argument
- run-multitests.py: add broadcast and wait facility
- multi_bluetooth/ble_subscribe.py: add test for subscription
- extmod/vfs_fat_finaliser.py: ensure alloc at never-used GC blocks
- basics: split f-string debug printing to separate file with .exp
- pybnative: make while.py test run on boards without pyb.delay
tools:
- autobuild: add scripts to build release firmware
- remove obsolete build-stm-latest.sh script
- ci.sh: run apt-get update in ci_powerpc_setup
- makemanifest.py: allow passing flags to mpy-tool.py
- autobuild: add mimxrt port to build scripts for nightly builds
- pyboard.py: add cmd-line option to make soft reset configurable
- mpremote: swap order of PID and VID in connect-list output
- ci.sh: build unix dev variant as part of macOS CI
- ci.sh: build GENERIC_C3 board as part of esp32 CI
- autobuild: use separate IDF version to build newer esp32 SoCs
- autobuild: add FeatherS2 and TinyS2 to esp32 auto builds
- mpremote: add seek whence for mounted files
- mpremote: raise OSError on unsupported RemoteFile.seek
- autobuild: add the MIMXRT1050_EVKB board to the daily builds
- ci.sh: add mpy-cross build to nrf port
- codeformat.py: include ports/nrf/modules/nrf in code formatting
- gen-cpydiff.py: don't rename foo to ufoo in diff output
- autobuild: add auto build for Silicognition wESP32
- mpremote: fix connect-list in case VID/PID are None
- mpremote: add "devs" shortcut for "connect list"
- mpremote: remove support for pyb.USB_VCP in/out specialisation
- autobuild: don't use "-B" for make, it's already a fresh build
- pyboard.py: move --no-exclusive/--soft-reset out of mutex group
- pyboard.py: make --no-follow use same variable as --follow
- pyboard.py: add --exclusive to match --no-exclusive
- pyboard.py: make --no-soft-reset consistent with other args
- uncrustify: force 1 newline at end of file
- mpremote: bump version to 0.0.6
CI:
- workflows: add workflow to build and test javascript port
- workflows: switch from Coveralls to Codecov
- workflows: switch from lcov to gcov
- workflows: add workflow to build and test unix dev variant
The ports
=========
all ports:
- use common mp_hal_stdout_tx_strn_cooked instead of custom one
- update for move of crypto-algorithms, uzlib to lib
- rename USBD_VID/PID config macros to MICROPY_HW_USB_VID/PID
bare-arm port: no changes specific to this component/port
cc3200 port: no changes specific to this component/port
esp8266 port:
- add __len__ to NeoPixel driver to support iterating
- Makefile: add more libm files to build
- include hidden networks in WLAN.scan results
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
esp32 port:
- boards/sdkconfig.base: disable MEMPROT_FEATURE to alloc from IRAM
- add __len__ to NeoPixel driver to support iterating
- main: allow MICROPY_DIR to be overridden
- esp32_rmt: fix RMT looping in newer IDF versions
- esp32_rmt: enhance RMT with idle_level and write_pulses modes
- add new machine.I2S class for I2S protocol support
- machine_spi: calculate actual attained baudrate
- machine_hw_spi: use a 2 item SPI queue for long transfers
- machine_dac: add MICROPY_PY_MACHINE_DAC option, enable by default
- machine_i2s: add MICROPY_PY_MACHINE_I2S option, enable by default
- fix use of mp_int_t, size_t and uintptr_t
- add initial support for ESP32C3 SoCs
- boards/GENERIC_C3: add generic C3-based board
- modmachine: release the GIL in machine.idle()
- mphalport: always yield at least once in delay_ms
- machine_uart: add flow kw-arg to enable hardware flow control
- boards: add Silicognition wESP32 board configuration
- mpconfigport.h: enable reverse and inplace special methods
- include hidden networks in WLAN.scan results
- makeimg.py: get bootloader and partition offset from sdkconfig
- enable MICROPY_PY_FSTRINGS by default
- machine_hw_spi: release GIL during transfers
- machine_pin: make check for non-output pins respect chip variant
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
- boards: add GENERIC_C3_USB board with USB serial/JTAG support
javascript port:
- rework Makefile and GC so it works with latest Emscripten
- Makefile: suppress compiler errors from array bounds
- Makefile: change variable to EXPORTED_RUNTIME_METHODS
mimxrt port:
- move calc_weekday helper function to timeutils
- machine_spi: add the SPI class to the machine module
- moduos: seed the PRNG on boot using the TRNG
- boards: set vfs partition start to 1 MBbyte
- main: skip running main.py if boot.py failed
- main: extend the information returned by help()
- mimxrt_flash: remove commented-out code
- modmachine: add a few minor methods to the machine module
- machine_led: use mp_raise_msg_varg helper
- machine_i2c: add hardware-based machine.I2C to machine module
- add support for Hyperflash chips
- boards: add support for the MIMXRT1050_EVKB board
- machine_pin: implement ioctl for Pin
minimal port:
- Makefile: add support for building with user C modules
nrf port:
- modules: replace master/slave with controller/peripheral in SPI
- boards/common.ld: calculate unused flash region
- modules/nrf: add new nrf module with flash block device
- drivers: add support for using flash block device with SoftDevice
- mpconfigport.h: expose nrf module when MICROPY_PY_NRF is set
- README: update README.md to reflect internal file systems
- mpconfigport.h: tune FAT FS configuration
- Makefile: add _fs_size linker script override from make
- modules/uos: allow a board to configure MICROPY_VFS_FAT/LFS1/LFS2
- mpconfigport.h: enable MICROPY_PY_IO_FILEIO when an FS is enabled
- qstrdefsport.h: add entries for in-built FS mount points
- main: add auto mount and auto format hook for internal flash FS
- boards: enable needed features for FAT/LFS1/LFS2
- facilitate use of freeze manifest
- boards: set FROZEN_MANIFEST blank when SD present on nrf51 targets
- modules/scripts: add file system formatting script
- Makefile: set default manifest file for all targets
- mphalport: add dummy function for mp_hal_time_ns()
- boards: enable MICROPY_VFS_LFS2 for all target boards
- modules/uos: add ilistdir to uos module
- modules/nrf: add function to enable/disable DCDC
- enable source line on tracebacks
- set .mpy features consistent with documentation and other ports
pic16bit port: no changes specific to this component/port
powerpc port: no changes specific to this component/port
qemu-arm port: no changes specific to this component/port
rp2 port:
- use 0=Monday datetime convention in RTC
- machine_rtc: in RTC.datetime, compute weekday automatically
- CMakeLists.txt: suppress compiler errors for pico-sdk and tinyusb
- tusb_config.h: set CFG_TUD_CDC_EP_BUFSIZE to 256
- machine_uart: add hardware flow control support
- machine_uart: allow overriding default machine UART pins
- machine_i2c: allow boards to configure I2C pins using new macros
- machine_spi: allow boards to configure SPI pins using new macros
- machine_uart: fix poll ioctl to also check hardware FIFO
- machine_uart: fix read when FIFO has chars but ringbuf doesn't
- tusb_port: allow boards to configure USB VID and PID
- boards/ADAFRUIT_FEATHER_RP2040: configure custom VID/PID
- boards/ADAFRUIT_FEATHER_RP2040: configure I2C/SPI default pins
- boards/SPARKFUN_PROMICRO: configure UART/I2C/SPI default pins
- boards/SPARKFUN_THINGPLUS: configure I2C/SPI default pins
- boards: add Adafruit ItsyBitsy RP2040
- boards: add Adafruit QT Py RP2040
- boards: add Pimoroni Pico LiPo 4MB
- boards: add Pimoroni Pico LiPo 16MB
- boards: add Pimoroni Tiny 2040
- CMakeLists.txt: allow a board's cmake to set the manifest path
- enable MICROPY_PY_FSTRINGS by default
- Makefile: add "submodules" target, to match other ports
- rp2_flash: disable IRQs while calling flash_erase/program
- CMakeLists.txt: add option to enable double tap reset to bootrom
- mpconfigport.h: allow boards to add root pointers
samd port:
- add support for building with user C modules
stm32 port:
- softtimer: add soft_timer_reinsert() helper function
- mpbthciport: change from systick to soft-timer for BT scheduling
- provide a custom BTstack runloop that integrates with soft timer
- usb: make irq's default trigger enable all events
- boardctrl: skip running main.py if boot.py had an error
- sdio: fix undefined reference to DMA stream on H7
- dma: add DMAMUX configuration for H7 to fix dma_nohal_init
- main: call mp_deinit() at end of main
- adc: allow using ADC12 and ADC3 for H7
- adc: define the ADC instance used for internal channels
- adc: simplify and generalise how pin_adcX table is defined
- add new machine.I2S class for I2S protocol support
- boards/NUCLEO_F446RE: fix I2C1 pin assignment to match datasheet
- replace master/slave with controller/peripheral in I2C and SPI
- systick: always POLL_HOOK when delaying for milliseconds
- sdram: make SDRAM test cache aware, and optional failure with msg
- boards/NUCLEO_F446RE: enable CAN bus support
- boards: add support for SparkFun STM32 MicroMod Processor board
- uart: fix LPUART1 baudrate set/get
- uart: support low baudrates on LPUART1
- boards/STM32F429DISC: set correct UART2 pins and add UART3/6
- boards/NUCLEO_F439ZI: add board definition for NUCLEO_F439ZI
- boards/LEGO_HUB_NO6: add board definition for LEGO_HUB_NO6
- Makefile: update to only pull in used Bluetooth library
- README.md: update supported MCUs, and submodule and mboot use
- usbd_desc: rename USBD_xxx descriptor opts to MICROPY_HW_USB_xxx
- usbd_cdc_interface: rename USBD_CDC_xx opts to MICROPY_HW_USB_xx
- powerctrl: support changing frequency on WB MCUs
- boards/NUCLEO_H743ZI2: add modified version of NUCLEO_H743ZI
- mbedtls: fix compile warning about uninitialized val
- enable MICROPY_PY_FSTRINGS by default
- add implementation of machine.bitstream
- Makefile: allow GIT_SUBMODULES and LIBS to be extended
- stm32_it: support TIM17 IRQs on WB MCUs
- disable computed goto on constrained boards
- storage: make extended-block-device more configurable
- boards/LEGO_HUB_NO6: change SPI flash storage to use hardware SPI
- boards/LEGO_HUB_NO6: skip first 1MiB of SPI flash for storage
- boards/LEGO_HUB_NO6: add make commands to backup/restore firmware
teensy port: no changes specific to this component/port
unix port:
- modffi: add option to lock GC in callback, and cfun access
- Makefile: add back LIB_SRC_C to list of object files
- variants: enable help and help("modules") on standard and dev
- Makefile: disable error compression on arm-linux-gnueabi-gcc
windows port:
- Makefile: add .exe extension to executables name
- appveyor: update to VS 2017 and use Python 3.8 for build/test
zephyr port:
- machine_spi: add support for hardware SPI
2021-10-14 15:38:41 -04:00
|
|
|
return mp_obj_str_make_new(&mp_type_str, n_args, 0, args);
|
2020-05-15 00:16:26 -04:00
|
|
|
}
|
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(array_decode_obj, 1, 3, array_decode);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2020-05-15 17:32:44 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY
|
|
|
|
STATIC const mp_rom_map_elem_t bytearray_locals_dict_table[] = {
|
2023-09-20 12:46:51 -04:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_append), MP_ROM_PTR(&mp_obj_array_append_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_extend), MP_ROM_PTR(&mp_obj_array_extend_obj) },
|
2020-07-15 20:59:11 -04:00
|
|
|
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_CPYTHON_COMPAT
|
2020-07-21 18:40:51 -04:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_find), MP_ROM_PTR(&buffer_find_obj) },
|
2020-07-15 20:59:11 -04:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_rfind), MP_ROM_PTR(&buffer_rfind_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_index), MP_ROM_PTR(&buffer_index_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_rindex), MP_ROM_PTR(&buffer_rindex_obj) },
|
|
|
|
|
2020-05-15 00:16:26 -04:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_decode), MP_ROM_PTR(&array_decode_obj) },
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2014-01-18 12:24:47 -05:00
|
|
|
};
|
|
|
|
|
2023-09-20 12:22:34 -04:00
|
|
|
MP_DEFINE_CONST_DICT(bytearray_locals_dict, bytearray_locals_dict_table);
|
2014-10-23 08:34:35 -04:00
|
|
|
#endif
|
2014-03-26 17:47:19 -04:00
|
|
|
|
2020-05-15 17:32:44 -04:00
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
#if MICROPY_PY_ARRAY
|
2021-07-14 00:38:38 -04:00
|
|
|
MP_DEFINE_CONST_OBJ_TYPE(
|
|
|
|
mp_type_array,
|
|
|
|
MP_QSTR_array,
|
2022-09-16 09:57:38 -04:00
|
|
|
MP_TYPE_FLAG_ITER_IS_GETITER,
|
2022-09-16 10:31:23 -04:00
|
|
|
make_new, array_make_new,
|
2021-07-14 00:38:38 -04:00
|
|
|
print, array_print,
|
2022-09-16 09:57:38 -04:00
|
|
|
iter, array_iterator_new,
|
2021-07-14 00:38:38 -04:00
|
|
|
unary_op, array_unary_op,
|
|
|
|
binary_op, array_binary_op,
|
|
|
|
subscr, array_subscr,
|
|
|
|
buffer, array_get_buffer,
|
2022-06-24 02:27:46 -04:00
|
|
|
locals_dict, &mp_obj_array_locals_dict
|
2021-07-14 00:38:38 -04:00
|
|
|
);
|
2014-10-23 08:34:35 -04:00
|
|
|
#endif
|
2014-01-18 12:24:47 -05:00
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY
|
2021-07-14 00:38:38 -04:00
|
|
|
MP_DEFINE_CONST_OBJ_TYPE(
|
|
|
|
mp_type_bytearray,
|
|
|
|
MP_QSTR_bytearray,
|
2022-09-16 09:57:38 -04:00
|
|
|
MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_ITER_IS_GETITER,
|
2022-09-16 10:31:23 -04:00
|
|
|
make_new, bytearray_make_new,
|
2021-07-14 00:38:38 -04:00
|
|
|
print, array_print,
|
2022-09-16 09:57:38 -04:00
|
|
|
iter, array_iterator_new,
|
2021-07-14 00:38:38 -04:00
|
|
|
unary_op, array_unary_op,
|
|
|
|
binary_op, array_binary_op,
|
|
|
|
subscr, array_subscr,
|
|
|
|
buffer, array_get_buffer,
|
2022-06-24 02:27:46 -04:00
|
|
|
locals_dict, &mp_obj_bytearray_locals_dict
|
2021-07-14 00:38:38 -04:00
|
|
|
);
|
2014-10-23 08:34:35 -04:00
|
|
|
#endif
|
2014-04-08 15:09:14 -04:00
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
2022-06-24 02:22:38 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
|
|
|
|
#define MEMORYVIEW_TYPE_ATTR attr, memoryview_attr,
|
|
|
|
#else
|
|
|
|
#define MEMORYVIEW_TYPE_ATTR
|
2021-02-20 11:35:27 -05:00
|
|
|
#endif
|
|
|
|
|
2023-10-19 16:42:36 -04:00
|
|
|
#if MICROPY_CPYTHON_COMPAT
|
|
|
|
// CIRCUITPY-CHANGE: provides cast
|
2023-09-22 14:54:20 -04:00
|
|
|
STATIC const mp_rom_map_elem_t memoryview_locals_dict_table[] = {
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_cast), MP_ROM_PTR(&memoryview_cast_obj) },
|
|
|
|
#if MICROPY_PY_BUILTINS_BYTES_HEX
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_hex), MP_ROM_PTR(&mp_obj_bytes_hex_as_str_obj) },
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
MP_DEFINE_CONST_DICT(memoryview_locals_dict, memoryview_locals_dict_table);
|
|
|
|
#define MEMORYVIEW_TYPE_LOCALS_DICT locals_dict, &memoryview_locals_dict,
|
|
|
|
#elif MICROPY_PY_BUILTINS_BYTES_HEX
|
2022-06-24 02:27:46 -04:00
|
|
|
#define MEMORYVIEW_TYPE_LOCALS_DICT locals_dict, &mp_obj_memoryview_locals_dict,
|
2022-06-24 02:22:38 -04:00
|
|
|
#else
|
|
|
|
#define MEMORYVIEW_TYPE_LOCALS_DICT
|
2014-10-23 08:34:35 -04:00
|
|
|
#endif
|
2014-01-18 12:24:47 -05:00
|
|
|
|
2021-07-14 00:38:38 -04:00
|
|
|
MP_DEFINE_CONST_OBJ_TYPE(
|
|
|
|
mp_type_memoryview,
|
|
|
|
MP_QSTR_memoryview,
|
2022-09-16 09:57:38 -04:00
|
|
|
MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_ITER_IS_GETITER,
|
2022-09-16 10:31:23 -04:00
|
|
|
make_new, memoryview_make_new,
|
2022-09-16 09:57:38 -04:00
|
|
|
iter, array_iterator_new,
|
2021-07-14 00:38:38 -04:00
|
|
|
unary_op, array_unary_op,
|
|
|
|
binary_op, array_binary_op,
|
2022-06-24 02:22:38 -04:00
|
|
|
MEMORYVIEW_TYPE_LOCALS_DICT
|
|
|
|
MEMORYVIEW_TYPE_ATTR
|
|
|
|
subscr, array_subscr,
|
|
|
|
buffer, array_get_buffer
|
2021-07-14 00:38:38 -04:00
|
|
|
);
|
2022-06-24 02:22:38 -04:00
|
|
|
#endif // MICROPY_PY_BUILTINS_MEMORYVIEW
|
2014-01-18 12:24:47 -05:00
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
/* unused
|
2017-02-16 00:31:43 -05:00
|
|
|
size_t mp_obj_array_len(mp_obj_t self_in) {
|
2014-01-21 16:30:10 -05:00
|
|
|
return ((mp_obj_array_t *)self_in)->len;
|
|
|
|
}
|
2014-10-23 08:34:35 -04:00
|
|
|
*/
|
2014-01-21 16:30:10 -05:00
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY
|
2022-08-10 00:13:17 -04:00
|
|
|
mp_obj_t mp_obj_new_bytearray(size_t n, const void *items) {
|
2014-01-18 12:24:47 -05:00
|
|
|
mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, n);
|
|
|
|
memcpy(o->items, items, n);
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-01-18 12:24:47 -05:00
|
|
|
}
|
2014-01-21 16:45:19 -05:00
|
|
|
|
2023-10-19 16:42:36 -04:00
|
|
|
// CIRCUITPY-CHANGE
|
2018-12-30 22:31:51 -05:00
|
|
|
mp_obj_t mp_obj_new_bytearray_of_zeros(size_t n) {
|
|
|
|
mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, n);
|
|
|
|
memset(o->items, 0, n);
|
|
|
|
return MP_OBJ_FROM_PTR(o);
|
|
|
|
}
|
|
|
|
|
2014-01-28 17:21:41 -05:00
|
|
|
// Create bytearray which references specified memory area
|
2017-02-16 00:31:43 -05:00
|
|
|
mp_obj_t mp_obj_new_bytearray_by_ref(size_t n, void *items) {
|
2022-04-22 03:09:15 -04:00
|
|
|
mp_obj_array_t *o = mp_obj_malloc(mp_obj_array_t, &mp_type_bytearray);
|
2014-01-28 17:21:41 -05:00
|
|
|
o->typecode = BYTEARRAY_TYPECODE;
|
|
|
|
o->free = 0;
|
|
|
|
o->len = n;
|
|
|
|
o->items = items;
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-01-28 17:21:41 -05:00
|
|
|
}
|
2014-10-23 08:34:35 -04:00
|
|
|
#endif
|
2014-01-28 17:21:41 -05:00
|
|
|
|
2014-01-21 16:45:19 -05:00
|
|
|
/******************************************************************************/
|
2014-10-23 08:34:35 -04:00
|
|
|
// array iterator
|
2014-01-21 16:45:19 -05:00
|
|
|
|
|
|
|
typedef struct _mp_obj_array_it_t {
|
|
|
|
mp_obj_base_t base;
|
|
|
|
mp_obj_array_t *array;
|
2017-02-16 00:31:43 -05:00
|
|
|
size_t offset;
|
|
|
|
size_t cur;
|
2014-01-21 16:45:19 -05:00
|
|
|
} mp_obj_array_it_t;
|
|
|
|
|
2014-03-25 10:18:18 -04:00
|
|
|
STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_array_it_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-01-21 16:45:19 -05:00
|
|
|
if (self->cur < self->array->len) {
|
2014-10-26 09:20:50 -04:00
|
|
|
return mp_binary_get_val_array(self->array->typecode & TYPECODE_MASK, self->array->items, self->offset + self->cur++);
|
2014-01-21 16:45:19 -05:00
|
|
|
} else {
|
2014-04-17 18:19:36 -04:00
|
|
|
return MP_OBJ_STOP_ITERATION;
|
2014-01-21 16:45:19 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-07-14 00:38:38 -04:00
|
|
|
STATIC MP_DEFINE_CONST_OBJ_TYPE(
|
|
|
|
mp_type_array_it,
|
|
|
|
MP_QSTR_iterator,
|
2022-09-16 09:57:38 -04:00
|
|
|
MP_TYPE_FLAG_ITER_IS_ITERNEXT,
|
|
|
|
iter, array_it_iternext
|
2021-07-14 00:38:38 -04:00
|
|
|
);
|
2014-01-21 16:45:19 -05:00
|
|
|
|
2016-01-09 18:14:54 -05:00
|
|
|
STATIC mp_obj_t array_iterator_new(mp_obj_t array_in, mp_obj_iter_buf_t *iter_buf) {
|
|
|
|
assert(sizeof(mp_obj_array_t) <= sizeof(mp_obj_iter_buf_t));
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_array_t *array = MP_OBJ_TO_PTR(array_in);
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_array_it_t *o = (mp_obj_array_it_t *)iter_buf;
|
2021-03-25 22:48:34 -04:00
|
|
|
o->base.type = &mp_type_array_it;
|
2014-01-21 16:45:19 -05:00
|
|
|
o->array = array;
|
2016-01-09 18:14:54 -05:00
|
|
|
o->offset = 0;
|
|
|
|
o->cur = 0;
|
2014-10-26 09:20:50 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
|
|
|
if (array->base.type == &mp_type_memoryview) {
|
2018-09-16 06:41:30 -04:00
|
|
|
o->offset = array->memview_offset;
|
2014-10-26 09:20:50 -04:00
|
|
|
}
|
|
|
|
#endif
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-01-21 16:45:19 -05:00
|
|
|
}
|
2014-06-27 13:39:09 -04:00
|
|
|
|
2014-10-23 08:34:35 -04:00
|
|
|
#endif // MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_BUILTINS_MEMORYVIEW
|