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