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