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