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