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