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