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)
|
|
|
|
*
|
2020-06-03 18:40:05 -04:00
|
|
|
* SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George
|
2021-04-22 20:55:39 -04:00
|
|
|
* SPDX-FileCopyrightText: Copyright (c) 2014-2018 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.
|
|
|
|
*/
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
2015-01-01 15:27:54 -05:00
|
|
|
#include "py/unicode.h"
|
|
|
|
#include "py/objstr.h"
|
|
|
|
#include "py/objlist.h"
|
2019-10-14 19:05:17 -04:00
|
|
|
#include "py/objtype.h"
|
2015-01-01 15:27:54 -05:00
|
|
|
#include "py/runtime.h"
|
2016-01-29 04:09:10 -05:00
|
|
|
#include "py/stackctrl.h"
|
2013-12-21 13:17:45 -05:00
|
|
|
|
2018-08-08 21:24:49 -04:00
|
|
|
#include "supervisor/shared/translate.h"
|
|
|
|
|
2018-08-15 08:17:41 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_OP_MODULO
|
2017-02-02 21:04:56 -05:00
|
|
|
STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_t *args, mp_obj_t dict);
|
2018-08-15 08:17:41 -04:00
|
|
|
#endif
|
2014-03-21 17:46:59 -04:00
|
|
|
|
2016-01-09 18:14:54 -05:00
|
|
|
STATIC mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf);
|
2014-04-29 22:35:18 -04:00
|
|
|
STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in);
|
2014-05-10 19:44:46 -04:00
|
|
|
|
2019-07-31 00:30:24 -04:00
|
|
|
const char nibble_to_hex_upper[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
|
|
|
|
'A', 'B', 'C', 'D', 'E', 'F'};
|
|
|
|
|
|
|
|
const char nibble_to_hex_lower[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
|
|
|
|
'a', 'b', 'c', 'd', 'e', 'f'};
|
|
|
|
|
2014-01-05 05:47:51 -05:00
|
|
|
/******************************************************************************/
|
|
|
|
/* str */
|
|
|
|
|
2017-02-16 00:26:48 -05:00
|
|
|
void mp_str_print_quoted(const mp_print_t *print, const byte *str_data, size_t str_len, bool is_bytes) {
|
2014-01-27 20:40:06 -05:00
|
|
|
// 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;
|
2014-06-03 13:26:40 -04:00
|
|
|
for (const byte *s = str_data, *top = str_data + str_len; !has_double_quote && s < top; s++) {
|
2014-01-27 20:40:06 -05:00
|
|
|
if (*s == '\'') {
|
|
|
|
has_single_quote = true;
|
|
|
|
} else if (*s == '"') {
|
|
|
|
has_double_quote = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
int quote_char = '\'';
|
|
|
|
if (has_single_quote && !has_double_quote) {
|
|
|
|
quote_char = '"';
|
|
|
|
}
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_printf(print, "%c", quote_char);
|
2014-01-27 20:40:06 -05:00
|
|
|
for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) {
|
|
|
|
if (*s == quote_char) {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_printf(print, "\\%c", quote_char);
|
2014-01-27 20:40:06 -05:00
|
|
|
} else if (*s == '\\') {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, "\\\\");
|
2014-06-13 14:23:00 -04:00
|
|
|
} else if (*s >= 0x20 && *s != 0x7f && (!is_bytes || *s < 0x80)) {
|
|
|
|
// In strings, anything which is not ascii control character
|
|
|
|
// is printed as is, this includes characters in range 0x80-0xff
|
|
|
|
// (which can be non-Latin letters, etc.)
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_printf(print, "%c", *s);
|
2014-01-27 20:40:06 -05:00
|
|
|
} else if (*s == '\n') {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, "\\n");
|
2014-04-07 21:42:50 -04:00
|
|
|
} else if (*s == '\r') {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, "\\r");
|
2014-04-07 21:42:50 -04:00
|
|
|
} else if (*s == '\t') {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, "\\t");
|
2014-01-27 20:40:06 -05:00
|
|
|
} else {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_printf(print, "\\x%02x", *s);
|
2014-01-27 20:40:06 -05:00
|
|
|
}
|
|
|
|
}
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_printf(print, "%c", quote_char);
|
2014-01-27 20:40:06 -05:00
|
|
|
}
|
|
|
|
|
2014-09-17 17:56:34 -04:00
|
|
|
#if MICROPY_PY_UJSON
|
2015-11-27 12:01:44 -05:00
|
|
|
void mp_str_print_json(const mp_print_t *print, const byte *str_data, size_t str_len) {
|
2014-09-25 12:35:56 -04:00
|
|
|
// for JSON spec, see http://www.ietf.org/rfc/rfc4627.txt
|
|
|
|
// if we are given a valid utf8-encoded string, we will print it in a JSON-conforming way
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, "\"");
|
2014-09-17 17:56:34 -04:00
|
|
|
for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) {
|
2014-09-25 12:35:56 -04:00
|
|
|
if (*s == '"' || *s == '\\') {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_printf(print, "\\%c", *s);
|
2014-09-25 12:35:56 -04:00
|
|
|
} else if (*s >= 32) {
|
|
|
|
// this will handle normal and utf-8 encoded chars
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_printf(print, "%c", *s);
|
2014-09-17 17:56:34 -04:00
|
|
|
} else if (*s == '\n') {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, "\\n");
|
2014-09-17 17:56:34 -04:00
|
|
|
} else if (*s == '\r') {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, "\\r");
|
2014-09-17 17:56:34 -04:00
|
|
|
} else if (*s == '\t') {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, "\\t");
|
2014-09-17 17:56:34 -04:00
|
|
|
} else {
|
2014-09-25 12:35:56 -04:00
|
|
|
// this will handle control chars
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_printf(print, "\\u%04x", *s);
|
2014-09-17 17:56:34 -04:00
|
|
|
}
|
|
|
|
}
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, "\"");
|
2014-09-17 17:56:34 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-04-09 18:56:15 -04:00
|
|
|
STATIC void str_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(self_in, str_data, str_len);
|
2014-09-17 17:56:34 -04:00
|
|
|
#if MICROPY_PY_UJSON
|
|
|
|
if (kind == PRINT_JSON) {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_str_print_json(print, str_data, str_len);
|
2014-09-17 17:56:34 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
2015-09-03 18:03:57 -04:00
|
|
|
#if !MICROPY_PY_BUILTINS_STR_UNICODE
|
2021-04-22 20:55:39 -04:00
|
|
|
bool is_bytes = mp_obj_is_type(self_in, &mp_type_bytes);
|
2015-09-03 18:03:57 -04:00
|
|
|
#else
|
|
|
|
bool is_bytes = true;
|
|
|
|
#endif
|
2015-12-20 09:44:36 -05:00
|
|
|
if (kind == PRINT_RAW || (!MICROPY_PY_BUILTINS_STR_UNICODE && kind == PRINT_STR && !is_bytes)) {
|
2020-10-22 04:38:03 -04:00
|
|
|
print->print_strn(print->data, (const char *)str_data, str_len);
|
2014-01-13 12:19:16 -05:00
|
|
|
} else {
|
2014-01-24 15:50:40 -05:00
|
|
|
if (is_bytes) {
|
2020-10-22 04:38:03 -04:00
|
|
|
print->print_strn(print->data, "b", 1);
|
2014-01-24 15:50:40 -05:00
|
|
|
}
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_str_print_quoted(print, str_data, str_len, is_bytes);
|
2014-01-13 12:19:16 -05:00
|
|
|
}
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
|
|
|
|
2016-01-03 10:55:55 -05:00
|
|
|
mp_obj_t mp_obj_str_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
2014-11-06 12:36:16 -05:00
|
|
|
mp_arg_check_num(n_args, n_kw, 0, 3, false);
|
|
|
|
|
2014-03-21 05:39:01 -04:00
|
|
|
switch (n_args) {
|
|
|
|
case 0:
|
|
|
|
return MP_OBJ_NEW_QSTR(MP_QSTR_);
|
|
|
|
|
2014-11-06 12:36:16 -05:00
|
|
|
case 1: {
|
2015-01-21 14:14:25 -05:00
|
|
|
vstr_t vstr;
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_t print;
|
|
|
|
vstr_init_print(&vstr, 16, &print);
|
|
|
|
mp_obj_print_helper(&print, args[0], PRINT_STR);
|
2016-01-03 10:55:55 -05:00
|
|
|
return mp_obj_new_str_from_vstr(type, &vstr);
|
2014-03-21 05:39:01 -04:00
|
|
|
}
|
|
|
|
|
2014-11-06 12:36:16 -05:00
|
|
|
default: // 2 or 3 args
|
2014-03-21 05:39:01 -04:00
|
|
|
// TODO: validate 2nd/3rd args
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_type(args[0], &mp_type_bytes)) {
|
2014-10-30 17:58:08 -04:00
|
|
|
GET_STR_DATA_LEN(args[0], str_data, str_len);
|
|
|
|
GET_STR_HASH(args[0], str_hash);
|
2016-09-02 00:42:53 -04:00
|
|
|
if (str_hash == 0) {
|
|
|
|
str_hash = qstr_compute_hash(str_data, str_len);
|
|
|
|
}
|
2017-06-23 20:38:32 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
|
|
|
|
if (!utf8_check(str_data, str_len)) {
|
|
|
|
mp_raise_msg(&mp_type_UnicodeError, NULL);
|
|
|
|
}
|
|
|
|
#endif
|
2017-11-15 22:02:28 -05:00
|
|
|
|
|
|
|
// Check if a qstr with this data already exists
|
2021-03-15 09:57:36 -04:00
|
|
|
qstr q = qstr_find_strn((const char *)str_data, str_len);
|
2021-04-23 15:26:42 -04:00
|
|
|
if (q != MP_QSTRnull) {
|
2017-11-15 22:02:28 -05:00
|
|
|
return MP_OBJ_NEW_QSTR(q);
|
|
|
|
}
|
|
|
|
|
2017-11-15 21:53:04 -05:00
|
|
|
mp_obj_str_t *o = MP_OBJ_TO_PTR(mp_obj_new_str_copy(type, NULL, str_len));
|
2014-10-30 17:58:08 -04:00
|
|
|
o->data = str_data;
|
|
|
|
o->hash = str_hash;
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-10-30 17:58:08 -04:00
|
|
|
} else {
|
|
|
|
mp_buffer_info_t bufinfo;
|
|
|
|
mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
|
2017-06-23 20:38:32 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
|
|
|
|
if (!utf8_check(bufinfo.buf, bufinfo.len)) {
|
|
|
|
mp_raise_msg(&mp_type_UnicodeError, NULL);
|
|
|
|
}
|
|
|
|
#endif
|
2017-11-15 21:17:51 -05:00
|
|
|
return mp_obj_new_str(bufinfo.buf, bufinfo.len);
|
2014-03-21 05:39:01 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-03 10:55:55 -05:00
|
|
|
STATIC mp_obj_t bytes_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;
|
|
|
|
|
2015-09-04 11:53:46 -04:00
|
|
|
#if MICROPY_CPYTHON_COMPAT
|
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
|
|
|
if (n_kw) {
|
2014-05-06 12:30:30 -04:00
|
|
|
mp_arg_error_unimpl_kw();
|
|
|
|
}
|
2015-09-04 11:53:46 -04:00
|
|
|
#else
|
|
|
|
(void)n_kw;
|
|
|
|
#endif
|
2014-05-06 12:30:30 -04:00
|
|
|
|
2015-09-04 11:51:55 -04:00
|
|
|
if (n_args == 0) {
|
|
|
|
return mp_const_empty_bytes;
|
|
|
|
}
|
|
|
|
|
2020-09-23 15:45:22 -04:00
|
|
|
if (mp_obj_is_type(args[0], &mp_type_bytes)) {
|
|
|
|
return args[0];
|
|
|
|
}
|
|
|
|
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_str(args[0])) {
|
2014-03-21 17:46:59 -04:00
|
|
|
if (n_args < 2 || n_args > 3) {
|
|
|
|
goto wrong_args;
|
|
|
|
}
|
|
|
|
GET_STR_DATA_LEN(args[0], str_data, str_len);
|
|
|
|
GET_STR_HASH(args[0], str_hash);
|
2016-09-02 00:42:53 -04:00
|
|
|
if (str_hash == 0) {
|
|
|
|
str_hash = qstr_compute_hash(str_data, str_len);
|
|
|
|
}
|
2017-11-15 21:53:04 -05:00
|
|
|
mp_obj_str_t *o = MP_OBJ_TO_PTR(mp_obj_new_str_copy(&mp_type_bytes, NULL, str_len));
|
2014-03-21 17:46:59 -04:00
|
|
|
o->data = str_data;
|
|
|
|
o->hash = str_hash;
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-03-21 17:46:59 -04:00
|
|
|
}
|
|
|
|
|
2021-06-29 10:29:44 -04:00
|
|
|
if (n_args > 1) {
|
|
|
|
goto wrong_args;
|
|
|
|
}
|
|
|
|
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_small_int(args[0])) {
|
2018-02-19 00:25:30 -05:00
|
|
|
mp_int_t len = MP_OBJ_SMALL_INT_VALUE(args[0]);
|
|
|
|
if (len < 0) {
|
|
|
|
mp_raise_ValueError(NULL);
|
|
|
|
}
|
2015-01-21 17:48:37 -05:00
|
|
|
vstr_t vstr;
|
|
|
|
vstr_init_len(&vstr, len);
|
|
|
|
memset(vstr.buf, 0, len);
|
|
|
|
return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
|
2014-03-21 17:46:59 -04:00
|
|
|
}
|
|
|
|
|
2019-10-14 19:05:17 -04:00
|
|
|
// check if __bytes__ exists, and if so delegate to it
|
|
|
|
mp_obj_t dest[2];
|
|
|
|
mp_load_method_maybe(args[0], MP_QSTR___bytes__, dest);
|
|
|
|
if (dest[0] != MP_OBJ_NULL) {
|
|
|
|
return mp_call_method_n_kw(0, 0, dest);
|
|
|
|
}
|
|
|
|
|
2014-12-04 10:46:14 -05:00
|
|
|
// check if argument has the buffer protocol
|
|
|
|
mp_buffer_info_t bufinfo;
|
|
|
|
if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_READ)) {
|
2017-11-15 21:53:04 -05:00
|
|
|
return mp_obj_new_bytes(bufinfo.buf, bufinfo.len);
|
2014-12-04 10:46:14 -05:00
|
|
|
}
|
|
|
|
|
2015-01-21 14:14:25 -05:00
|
|
|
vstr_t vstr;
|
2014-03-21 17:46:59 -04:00
|
|
|
// Try to create array of exact len if initializer len is known
|
|
|
|
mp_obj_t len_in = mp_obj_len_maybe(args[0]);
|
|
|
|
if (len_in == MP_OBJ_NULL) {
|
2015-01-21 14:14:25 -05:00
|
|
|
vstr_init(&vstr, 16);
|
2014-03-21 17:46:59 -04:00
|
|
|
} else {
|
2015-01-21 14:14:25 -05:00
|
|
|
mp_int_t len = MP_OBJ_SMALL_INT_VALUE(len_in);
|
2015-01-28 18:43:01 -05:00
|
|
|
vstr_init(&vstr, len);
|
2014-03-21 17:46:59 -04:00
|
|
|
}
|
|
|
|
|
2016-01-09 18:14:54 -05:00
|
|
|
mp_obj_iter_buf_t iter_buf;
|
|
|
|
mp_obj_t iterable = mp_getiter(args[0], &iter_buf);
|
2014-03-21 17:46:59 -04:00
|
|
|
mp_obj_t item;
|
2014-04-17 18:19:36 -04:00
|
|
|
while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
|
2015-04-23 10:28:18 -04:00
|
|
|
mp_int_t val = mp_obj_get_int(item);
|
2017-04-02 14:20:07 -04:00
|
|
|
#if MICROPY_FULL_CHECKS
|
2015-04-23 10:28:18 -04:00
|
|
|
if (val < 0 || val > 255) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("bytes value out of range"));
|
2015-04-23 10:28:18 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
vstr_add_byte(&vstr, val);
|
2014-03-21 17:46:59 -04:00
|
|
|
}
|
|
|
|
|
2015-01-21 14:14:25 -05:00
|
|
|
return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
|
2014-03-21 17:46:59 -04:00
|
|
|
|
|
|
|
wrong_args:
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("wrong number of arguments"));
|
2014-03-21 17:46:59 -04:00
|
|
|
}
|
|
|
|
|
2014-01-21 16:40:13 -05:00
|
|
|
// like strstr but with specified length and allows \0 bytes
|
|
|
|
// TODO replace with something more efficient/standard
|
2017-02-16 00:26:48 -05:00
|
|
|
const byte *find_subbytes(const byte *haystack, size_t hlen, const byte *needle, size_t nlen, int direction) {
|
2014-01-21 16:40:13 -05:00
|
|
|
if (hlen >= nlen) {
|
2017-02-16 00:26:48 -05:00
|
|
|
size_t str_index, str_index_end;
|
2014-03-24 02:31:58 -04:00
|
|
|
if (direction > 0) {
|
|
|
|
str_index = 0;
|
|
|
|
str_index_end = hlen - nlen;
|
|
|
|
} else {
|
|
|
|
str_index = hlen - nlen;
|
|
|
|
str_index_end = 0;
|
|
|
|
}
|
|
|
|
for (;;) {
|
|
|
|
if (memcmp(&haystack[str_index], needle, nlen) == 0) {
|
2021-03-15 09:57:36 -04:00
|
|
|
// found
|
2014-03-24 02:31:58 -04:00
|
|
|
return haystack + str_index;
|
2014-01-21 16:40:13 -05:00
|
|
|
}
|
2014-03-24 02:31:58 -04:00
|
|
|
if (str_index == str_index_end) {
|
2021-03-15 09:57:36 -04:00
|
|
|
// not found
|
2014-03-24 02:31:58 -04:00
|
|
|
break;
|
2014-01-21 16:40:13 -05:00
|
|
|
}
|
2014-03-24 02:31:58 -04:00
|
|
|
str_index += direction;
|
2014-01-21 16:40:13 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-08-27 04:20:30 -04:00
|
|
|
// Note: this function is used to check if an object is a str or bytes, which
|
|
|
|
// works because both those types use it as their binary_op method. Revisit
|
2021-04-22 20:55:39 -04:00
|
|
|
// mp_obj_is_str_or_bytes if this fact changes.
|
2017-08-28 23:04:01 -04:00
|
|
|
mp_obj_t mp_obj_str_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
|
2014-11-05 11:30:34 -05:00
|
|
|
// check for modulo
|
|
|
|
if (op == MP_BINARY_OP_MODULO) {
|
2018-08-15 08:17:41 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_OP_MODULO
|
2017-02-02 20:13:44 -05:00
|
|
|
mp_obj_t *args = &rhs_in;
|
2017-03-25 04:35:08 -04:00
|
|
|
size_t n_args = 1;
|
2014-11-05 11:30:34 -05:00
|
|
|
mp_obj_t dict = MP_OBJ_NULL;
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_type(rhs_in, &mp_type_tuple)) {
|
2014-11-05 11:30:34 -05:00
|
|
|
// TODO: Support tuple subclasses?
|
|
|
|
mp_obj_tuple_get(rhs_in, &n_args, &args);
|
2021-04-22 20:55:39 -04:00
|
|
|
} else if (mp_obj_is_type(rhs_in, &mp_type_dict)) {
|
2014-11-05 11:30:34 -05:00
|
|
|
dict = rhs_in;
|
|
|
|
}
|
|
|
|
return str_modulo_format(lhs_in, n_args, args, dict);
|
2018-08-15 08:17:41 -04:00
|
|
|
#else
|
|
|
|
return MP_OBJ_NULL;
|
|
|
|
#endif
|
2014-11-05 11:30:34 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// from now on we need lhs type and data, so extract them
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *lhs_type = mp_obj_get_type(lhs_in);
|
2014-11-05 11:30:34 -05:00
|
|
|
GET_STR_DATA_LEN(lhs_in, lhs_data, lhs_len);
|
2014-01-22 09:35:10 -05:00
|
|
|
|
2014-11-05 11:30:34 -05:00
|
|
|
// check for multiply
|
|
|
|
if (op == MP_BINARY_OP_MULTIPLY) {
|
|
|
|
mp_int_t n;
|
|
|
|
if (!mp_obj_get_int_maybe(rhs_in, &n)) {
|
|
|
|
return MP_OBJ_NULL; // op not supported
|
|
|
|
}
|
|
|
|
if (n <= 0) {
|
|
|
|
if (lhs_type == &mp_type_str) {
|
|
|
|
return MP_OBJ_NEW_QSTR(MP_QSTR_); // empty str
|
|
|
|
} else {
|
|
|
|
return mp_const_empty_bytes;
|
2014-01-11 07:39:33 -05:00
|
|
|
}
|
2014-11-05 11:30:34 -05:00
|
|
|
}
|
2019-02-04 18:33:36 -05:00
|
|
|
size_t new_len = mp_seq_multiply_len(lhs_len, n);
|
2015-01-21 17:48:37 -05:00
|
|
|
vstr_t vstr;
|
2019-02-04 18:33:36 -05:00
|
|
|
vstr_init_len(&vstr, new_len);
|
2015-01-21 17:48:37 -05:00
|
|
|
mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, vstr.buf);
|
|
|
|
return mp_obj_new_str_from_vstr(lhs_type, &vstr);
|
2014-11-05 11:30:34 -05:00
|
|
|
}
|
2014-01-22 09:35:10 -05:00
|
|
|
|
2014-11-05 11:30:34 -05:00
|
|
|
// From now on all operations allow:
|
|
|
|
// - str with str
|
|
|
|
// - bytes with bytes
|
|
|
|
// - bytes with bytearray
|
|
|
|
// - bytes with array.array
|
|
|
|
// To do this efficiently we use the buffer protocol to extract the raw
|
|
|
|
// data for the rhs, but only if the lhs is a bytes object.
|
|
|
|
//
|
|
|
|
// NOTE: CPython does not allow comparison between bytes ard array.array
|
|
|
|
// (even if the array is of type 'b'), even though it allows addition of
|
|
|
|
// such types. We are not compatible with this (we do allow comparison
|
|
|
|
// of bytes with anything that has the buffer protocol). It would be
|
|
|
|
// easy to "fix" this with a bit of extra logic below, but it costs code
|
|
|
|
// size and execution time so we don't.
|
|
|
|
|
|
|
|
const byte *rhs_data;
|
2017-02-16 00:26:48 -05:00
|
|
|
size_t rhs_len;
|
2014-11-05 11:30:34 -05:00
|
|
|
if (lhs_type == mp_obj_get_type(rhs_in)) {
|
|
|
|
GET_STR_DATA_LEN(rhs_in, rhs_data_, rhs_len_);
|
|
|
|
rhs_data = rhs_data_;
|
|
|
|
rhs_len = rhs_len_;
|
|
|
|
} else if (lhs_type == &mp_type_bytes) {
|
|
|
|
mp_buffer_info_t bufinfo;
|
|
|
|
if (!mp_get_buffer(rhs_in, &bufinfo, MP_BUFFER_READ)) {
|
2015-01-11 16:07:15 -05:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-11-05 11:30:34 -05:00
|
|
|
}
|
|
|
|
rhs_data = bufinfo.buf;
|
|
|
|
rhs_len = bufinfo.len;
|
|
|
|
} else {
|
2017-08-09 07:25:48 -04:00
|
|
|
// LHS is str and RHS has an incompatible type
|
|
|
|
// (except if operation is EQUAL, but that's handled by mp_obj_equal)
|
|
|
|
bad_implicit_conversion(rhs_in);
|
2014-11-05 11:30:34 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
switch (op) {
|
|
|
|
case MP_BINARY_OP_ADD:
|
|
|
|
case MP_BINARY_OP_INPLACE_ADD: {
|
2017-03-15 23:30:04 -04:00
|
|
|
if (lhs_len == 0 && mp_obj_get_type(rhs_in) == lhs_type) {
|
2017-01-26 16:40:47 -05:00
|
|
|
return rhs_in;
|
|
|
|
}
|
|
|
|
if (rhs_len == 0) {
|
|
|
|
return lhs_in;
|
|
|
|
}
|
|
|
|
|
2015-01-21 17:48:37 -05:00
|
|
|
vstr_t vstr;
|
|
|
|
vstr_init_len(&vstr, lhs_len + rhs_len);
|
|
|
|
memcpy(vstr.buf, lhs_data, lhs_len);
|
|
|
|
memcpy(vstr.buf + lhs_len, rhs_data, rhs_len);
|
|
|
|
return mp_obj_new_str_from_vstr(lhs_type, &vstr);
|
2014-01-20 17:27:33 -05:00
|
|
|
}
|
2014-02-02 01:24:07 -05:00
|
|
|
|
2017-11-23 21:04:24 -05:00
|
|
|
case MP_BINARY_OP_CONTAINS:
|
2015-10-11 05:09:43 -04:00
|
|
|
return mp_obj_new_bool(find_subbytes(lhs_data, lhs_len, rhs_data, rhs_len, 1) != NULL);
|
2014-03-31 14:18:28 -04:00
|
|
|
|
2021-03-15 09:57:36 -04:00
|
|
|
// case MP_BINARY_OP_NOT_EQUAL: // This is never passed here
|
2014-05-09 21:26:10 -04:00
|
|
|
case MP_BINARY_OP_EQUAL: // This will be passed only for bytes, str is dealt with in mp_obj_equal()
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_LESS:
|
|
|
|
case MP_BINARY_OP_LESS_EQUAL:
|
|
|
|
case MP_BINARY_OP_MORE:
|
|
|
|
case MP_BINARY_OP_MORE_EQUAL:
|
2015-10-11 05:09:43 -04:00
|
|
|
return mp_obj_new_bool(mp_seq_cmp_bytes(op, lhs_data, lhs_len, rhs_data, rhs_len));
|
2013-12-21 13:17:45 -05:00
|
|
|
|
2017-08-28 23:04:01 -04:00
|
|
|
default:
|
|
|
|
return MP_OBJ_NULL; // op not supported
|
|
|
|
}
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
|
|
|
|
2014-06-14 17:35:09 -04:00
|
|
|
#if !MICROPY_PY_BUILTINS_STR_UNICODE
|
|
|
|
// objstrunicode defines own version
|
2019-02-12 16:42:59 -05:00
|
|
|
size_t str_offset_to_index(const mp_obj_type_t *type, const byte *self_data, size_t self_len,
|
2021-03-15 09:57:36 -04:00
|
|
|
size_t offset) {
|
2019-02-12 16:42:59 -05:00
|
|
|
if (offset > self_len) {
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("offset out of bounds"));
|
2019-02-12 16:42:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
2015-11-27 12:01:44 -05:00
|
|
|
const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, size_t self_len,
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_t index, bool is_slice) {
|
2017-03-23 01:17:40 -04:00
|
|
|
size_t index_val = mp_get_index(type, self_len, index, is_slice);
|
2014-06-13 23:06:36 -04:00
|
|
|
return self_data + index_val;
|
|
|
|
}
|
2014-06-14 17:35:09 -04:00
|
|
|
#endif
|
2014-06-13 23:06:36 -04:00
|
|
|
|
2014-08-11 15:36:38 -04:00
|
|
|
// This is used for both bytes and 8-bit strings. This is not used for unicode strings.
|
|
|
|
STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *type = mp_obj_get_type(self_in);
|
2014-04-17 17:10:53 -04:00
|
|
|
GET_STR_DATA_LEN(self_in, self_data, self_len);
|
|
|
|
if (value == MP_OBJ_SENTINEL) {
|
|
|
|
// load
|
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, &mp_type_slice)) {
|
2014-05-25 14:21:57 -04:00
|
|
|
mp_bound_slice_t slice;
|
|
|
|
if (!mp_seq_get_fast_slice_indexes(self_len, index, &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-17 17:10:53 -04:00
|
|
|
}
|
2014-05-25 17:34:34 -04:00
|
|
|
return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start);
|
2014-04-17 17:10:53 -04:00
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2017-03-23 01:17:40 -04:00
|
|
|
size_t index_val = mp_get_index(type, self_len, index, false);
|
2014-08-11 18:24:29 -04:00
|
|
|
// If we have unicode enabled the type will always be bytes, so take the short cut.
|
|
|
|
if (MICROPY_PY_BUILTINS_STR_UNICODE || type == &mp_type_bytes) {
|
2014-08-11 15:36:38 -04:00
|
|
|
return MP_OBJ_NEW_SMALL_INT(self_data[index_val]);
|
2014-04-17 17:10:53 -04:00
|
|
|
} else {
|
2021-03-15 09:57:36 -04:00
|
|
|
return mp_obj_new_str_via_qstr((char *)&self_data[index_val], 1);
|
2014-04-17 17:10:53 -04:00
|
|
|
}
|
|
|
|
} else {
|
2014-05-21 14:42:43 -04:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-04-17 17:10:53 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
|
2021-04-22 20:55:39 -04:00
|
|
|
mp_check_self(mp_obj_is_str_or_bytes(self_in));
|
2014-05-11 14:13:01 -04:00
|
|
|
const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
|
2013-12-21 13:17:45 -05:00
|
|
|
|
2014-01-02 11:36:09 -05:00
|
|
|
// get separation string
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(self_in, sep_str, sep_len);
|
2014-01-02 11:36:09 -05:00
|
|
|
|
|
|
|
// process args
|
2017-03-25 04:35:08 -04:00
|
|
|
size_t seq_len;
|
2013-12-21 13:17:45 -05:00
|
|
|
mp_obj_t *seq_items;
|
2017-03-04 06:29:20 -05:00
|
|
|
|
2021-04-22 20:55:39 -04:00
|
|
|
if (!mp_obj_is_type(arg, &mp_type_list) && !mp_obj_is_type(arg, &mp_type_tuple)) {
|
2017-03-04 06:29:20 -05:00
|
|
|
// arg is not a list nor a tuple, try to convert it to a list
|
|
|
|
// TODO: Try to optimize?
|
|
|
|
arg = mp_type_list.make_new(&mp_type_list, 1, 0, &arg);
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2017-03-04 06:29:20 -05:00
|
|
|
mp_obj_get_array(arg, &seq_len, &seq_items);
|
2014-01-02 11:36:09 -05:00
|
|
|
|
|
|
|
// count required length
|
2017-02-16 00:26:48 -05:00
|
|
|
size_t required_len = 0;
|
|
|
|
for (size_t i = 0; i < seq_len; i++) {
|
2014-05-11 14:13:01 -04:00
|
|
|
if (mp_obj_get_type(seq_items[i]) != self_type) {
|
2016-08-14 02:51:54 -04:00
|
|
|
mp_raise_TypeError(
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("join expects a list of str/bytes objects consistent with self object"));
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2014-01-02 11:36:09 -05:00
|
|
|
if (i > 0) {
|
|
|
|
required_len += sep_len;
|
|
|
|
}
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_LEN(seq_items[i], l);
|
|
|
|
required_len += l;
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// make joined string
|
2015-01-21 17:48:37 -05:00
|
|
|
vstr_t vstr;
|
|
|
|
vstr_init_len(&vstr, required_len);
|
2021-03-15 09:57:36 -04:00
|
|
|
byte *data = (byte *)vstr.buf;
|
2017-02-16 00:26:48 -05:00
|
|
|
for (size_t i = 0; i < seq_len; i++) {
|
2013-12-21 13:17:45 -05:00
|
|
|
if (i > 0) {
|
2014-01-22 09:35:10 -05:00
|
|
|
memcpy(data, sep_str, sep_len);
|
|
|
|
data += sep_len;
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(seq_items[i], s, l);
|
|
|
|
memcpy(data, s, l);
|
|
|
|
data += l;
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2014-01-02 11:36:09 -05:00
|
|
|
|
|
|
|
// return joined string
|
2015-01-21 17:48:37 -05:00
|
|
|
return mp_obj_new_str_from_vstr(self_type, &vstr);
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join);
|
2013-12-21 13:17:45 -05:00
|
|
|
|
2016-05-13 07:21:32 -04:00
|
|
|
mp_obj_t mp_obj_str_split(size_t n_args, const mp_obj_t *args) {
|
2014-05-11 14:17:28 -04:00
|
|
|
const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
|
2014-07-03 08:25:24 -04:00
|
|
|
mp_int_t splits = -1;
|
2014-01-20 22:00:21 -05:00
|
|
|
mp_obj_t sep = mp_const_none;
|
|
|
|
if (n_args > 1) {
|
|
|
|
sep = args[1];
|
|
|
|
if (n_args > 2) {
|
2014-04-06 06:11:15 -04:00
|
|
|
splits = mp_obj_get_int(args[2]);
|
2014-01-20 22:00:21 -05:00
|
|
|
}
|
|
|
|
}
|
2014-04-06 06:11:15 -04:00
|
|
|
|
2014-01-20 22:00:21 -05:00
|
|
|
mp_obj_t res = mp_obj_new_list(0, NULL);
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(args[0], s, len);
|
|
|
|
const byte *top = s + len;
|
2014-04-06 06:11:15 -04:00
|
|
|
|
|
|
|
if (sep == mp_const_none) {
|
|
|
|
// sep not given, so separate on whitespace
|
|
|
|
|
|
|
|
// Initial whitespace is not counted as split, so we pre-do it
|
2021-03-15 09:57:36 -04:00
|
|
|
while (s < top && unichar_isspace(*s)) {
|
|
|
|
s++;
|
|
|
|
}
|
2014-04-06 06:11:15 -04:00
|
|
|
while (s < top && splits != 0) {
|
|
|
|
const byte *start = s;
|
2021-03-15 09:57:36 -04:00
|
|
|
while (s < top && !unichar_isspace(*s)) {
|
|
|
|
s++;
|
|
|
|
}
|
2014-05-25 17:34:34 -04:00
|
|
|
mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
|
2014-04-06 06:11:15 -04:00
|
|
|
if (s >= top) {
|
|
|
|
break;
|
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
while (s < top && unichar_isspace(*s)) {
|
|
|
|
s++;
|
|
|
|
}
|
2014-04-06 06:11:15 -04:00
|
|
|
if (splits > 0) {
|
|
|
|
splits--;
|
|
|
|
}
|
2014-01-20 22:00:21 -05:00
|
|
|
}
|
|
|
|
|
2014-04-06 06:11:15 -04:00
|
|
|
if (s < top) {
|
2014-05-25 17:34:34 -04:00
|
|
|
mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, s, top - s));
|
2014-04-06 06:11:15 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
// sep given
|
2014-08-10 16:14:35 -04:00
|
|
|
if (mp_obj_get_type(sep) != self_type) {
|
2014-12-24 15:28:30 -05:00
|
|
|
bad_implicit_conversion(sep);
|
2014-08-10 16:14:35 -04:00
|
|
|
}
|
2014-04-06 06:11:15 -04:00
|
|
|
|
2017-03-25 04:48:18 -04:00
|
|
|
size_t sep_len;
|
2014-04-06 06:11:15 -04:00
|
|
|
const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
|
|
|
|
|
|
|
|
if (sep_len == 0) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("empty separator"));
|
2014-04-06 06:11:15 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
const byte *start = s;
|
|
|
|
for (;;) {
|
|
|
|
if (splits == 0 || s + sep_len > top) {
|
|
|
|
s = top;
|
|
|
|
break;
|
|
|
|
} else if (memcmp(s, sep_str, sep_len) == 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
s++;
|
|
|
|
}
|
2016-05-13 07:21:32 -04:00
|
|
|
mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
|
2014-04-06 06:11:15 -04:00
|
|
|
if (s >= top) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
s += sep_len;
|
|
|
|
if (splits > 0) {
|
|
|
|
splits--;
|
|
|
|
}
|
|
|
|
}
|
2014-01-20 22:00:21 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, mp_obj_str_split);
|
2014-01-20 22:00:21 -05:00
|
|
|
|
2015-04-03 17:09:23 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_SPLITLINES
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_splitlines(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
|
2016-05-13 07:21:32 -04:00
|
|
|
enum { ARG_keepends };
|
2015-04-03 17:09:23 -04:00
|
|
|
static const mp_arg_t allowed_args[] = {
|
|
|
|
{ MP_QSTR_keepends, MP_ARG_BOOL, {.u_bool = false} },
|
|
|
|
};
|
|
|
|
|
|
|
|
// parse args
|
2016-05-13 07:21:32 -04:00
|
|
|
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
|
|
|
|
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
|
|
|
|
|
|
|
|
const mp_obj_type_t *self_type = mp_obj_get_type(pos_args[0]);
|
|
|
|
mp_obj_t res = mp_obj_new_list(0, NULL);
|
|
|
|
|
|
|
|
GET_STR_DATA_LEN(pos_args[0], s, len);
|
|
|
|
const byte *top = s + len;
|
|
|
|
|
|
|
|
while (s < top) {
|
|
|
|
const byte *start = s;
|
|
|
|
size_t match = 0;
|
|
|
|
while (s < top) {
|
|
|
|
if (*s == '\n') {
|
|
|
|
match = 1;
|
|
|
|
break;
|
|
|
|
} else if (*s == '\r') {
|
|
|
|
if (s[1] == '\n') {
|
|
|
|
match = 2;
|
|
|
|
} else {
|
|
|
|
match = 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
size_t sub_len = s - start;
|
|
|
|
if (args[ARG_keepends].u_bool) {
|
|
|
|
sub_len += match;
|
|
|
|
}
|
|
|
|
mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, sub_len));
|
|
|
|
s += match;
|
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
2015-04-03 17:09:23 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_KW(str_splitlines_obj, 1, str_splitlines);
|
2015-04-03 17:09:23 -04:00
|
|
|
#endif
|
|
|
|
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_rsplit(size_t n_args, const mp_obj_t *args) {
|
2014-05-13 01:07:08 -04:00
|
|
|
if (n_args < 3) {
|
|
|
|
// If we don't have split limit, it doesn't matter from which side
|
|
|
|
// we split.
|
2015-03-23 16:15:12 -04:00
|
|
|
return mp_obj_str_split(n_args, args);
|
2014-05-13 01:07:08 -04:00
|
|
|
}
|
|
|
|
const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
|
|
|
|
mp_obj_t sep = args[1];
|
|
|
|
GET_STR_DATA_LEN(args[0], s, len);
|
|
|
|
|
2014-07-03 08:25:24 -04:00
|
|
|
mp_int_t splits = mp_obj_get_int(args[2]);
|
2017-06-01 23:07:22 -04:00
|
|
|
if (splits < 0) {
|
|
|
|
// Negative limit means no limit, so delegate to split().
|
|
|
|
return mp_obj_str_split(n_args, args);
|
|
|
|
}
|
|
|
|
|
2014-07-03 08:25:24 -04:00
|
|
|
mp_int_t org_splits = splits;
|
2014-05-13 01:07:08 -04:00
|
|
|
// Preallocate list to the max expected # of elements, as we
|
|
|
|
// will fill it from the end.
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_list_t *res = MP_OBJ_TO_PTR(mp_obj_new_list(splits + 1, NULL));
|
2014-10-03 14:52:22 -04:00
|
|
|
mp_int_t idx = splits;
|
2014-05-13 01:07:08 -04:00
|
|
|
|
|
|
|
if (sep == mp_const_none) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_NotImplementedError(MP_ERROR_TEXT("rsplit(None,n)"));
|
2014-05-13 01:07:08 -04:00
|
|
|
} else {
|
2017-03-25 04:48:18 -04:00
|
|
|
size_t sep_len;
|
2014-05-13 01:07:08 -04:00
|
|
|
const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
|
|
|
|
|
|
|
|
if (sep_len == 0) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("empty separator"));
|
2014-05-13 01:07:08 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
const byte *beg = s;
|
|
|
|
const byte *last = s + len;
|
|
|
|
for (;;) {
|
|
|
|
s = last - sep_len;
|
|
|
|
for (;;) {
|
|
|
|
if (splits == 0 || s < beg) {
|
|
|
|
break;
|
|
|
|
} else if (memcmp(s, sep_str, sep_len) == 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
s--;
|
|
|
|
}
|
|
|
|
if (s < beg || splits == 0) {
|
2014-05-25 17:34:34 -04:00
|
|
|
res->items[idx] = mp_obj_new_str_of_type(self_type, beg, last - beg);
|
2014-05-13 01:07:08 -04:00
|
|
|
break;
|
|
|
|
}
|
2014-05-25 17:34:34 -04:00
|
|
|
res->items[idx--] = mp_obj_new_str_of_type(self_type, s + sep_len, last - s - sep_len);
|
2014-05-13 01:07:08 -04:00
|
|
|
last = s;
|
2018-02-20 03:19:02 -05:00
|
|
|
splits--;
|
2014-05-13 01:07:08 -04:00
|
|
|
}
|
|
|
|
if (idx != 0) {
|
|
|
|
// We split less parts than split limit, now go cleanup surplus
|
2017-02-16 00:26:48 -05:00
|
|
|
size_t used = org_splits + 1 - idx;
|
2014-08-29 16:07:54 -04:00
|
|
|
memmove(res->items, &res->items[idx], used * sizeof(mp_obj_t));
|
2014-05-13 01:07:08 -04:00
|
|
|
mp_seq_clear(res->items, used, res->alloc, sizeof(*res->items));
|
|
|
|
res->len = used;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(res);
|
2014-05-13 01:07:08 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rsplit_obj, 1, 3, str_rsplit);
|
2014-05-13 01:07:08 -04:00
|
|
|
|
2017-02-16 00:26:48 -05:00
|
|
|
STATIC mp_obj_t str_finder(size_t n_args, const mp_obj_t *args, int direction, bool is_index) {
|
2014-06-13 23:06:36 -04:00
|
|
|
const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
|
2021-04-22 20:55:39 -04:00
|
|
|
mp_check_self(mp_obj_is_str_or_bytes(args[0]));
|
2014-11-05 11:45:54 -05:00
|
|
|
|
|
|
|
// check argument type
|
2014-12-24 15:28:30 -05:00
|
|
|
if (mp_obj_get_type(args[1]) != self_type) {
|
2014-11-05 11:45:54 -05:00
|
|
|
bad_implicit_conversion(args[1]);
|
|
|
|
}
|
2014-01-12 16:53:52 -05:00
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(args[0], haystack, haystack_len);
|
|
|
|
GET_STR_DATA_LEN(args[1], needle, needle_len);
|
2014-01-12 16:53:52 -05:00
|
|
|
|
2014-06-13 23:06:36 -04:00
|
|
|
const byte *start = haystack;
|
|
|
|
const byte *end = haystack + haystack_len;
|
2014-01-12 16:53:52 -05:00
|
|
|
if (n_args >= 3 && args[2] != mp_const_none) {
|
2014-06-13 23:06:36 -04:00
|
|
|
start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
|
2014-01-12 16:53:52 -05:00
|
|
|
}
|
|
|
|
if (n_args >= 4 && args[3] != mp_const_none) {
|
2014-06-13 23:06:36 -04:00
|
|
|
end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
|
2014-01-12 16:53:52 -05:00
|
|
|
}
|
|
|
|
|
2018-03-31 22:27:56 -04:00
|
|
|
if (end < start) {
|
|
|
|
goto out_error;
|
|
|
|
}
|
|
|
|
|
2014-06-13 23:06:36 -04:00
|
|
|
const byte *p = find_subbytes(start, end - start, needle, needle_len, direction);
|
2014-01-13 14:39:01 -05:00
|
|
|
if (p == NULL) {
|
2018-03-31 22:27:56 -04:00
|
|
|
out_error:
|
2014-01-13 14:39:01 -05:00
|
|
|
// not found
|
2014-04-08 14:42:19 -04:00
|
|
|
if (is_index) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("substring not found"));
|
2014-04-08 14:42:19 -04:00
|
|
|
} else {
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(-1);
|
|
|
|
}
|
2014-01-13 14:39:01 -05:00
|
|
|
} else {
|
|
|
|
// found
|
2014-06-13 20:15:00 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_UNICODE
|
|
|
|
if (self_type == &mp_type_str) {
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(utf8_ptr_to_index(haystack, p));
|
|
|
|
}
|
|
|
|
#endif
|
2014-03-24 02:31:58 -04:00
|
|
|
return MP_OBJ_NEW_SMALL_INT(p - haystack);
|
2014-01-12 16:53:52 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_find(size_t n_args, const mp_obj_t *args) {
|
2014-04-08 14:42:19 -04:00
|
|
|
return str_finder(n_args, args, 1, false);
|
2014-03-24 02:31:58 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj, 2, 4, str_find);
|
2014-03-24 02:31:58 -04:00
|
|
|
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_rfind(size_t n_args, const mp_obj_t *args) {
|
2014-04-08 14:42:19 -04:00
|
|
|
return str_finder(n_args, args, -1, false);
|
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rfind_obj, 2, 4, str_rfind);
|
2014-04-08 14:42:19 -04:00
|
|
|
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_index(size_t n_args, const mp_obj_t *args) {
|
2014-04-08 14:42:19 -04:00
|
|
|
return str_finder(n_args, args, 1, true);
|
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_index_obj, 2, 4, str_index);
|
2014-04-08 14:42:19 -04:00
|
|
|
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_rindex(size_t n_args, const mp_obj_t *args) {
|
2014-04-08 14:42:19 -04:00
|
|
|
return str_finder(n_args, args, -1, true);
|
2014-03-24 02:31:58 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rindex_obj, 2, 4, str_rindex);
|
2014-03-24 02:31:58 -04:00
|
|
|
|
2014-01-22 18:20:40 -05:00
|
|
|
// TODO: (Much) more variety in args
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_startswith(size_t n_args, const mp_obj_t *args) {
|
2014-06-13 23:06:36 -04:00
|
|
|
const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
|
2014-05-15 14:18:34 -04:00
|
|
|
GET_STR_DATA_LEN(args[0], str, str_len);
|
2017-08-28 17:06:21 -04:00
|
|
|
size_t prefix_len;
|
|
|
|
const char *prefix = mp_obj_str_get_data(args[1], &prefix_len);
|
2014-06-13 23:06:36 -04:00
|
|
|
const byte *start = str;
|
2014-05-15 14:18:34 -04:00
|
|
|
if (n_args > 2) {
|
2014-06-13 23:06:36 -04:00
|
|
|
start = str_index_to_ptr(self_type, str, str_len, args[2], true);
|
2014-05-15 14:18:34 -04:00
|
|
|
}
|
2014-06-13 23:06:36 -04:00
|
|
|
if (prefix_len + (start - str) > str_len) {
|
2014-01-22 18:20:40 -05:00
|
|
|
return mp_const_false;
|
|
|
|
}
|
2015-10-11 05:09:43 -04:00
|
|
|
return mp_obj_new_bool(memcmp(start, prefix, prefix_len) == 0);
|
2014-01-22 18:20:40 -05:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_startswith_obj, 2, 3, str_startswith);
|
2014-01-22 18:20:40 -05:00
|
|
|
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_endswith(size_t n_args, const mp_obj_t *args) {
|
2014-05-24 15:46:51 -04:00
|
|
|
GET_STR_DATA_LEN(args[0], str, str_len);
|
2017-08-28 17:06:21 -04:00
|
|
|
size_t suffix_len;
|
|
|
|
const char *suffix = mp_obj_str_get_data(args[1], &suffix_len);
|
2015-09-04 11:49:56 -04:00
|
|
|
if (n_args > 2) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_NotImplementedError(MP_ERROR_TEXT("start/end indices"));
|
2015-09-04 11:49:56 -04:00
|
|
|
}
|
2014-05-24 15:46:51 -04:00
|
|
|
|
|
|
|
if (suffix_len > str_len) {
|
|
|
|
return mp_const_false;
|
|
|
|
}
|
2015-10-11 05:09:43 -04:00
|
|
|
return mp_obj_new_bool(memcmp(str + (str_len - suffix_len), suffix, suffix_len) == 0);
|
2014-05-24 15:46:51 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_endswith_obj, 2, 3, str_endswith);
|
2014-05-24 15:46:51 -04:00
|
|
|
|
2014-04-25 23:20:08 -04:00
|
|
|
enum { LSTRIP, RSTRIP, STRIP };
|
|
|
|
|
2017-02-02 21:04:56 -05:00
|
|
|
STATIC mp_obj_t str_uni_strip(int type, size_t n_args, const mp_obj_t *args) {
|
2021-04-22 20:55:39 -04:00
|
|
|
mp_check_self(mp_obj_is_str_or_bytes(args[0]));
|
2014-05-11 06:17:29 -04:00
|
|
|
const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
|
2014-01-22 09:35:10 -05:00
|
|
|
|
|
|
|
const byte *chars_to_del;
|
|
|
|
uint chars_to_del_len;
|
|
|
|
static const byte whitespace[] = " \t\n\r\v\f";
|
2014-01-08 17:23:45 -05:00
|
|
|
|
|
|
|
if (n_args == 1) {
|
|
|
|
chars_to_del = whitespace;
|
2017-09-19 14:19:23 -04:00
|
|
|
chars_to_del_len = sizeof(whitespace) - 1;
|
2014-01-08 17:23:45 -05:00
|
|
|
} else {
|
2014-05-11 06:17:29 -04:00
|
|
|
if (mp_obj_get_type(args[1]) != self_type) {
|
2014-12-24 15:28:30 -05:00
|
|
|
bad_implicit_conversion(args[1]);
|
2014-05-11 06:17:29 -04:00
|
|
|
}
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(args[1], s, l);
|
|
|
|
chars_to_del = s;
|
|
|
|
chars_to_del_len = l;
|
2014-01-08 17:23:45 -05:00
|
|
|
}
|
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(args[0], orig_str, orig_str_len);
|
2014-01-08 17:23:45 -05:00
|
|
|
|
2017-02-16 00:26:48 -05:00
|
|
|
size_t first_good_char_pos = 0;
|
2014-01-08 17:23:45 -05:00
|
|
|
bool first_good_char_pos_set = false;
|
2017-02-16 00:26:48 -05:00
|
|
|
size_t last_good_char_pos = 0;
|
|
|
|
size_t i = 0;
|
|
|
|
int delta = 1;
|
2014-04-25 23:48:31 -04:00
|
|
|
if (type == RSTRIP) {
|
|
|
|
i = orig_str_len - 1;
|
|
|
|
delta = -1;
|
|
|
|
}
|
2017-02-16 00:26:48 -05:00
|
|
|
for (size_t len = orig_str_len; len > 0; len--) {
|
2014-03-24 02:31:58 -04:00
|
|
|
if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) {
|
2014-01-08 17:23:45 -05:00
|
|
|
if (!first_good_char_pos_set) {
|
2014-05-29 20:07:05 -04:00
|
|
|
first_good_char_pos_set = true;
|
2014-01-08 17:23:45 -05:00
|
|
|
first_good_char_pos = i;
|
2014-04-25 23:20:08 -04:00
|
|
|
if (type == LSTRIP) {
|
|
|
|
last_good_char_pos = orig_str_len - 1;
|
|
|
|
break;
|
2014-04-25 23:48:31 -04:00
|
|
|
} else if (type == RSTRIP) {
|
|
|
|
first_good_char_pos = 0;
|
|
|
|
last_good_char_pos = i;
|
|
|
|
break;
|
2014-04-25 23:20:08 -04:00
|
|
|
}
|
2014-01-08 17:23:45 -05:00
|
|
|
}
|
2014-04-25 23:20:08 -04:00
|
|
|
last_good_char_pos = i;
|
2014-01-08 17:23:45 -05:00
|
|
|
}
|
2014-04-25 23:48:31 -04:00
|
|
|
i += delta;
|
2014-01-08 17:23:45 -05:00
|
|
|
}
|
|
|
|
|
2014-05-29 20:07:05 -04:00
|
|
|
if (!first_good_char_pos_set) {
|
2014-01-22 09:35:10 -05:00
|
|
|
// string is all whitespace, return ''
|
2014-12-24 15:28:30 -05:00
|
|
|
if (self_type == &mp_type_str) {
|
|
|
|
return MP_OBJ_NEW_QSTR(MP_QSTR_);
|
|
|
|
} else {
|
|
|
|
return mp_const_empty_bytes;
|
|
|
|
}
|
2014-01-08 17:23:45 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
assert(last_good_char_pos >= first_good_char_pos);
|
2021-03-15 09:57:36 -04:00
|
|
|
// +1 to accommodate the last character
|
2017-02-16 00:26:48 -05:00
|
|
|
size_t stripped_len = last_good_char_pos - first_good_char_pos + 1;
|
2014-05-29 20:11:44 -04:00
|
|
|
if (stripped_len == orig_str_len) {
|
|
|
|
// If nothing was stripped, don't bother to dup original string
|
|
|
|
// TODO: watch out for this case when we'll get to bytearray.strip()
|
|
|
|
assert(first_good_char_pos == 0);
|
|
|
|
return args[0];
|
|
|
|
}
|
2014-05-25 17:34:34 -04:00
|
|
|
return mp_obj_new_str_of_type(self_type, orig_str + first_good_char_pos, stripped_len);
|
2014-01-08 17:23:45 -05:00
|
|
|
}
|
|
|
|
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_strip(size_t n_args, const mp_obj_t *args) {
|
2014-04-25 23:20:08 -04:00
|
|
|
return str_uni_strip(STRIP, n_args, args);
|
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip);
|
2014-04-25 23:20:08 -04:00
|
|
|
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_lstrip(size_t n_args, const mp_obj_t *args) {
|
2014-04-25 23:20:08 -04:00
|
|
|
return str_uni_strip(LSTRIP, n_args, args);
|
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_lstrip_obj, 1, 2, str_lstrip);
|
2014-04-25 23:20:08 -04:00
|
|
|
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_rstrip(size_t n_args, const mp_obj_t *args) {
|
2014-04-25 23:20:08 -04:00
|
|
|
return str_uni_strip(RSTRIP, n_args, args);
|
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rstrip_obj, 1, 2, str_rstrip);
|
2014-04-25 23:20:08 -04:00
|
|
|
|
2016-05-21 17:13:44 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_CENTER
|
|
|
|
STATIC mp_obj_t str_center(mp_obj_t str_in, mp_obj_t width_in) {
|
|
|
|
GET_STR_DATA_LEN(str_in, str, str_len);
|
2016-05-21 19:22:14 -04:00
|
|
|
mp_uint_t width = mp_obj_get_int(width_in);
|
2016-05-21 17:13:44 -04:00
|
|
|
if (str_len >= width) {
|
|
|
|
return str_in;
|
|
|
|
}
|
|
|
|
|
|
|
|
vstr_t vstr;
|
|
|
|
vstr_init_len(&vstr, width);
|
|
|
|
memset(vstr.buf, ' ', width);
|
|
|
|
int left = (width - str_len) / 2;
|
|
|
|
memcpy(vstr.buf + left, str, str_len);
|
|
|
|
return mp_obj_new_str_from_vstr(mp_obj_get_type(str_in), &vstr);
|
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_2(str_center_obj, str_center);
|
2016-05-21 17:13:44 -04:00
|
|
|
#endif
|
|
|
|
|
2014-03-31 00:06:50 -04:00
|
|
|
// Takes an int arg, but only parses unsigned numbers, and only changes
|
|
|
|
// *num if at least one digit was parsed.
|
2016-02-02 10:51:57 -05:00
|
|
|
STATIC const char *str_to_int(const char *str, const char *top, int *num) {
|
|
|
|
if (str < top && '0' <= *str && *str <= '9') {
|
2014-03-31 00:06:50 -04:00
|
|
|
*num = 0;
|
|
|
|
do {
|
2016-02-02 10:51:57 -05:00
|
|
|
*num = *num * 10 + (*str - '0');
|
|
|
|
str++;
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2016-02-02 10:51:57 -05:00
|
|
|
while (str < top && '0' <= *str && *str <= '9');
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2016-02-02 10:51:57 -05:00
|
|
|
return str;
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
|
2015-04-04 10:53:11 -04:00
|
|
|
STATIC bool isalignment(char ch) {
|
2014-03-31 00:06:50 -04:00
|
|
|
return ch && strchr("<>=^", ch) != NULL;
|
|
|
|
}
|
|
|
|
|
2015-04-04 10:53:11 -04:00
|
|
|
STATIC bool istype(char ch) {
|
2014-03-31 00:06:50 -04:00
|
|
|
return ch && strchr("bcdeEfFgGnosxX%", ch) != NULL;
|
|
|
|
}
|
|
|
|
|
2015-04-04 10:53:11 -04:00
|
|
|
STATIC bool arg_looks_integer(mp_obj_t arg) {
|
2020-01-22 07:19:14 -05:00
|
|
|
return mp_obj_is_bool(arg) || mp_obj_is_int(arg);
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
|
2015-04-04 10:53:11 -04:00
|
|
|
STATIC bool arg_looks_numeric(mp_obj_t arg) {
|
2014-03-31 00:06:50 -04:00
|
|
|
return arg_looks_integer(arg)
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_FLOAT
|
|
|
|
|| mp_obj_is_float(arg)
|
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
;
|
|
|
|
}
|
|
|
|
|
2018-08-15 08:17:41 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_OP_MODULO
|
2015-04-04 10:53:11 -04:00
|
|
|
STATIC mp_obj_t arg_as_int(mp_obj_t arg) {
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_FLOAT
|
2015-08-20 18:30:12 -04:00
|
|
|
if (mp_obj_is_float(arg)) {
|
|
|
|
return mp_obj_new_int_from_float(mp_obj_float_get(arg));
|
2014-04-05 11:21:45 -04:00
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2014-04-07 14:19:51 -04:00
|
|
|
return arg;
|
2014-04-05 11:21:45 -04:00
|
|
|
}
|
2018-08-15 08:17:41 -04:00
|
|
|
#endif
|
2014-04-05 11:21:45 -04:00
|
|
|
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2014-11-06 12:36:16 -05:00
|
|
|
STATIC NORETURN void terse_str_format_value_error(void) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("bad format string"));
|
2014-11-06 12:36:16 -05:00
|
|
|
}
|
2016-09-27 01:45:42 -04:00
|
|
|
#else
|
|
|
|
// define to nothing to improve coverage
|
|
|
|
#define terse_str_format_value_error()
|
|
|
|
#endif
|
2014-11-06 12:36:16 -05:00
|
|
|
|
2017-02-02 21:04:56 -05:00
|
|
|
STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *arg_i, size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
|
2015-01-21 14:14:25 -05:00
|
|
|
vstr_t vstr;
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_t print;
|
|
|
|
vstr_init_print(&vstr, 16, &print);
|
2014-03-31 00:06:50 -04:00
|
|
|
|
2016-01-29 04:09:10 -05:00
|
|
|
for (; str < top; str++) {
|
2014-03-31 00:06:50 -04:00
|
|
|
if (*str == '}') {
|
|
|
|
str++;
|
|
|
|
if (str < top && *str == '}') {
|
2015-08-26 10:29:49 -04:00
|
|
|
vstr_add_byte(&vstr, '}');
|
2014-03-31 00:06:50 -04:00
|
|
|
continue;
|
|
|
|
}
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("single '}' encountered in format string"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
if (*str != '{') {
|
2015-08-26 10:29:49 -04:00
|
|
|
vstr_add_byte(&vstr, *str);
|
2014-03-31 00:06:50 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
str++;
|
|
|
|
if (str < top && *str == '{') {
|
2015-08-26 10:29:49 -04:00
|
|
|
vstr_add_byte(&vstr, '{');
|
2014-03-31 00:06:50 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}"
|
|
|
|
|
2016-02-02 10:51:57 -05:00
|
|
|
const char *field_name = NULL;
|
|
|
|
const char *field_name_top = NULL;
|
2014-03-31 00:06:50 -04:00
|
|
|
char conversion = '\0';
|
2016-01-29 04:09:10 -05:00
|
|
|
const char *format_spec = NULL;
|
2014-03-31 00:06:50 -04:00
|
|
|
|
|
|
|
if (str < top && *str != '}' && *str != '!' && *str != ':') {
|
2016-02-02 10:51:57 -05:00
|
|
|
field_name = (const char *)str;
|
2014-03-31 00:06:50 -04:00
|
|
|
while (str < top && *str != '}' && *str != '!' && *str != ':') {
|
2016-02-02 10:51:57 -05:00
|
|
|
++str;
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2016-02-02 10:51:57 -05:00
|
|
|
field_name_top = (const char *)str;
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// conversion ::= "r" | "s"
|
|
|
|
|
|
|
|
if (str < top && *str == '!') {
|
2013-12-21 13:17:45 -05:00
|
|
|
str++;
|
2014-03-31 00:06:50 -04:00
|
|
|
if (str < top && (*str == 'r' || *str == 's')) {
|
|
|
|
conversion = *str++;
|
2014-01-15 15:45:20 -05:00
|
|
|
} else {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("bad conversion specifier"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
if (str >= top) {
|
|
|
|
mp_raise_ValueError(
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("end of format while looking for conversion specifier"));
|
2021-03-15 09:57:36 -04:00
|
|
|
} else {
|
2019-09-26 08:52:04 -04:00
|
|
|
mp_raise_msg_varg(&mp_type_ValueError,
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("unknown conversion specifier %c"), *str);
|
2021-03-15 09:57:36 -04:00
|
|
|
}
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (str < top && *str == ':') {
|
|
|
|
str++;
|
|
|
|
// {:} is the same as {}, which is the same as {!s}
|
|
|
|
// This makes a difference when passing in a True or False
|
|
|
|
// '{}'.format(True) returns 'True'
|
|
|
|
// '{:d}'.format(True) returns '1'
|
|
|
|
// So we treat {:} as {} and this later gets treated to be {!s}
|
|
|
|
if (*str != '}') {
|
2016-01-29 04:09:10 -05:00
|
|
|
format_spec = str;
|
|
|
|
for (int nest = 1; str < top;) {
|
|
|
|
if (*str == '{') {
|
|
|
|
++nest;
|
|
|
|
} else if (*str == '}') {
|
|
|
|
if (--nest == 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
++str;
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (str >= top) {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("unmatched '{' in format"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
if (*str != '}') {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2019-09-26 08:52:04 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("expected ':' after format specifier"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t arg = mp_const_none;
|
|
|
|
|
|
|
|
if (field_name) {
|
2014-04-14 16:20:30 -04:00
|
|
|
int index = 0;
|
2016-02-02 10:51:57 -05:00
|
|
|
if (MP_LIKELY(unichar_isdigit(*field_name))) {
|
2016-01-29 04:09:10 -05:00
|
|
|
if (*arg_i > 0) {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_raise_ValueError(
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("can't switch from automatic field numbering to manual field specification"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2015-01-03 17:14:13 -05:00
|
|
|
}
|
2016-02-02 10:51:57 -05:00
|
|
|
field_name = str_to_int(field_name, field_name_top, &index);
|
2015-01-16 12:47:07 -05:00
|
|
|
if ((uint)index >= n_args - 1) {
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_IndexError_varg(MP_ERROR_TEXT("%q index out of range"), MP_QSTR_tuple);
|
2015-01-03 17:14:13 -05:00
|
|
|
}
|
|
|
|
arg = args[index + 1];
|
2016-01-29 04:09:10 -05:00
|
|
|
*arg_i = -1;
|
2015-01-03 17:14:13 -05:00
|
|
|
} else {
|
2016-02-02 10:51:57 -05:00
|
|
|
const char *lookup;
|
2021-03-15 09:57:36 -04:00
|
|
|
for (lookup = field_name; lookup < field_name_top && *lookup != '.' && *lookup != '['; lookup++) {;
|
|
|
|
}
|
2017-11-15 21:17:51 -05:00
|
|
|
mp_obj_t field_q = mp_obj_new_str_via_qstr(field_name, lookup - field_name); // should it be via qstr?
|
2016-02-02 10:51:57 -05:00
|
|
|
field_name = lookup;
|
2015-01-03 17:14:13 -05:00
|
|
|
mp_map_elem_t *key_elem = mp_map_lookup(kwargs, field_q, MP_MAP_LOOKUP);
|
|
|
|
if (key_elem == NULL) {
|
2021-07-14 08:56:52 -04:00
|
|
|
mp_raise_type_arg(&mp_type_KeyError, field_q);
|
2015-01-03 17:14:13 -05:00
|
|
|
}
|
|
|
|
arg = key_elem->value;
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2016-02-02 10:51:57 -05:00
|
|
|
if (field_name < field_name_top) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_NotImplementedError(MP_ERROR_TEXT("attributes not supported yet"));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2013-12-21 13:17:45 -05:00
|
|
|
} else {
|
2016-01-29 04:09:10 -05:00
|
|
|
if (*arg_i < 0) {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_raise_ValueError(
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("can't switch from manual field specification to automatic field numbering"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2016-01-29 04:09:10 -05:00
|
|
|
if ((uint)*arg_i >= n_args - 1) {
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_IndexError_varg(MP_ERROR_TEXT("%q index out of range"), MP_QSTR_tuple);
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2016-01-29 04:09:10 -05:00
|
|
|
arg = args[(*arg_i) + 1];
|
|
|
|
(*arg_i)++;
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
if (!format_spec && !conversion) {
|
|
|
|
conversion = 's';
|
|
|
|
}
|
|
|
|
if (conversion) {
|
|
|
|
mp_print_kind_t print_kind;
|
|
|
|
if (conversion == 's') {
|
|
|
|
print_kind = PRINT_STR;
|
|
|
|
} else {
|
2015-08-30 07:43:21 -04:00
|
|
|
assert(conversion == 'r');
|
|
|
|
print_kind = PRINT_REPR;
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2015-01-21 14:14:25 -05:00
|
|
|
vstr_t arg_vstr;
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_t arg_print;
|
|
|
|
vstr_init_print(&arg_vstr, 16, &arg_print);
|
|
|
|
mp_obj_print_helper(&arg_print, arg, print_kind);
|
2015-01-21 14:14:25 -05:00
|
|
|
arg = mp_obj_new_str_from_vstr(&mp_type_str, &arg_vstr);
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
char fill = '\0';
|
|
|
|
char align = '\0';
|
|
|
|
int width = -1;
|
|
|
|
int precision = -1;
|
|
|
|
char type = '\0';
|
|
|
|
int flags = 0;
|
|
|
|
|
|
|
|
if (format_spec) {
|
|
|
|
// The format specifier (from http://docs.python.org/2/library/string.html#formatspec)
|
|
|
|
//
|
|
|
|
// [[fill]align][sign][#][0][width][,][.precision][type]
|
|
|
|
// fill ::= <any character>
|
|
|
|
// align ::= "<" | ">" | "=" | "^"
|
|
|
|
// sign ::= "+" | "-" | " "
|
|
|
|
// width ::= integer
|
|
|
|
// precision ::= integer
|
|
|
|
// type ::= "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
|
|
|
|
|
2016-01-29 04:09:10 -05:00
|
|
|
// recursively call the formatter to format any nested specifiers
|
|
|
|
MP_STACK_CHECK();
|
|
|
|
vstr_t format_spec_vstr = mp_obj_str_format_helper(format_spec, str, arg_i, n_args, args, kwargs);
|
2016-05-09 16:42:42 -04:00
|
|
|
const char *s = vstr_null_terminated_str(&format_spec_vstr);
|
2016-02-02 10:51:57 -05:00
|
|
|
const char *stop = s + format_spec_vstr.len;
|
2014-03-31 00:06:50 -04:00
|
|
|
if (isalignment(*s)) {
|
|
|
|
align = *s++;
|
|
|
|
} else if (*s && isalignment(s[1])) {
|
|
|
|
fill = *s++;
|
|
|
|
align = *s++;
|
|
|
|
}
|
|
|
|
if (*s == '+' || *s == '-' || *s == ' ') {
|
|
|
|
if (*s == '+') {
|
|
|
|
flags |= PF_FLAG_SHOW_SIGN;
|
|
|
|
} else if (*s == ' ') {
|
|
|
|
flags |= PF_FLAG_SPACE_SIGN;
|
|
|
|
}
|
2017-07-03 12:13:27 -04:00
|
|
|
s++;
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
if (*s == '#') {
|
|
|
|
flags |= PF_FLAG_SHOW_PREFIX;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
if (*s == '0') {
|
|
|
|
if (!align) {
|
|
|
|
align = '=';
|
|
|
|
}
|
|
|
|
if (!fill) {
|
|
|
|
fill = '0';
|
|
|
|
}
|
|
|
|
}
|
2016-02-02 10:51:57 -05:00
|
|
|
s = str_to_int(s, stop, &width);
|
2014-03-31 00:06:50 -04:00
|
|
|
if (*s == ',') {
|
|
|
|
flags |= PF_FLAG_SHOW_COMMA;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
if (*s == '.') {
|
|
|
|
s++;
|
2016-02-02 10:51:57 -05:00
|
|
|
s = str_to_int(s, stop, &precision);
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
if (istype(*s)) {
|
|
|
|
type = *s++;
|
|
|
|
}
|
2016-05-09 16:42:42 -04:00
|
|
|
if (*s) {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("invalid format specifier"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2016-01-29 04:09:10 -05:00
|
|
|
vstr_clear(&format_spec_vstr);
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
if (!align) {
|
|
|
|
if (arg_looks_numeric(arg)) {
|
|
|
|
align = '>';
|
|
|
|
} else {
|
|
|
|
align = '<';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!fill) {
|
|
|
|
fill = ' ';
|
|
|
|
}
|
|
|
|
|
2017-07-03 12:13:27 -04:00
|
|
|
if (flags & (PF_FLAG_SHOW_SIGN | PF_FLAG_SPACE_SIGN)) {
|
2014-03-31 00:06:50 -04:00
|
|
|
if (type == 's') {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("sign not allowed in string format specifier"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
if (type == 'c') {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_raise_ValueError(
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("sign not allowed with integer format specifier 'c'"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (align) {
|
2021-03-15 09:57:36 -04:00
|
|
|
case '<':
|
|
|
|
flags |= PF_FLAG_LEFT_ADJUST;
|
|
|
|
break;
|
|
|
|
case '=':
|
|
|
|
flags |= PF_FLAG_PAD_AFTER_SIGN;
|
|
|
|
break;
|
|
|
|
case '^':
|
|
|
|
flags |= PF_FLAG_CENTER_ADJUST;
|
|
|
|
break;
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (arg_looks_integer(arg)) {
|
|
|
|
switch (type) {
|
|
|
|
case 'b':
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_mp_int(&print, arg, 2, 'a', flags, fill, width, 0);
|
2014-03-31 00:06:50 -04:00
|
|
|
continue;
|
|
|
|
|
2021-03-15 09:57:36 -04:00
|
|
|
case 'c': {
|
2014-03-31 00:06:50 -04:00
|
|
|
char ch = mp_obj_get_int(arg);
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_strn(&print, &ch, 1, flags, fill, width);
|
2014-03-31 00:06:50 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
case '\0': // No explicit format type implies 'd'
|
|
|
|
case 'n': // I don't think we support locales in uPy so use 'd'
|
|
|
|
case 'd':
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_mp_int(&print, arg, 10, 'a', flags, fill, width, 0);
|
2014-03-31 00:06:50 -04:00
|
|
|
continue;
|
|
|
|
|
|
|
|
case 'o':
|
2014-04-07 14:19:51 -04:00
|
|
|
if (flags & PF_FLAG_SHOW_PREFIX) {
|
|
|
|
flags |= PF_FLAG_SHOW_OCTAL_LETTER;
|
|
|
|
}
|
|
|
|
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_mp_int(&print, arg, 8, 'a', flags, fill, width, 0);
|
2014-03-31 00:06:50 -04:00
|
|
|
continue;
|
|
|
|
|
|
|
|
case 'X':
|
2014-06-05 13:57:38 -04:00
|
|
|
case 'x':
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_mp_int(&print, arg, 16, type - ('X' - 'A'), flags, fill, width, 0);
|
2014-03-31 00:06:50 -04:00
|
|
|
continue;
|
|
|
|
|
|
|
|
case 'e':
|
|
|
|
case 'E':
|
|
|
|
case 'f':
|
|
|
|
case 'F':
|
|
|
|
case 'g':
|
|
|
|
case 'G':
|
|
|
|
case '%':
|
|
|
|
// The floating point formatters all work with anything that
|
|
|
|
// looks like an integer
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_raise_ValueError_varg(
|
2021-05-04 14:40:55 -04:00
|
|
|
MP_ERROR_TEXT("unknown format code '%c' for object of type '%q'"),
|
2021-03-15 09:57:36 -04:00
|
|
|
type, mp_obj_get_type_qstr(arg));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2014-04-02 15:04:15 -04:00
|
|
|
}
|
2014-04-02 12:06:05 -04:00
|
|
|
|
2014-04-02 15:07:31 -04:00
|
|
|
// NOTE: no else here. We need the e, f, g etc formats for integer
|
|
|
|
// arguments (from above if) to take this if.
|
2014-04-02 15:04:15 -04:00
|
|
|
if (arg_looks_numeric(arg)) {
|
2014-03-31 00:06:50 -04:00
|
|
|
if (!type) {
|
|
|
|
|
|
|
|
// Even though the docs say that an unspecified type is the same
|
|
|
|
// as 'g', there is one subtle difference, when the exponent
|
|
|
|
// is one less than the precision.
|
2014-06-05 13:57:38 -04:00
|
|
|
//
|
2014-03-31 00:06:50 -04:00
|
|
|
// '{:10.1}'.format(0.0) ==> '0e+00'
|
|
|
|
// '{:10.1g}'.format(0.0) ==> '0'
|
|
|
|
//
|
|
|
|
// TODO: Figure out how to deal with this.
|
|
|
|
//
|
|
|
|
// A proper solution would involve adding a special flag
|
|
|
|
// or something to format_float, and create a format_double
|
|
|
|
// to deal with doubles. In order to fix this when using
|
|
|
|
// sprintf, we'd need to use the e format and tweak the
|
|
|
|
// returned result to strip trailing zeros like the g format
|
|
|
|
// does.
|
|
|
|
//
|
|
|
|
// {:10.3} and {:10.2e} with 1.23e2 both produce 1.23e+02
|
|
|
|
// but with 1.e2 you get 1e+02 and 1.00e+02
|
|
|
|
//
|
|
|
|
// Stripping the trailing 0's (like g) does would make the
|
|
|
|
// e format give us the right format.
|
|
|
|
//
|
|
|
|
// CPython sources say:
|
|
|
|
// Omitted type specifier. Behaves in the same way as repr(x)
|
|
|
|
// and str(x) if no precision is given, else like 'g', but with
|
|
|
|
// at least one digit after the decimal point. */
|
|
|
|
|
|
|
|
type = 'g';
|
|
|
|
}
|
|
|
|
if (type == 'n') {
|
|
|
|
type = 'g';
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (type) {
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_FLOAT
|
2014-03-31 00:06:50 -04:00
|
|
|
case 'e':
|
|
|
|
case 'E':
|
|
|
|
case 'f':
|
|
|
|
case 'F':
|
|
|
|
case 'g':
|
|
|
|
case 'G':
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_float(&print, mp_obj_get_float(arg), type, flags, fill, width, precision);
|
2014-03-31 00:06:50 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case '%':
|
|
|
|
flags |= PF_FLAG_ADD_PERCENT;
|
2015-01-12 16:56:35 -05:00
|
|
|
#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
|
|
|
|
#define F100 100.0F
|
|
|
|
#else
|
|
|
|
#define F100 100.0
|
|
|
|
#endif
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_float(&print, mp_obj_get_float(arg) * F100, 'f', flags, fill, width, precision);
|
2021-03-15 09:57:36 -04:00
|
|
|
#undef F100
|
2014-03-31 00:06:50 -04:00
|
|
|
break;
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
|
|
|
|
default:
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_raise_ValueError_varg(
|
2021-05-04 14:40:55 -04:00
|
|
|
MP_ERROR_TEXT("unknown format code '%c' for object of type '%q'"),
|
2021-03-15 09:57:36 -04:00
|
|
|
type, mp_obj_get_type_qstr(arg));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
} else {
|
2014-04-02 12:06:05 -04:00
|
|
|
// arg doesn't look like a number
|
|
|
|
|
2014-03-31 00:06:50 -04:00
|
|
|
if (align == '=') {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_raise_ValueError(
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("'=' alignment not allowed in string format specifier"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2014-04-02 12:06:05 -04:00
|
|
|
|
2014-03-31 00:06:50 -04:00
|
|
|
switch (type) {
|
2016-01-04 08:13:39 -05:00
|
|
|
case '\0': // no explicit format type implies 's'
|
2014-08-30 09:19:41 -04:00
|
|
|
case 's': {
|
2017-03-25 04:48:18 -04:00
|
|
|
size_t slen;
|
2015-01-20 06:55:10 -05:00
|
|
|
const char *s = mp_obj_str_get_data(arg, &slen);
|
2014-03-31 00:06:50 -04:00
|
|
|
if (precision < 0) {
|
2015-01-20 06:55:10 -05:00
|
|
|
precision = slen;
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2017-03-25 04:48:18 -04:00
|
|
|
if (slen > (size_t)precision) {
|
2015-01-20 06:55:10 -05:00
|
|
|
slen = precision;
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_strn(&print, s, slen, flags, fill, width);
|
2014-03-31 00:06:50 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_raise_ValueError_varg(
|
2021-05-04 14:40:55 -04:00
|
|
|
MP_ERROR_TEXT("unknown format code '%c' for object of type '%q'"),
|
2021-03-15 09:57:36 -04:00
|
|
|
type, mp_obj_get_type_qstr(arg));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-29 04:09:10 -05:00
|
|
|
return vstr;
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t mp_obj_str_format(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
|
2021-04-22 20:55:39 -04:00
|
|
|
mp_check_self(mp_obj_is_str_or_bytes(args[0]));
|
2016-01-29 04:09:10 -05:00
|
|
|
|
|
|
|
GET_STR_DATA_LEN(args[0], str, len);
|
|
|
|
int arg_i = 0;
|
2021-03-15 09:57:36 -04:00
|
|
|
vstr_t vstr = mp_obj_str_format_helper((const char *)str, (const char *)str + len, &arg_i, n_args, args, kwargs);
|
2018-09-21 19:44:04 -04:00
|
|
|
return mp_obj_new_str_from_vstr(mp_obj_get_type(args[0]), &vstr);
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_KW(str_format_obj, 1, mp_obj_str_format);
|
2013-12-21 13:17:45 -05:00
|
|
|
|
2018-08-15 08:17:41 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_OP_MODULO
|
2017-02-02 21:04:56 -05:00
|
|
|
STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_t *args, mp_obj_t dict) {
|
2021-04-22 20:55:39 -04:00
|
|
|
mp_check_self(mp_obj_is_str_or_bytes(pattern));
|
2014-03-31 14:18:28 -04:00
|
|
|
|
|
|
|
GET_STR_DATA_LEN(pattern, str, len);
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING > MICROPY_ERROR_REPORTING_TERSE
|
2014-04-02 14:42:39 -04:00
|
|
|
const byte *start_str = str;
|
2019-09-26 08:52:04 -04:00
|
|
|
#endif
|
2021-04-22 20:55:39 -04:00
|
|
|
bool is_bytes = mp_obj_is_type(pattern, &mp_type_bytes);
|
2017-02-02 21:04:56 -05:00
|
|
|
size_t arg_i = 0;
|
2015-01-21 14:14:25 -05:00
|
|
|
vstr_t vstr;
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_t print;
|
|
|
|
vstr_init_print(&vstr, 16, &print);
|
2014-04-02 14:42:39 -04:00
|
|
|
|
2014-03-31 14:18:28 -04:00
|
|
|
for (const byte *top = str + len; str < top; str++) {
|
2014-06-05 13:02:15 -04:00
|
|
|
mp_obj_t arg = MP_OBJ_NULL;
|
2014-04-02 14:42:39 -04:00
|
|
|
if (*str != '%') {
|
2015-08-26 10:29:49 -04:00
|
|
|
vstr_add_byte(&vstr, *str);
|
2014-04-02 14:42:39 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (++str >= top) {
|
2015-08-26 10:45:06 -04:00
|
|
|
goto incomplete_format;
|
2014-04-02 14:42:39 -04:00
|
|
|
}
|
2014-03-31 14:18:28 -04:00
|
|
|
if (*str == '%') {
|
2015-08-26 10:29:49 -04:00
|
|
|
vstr_add_byte(&vstr, '%');
|
2014-04-02 14:42:39 -04:00
|
|
|
continue;
|
|
|
|
}
|
2014-06-05 13:02:15 -04:00
|
|
|
|
|
|
|
// Dictionary value lookup
|
|
|
|
if (*str == '(') {
|
2017-02-02 20:13:44 -05:00
|
|
|
if (dict == MP_OBJ_NULL) {
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("format requires a dict"));
|
2017-02-02 20:13:44 -05:00
|
|
|
}
|
|
|
|
arg_i = 1; // we used up the single dict argument
|
2014-06-05 13:02:15 -04:00
|
|
|
const byte *key = ++str;
|
|
|
|
while (*str != ')') {
|
|
|
|
if (str >= top) {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("incomplete format key"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-06-05 13:02:15 -04:00
|
|
|
}
|
|
|
|
++str;
|
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_t k_obj = mp_obj_new_str_via_qstr((const char *)key, str - key);
|
2014-06-05 13:02:15 -04:00
|
|
|
arg = mp_obj_dict_get(dict, k_obj);
|
|
|
|
str++;
|
2014-04-02 14:42:39 -04:00
|
|
|
}
|
2014-06-05 13:02:15 -04:00
|
|
|
|
2014-04-02 14:42:39 -04:00
|
|
|
int flags = 0;
|
|
|
|
char fill = ' ';
|
2014-06-05 13:57:38 -04:00
|
|
|
int alt = 0;
|
2014-04-02 14:42:39 -04:00
|
|
|
while (str < top) {
|
2021-03-15 09:57:36 -04:00
|
|
|
if (*str == '-') {
|
|
|
|
flags |= PF_FLAG_LEFT_ADJUST;
|
|
|
|
} else if (*str == '+') {
|
|
|
|
flags |= PF_FLAG_SHOW_SIGN;
|
|
|
|
} else if (*str == ' ') {
|
|
|
|
flags |= PF_FLAG_SPACE_SIGN;
|
|
|
|
} else if (*str == '#') {
|
|
|
|
alt = PF_FLAG_SHOW_PREFIX;
|
|
|
|
} else if (*str == '0') {
|
2014-04-02 14:42:39 -04:00
|
|
|
flags |= PF_FLAG_PAD_AFTER_SIGN;
|
|
|
|
fill = '0';
|
2021-03-15 09:57:36 -04:00
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
2014-04-02 14:42:39 -04:00
|
|
|
str++;
|
|
|
|
}
|
|
|
|
// parse width, if it exists
|
2014-06-05 13:57:38 -04:00
|
|
|
int width = 0;
|
2014-04-02 14:42:39 -04:00
|
|
|
if (str < top) {
|
|
|
|
if (*str == '*') {
|
2017-02-02 21:04:56 -05:00
|
|
|
if (arg_i >= n_args) {
|
2014-06-05 13:02:15 -04:00
|
|
|
goto not_enough_args;
|
|
|
|
}
|
2014-04-02 14:42:39 -04:00
|
|
|
width = mp_obj_get_int(args[arg_i++]);
|
|
|
|
str++;
|
2014-03-31 14:18:28 -04:00
|
|
|
} else {
|
2021-03-15 09:57:36 -04:00
|
|
|
str = (const byte *)str_to_int((const char *)str, (const char *)top, &width);
|
2014-04-02 14:42:39 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
int prec = -1;
|
|
|
|
if (str < top && *str == '.') {
|
|
|
|
if (++str < top) {
|
|
|
|
if (*str == '*') {
|
2017-02-02 21:04:56 -05:00
|
|
|
if (arg_i >= n_args) {
|
2014-06-05 13:02:15 -04:00
|
|
|
goto not_enough_args;
|
|
|
|
}
|
2014-04-02 14:42:39 -04:00
|
|
|
prec = mp_obj_get_int(args[arg_i++]);
|
|
|
|
str++;
|
|
|
|
} else {
|
|
|
|
prec = 0;
|
2021-03-15 09:57:36 -04:00
|
|
|
str = (const byte *)str_to_int((const char *)str, (const char *)top, &prec);
|
2014-04-02 14:42:39 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (str >= top) {
|
2021-03-15 09:57:36 -04:00
|
|
|
incomplete_format:
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("incomplete format"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-04-02 14:42:39 -04:00
|
|
|
}
|
2014-06-05 13:02:15 -04:00
|
|
|
|
|
|
|
// Tuple value lookup
|
|
|
|
if (arg == MP_OBJ_NULL) {
|
2017-02-02 21:04:56 -05:00
|
|
|
if (arg_i >= n_args) {
|
2021-03-15 09:57:36 -04:00
|
|
|
not_enough_args:
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("not enough arguments for format string"));
|
2014-06-05 13:02:15 -04:00
|
|
|
}
|
|
|
|
arg = args[arg_i++];
|
|
|
|
}
|
2014-04-02 14:42:39 -04:00
|
|
|
switch (*str) {
|
|
|
|
case 'c':
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_str(arg)) {
|
2017-03-25 04:48:18 -04:00
|
|
|
size_t slen;
|
2015-01-20 06:55:10 -05:00
|
|
|
const char *s = mp_obj_str_get_data(arg, &slen);
|
|
|
|
if (slen != 1) {
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("%%c requires int or char"));
|
2014-04-02 14:42:39 -04:00
|
|
|
}
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_strn(&print, s, 1, flags, ' ', width);
|
2014-11-06 12:36:16 -05:00
|
|
|
} else if (arg_looks_integer(arg)) {
|
2014-04-02 14:42:39 -04:00
|
|
|
char ch = mp_obj_get_int(arg);
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_strn(&print, &ch, 1, flags, ' ', width);
|
2014-11-06 12:36:16 -05:00
|
|
|
} else {
|
2021-10-16 20:37:12 -04:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("%%c requires int or char"));
|
2014-04-02 14:42:39 -04:00
|
|
|
}
|
2014-06-05 13:57:38 -04:00
|
|
|
break;
|
2014-04-02 14:42:39 -04:00
|
|
|
|
|
|
|
case 'd':
|
|
|
|
case 'i':
|
|
|
|
case 'u':
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_mp_int(&print, arg_as_int(arg), 10, 'a', flags, fill, width, prec);
|
2014-04-02 14:42:39 -04:00
|
|
|
break;
|
|
|
|
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_FLOAT
|
2014-04-02 14:42:39 -04:00
|
|
|
case 'e':
|
|
|
|
case 'E':
|
|
|
|
case 'f':
|
|
|
|
case 'F':
|
|
|
|
case 'g':
|
|
|
|
case 'G':
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_float(&print, mp_obj_get_float(arg), *str, flags, fill, width, prec);
|
2014-04-02 14:42:39 -04:00
|
|
|
break;
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2014-04-02 14:42:39 -04:00
|
|
|
|
|
|
|
case 'o':
|
|
|
|
if (alt) {
|
2014-04-07 14:19:51 -04:00
|
|
|
flags |= (PF_FLAG_SHOW_PREFIX | PF_FLAG_SHOW_OCTAL_LETTER);
|
2014-04-02 14:42:39 -04:00
|
|
|
}
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_mp_int(&print, arg, 8, 'a', flags, fill, width, prec);
|
2014-04-02 14:42:39 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'r':
|
2021-03-15 09:57:36 -04:00
|
|
|
case 's': {
|
2015-01-21 14:14:25 -05:00
|
|
|
vstr_t arg_vstr;
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_t arg_print;
|
|
|
|
vstr_init_print(&arg_vstr, 16, &arg_print);
|
2015-12-20 09:44:36 -05:00
|
|
|
mp_print_kind_t print_kind = (*str == 'r' ? PRINT_REPR : PRINT_STR);
|
2021-04-22 20:55:39 -04:00
|
|
|
if (print_kind == PRINT_STR && is_bytes && mp_obj_is_type(arg, &mp_type_bytes)) {
|
2015-12-20 09:44:36 -05:00
|
|
|
// If we have something like b"%s" % b"1", bytes arg should be
|
|
|
|
// printed undecorated.
|
|
|
|
print_kind = PRINT_RAW;
|
|
|
|
}
|
|
|
|
mp_obj_print_helper(&arg_print, arg, print_kind);
|
2015-01-21 14:14:25 -05:00
|
|
|
uint vlen = arg_vstr.len;
|
2014-04-02 14:42:39 -04:00
|
|
|
if (prec < 0) {
|
2015-01-20 06:55:10 -05:00
|
|
|
prec = vlen;
|
2014-04-02 14:42:39 -04:00
|
|
|
}
|
2015-01-20 06:55:10 -05:00
|
|
|
if (vlen > (uint)prec) {
|
|
|
|
vlen = prec;
|
2014-03-31 14:18:28 -04:00
|
|
|
}
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_strn(&print, arg_vstr.buf, vlen, flags, ' ', width);
|
2015-01-21 14:14:25 -05:00
|
|
|
vstr_clear(&arg_vstr);
|
2014-04-02 14:42:39 -04:00
|
|
|
break;
|
2014-03-31 14:18:28 -04:00
|
|
|
}
|
2014-04-02 14:42:39 -04:00
|
|
|
|
|
|
|
case 'X':
|
2014-06-05 13:57:38 -04:00
|
|
|
case 'x':
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_mp_int(&print, arg, 16, *str - ('X' - 'A'), flags | alt, fill, width, prec);
|
2014-04-02 14:42:39 -04:00
|
|
|
break;
|
2014-04-06 06:11:15 -04:00
|
|
|
|
2014-04-02 14:42:39 -04:00
|
|
|
default:
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-03-15 09:57:36 -04:00
|
|
|
terse_str_format_value_error();
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_raise_ValueError_varg(
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("unsupported format character '%c' (0x%x) at index %d"),
|
2021-03-15 09:57:36 -04:00
|
|
|
*str, *str, str - start_str);
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-31 14:18:28 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-02 21:04:56 -05:00
|
|
|
if (arg_i != n_args) {
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("not all arguments converted during string formatting"));
|
2014-03-31 14:18:28 -04:00
|
|
|
}
|
|
|
|
|
2015-12-20 09:50:51 -05:00
|
|
|
return mp_obj_new_str_from_vstr(is_bytes ? &mp_type_bytes : &mp_type_str, &vstr);
|
2014-03-31 14:18:28 -04:00
|
|
|
}
|
2018-08-15 08:17:41 -04:00
|
|
|
#endif
|
2014-03-31 14:18:28 -04:00
|
|
|
|
2015-06-26 10:33:21 -04:00
|
|
|
// The implementation is optimized, returning the original string if there's
|
|
|
|
// nothing to replace.
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_replace(size_t n_args, const mp_obj_t *args) {
|
2021-04-22 20:55:39 -04:00
|
|
|
mp_check_self(mp_obj_is_str_or_bytes(args[0]));
|
2014-01-31 01:17:30 -05:00
|
|
|
|
2014-07-03 08:25:24 -04:00
|
|
|
mp_int_t max_rep = -1;
|
2014-01-31 01:17:30 -05:00
|
|
|
if (n_args == 4) {
|
2014-04-06 19:39:13 -04:00
|
|
|
max_rep = mp_obj_get_int(args[3]);
|
2014-02-11 08:29:55 -05:00
|
|
|
if (max_rep == 0) {
|
|
|
|
return args[0];
|
|
|
|
} else if (max_rep < 0) {
|
2014-04-06 19:39:13 -04:00
|
|
|
max_rep = -1;
|
2014-02-11 08:29:55 -05:00
|
|
|
}
|
2014-01-31 01:17:30 -05:00
|
|
|
}
|
2014-01-31 18:45:12 -05:00
|
|
|
|
2014-04-07 17:46:39 -04:00
|
|
|
// if max_rep is still -1 by this point we will need to do all possible replacements
|
2014-01-31 01:17:30 -05:00
|
|
|
|
2014-04-06 19:39:13 -04:00
|
|
|
// check argument types
|
|
|
|
|
2014-12-24 15:28:30 -05:00
|
|
|
const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
|
|
|
|
|
|
|
|
if (mp_obj_get_type(args[1]) != self_type) {
|
2014-04-06 19:39:13 -04:00
|
|
|
bad_implicit_conversion(args[1]);
|
|
|
|
}
|
|
|
|
|
2014-12-24 15:28:30 -05:00
|
|
|
if (mp_obj_get_type(args[2]) != self_type) {
|
2014-04-06 19:39:13 -04:00
|
|
|
bad_implicit_conversion(args[2]);
|
|
|
|
}
|
|
|
|
|
|
|
|
// extract string data
|
|
|
|
|
2014-01-31 01:17:30 -05:00
|
|
|
GET_STR_DATA_LEN(args[0], str, str_len);
|
|
|
|
GET_STR_DATA_LEN(args[1], old, old_len);
|
|
|
|
GET_STR_DATA_LEN(args[2], new, new_len);
|
2014-01-31 18:45:12 -05:00
|
|
|
|
|
|
|
// old won't exist in str if it's longer, so nothing to replace
|
2014-01-31 01:17:30 -05:00
|
|
|
if (old_len > str_len) {
|
2014-02-11 08:29:55 -05:00
|
|
|
return args[0];
|
2014-01-31 01:17:30 -05:00
|
|
|
}
|
|
|
|
|
2014-01-31 18:45:12 -05:00
|
|
|
// data for the replaced string
|
|
|
|
byte *data = NULL;
|
2015-01-21 17:48:37 -05:00
|
|
|
vstr_t vstr;
|
2014-01-31 18:45:12 -05:00
|
|
|
|
|
|
|
// do 2 passes over the string:
|
|
|
|
// first pass computes the required length of the replaced string
|
|
|
|
// second pass does the replacements
|
|
|
|
for (;;) {
|
2017-02-16 00:26:48 -05:00
|
|
|
size_t replaced_str_index = 0;
|
|
|
|
size_t num_replacements_done = 0;
|
2014-01-31 18:45:12 -05:00
|
|
|
const byte *old_occurrence;
|
|
|
|
const byte *offset_ptr = str;
|
2017-02-16 00:26:48 -05:00
|
|
|
size_t str_len_remain = str_len;
|
2014-04-06 19:39:13 -04:00
|
|
|
if (old_len == 0) {
|
|
|
|
// if old_str is empty, copy new_str to start of replaced string
|
|
|
|
// copy the replacement string
|
|
|
|
if (data != NULL) {
|
|
|
|
memcpy(data, new, new_len);
|
|
|
|
}
|
|
|
|
replaced_str_index += new_len;
|
|
|
|
num_replacements_done++;
|
|
|
|
}
|
2017-02-16 00:26:48 -05:00
|
|
|
while (num_replacements_done != (size_t)max_rep && str_len_remain > 0 && (old_occurrence = find_subbytes(offset_ptr, str_len_remain, old, old_len, 1)) != NULL) {
|
2014-04-06 19:39:13 -04:00
|
|
|
if (old_len == 0) {
|
|
|
|
old_occurrence += 1;
|
|
|
|
}
|
2014-01-31 18:45:12 -05:00
|
|
|
// copy from just after end of last occurrence of to-be-replaced string to right before start of next occurrence
|
|
|
|
if (data != NULL) {
|
|
|
|
memcpy(data + replaced_str_index, offset_ptr, old_occurrence - offset_ptr);
|
|
|
|
}
|
|
|
|
replaced_str_index += old_occurrence - offset_ptr;
|
|
|
|
// copy the replacement string
|
|
|
|
if (data != NULL) {
|
|
|
|
memcpy(data + replaced_str_index, new, new_len);
|
|
|
|
}
|
|
|
|
replaced_str_index += new_len;
|
|
|
|
offset_ptr = old_occurrence + old_len;
|
2014-04-06 19:39:13 -04:00
|
|
|
str_len_remain = str + str_len - offset_ptr;
|
2014-01-31 18:45:12 -05:00
|
|
|
num_replacements_done++;
|
|
|
|
}
|
|
|
|
|
|
|
|
// copy from just after end of last occurrence of to-be-replaced string to end of old string
|
|
|
|
if (data != NULL) {
|
2014-04-06 19:39:13 -04:00
|
|
|
memcpy(data + replaced_str_index, offset_ptr, str_len_remain);
|
2014-01-31 18:45:12 -05:00
|
|
|
}
|
2014-04-06 19:39:13 -04:00
|
|
|
replaced_str_index += str_len_remain;
|
2014-01-31 18:45:12 -05:00
|
|
|
|
|
|
|
if (data == NULL) {
|
|
|
|
// first pass
|
|
|
|
if (num_replacements_done == 0) {
|
|
|
|
// no substr found, return original string
|
|
|
|
return args[0];
|
|
|
|
} else {
|
|
|
|
// substr found, allocate new string
|
2015-01-21 17:48:37 -05:00
|
|
|
vstr_init_len(&vstr, replaced_str_index);
|
2021-03-15 09:57:36 -04:00
|
|
|
data = (byte *)vstr.buf;
|
2014-04-06 19:39:13 -04:00
|
|
|
assert(data != NULL);
|
2014-01-31 18:45:12 -05:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// second pass, we are done
|
|
|
|
break;
|
|
|
|
}
|
2014-01-31 01:17:30 -05:00
|
|
|
}
|
2014-01-31 18:45:12 -05:00
|
|
|
|
2015-01-21 17:48:37 -05:00
|
|
|
return mp_obj_new_str_from_vstr(self_type, &vstr);
|
2014-01-31 01:17:30 -05:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj, 3, 4, str_replace);
|
2014-01-31 01:17:30 -05:00
|
|
|
|
2018-08-05 16:56:19 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_COUNT
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_count(size_t n_args, const mp_obj_t *args) {
|
2014-06-13 23:06:36 -04:00
|
|
|
const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
|
2021-04-22 20:55:39 -04:00
|
|
|
mp_check_self(mp_obj_is_str_or_bytes(args[0]));
|
2014-11-05 11:45:54 -05:00
|
|
|
|
|
|
|
// check argument type
|
2014-12-24 15:28:30 -05:00
|
|
|
if (mp_obj_get_type(args[1]) != self_type) {
|
2014-11-05 11:45:54 -05:00
|
|
|
bad_implicit_conversion(args[1]);
|
|
|
|
}
|
2014-03-13 01:57:16 -04:00
|
|
|
|
|
|
|
GET_STR_DATA_LEN(args[0], haystack, haystack_len);
|
|
|
|
GET_STR_DATA_LEN(args[1], needle, needle_len);
|
|
|
|
|
2014-06-13 23:06:36 -04:00
|
|
|
const byte *start = haystack;
|
|
|
|
const byte *end = haystack + haystack_len;
|
2014-03-13 01:57:16 -04:00
|
|
|
if (n_args >= 3 && args[2] != mp_const_none) {
|
2014-06-13 23:06:36 -04:00
|
|
|
start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
|
2014-03-13 01:57:16 -04:00
|
|
|
}
|
|
|
|
if (n_args >= 4 && args[3] != mp_const_none) {
|
2014-06-13 23:06:36 -04:00
|
|
|
end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
|
2014-03-13 01:57:16 -04:00
|
|
|
}
|
|
|
|
|
2014-03-13 18:07:55 -04:00
|
|
|
// if needle_len is zero then we count each gap between characters as an occurrence
|
|
|
|
if (needle_len == 0) {
|
2018-02-14 02:19:22 -05:00
|
|
|
return MP_OBJ_NEW_SMALL_INT(utf8_charlen(start, end - start) + 1);
|
2014-03-13 01:57:16 -04:00
|
|
|
}
|
|
|
|
|
2014-03-13 18:07:55 -04:00
|
|
|
// count the occurrences
|
2014-07-03 08:25:24 -04:00
|
|
|
mp_int_t num_occurrences = 0;
|
2014-06-13 23:06:36 -04:00
|
|
|
for (const byte *haystack_ptr = start; haystack_ptr + needle_len <= end;) {
|
|
|
|
if (memcmp(haystack_ptr, needle, needle_len) == 0) {
|
2014-03-13 03:29:15 -04:00
|
|
|
num_occurrences++;
|
2014-06-13 23:06:36 -04:00
|
|
|
haystack_ptr += needle_len;
|
|
|
|
} else {
|
|
|
|
haystack_ptr = utf8_next_char(haystack_ptr);
|
2014-03-13 03:29:15 -04:00
|
|
|
}
|
2014-03-13 01:57:16 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(num_occurrences);
|
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count);
|
2018-08-05 16:56:19 -04:00
|
|
|
#endif
|
2014-03-13 01:57:16 -04:00
|
|
|
|
2016-08-06 23:46:55 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_PARTITION
|
2017-02-16 00:26:48 -05:00
|
|
|
STATIC mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, int direction) {
|
2021-04-22 20:55:39 -04:00
|
|
|
mp_check_self(mp_obj_is_str_or_bytes(self_in));
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
|
2014-05-10 19:44:46 -04:00
|
|
|
if (self_type != mp_obj_get_type(arg)) {
|
2014-12-24 15:28:30 -05:00
|
|
|
bad_implicit_conversion(arg);
|
2014-03-18 03:06:29 -04:00
|
|
|
}
|
2014-03-21 16:39:40 -04:00
|
|
|
|
2014-03-18 03:06:29 -04:00
|
|
|
GET_STR_DATA_LEN(self_in, str, str_len);
|
|
|
|
GET_STR_DATA_LEN(arg, sep, sep_len);
|
|
|
|
|
|
|
|
if (sep_len == 0) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("empty separator"));
|
2014-03-18 03:06:29 -04:00
|
|
|
}
|
2014-03-21 16:39:40 -04:00
|
|
|
|
2014-12-24 15:28:30 -05:00
|
|
|
mp_obj_t result[3];
|
|
|
|
if (self_type == &mp_type_str) {
|
|
|
|
result[0] = MP_OBJ_NEW_QSTR(MP_QSTR_);
|
|
|
|
result[1] = MP_OBJ_NEW_QSTR(MP_QSTR_);
|
|
|
|
result[2] = MP_OBJ_NEW_QSTR(MP_QSTR_);
|
|
|
|
} else {
|
|
|
|
result[0] = mp_const_empty_bytes;
|
|
|
|
result[1] = mp_const_empty_bytes;
|
|
|
|
result[2] = mp_const_empty_bytes;
|
|
|
|
}
|
2014-03-21 16:39:40 -04:00
|
|
|
|
|
|
|
if (direction > 0) {
|
|
|
|
result[0] = self_in;
|
2014-03-21 04:12:26 -04:00
|
|
|
} else {
|
2014-03-21 16:39:40 -04:00
|
|
|
result[2] = self_in;
|
2014-03-21 04:12:26 -04:00
|
|
|
}
|
2014-03-18 03:06:29 -04:00
|
|
|
|
2014-03-24 02:31:58 -04:00
|
|
|
const byte *position_ptr = find_subbytes(str, str_len, sep, sep_len, direction);
|
|
|
|
if (position_ptr != NULL) {
|
2017-02-16 00:26:48 -05:00
|
|
|
size_t position = position_ptr - str;
|
2014-05-25 17:34:34 -04:00
|
|
|
result[0] = mp_obj_new_str_of_type(self_type, str, position);
|
2014-03-24 02:31:58 -04:00
|
|
|
result[1] = arg;
|
2014-05-25 17:34:34 -04:00
|
|
|
result[2] = mp_obj_new_str_of_type(self_type, str + position + sep_len, str_len - position - sep_len);
|
2014-03-18 03:06:29 -04:00
|
|
|
}
|
2014-03-21 16:39:40 -04:00
|
|
|
|
2014-03-21 04:12:26 -04:00
|
|
|
return mp_obj_new_tuple(3, result);
|
2014-03-18 03:06:29 -04:00
|
|
|
}
|
|
|
|
|
2014-03-21 16:39:40 -04:00
|
|
|
STATIC mp_obj_t str_partition(mp_obj_t self_in, mp_obj_t arg) {
|
|
|
|
return str_partitioner(self_in, arg, 1);
|
2014-03-21 04:12:26 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition);
|
2014-03-19 03:46:14 -04:00
|
|
|
|
2014-03-21 16:39:40 -04:00
|
|
|
STATIC mp_obj_t str_rpartition(mp_obj_t self_in, mp_obj_t arg) {
|
|
|
|
return str_partitioner(self_in, arg, -1);
|
2014-03-19 03:46:14 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_2(str_rpartition_obj, str_rpartition);
|
2016-08-06 23:46:55 -04:00
|
|
|
#endif
|
2014-03-19 03:46:14 -04:00
|
|
|
|
2014-05-10 12:47:41 -04:00
|
|
|
// Supposedly not too critical operations, so optimize for code size
|
2014-06-01 13:22:09 -04:00
|
|
|
STATIC mp_obj_t str_caseconv(unichar (*op)(unichar), mp_obj_t self_in) {
|
2014-05-10 12:47:41 -04:00
|
|
|
GET_STR_DATA_LEN(self_in, self_data, self_len);
|
2015-01-21 17:48:37 -05:00
|
|
|
vstr_t vstr;
|
|
|
|
vstr_init_len(&vstr, self_len);
|
2021-03-15 09:57:36 -04:00
|
|
|
byte *data = (byte *)vstr.buf;
|
2017-02-16 00:26:48 -05:00
|
|
|
for (size_t i = 0; i < self_len; i++) {
|
2014-06-01 13:22:09 -04:00
|
|
|
*data++ = op(*self_data++);
|
2014-05-10 12:47:41 -04:00
|
|
|
}
|
2015-01-21 17:48:37 -05:00
|
|
|
return mp_obj_new_str_from_vstr(mp_obj_get_type(self_in), &vstr);
|
2014-05-10 12:47:41 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
STATIC mp_obj_t str_lower(mp_obj_t self_in) {
|
2014-06-01 13:22:09 -04:00
|
|
|
return str_caseconv(unichar_tolower, self_in);
|
2014-05-10 12:47:41 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_1(str_lower_obj, str_lower);
|
2014-05-10 12:47:41 -04:00
|
|
|
|
|
|
|
STATIC mp_obj_t str_upper(mp_obj_t self_in) {
|
2014-06-01 13:22:09 -04:00
|
|
|
return str_caseconv(unichar_toupper, self_in);
|
2014-05-10 12:47:41 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_1(str_upper_obj, str_upper);
|
2014-05-10 12:47:41 -04:00
|
|
|
|
2014-06-01 13:22:09 -04:00
|
|
|
STATIC mp_obj_t str_uni_istype(bool (*f)(unichar), mp_obj_t self_in) {
|
2014-05-31 02:30:03 -04:00
|
|
|
GET_STR_DATA_LEN(self_in, self_data, self_len);
|
2014-05-31 04:00:25 -04:00
|
|
|
|
2014-05-31 03:59:34 -04:00
|
|
|
if (self_len == 0) {
|
|
|
|
return mp_const_false; // default to False for empty str
|
|
|
|
}
|
2014-05-31 04:00:25 -04:00
|
|
|
|
2014-06-01 13:22:09 -04:00
|
|
|
if (f != unichar_isupper && f != unichar_islower) {
|
2017-02-16 00:26:48 -05:00
|
|
|
for (size_t i = 0; i < self_len; i++) {
|
2014-05-31 03:59:34 -04:00
|
|
|
if (!f(*self_data++)) {
|
|
|
|
return mp_const_false;
|
|
|
|
}
|
2014-05-31 02:30:03 -04:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
bool contains_alpha = false;
|
2014-05-31 04:00:25 -04:00
|
|
|
|
2017-02-16 00:26:48 -05:00
|
|
|
for (size_t i = 0; i < self_len; i++) { // only check alphanumeric characters
|
2014-05-31 02:30:03 -04:00
|
|
|
if (unichar_isalpha(*self_data++)) {
|
|
|
|
contains_alpha = true;
|
2014-06-01 13:22:09 -04:00
|
|
|
if (!f(*(self_data - 1))) { // -1 because we already incremented above
|
|
|
|
return mp_const_false;
|
2014-05-31 03:59:34 -04:00
|
|
|
}
|
2014-05-31 02:30:03 -04:00
|
|
|
}
|
|
|
|
}
|
2014-05-31 04:00:25 -04:00
|
|
|
|
2014-05-31 03:59:34 -04:00
|
|
|
if (!contains_alpha) {
|
|
|
|
return mp_const_false;
|
|
|
|
}
|
2014-05-31 02:30:03 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
return mp_const_true;
|
|
|
|
}
|
|
|
|
|
|
|
|
STATIC mp_obj_t str_isspace(mp_obj_t self_in) {
|
2014-06-01 13:22:09 -04:00
|
|
|
return str_uni_istype(unichar_isspace, self_in);
|
2014-05-31 02:30:03 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_1(str_isspace_obj, str_isspace);
|
2014-05-31 02:30:03 -04:00
|
|
|
|
|
|
|
STATIC mp_obj_t str_isalpha(mp_obj_t self_in) {
|
2014-06-01 13:22:09 -04:00
|
|
|
return str_uni_istype(unichar_isalpha, self_in);
|
2014-05-31 02:30:03 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_1(str_isalpha_obj, str_isalpha);
|
2014-05-31 02:30:03 -04:00
|
|
|
|
|
|
|
STATIC mp_obj_t str_isdigit(mp_obj_t self_in) {
|
2014-06-01 13:22:09 -04:00
|
|
|
return str_uni_istype(unichar_isdigit, self_in);
|
2014-05-31 02:30:03 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_1(str_isdigit_obj, str_isdigit);
|
2014-05-31 02:30:03 -04:00
|
|
|
|
|
|
|
STATIC mp_obj_t str_isupper(mp_obj_t self_in) {
|
2014-06-01 13:22:09 -04:00
|
|
|
return str_uni_istype(unichar_isupper, self_in);
|
2014-05-31 02:30:03 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_1(str_isupper_obj, str_isupper);
|
2014-05-31 02:30:03 -04:00
|
|
|
|
|
|
|
STATIC mp_obj_t str_islower(mp_obj_t self_in) {
|
2014-06-01 13:22:09 -04:00
|
|
|
return str_uni_istype(unichar_islower, self_in);
|
2014-05-31 02:30:03 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_1(str_islower_obj, str_islower);
|
2014-05-31 02:30:03 -04:00
|
|
|
|
2014-04-12 22:28:46 -04:00
|
|
|
#if MICROPY_CPYTHON_COMPAT
|
2017-05-29 03:08:14 -04:00
|
|
|
// These methods are superfluous in the presence of str() and bytes()
|
2014-04-12 22:28:46 -04:00
|
|
|
// constructors.
|
|
|
|
// TODO: should accept kwargs too
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t bytes_decode(size_t n_args, const mp_obj_t *args) {
|
2014-04-12 22:28:46 -04:00
|
|
|
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++;
|
|
|
|
}
|
2016-01-03 10:55:55 -05:00
|
|
|
return mp_obj_str_make_new(&mp_type_str, n_args, 0, args);
|
2014-04-12 22:28:46 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_decode_obj, 1, 3, bytes_decode);
|
2014-04-12 22:28:46 -04:00
|
|
|
|
|
|
|
// TODO: should accept kwargs too
|
2016-01-03 09:21:40 -05:00
|
|
|
STATIC mp_obj_t str_encode(size_t n_args, const mp_obj_t *args) {
|
2014-04-12 22:28:46 -04:00
|
|
|
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++;
|
|
|
|
}
|
2016-01-03 10:55:55 -05:00
|
|
|
return bytes_make_new(NULL, n_args, 0, args);
|
2014-04-12 22:28:46 -04:00
|
|
|
}
|
2017-07-02 09:35:42 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_encode_obj, 1, 3, str_encode);
|
2014-04-12 22:28:46 -04:00
|
|
|
#endif
|
|
|
|
|
2014-08-30 09:28:06 -04:00
|
|
|
mp_int_t mp_obj_str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
|
2014-04-18 17:29:21 -04:00
|
|
|
if (flags == MP_BUFFER_READ) {
|
2014-03-09 15:58:18 -04:00
|
|
|
GET_STR_DATA_LEN(self_in, str_data, str_len);
|
2021-03-15 09:57:36 -04:00
|
|
|
bufinfo->buf = (void *)str_data;
|
2014-03-09 15:58:18 -04:00
|
|
|
bufinfo->len = str_len;
|
2016-05-07 16:18:17 -04:00
|
|
|
bufinfo->typecode = 'B'; // bytes should be unsigned, so should unicode byte-access
|
2014-03-09 15:58:18 -04:00
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
// can't write to a string
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-27 08:38:15 -05:00
|
|
|
STATIC const mp_rom_map_elem_t str8_locals_dict_table[] = {
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_CPYTHON_COMPAT
|
2015-11-27 08:38:15 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_decode), MP_ROM_PTR(&bytes_decode_obj) },
|
2014-06-13 15:41:45 -04:00
|
|
|
#if !MICROPY_PY_BUILTINS_STR_UNICODE
|
|
|
|
// If we have separate unicode type, then here we have methods only
|
|
|
|
// for bytes type, and it should not have encode() methods. Otherwise,
|
|
|
|
// we have non-compliant-but-practical bytestring type, which shares
|
|
|
|
// method table with bytes, so they both have encode() and decode()
|
|
|
|
// methods (which should do type checking at runtime).
|
2015-11-27 08:38:15 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_encode), MP_ROM_PTR(&str_encode_obj) },
|
2014-06-13 15:41:45 -04:00
|
|
|
#endif
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2015-11-27 08:38:15 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_find), MP_ROM_PTR(&str_find_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_rfind), MP_ROM_PTR(&str_rfind_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_index), MP_ROM_PTR(&str_index_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_rindex), MP_ROM_PTR(&str_rindex_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_join), MP_ROM_PTR(&str_join_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_split), MP_ROM_PTR(&str_split_obj) },
|
2015-04-03 17:09:23 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_SPLITLINES
|
2015-11-27 08:38:15 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_splitlines), MP_ROM_PTR(&str_splitlines_obj) },
|
2015-04-03 17:09:23 -04:00
|
|
|
#endif
|
2015-11-27 08:38:15 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_rsplit), MP_ROM_PTR(&str_rsplit_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_startswith), MP_ROM_PTR(&str_startswith_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_endswith), MP_ROM_PTR(&str_endswith_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_strip), MP_ROM_PTR(&str_strip_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_lstrip), MP_ROM_PTR(&str_lstrip_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_rstrip), MP_ROM_PTR(&str_rstrip_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_format), MP_ROM_PTR(&str_format_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_replace), MP_ROM_PTR(&str_replace_obj) },
|
2018-08-05 16:56:19 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_COUNT
|
2015-11-27 08:38:15 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_count), MP_ROM_PTR(&str_count_obj) },
|
2018-08-05 16:56:19 -04:00
|
|
|
#endif
|
2016-08-06 23:46:55 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_PARTITION
|
2015-11-27 08:38:15 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_partition), MP_ROM_PTR(&str_partition_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_rpartition), MP_ROM_PTR(&str_rpartition_obj) },
|
2016-08-06 23:46:55 -04:00
|
|
|
#endif
|
2016-08-07 08:24:57 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_STR_CENTER
|
2016-05-21 17:13:44 -04:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_center), MP_ROM_PTR(&str_center_obj) },
|
2016-08-07 08:24:57 -04:00
|
|
|
#endif
|
2015-11-27 08:38:15 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_lower), MP_ROM_PTR(&str_lower_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_upper), MP_ROM_PTR(&str_upper_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_isspace), MP_ROM_PTR(&str_isspace_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_isalpha), MP_ROM_PTR(&str_isalpha_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_isdigit), MP_ROM_PTR(&str_isdigit_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_isupper), MP_ROM_PTR(&str_isupper_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_islower), MP_ROM_PTR(&str_islower_obj) },
|
2014-01-06 12:52:29 -05:00
|
|
|
};
|
2014-01-07 10:58:30 -05:00
|
|
|
|
2015-01-22 19:05:58 -05:00
|
|
|
STATIC MP_DEFINE_CONST_DICT(str8_locals_dict, str8_locals_dict_table);
|
2014-03-26 17:47:19 -04:00
|
|
|
|
2014-06-13 15:41:45 -04:00
|
|
|
#if !MICROPY_PY_BUILTINS_STR_UNICODE
|
2016-01-09 18:14:54 -05:00
|
|
|
STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf);
|
2015-05-17 11:44:24 -04:00
|
|
|
|
2014-03-29 09:43:38 -04:00
|
|
|
const mp_obj_type_t mp_type_str = {
|
2014-02-15 11:10:44 -05:00
|
|
|
{ &mp_type_type },
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_str,
|
2014-01-05 15:34:09 -05:00
|
|
|
.print = str_print,
|
2015-01-22 19:15:56 -05:00
|
|
|
.make_new = mp_obj_str_make_new,
|
2014-06-28 05:27:23 -04:00
|
|
|
.binary_op = mp_obj_str_binary_op,
|
2014-08-11 15:36:38 -04:00
|
|
|
.subscr = bytes_subscr,
|
2014-01-24 15:50:40 -05:00
|
|
|
.getiter = mp_obj_new_str_iterator,
|
2014-06-28 05:27:23 -04:00
|
|
|
.buffer_p = { .get_buffer = mp_obj_str_get_buffer },
|
2021-03-15 09:57:36 -04:00
|
|
|
.locals_dict = (mp_obj_dict_t *)&str8_locals_dict,
|
2014-01-24 15:50:40 -05:00
|
|
|
};
|
2014-06-13 15:41:45 -04:00
|
|
|
#endif
|
2014-01-24 15:50:40 -05:00
|
|
|
|
|
|
|
// Reuses most of methods from str
|
2014-03-29 09:43:38 -04:00
|
|
|
const mp_obj_type_t mp_type_bytes = {
|
2014-02-15 11:10:44 -05:00
|
|
|
{ &mp_type_type },
|
2021-07-09 15:59:37 -04:00
|
|
|
.flags = MP_TYPE_FLAG_EXTENDED,
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_bytes,
|
2014-01-24 15:50:40 -05:00
|
|
|
.print = str_print,
|
2014-03-21 17:46:59 -04:00
|
|
|
.make_new = bytes_make_new,
|
2021-03-15 09:57:36 -04:00
|
|
|
.locals_dict = (mp_obj_dict_t *)&str8_locals_dict,
|
2021-07-12 07:57:59 -04:00
|
|
|
MP_TYPE_EXTENDED_FIELDS(
|
2021-07-06 11:37:32 -04:00
|
|
|
.binary_op = mp_obj_str_binary_op,
|
|
|
|
.subscr = bytes_subscr,
|
|
|
|
.getiter = mp_obj_new_bytes_iterator,
|
|
|
|
.buffer_p = { .get_buffer = mp_obj_str_get_buffer },
|
|
|
|
),
|
2013-12-21 13:17:45 -05:00
|
|
|
};
|
|
|
|
|
2017-10-04 02:59:22 -04:00
|
|
|
// The zero-length bytes object, with data that includes a null-terminating byte
|
2021-03-15 09:57:36 -04:00
|
|
|
const mp_obj_str_t mp_const_empty_bytes_obj = {{&mp_type_bytes}, 0, 0, (const byte *)""};
|
2014-03-21 17:46:59 -04:00
|
|
|
|
2015-01-21 18:08:36 -05:00
|
|
|
// Create a str/bytes object using the given data. New memory is allocated and
|
2017-11-15 21:53:04 -05:00
|
|
|
// the data is copied across. This function should only be used if the type is bytes,
|
|
|
|
// or if the type is str and the string data is known to be not interned.
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_t mp_obj_new_str_copy(const mp_obj_type_t *type, const byte *data, size_t len) {
|
2014-03-20 10:47:44 -04:00
|
|
|
mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
|
2014-01-24 15:50:40 -05:00
|
|
|
o->base.type = type;
|
|
|
|
o->len = len;
|
2014-03-20 10:47:44 -04:00
|
|
|
if (data) {
|
|
|
|
o->hash = qstr_compute_hash(data, len);
|
|
|
|
byte *p = m_new(byte, len + 1);
|
|
|
|
o->data = p;
|
|
|
|
memcpy(p, data, len * sizeof(byte));
|
|
|
|
p[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
|
|
|
|
}
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-01-24 15:50:40 -05:00
|
|
|
}
|
|
|
|
|
2017-11-15 21:53:04 -05:00
|
|
|
// Create a str/bytes object using the given data. If the type is str and the string
|
|
|
|
// data is already interned, then a qstr object is returned. Otherwise new memory is
|
|
|
|
// allocated for the object and the data is copied across.
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_t mp_obj_new_str_of_type(const mp_obj_type_t *type, const byte *data, size_t len) {
|
2017-11-15 21:53:04 -05:00
|
|
|
if (type == &mp_type_str) {
|
2021-03-15 09:57:36 -04:00
|
|
|
return mp_obj_new_str((const char *)data, len);
|
2017-11-15 21:53:04 -05:00
|
|
|
} else {
|
|
|
|
return mp_obj_new_bytes(data, len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-15 21:17:51 -05:00
|
|
|
// Create a str using a qstr to store the data; may use existing or new qstr.
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_t mp_obj_new_str_via_qstr(const char *data, size_t len) {
|
2017-11-15 21:17:51 -05:00
|
|
|
return MP_OBJ_NEW_QSTR(qstr_from_strn(data, len));
|
|
|
|
}
|
|
|
|
|
2015-01-21 18:08:36 -05:00
|
|
|
// Create a str/bytes object from the given vstr. The vstr buffer is resized to
|
|
|
|
// the exact length required and then reused for the str/bytes object. The vstr
|
|
|
|
// is cleared and can safely be passed to vstr_free if it was heap allocated.
|
2015-01-21 14:14:25 -05:00
|
|
|
mp_obj_t mp_obj_new_str_from_vstr(const mp_obj_type_t *type, vstr_t *vstr) {
|
|
|
|
// if not a bytes object, look if a qstr with this data already exists
|
|
|
|
if (type == &mp_type_str) {
|
|
|
|
qstr q = qstr_find_strn(vstr->buf, vstr->len);
|
2021-04-23 15:26:42 -04:00
|
|
|
if (q != MP_QSTRnull) {
|
2015-01-21 14:14:25 -05:00
|
|
|
vstr_clear(vstr);
|
|
|
|
vstr->alloc = 0;
|
|
|
|
return MP_OBJ_NEW_QSTR(q);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// make a new str/bytes object
|
|
|
|
mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
|
|
|
|
o->base.type = type;
|
|
|
|
o->len = vstr->len;
|
2021-03-15 09:57:36 -04:00
|
|
|
o->hash = qstr_compute_hash((byte *)vstr->buf, vstr->len);
|
2015-05-18 16:25:36 -04:00
|
|
|
if (vstr->len + 1 == vstr->alloc) {
|
2021-03-15 09:57:36 -04:00
|
|
|
o->data = (byte *)vstr->buf;
|
2015-05-18 16:25:36 -04:00
|
|
|
} else {
|
2021-03-15 09:57:36 -04:00
|
|
|
o->data = (byte *)m_renew(char, vstr->buf, vstr->alloc, vstr->len + 1);
|
2015-05-18 16:25:36 -04:00
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
((byte *)o->data)[o->len] = '\0'; // add null byte
|
2015-01-21 14:14:25 -05:00
|
|
|
vstr->buf = NULL;
|
|
|
|
vstr->alloc = 0;
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2015-01-21 14:14:25 -05:00
|
|
|
}
|
|
|
|
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_t mp_obj_new_str(const char *data, size_t len) {
|
2017-11-15 21:17:51 -05:00
|
|
|
qstr q = qstr_find_strn(data, len);
|
2021-04-23 15:26:42 -04:00
|
|
|
if (q != MP_QSTRnull) {
|
2017-11-15 21:17:51 -05:00
|
|
|
// qstr with this data already exists
|
|
|
|
return MP_OBJ_NEW_QSTR(q);
|
2014-01-22 09:35:10 -05:00
|
|
|
} else {
|
2017-11-15 21:17:51 -05:00
|
|
|
// no existing qstr, don't make one
|
2021-03-15 09:57:36 -04:00
|
|
|
return mp_obj_new_str_copy(&mp_type_str, (const byte *)data, len);
|
2014-01-22 09:35:10 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-07 18:13:35 -04:00
|
|
|
mp_obj_t mp_obj_str_intern(mp_obj_t str) {
|
|
|
|
GET_STR_DATA_LEN(str, data, len);
|
2021-03-15 09:57:36 -04:00
|
|
|
return mp_obj_new_str_via_qstr((const char *)data, len);
|
2014-06-07 18:13:35 -04:00
|
|
|
}
|
|
|
|
|
2018-03-29 20:09:00 -04:00
|
|
|
mp_obj_t mp_obj_str_intern_checked(mp_obj_t obj) {
|
|
|
|
size_t len;
|
|
|
|
const char *data = mp_obj_str_get_data(obj, &len);
|
2021-03-15 09:57:36 -04:00
|
|
|
return mp_obj_new_str_via_qstr((const char *)data, len);
|
2014-06-07 18:13:35 -04:00
|
|
|
}
|
|
|
|
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_t mp_obj_new_bytes(const byte *data, size_t len) {
|
2017-11-15 21:53:04 -05:00
|
|
|
return mp_obj_new_str_copy(&mp_type_bytes, data, len);
|
2014-01-24 15:50:40 -05:00
|
|
|
}
|
|
|
|
|
2019-08-28 16:15:09 -04:00
|
|
|
mp_obj_t mp_obj_new_bytes_of_zeros(size_t len) {
|
|
|
|
vstr_t vstr;
|
|
|
|
vstr_init_len(&vstr, len);
|
|
|
|
memset(vstr.buf, 0, len);
|
|
|
|
return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) {
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_qstr(s1) && mp_obj_is_qstr(s2)) {
|
2014-01-22 09:35:10 -05:00
|
|
|
return s1 == s2;
|
|
|
|
} else {
|
|
|
|
GET_STR_HASH(s1, h1);
|
|
|
|
GET_STR_HASH(s2, h2);
|
2014-04-13 18:43:01 -04:00
|
|
|
// If any of hashes is 0, it means it's not valid
|
|
|
|
if (h1 != 0 && h2 != 0 && h1 != h2) {
|
2014-01-22 09:35:10 -05:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
GET_STR_DATA_LEN(s1, d1, l1);
|
|
|
|
GET_STR_DATA_LEN(s2, d2, l2);
|
|
|
|
if (l1 != l2) {
|
|
|
|
return false;
|
|
|
|
}
|
2014-01-23 13:27:51 -05:00
|
|
|
return memcmp(d1, d2, l1) == 0;
|
2014-01-22 09:35:10 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-28 23:43:40 -05:00
|
|
|
STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in) {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("can't convert to str implicitly"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
const qstr src_name = mp_obj_get_type_qstr(self_in);
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError_varg(MP_ERROR_TEXT("can't convert '%q' object to %q implicitly"),
|
2021-03-15 09:57:36 -04:00
|
|
|
src_name, src_name == MP_QSTR_str ? MP_QSTR_bytes : MP_QSTR_str);
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-01-25 08:51:19 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// use this if you will anyway convert the string to a qstr
|
|
|
|
// will be more efficient for the case where it's already a qstr
|
|
|
|
qstr mp_obj_str_get_qstr(mp_obj_t self_in) {
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_qstr(self_in)) {
|
2014-01-25 08:51:19 -05:00
|
|
|
return MP_OBJ_QSTR_VALUE(self_in);
|
2021-04-22 20:55:39 -04:00
|
|
|
} else if (mp_obj_is_type(self_in, &mp_type_str)) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_str_t *self = MP_OBJ_TO_PTR(self_in);
|
2021-03-15 09:57:36 -04:00
|
|
|
return qstr_from_strn((char *)self->data, self->len);
|
2014-01-25 08:51:19 -05:00
|
|
|
} else {
|
|
|
|
bad_implicit_conversion(self_in);
|
2014-01-22 09:35:10 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// only use this function if you need the str data to be zero terminated
|
|
|
|
// at the moment all strings are zero terminated to help with C ASCIIZ compatibility
|
|
|
|
const char *mp_obj_str_get_str(mp_obj_t self_in) {
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_str_or_bytes(self_in)) {
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(self_in, s, l);
|
|
|
|
(void)l; // len unused
|
2021-03-15 09:57:36 -04:00
|
|
|
return (const char *)s;
|
2014-01-22 09:35:10 -05:00
|
|
|
} else {
|
2014-01-25 08:51:19 -05:00
|
|
|
bad_implicit_conversion(self_in);
|
2014-01-22 09:35:10 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-25 04:48:18 -04:00
|
|
|
const char *mp_obj_str_get_data(mp_obj_t self_in, size_t *len) {
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_str_or_bytes(self_in)) {
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(self_in, s, l);
|
|
|
|
*len = l;
|
2021-03-15 09:57:36 -04:00
|
|
|
return (const char *)s;
|
2014-01-22 09:35:10 -05:00
|
|
|
} else {
|
2014-01-25 08:51:19 -05:00
|
|
|
bad_implicit_conversion(self_in);
|
2014-01-20 16:33:19 -05:00
|
|
|
}
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2014-01-05 05:47:51 -05:00
|
|
|
|
2019-12-27 07:15:52 -05:00
|
|
|
#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C || MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
|
2015-11-27 07:23:18 -05:00
|
|
|
const byte *mp_obj_str_get_data_no_check(mp_obj_t self_in, size_t *len) {
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_qstr(self_in)) {
|
2015-10-18 18:09:04 -04:00
|
|
|
return qstr_data(MP_OBJ_QSTR_VALUE(self_in), len);
|
|
|
|
} else {
|
2019-12-27 07:15:52 -05:00
|
|
|
*len = ((mp_obj_str_t *)MP_OBJ_TO_PTR(self_in))->len;
|
|
|
|
return ((mp_obj_str_t *)MP_OBJ_TO_PTR(self_in))->data;
|
2015-10-18 18:09:04 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-01-05 05:47:51 -05:00
|
|
|
/******************************************************************************/
|
|
|
|
/* str iterator */
|
|
|
|
|
2015-05-17 11:44:24 -04:00
|
|
|
typedef struct _mp_obj_str8_it_t {
|
2014-01-05 05:47:51 -05:00
|
|
|
mp_obj_base_t base;
|
2016-01-03 11:27:55 -05:00
|
|
|
mp_fun_1_t iternext;
|
2014-01-22 09:35:10 -05:00
|
|
|
mp_obj_t str;
|
2017-02-16 00:26:48 -05:00
|
|
|
size_t cur;
|
2015-05-17 11:44:24 -04:00
|
|
|
} mp_obj_str8_it_t;
|
2014-01-05 05:47:51 -05:00
|
|
|
|
2014-06-13 15:41:45 -04:00
|
|
|
#if !MICROPY_PY_BUILTINS_STR_UNICODE
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
|
2017-06-07 10:40:38 -04:00
|
|
|
mp_obj_str8_it_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(self->str, str, len);
|
|
|
|
if (self->cur < len) {
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_t o_out = mp_obj_new_str_via_qstr((const char *)str + self->cur, 1);
|
2014-01-05 05:47:51 -05:00
|
|
|
self->cur += 1;
|
|
|
|
return o_out;
|
|
|
|
} else {
|
2014-04-17 18:19:36 -04:00
|
|
|
return MP_OBJ_STOP_ITERATION;
|
2014-01-05 05:47:51 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-09 18:14:54 -05:00
|
|
|
STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf) {
|
|
|
|
assert(sizeof(mp_obj_str8_it_t) <= sizeof(mp_obj_iter_buf_t));
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_str8_it_t *o = (mp_obj_str8_it_t *)iter_buf;
|
2016-01-03 11:27:55 -05:00
|
|
|
o->base.type = &mp_type_polymorph_iter;
|
|
|
|
o->iternext = str_it_iternext;
|
2014-06-13 15:41:45 -04:00
|
|
|
o->str = str;
|
|
|
|
o->cur = 0;
|
2017-06-07 10:40:38 -04:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-06-13 15:41:45 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t bytes_it_iternext(mp_obj_t self_in) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_str8_it_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-01-24 15:50:40 -05:00
|
|
|
GET_STR_DATA_LEN(self->str, str, len);
|
|
|
|
if (self->cur < len) {
|
2014-07-31 05:49:14 -04:00
|
|
|
mp_obj_t o_out = MP_OBJ_NEW_SMALL_INT(str[self->cur]);
|
2014-01-24 15:50:40 -05:00
|
|
|
self->cur += 1;
|
|
|
|
return o_out;
|
|
|
|
} else {
|
2014-04-17 18:19:36 -04:00
|
|
|
return MP_OBJ_STOP_ITERATION;
|
2014-01-24 15:50:40 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-09 18:14:54 -05:00
|
|
|
mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf) {
|
|
|
|
assert(sizeof(mp_obj_str8_it_t) <= sizeof(mp_obj_iter_buf_t));
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_str8_it_t *o = (mp_obj_str8_it_t *)iter_buf;
|
2016-01-03 11:27:55 -05:00
|
|
|
o->base.type = &mp_type_polymorph_iter;
|
|
|
|
o->iternext = bytes_it_iternext;
|
2014-01-24 15:50:40 -05:00
|
|
|
o->str = str;
|
|
|
|
o->cur = 0;
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-01-05 05:47:51 -05:00
|
|
|
}
|