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
280 lines
10 KiB
C
280 lines
10 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-2016 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.
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "py/objstr.h"
|
|
#include "py/objlist.h"
|
|
#include "py/runtime.h"
|
|
|
|
#if MICROPY_PY_BUILTINS_STR_UNICODE
|
|
|
|
STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf);
|
|
|
|
/******************************************************************************/
|
|
/* str */
|
|
|
|
STATIC void uni_print_quoted(const mp_print_t *print, const byte *str_data, uint str_len) {
|
|
// this escapes characters, but it will be very slow to print (calling print many times)
|
|
bool has_single_quote = false;
|
|
bool has_double_quote = false;
|
|
for (const byte *s = str_data, *top = str_data + str_len; !has_double_quote && s < top; s++) {
|
|
if (*s == '\'') {
|
|
has_single_quote = true;
|
|
} else if (*s == '"') {
|
|
has_double_quote = true;
|
|
}
|
|
}
|
|
unichar quote_char = '\'';
|
|
if (has_single_quote && !has_double_quote) {
|
|
quote_char = '"';
|
|
}
|
|
mp_printf(print, "%c", quote_char);
|
|
const byte *s = str_data, *top = str_data + str_len;
|
|
while (s < top) {
|
|
unichar ch;
|
|
ch = utf8_get_char(s);
|
|
s = utf8_next_char(s);
|
|
if (ch == quote_char) {
|
|
mp_printf(print, "\\%c", quote_char);
|
|
} else if (ch == '\\') {
|
|
mp_print_str(print, "\\\\");
|
|
} else if (32 <= ch && ch <= 126) {
|
|
mp_printf(print, "%c", ch);
|
|
} else if (ch == '\n') {
|
|
mp_print_str(print, "\\n");
|
|
} else if (ch == '\r') {
|
|
mp_print_str(print, "\\r");
|
|
} else if (ch == '\t') {
|
|
mp_print_str(print, "\\t");
|
|
} else if (ch < 0x100) {
|
|
mp_printf(print, "\\x%02x", ch);
|
|
} else if (ch < 0x10000) {
|
|
mp_printf(print, "\\u%04x", ch);
|
|
} else {
|
|
mp_printf(print, "\\U%08x", ch);
|
|
}
|
|
}
|
|
mp_printf(print, "%c", quote_char);
|
|
}
|
|
|
|
STATIC void uni_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
|
|
GET_STR_DATA_LEN(self_in, str_data, str_len);
|
|
#if MICROPY_PY_UJSON
|
|
if (kind == PRINT_JSON) {
|
|
mp_str_print_json(print, str_data, str_len);
|
|
return;
|
|
}
|
|
#endif
|
|
if (kind == PRINT_STR) {
|
|
print->print_strn(print->data, (const char *)str_data, str_len);
|
|
} else {
|
|
uni_print_quoted(print, str_data, str_len);
|
|
}
|
|
}
|
|
|
|
STATIC mp_obj_t uni_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
|
|
GET_STR_DATA_LEN(self_in, str_data, str_len);
|
|
switch (op) {
|
|
case MP_UNARY_OP_BOOL:
|
|
return mp_obj_new_bool(str_len != 0);
|
|
case MP_UNARY_OP_LEN:
|
|
return MP_OBJ_NEW_SMALL_INT(utf8_charlen(str_data, str_len));
|
|
default:
|
|
return MP_OBJ_NULL; // op not supported
|
|
}
|
|
}
|
|
|
|
// Convert an index into a pointer to its lead byte. Out of bounds indexing will raise IndexError or
|
|
// be capped to the first/last character of the string, depending on is_slice.
|
|
const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, size_t self_len,
|
|
mp_obj_t index, bool is_slice) {
|
|
// All str functions also handle bytes objects, and they call str_index_to_ptr(),
|
|
// so it must handle bytes.
|
|
if (type == &mp_type_bytes
|
|
#if MICROPY_PY_BUILTINS_BYTEARRAY
|
|
|| type == &mp_type_bytearray
|
|
#endif
|
|
) {
|
|
// Taken from objstr.c:str_index_to_ptr()
|
|
size_t index_val = mp_get_index(type, self_len, index, is_slice);
|
|
return self_data + index_val;
|
|
}
|
|
|
|
mp_int_t i;
|
|
// Copied from mp_get_index; I don't want bounds checking, just give me
|
|
// the integer as-is. (I can't bounds-check without scanning the whole
|
|
// string; an out-of-bounds index will be caught in the loops below.)
|
|
if (mp_obj_is_small_int(index)) {
|
|
i = MP_OBJ_SMALL_INT_VALUE(index);
|
|
} else if (!mp_obj_get_int_maybe(index, &i)) {
|
|
mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("string indices must be integers, not %s"), mp_obj_get_type_str(index));
|
|
}
|
|
const byte *s, *top = self_data + self_len;
|
|
if (i < 0) {
|
|
// Negative indexing is performed by counting from the end of the string.
|
|
for (s = top - 1; i; --s) {
|
|
if (s < self_data) {
|
|
if (is_slice) {
|
|
return self_data;
|
|
}
|
|
mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("string index out of range"));
|
|
}
|
|
if (!UTF8_IS_CONT(*s)) {
|
|
++i;
|
|
}
|
|
}
|
|
++s;
|
|
} else {
|
|
// Positive indexing, correspondingly, counts from the start of the string.
|
|
// It's assumed that negative indexing will generally be used with small
|
|
// absolute values (eg str[-1], not str[-1000000]), which means it'll be
|
|
// more efficient this way.
|
|
s = self_data;
|
|
while (1) {
|
|
// First check out-of-bounds
|
|
if (s >= top) {
|
|
if (is_slice) {
|
|
return top;
|
|
}
|
|
mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("string index out of range"));
|
|
}
|
|
// Then check completion
|
|
if (i-- == 0) {
|
|
break;
|
|
}
|
|
// Then skip UTF-8 char
|
|
++s;
|
|
while (UTF8_IS_CONT(*s)) {
|
|
++s;
|
|
}
|
|
}
|
|
}
|
|
return s;
|
|
}
|
|
|
|
STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
|
|
const mp_obj_type_t *type = mp_obj_get_type(self_in);
|
|
assert(type == &mp_type_str);
|
|
GET_STR_DATA_LEN(self_in, self_data, self_len);
|
|
if (value == MP_OBJ_SENTINEL) {
|
|
// load
|
|
#if MICROPY_PY_BUILTINS_SLICE
|
|
if (mp_obj_is_type(index, &mp_type_slice)) {
|
|
mp_obj_t ostart, ostop, ostep;
|
|
mp_obj_slice_t *slice = MP_OBJ_TO_PTR(index);
|
|
ostart = slice->start;
|
|
ostop = slice->stop;
|
|
ostep = slice->step;
|
|
|
|
if (ostep != mp_const_none && ostep != MP_OBJ_NEW_SMALL_INT(1)) {
|
|
mp_raise_NotImplementedError(MP_ERROR_TEXT("only slices with step=1 (aka None) are supported"));
|
|
}
|
|
|
|
const byte *pstart, *pstop;
|
|
if (ostart != mp_const_none) {
|
|
pstart = str_index_to_ptr(type, self_data, self_len, ostart, true);
|
|
} else {
|
|
pstart = self_data;
|
|
}
|
|
if (ostop != mp_const_none) {
|
|
// pstop will point just after the stop character. This depends on
|
|
// the \0 at the end of the string.
|
|
pstop = str_index_to_ptr(type, self_data, self_len, ostop, true);
|
|
} else {
|
|
pstop = self_data + self_len;
|
|
}
|
|
if (pstop < pstart) {
|
|
return MP_OBJ_NEW_QSTR(MP_QSTR_);
|
|
}
|
|
return mp_obj_new_str_of_type(type, (const byte *)pstart, pstop - pstart);
|
|
}
|
|
#endif
|
|
const byte *s = str_index_to_ptr(type, self_data, self_len, index, false);
|
|
int len = 1;
|
|
if (UTF8_IS_NONASCII(*s)) {
|
|
// Count the number of 1 bits (after the first)
|
|
for (char mask = 0x40; *s & mask; mask >>= 1) {
|
|
++len;
|
|
}
|
|
}
|
|
return mp_obj_new_str_via_qstr((const char *)s, len); // This will create a one-character string
|
|
} else {
|
|
return MP_OBJ_NULL; // op not supported
|
|
}
|
|
}
|
|
|
|
const mp_obj_type_t mp_type_str = {
|
|
{ &mp_type_type },
|
|
.name = MP_QSTR_str,
|
|
.print = uni_print,
|
|
.make_new = mp_obj_str_make_new,
|
|
.unary_op = uni_unary_op,
|
|
.binary_op = mp_obj_str_binary_op,
|
|
.subscr = str_subscr,
|
|
.getiter = mp_obj_new_str_iterator,
|
|
.buffer_p = { .get_buffer = mp_obj_str_get_buffer },
|
|
.locals_dict = (mp_obj_dict_t *)&mp_obj_str_locals_dict,
|
|
};
|
|
|
|
/******************************************************************************/
|
|
/* str iterator */
|
|
|
|
typedef struct _mp_obj_str_it_t {
|
|
mp_obj_base_t base;
|
|
mp_fun_1_t iternext;
|
|
mp_obj_t str;
|
|
size_t cur;
|
|
} mp_obj_str_it_t;
|
|
|
|
STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
|
|
mp_obj_str_it_t *self = MP_OBJ_TO_PTR(self_in);
|
|
GET_STR_DATA_LEN(self->str, str, len);
|
|
if (self->cur < len) {
|
|
const byte *cur = str + self->cur;
|
|
const byte *end = utf8_next_char(str + self->cur);
|
|
mp_obj_t o_out = mp_obj_new_str_via_qstr((const char *)cur, end - cur);
|
|
self->cur += end - cur;
|
|
return o_out;
|
|
} else {
|
|
return MP_OBJ_STOP_ITERATION;
|
|
}
|
|
}
|
|
|
|
STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf) {
|
|
assert(sizeof(mp_obj_str_it_t) <= sizeof(mp_obj_iter_buf_t));
|
|
mp_obj_str_it_t *o = (mp_obj_str_it_t *)iter_buf;
|
|
o->base.type = &mp_type_polymorph_iter;
|
|
o->iternext = str_it_iternext;
|
|
o->str = str;
|
|
o->cur = 0;
|
|
return MP_OBJ_FROM_PTR(o);
|
|
}
|
|
|
|
#endif // MICROPY_PY_BUILTINS_STR_UNICODE
|