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