Damien George | 04b9147 | 2014-05-03 23:27:38 +0100 | [diff] [blame] | 1 | /* |
Alexander Steffen | 55f3324 | 2017-06-30 09:22:17 +0200 | [diff] [blame] | 2 | * This file is part of the MicroPython project, http://micropython.org/ |
Damien George | 04b9147 | 2014-05-03 23:27:38 +0100 | [diff] [blame] | 3 | * |
| 4 | * The MIT License (MIT) |
| 5 | * |
| 6 | * Copyright (c) 2013, 2014 Damien P. George |
Paul Sokolovsky | da9f092 | 2014-05-13 08:44:45 +0300 | [diff] [blame] | 7 | * Copyright (c) 2014 Paul Sokolovsky |
Damien George | 04b9147 | 2014-05-03 23:27:38 +0100 | [diff] [blame] | 8 | * |
| 9 | * Permission is hereby granted, free of charge, to any person obtaining a copy |
| 10 | * of this software and associated documentation files (the "Software"), to deal |
| 11 | * in the Software without restriction, including without limitation the rights |
| 12 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
| 13 | * copies of the Software, and to permit persons to whom the Software is |
| 14 | * furnished to do so, subject to the following conditions: |
| 15 | * |
| 16 | * The above copyright notice and this permission notice shall be included in |
| 17 | * all copies or substantial portions of the Software. |
| 18 | * |
| 19 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 20 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 21 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| 22 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 23 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| 24 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| 25 | * THE SOFTWARE. |
| 26 | */ |
| 27 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 28 | #include <string.h> |
| 29 | #include <assert.h> |
| 30 | |
Damien George | 51dfcb4 | 2015-01-01 20:27:54 +0000 | [diff] [blame] | 31 | #include "py/unicode.h" |
| 32 | #include "py/objstr.h" |
| 33 | #include "py/objlist.h" |
Damien George | 51dfcb4 | 2015-01-01 20:27:54 +0000 | [diff] [blame] | 34 | #include "py/runtime.h" |
pohmelie | e3a29de | 2016-01-29 12:09:10 +0300 | [diff] [blame] | 35 | #include "py/stackctrl.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 36 | |
Damien George | 90ab191 | 2017-02-03 13:04:56 +1100 | [diff] [blame] | 37 | STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_t *args, mp_obj_t dict); |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 38 | |
Damien George | ae8d867 | 2016-01-09 23:14:54 +0000 | [diff] [blame] | 39 | STATIC mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf); |
Paul Sokolovsky | e908591 | 2014-04-30 05:35:18 +0300 | [diff] [blame] | 40 | STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in); |
Paul Sokolovsky | 69f3eb2 | 2014-05-11 02:44:46 +0300 | [diff] [blame] | 41 | |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 42 | /******************************************************************************/ |
| 43 | /* str */ |
| 44 | |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 45 | void mp_str_print_quoted(const mp_print_t *print, const byte *str_data, size_t str_len, bool is_bytes) { |
Paul Sokolovsky | 0b7e29c | 2014-01-28 03:40:06 +0200 | [diff] [blame] | 46 | // this escapes characters, but it will be very slow to print (calling print many times) |
| 47 | bool has_single_quote = false; |
| 48 | bool has_double_quote = false; |
Chris Angelico | 4867413 | 2014-06-04 03:26:40 +1000 | [diff] [blame] | 49 | for (const byte *s = str_data, *top = str_data + str_len; !has_double_quote && s < top; s++) { |
Paul Sokolovsky | 0b7e29c | 2014-01-28 03:40:06 +0200 | [diff] [blame] | 50 | if (*s == '\'') { |
| 51 | has_single_quote = true; |
| 52 | } else if (*s == '"') { |
| 53 | has_double_quote = true; |
| 54 | } |
| 55 | } |
| 56 | int quote_char = '\''; |
| 57 | if (has_single_quote && !has_double_quote) { |
| 58 | quote_char = '"'; |
| 59 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 60 | mp_printf(print, "%c", quote_char); |
Paul Sokolovsky | 0b7e29c | 2014-01-28 03:40:06 +0200 | [diff] [blame] | 61 | for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) { |
| 62 | if (*s == quote_char) { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 63 | mp_printf(print, "\\%c", quote_char); |
Paul Sokolovsky | 0b7e29c | 2014-01-28 03:40:06 +0200 | [diff] [blame] | 64 | } else if (*s == '\\') { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 65 | mp_print_str(print, "\\\\"); |
Paul Sokolovsky | 2ec38a1 | 2014-06-13 21:23:00 +0300 | [diff] [blame] | 66 | } else if (*s >= 0x20 && *s != 0x7f && (!is_bytes || *s < 0x80)) { |
| 67 | // In strings, anything which is not ascii control character |
| 68 | // is printed as is, this includes characters in range 0x80-0xff |
| 69 | // (which can be non-Latin letters, etc.) |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 70 | mp_printf(print, "%c", *s); |
Paul Sokolovsky | 0b7e29c | 2014-01-28 03:40:06 +0200 | [diff] [blame] | 71 | } else if (*s == '\n') { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 72 | mp_print_str(print, "\\n"); |
Andrew Scheller | 12968fb | 2014-04-08 02:42:50 +0100 | [diff] [blame] | 73 | } else if (*s == '\r') { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 74 | mp_print_str(print, "\\r"); |
Andrew Scheller | 12968fb | 2014-04-08 02:42:50 +0100 | [diff] [blame] | 75 | } else if (*s == '\t') { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 76 | mp_print_str(print, "\\t"); |
Paul Sokolovsky | 0b7e29c | 2014-01-28 03:40:06 +0200 | [diff] [blame] | 77 | } else { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 78 | mp_printf(print, "\\x%02x", *s); |
Paul Sokolovsky | 0b7e29c | 2014-01-28 03:40:06 +0200 | [diff] [blame] | 79 | } |
| 80 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 81 | mp_printf(print, "%c", quote_char); |
Paul Sokolovsky | 0b7e29c | 2014-01-28 03:40:06 +0200 | [diff] [blame] | 82 | } |
| 83 | |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 84 | #if MICROPY_PY_UJSON |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 85 | void mp_str_print_json(const mp_print_t *print, const byte *str_data, size_t str_len) { |
Damien George | cde0ca2 | 2014-09-25 17:35:56 +0100 | [diff] [blame] | 86 | // for JSON spec, see http://www.ietf.org/rfc/rfc4627.txt |
| 87 | // if we are given a valid utf8-encoded string, we will print it in a JSON-conforming way |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 88 | mp_print_str(print, "\""); |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 89 | for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) { |
Damien George | cde0ca2 | 2014-09-25 17:35:56 +0100 | [diff] [blame] | 90 | if (*s == '"' || *s == '\\') { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 91 | mp_printf(print, "\\%c", *s); |
Damien George | cde0ca2 | 2014-09-25 17:35:56 +0100 | [diff] [blame] | 92 | } else if (*s >= 32) { |
| 93 | // this will handle normal and utf-8 encoded chars |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 94 | mp_printf(print, "%c", *s); |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 95 | } else if (*s == '\n') { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 96 | mp_print_str(print, "\\n"); |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 97 | } else if (*s == '\r') { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 98 | mp_print_str(print, "\\r"); |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 99 | } else if (*s == '\t') { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 100 | mp_print_str(print, "\\t"); |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 101 | } else { |
Damien George | cde0ca2 | 2014-09-25 17:35:56 +0100 | [diff] [blame] | 102 | // this will handle control chars |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 103 | mp_printf(print, "\\u%04x", *s); |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 104 | } |
| 105 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 106 | mp_print_str(print, "\""); |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 107 | } |
| 108 | #endif |
| 109 | |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 110 | STATIC void str_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 111 | GET_STR_DATA_LEN(self_in, str_data, str_len); |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 112 | #if MICROPY_PY_UJSON |
| 113 | if (kind == PRINT_JSON) { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 114 | mp_str_print_json(print, str_data, str_len); |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 115 | return; |
| 116 | } |
| 117 | #endif |
Damien George | e2aa117 | 2015-09-03 23:03:57 +0100 | [diff] [blame] | 118 | #if !MICROPY_PY_BUILTINS_STR_UNICODE |
Damien George | cde0ca2 | 2014-09-25 17:35:56 +0100 | [diff] [blame] | 119 | bool is_bytes = MP_OBJ_IS_TYPE(self_in, &mp_type_bytes); |
Damien George | e2aa117 | 2015-09-03 23:03:57 +0100 | [diff] [blame] | 120 | #else |
| 121 | bool is_bytes = true; |
| 122 | #endif |
Paul Sokolovsky | ef63ab5 | 2015-12-20 16:44:36 +0200 | [diff] [blame] | 123 | if (kind == PRINT_RAW || (!MICROPY_PY_BUILTINS_STR_UNICODE && kind == PRINT_STR && !is_bytes)) { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 124 | mp_printf(print, "%.*s", str_len, str_data); |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 125 | } else { |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 126 | if (is_bytes) { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 127 | mp_print_str(print, "b"); |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 128 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 129 | mp_str_print_quoted(print, str_data, str_len, is_bytes); |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 130 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 131 | } |
| 132 | |
Damien George | 5b3f0b7 | 2016-01-03 15:55:55 +0000 | [diff] [blame] | 133 | 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) { |
Paul Sokolovsky | b473d0a | 2014-05-06 19:30:30 +0300 | [diff] [blame] | 134 | #if MICROPY_CPYTHON_COMPAT |
| 135 | if (n_kw != 0) { |
| 136 | mp_arg_error_unimpl_kw(); |
| 137 | } |
| 138 | #endif |
| 139 | |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 140 | mp_arg_check_num(n_args, n_kw, 0, 3, false); |
| 141 | |
Paul Sokolovsky | be020c2 | 2014-03-21 11:39:01 +0200 | [diff] [blame] | 142 | switch (n_args) { |
| 143 | case 0: |
| 144 | return MP_OBJ_NEW_QSTR(MP_QSTR_); |
| 145 | |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 146 | case 1: { |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 147 | vstr_t vstr; |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 148 | mp_print_t print; |
| 149 | vstr_init_print(&vstr, 16, &print); |
| 150 | mp_obj_print_helper(&print, args[0], PRINT_STR); |
Damien George | 5b3f0b7 | 2016-01-03 15:55:55 +0000 | [diff] [blame] | 151 | return mp_obj_new_str_from_vstr(type, &vstr); |
Paul Sokolovsky | be020c2 | 2014-03-21 11:39:01 +0200 | [diff] [blame] | 152 | } |
| 153 | |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 154 | default: // 2 or 3 args |
Paul Sokolovsky | be020c2 | 2014-03-21 11:39:01 +0200 | [diff] [blame] | 155 | // TODO: validate 2nd/3rd args |
Paul Sokolovsky | e62a0fe | 2014-10-30 23:58:08 +0200 | [diff] [blame] | 156 | if (MP_OBJ_IS_TYPE(args[0], &mp_type_bytes)) { |
| 157 | GET_STR_DATA_LEN(args[0], str_data, str_len); |
| 158 | GET_STR_HASH(args[0], str_hash); |
Damien George | 5f3bda4 | 2016-09-02 14:42:53 +1000 | [diff] [blame] | 159 | if (str_hash == 0) { |
| 160 | str_hash = qstr_compute_hash(str_data, str_len); |
| 161 | } |
tll | 68c2817 | 2017-06-24 08:38:32 +0800 | [diff] [blame] | 162 | #if MICROPY_PY_BUILTINS_STR_UNICODE_CHECK |
| 163 | if (!utf8_check(str_data, str_len)) { |
| 164 | mp_raise_msg(&mp_type_UnicodeError, NULL); |
| 165 | } |
| 166 | #endif |
Damien George | 5b3f0b7 | 2016-01-03 15:55:55 +0000 | [diff] [blame] | 167 | mp_obj_str_t *o = MP_OBJ_TO_PTR(mp_obj_new_str_of_type(type, NULL, str_len)); |
Paul Sokolovsky | e62a0fe | 2014-10-30 23:58:08 +0200 | [diff] [blame] | 168 | o->data = str_data; |
| 169 | o->hash = str_hash; |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 170 | return MP_OBJ_FROM_PTR(o); |
Paul Sokolovsky | e62a0fe | 2014-10-30 23:58:08 +0200 | [diff] [blame] | 171 | } else { |
| 172 | mp_buffer_info_t bufinfo; |
| 173 | mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ); |
tll | 68c2817 | 2017-06-24 08:38:32 +0800 | [diff] [blame] | 174 | #if MICROPY_PY_BUILTINS_STR_UNICODE_CHECK |
| 175 | if (!utf8_check(bufinfo.buf, bufinfo.len)) { |
| 176 | mp_raise_msg(&mp_type_UnicodeError, NULL); |
| 177 | } |
| 178 | #endif |
Damien George | 4601759 | 2017-11-16 13:17:51 +1100 | [diff] [blame^] | 179 | return mp_obj_new_str(bufinfo.buf, bufinfo.len); |
Paul Sokolovsky | be020c2 | 2014-03-21 11:39:01 +0200 | [diff] [blame] | 180 | } |
Paul Sokolovsky | be020c2 | 2014-03-21 11:39:01 +0200 | [diff] [blame] | 181 | } |
| 182 | } |
| 183 | |
Damien George | 5b3f0b7 | 2016-01-03 15:55:55 +0000 | [diff] [blame] | 184 | 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) { |
Damien George | ff8dd3f | 2015-01-20 12:47:20 +0000 | [diff] [blame] | 185 | (void)type_in; |
| 186 | |
Damien George | 3a2171e | 2015-09-04 16:53:46 +0100 | [diff] [blame] | 187 | #if MICROPY_CPYTHON_COMPAT |
Paul Sokolovsky | b473d0a | 2014-05-06 19:30:30 +0300 | [diff] [blame] | 188 | if (n_kw != 0) { |
| 189 | mp_arg_error_unimpl_kw(); |
| 190 | } |
Damien George | 3a2171e | 2015-09-04 16:53:46 +0100 | [diff] [blame] | 191 | #else |
| 192 | (void)n_kw; |
| 193 | #endif |
Paul Sokolovsky | b473d0a | 2014-05-06 19:30:30 +0300 | [diff] [blame] | 194 | |
Damien George | 42cec5c | 2015-09-04 16:51:55 +0100 | [diff] [blame] | 195 | if (n_args == 0) { |
| 196 | return mp_const_empty_bytes; |
| 197 | } |
| 198 | |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 199 | if (MP_OBJ_IS_STR(args[0])) { |
| 200 | if (n_args < 2 || n_args > 3) { |
| 201 | goto wrong_args; |
| 202 | } |
| 203 | GET_STR_DATA_LEN(args[0], str_data, str_len); |
| 204 | GET_STR_HASH(args[0], str_hash); |
Damien George | 5f3bda4 | 2016-09-02 14:42:53 +1000 | [diff] [blame] | 205 | if (str_hash == 0) { |
| 206 | str_hash = qstr_compute_hash(str_data, str_len); |
| 207 | } |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 208 | mp_obj_str_t *o = MP_OBJ_TO_PTR(mp_obj_new_str_of_type(&mp_type_bytes, NULL, str_len)); |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 209 | o->data = str_data; |
| 210 | o->hash = str_hash; |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 211 | return MP_OBJ_FROM_PTR(o); |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 212 | } |
| 213 | |
| 214 | if (n_args > 1) { |
| 215 | goto wrong_args; |
| 216 | } |
| 217 | |
| 218 | if (MP_OBJ_IS_SMALL_INT(args[0])) { |
| 219 | uint len = MP_OBJ_SMALL_INT_VALUE(args[0]); |
Damien George | 05005f6 | 2015-01-21 22:48:37 +0000 | [diff] [blame] | 220 | vstr_t vstr; |
| 221 | vstr_init_len(&vstr, len); |
| 222 | memset(vstr.buf, 0, len); |
| 223 | return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 224 | } |
| 225 | |
Damien George | 32ef3a3 | 2014-12-04 15:46:14 +0000 | [diff] [blame] | 226 | // check if argument has the buffer protocol |
| 227 | mp_buffer_info_t bufinfo; |
| 228 | if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_READ)) { |
| 229 | return mp_obj_new_str_of_type(&mp_type_bytes, bufinfo.buf, bufinfo.len); |
| 230 | } |
| 231 | |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 232 | vstr_t vstr; |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 233 | // Try to create array of exact len if initializer len is known |
| 234 | mp_obj_t len_in = mp_obj_len_maybe(args[0]); |
| 235 | if (len_in == MP_OBJ_NULL) { |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 236 | vstr_init(&vstr, 16); |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 237 | } else { |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 238 | mp_int_t len = MP_OBJ_SMALL_INT_VALUE(len_in); |
Damien George | 0d3cb67 | 2015-01-28 23:43:01 +0000 | [diff] [blame] | 239 | vstr_init(&vstr, len); |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 240 | } |
| 241 | |
Damien George | ae8d867 | 2016-01-09 23:14:54 +0000 | [diff] [blame] | 242 | mp_obj_iter_buf_t iter_buf; |
| 243 | mp_obj_t iterable = mp_getiter(args[0], &iter_buf); |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 244 | mp_obj_t item; |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 245 | while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) { |
Damien George | ede0f3a | 2015-04-23 15:28:18 +0100 | [diff] [blame] | 246 | mp_int_t val = mp_obj_get_int(item); |
Paul Sokolovsky | 9a97397 | 2017-04-02 21:20:07 +0300 | [diff] [blame] | 247 | #if MICROPY_FULL_CHECKS |
Damien George | ede0f3a | 2015-04-23 15:28:18 +0100 | [diff] [blame] | 248 | if (val < 0 || val > 255) { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 249 | mp_raise_ValueError("bytes value out of range"); |
Damien George | ede0f3a | 2015-04-23 15:28:18 +0100 | [diff] [blame] | 250 | } |
| 251 | #endif |
| 252 | vstr_add_byte(&vstr, val); |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 253 | } |
| 254 | |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 255 | return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 256 | |
| 257 | wrong_args: |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 258 | mp_raise_TypeError("wrong number of arguments"); |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 259 | } |
| 260 | |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 261 | // like strstr but with specified length and allows \0 bytes |
| 262 | // TODO replace with something more efficient/standard |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 263 | const byte *find_subbytes(const byte *haystack, size_t hlen, const byte *needle, size_t nlen, int direction) { |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 264 | if (hlen >= nlen) { |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 265 | size_t str_index, str_index_end; |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 266 | if (direction > 0) { |
| 267 | str_index = 0; |
| 268 | str_index_end = hlen - nlen; |
| 269 | } else { |
| 270 | str_index = hlen - nlen; |
| 271 | str_index_end = 0; |
| 272 | } |
| 273 | for (;;) { |
| 274 | if (memcmp(&haystack[str_index], needle, nlen) == 0) { |
| 275 | //found |
| 276 | return haystack + str_index; |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 277 | } |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 278 | if (str_index == str_index_end) { |
| 279 | //not found |
| 280 | break; |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 281 | } |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 282 | str_index += direction; |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 283 | } |
| 284 | } |
| 285 | return NULL; |
| 286 | } |
| 287 | |
Damien George | a75b02e | 2014-08-27 09:20:30 +0100 | [diff] [blame] | 288 | // Note: this function is used to check if an object is a str or bytes, which |
| 289 | // works because both those types use it as their binary_op method. Revisit |
| 290 | // MP_OBJ_IS_STR_OR_BYTES if this fact changes. |
Damien George | 58321dd | 2017-08-29 13:04:01 +1000 | [diff] [blame] | 291 | mp_obj_t mp_obj_str_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { |
Damien George | a65c03c | 2014-11-05 16:30:34 +0000 | [diff] [blame] | 292 | // check for modulo |
| 293 | if (op == MP_BINARY_OP_MODULO) { |
Damien George | 7317e34 | 2017-02-03 12:13:44 +1100 | [diff] [blame] | 294 | mp_obj_t *args = &rhs_in; |
Damien George | 6213ad7 | 2017-03-25 19:35:08 +1100 | [diff] [blame] | 295 | size_t n_args = 1; |
Damien George | a65c03c | 2014-11-05 16:30:34 +0000 | [diff] [blame] | 296 | mp_obj_t dict = MP_OBJ_NULL; |
| 297 | if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple)) { |
| 298 | // TODO: Support tuple subclasses? |
| 299 | mp_obj_tuple_get(rhs_in, &n_args, &args); |
| 300 | } else if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_dict)) { |
Damien George | a65c03c | 2014-11-05 16:30:34 +0000 | [diff] [blame] | 301 | dict = rhs_in; |
Damien George | a65c03c | 2014-11-05 16:30:34 +0000 | [diff] [blame] | 302 | } |
| 303 | return str_modulo_format(lhs_in, n_args, args, dict); |
| 304 | } |
| 305 | |
| 306 | // from now on we need lhs type and data, so extract them |
Paul Sokolovsky | 7b0f9a7 | 2014-05-10 04:26:10 +0300 | [diff] [blame] | 307 | mp_obj_type_t *lhs_type = mp_obj_get_type(lhs_in); |
Damien George | a65c03c | 2014-11-05 16:30:34 +0000 | [diff] [blame] | 308 | GET_STR_DATA_LEN(lhs_in, lhs_data, lhs_len); |
| 309 | |
| 310 | // check for multiply |
| 311 | if (op == MP_BINARY_OP_MULTIPLY) { |
| 312 | mp_int_t n; |
| 313 | if (!mp_obj_get_int_maybe(rhs_in, &n)) { |
| 314 | return MP_OBJ_NULL; // op not supported |
| 315 | } |
| 316 | if (n <= 0) { |
| 317 | if (lhs_type == &mp_type_str) { |
| 318 | return MP_OBJ_NEW_QSTR(MP_QSTR_); // empty str |
| 319 | } else { |
| 320 | return mp_const_empty_bytes; |
| 321 | } |
| 322 | } |
Damien George | 05005f6 | 2015-01-21 22:48:37 +0000 | [diff] [blame] | 323 | vstr_t vstr; |
| 324 | vstr_init_len(&vstr, lhs_len * n); |
| 325 | mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, vstr.buf); |
| 326 | return mp_obj_new_str_from_vstr(lhs_type, &vstr); |
Damien George | a65c03c | 2014-11-05 16:30:34 +0000 | [diff] [blame] | 327 | } |
| 328 | |
| 329 | // From now on all operations allow: |
| 330 | // - str with str |
| 331 | // - bytes with bytes |
| 332 | // - bytes with bytearray |
| 333 | // - bytes with array.array |
| 334 | // To do this efficiently we use the buffer protocol to extract the raw |
| 335 | // data for the rhs, but only if the lhs is a bytes object. |
| 336 | // |
| 337 | // NOTE: CPython does not allow comparison between bytes ard array.array |
| 338 | // (even if the array is of type 'b'), even though it allows addition of |
| 339 | // such types. We are not compatible with this (we do allow comparison |
| 340 | // of bytes with anything that has the buffer protocol). It would be |
| 341 | // easy to "fix" this with a bit of extra logic below, but it costs code |
| 342 | // size and execution time so we don't. |
| 343 | |
| 344 | const byte *rhs_data; |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 345 | size_t rhs_len; |
Damien George | a65c03c | 2014-11-05 16:30:34 +0000 | [diff] [blame] | 346 | if (lhs_type == mp_obj_get_type(rhs_in)) { |
| 347 | GET_STR_DATA_LEN(rhs_in, rhs_data_, rhs_len_); |
| 348 | rhs_data = rhs_data_; |
| 349 | rhs_len = rhs_len_; |
| 350 | } else if (lhs_type == &mp_type_bytes) { |
| 351 | mp_buffer_info_t bufinfo; |
| 352 | if (!mp_get_buffer(rhs_in, &bufinfo, MP_BUFFER_READ)) { |
Damien George | e233a55 | 2015-01-11 21:07:15 +0000 | [diff] [blame] | 353 | return MP_OBJ_NULL; // op not supported |
Damien George | a65c03c | 2014-11-05 16:30:34 +0000 | [diff] [blame] | 354 | } |
| 355 | rhs_data = bufinfo.buf; |
| 356 | rhs_len = bufinfo.len; |
| 357 | } else { |
Damien George | 3d25d9c | 2017-08-09 21:25:48 +1000 | [diff] [blame] | 358 | // LHS is str and RHS has an incompatible type |
| 359 | // (except if operation is EQUAL, but that's handled by mp_obj_equal) |
| 360 | bad_implicit_conversion(rhs_in); |
Damien George | a65c03c | 2014-11-05 16:30:34 +0000 | [diff] [blame] | 361 | } |
| 362 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 363 | switch (op) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 364 | case MP_BINARY_OP_ADD: |
Damien George | a65c03c | 2014-11-05 16:30:34 +0000 | [diff] [blame] | 365 | case MP_BINARY_OP_INPLACE_ADD: { |
Damien George | d279bcf | 2017-03-16 14:30:04 +1100 | [diff] [blame] | 366 | if (lhs_len == 0 && mp_obj_get_type(rhs_in) == lhs_type) { |
Paul Sokolovsky | e2e6632 | 2017-01-27 00:40:47 +0300 | [diff] [blame] | 367 | return rhs_in; |
| 368 | } |
| 369 | if (rhs_len == 0) { |
| 370 | return lhs_in; |
| 371 | } |
| 372 | |
Damien George | 05005f6 | 2015-01-21 22:48:37 +0000 | [diff] [blame] | 373 | vstr_t vstr; |
| 374 | vstr_init_len(&vstr, lhs_len + rhs_len); |
| 375 | memcpy(vstr.buf, lhs_data, lhs_len); |
| 376 | memcpy(vstr.buf + lhs_len, rhs_data, rhs_len); |
| 377 | return mp_obj_new_str_from_vstr(lhs_type, &vstr); |
Paul Sokolovsky | 545591a | 2014-01-21 00:27:33 +0200 | [diff] [blame] | 378 | } |
Paul Sokolovsky | 87e85b7 | 2014-02-02 08:24:07 +0200 | [diff] [blame] | 379 | |
Damien George | a65c03c | 2014-11-05 16:30:34 +0000 | [diff] [blame] | 380 | case MP_BINARY_OP_IN: |
| 381 | /* NOTE `a in b` is `b.__contains__(a)` */ |
Paul Sokolovsky | 1b586f3 | 2015-10-11 12:09:43 +0300 | [diff] [blame] | 382 | return mp_obj_new_bool(find_subbytes(lhs_data, lhs_len, rhs_data, rhs_len, 1) != NULL); |
Paul Sokolovsky | 4db727a | 2014-03-31 21:18:28 +0300 | [diff] [blame] | 383 | |
Paul Sokolovsky | 7b0f9a7 | 2014-05-10 04:26:10 +0300 | [diff] [blame] | 384 | //case MP_BINARY_OP_NOT_EQUAL: // This is never passed here |
| 385 | case MP_BINARY_OP_EQUAL: // This will be passed only for bytes, str is dealt with in mp_obj_equal() |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 386 | case MP_BINARY_OP_LESS: |
| 387 | case MP_BINARY_OP_LESS_EQUAL: |
| 388 | case MP_BINARY_OP_MORE: |
| 389 | case MP_BINARY_OP_MORE_EQUAL: |
Paul Sokolovsky | 1b586f3 | 2015-10-11 12:09:43 +0300 | [diff] [blame] | 390 | return mp_obj_new_bool(mp_seq_cmp_bytes(op, lhs_data, lhs_len, rhs_data, rhs_len)); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 391 | |
Damien George | 58321dd | 2017-08-29 13:04:01 +1000 | [diff] [blame] | 392 | default: |
| 393 | return MP_OBJ_NULL; // op not supported |
| 394 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 395 | } |
| 396 | |
Paul Sokolovsky | ea2c936 | 2014-06-15 00:35:09 +0300 | [diff] [blame] | 397 | #if !MICROPY_PY_BUILTINS_STR_UNICODE |
| 398 | // objstrunicode defines own version |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 399 | const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, size_t self_len, |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 400 | mp_obj_t index, bool is_slice) { |
Damien George | c88cfe1 | 2017-03-23 16:17:40 +1100 | [diff] [blame] | 401 | size_t index_val = mp_get_index(type, self_len, index, is_slice); |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 402 | return self_data + index_val; |
| 403 | } |
Paul Sokolovsky | ea2c936 | 2014-06-15 00:35:09 +0300 | [diff] [blame] | 404 | #endif |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 405 | |
Paul Sokolovsky | 9749b2f | 2014-08-11 22:36:38 +0300 | [diff] [blame] | 406 | // This is used for both bytes and 8-bit strings. This is not used for unicode strings. |
| 407 | STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { |
Paul Sokolovsky | 5ebd5f0 | 2014-05-11 21:22:59 +0300 | [diff] [blame] | 408 | mp_obj_type_t *type = mp_obj_get_type(self_in); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 409 | GET_STR_DATA_LEN(self_in, self_data, self_len); |
| 410 | if (value == MP_OBJ_SENTINEL) { |
| 411 | // load |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame] | 412 | #if MICROPY_PY_BUILTINS_SLICE |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 413 | if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) { |
Paul Sokolovsky | de4b932 | 2014-05-25 21:21:57 +0300 | [diff] [blame] | 414 | mp_bound_slice_t slice; |
| 415 | if (!mp_seq_get_fast_slice_indexes(self_len, index, &slice)) { |
Javier Candeira | 35a1fea | 2017-08-09 14:40:45 +1000 | [diff] [blame] | 416 | mp_raise_NotImplementedError("only slices with step=1 (aka None) are supported"); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 417 | } |
Damien George | f600a6a | 2014-05-25 22:34:34 +0100 | [diff] [blame] | 418 | return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 419 | } |
| 420 | #endif |
Damien George | c88cfe1 | 2017-03-23 16:17:40 +1100 | [diff] [blame] | 421 | size_t index_val = mp_get_index(type, self_len, index, false); |
Damien George | 2eb1f60 | 2014-08-11 23:24:29 +0100 | [diff] [blame] | 422 | // If we have unicode enabled the type will always be bytes, so take the short cut. |
| 423 | if (MICROPY_PY_BUILTINS_STR_UNICODE || type == &mp_type_bytes) { |
Paul Sokolovsky | 9749b2f | 2014-08-11 22:36:38 +0300 | [diff] [blame] | 424 | return MP_OBJ_NEW_SMALL_INT(self_data[index_val]); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 425 | } else { |
Damien George | 4601759 | 2017-11-16 13:17:51 +1100 | [diff] [blame^] | 426 | return mp_obj_new_str_via_qstr((char*)&self_data[index_val], 1); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 427 | } |
| 428 | } else { |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 429 | return MP_OBJ_NULL; // op not supported |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 430 | } |
| 431 | } |
| 432 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 433 | STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 434 | mp_check_self(MP_OBJ_IS_STR_OR_BYTES(self_in)); |
Paul Sokolovsky | 5e5d69b | 2014-05-11 21:13:01 +0300 | [diff] [blame] | 435 | const mp_obj_type_t *self_type = mp_obj_get_type(self_in); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 436 | |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 437 | // get separation string |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 438 | GET_STR_DATA_LEN(self_in, sep_str, sep_len); |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 439 | |
| 440 | // process args |
Damien George | 6213ad7 | 2017-03-25 19:35:08 +1100 | [diff] [blame] | 441 | size_t seq_len; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 442 | mp_obj_t *seq_items; |
Krzysztof Blazewicz | 7e480e8 | 2017-03-04 12:29:20 +0100 | [diff] [blame] | 443 | |
| 444 | if (!MP_OBJ_IS_TYPE(arg, &mp_type_list) && !MP_OBJ_IS_TYPE(arg, &mp_type_tuple)) { |
| 445 | // arg is not a list nor a tuple, try to convert it to a list |
| 446 | // TODO: Try to optimize? |
| 447 | arg = mp_type_list.make_new(&mp_type_list, 1, 0, &arg); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 448 | } |
Krzysztof Blazewicz | 7e480e8 | 2017-03-04 12:29:20 +0100 | [diff] [blame] | 449 | mp_obj_get_array(arg, &seq_len, &seq_items); |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 450 | |
| 451 | // count required length |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 452 | size_t required_len = 0; |
| 453 | for (size_t i = 0; i < seq_len; i++) { |
Paul Sokolovsky | 5e5d69b | 2014-05-11 21:13:01 +0300 | [diff] [blame] | 454 | if (mp_obj_get_type(seq_items[i]) != self_type) { |
Damien George | 2196799 | 2016-08-14 16:51:54 +1000 | [diff] [blame] | 455 | mp_raise_TypeError( |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 456 | "join expects a list of str/bytes objects consistent with self object"); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 457 | } |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 458 | if (i > 0) { |
| 459 | required_len += sep_len; |
| 460 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 461 | GET_STR_LEN(seq_items[i], l); |
| 462 | required_len += l; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 463 | } |
| 464 | |
| 465 | // make joined string |
Damien George | 05005f6 | 2015-01-21 22:48:37 +0000 | [diff] [blame] | 466 | vstr_t vstr; |
| 467 | vstr_init_len(&vstr, required_len); |
| 468 | byte *data = (byte*)vstr.buf; |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 469 | for (size_t i = 0; i < seq_len; i++) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 470 | if (i > 0) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 471 | memcpy(data, sep_str, sep_len); |
| 472 | data += sep_len; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 473 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 474 | GET_STR_DATA_LEN(seq_items[i], s, l); |
| 475 | memcpy(data, s, l); |
| 476 | data += l; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 477 | } |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 478 | |
| 479 | // return joined string |
Damien George | 05005f6 | 2015-01-21 22:48:37 +0000 | [diff] [blame] | 480 | return mp_obj_new_str_from_vstr(self_type, &vstr); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 481 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 482 | MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 483 | |
Damien George | cc80c4d | 2016-05-13 12:21:32 +0100 | [diff] [blame] | 484 | mp_obj_t mp_obj_str_split(size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | bfb8819 | 2014-05-11 21:17:28 +0300 | [diff] [blame] | 485 | const mp_obj_type_t *self_type = mp_obj_get_type(args[0]); |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 486 | mp_int_t splits = -1; |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 487 | mp_obj_t sep = mp_const_none; |
| 488 | if (n_args > 1) { |
| 489 | sep = args[1]; |
| 490 | if (n_args > 2) { |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 491 | splits = mp_obj_get_int(args[2]); |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 492 | } |
| 493 | } |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 494 | |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 495 | mp_obj_t res = mp_obj_new_list(0, NULL); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 496 | GET_STR_DATA_LEN(args[0], s, len); |
| 497 | const byte *top = s + len; |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 498 | |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 499 | if (sep == mp_const_none) { |
| 500 | // sep not given, so separate on whitespace |
| 501 | |
| 502 | // Initial whitespace is not counted as split, so we pre-do it |
Paul Sokolovsky | 8b7faa3 | 2015-04-12 00:17:16 +0300 | [diff] [blame] | 503 | while (s < top && unichar_isspace(*s)) s++; |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 504 | while (s < top && splits != 0) { |
| 505 | const byte *start = s; |
Paul Sokolovsky | 8b7faa3 | 2015-04-12 00:17:16 +0300 | [diff] [blame] | 506 | while (s < top && !unichar_isspace(*s)) s++; |
Damien George | f600a6a | 2014-05-25 22:34:34 +0100 | [diff] [blame] | 507 | mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start)); |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 508 | if (s >= top) { |
| 509 | break; |
| 510 | } |
Paul Sokolovsky | 8b7faa3 | 2015-04-12 00:17:16 +0300 | [diff] [blame] | 511 | while (s < top && unichar_isspace(*s)) s++; |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 512 | if (splits > 0) { |
| 513 | splits--; |
| 514 | } |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 515 | } |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 516 | |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 517 | if (s < top) { |
Damien George | f600a6a | 2014-05-25 22:34:34 +0100 | [diff] [blame] | 518 | mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, s, top - s)); |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 519 | } |
| 520 | |
| 521 | } else { |
| 522 | // sep given |
Paul Sokolovsky | 0c54985 | 2014-08-10 23:14:35 +0300 | [diff] [blame] | 523 | if (mp_obj_get_type(sep) != self_type) { |
Damien George | c55a4d8 | 2014-12-24 20:28:30 +0000 | [diff] [blame] | 524 | bad_implicit_conversion(sep); |
Paul Sokolovsky | 0c54985 | 2014-08-10 23:14:35 +0300 | [diff] [blame] | 525 | } |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 526 | |
Damien George | 6b34107 | 2017-03-25 19:48:18 +1100 | [diff] [blame] | 527 | size_t sep_len; |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 528 | const char *sep_str = mp_obj_str_get_data(sep, &sep_len); |
| 529 | |
| 530 | if (sep_len == 0) { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 531 | mp_raise_ValueError("empty separator"); |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 532 | } |
| 533 | |
| 534 | for (;;) { |
| 535 | const byte *start = s; |
| 536 | for (;;) { |
| 537 | if (splits == 0 || s + sep_len > top) { |
| 538 | s = top; |
| 539 | break; |
| 540 | } else if (memcmp(s, sep_str, sep_len) == 0) { |
| 541 | break; |
| 542 | } |
| 543 | s++; |
| 544 | } |
Damien George | cc80c4d | 2016-05-13 12:21:32 +0100 | [diff] [blame] | 545 | mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start)); |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 546 | if (s >= top) { |
| 547 | break; |
| 548 | } |
| 549 | s += sep_len; |
| 550 | if (splits > 0) { |
| 551 | splits--; |
| 552 | } |
| 553 | } |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 554 | } |
| 555 | |
| 556 | return res; |
| 557 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 558 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, mp_obj_str_split); |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 559 | |
Paul Sokolovsky | ac2f7a7 | 2015-04-04 00:09:23 +0300 | [diff] [blame] | 560 | #if MICROPY_PY_BUILTINS_STR_SPLITLINES |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 561 | STATIC mp_obj_t str_splitlines(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { |
Damien George | cc80c4d | 2016-05-13 12:21:32 +0100 | [diff] [blame] | 562 | enum { ARG_keepends }; |
Paul Sokolovsky | ac2f7a7 | 2015-04-04 00:09:23 +0300 | [diff] [blame] | 563 | static const mp_arg_t allowed_args[] = { |
| 564 | { MP_QSTR_keepends, MP_ARG_BOOL, {.u_bool = false} }, |
| 565 | }; |
| 566 | |
| 567 | // parse args |
Damien George | cc80c4d | 2016-05-13 12:21:32 +0100 | [diff] [blame] | 568 | mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; |
| 569 | mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); |
Paul Sokolovsky | ac2f7a7 | 2015-04-04 00:09:23 +0300 | [diff] [blame] | 570 | |
Damien George | cc80c4d | 2016-05-13 12:21:32 +0100 | [diff] [blame] | 571 | const mp_obj_type_t *self_type = mp_obj_get_type(pos_args[0]); |
| 572 | mp_obj_t res = mp_obj_new_list(0, NULL); |
| 573 | |
| 574 | GET_STR_DATA_LEN(pos_args[0], s, len); |
| 575 | const byte *top = s + len; |
| 576 | |
| 577 | while (s < top) { |
| 578 | const byte *start = s; |
| 579 | size_t match = 0; |
| 580 | while (s < top) { |
| 581 | if (*s == '\n') { |
| 582 | match = 1; |
| 583 | break; |
| 584 | } else if (*s == '\r') { |
| 585 | if (s[1] == '\n') { |
| 586 | match = 2; |
| 587 | } else { |
| 588 | match = 1; |
| 589 | } |
| 590 | break; |
| 591 | } |
| 592 | s++; |
| 593 | } |
| 594 | size_t sub_len = s - start; |
| 595 | if (args[ARG_keepends].u_bool) { |
| 596 | sub_len += match; |
| 597 | } |
| 598 | mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, sub_len)); |
| 599 | s += match; |
| 600 | } |
| 601 | |
| 602 | return res; |
Paul Sokolovsky | ac2f7a7 | 2015-04-04 00:09:23 +0300 | [diff] [blame] | 603 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 604 | MP_DEFINE_CONST_FUN_OBJ_KW(str_splitlines_obj, 1, str_splitlines); |
Paul Sokolovsky | ac2f7a7 | 2015-04-04 00:09:23 +0300 | [diff] [blame] | 605 | #endif |
| 606 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 607 | STATIC mp_obj_t str_rsplit(size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | 2a27365 | 2014-05-13 08:07:08 +0300 | [diff] [blame] | 608 | if (n_args < 3) { |
| 609 | // If we don't have split limit, it doesn't matter from which side |
| 610 | // we split. |
Paul Sokolovsky | 8705171 | 2015-03-23 22:15:12 +0200 | [diff] [blame] | 611 | return mp_obj_str_split(n_args, args); |
Paul Sokolovsky | 2a27365 | 2014-05-13 08:07:08 +0300 | [diff] [blame] | 612 | } |
| 613 | const mp_obj_type_t *self_type = mp_obj_get_type(args[0]); |
| 614 | mp_obj_t sep = args[1]; |
| 615 | GET_STR_DATA_LEN(args[0], s, len); |
| 616 | |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 617 | mp_int_t splits = mp_obj_get_int(args[2]); |
Damien George | 9f85c4f | 2017-06-02 13:07:22 +1000 | [diff] [blame] | 618 | if (splits < 0) { |
| 619 | // Negative limit means no limit, so delegate to split(). |
| 620 | return mp_obj_str_split(n_args, args); |
| 621 | } |
| 622 | |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 623 | mp_int_t org_splits = splits; |
Paul Sokolovsky | 2a27365 | 2014-05-13 08:07:08 +0300 | [diff] [blame] | 624 | // Preallocate list to the max expected # of elements, as we |
| 625 | // will fill it from the end. |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 626 | mp_obj_list_t *res = MP_OBJ_TO_PTR(mp_obj_new_list(splits + 1, NULL)); |
Damien George | 39dc145 | 2014-10-03 19:52:22 +0100 | [diff] [blame] | 627 | mp_int_t idx = splits; |
Paul Sokolovsky | 2a27365 | 2014-05-13 08:07:08 +0300 | [diff] [blame] | 628 | |
| 629 | if (sep == mp_const_none) { |
Javier Candeira | 35a1fea | 2017-08-09 14:40:45 +1000 | [diff] [blame] | 630 | mp_raise_NotImplementedError("rsplit(None,n)"); |
Paul Sokolovsky | 2a27365 | 2014-05-13 08:07:08 +0300 | [diff] [blame] | 631 | } else { |
Damien George | 6b34107 | 2017-03-25 19:48:18 +1100 | [diff] [blame] | 632 | size_t sep_len; |
Paul Sokolovsky | 2a27365 | 2014-05-13 08:07:08 +0300 | [diff] [blame] | 633 | const char *sep_str = mp_obj_str_get_data(sep, &sep_len); |
| 634 | |
| 635 | if (sep_len == 0) { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 636 | mp_raise_ValueError("empty separator"); |
Paul Sokolovsky | 2a27365 | 2014-05-13 08:07:08 +0300 | [diff] [blame] | 637 | } |
| 638 | |
| 639 | const byte *beg = s; |
| 640 | const byte *last = s + len; |
| 641 | for (;;) { |
| 642 | s = last - sep_len; |
| 643 | for (;;) { |
| 644 | if (splits == 0 || s < beg) { |
| 645 | break; |
| 646 | } else if (memcmp(s, sep_str, sep_len) == 0) { |
| 647 | break; |
| 648 | } |
| 649 | s--; |
| 650 | } |
| 651 | if (s < beg || splits == 0) { |
Damien George | f600a6a | 2014-05-25 22:34:34 +0100 | [diff] [blame] | 652 | res->items[idx] = mp_obj_new_str_of_type(self_type, beg, last - beg); |
Paul Sokolovsky | 2a27365 | 2014-05-13 08:07:08 +0300 | [diff] [blame] | 653 | break; |
| 654 | } |
Damien George | f600a6a | 2014-05-25 22:34:34 +0100 | [diff] [blame] | 655 | res->items[idx--] = mp_obj_new_str_of_type(self_type, s + sep_len, last - s - sep_len); |
Paul Sokolovsky | 2a27365 | 2014-05-13 08:07:08 +0300 | [diff] [blame] | 656 | last = s; |
| 657 | if (splits > 0) { |
| 658 | splits--; |
| 659 | } |
| 660 | } |
| 661 | if (idx != 0) { |
| 662 | // We split less parts than split limit, now go cleanup surplus |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 663 | size_t used = org_splits + 1 - idx; |
Damien George | 17ae239 | 2014-08-29 21:07:54 +0100 | [diff] [blame] | 664 | memmove(res->items, &res->items[idx], used * sizeof(mp_obj_t)); |
Paul Sokolovsky | 2a27365 | 2014-05-13 08:07:08 +0300 | [diff] [blame] | 665 | mp_seq_clear(res->items, used, res->alloc, sizeof(*res->items)); |
| 666 | res->len = used; |
| 667 | } |
| 668 | } |
| 669 | |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 670 | return MP_OBJ_FROM_PTR(res); |
Paul Sokolovsky | 2a27365 | 2014-05-13 08:07:08 +0300 | [diff] [blame] | 671 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 672 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rsplit_obj, 1, 3, str_rsplit); |
Paul Sokolovsky | 2a27365 | 2014-05-13 08:07:08 +0300 | [diff] [blame] | 673 | |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 674 | STATIC mp_obj_t str_finder(size_t n_args, const mp_obj_t *args, int direction, bool is_index) { |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 675 | const mp_obj_type_t *self_type = mp_obj_get_type(args[0]); |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 676 | mp_check_self(MP_OBJ_IS_STR_OR_BYTES(args[0])); |
Damien George | be8e99c | 2014-11-05 16:45:54 +0000 | [diff] [blame] | 677 | |
| 678 | // check argument type |
Damien George | c55a4d8 | 2014-12-24 20:28:30 +0000 | [diff] [blame] | 679 | if (mp_obj_get_type(args[1]) != self_type) { |
Damien George | be8e99c | 2014-11-05 16:45:54 +0000 | [diff] [blame] | 680 | bad_implicit_conversion(args[1]); |
| 681 | } |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 682 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 683 | GET_STR_DATA_LEN(args[0], haystack, haystack_len); |
| 684 | GET_STR_DATA_LEN(args[1], needle, needle_len); |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 685 | |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 686 | const byte *start = haystack; |
| 687 | const byte *end = haystack + haystack_len; |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 688 | if (n_args >= 3 && args[2] != mp_const_none) { |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 689 | start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true); |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 690 | } |
| 691 | if (n_args >= 4 && args[3] != mp_const_none) { |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 692 | end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true); |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 693 | } |
| 694 | |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 695 | const byte *p = find_subbytes(start, end - start, needle, needle_len, direction); |
Damien George | 2300537 | 2014-01-13 19:39:01 +0000 | [diff] [blame] | 696 | if (p == NULL) { |
| 697 | // not found |
xbe | 3d9a39e | 2014-04-08 11:42:19 -0700 | [diff] [blame] | 698 | if (is_index) { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 699 | mp_raise_ValueError("substring not found"); |
xbe | 3d9a39e | 2014-04-08 11:42:19 -0700 | [diff] [blame] | 700 | } else { |
| 701 | return MP_OBJ_NEW_SMALL_INT(-1); |
| 702 | } |
Damien George | 2300537 | 2014-01-13 19:39:01 +0000 | [diff] [blame] | 703 | } else { |
| 704 | // found |
Paul Sokolovsky | 5048df0 | 2014-06-14 03:15:00 +0300 | [diff] [blame] | 705 | #if MICROPY_PY_BUILTINS_STR_UNICODE |
| 706 | if (self_type == &mp_type_str) { |
| 707 | return MP_OBJ_NEW_SMALL_INT(utf8_ptr_to_index(haystack, p)); |
| 708 | } |
| 709 | #endif |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 710 | return MP_OBJ_NEW_SMALL_INT(p - haystack); |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 711 | } |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 712 | } |
| 713 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 714 | STATIC mp_obj_t str_find(size_t n_args, const mp_obj_t *args) { |
xbe | 3d9a39e | 2014-04-08 11:42:19 -0700 | [diff] [blame] | 715 | return str_finder(n_args, args, 1, false); |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 716 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 717 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj, 2, 4, str_find); |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 718 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 719 | STATIC mp_obj_t str_rfind(size_t n_args, const mp_obj_t *args) { |
xbe | 3d9a39e | 2014-04-08 11:42:19 -0700 | [diff] [blame] | 720 | return str_finder(n_args, args, -1, false); |
| 721 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 722 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rfind_obj, 2, 4, str_rfind); |
xbe | 3d9a39e | 2014-04-08 11:42:19 -0700 | [diff] [blame] | 723 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 724 | STATIC mp_obj_t str_index(size_t n_args, const mp_obj_t *args) { |
xbe | 3d9a39e | 2014-04-08 11:42:19 -0700 | [diff] [blame] | 725 | return str_finder(n_args, args, 1, true); |
| 726 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 727 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_index_obj, 2, 4, str_index); |
xbe | 3d9a39e | 2014-04-08 11:42:19 -0700 | [diff] [blame] | 728 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 729 | STATIC mp_obj_t str_rindex(size_t n_args, const mp_obj_t *args) { |
xbe | 3d9a39e | 2014-04-08 11:42:19 -0700 | [diff] [blame] | 730 | return str_finder(n_args, args, -1, true); |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 731 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 732 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rindex_obj, 2, 4, str_rindex); |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 733 | |
Paul Sokolovsky | 1eacefe | 2014-01-23 01:20:40 +0200 | [diff] [blame] | 734 | // TODO: (Much) more variety in args |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 735 | STATIC mp_obj_t str_startswith(size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 736 | const mp_obj_type_t *self_type = mp_obj_get_type(args[0]); |
Paul Sokolovsky | c18ef2a | 2014-05-15 21:18:34 +0300 | [diff] [blame] | 737 | GET_STR_DATA_LEN(args[0], str, str_len); |
Paul Sokolovsky | 37379a2 | 2017-08-29 00:06:21 +0300 | [diff] [blame] | 738 | size_t prefix_len; |
| 739 | const char *prefix = mp_obj_str_get_data(args[1], &prefix_len); |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 740 | const byte *start = str; |
Paul Sokolovsky | c18ef2a | 2014-05-15 21:18:34 +0300 | [diff] [blame] | 741 | if (n_args > 2) { |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 742 | start = str_index_to_ptr(self_type, str, str_len, args[2], true); |
Paul Sokolovsky | c18ef2a | 2014-05-15 21:18:34 +0300 | [diff] [blame] | 743 | } |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 744 | if (prefix_len + (start - str) > str_len) { |
Paul Sokolovsky | 1eacefe | 2014-01-23 01:20:40 +0200 | [diff] [blame] | 745 | return mp_const_false; |
| 746 | } |
Paul Sokolovsky | 1b586f3 | 2015-10-11 12:09:43 +0300 | [diff] [blame] | 747 | return mp_obj_new_bool(memcmp(start, prefix, prefix_len) == 0); |
Paul Sokolovsky | 1eacefe | 2014-01-23 01:20:40 +0200 | [diff] [blame] | 748 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 749 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_startswith_obj, 2, 3, str_startswith); |
Paul Sokolovsky | 1eacefe | 2014-01-23 01:20:40 +0200 | [diff] [blame] | 750 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 751 | STATIC mp_obj_t str_endswith(size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | d098c6b | 2014-05-24 22:46:51 +0300 | [diff] [blame] | 752 | GET_STR_DATA_LEN(args[0], str, str_len); |
Paul Sokolovsky | 37379a2 | 2017-08-29 00:06:21 +0300 | [diff] [blame] | 753 | size_t suffix_len; |
| 754 | const char *suffix = mp_obj_str_get_data(args[1], &suffix_len); |
Damien George | 55b11e6 | 2015-09-04 16:49:56 +0100 | [diff] [blame] | 755 | if (n_args > 2) { |
Javier Candeira | 35a1fea | 2017-08-09 14:40:45 +1000 | [diff] [blame] | 756 | mp_raise_NotImplementedError("start/end indices"); |
Damien George | 55b11e6 | 2015-09-04 16:49:56 +0100 | [diff] [blame] | 757 | } |
Paul Sokolovsky | d098c6b | 2014-05-24 22:46:51 +0300 | [diff] [blame] | 758 | |
| 759 | if (suffix_len > str_len) { |
| 760 | return mp_const_false; |
| 761 | } |
Paul Sokolovsky | 1b586f3 | 2015-10-11 12:09:43 +0300 | [diff] [blame] | 762 | return mp_obj_new_bool(memcmp(str + (str_len - suffix_len), suffix, suffix_len) == 0); |
Paul Sokolovsky | d098c6b | 2014-05-24 22:46:51 +0300 | [diff] [blame] | 763 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 764 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_endswith_obj, 2, 3, str_endswith); |
Paul Sokolovsky | d098c6b | 2014-05-24 22:46:51 +0300 | [diff] [blame] | 765 | |
Paul Sokolovsky | 8810784 | 2014-04-26 06:20:08 +0300 | [diff] [blame] | 766 | enum { LSTRIP, RSTRIP, STRIP }; |
| 767 | |
Damien George | 90ab191 | 2017-02-03 13:04:56 +1100 | [diff] [blame] | 768 | STATIC mp_obj_t str_uni_strip(int type, size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 769 | mp_check_self(MP_OBJ_IS_STR_OR_BYTES(args[0])); |
Paul Sokolovsky | b2d4fc0 | 2014-05-11 13:17:29 +0300 | [diff] [blame] | 770 | const mp_obj_type_t *self_type = mp_obj_get_type(args[0]); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 771 | |
| 772 | const byte *chars_to_del; |
| 773 | uint chars_to_del_len; |
| 774 | static const byte whitespace[] = " \t\n\r\v\f"; |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 775 | |
| 776 | if (n_args == 1) { |
| 777 | chars_to_del = whitespace; |
Paul Sokolovsky | fc9a6dd | 2017-09-19 21:19:23 +0300 | [diff] [blame] | 778 | chars_to_del_len = sizeof(whitespace) - 1; |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 779 | } else { |
Paul Sokolovsky | b2d4fc0 | 2014-05-11 13:17:29 +0300 | [diff] [blame] | 780 | if (mp_obj_get_type(args[1]) != self_type) { |
Damien George | c55a4d8 | 2014-12-24 20:28:30 +0000 | [diff] [blame] | 781 | bad_implicit_conversion(args[1]); |
Paul Sokolovsky | b2d4fc0 | 2014-05-11 13:17:29 +0300 | [diff] [blame] | 782 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 783 | GET_STR_DATA_LEN(args[1], s, l); |
| 784 | chars_to_del = s; |
| 785 | chars_to_del_len = l; |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 786 | } |
| 787 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 788 | GET_STR_DATA_LEN(args[0], orig_str, orig_str_len); |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 789 | |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 790 | size_t first_good_char_pos = 0; |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 791 | bool first_good_char_pos_set = false; |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 792 | size_t last_good_char_pos = 0; |
| 793 | size_t i = 0; |
| 794 | int delta = 1; |
Paul Sokolovsky | e14d096 | 2014-04-26 06:48:31 +0300 | [diff] [blame] | 795 | if (type == RSTRIP) { |
| 796 | i = orig_str_len - 1; |
| 797 | delta = -1; |
| 798 | } |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 799 | for (size_t len = orig_str_len; len > 0; len--) { |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 800 | if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) { |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 801 | if (!first_good_char_pos_set) { |
Paul Sokolovsky | bcdffe5 | 2014-05-30 03:07:05 +0300 | [diff] [blame] | 802 | first_good_char_pos_set = true; |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 803 | first_good_char_pos = i; |
Paul Sokolovsky | 8810784 | 2014-04-26 06:20:08 +0300 | [diff] [blame] | 804 | if (type == LSTRIP) { |
| 805 | last_good_char_pos = orig_str_len - 1; |
| 806 | break; |
Paul Sokolovsky | e14d096 | 2014-04-26 06:48:31 +0300 | [diff] [blame] | 807 | } else if (type == RSTRIP) { |
| 808 | first_good_char_pos = 0; |
| 809 | last_good_char_pos = i; |
| 810 | break; |
Paul Sokolovsky | 8810784 | 2014-04-26 06:20:08 +0300 | [diff] [blame] | 811 | } |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 812 | } |
Paul Sokolovsky | 8810784 | 2014-04-26 06:20:08 +0300 | [diff] [blame] | 813 | last_good_char_pos = i; |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 814 | } |
Paul Sokolovsky | e14d096 | 2014-04-26 06:48:31 +0300 | [diff] [blame] | 815 | i += delta; |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 816 | } |
| 817 | |
Paul Sokolovsky | bcdffe5 | 2014-05-30 03:07:05 +0300 | [diff] [blame] | 818 | if (!first_good_char_pos_set) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 819 | // string is all whitespace, return '' |
Damien George | c55a4d8 | 2014-12-24 20:28:30 +0000 | [diff] [blame] | 820 | if (self_type == &mp_type_str) { |
| 821 | return MP_OBJ_NEW_QSTR(MP_QSTR_); |
| 822 | } else { |
| 823 | return mp_const_empty_bytes; |
| 824 | } |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 825 | } |
| 826 | |
| 827 | assert(last_good_char_pos >= first_good_char_pos); |
Ville Skyttä | ca16c38 | 2017-05-29 10:08:14 +0300 | [diff] [blame] | 828 | //+1 to accommodate the last character |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 829 | size_t stripped_len = last_good_char_pos - first_good_char_pos + 1; |
Paul Sokolovsky | 8827682 | 2014-05-30 03:11:44 +0300 | [diff] [blame] | 830 | if (stripped_len == orig_str_len) { |
| 831 | // If nothing was stripped, don't bother to dup original string |
| 832 | // TODO: watch out for this case when we'll get to bytearray.strip() |
| 833 | assert(first_good_char_pos == 0); |
| 834 | return args[0]; |
| 835 | } |
Damien George | f600a6a | 2014-05-25 22:34:34 +0100 | [diff] [blame] | 836 | return mp_obj_new_str_of_type(self_type, orig_str + first_good_char_pos, stripped_len); |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 837 | } |
| 838 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 839 | STATIC mp_obj_t str_strip(size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | 8810784 | 2014-04-26 06:20:08 +0300 | [diff] [blame] | 840 | return str_uni_strip(STRIP, n_args, args); |
| 841 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 842 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip); |
Paul Sokolovsky | 8810784 | 2014-04-26 06:20:08 +0300 | [diff] [blame] | 843 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 844 | STATIC mp_obj_t str_lstrip(size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | 8810784 | 2014-04-26 06:20:08 +0300 | [diff] [blame] | 845 | return str_uni_strip(LSTRIP, n_args, args); |
| 846 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 847 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_lstrip_obj, 1, 2, str_lstrip); |
Paul Sokolovsky | 8810784 | 2014-04-26 06:20:08 +0300 | [diff] [blame] | 848 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 849 | STATIC mp_obj_t str_rstrip(size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | 8810784 | 2014-04-26 06:20:08 +0300 | [diff] [blame] | 850 | return str_uni_strip(RSTRIP, n_args, args); |
| 851 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 852 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rstrip_obj, 1, 2, str_rstrip); |
Paul Sokolovsky | 8810784 | 2014-04-26 06:20:08 +0300 | [diff] [blame] | 853 | |
Paul Sokolovsky | 1b5abfc | 2016-05-22 00:13:44 +0300 | [diff] [blame] | 854 | #if MICROPY_PY_BUILTINS_STR_CENTER |
| 855 | STATIC mp_obj_t str_center(mp_obj_t str_in, mp_obj_t width_in) { |
| 856 | GET_STR_DATA_LEN(str_in, str, str_len); |
Paul Sokolovsky | 9dde606 | 2016-05-22 02:22:14 +0300 | [diff] [blame] | 857 | mp_uint_t width = mp_obj_get_int(width_in); |
Paul Sokolovsky | 1b5abfc | 2016-05-22 00:13:44 +0300 | [diff] [blame] | 858 | if (str_len >= width) { |
| 859 | return str_in; |
| 860 | } |
| 861 | |
| 862 | vstr_t vstr; |
| 863 | vstr_init_len(&vstr, width); |
| 864 | memset(vstr.buf, ' ', width); |
| 865 | int left = (width - str_len) / 2; |
| 866 | memcpy(vstr.buf + left, str, str_len); |
| 867 | return mp_obj_new_str_from_vstr(mp_obj_get_type(str_in), &vstr); |
| 868 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 869 | MP_DEFINE_CONST_FUN_OBJ_2(str_center_obj, str_center); |
Paul Sokolovsky | 1b5abfc | 2016-05-22 00:13:44 +0300 | [diff] [blame] | 870 | #endif |
| 871 | |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 872 | // Takes an int arg, but only parses unsigned numbers, and only changes |
| 873 | // *num if at least one digit was parsed. |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 874 | STATIC const char *str_to_int(const char *str, const char *top, int *num) { |
| 875 | if (str < top && '0' <= *str && *str <= '9') { |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 876 | *num = 0; |
| 877 | do { |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 878 | *num = *num * 10 + (*str - '0'); |
| 879 | str++; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 880 | } |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 881 | while (str < top && '0' <= *str && *str <= '9'); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 882 | } |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 883 | return str; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 884 | } |
| 885 | |
Damien George | 2801e6f | 2015-04-04 15:53:11 +0100 | [diff] [blame] | 886 | STATIC bool isalignment(char ch) { |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 887 | return ch && strchr("<>=^", ch) != NULL; |
| 888 | } |
| 889 | |
Damien George | 2801e6f | 2015-04-04 15:53:11 +0100 | [diff] [blame] | 890 | STATIC bool istype(char ch) { |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 891 | return ch && strchr("bcdeEfFgGnosxX%", ch) != NULL; |
| 892 | } |
| 893 | |
Damien George | 2801e6f | 2015-04-04 15:53:11 +0100 | [diff] [blame] | 894 | STATIC bool arg_looks_integer(mp_obj_t arg) { |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 895 | return MP_OBJ_IS_TYPE(arg, &mp_type_bool) || MP_OBJ_IS_INT(arg); |
| 896 | } |
| 897 | |
Damien George | 2801e6f | 2015-04-04 15:53:11 +0100 | [diff] [blame] | 898 | STATIC bool arg_looks_numeric(mp_obj_t arg) { |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 899 | return arg_looks_integer(arg) |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame] | 900 | #if MICROPY_PY_BUILTINS_FLOAT |
Damien George | aaef185 | 2015-08-20 23:30:12 +0100 | [diff] [blame] | 901 | || mp_obj_is_float(arg) |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 902 | #endif |
| 903 | ; |
| 904 | } |
| 905 | |
Damien George | 2801e6f | 2015-04-04 15:53:11 +0100 | [diff] [blame] | 906 | STATIC mp_obj_t arg_as_int(mp_obj_t arg) { |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame] | 907 | #if MICROPY_PY_BUILTINS_FLOAT |
Damien George | aaef185 | 2015-08-20 23:30:12 +0100 | [diff] [blame] | 908 | if (mp_obj_is_float(arg)) { |
| 909 | return mp_obj_new_int_from_float(mp_obj_float_get(arg)); |
Dave Hylands | f81a49e | 2014-04-05 08:21:45 -0700 | [diff] [blame] | 910 | } |
| 911 | #endif |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 912 | return arg; |
Dave Hylands | f81a49e | 2014-04-05 08:21:45 -0700 | [diff] [blame] | 913 | } |
| 914 | |
Damien George | 897129a | 2016-09-27 15:45:42 +1000 | [diff] [blame] | 915 | #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 916 | STATIC NORETURN void terse_str_format_value_error(void) { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 917 | mp_raise_ValueError("bad format string"); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 918 | } |
Damien George | 897129a | 2016-09-27 15:45:42 +1000 | [diff] [blame] | 919 | #else |
| 920 | // define to nothing to improve coverage |
| 921 | #define terse_str_format_value_error() |
| 922 | #endif |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 923 | |
Damien George | 90ab191 | 2017-02-03 13:04:56 +1100 | [diff] [blame] | 924 | 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) { |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 925 | vstr_t vstr; |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 926 | mp_print_t print; |
| 927 | vstr_init_print(&vstr, 16, &print); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 928 | |
pohmelie | e3a29de | 2016-01-29 12:09:10 +0300 | [diff] [blame] | 929 | for (; str < top; str++) { |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 930 | if (*str == '}') { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 931 | str++; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 932 | if (str < top && *str == '}') { |
Damien George | 51b9a0d | 2015-08-26 15:29:49 +0100 | [diff] [blame] | 933 | vstr_add_byte(&vstr, '}'); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 934 | continue; |
| 935 | } |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 936 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 937 | terse_str_format_value_error(); |
| 938 | } else { |
Damien George | 2196799 | 2016-08-14 16:51:54 +1000 | [diff] [blame] | 939 | mp_raise_ValueError("single '}' encountered in format string"); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 940 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 941 | } |
| 942 | if (*str != '{') { |
Damien George | 51b9a0d | 2015-08-26 15:29:49 +0100 | [diff] [blame] | 943 | vstr_add_byte(&vstr, *str); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 944 | continue; |
| 945 | } |
| 946 | |
| 947 | str++; |
| 948 | if (str < top && *str == '{') { |
Damien George | 51b9a0d | 2015-08-26 15:29:49 +0100 | [diff] [blame] | 949 | vstr_add_byte(&vstr, '{'); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 950 | continue; |
| 951 | } |
| 952 | |
| 953 | // replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}" |
| 954 | |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 955 | const char *field_name = NULL; |
| 956 | const char *field_name_top = NULL; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 957 | char conversion = '\0'; |
pohmelie | e3a29de | 2016-01-29 12:09:10 +0300 | [diff] [blame] | 958 | const char *format_spec = NULL; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 959 | |
| 960 | if (str < top && *str != '}' && *str != '!' && *str != ':') { |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 961 | field_name = (const char *)str; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 962 | while (str < top && *str != '}' && *str != '!' && *str != ':') { |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 963 | ++str; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 964 | } |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 965 | field_name_top = (const char *)str; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 966 | } |
| 967 | |
| 968 | // conversion ::= "r" | "s" |
| 969 | |
| 970 | if (str < top && *str == '!') { |
| 971 | str++; |
| 972 | if (str < top && (*str == 'r' || *str == 's')) { |
| 973 | conversion = *str++; |
Paul Sokolovsky | f2b796e | 2014-01-15 22:45:20 +0200 | [diff] [blame] | 974 | } else { |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 975 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 976 | terse_str_format_value_error(); |
Damien George | 000730e | 2015-08-30 12:43:21 +0100 | [diff] [blame] | 977 | } else if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL) { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 978 | mp_raise_ValueError("bad conversion specifier"); |
Damien George | 000730e | 2015-08-30 12:43:21 +0100 | [diff] [blame] | 979 | } else { |
| 980 | if (str >= top) { |
Damien George | 2196799 | 2016-08-14 16:51:54 +1000 | [diff] [blame] | 981 | mp_raise_ValueError( |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 982 | "end of format while looking for conversion specifier"); |
Damien George | 000730e | 2015-08-30 12:43:21 +0100 | [diff] [blame] | 983 | } else { |
| 984 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, |
| 985 | "unknown conversion specifier %c", *str)); |
| 986 | } |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 987 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 988 | } |
| 989 | } |
| 990 | |
| 991 | if (str < top && *str == ':') { |
| 992 | str++; |
| 993 | // {:} is the same as {}, which is the same as {!s} |
| 994 | // This makes a difference when passing in a True or False |
| 995 | // '{}'.format(True) returns 'True' |
| 996 | // '{:d}'.format(True) returns '1' |
| 997 | // So we treat {:} as {} and this later gets treated to be {!s} |
| 998 | if (*str != '}') { |
pohmelie | e3a29de | 2016-01-29 12:09:10 +0300 | [diff] [blame] | 999 | format_spec = str; |
| 1000 | for (int nest = 1; str < top;) { |
| 1001 | if (*str == '{') { |
| 1002 | ++nest; |
| 1003 | } else if (*str == '}') { |
| 1004 | if (--nest == 0) { |
| 1005 | break; |
| 1006 | } |
| 1007 | } |
| 1008 | ++str; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 1009 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1010 | } |
| 1011 | } |
| 1012 | if (str >= top) { |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1013 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1014 | terse_str_format_value_error(); |
| 1015 | } else { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1016 | mp_raise_ValueError("unmatched '{' in format"); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1017 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1018 | } |
| 1019 | if (*str != '}') { |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1020 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1021 | terse_str_format_value_error(); |
| 1022 | } else { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1023 | mp_raise_ValueError("expected ':' after format specifier"); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1024 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1025 | } |
| 1026 | |
| 1027 | mp_obj_t arg = mp_const_none; |
| 1028 | |
| 1029 | if (field_name) { |
Damien George | 3bb8bd8 | 2014-04-14 21:20:30 +0100 | [diff] [blame] | 1030 | int index = 0; |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 1031 | if (MP_LIKELY(unichar_isdigit(*field_name))) { |
pohmelie | e3a29de | 2016-01-29 12:09:10 +0300 | [diff] [blame] | 1032 | if (*arg_i > 0) { |
Paul Sokolovsky | c114496 | 2015-01-04 00:14:13 +0200 | [diff] [blame] | 1033 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1034 | terse_str_format_value_error(); |
| 1035 | } else { |
Damien George | 2196799 | 2016-08-14 16:51:54 +1000 | [diff] [blame] | 1036 | mp_raise_ValueError( |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1037 | "can't switch from automatic field numbering to manual field specification"); |
Paul Sokolovsky | c114496 | 2015-01-04 00:14:13 +0200 | [diff] [blame] | 1038 | } |
| 1039 | } |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 1040 | field_name = str_to_int(field_name, field_name_top, &index); |
Damien George | 963a5a3 | 2015-01-16 17:47:07 +0000 | [diff] [blame] | 1041 | if ((uint)index >= n_args - 1) { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1042 | mp_raise_msg(&mp_type_IndexError, "tuple index out of range"); |
Paul Sokolovsky | c114496 | 2015-01-04 00:14:13 +0200 | [diff] [blame] | 1043 | } |
| 1044 | arg = args[index + 1]; |
pohmelie | e3a29de | 2016-01-29 12:09:10 +0300 | [diff] [blame] | 1045 | *arg_i = -1; |
Paul Sokolovsky | c114496 | 2015-01-04 00:14:13 +0200 | [diff] [blame] | 1046 | } else { |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 1047 | const char *lookup; |
| 1048 | for (lookup = field_name; lookup < field_name_top && *lookup != '.' && *lookup != '['; lookup++); |
Damien George | 4601759 | 2017-11-16 13:17:51 +1100 | [diff] [blame^] | 1049 | mp_obj_t field_q = mp_obj_new_str_via_qstr(field_name, lookup - field_name); // should it be via qstr? |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 1050 | field_name = lookup; |
Paul Sokolovsky | c114496 | 2015-01-04 00:14:13 +0200 | [diff] [blame] | 1051 | mp_map_elem_t *key_elem = mp_map_lookup(kwargs, field_q, MP_MAP_LOOKUP); |
| 1052 | if (key_elem == NULL) { |
| 1053 | nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, field_q)); |
| 1054 | } |
| 1055 | arg = key_elem->value; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1056 | } |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 1057 | if (field_name < field_name_top) { |
Javier Candeira | 35a1fea | 2017-08-09 14:40:45 +1000 | [diff] [blame] | 1058 | mp_raise_NotImplementedError("attributes not supported yet"); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1059 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1060 | } else { |
pohmelie | e3a29de | 2016-01-29 12:09:10 +0300 | [diff] [blame] | 1061 | if (*arg_i < 0) { |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1062 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1063 | terse_str_format_value_error(); |
| 1064 | } else { |
Damien George | 2196799 | 2016-08-14 16:51:54 +1000 | [diff] [blame] | 1065 | mp_raise_ValueError( |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1066 | "can't switch from manual field specification to automatic field numbering"); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1067 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1068 | } |
pohmelie | e3a29de | 2016-01-29 12:09:10 +0300 | [diff] [blame] | 1069 | if ((uint)*arg_i >= n_args - 1) { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1070 | mp_raise_msg(&mp_type_IndexError, "tuple index out of range"); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1071 | } |
pohmelie | e3a29de | 2016-01-29 12:09:10 +0300 | [diff] [blame] | 1072 | arg = args[(*arg_i) + 1]; |
| 1073 | (*arg_i)++; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1074 | } |
| 1075 | if (!format_spec && !conversion) { |
| 1076 | conversion = 's'; |
| 1077 | } |
| 1078 | if (conversion) { |
| 1079 | mp_print_kind_t print_kind; |
| 1080 | if (conversion == 's') { |
| 1081 | print_kind = PRINT_STR; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1082 | } else { |
Damien George | 000730e | 2015-08-30 12:43:21 +0100 | [diff] [blame] | 1083 | assert(conversion == 'r'); |
| 1084 | print_kind = PRINT_REPR; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1085 | } |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 1086 | vstr_t arg_vstr; |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1087 | mp_print_t arg_print; |
| 1088 | vstr_init_print(&arg_vstr, 16, &arg_print); |
| 1089 | mp_obj_print_helper(&arg_print, arg, print_kind); |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 1090 | arg = mp_obj_new_str_from_vstr(&mp_type_str, &arg_vstr); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1091 | } |
| 1092 | |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1093 | char fill = '\0'; |
| 1094 | char align = '\0'; |
| 1095 | int width = -1; |
| 1096 | int precision = -1; |
| 1097 | char type = '\0'; |
| 1098 | int flags = 0; |
| 1099 | |
| 1100 | if (format_spec) { |
| 1101 | // The format specifier (from http://docs.python.org/2/library/string.html#formatspec) |
| 1102 | // |
| 1103 | // [[fill]align][sign][#][0][width][,][.precision][type] |
| 1104 | // fill ::= <any character> |
| 1105 | // align ::= "<" | ">" | "=" | "^" |
| 1106 | // sign ::= "+" | "-" | " " |
| 1107 | // width ::= integer |
| 1108 | // precision ::= integer |
| 1109 | // type ::= "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%" |
| 1110 | |
pohmelie | e3a29de | 2016-01-29 12:09:10 +0300 | [diff] [blame] | 1111 | // recursively call the formatter to format any nested specifiers |
| 1112 | MP_STACK_CHECK(); |
| 1113 | vstr_t format_spec_vstr = mp_obj_str_format_helper(format_spec, str, arg_i, n_args, args, kwargs); |
Paul Sokolovsky | 40f0096 | 2016-05-09 23:42:42 +0300 | [diff] [blame] | 1114 | const char *s = vstr_null_terminated_str(&format_spec_vstr); |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 1115 | const char *stop = s + format_spec_vstr.len; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1116 | if (isalignment(*s)) { |
| 1117 | align = *s++; |
| 1118 | } else if (*s && isalignment(s[1])) { |
| 1119 | fill = *s++; |
| 1120 | align = *s++; |
| 1121 | } |
| 1122 | if (*s == '+' || *s == '-' || *s == ' ') { |
| 1123 | if (*s == '+') { |
| 1124 | flags |= PF_FLAG_SHOW_SIGN; |
| 1125 | } else if (*s == ' ') { |
| 1126 | flags |= PF_FLAG_SPACE_SIGN; |
| 1127 | } |
Damien George | 9d2c72a | 2017-07-04 02:13:27 +1000 | [diff] [blame] | 1128 | s++; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1129 | } |
| 1130 | if (*s == '#') { |
| 1131 | flags |= PF_FLAG_SHOW_PREFIX; |
| 1132 | s++; |
| 1133 | } |
| 1134 | if (*s == '0') { |
| 1135 | if (!align) { |
| 1136 | align = '='; |
| 1137 | } |
| 1138 | if (!fill) { |
| 1139 | fill = '0'; |
| 1140 | } |
| 1141 | } |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 1142 | s = str_to_int(s, stop, &width); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1143 | if (*s == ',') { |
| 1144 | flags |= PF_FLAG_SHOW_COMMA; |
| 1145 | s++; |
| 1146 | } |
| 1147 | if (*s == '.') { |
| 1148 | s++; |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 1149 | s = str_to_int(s, stop, &precision); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1150 | } |
| 1151 | if (istype(*s)) { |
| 1152 | type = *s++; |
| 1153 | } |
Paul Sokolovsky | 40f0096 | 2016-05-09 23:42:42 +0300 | [diff] [blame] | 1154 | if (*s) { |
Damien George | 7ef75f9 | 2015-08-26 15:42:25 +0100 | [diff] [blame] | 1155 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1156 | terse_str_format_value_error(); |
| 1157 | } else { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1158 | mp_raise_ValueError("invalid format specifier"); |
Damien George | 7ef75f9 | 2015-08-26 15:42:25 +0100 | [diff] [blame] | 1159 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1160 | } |
pohmelie | e3a29de | 2016-01-29 12:09:10 +0300 | [diff] [blame] | 1161 | vstr_clear(&format_spec_vstr); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1162 | } |
| 1163 | if (!align) { |
| 1164 | if (arg_looks_numeric(arg)) { |
| 1165 | align = '>'; |
| 1166 | } else { |
| 1167 | align = '<'; |
| 1168 | } |
| 1169 | } |
| 1170 | if (!fill) { |
| 1171 | fill = ' '; |
| 1172 | } |
| 1173 | |
Damien George | 9d2c72a | 2017-07-04 02:13:27 +1000 | [diff] [blame] | 1174 | if (flags & (PF_FLAG_SHOW_SIGN | PF_FLAG_SPACE_SIGN)) { |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1175 | if (type == 's') { |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1176 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1177 | terse_str_format_value_error(); |
| 1178 | } else { |
Damien George | 2196799 | 2016-08-14 16:51:54 +1000 | [diff] [blame] | 1179 | mp_raise_ValueError("sign not allowed in string format specifier"); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1180 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1181 | } |
| 1182 | if (type == 'c') { |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1183 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1184 | terse_str_format_value_error(); |
| 1185 | } else { |
Damien George | 2196799 | 2016-08-14 16:51:54 +1000 | [diff] [blame] | 1186 | mp_raise_ValueError( |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1187 | "sign not allowed with integer format specifier 'c'"); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1188 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 1189 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1190 | } |
| 1191 | |
| 1192 | switch (align) { |
| 1193 | case '<': flags |= PF_FLAG_LEFT_ADJUST; break; |
| 1194 | case '=': flags |= PF_FLAG_PAD_AFTER_SIGN; break; |
| 1195 | case '^': flags |= PF_FLAG_CENTER_ADJUST; break; |
| 1196 | } |
| 1197 | |
| 1198 | if (arg_looks_integer(arg)) { |
| 1199 | switch (type) { |
| 1200 | case 'b': |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1201 | mp_print_mp_int(&print, arg, 2, 'a', flags, fill, width, 0); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1202 | continue; |
| 1203 | |
| 1204 | case 'c': |
| 1205 | { |
| 1206 | char ch = mp_obj_get_int(arg); |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1207 | mp_print_strn(&print, &ch, 1, flags, fill, width); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1208 | continue; |
| 1209 | } |
| 1210 | |
| 1211 | case '\0': // No explicit format type implies 'd' |
| 1212 | case 'n': // I don't think we support locales in uPy so use 'd' |
| 1213 | case 'd': |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1214 | mp_print_mp_int(&print, arg, 10, 'a', flags, fill, width, 0); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1215 | continue; |
| 1216 | |
| 1217 | case 'o': |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 1218 | if (flags & PF_FLAG_SHOW_PREFIX) { |
| 1219 | flags |= PF_FLAG_SHOW_OCTAL_LETTER; |
| 1220 | } |
| 1221 | |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1222 | mp_print_mp_int(&print, arg, 8, 'a', flags, fill, width, 0); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1223 | continue; |
| 1224 | |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1225 | case 'X': |
Damien George | 11de839 | 2014-06-05 18:57:38 +0100 | [diff] [blame] | 1226 | case 'x': |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1227 | mp_print_mp_int(&print, arg, 16, type - ('X' - 'A'), flags, fill, width, 0); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1228 | continue; |
| 1229 | |
| 1230 | case 'e': |
| 1231 | case 'E': |
| 1232 | case 'f': |
| 1233 | case 'F': |
| 1234 | case 'g': |
| 1235 | case 'G': |
| 1236 | case '%': |
| 1237 | // The floating point formatters all work with anything that |
| 1238 | // looks like an integer |
| 1239 | break; |
| 1240 | |
| 1241 | default: |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1242 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1243 | terse_str_format_value_error(); |
| 1244 | } else { |
| 1245 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, |
| 1246 | "unknown format code '%c' for object of type '%s'", |
| 1247 | type, mp_obj_get_type_str(arg))); |
| 1248 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1249 | } |
Damien George | c322c5f | 2014-04-02 20:04:15 +0100 | [diff] [blame] | 1250 | } |
Damien George | 70f33cd | 2014-04-02 17:06:05 +0100 | [diff] [blame] | 1251 | |
Dave Hylands | 22fe4d7 | 2014-04-02 12:07:31 -0700 | [diff] [blame] | 1252 | // NOTE: no else here. We need the e, f, g etc formats for integer |
| 1253 | // arguments (from above if) to take this if. |
Damien George | c322c5f | 2014-04-02 20:04:15 +0100 | [diff] [blame] | 1254 | if (arg_looks_numeric(arg)) { |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1255 | if (!type) { |
| 1256 | |
| 1257 | // Even though the docs say that an unspecified type is the same |
| 1258 | // as 'g', there is one subtle difference, when the exponent |
| 1259 | // is one less than the precision. |
Damien George | 11de839 | 2014-06-05 18:57:38 +0100 | [diff] [blame] | 1260 | // |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1261 | // '{:10.1}'.format(0.0) ==> '0e+00' |
| 1262 | // '{:10.1g}'.format(0.0) ==> '0' |
| 1263 | // |
| 1264 | // TODO: Figure out how to deal with this. |
| 1265 | // |
| 1266 | // A proper solution would involve adding a special flag |
| 1267 | // or something to format_float, and create a format_double |
| 1268 | // to deal with doubles. In order to fix this when using |
| 1269 | // sprintf, we'd need to use the e format and tweak the |
| 1270 | // returned result to strip trailing zeros like the g format |
| 1271 | // does. |
| 1272 | // |
| 1273 | // {:10.3} and {:10.2e} with 1.23e2 both produce 1.23e+02 |
| 1274 | // but with 1.e2 you get 1e+02 and 1.00e+02 |
| 1275 | // |
| 1276 | // Stripping the trailing 0's (like g) does would make the |
| 1277 | // e format give us the right format. |
| 1278 | // |
| 1279 | // CPython sources say: |
| 1280 | // Omitted type specifier. Behaves in the same way as repr(x) |
| 1281 | // and str(x) if no precision is given, else like 'g', but with |
| 1282 | // at least one digit after the decimal point. */ |
| 1283 | |
| 1284 | type = 'g'; |
| 1285 | } |
| 1286 | if (type == 'n') { |
| 1287 | type = 'g'; |
| 1288 | } |
| 1289 | |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1290 | switch (type) { |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame] | 1291 | #if MICROPY_PY_BUILTINS_FLOAT |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1292 | case 'e': |
| 1293 | case 'E': |
| 1294 | case 'f': |
| 1295 | case 'F': |
| 1296 | case 'g': |
| 1297 | case 'G': |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1298 | mp_print_float(&print, mp_obj_get_float(arg), type, flags, fill, width, precision); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1299 | break; |
| 1300 | |
| 1301 | case '%': |
| 1302 | flags |= PF_FLAG_ADD_PERCENT; |
Damien George | 0178aa9 | 2015-01-12 21:56:35 +0000 | [diff] [blame] | 1303 | #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT |
| 1304 | #define F100 100.0F |
| 1305 | #else |
| 1306 | #define F100 100.0 |
| 1307 | #endif |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1308 | mp_print_float(&print, mp_obj_get_float(arg) * F100, 'f', flags, fill, width, precision); |
Damien George | 0178aa9 | 2015-01-12 21:56:35 +0000 | [diff] [blame] | 1309 | #undef F100 |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1310 | break; |
Damien George | c322c5f | 2014-04-02 20:04:15 +0100 | [diff] [blame] | 1311 | #endif |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1312 | |
| 1313 | default: |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1314 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1315 | terse_str_format_value_error(); |
| 1316 | } else { |
| 1317 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, |
| 1318 | "unknown format code '%c' for object of type 'float'", |
| 1319 | type, mp_obj_get_type_str(arg))); |
| 1320 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1321 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1322 | } else { |
Damien George | 70f33cd | 2014-04-02 17:06:05 +0100 | [diff] [blame] | 1323 | // arg doesn't look like a number |
| 1324 | |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1325 | if (align == '=') { |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1326 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1327 | terse_str_format_value_error(); |
| 1328 | } else { |
Damien George | 2196799 | 2016-08-14 16:51:54 +1000 | [diff] [blame] | 1329 | mp_raise_ValueError( |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1330 | "'=' alignment not allowed in string format specifier"); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1331 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1332 | } |
Damien George | 70f33cd | 2014-04-02 17:06:05 +0100 | [diff] [blame] | 1333 | |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1334 | switch (type) { |
Damien George | d4df8f4 | 2016-01-04 13:13:39 +0000 | [diff] [blame] | 1335 | case '\0': // no explicit format type implies 's' |
Damien George | d182b98 | 2014-08-30 14:19:41 +0100 | [diff] [blame] | 1336 | case 's': { |
Damien George | 6b34107 | 2017-03-25 19:48:18 +1100 | [diff] [blame] | 1337 | size_t slen; |
Damien George | 50912e7 | 2015-01-20 11:55:10 +0000 | [diff] [blame] | 1338 | const char *s = mp_obj_str_get_data(arg, &slen); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1339 | if (precision < 0) { |
Damien George | 50912e7 | 2015-01-20 11:55:10 +0000 | [diff] [blame] | 1340 | precision = slen; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1341 | } |
Damien George | 6b34107 | 2017-03-25 19:48:18 +1100 | [diff] [blame] | 1342 | if (slen > (size_t)precision) { |
Damien George | 50912e7 | 2015-01-20 11:55:10 +0000 | [diff] [blame] | 1343 | slen = precision; |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1344 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1345 | mp_print_strn(&print, s, slen, flags, fill, width); |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1346 | break; |
| 1347 | } |
| 1348 | |
| 1349 | default: |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1350 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1351 | terse_str_format_value_error(); |
| 1352 | } else { |
| 1353 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, |
| 1354 | "unknown format code '%c' for object of type 'str'", |
| 1355 | type, mp_obj_get_type_str(arg))); |
| 1356 | } |
Dave Hylands | baf6f14 | 2014-03-30 21:06:50 -0700 | [diff] [blame] | 1357 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 1358 | } |
| 1359 | } |
| 1360 | |
pohmelie | e3a29de | 2016-01-29 12:09:10 +0300 | [diff] [blame] | 1361 | return vstr; |
| 1362 | } |
| 1363 | |
| 1364 | mp_obj_t mp_obj_str_format(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 1365 | mp_check_self(MP_OBJ_IS_STR_OR_BYTES(args[0])); |
pohmelie | e3a29de | 2016-01-29 12:09:10 +0300 | [diff] [blame] | 1366 | |
| 1367 | GET_STR_DATA_LEN(args[0], str, len); |
| 1368 | int arg_i = 0; |
| 1369 | vstr_t vstr = mp_obj_str_format_helper((const char*)str, (const char*)str + len, &arg_i, n_args, args, kwargs); |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 1370 | return mp_obj_new_str_from_vstr(&mp_type_str, &vstr); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 1371 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1372 | MP_DEFINE_CONST_FUN_OBJ_KW(str_format_obj, 1, mp_obj_str_format); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 1373 | |
Damien George | 90ab191 | 2017-02-03 13:04:56 +1100 | [diff] [blame] | 1374 | STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_t *args, mp_obj_t dict) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 1375 | mp_check_self(MP_OBJ_IS_STR_OR_BYTES(pattern)); |
Paul Sokolovsky | 4db727a | 2014-03-31 21:18:28 +0300 | [diff] [blame] | 1376 | |
| 1377 | GET_STR_DATA_LEN(pattern, str, len); |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1378 | const byte *start_str = str; |
Paul Sokolovsky | ef63ab5 | 2015-12-20 16:44:36 +0200 | [diff] [blame] | 1379 | bool is_bytes = MP_OBJ_IS_TYPE(pattern, &mp_type_bytes); |
Damien George | 90ab191 | 2017-02-03 13:04:56 +1100 | [diff] [blame] | 1380 | size_t arg_i = 0; |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 1381 | vstr_t vstr; |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1382 | mp_print_t print; |
| 1383 | vstr_init_print(&vstr, 16, &print); |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1384 | |
Paul Sokolovsky | 4db727a | 2014-03-31 21:18:28 +0300 | [diff] [blame] | 1385 | for (const byte *top = str + len; str < top; str++) { |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 1386 | mp_obj_t arg = MP_OBJ_NULL; |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1387 | if (*str != '%') { |
Damien George | 51b9a0d | 2015-08-26 15:29:49 +0100 | [diff] [blame] | 1388 | vstr_add_byte(&vstr, *str); |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1389 | continue; |
| 1390 | } |
| 1391 | if (++str >= top) { |
Damien George | b648e98 | 2015-08-26 15:45:06 +0100 | [diff] [blame] | 1392 | goto incomplete_format; |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1393 | } |
Paul Sokolovsky | 4db727a | 2014-03-31 21:18:28 +0300 | [diff] [blame] | 1394 | if (*str == '%') { |
Damien George | 51b9a0d | 2015-08-26 15:29:49 +0100 | [diff] [blame] | 1395 | vstr_add_byte(&vstr, '%'); |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1396 | continue; |
| 1397 | } |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 1398 | |
| 1399 | // Dictionary value lookup |
| 1400 | if (*str == '(') { |
Damien George | 7317e34 | 2017-02-03 12:13:44 +1100 | [diff] [blame] | 1401 | if (dict == MP_OBJ_NULL) { |
| 1402 | mp_raise_TypeError("format requires a dict"); |
| 1403 | } |
| 1404 | arg_i = 1; // we used up the single dict argument |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 1405 | const byte *key = ++str; |
| 1406 | while (*str != ')') { |
| 1407 | if (str >= top) { |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1408 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1409 | terse_str_format_value_error(); |
| 1410 | } else { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1411 | mp_raise_ValueError("incomplete format key"); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1412 | } |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 1413 | } |
| 1414 | ++str; |
| 1415 | } |
Damien George | 4601759 | 2017-11-16 13:17:51 +1100 | [diff] [blame^] | 1416 | mp_obj_t k_obj = mp_obj_new_str_via_qstr((const char*)key, str - key); |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 1417 | arg = mp_obj_dict_get(dict, k_obj); |
| 1418 | str++; |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1419 | } |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 1420 | |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1421 | int flags = 0; |
| 1422 | char fill = ' '; |
Damien George | 11de839 | 2014-06-05 18:57:38 +0100 | [diff] [blame] | 1423 | int alt = 0; |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1424 | while (str < top) { |
| 1425 | if (*str == '-') flags |= PF_FLAG_LEFT_ADJUST; |
| 1426 | else if (*str == '+') flags |= PF_FLAG_SHOW_SIGN; |
| 1427 | else if (*str == ' ') flags |= PF_FLAG_SPACE_SIGN; |
Damien George | 11de839 | 2014-06-05 18:57:38 +0100 | [diff] [blame] | 1428 | else if (*str == '#') alt = PF_FLAG_SHOW_PREFIX; |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1429 | else if (*str == '0') { |
| 1430 | flags |= PF_FLAG_PAD_AFTER_SIGN; |
| 1431 | fill = '0'; |
| 1432 | } else break; |
| 1433 | str++; |
| 1434 | } |
| 1435 | // parse width, if it exists |
Damien George | 11de839 | 2014-06-05 18:57:38 +0100 | [diff] [blame] | 1436 | int width = 0; |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1437 | if (str < top) { |
| 1438 | if (*str == '*') { |
Damien George | 90ab191 | 2017-02-03 13:04:56 +1100 | [diff] [blame] | 1439 | if (arg_i >= n_args) { |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 1440 | goto not_enough_args; |
| 1441 | } |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1442 | width = mp_obj_get_int(args[arg_i++]); |
| 1443 | str++; |
| 1444 | } else { |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 1445 | str = (const byte*)str_to_int((const char*)str, (const char*)top, &width); |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1446 | } |
| 1447 | } |
| 1448 | int prec = -1; |
| 1449 | if (str < top && *str == '.') { |
| 1450 | if (++str < top) { |
| 1451 | if (*str == '*') { |
Damien George | 90ab191 | 2017-02-03 13:04:56 +1100 | [diff] [blame] | 1452 | if (arg_i >= n_args) { |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 1453 | goto not_enough_args; |
| 1454 | } |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1455 | prec = mp_obj_get_int(args[arg_i++]); |
| 1456 | str++; |
| 1457 | } else { |
| 1458 | prec = 0; |
Damien George | 87e07ea | 2016-02-02 15:51:57 +0000 | [diff] [blame] | 1459 | str = (const byte*)str_to_int((const char*)str, (const char*)top, &prec); |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1460 | } |
| 1461 | } |
| 1462 | } |
| 1463 | |
| 1464 | if (str >= top) { |
Damien George | b648e98 | 2015-08-26 15:45:06 +0100 | [diff] [blame] | 1465 | incomplete_format: |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1466 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1467 | terse_str_format_value_error(); |
| 1468 | } else { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1469 | mp_raise_ValueError("incomplete format"); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1470 | } |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1471 | } |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 1472 | |
| 1473 | // Tuple value lookup |
| 1474 | if (arg == MP_OBJ_NULL) { |
Damien George | 90ab191 | 2017-02-03 13:04:56 +1100 | [diff] [blame] | 1475 | if (arg_i >= n_args) { |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 1476 | not_enough_args: |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1477 | mp_raise_TypeError("not enough arguments for format string"); |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 1478 | } |
| 1479 | arg = args[arg_i++]; |
| 1480 | } |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1481 | switch (*str) { |
| 1482 | case 'c': |
| 1483 | if (MP_OBJ_IS_STR(arg)) { |
Damien George | 6b34107 | 2017-03-25 19:48:18 +1100 | [diff] [blame] | 1484 | size_t slen; |
Damien George | 50912e7 | 2015-01-20 11:55:10 +0000 | [diff] [blame] | 1485 | const char *s = mp_obj_str_get_data(arg, &slen); |
| 1486 | if (slen != 1) { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1487 | mp_raise_TypeError("%%c requires int or char"); |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1488 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1489 | mp_print_strn(&print, s, 1, flags, ' ', width); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1490 | } else if (arg_looks_integer(arg)) { |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1491 | char ch = mp_obj_get_int(arg); |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1492 | mp_print_strn(&print, &ch, 1, flags, ' ', width); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1493 | } else { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1494 | mp_raise_TypeError("integer required"); |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1495 | } |
Damien George | 11de839 | 2014-06-05 18:57:38 +0100 | [diff] [blame] | 1496 | break; |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1497 | |
| 1498 | case 'd': |
| 1499 | case 'i': |
| 1500 | case 'u': |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1501 | mp_print_mp_int(&print, arg_as_int(arg), 10, 'a', flags, fill, width, prec); |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1502 | break; |
| 1503 | |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame] | 1504 | #if MICROPY_PY_BUILTINS_FLOAT |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1505 | case 'e': |
| 1506 | case 'E': |
| 1507 | case 'f': |
| 1508 | case 'F': |
| 1509 | case 'g': |
| 1510 | case 'G': |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1511 | mp_print_float(&print, mp_obj_get_float(arg), *str, flags, fill, width, prec); |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1512 | break; |
| 1513 | #endif |
| 1514 | |
| 1515 | case 'o': |
| 1516 | if (alt) { |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 1517 | flags |= (PF_FLAG_SHOW_PREFIX | PF_FLAG_SHOW_OCTAL_LETTER); |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1518 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1519 | mp_print_mp_int(&print, arg, 8, 'a', flags, fill, width, prec); |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1520 | break; |
| 1521 | |
| 1522 | case 'r': |
| 1523 | case 's': |
| 1524 | { |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 1525 | vstr_t arg_vstr; |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1526 | mp_print_t arg_print; |
| 1527 | vstr_init_print(&arg_vstr, 16, &arg_print); |
Paul Sokolovsky | ef63ab5 | 2015-12-20 16:44:36 +0200 | [diff] [blame] | 1528 | mp_print_kind_t print_kind = (*str == 'r' ? PRINT_REPR : PRINT_STR); |
| 1529 | if (print_kind == PRINT_STR && is_bytes && MP_OBJ_IS_TYPE(arg, &mp_type_bytes)) { |
| 1530 | // If we have something like b"%s" % b"1", bytes arg should be |
| 1531 | // printed undecorated. |
| 1532 | print_kind = PRINT_RAW; |
| 1533 | } |
| 1534 | mp_obj_print_helper(&arg_print, arg, print_kind); |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 1535 | uint vlen = arg_vstr.len; |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1536 | if (prec < 0) { |
Damien George | 50912e7 | 2015-01-20 11:55:10 +0000 | [diff] [blame] | 1537 | prec = vlen; |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1538 | } |
Damien George | 50912e7 | 2015-01-20 11:55:10 +0000 | [diff] [blame] | 1539 | if (vlen > (uint)prec) { |
| 1540 | vlen = prec; |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1541 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1542 | mp_print_strn(&print, arg_vstr.buf, vlen, flags, ' ', width); |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 1543 | vstr_clear(&arg_vstr); |
Paul Sokolovsky | 4db727a | 2014-03-31 21:18:28 +0300 | [diff] [blame] | 1544 | break; |
| 1545 | } |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1546 | |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1547 | case 'X': |
Damien George | 11de839 | 2014-06-05 18:57:38 +0100 | [diff] [blame] | 1548 | case 'x': |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 1549 | mp_print_mp_int(&print, arg, 16, *str - ('X' - 'A'), flags | alt, fill, width, prec); |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1550 | break; |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 1551 | |
Dave Hylands | 6756a37 | 2014-04-02 11:42:39 -0700 | [diff] [blame] | 1552 | default: |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 1553 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
| 1554 | terse_str_format_value_error(); |
| 1555 | } else { |
| 1556 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, |
| 1557 | "unsupported format character '%c' (0x%x) at index %d", |
| 1558 | *str, *str, str - start_str)); |
| 1559 | } |
Paul Sokolovsky | 4db727a | 2014-03-31 21:18:28 +0300 | [diff] [blame] | 1560 | } |
| 1561 | } |
| 1562 | |
Damien George | 90ab191 | 2017-02-03 13:04:56 +1100 | [diff] [blame] | 1563 | if (arg_i != n_args) { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1564 | mp_raise_TypeError("not all arguments converted during string formatting"); |
Paul Sokolovsky | 4db727a | 2014-03-31 21:18:28 +0300 | [diff] [blame] | 1565 | } |
| 1566 | |
Paul Sokolovsky | d50f649 | 2015-12-20 16:50:51 +0200 | [diff] [blame] | 1567 | return mp_obj_new_str_from_vstr(is_bytes ? &mp_type_bytes : &mp_type_str, &vstr); |
Paul Sokolovsky | 4db727a | 2014-03-31 21:18:28 +0300 | [diff] [blame] | 1568 | } |
| 1569 | |
Paul Sokolovsky | f44cc51 | 2015-06-26 17:33:21 +0300 | [diff] [blame] | 1570 | // The implementation is optimized, returning the original string if there's |
| 1571 | // nothing to replace. |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 1572 | STATIC mp_obj_t str_replace(size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 1573 | mp_check_self(MP_OBJ_IS_STR_OR_BYTES(args[0])); |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 1574 | |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 1575 | mp_int_t max_rep = -1; |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 1576 | if (n_args == 4) { |
Damien George | ff71542 | 2014-04-07 00:39:13 +0100 | [diff] [blame] | 1577 | max_rep = mp_obj_get_int(args[3]); |
Paul Sokolovsky | 4e24608 | 2014-02-11 15:29:55 +0200 | [diff] [blame] | 1578 | if (max_rep == 0) { |
| 1579 | return args[0]; |
| 1580 | } else if (max_rep < 0) { |
Damien George | ff71542 | 2014-04-07 00:39:13 +0100 | [diff] [blame] | 1581 | max_rep = -1; |
Paul Sokolovsky | 4e24608 | 2014-02-11 15:29:55 +0200 | [diff] [blame] | 1582 | } |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 1583 | } |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 1584 | |
xbe | 729be9b | 2014-04-07 14:46:39 -0700 | [diff] [blame] | 1585 | // if max_rep is still -1 by this point we will need to do all possible replacements |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 1586 | |
Damien George | ff71542 | 2014-04-07 00:39:13 +0100 | [diff] [blame] | 1587 | // check argument types |
| 1588 | |
Damien George | c55a4d8 | 2014-12-24 20:28:30 +0000 | [diff] [blame] | 1589 | const mp_obj_type_t *self_type = mp_obj_get_type(args[0]); |
| 1590 | |
| 1591 | if (mp_obj_get_type(args[1]) != self_type) { |
Damien George | ff71542 | 2014-04-07 00:39:13 +0100 | [diff] [blame] | 1592 | bad_implicit_conversion(args[1]); |
| 1593 | } |
| 1594 | |
Damien George | c55a4d8 | 2014-12-24 20:28:30 +0000 | [diff] [blame] | 1595 | if (mp_obj_get_type(args[2]) != self_type) { |
Damien George | ff71542 | 2014-04-07 00:39:13 +0100 | [diff] [blame] | 1596 | bad_implicit_conversion(args[2]); |
| 1597 | } |
| 1598 | |
| 1599 | // extract string data |
| 1600 | |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 1601 | GET_STR_DATA_LEN(args[0], str, str_len); |
| 1602 | GET_STR_DATA_LEN(args[1], old, old_len); |
| 1603 | GET_STR_DATA_LEN(args[2], new, new_len); |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 1604 | |
| 1605 | // old won't exist in str if it's longer, so nothing to replace |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 1606 | if (old_len > str_len) { |
Paul Sokolovsky | 4e24608 | 2014-02-11 15:29:55 +0200 | [diff] [blame] | 1607 | return args[0]; |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 1608 | } |
| 1609 | |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 1610 | // data for the replaced string |
| 1611 | byte *data = NULL; |
Damien George | 05005f6 | 2015-01-21 22:48:37 +0000 | [diff] [blame] | 1612 | vstr_t vstr; |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 1613 | |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 1614 | // do 2 passes over the string: |
| 1615 | // first pass computes the required length of the replaced string |
| 1616 | // second pass does the replacements |
| 1617 | for (;;) { |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 1618 | size_t replaced_str_index = 0; |
| 1619 | size_t num_replacements_done = 0; |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 1620 | const byte *old_occurrence; |
| 1621 | const byte *offset_ptr = str; |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 1622 | size_t str_len_remain = str_len; |
Damien George | ff71542 | 2014-04-07 00:39:13 +0100 | [diff] [blame] | 1623 | if (old_len == 0) { |
| 1624 | // if old_str is empty, copy new_str to start of replaced string |
| 1625 | // copy the replacement string |
| 1626 | if (data != NULL) { |
| 1627 | memcpy(data, new, new_len); |
| 1628 | } |
| 1629 | replaced_str_index += new_len; |
| 1630 | num_replacements_done++; |
| 1631 | } |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 1632 | 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) { |
Damien George | ff71542 | 2014-04-07 00:39:13 +0100 | [diff] [blame] | 1633 | if (old_len == 0) { |
| 1634 | old_occurrence += 1; |
| 1635 | } |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 1636 | // copy from just after end of last occurrence of to-be-replaced string to right before start of next occurrence |
| 1637 | if (data != NULL) { |
| 1638 | memcpy(data + replaced_str_index, offset_ptr, old_occurrence - offset_ptr); |
| 1639 | } |
| 1640 | replaced_str_index += old_occurrence - offset_ptr; |
| 1641 | // copy the replacement string |
| 1642 | if (data != NULL) { |
| 1643 | memcpy(data + replaced_str_index, new, new_len); |
| 1644 | } |
| 1645 | replaced_str_index += new_len; |
| 1646 | offset_ptr = old_occurrence + old_len; |
Damien George | ff71542 | 2014-04-07 00:39:13 +0100 | [diff] [blame] | 1647 | str_len_remain = str + str_len - offset_ptr; |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 1648 | num_replacements_done++; |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 1649 | } |
| 1650 | |
| 1651 | // copy from just after end of last occurrence of to-be-replaced string to end of old string |
| 1652 | if (data != NULL) { |
Damien George | ff71542 | 2014-04-07 00:39:13 +0100 | [diff] [blame] | 1653 | memcpy(data + replaced_str_index, offset_ptr, str_len_remain); |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 1654 | } |
Damien George | ff71542 | 2014-04-07 00:39:13 +0100 | [diff] [blame] | 1655 | replaced_str_index += str_len_remain; |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 1656 | |
| 1657 | if (data == NULL) { |
| 1658 | // first pass |
| 1659 | if (num_replacements_done == 0) { |
| 1660 | // no substr found, return original string |
| 1661 | return args[0]; |
| 1662 | } else { |
| 1663 | // substr found, allocate new string |
Damien George | 05005f6 | 2015-01-21 22:48:37 +0000 | [diff] [blame] | 1664 | vstr_init_len(&vstr, replaced_str_index); |
| 1665 | data = (byte*)vstr.buf; |
Damien George | ff71542 | 2014-04-07 00:39:13 +0100 | [diff] [blame] | 1666 | assert(data != NULL); |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 1667 | } |
| 1668 | } else { |
| 1669 | // second pass, we are done |
| 1670 | break; |
| 1671 | } |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 1672 | } |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 1673 | |
Damien George | 05005f6 | 2015-01-21 22:48:37 +0000 | [diff] [blame] | 1674 | return mp_obj_new_str_from_vstr(self_type, &vstr); |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 1675 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1676 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj, 3, 4, str_replace); |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 1677 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 1678 | STATIC mp_obj_t str_count(size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 1679 | const mp_obj_type_t *self_type = mp_obj_get_type(args[0]); |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 1680 | mp_check_self(MP_OBJ_IS_STR_OR_BYTES(args[0])); |
Damien George | be8e99c | 2014-11-05 16:45:54 +0000 | [diff] [blame] | 1681 | |
| 1682 | // check argument type |
Damien George | c55a4d8 | 2014-12-24 20:28:30 +0000 | [diff] [blame] | 1683 | if (mp_obj_get_type(args[1]) != self_type) { |
Damien George | be8e99c | 2014-11-05 16:45:54 +0000 | [diff] [blame] | 1684 | bad_implicit_conversion(args[1]); |
| 1685 | } |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 1686 | |
| 1687 | GET_STR_DATA_LEN(args[0], haystack, haystack_len); |
| 1688 | GET_STR_DATA_LEN(args[1], needle, needle_len); |
| 1689 | |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 1690 | const byte *start = haystack; |
| 1691 | const byte *end = haystack + haystack_len; |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 1692 | if (n_args >= 3 && args[2] != mp_const_none) { |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 1693 | start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true); |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 1694 | } |
| 1695 | if (n_args >= 4 && args[3] != mp_const_none) { |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 1696 | end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true); |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 1697 | } |
| 1698 | |
Damien George | 536dde2 | 2014-03-13 22:07:55 +0000 | [diff] [blame] | 1699 | // if needle_len is zero then we count each gap between characters as an occurrence |
| 1700 | if (needle_len == 0) { |
Paul Sokolovsky | 9e215fa | 2014-06-28 23:14:30 +0300 | [diff] [blame] | 1701 | return MP_OBJ_NEW_SMALL_INT(unichar_charlen((const char*)start, end - start) + 1); |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 1702 | } |
| 1703 | |
Damien George | 536dde2 | 2014-03-13 22:07:55 +0000 | [diff] [blame] | 1704 | // count the occurrences |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 1705 | mp_int_t num_occurrences = 0; |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 1706 | for (const byte *haystack_ptr = start; haystack_ptr + needle_len <= end;) { |
| 1707 | if (memcmp(haystack_ptr, needle, needle_len) == 0) { |
xbe | c5d70ba | 2014-03-13 00:29:15 -0700 | [diff] [blame] | 1708 | num_occurrences++; |
Paul Sokolovsky | e3cfc0d | 2014-06-14 06:06:36 +0300 | [diff] [blame] | 1709 | haystack_ptr += needle_len; |
| 1710 | } else { |
| 1711 | haystack_ptr = utf8_next_char(haystack_ptr); |
xbe | c5d70ba | 2014-03-13 00:29:15 -0700 | [diff] [blame] | 1712 | } |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 1713 | } |
| 1714 | |
| 1715 | return MP_OBJ_NEW_SMALL_INT(num_occurrences); |
| 1716 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1717 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count); |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 1718 | |
Paul Sokolovsky | 56eb25f | 2016-08-07 06:46:55 +0300 | [diff] [blame] | 1719 | #if MICROPY_PY_BUILTINS_STR_PARTITION |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 1720 | STATIC mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, int direction) { |
Paul Sokolovsky | c4a8004 | 2016-08-12 22:06:47 +0300 | [diff] [blame] | 1721 | mp_check_self(MP_OBJ_IS_STR_OR_BYTES(self_in)); |
Paul Sokolovsky | 69f3eb2 | 2014-05-11 02:44:46 +0300 | [diff] [blame] | 1722 | mp_obj_type_t *self_type = mp_obj_get_type(self_in); |
| 1723 | if (self_type != mp_obj_get_type(arg)) { |
Damien George | c55a4d8 | 2014-12-24 20:28:30 +0000 | [diff] [blame] | 1724 | bad_implicit_conversion(arg); |
xbe | 613a8e3 | 2014-03-18 00:06:29 -0700 | [diff] [blame] | 1725 | } |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 1726 | |
xbe | 613a8e3 | 2014-03-18 00:06:29 -0700 | [diff] [blame] | 1727 | GET_STR_DATA_LEN(self_in, str, str_len); |
| 1728 | GET_STR_DATA_LEN(arg, sep, sep_len); |
| 1729 | |
| 1730 | if (sep_len == 0) { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 1731 | mp_raise_ValueError("empty separator"); |
xbe | 613a8e3 | 2014-03-18 00:06:29 -0700 | [diff] [blame] | 1732 | } |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 1733 | |
Damien George | c55a4d8 | 2014-12-24 20:28:30 +0000 | [diff] [blame] | 1734 | mp_obj_t result[3]; |
| 1735 | if (self_type == &mp_type_str) { |
| 1736 | result[0] = MP_OBJ_NEW_QSTR(MP_QSTR_); |
| 1737 | result[1] = MP_OBJ_NEW_QSTR(MP_QSTR_); |
| 1738 | result[2] = MP_OBJ_NEW_QSTR(MP_QSTR_); |
| 1739 | } else { |
| 1740 | result[0] = mp_const_empty_bytes; |
| 1741 | result[1] = mp_const_empty_bytes; |
| 1742 | result[2] = mp_const_empty_bytes; |
| 1743 | } |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 1744 | |
| 1745 | if (direction > 0) { |
| 1746 | result[0] = self_in; |
xbe | 0a6894c | 2014-03-21 01:12:26 -0700 | [diff] [blame] | 1747 | } else { |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 1748 | result[2] = self_in; |
xbe | 0a6894c | 2014-03-21 01:12:26 -0700 | [diff] [blame] | 1749 | } |
xbe | 613a8e3 | 2014-03-18 00:06:29 -0700 | [diff] [blame] | 1750 | |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 1751 | const byte *position_ptr = find_subbytes(str, str_len, sep, sep_len, direction); |
| 1752 | if (position_ptr != NULL) { |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 1753 | size_t position = position_ptr - str; |
Damien George | f600a6a | 2014-05-25 22:34:34 +0100 | [diff] [blame] | 1754 | result[0] = mp_obj_new_str_of_type(self_type, str, position); |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 1755 | result[1] = arg; |
Damien George | f600a6a | 2014-05-25 22:34:34 +0100 | [diff] [blame] | 1756 | result[2] = mp_obj_new_str_of_type(self_type, str + position + sep_len, str_len - position - sep_len); |
xbe | 613a8e3 | 2014-03-18 00:06:29 -0700 | [diff] [blame] | 1757 | } |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 1758 | |
xbe | 0a6894c | 2014-03-21 01:12:26 -0700 | [diff] [blame] | 1759 | return mp_obj_new_tuple(3, result); |
xbe | 613a8e3 | 2014-03-18 00:06:29 -0700 | [diff] [blame] | 1760 | } |
| 1761 | |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 1762 | STATIC mp_obj_t str_partition(mp_obj_t self_in, mp_obj_t arg) { |
| 1763 | return str_partitioner(self_in, arg, 1); |
xbe | 0a6894c | 2014-03-21 01:12:26 -0700 | [diff] [blame] | 1764 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1765 | MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition); |
xbe | 4504ea8 | 2014-03-19 00:46:14 -0700 | [diff] [blame] | 1766 | |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 1767 | STATIC mp_obj_t str_rpartition(mp_obj_t self_in, mp_obj_t arg) { |
| 1768 | return str_partitioner(self_in, arg, -1); |
xbe | 4504ea8 | 2014-03-19 00:46:14 -0700 | [diff] [blame] | 1769 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1770 | MP_DEFINE_CONST_FUN_OBJ_2(str_rpartition_obj, str_rpartition); |
Paul Sokolovsky | 56eb25f | 2016-08-07 06:46:55 +0300 | [diff] [blame] | 1771 | #endif |
xbe | 4504ea8 | 2014-03-19 00:46:14 -0700 | [diff] [blame] | 1772 | |
Paul Sokolovsky | 6913521 | 2014-05-10 19:47:41 +0300 | [diff] [blame] | 1773 | // Supposedly not too critical operations, so optimize for code size |
Damien George | fcc9cf6 | 2014-06-01 18:22:09 +0100 | [diff] [blame] | 1774 | STATIC mp_obj_t str_caseconv(unichar (*op)(unichar), mp_obj_t self_in) { |
Paul Sokolovsky | 6913521 | 2014-05-10 19:47:41 +0300 | [diff] [blame] | 1775 | GET_STR_DATA_LEN(self_in, self_data, self_len); |
Damien George | 05005f6 | 2015-01-21 22:48:37 +0000 | [diff] [blame] | 1776 | vstr_t vstr; |
| 1777 | vstr_init_len(&vstr, self_len); |
| 1778 | byte *data = (byte*)vstr.buf; |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 1779 | for (size_t i = 0; i < self_len; i++) { |
Damien George | fcc9cf6 | 2014-06-01 18:22:09 +0100 | [diff] [blame] | 1780 | *data++ = op(*self_data++); |
Paul Sokolovsky | 6913521 | 2014-05-10 19:47:41 +0300 | [diff] [blame] | 1781 | } |
Damien George | 05005f6 | 2015-01-21 22:48:37 +0000 | [diff] [blame] | 1782 | return mp_obj_new_str_from_vstr(mp_obj_get_type(self_in), &vstr); |
Paul Sokolovsky | 6913521 | 2014-05-10 19:47:41 +0300 | [diff] [blame] | 1783 | } |
| 1784 | |
| 1785 | STATIC mp_obj_t str_lower(mp_obj_t self_in) { |
Damien George | fcc9cf6 | 2014-06-01 18:22:09 +0100 | [diff] [blame] | 1786 | return str_caseconv(unichar_tolower, self_in); |
Paul Sokolovsky | 6913521 | 2014-05-10 19:47:41 +0300 | [diff] [blame] | 1787 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1788 | MP_DEFINE_CONST_FUN_OBJ_1(str_lower_obj, str_lower); |
Paul Sokolovsky | 6913521 | 2014-05-10 19:47:41 +0300 | [diff] [blame] | 1789 | |
| 1790 | STATIC mp_obj_t str_upper(mp_obj_t self_in) { |
Damien George | fcc9cf6 | 2014-06-01 18:22:09 +0100 | [diff] [blame] | 1791 | return str_caseconv(unichar_toupper, self_in); |
Paul Sokolovsky | 6913521 | 2014-05-10 19:47:41 +0300 | [diff] [blame] | 1792 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1793 | MP_DEFINE_CONST_FUN_OBJ_1(str_upper_obj, str_upper); |
Paul Sokolovsky | 6913521 | 2014-05-10 19:47:41 +0300 | [diff] [blame] | 1794 | |
Damien George | fcc9cf6 | 2014-06-01 18:22:09 +0100 | [diff] [blame] | 1795 | STATIC mp_obj_t str_uni_istype(bool (*f)(unichar), mp_obj_t self_in) { |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1796 | GET_STR_DATA_LEN(self_in, self_data, self_len); |
Paul Sokolovsky | ae9c82d | 2014-05-31 11:00:25 +0300 | [diff] [blame] | 1797 | |
Paul Sokolovsky | f69b9d3 | 2014-05-31 10:59:34 +0300 | [diff] [blame] | 1798 | if (self_len == 0) { |
| 1799 | return mp_const_false; // default to False for empty str |
| 1800 | } |
Paul Sokolovsky | ae9c82d | 2014-05-31 11:00:25 +0300 | [diff] [blame] | 1801 | |
Damien George | fcc9cf6 | 2014-06-01 18:22:09 +0100 | [diff] [blame] | 1802 | if (f != unichar_isupper && f != unichar_islower) { |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 1803 | for (size_t i = 0; i < self_len; i++) { |
Paul Sokolovsky | f69b9d3 | 2014-05-31 10:59:34 +0300 | [diff] [blame] | 1804 | if (!f(*self_data++)) { |
| 1805 | return mp_const_false; |
| 1806 | } |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1807 | } |
| 1808 | } else { |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1809 | bool contains_alpha = false; |
Paul Sokolovsky | ae9c82d | 2014-05-31 11:00:25 +0300 | [diff] [blame] | 1810 | |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 1811 | for (size_t i = 0; i < self_len; i++) { // only check alphanumeric characters |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1812 | if (unichar_isalpha(*self_data++)) { |
| 1813 | contains_alpha = true; |
Damien George | fcc9cf6 | 2014-06-01 18:22:09 +0100 | [diff] [blame] | 1814 | if (!f(*(self_data - 1))) { // -1 because we already incremented above |
| 1815 | return mp_const_false; |
Paul Sokolovsky | f69b9d3 | 2014-05-31 10:59:34 +0300 | [diff] [blame] | 1816 | } |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1817 | } |
| 1818 | } |
Paul Sokolovsky | ae9c82d | 2014-05-31 11:00:25 +0300 | [diff] [blame] | 1819 | |
Paul Sokolovsky | f69b9d3 | 2014-05-31 10:59:34 +0300 | [diff] [blame] | 1820 | if (!contains_alpha) { |
| 1821 | return mp_const_false; |
| 1822 | } |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1823 | } |
| 1824 | |
| 1825 | return mp_const_true; |
| 1826 | } |
| 1827 | |
| 1828 | STATIC mp_obj_t str_isspace(mp_obj_t self_in) { |
Damien George | fcc9cf6 | 2014-06-01 18:22:09 +0100 | [diff] [blame] | 1829 | return str_uni_istype(unichar_isspace, self_in); |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1830 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1831 | MP_DEFINE_CONST_FUN_OBJ_1(str_isspace_obj, str_isspace); |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1832 | |
| 1833 | STATIC mp_obj_t str_isalpha(mp_obj_t self_in) { |
Damien George | fcc9cf6 | 2014-06-01 18:22:09 +0100 | [diff] [blame] | 1834 | return str_uni_istype(unichar_isalpha, self_in); |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1835 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1836 | MP_DEFINE_CONST_FUN_OBJ_1(str_isalpha_obj, str_isalpha); |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1837 | |
| 1838 | STATIC mp_obj_t str_isdigit(mp_obj_t self_in) { |
Damien George | fcc9cf6 | 2014-06-01 18:22:09 +0100 | [diff] [blame] | 1839 | return str_uni_istype(unichar_isdigit, self_in); |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1840 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1841 | MP_DEFINE_CONST_FUN_OBJ_1(str_isdigit_obj, str_isdigit); |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1842 | |
| 1843 | STATIC mp_obj_t str_isupper(mp_obj_t self_in) { |
Damien George | fcc9cf6 | 2014-06-01 18:22:09 +0100 | [diff] [blame] | 1844 | return str_uni_istype(unichar_isupper, self_in); |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1845 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1846 | MP_DEFINE_CONST_FUN_OBJ_1(str_isupper_obj, str_isupper); |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1847 | |
| 1848 | STATIC mp_obj_t str_islower(mp_obj_t self_in) { |
Damien George | fcc9cf6 | 2014-06-01 18:22:09 +0100 | [diff] [blame] | 1849 | return str_uni_istype(unichar_islower, self_in); |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1850 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1851 | MP_DEFINE_CONST_FUN_OBJ_1(str_islower_obj, str_islower); |
Kim Bauters | a3f4b83 | 2014-05-31 07:30:03 +0100 | [diff] [blame] | 1852 | |
Paul Sokolovsky | 73b7027 | 2014-04-13 05:28:46 +0300 | [diff] [blame] | 1853 | #if MICROPY_CPYTHON_COMPAT |
Ville Skyttä | ca16c38 | 2017-05-29 10:08:14 +0300 | [diff] [blame] | 1854 | // These methods are superfluous in the presence of str() and bytes() |
Paul Sokolovsky | 73b7027 | 2014-04-13 05:28:46 +0300 | [diff] [blame] | 1855 | // constructors. |
| 1856 | // TODO: should accept kwargs too |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 1857 | STATIC mp_obj_t bytes_decode(size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | 73b7027 | 2014-04-13 05:28:46 +0300 | [diff] [blame] | 1858 | mp_obj_t new_args[2]; |
| 1859 | if (n_args == 1) { |
| 1860 | new_args[0] = args[0]; |
| 1861 | new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8); |
| 1862 | args = new_args; |
| 1863 | n_args++; |
| 1864 | } |
Damien George | 5b3f0b7 | 2016-01-03 15:55:55 +0000 | [diff] [blame] | 1865 | return mp_obj_str_make_new(&mp_type_str, n_args, 0, args); |
Paul Sokolovsky | 73b7027 | 2014-04-13 05:28:46 +0300 | [diff] [blame] | 1866 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1867 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_decode_obj, 1, 3, bytes_decode); |
Paul Sokolovsky | 73b7027 | 2014-04-13 05:28:46 +0300 | [diff] [blame] | 1868 | |
| 1869 | // TODO: should accept kwargs too |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 1870 | STATIC mp_obj_t str_encode(size_t n_args, const mp_obj_t *args) { |
Paul Sokolovsky | 73b7027 | 2014-04-13 05:28:46 +0300 | [diff] [blame] | 1871 | mp_obj_t new_args[2]; |
| 1872 | if (n_args == 1) { |
| 1873 | new_args[0] = args[0]; |
| 1874 | new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8); |
| 1875 | args = new_args; |
| 1876 | n_args++; |
| 1877 | } |
Damien George | 5b3f0b7 | 2016-01-03 15:55:55 +0000 | [diff] [blame] | 1878 | return bytes_make_new(NULL, n_args, 0, args); |
Paul Sokolovsky | 73b7027 | 2014-04-13 05:28:46 +0300 | [diff] [blame] | 1879 | } |
Damien George | 65417c5 | 2017-07-02 23:35:42 +1000 | [diff] [blame] | 1880 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_encode_obj, 1, 3, str_encode); |
Paul Sokolovsky | 73b7027 | 2014-04-13 05:28:46 +0300 | [diff] [blame] | 1881 | #endif |
| 1882 | |
Damien George | 4d91723 | 2014-08-30 14:28:06 +0100 | [diff] [blame] | 1883 | mp_int_t mp_obj_str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { |
Damien George | 57a4b4f | 2014-04-18 22:29:21 +0100 | [diff] [blame] | 1884 | if (flags == MP_BUFFER_READ) { |
Damien George | 2da9830 | 2014-03-09 19:58:18 +0000 | [diff] [blame] | 1885 | GET_STR_DATA_LEN(self_in, str_data, str_len); |
| 1886 | bufinfo->buf = (void*)str_data; |
| 1887 | bufinfo->len = str_len; |
Damien George | 12dd8df | 2016-05-07 21:18:17 +0100 | [diff] [blame] | 1888 | bufinfo->typecode = 'B'; // bytes should be unsigned, so should unicode byte-access |
Damien George | 2da9830 | 2014-03-09 19:58:18 +0000 | [diff] [blame] | 1889 | return 0; |
| 1890 | } else { |
| 1891 | // can't write to a string |
| 1892 | bufinfo->buf = NULL; |
| 1893 | bufinfo->len = 0; |
Damien George | 57a4b4f | 2014-04-18 22:29:21 +0100 | [diff] [blame] | 1894 | bufinfo->typecode = -1; |
Damien George | 2da9830 | 2014-03-09 19:58:18 +0000 | [diff] [blame] | 1895 | return 1; |
| 1896 | } |
| 1897 | } |
| 1898 | |
Damien George | cbf7674 | 2015-11-27 13:38:15 +0000 | [diff] [blame] | 1899 | STATIC const mp_rom_map_elem_t str8_locals_dict_table[] = { |
Paul Sokolovsky | 73b7027 | 2014-04-13 05:28:46 +0300 | [diff] [blame] | 1900 | #if MICROPY_CPYTHON_COMPAT |
Damien George | cbf7674 | 2015-11-27 13:38:15 +0000 | [diff] [blame] | 1901 | { MP_ROM_QSTR(MP_QSTR_decode), MP_ROM_PTR(&bytes_decode_obj) }, |
Paul Sokolovsky | d215ee1 | 2014-06-13 22:41:45 +0300 | [diff] [blame] | 1902 | #if !MICROPY_PY_BUILTINS_STR_UNICODE |
| 1903 | // If we have separate unicode type, then here we have methods only |
| 1904 | // for bytes type, and it should not have encode() methods. Otherwise, |
| 1905 | // we have non-compliant-but-practical bytestring type, which shares |
| 1906 | // method table with bytes, so they both have encode() and decode() |
| 1907 | // methods (which should do type checking at runtime). |
Damien George | cbf7674 | 2015-11-27 13:38:15 +0000 | [diff] [blame] | 1908 | { MP_ROM_QSTR(MP_QSTR_encode), MP_ROM_PTR(&str_encode_obj) }, |
Paul Sokolovsky | d215ee1 | 2014-06-13 22:41:45 +0300 | [diff] [blame] | 1909 | #endif |
Paul Sokolovsky | 73b7027 | 2014-04-13 05:28:46 +0300 | [diff] [blame] | 1910 | #endif |
Damien George | cbf7674 | 2015-11-27 13:38:15 +0000 | [diff] [blame] | 1911 | { MP_ROM_QSTR(MP_QSTR_find), MP_ROM_PTR(&str_find_obj) }, |
| 1912 | { MP_ROM_QSTR(MP_QSTR_rfind), MP_ROM_PTR(&str_rfind_obj) }, |
| 1913 | { MP_ROM_QSTR(MP_QSTR_index), MP_ROM_PTR(&str_index_obj) }, |
| 1914 | { MP_ROM_QSTR(MP_QSTR_rindex), MP_ROM_PTR(&str_rindex_obj) }, |
| 1915 | { MP_ROM_QSTR(MP_QSTR_join), MP_ROM_PTR(&str_join_obj) }, |
| 1916 | { MP_ROM_QSTR(MP_QSTR_split), MP_ROM_PTR(&str_split_obj) }, |
Paul Sokolovsky | ac2f7a7 | 2015-04-04 00:09:23 +0300 | [diff] [blame] | 1917 | #if MICROPY_PY_BUILTINS_STR_SPLITLINES |
Damien George | cbf7674 | 2015-11-27 13:38:15 +0000 | [diff] [blame] | 1918 | { MP_ROM_QSTR(MP_QSTR_splitlines), MP_ROM_PTR(&str_splitlines_obj) }, |
Paul Sokolovsky | ac2f7a7 | 2015-04-04 00:09:23 +0300 | [diff] [blame] | 1919 | #endif |
Damien George | cbf7674 | 2015-11-27 13:38:15 +0000 | [diff] [blame] | 1920 | { MP_ROM_QSTR(MP_QSTR_rsplit), MP_ROM_PTR(&str_rsplit_obj) }, |
| 1921 | { MP_ROM_QSTR(MP_QSTR_startswith), MP_ROM_PTR(&str_startswith_obj) }, |
| 1922 | { MP_ROM_QSTR(MP_QSTR_endswith), MP_ROM_PTR(&str_endswith_obj) }, |
| 1923 | { MP_ROM_QSTR(MP_QSTR_strip), MP_ROM_PTR(&str_strip_obj) }, |
| 1924 | { MP_ROM_QSTR(MP_QSTR_lstrip), MP_ROM_PTR(&str_lstrip_obj) }, |
| 1925 | { MP_ROM_QSTR(MP_QSTR_rstrip), MP_ROM_PTR(&str_rstrip_obj) }, |
| 1926 | { MP_ROM_QSTR(MP_QSTR_format), MP_ROM_PTR(&str_format_obj) }, |
| 1927 | { MP_ROM_QSTR(MP_QSTR_replace), MP_ROM_PTR(&str_replace_obj) }, |
| 1928 | { MP_ROM_QSTR(MP_QSTR_count), MP_ROM_PTR(&str_count_obj) }, |
Paul Sokolovsky | 56eb25f | 2016-08-07 06:46:55 +0300 | [diff] [blame] | 1929 | #if MICROPY_PY_BUILTINS_STR_PARTITION |
Damien George | cbf7674 | 2015-11-27 13:38:15 +0000 | [diff] [blame] | 1930 | { MP_ROM_QSTR(MP_QSTR_partition), MP_ROM_PTR(&str_partition_obj) }, |
| 1931 | { MP_ROM_QSTR(MP_QSTR_rpartition), MP_ROM_PTR(&str_rpartition_obj) }, |
Paul Sokolovsky | 56eb25f | 2016-08-07 06:46:55 +0300 | [diff] [blame] | 1932 | #endif |
Paul Sokolovsky | 1563388 | 2016-08-07 15:24:57 +0300 | [diff] [blame] | 1933 | #if MICROPY_PY_BUILTINS_STR_CENTER |
Paul Sokolovsky | 1b5abfc | 2016-05-22 00:13:44 +0300 | [diff] [blame] | 1934 | { MP_ROM_QSTR(MP_QSTR_center), MP_ROM_PTR(&str_center_obj) }, |
Paul Sokolovsky | 1563388 | 2016-08-07 15:24:57 +0300 | [diff] [blame] | 1935 | #endif |
Damien George | cbf7674 | 2015-11-27 13:38:15 +0000 | [diff] [blame] | 1936 | { MP_ROM_QSTR(MP_QSTR_lower), MP_ROM_PTR(&str_lower_obj) }, |
| 1937 | { MP_ROM_QSTR(MP_QSTR_upper), MP_ROM_PTR(&str_upper_obj) }, |
| 1938 | { MP_ROM_QSTR(MP_QSTR_isspace), MP_ROM_PTR(&str_isspace_obj) }, |
| 1939 | { MP_ROM_QSTR(MP_QSTR_isalpha), MP_ROM_PTR(&str_isalpha_obj) }, |
| 1940 | { MP_ROM_QSTR(MP_QSTR_isdigit), MP_ROM_PTR(&str_isdigit_obj) }, |
| 1941 | { MP_ROM_QSTR(MP_QSTR_isupper), MP_ROM_PTR(&str_isupper_obj) }, |
| 1942 | { MP_ROM_QSTR(MP_QSTR_islower), MP_ROM_PTR(&str_islower_obj) }, |
ian-v | 7a16fad | 2014-01-06 09:52:29 -0800 | [diff] [blame] | 1943 | }; |
Damien George | 97209d3 | 2014-01-07 15:58:30 +0000 | [diff] [blame] | 1944 | |
Paul Sokolovsky | 6113eb2 | 2015-01-23 02:05:58 +0200 | [diff] [blame] | 1945 | STATIC MP_DEFINE_CONST_DICT(str8_locals_dict, str8_locals_dict_table); |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 1946 | |
Paul Sokolovsky | d215ee1 | 2014-06-13 22:41:45 +0300 | [diff] [blame] | 1947 | #if !MICROPY_PY_BUILTINS_STR_UNICODE |
Damien George | ae8d867 | 2016-01-09 23:14:54 +0000 | [diff] [blame] | 1948 | STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf); |
Damien George | 44e7cbf | 2015-05-17 16:44:24 +0100 | [diff] [blame] | 1949 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 1950 | const mp_obj_type_t mp_type_str = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 1951 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 1952 | .name = MP_QSTR_str, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 1953 | .print = str_print, |
Paul Sokolovsky | 344e15b | 2015-01-23 02:15:56 +0200 | [diff] [blame] | 1954 | .make_new = mp_obj_str_make_new, |
Damien George | e04a44e | 2014-06-28 10:27:23 +0100 | [diff] [blame] | 1955 | .binary_op = mp_obj_str_binary_op, |
Paul Sokolovsky | 9749b2f | 2014-08-11 22:36:38 +0300 | [diff] [blame] | 1956 | .subscr = bytes_subscr, |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 1957 | .getiter = mp_obj_new_str_iterator, |
Damien George | e04a44e | 2014-06-28 10:27:23 +0100 | [diff] [blame] | 1958 | .buffer_p = { .get_buffer = mp_obj_str_get_buffer }, |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 1959 | .locals_dict = (mp_obj_dict_t*)&str8_locals_dict, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 1960 | }; |
Paul Sokolovsky | d215ee1 | 2014-06-13 22:41:45 +0300 | [diff] [blame] | 1961 | #endif |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 1962 | |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 1963 | // Reuses most of methods from str |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 1964 | const mp_obj_type_t mp_type_bytes = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 1965 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 1966 | .name = MP_QSTR_bytes, |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 1967 | .print = str_print, |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 1968 | .make_new = bytes_make_new, |
Damien George | e04a44e | 2014-06-28 10:27:23 +0100 | [diff] [blame] | 1969 | .binary_op = mp_obj_str_binary_op, |
Paul Sokolovsky | 9749b2f | 2014-08-11 22:36:38 +0300 | [diff] [blame] | 1970 | .subscr = bytes_subscr, |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 1971 | .getiter = mp_obj_new_bytes_iterator, |
Damien George | e04a44e | 2014-06-28 10:27:23 +0100 | [diff] [blame] | 1972 | .buffer_p = { .get_buffer = mp_obj_str_get_buffer }, |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 1973 | .locals_dict = (mp_obj_dict_t*)&str8_locals_dict, |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 1974 | }; |
| 1975 | |
Damien George | dfa563c | 2017-10-04 17:59:22 +1100 | [diff] [blame] | 1976 | // The zero-length bytes object, with data that includes a null-terminating byte |
| 1977 | const mp_obj_str_t mp_const_empty_bytes_obj = {{&mp_type_bytes}, 0, 0, (const byte*)""}; |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 1978 | |
Damien George | 77089be | 2015-01-21 23:08:36 +0000 | [diff] [blame] | 1979 | // Create a str/bytes object using the given data. New memory is allocated and |
| 1980 | // the data is copied across. |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 1981 | mp_obj_t mp_obj_new_str_of_type(const mp_obj_type_t *type, const byte* data, size_t len) { |
Paul Sokolovsky | 5972b4c | 2014-03-20 16:47:44 +0200 | [diff] [blame] | 1982 | mp_obj_str_t *o = m_new_obj(mp_obj_str_t); |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 1983 | o->base.type = type; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 1984 | o->len = len; |
Paul Sokolovsky | 5972b4c | 2014-03-20 16:47:44 +0200 | [diff] [blame] | 1985 | if (data) { |
| 1986 | o->hash = qstr_compute_hash(data, len); |
| 1987 | byte *p = m_new(byte, len + 1); |
| 1988 | o->data = p; |
| 1989 | memcpy(p, data, len * sizeof(byte)); |
| 1990 | p[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings |
| 1991 | } |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 1992 | return MP_OBJ_FROM_PTR(o); |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 1993 | } |
| 1994 | |
Damien George | 4601759 | 2017-11-16 13:17:51 +1100 | [diff] [blame^] | 1995 | // Create a str using a qstr to store the data; may use existing or new qstr. |
| 1996 | mp_obj_t mp_obj_new_str_via_qstr(const char* data, size_t len) { |
| 1997 | return MP_OBJ_NEW_QSTR(qstr_from_strn(data, len)); |
| 1998 | } |
| 1999 | |
Damien George | 77089be | 2015-01-21 23:08:36 +0000 | [diff] [blame] | 2000 | // Create a str/bytes object from the given vstr. The vstr buffer is resized to |
| 2001 | // the exact length required and then reused for the str/bytes object. The vstr |
| 2002 | // is cleared and can safely be passed to vstr_free if it was heap allocated. |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 2003 | mp_obj_t mp_obj_new_str_from_vstr(const mp_obj_type_t *type, vstr_t *vstr) { |
| 2004 | // if not a bytes object, look if a qstr with this data already exists |
| 2005 | if (type == &mp_type_str) { |
| 2006 | qstr q = qstr_find_strn(vstr->buf, vstr->len); |
| 2007 | if (q != MP_QSTR_NULL) { |
| 2008 | vstr_clear(vstr); |
| 2009 | vstr->alloc = 0; |
| 2010 | return MP_OBJ_NEW_QSTR(q); |
| 2011 | } |
| 2012 | } |
| 2013 | |
| 2014 | // make a new str/bytes object |
| 2015 | mp_obj_str_t *o = m_new_obj(mp_obj_str_t); |
| 2016 | o->base.type = type; |
| 2017 | o->len = vstr->len; |
| 2018 | o->hash = qstr_compute_hash((byte*)vstr->buf, vstr->len); |
Dave Hylands | 9f76dcd | 2015-05-18 13:25:36 -0700 | [diff] [blame] | 2019 | if (vstr->len + 1 == vstr->alloc) { |
| 2020 | o->data = (byte*)vstr->buf; |
| 2021 | } else { |
| 2022 | o->data = (byte*)m_renew(char, vstr->buf, vstr->alloc, vstr->len + 1); |
| 2023 | } |
Damien George | 0d3cb67 | 2015-01-28 23:43:01 +0000 | [diff] [blame] | 2024 | ((byte*)o->data)[o->len] = '\0'; // add null byte |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 2025 | vstr->buf = NULL; |
| 2026 | vstr->alloc = 0; |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 2027 | return MP_OBJ_FROM_PTR(o); |
Damien George | 0b9ee86 | 2015-01-21 19:14:25 +0000 | [diff] [blame] | 2028 | } |
| 2029 | |
Damien George | 4601759 | 2017-11-16 13:17:51 +1100 | [diff] [blame^] | 2030 | mp_obj_t mp_obj_new_str(const char* data, size_t len) { |
| 2031 | qstr q = qstr_find_strn(data, len); |
| 2032 | if (q != MP_QSTR_NULL) { |
| 2033 | // qstr with this data already exists |
| 2034 | return MP_OBJ_NEW_QSTR(q); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 2035 | } else { |
Damien George | 4601759 | 2017-11-16 13:17:51 +1100 | [diff] [blame^] | 2036 | // no existing qstr, don't make one |
| 2037 | return mp_obj_new_str_of_type(&mp_type_str, (const byte*)data, len); |
Paul Sokolovsky | 8965a5e | 2014-01-20 23:33:19 +0200 | [diff] [blame] | 2038 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 2039 | } |
| 2040 | |
Paul Sokolovsky | b4efac1 | 2014-06-08 01:13:35 +0300 | [diff] [blame] | 2041 | mp_obj_t mp_obj_str_intern(mp_obj_t str) { |
| 2042 | GET_STR_DATA_LEN(str, data, len); |
Damien George | 4601759 | 2017-11-16 13:17:51 +1100 | [diff] [blame^] | 2043 | return mp_obj_new_str_via_qstr((const char*)data, len); |
Paul Sokolovsky | b4efac1 | 2014-06-08 01:13:35 +0300 | [diff] [blame] | 2044 | } |
| 2045 | |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 2046 | mp_obj_t mp_obj_new_bytes(const byte* data, size_t len) { |
Damien George | f600a6a | 2014-05-25 22:34:34 +0100 | [diff] [blame] | 2047 | return mp_obj_new_str_of_type(&mp_type_bytes, data, len); |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 2048 | } |
| 2049 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 2050 | bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) { |
| 2051 | if (MP_OBJ_IS_QSTR(s1) && MP_OBJ_IS_QSTR(s2)) { |
| 2052 | return s1 == s2; |
| 2053 | } else { |
| 2054 | GET_STR_HASH(s1, h1); |
| 2055 | GET_STR_HASH(s2, h2); |
Paul Sokolovsky | 59e269c | 2014-04-14 01:43:01 +0300 | [diff] [blame] | 2056 | // If any of hashes is 0, it means it's not valid |
| 2057 | if (h1 != 0 && h2 != 0 && h1 != h2) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 2058 | return false; |
| 2059 | } |
| 2060 | GET_STR_DATA_LEN(s1, d1, l1); |
| 2061 | GET_STR_DATA_LEN(s2, d2, l2); |
| 2062 | if (l1 != l2) { |
| 2063 | return false; |
| 2064 | } |
Damien George | 1e708fe | 2014-01-23 18:27:51 +0000 | [diff] [blame] | 2065 | return memcmp(d1, d2, l1) == 0; |
Paul Sokolovsky | 8965a5e | 2014-01-20 23:33:19 +0200 | [diff] [blame] | 2066 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 2067 | } |
| 2068 | |
Damien George | deed087 | 2014-04-06 11:11:15 +0100 | [diff] [blame] | 2069 | STATIC void bad_implicit_conversion(mp_obj_t self_in) { |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 2070 | if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { |
Paul Sokolovsky | 9e1b61d | 2016-08-12 21:26:12 +0300 | [diff] [blame] | 2071 | mp_raise_TypeError("can't convert to str implicitly"); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 2072 | } else { |
stijn | bf29fe2 | 2017-03-15 12:17:38 +0100 | [diff] [blame] | 2073 | const qstr src_name = mp_obj_get_type(self_in)->name; |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 2074 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, |
stijn | bf29fe2 | 2017-03-15 12:17:38 +0100 | [diff] [blame] | 2075 | "can't convert '%q' object to %q implicitly", |
| 2076 | src_name, src_name == MP_QSTR_str ? MP_QSTR_bytes : MP_QSTR_str)); |
Damien George | 1e9a92f | 2014-11-06 17:36:16 +0000 | [diff] [blame] | 2077 | } |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 2078 | } |
| 2079 | |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 2080 | // use this if you will anyway convert the string to a qstr |
| 2081 | // will be more efficient for the case where it's already a qstr |
| 2082 | qstr mp_obj_str_get_qstr(mp_obj_t self_in) { |
| 2083 | if (MP_OBJ_IS_QSTR(self_in)) { |
| 2084 | return MP_OBJ_QSTR_VALUE(self_in); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 2085 | } else if (MP_OBJ_IS_TYPE(self_in, &mp_type_str)) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 2086 | mp_obj_str_t *self = MP_OBJ_TO_PTR(self_in); |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 2087 | return qstr_from_strn((char*)self->data, self->len); |
| 2088 | } else { |
| 2089 | bad_implicit_conversion(self_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 2090 | } |
| 2091 | } |
| 2092 | |
| 2093 | // only use this function if you need the str data to be zero terminated |
| 2094 | // at the moment all strings are zero terminated to help with C ASCIIZ compatibility |
| 2095 | const char *mp_obj_str_get_str(mp_obj_t self_in) { |
Paul Sokolovsky | 31619cc | 2014-10-30 16:36:41 +0200 | [diff] [blame] | 2096 | if (MP_OBJ_IS_STR_OR_BYTES(self_in)) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 2097 | GET_STR_DATA_LEN(self_in, s, l); |
| 2098 | (void)l; // len unused |
| 2099 | return (const char*)s; |
| 2100 | } else { |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 2101 | bad_implicit_conversion(self_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 2102 | } |
| 2103 | } |
| 2104 | |
Damien George | 6b34107 | 2017-03-25 19:48:18 +1100 | [diff] [blame] | 2105 | const char *mp_obj_str_get_data(mp_obj_t self_in, size_t *len) { |
Dave Hylands | b7f7c65 | 2014-08-26 12:44:46 -0700 | [diff] [blame] | 2106 | if (MP_OBJ_IS_STR_OR_BYTES(self_in)) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 2107 | GET_STR_DATA_LEN(self_in, s, l); |
| 2108 | *len = l; |
Damien George | 698ec21 | 2014-02-08 18:17:23 +0000 | [diff] [blame] | 2109 | return (const char*)s; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 2110 | } else { |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 2111 | bad_implicit_conversion(self_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 2112 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 2113 | } |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 2114 | |
Damien George | 04353cc | 2015-10-18 23:09:04 +0100 | [diff] [blame] | 2115 | #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C |
Damien George | c3f64d9 | 2015-11-27 12:23:18 +0000 | [diff] [blame] | 2116 | const byte *mp_obj_str_get_data_no_check(mp_obj_t self_in, size_t *len) { |
Damien George | 04353cc | 2015-10-18 23:09:04 +0100 | [diff] [blame] | 2117 | if (MP_OBJ_IS_QSTR(self_in)) { |
| 2118 | return qstr_data(MP_OBJ_QSTR_VALUE(self_in), len); |
| 2119 | } else { |
| 2120 | *len = ((mp_obj_str_t*)self_in)->len; |
| 2121 | return ((mp_obj_str_t*)self_in)->data; |
| 2122 | } |
| 2123 | } |
| 2124 | #endif |
| 2125 | |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 2126 | /******************************************************************************/ |
| 2127 | /* str iterator */ |
| 2128 | |
Damien George | 44e7cbf | 2015-05-17 16:44:24 +0100 | [diff] [blame] | 2129 | typedef struct _mp_obj_str8_it_t { |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 2130 | mp_obj_base_t base; |
Damien George | 8212d97 | 2016-01-03 16:27:55 +0000 | [diff] [blame] | 2131 | mp_fun_1_t iternext; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 2132 | mp_obj_t str; |
Damien George | c0d9500 | 2017-02-16 16:26:48 +1100 | [diff] [blame] | 2133 | size_t cur; |
Damien George | 44e7cbf | 2015-05-17 16:44:24 +0100 | [diff] [blame] | 2134 | } mp_obj_str8_it_t; |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 2135 | |
Paul Sokolovsky | d215ee1 | 2014-06-13 22:41:45 +0300 | [diff] [blame] | 2136 | #if !MICROPY_PY_BUILTINS_STR_UNICODE |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 2137 | STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) { |
Damien George | 326e886 | 2017-06-08 00:40:38 +1000 | [diff] [blame] | 2138 | mp_obj_str8_it_t *self = MP_OBJ_TO_PTR(self_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 2139 | GET_STR_DATA_LEN(self->str, str, len); |
| 2140 | if (self->cur < len) { |
Damien George | 4601759 | 2017-11-16 13:17:51 +1100 | [diff] [blame^] | 2141 | mp_obj_t o_out = mp_obj_new_str_via_qstr((const char*)str + self->cur, 1); |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 2142 | self->cur += 1; |
| 2143 | return o_out; |
| 2144 | } else { |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 2145 | return MP_OBJ_STOP_ITERATION; |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 2146 | } |
| 2147 | } |
| 2148 | |
Damien George | ae8d867 | 2016-01-09 23:14:54 +0000 | [diff] [blame] | 2149 | STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf) { |
| 2150 | assert(sizeof(mp_obj_str8_it_t) <= sizeof(mp_obj_iter_buf_t)); |
| 2151 | mp_obj_str8_it_t *o = (mp_obj_str8_it_t*)iter_buf; |
Damien George | 8212d97 | 2016-01-03 16:27:55 +0000 | [diff] [blame] | 2152 | o->base.type = &mp_type_polymorph_iter; |
| 2153 | o->iternext = str_it_iternext; |
Paul Sokolovsky | d215ee1 | 2014-06-13 22:41:45 +0300 | [diff] [blame] | 2154 | o->str = str; |
| 2155 | o->cur = 0; |
Damien George | 326e886 | 2017-06-08 00:40:38 +1000 | [diff] [blame] | 2156 | return MP_OBJ_FROM_PTR(o); |
Paul Sokolovsky | d215ee1 | 2014-06-13 22:41:45 +0300 | [diff] [blame] | 2157 | } |
| 2158 | #endif |
| 2159 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 2160 | STATIC mp_obj_t bytes_it_iternext(mp_obj_t self_in) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 2161 | mp_obj_str8_it_t *self = MP_OBJ_TO_PTR(self_in); |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 2162 | GET_STR_DATA_LEN(self->str, str, len); |
| 2163 | if (self->cur < len) { |
Damien George | bb4c6f3 | 2014-07-31 10:49:14 +0100 | [diff] [blame] | 2164 | mp_obj_t o_out = MP_OBJ_NEW_SMALL_INT(str[self->cur]); |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 2165 | self->cur += 1; |
| 2166 | return o_out; |
| 2167 | } else { |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 2168 | return MP_OBJ_STOP_ITERATION; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 2169 | } |
| 2170 | } |
| 2171 | |
Damien George | ae8d867 | 2016-01-09 23:14:54 +0000 | [diff] [blame] | 2172 | mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf) { |
| 2173 | assert(sizeof(mp_obj_str8_it_t) <= sizeof(mp_obj_iter_buf_t)); |
| 2174 | mp_obj_str8_it_t *o = (mp_obj_str8_it_t*)iter_buf; |
Damien George | 8212d97 | 2016-01-03 16:27:55 +0000 | [diff] [blame] | 2175 | o->base.type = &mp_type_polymorph_iter; |
| 2176 | o->iternext = bytes_it_iternext; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 2177 | o->str = str; |
| 2178 | o->cur = 0; |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 2179 | return MP_OBJ_FROM_PTR(o); |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 2180 | } |