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