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