f7f56d4285
This commit adds the bytes methods to bytearray, matching CPython. The existing implementations of these methods for str/bytes are reused for bytearray with minor updates to match CPython return types. For details on the CPython behaviour see https://docs.python.org/3/library/stdtypes.html#bytes-and-bytearray-operations The work to merge locals tables for str/bytes/bytearray/array was done by @jimmo. Because of this merging of locals the change in code size for this commit is mostly negative: bare-arm: +0 +0.000% minimal x86: +29 +0.018% unix x64: -792 -0.128% standard[incl -448(data)] unix nanbox: -436 -0.078% nanbox[incl -448(data)] stm32: -40 -0.010% PYBV10 cc3200: -32 -0.017% esp8266: -28 -0.004% GENERIC esp32: -72 -0.005% GENERIC[incl -200(data)] mimxrt: -40 -0.011% TEENSY40 renesas-ra: -40 -0.006% RA6M2_EK nrf: -16 -0.009% pca10040 rp2: -64 -0.013% PICO samd: +148 +0.105% ADAFRUIT_ITSYBITSY_M4_EXPRESS
68 lines
2.7 KiB
C
68 lines
2.7 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
* Copyright (c) 2014 Paul Sokolovsky
|
|
*
|
|
* 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.
|
|
*/
|
|
#ifndef MICROPY_INCLUDED_PY_OBJARRAY_H
|
|
#define MICROPY_INCLUDED_PY_OBJARRAY_H
|
|
|
|
#include "py/obj.h"
|
|
|
|
// Used only for memoryview types, set in "typecode" to indicate a writable memoryview
|
|
#define MP_OBJ_ARRAY_TYPECODE_FLAG_RW (0x80)
|
|
|
|
// This structure is used for all of bytearray, array.array, memoryview
|
|
// objects. Note that memoryview has different meaning for some fields,
|
|
// see comment at the beginning of objarray.c.
|
|
typedef struct _mp_obj_array_t {
|
|
mp_obj_base_t base;
|
|
size_t typecode : 8;
|
|
// free is number of unused elements after len used elements
|
|
// alloc size = len + free
|
|
// But for memoryview, 'free' is reused as offset (in elements) into the
|
|
// parent object. (Union is not used to not go into a complication of
|
|
// union-of-bitfields with different toolchains). See comments in
|
|
// objarray.c.
|
|
size_t free : (8 * sizeof(size_t) - 8);
|
|
size_t len; // in elements
|
|
void *items;
|
|
} mp_obj_array_t;
|
|
|
|
#if MICROPY_PY_BUILTINS_MEMORYVIEW
|
|
static inline void mp_obj_memoryview_init(mp_obj_array_t *self, size_t typecode, size_t offset, size_t len, void *items) {
|
|
self->base.type = &mp_type_memoryview;
|
|
self->typecode = typecode;
|
|
self->free = offset;
|
|
self->len = len;
|
|
self->items = items;
|
|
}
|
|
#endif
|
|
|
|
#if MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY
|
|
MP_DECLARE_CONST_FUN_OBJ_2(mp_obj_array_append_obj);
|
|
MP_DECLARE_CONST_FUN_OBJ_2(mp_obj_array_extend_obj);
|
|
#endif
|
|
|
|
#endif // MICROPY_INCLUDED_PY_OBJARRAY_H
|