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" |
| 12 | |
| 13 | typedef struct _mp_obj_str_t { |
| 14 | mp_obj_base_t base; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 15 | machine_uint_t hash : 16; // XXX here we assume the hash size is 16 bits (it is at the moment; see qstr.c) |
| 16 | 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] | 17 | const byte *data; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 18 | } mp_obj_str_t; |
| 19 | |
Paul Sokolovsky | 4db727a | 2014-03-31 21:18:28 +0300 | [diff] [blame] | 20 | 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] | 21 | const mp_obj_t mp_const_empty_bytes; |
| 22 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 23 | // use this macro to extract the string hash |
| 24 | #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; } |
| 25 | |
| 26 | // use this macro to extract the string length |
| 27 | #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; } |
| 28 | |
| 29 | // use this macro to extract the string data and length |
| 30 | #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; } |
| 31 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 32 | STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str); |
| 33 | 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] | 34 | STATIC mp_obj_t str_new(const mp_obj_type_t *type, const byte* data, uint len); |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 35 | |
| 36 | /******************************************************************************/ |
| 37 | /* str */ |
| 38 | |
Paul Sokolovsky | 0b7e29c | 2014-01-28 03:40:06 +0200 | [diff] [blame] | 39 | void mp_str_print_quoted(void (*print)(void *env, const char *fmt, ...), void *env, const byte *str_data, uint str_len) { |
| 40 | // this escapes characters, but it will be very slow to print (calling print many times) |
| 41 | bool has_single_quote = false; |
| 42 | bool has_double_quote = false; |
| 43 | for (const byte *s = str_data, *top = str_data + str_len; (!has_single_quote || !has_double_quote) && s < top; s++) { |
| 44 | if (*s == '\'') { |
| 45 | has_single_quote = true; |
| 46 | } else if (*s == '"') { |
| 47 | has_double_quote = true; |
| 48 | } |
| 49 | } |
| 50 | int quote_char = '\''; |
| 51 | if (has_single_quote && !has_double_quote) { |
| 52 | quote_char = '"'; |
| 53 | } |
| 54 | print(env, "%c", quote_char); |
| 55 | for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) { |
| 56 | if (*s == quote_char) { |
| 57 | print(env, "\\%c", quote_char); |
| 58 | } else if (*s == '\\') { |
| 59 | print(env, "\\\\"); |
| 60 | } else if (32 <= *s && *s <= 126) { |
| 61 | print(env, "%c", *s); |
| 62 | } else if (*s == '\n') { |
| 63 | print(env, "\\n"); |
| 64 | // TODO add more escape codes here if we want to match CPython |
| 65 | } else { |
| 66 | print(env, "\\x%02x", *s); |
| 67 | } |
| 68 | } |
| 69 | print(env, "%c", quote_char); |
| 70 | } |
| 71 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 72 | 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] | 73 | GET_STR_DATA_LEN(self_in, str_data, str_len); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 74 | bool is_bytes = MP_OBJ_IS_TYPE(self_in, &mp_type_bytes); |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 75 | if (kind == PRINT_STR && !is_bytes) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 76 | print(env, "%.*s", str_len, str_data); |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 77 | } else { |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 78 | if (is_bytes) { |
| 79 | print(env, "b"); |
| 80 | } |
Paul Sokolovsky | 0b7e29c | 2014-01-28 03:40:06 +0200 | [diff] [blame] | 81 | mp_str_print_quoted(print, env, str_data, str_len); |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 82 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 83 | } |
| 84 | |
Paul Sokolovsky | be020c2 | 2014-03-21 11:39:01 +0200 | [diff] [blame] | 85 | STATIC mp_obj_t str_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { |
| 86 | switch (n_args) { |
| 87 | case 0: |
| 88 | return MP_OBJ_NEW_QSTR(MP_QSTR_); |
| 89 | |
| 90 | case 1: |
| 91 | { |
| 92 | vstr_t *vstr = vstr_new(); |
| 93 | mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, args[0], PRINT_STR); |
| 94 | mp_obj_t s = mp_obj_new_str((byte*)vstr->buf, vstr->len, false); |
| 95 | vstr_free(vstr); |
| 96 | return s; |
| 97 | } |
| 98 | |
| 99 | case 2: |
| 100 | case 3: |
| 101 | { |
| 102 | // TODO: validate 2nd/3rd args |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 103 | if (!MP_OBJ_IS_TYPE(args[0], &mp_type_bytes)) { |
Paul Sokolovsky | be020c2 | 2014-03-21 11:39:01 +0200 | [diff] [blame] | 104 | nlr_jump(mp_obj_new_exception_msg(&mp_type_TypeError, "bytes expected")); |
| 105 | } |
| 106 | GET_STR_DATA_LEN(args[0], str_data, str_len); |
| 107 | GET_STR_HASH(args[0], str_hash); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 108 | 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] | 109 | o->data = str_data; |
| 110 | o->hash = str_hash; |
| 111 | return o; |
| 112 | } |
| 113 | |
| 114 | default: |
| 115 | nlr_jump(mp_obj_new_exception_msg(&mp_type_TypeError, "str takes at most 3 arguments")); |
| 116 | } |
| 117 | } |
| 118 | |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 119 | STATIC mp_obj_t bytes_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { |
| 120 | if (n_args == 0) { |
| 121 | return mp_const_empty_bytes; |
| 122 | } |
| 123 | |
| 124 | if (MP_OBJ_IS_STR(args[0])) { |
| 125 | if (n_args < 2 || n_args > 3) { |
| 126 | goto wrong_args; |
| 127 | } |
| 128 | GET_STR_DATA_LEN(args[0], str_data, str_len); |
| 129 | GET_STR_HASH(args[0], str_hash); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 130 | 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] | 131 | o->data = str_data; |
| 132 | o->hash = str_hash; |
| 133 | return o; |
| 134 | } |
| 135 | |
| 136 | if (n_args > 1) { |
| 137 | goto wrong_args; |
| 138 | } |
| 139 | |
| 140 | if (MP_OBJ_IS_SMALL_INT(args[0])) { |
| 141 | uint len = MP_OBJ_SMALL_INT_VALUE(args[0]); |
| 142 | byte *data; |
| 143 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 144 | 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] | 145 | memset(data, 0, len); |
| 146 | return mp_obj_str_builder_end(o); |
| 147 | } |
| 148 | |
| 149 | int len; |
| 150 | byte *data; |
| 151 | vstr_t *vstr = NULL; |
| 152 | mp_obj_t o = NULL; |
| 153 | // Try to create array of exact len if initializer len is known |
| 154 | mp_obj_t len_in = mp_obj_len_maybe(args[0]); |
| 155 | if (len_in == MP_OBJ_NULL) { |
| 156 | len = -1; |
| 157 | vstr = vstr_new(); |
| 158 | } else { |
| 159 | len = MP_OBJ_SMALL_INT_VALUE(len_in); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 160 | o = mp_obj_str_builder_start(&mp_type_bytes, len, &data); |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 161 | } |
| 162 | |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 163 | mp_obj_t iterable = mp_getiter(args[0]); |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 164 | mp_obj_t item; |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 165 | while ((item = mp_iternext(iterable)) != MP_OBJ_NULL) { |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 166 | if (len == -1) { |
| 167 | vstr_add_char(vstr, MP_OBJ_SMALL_INT_VALUE(item)); |
| 168 | } else { |
| 169 | *data++ = MP_OBJ_SMALL_INT_VALUE(item); |
| 170 | } |
| 171 | } |
| 172 | |
| 173 | if (len == -1) { |
| 174 | vstr_shrink(vstr); |
| 175 | // TODO: Optimize, borrow buffer from vstr |
| 176 | len = vstr_len(vstr); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 177 | o = mp_obj_str_builder_start(&mp_type_bytes, len, &data); |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 178 | memcpy(data, vstr_str(vstr), len); |
| 179 | vstr_free(vstr); |
| 180 | } |
| 181 | |
| 182 | return mp_obj_str_builder_end(o); |
| 183 | |
| 184 | wrong_args: |
| 185 | nlr_jump(mp_obj_new_exception_msg(&mp_type_TypeError, "wrong number of arguments")); |
| 186 | } |
| 187 | |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 188 | // like strstr but with specified length and allows \0 bytes |
| 189 | // TODO replace with something more efficient/standard |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 190 | 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] | 191 | if (hlen >= nlen) { |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 192 | machine_uint_t str_index, str_index_end; |
| 193 | if (direction > 0) { |
| 194 | str_index = 0; |
| 195 | str_index_end = hlen - nlen; |
| 196 | } else { |
| 197 | str_index = hlen - nlen; |
| 198 | str_index_end = 0; |
| 199 | } |
| 200 | for (;;) { |
| 201 | if (memcmp(&haystack[str_index], needle, nlen) == 0) { |
| 202 | //found |
| 203 | return haystack + str_index; |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 204 | } |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 205 | if (str_index == str_index_end) { |
| 206 | //not found |
| 207 | break; |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 208 | } |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 209 | str_index += direction; |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 210 | } |
| 211 | } |
| 212 | return NULL; |
| 213 | } |
| 214 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 215 | 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] | 216 | GET_STR_DATA_LEN(lhs_in, lhs_data, lhs_len); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 217 | switch (op) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 218 | case MP_BINARY_OP_SUBSCR: |
Paul Sokolovsky | 31ba60f | 2014-01-03 02:51:16 +0200 | [diff] [blame] | 219 | // TODO: need predicate to check for int-like type (bools are such for example) |
| 220 | // ["no", "yes"][1 == 2] is common idiom |
| 221 | if (MP_OBJ_IS_SMALL_INT(rhs_in)) { |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 222 | 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] | 223 | if (MP_OBJ_IS_TYPE(lhs_in, &mp_type_bytes)) { |
Damien George | 7c9c667 | 2014-01-25 00:17:36 +0000 | [diff] [blame] | 224 | 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] | 225 | } else { |
| 226 | return mp_obj_new_str(lhs_data + index, 1, true); |
| 227 | } |
Paul Sokolovsky | e606cb6 | 2014-01-04 01:34:23 +0200 | [diff] [blame] | 228 | #if MICROPY_ENABLE_SLICE |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 229 | } else if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_slice)) { |
Paul Sokolovsky | 7364af2 | 2014-02-02 02:38:22 +0200 | [diff] [blame] | 230 | machine_uint_t start, stop; |
Paul Sokolovsky | ea2509d | 2014-02-02 08:57:05 +0200 | [diff] [blame] | 231 | if (!m_seq_get_fast_slice_indexes(lhs_len, rhs_in, &start, &stop)) { |
| 232 | assert(0); |
| 233 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 234 | return mp_obj_new_str(lhs_data + start, stop - start, false); |
Paul Sokolovsky | e606cb6 | 2014-01-04 01:34:23 +0200 | [diff] [blame] | 235 | #endif |
Paul Sokolovsky | 31ba60f | 2014-01-03 02:51:16 +0200 | [diff] [blame] | 236 | } else { |
Paul Sokolovsky | f8b9d3c | 2014-01-04 01:38:26 +0200 | [diff] [blame] | 237 | // Message doesn't match CPython, but we don't have so much bytes as they |
| 238 | // to spend them on verbose wording |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 239 | nlr_jump(mp_obj_new_exception_msg(&mp_type_TypeError, "index must be int")); |
Paul Sokolovsky | 31ba60f | 2014-01-03 02:51:16 +0200 | [diff] [blame] | 240 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 241 | |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 242 | case MP_BINARY_OP_ADD: |
| 243 | case MP_BINARY_OP_INPLACE_ADD: |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 244 | if (MP_OBJ_IS_STR(rhs_in)) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 245 | // add 2 strings |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 246 | |
| 247 | GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len); |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 248 | int alloc_len = lhs_len + rhs_len; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 249 | |
| 250 | /* code for making qstr |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 251 | byte *q_ptr; |
| 252 | byte *val = qstr_build_start(alloc_len, &q_ptr); |
| 253 | memcpy(val, lhs_data, lhs_len); |
| 254 | memcpy(val + lhs_len, rhs_data, rhs_len); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 255 | return MP_OBJ_NEW_QSTR(qstr_build_end(q_ptr)); |
| 256 | */ |
| 257 | |
| 258 | // code for non-qstr |
| 259 | byte *data; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 260 | 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] | 261 | memcpy(data, lhs_data, lhs_len); |
| 262 | memcpy(data + lhs_len, rhs_data, rhs_len); |
| 263 | return mp_obj_str_builder_end(s); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 264 | } |
| 265 | break; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 266 | |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 267 | case MP_BINARY_OP_IN: |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 268 | /* NOTE `a in b` is `b.__contains__(a)` */ |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 269 | if (MP_OBJ_IS_STR(rhs_in)) { |
| 270 | GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len); |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 271 | 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] | 272 | } |
| 273 | break; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 274 | |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 275 | case MP_BINARY_OP_MULTIPLY: |
Paul Sokolovsky | 545591a | 2014-01-21 00:27:33 +0200 | [diff] [blame] | 276 | { |
| 277 | if (!MP_OBJ_IS_SMALL_INT(rhs_in)) { |
| 278 | return NULL; |
| 279 | } |
| 280 | int n = MP_OBJ_SMALL_INT_VALUE(rhs_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 281 | byte *data; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 282 | 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] | 283 | mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, data); |
| 284 | return mp_obj_str_builder_end(s); |
Paul Sokolovsky | 545591a | 2014-01-21 00:27:33 +0200 | [diff] [blame] | 285 | } |
Paul Sokolovsky | 87e85b7 | 2014-02-02 08:24:07 +0200 | [diff] [blame] | 286 | |
Paul Sokolovsky | 4db727a | 2014-03-31 21:18:28 +0300 | [diff] [blame] | 287 | case MP_BINARY_OP_MODULO: { |
| 288 | mp_obj_t *args; |
| 289 | uint n_args; |
| 290 | if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple)) { |
| 291 | // TODO: Support tuple subclasses? |
| 292 | mp_obj_tuple_get(rhs_in, &n_args, &args); |
| 293 | } else { |
| 294 | args = &rhs_in; |
| 295 | n_args = 1; |
| 296 | } |
| 297 | return str_modulo_format(lhs_in, n_args, args); |
| 298 | } |
| 299 | |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 300 | // These 2 are never passed here, dealt with as a special case in mp_binary_op(). |
| 301 | //case MP_BINARY_OP_EQUAL: |
| 302 | //case MP_BINARY_OP_NOT_EQUAL: |
| 303 | case MP_BINARY_OP_LESS: |
| 304 | case MP_BINARY_OP_LESS_EQUAL: |
| 305 | case MP_BINARY_OP_MORE: |
| 306 | case MP_BINARY_OP_MORE_EQUAL: |
Paul Sokolovsky | 87e85b7 | 2014-02-02 08:24:07 +0200 | [diff] [blame] | 307 | if (MP_OBJ_IS_STR(rhs_in)) { |
| 308 | GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len); |
| 309 | return MP_BOOL(mp_seq_cmp_bytes(op, lhs_data, lhs_len, rhs_data, rhs_len)); |
| 310 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 311 | } |
| 312 | |
| 313 | return MP_OBJ_NULL; // op not supported |
| 314 | } |
| 315 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 316 | 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] | 317 | assert(MP_OBJ_IS_STR(self_in)); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 318 | |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 319 | // get separation string |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 320 | GET_STR_DATA_LEN(self_in, sep_str, sep_len); |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 321 | |
| 322 | // process args |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 323 | uint seq_len; |
| 324 | mp_obj_t *seq_items; |
Damien George | 07ddab5 | 2014-03-29 13:15:08 +0000 | [diff] [blame] | 325 | if (MP_OBJ_IS_TYPE(arg, &mp_type_tuple)) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 326 | mp_obj_tuple_get(arg, &seq_len, &seq_items); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 327 | } else if (MP_OBJ_IS_TYPE(arg, &mp_type_list)) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 328 | mp_obj_list_get(arg, &seq_len, &seq_items); |
| 329 | } else { |
| 330 | goto bad_arg; |
| 331 | } |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 332 | |
| 333 | // count required length |
| 334 | int required_len = 0; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 335 | for (int i = 0; i < seq_len; i++) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 336 | if (!MP_OBJ_IS_STR(seq_items[i])) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 337 | goto bad_arg; |
| 338 | } |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 339 | if (i > 0) { |
| 340 | required_len += sep_len; |
| 341 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 342 | GET_STR_LEN(seq_items[i], l); |
| 343 | required_len += l; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 344 | } |
| 345 | |
| 346 | // make joined string |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 347 | byte *data; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 348 | 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] | 349 | for (int i = 0; i < seq_len; i++) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 350 | if (i > 0) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 351 | memcpy(data, sep_str, sep_len); |
| 352 | data += sep_len; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 353 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 354 | GET_STR_DATA_LEN(seq_items[i], s, l); |
| 355 | memcpy(data, s, l); |
| 356 | data += l; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 357 | } |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 358 | |
| 359 | // return joined string |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 360 | return mp_obj_str_builder_end(joined_str); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 361 | |
| 362 | bad_arg: |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 363 | nlr_jump(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] | 364 | } |
| 365 | |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 366 | #define is_ws(c) ((c) == ' ' || (c) == '\t') |
| 367 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 368 | STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) { |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 369 | int splits = -1; |
| 370 | mp_obj_t sep = mp_const_none; |
| 371 | if (n_args > 1) { |
| 372 | sep = args[1]; |
| 373 | if (n_args > 2) { |
| 374 | splits = MP_OBJ_SMALL_INT_VALUE(args[2]); |
| 375 | } |
| 376 | } |
| 377 | assert(sep == mp_const_none); |
Damien George | 12eacca | 2014-01-21 21:54:15 +0000 | [diff] [blame] | 378 | (void)sep; // unused; to hush compiler warning |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 379 | mp_obj_t res = mp_obj_new_list(0, NULL); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 380 | GET_STR_DATA_LEN(args[0], s, len); |
| 381 | const byte *top = s + len; |
| 382 | const byte *start; |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 383 | |
| 384 | // Initial whitespace is not counted as split, so we pre-do it |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 385 | while (s < top && is_ws(*s)) s++; |
| 386 | while (s < top && splits != 0) { |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 387 | start = s; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 388 | while (s < top && !is_ws(*s)) s++; |
Damien George | 15d1806 | 2014-03-31 16:28:13 +0100 | [diff] [blame] | 389 | mp_obj_list_append(res, mp_obj_new_str(start, s - start, false)); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 390 | if (s >= top) { |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 391 | break; |
| 392 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 393 | while (s < top && is_ws(*s)) s++; |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 394 | if (splits > 0) { |
| 395 | splits--; |
| 396 | } |
| 397 | } |
| 398 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 399 | if (s < top) { |
Damien George | 15d1806 | 2014-03-31 16:28:13 +0100 | [diff] [blame] | 400 | mp_obj_list_append(res, mp_obj_new_str(s, top - s, false)); |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 401 | } |
| 402 | |
| 403 | return res; |
| 404 | } |
| 405 | |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 406 | 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] | 407 | assert(2 <= n_args && n_args <= 4); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 408 | assert(MP_OBJ_IS_STR(args[0])); |
| 409 | assert(MP_OBJ_IS_STR(args[1])); |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 410 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 411 | GET_STR_DATA_LEN(args[0], haystack, haystack_len); |
| 412 | GET_STR_DATA_LEN(args[1], needle, needle_len); |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 413 | |
xbe | c553888 | 2014-03-16 17:58:35 -0700 | [diff] [blame] | 414 | machine_uint_t start = 0; |
| 415 | machine_uint_t end = haystack_len; |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 416 | if (n_args >= 3 && args[2] != mp_const_none) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 417 | 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] | 418 | } |
| 419 | if (n_args >= 4 && args[3] != mp_const_none) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 420 | 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] | 421 | } |
| 422 | |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 423 | 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] | 424 | if (p == NULL) { |
| 425 | // not found |
| 426 | return MP_OBJ_NEW_SMALL_INT(-1); |
| 427 | } else { |
| 428 | // found |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 429 | return MP_OBJ_NEW_SMALL_INT(p - haystack); |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 430 | } |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 431 | } |
| 432 | |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 433 | STATIC mp_obj_t str_find(uint n_args, const mp_obj_t *args) { |
| 434 | return str_finder(n_args, args, 1); |
| 435 | } |
| 436 | |
| 437 | STATIC mp_obj_t str_rfind(uint n_args, const mp_obj_t *args) { |
| 438 | return str_finder(n_args, args, -1); |
| 439 | } |
| 440 | |
Paul Sokolovsky | 1eacefe | 2014-01-23 01:20:40 +0200 | [diff] [blame] | 441 | // TODO: (Much) more variety in args |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 442 | 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] | 443 | GET_STR_DATA_LEN(self_in, str, str_len); |
| 444 | GET_STR_DATA_LEN(arg, prefix, prefix_len); |
| 445 | if (prefix_len > str_len) { |
| 446 | return mp_const_false; |
| 447 | } |
| 448 | return MP_BOOL(memcmp(str, prefix, prefix_len) == 0); |
| 449 | } |
| 450 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 451 | 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] | 452 | assert(1 <= n_args && n_args <= 2); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 453 | assert(MP_OBJ_IS_STR(args[0])); |
| 454 | |
| 455 | const byte *chars_to_del; |
| 456 | uint chars_to_del_len; |
| 457 | static const byte whitespace[] = " \t\n\r\v\f"; |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 458 | |
| 459 | if (n_args == 1) { |
| 460 | chars_to_del = whitespace; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 461 | chars_to_del_len = sizeof(whitespace); |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 462 | } else { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 463 | assert(MP_OBJ_IS_STR(args[1])); |
| 464 | GET_STR_DATA_LEN(args[1], s, l); |
| 465 | chars_to_del = s; |
| 466 | chars_to_del_len = l; |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 467 | } |
| 468 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 469 | GET_STR_DATA_LEN(args[0], orig_str, orig_str_len); |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 470 | |
xbe | c553888 | 2014-03-16 17:58:35 -0700 | [diff] [blame] | 471 | machine_uint_t first_good_char_pos = 0; |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 472 | bool first_good_char_pos_set = false; |
xbe | c553888 | 2014-03-16 17:58:35 -0700 | [diff] [blame] | 473 | machine_uint_t last_good_char_pos = 0; |
| 474 | for (machine_uint_t i = 0; i < orig_str_len; i++) { |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 475 | 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] | 476 | last_good_char_pos = i; |
| 477 | if (!first_good_char_pos_set) { |
| 478 | first_good_char_pos = i; |
| 479 | first_good_char_pos_set = true; |
| 480 | } |
| 481 | } |
| 482 | } |
| 483 | |
| 484 | if (first_good_char_pos == 0 && last_good_char_pos == 0) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 485 | // string is all whitespace, return '' |
| 486 | return MP_OBJ_NEW_QSTR(MP_QSTR_); |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 487 | } |
| 488 | |
| 489 | assert(last_good_char_pos >= first_good_char_pos); |
| 490 | //+1 to accomodate the last character |
xbe | c553888 | 2014-03-16 17:58:35 -0700 | [diff] [blame] | 491 | 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] | 492 | 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] | 493 | } |
| 494 | |
Damien George | a11ceca | 2014-01-19 16:02:09 +0000 | [diff] [blame] | 495 | 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] | 496 | assert(MP_OBJ_IS_STR(args[0])); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 497 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 498 | GET_STR_DATA_LEN(args[0], str, len); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 499 | int arg_i = 1; |
| 500 | vstr_t *vstr = vstr_new(); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 501 | for (const byte *top = str + len; str < top; str++) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 502 | if (*str == '{') { |
| 503 | str++; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 504 | if (str < top && *str == '{') { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 505 | vstr_add_char(vstr, '{'); |
Paul Sokolovsky | f2b796e | 2014-01-15 22:45:20 +0200 | [diff] [blame] | 506 | } else { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 507 | while (str < top && *str != '}') str++; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 508 | if (arg_i >= n_args) { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 509 | nlr_jump(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range")); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 510 | } |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 511 | // TODO: may be PRINT_REPR depending on formatting code |
Damien George | 4899ff9 | 2014-01-15 22:39:03 +0000 | [diff] [blame] | 512 | mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, args[arg_i], PRINT_STR); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 513 | arg_i++; |
| 514 | } |
| 515 | } else { |
| 516 | vstr_add_char(vstr, *str); |
| 517 | } |
| 518 | } |
| 519 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 520 | mp_obj_t s = mp_obj_new_str((byte*)vstr->buf, vstr->len, false); |
| 521 | vstr_free(vstr); |
| 522 | return s; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 523 | } |
| 524 | |
Paul Sokolovsky | 4db727a | 2014-03-31 21:18:28 +0300 | [diff] [blame] | 525 | STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, uint n_args, const mp_obj_t *args) { |
| 526 | assert(MP_OBJ_IS_STR(pattern)); |
| 527 | |
| 528 | GET_STR_DATA_LEN(pattern, str, len); |
| 529 | int arg_i = 0; |
| 530 | vstr_t *vstr = vstr_new(); |
| 531 | for (const byte *top = str + len; str < top; str++) { |
| 532 | if (*str == '%') { |
| 533 | if (++str >= top) { |
| 534 | break; |
| 535 | } |
| 536 | if (*str == '%') { |
| 537 | vstr_add_char(vstr, '%'); |
| 538 | } else { |
| 539 | if (arg_i >= n_args) { |
| 540 | nlr_jump(mp_obj_new_exception_msg(&mp_type_TypeError, "not enough arguments for format string")); |
| 541 | } |
| 542 | switch (*str) { |
| 543 | case 's': |
| 544 | mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, args[arg_i], PRINT_STR); |
| 545 | break; |
| 546 | case 'r': |
| 547 | mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, args[arg_i], PRINT_REPR); |
| 548 | break; |
| 549 | } |
| 550 | arg_i++; |
| 551 | } |
| 552 | } else { |
| 553 | vstr_add_char(vstr, *str); |
| 554 | } |
| 555 | } |
| 556 | |
| 557 | if (arg_i != n_args) { |
| 558 | nlr_jump(mp_obj_new_exception_msg(&mp_type_TypeError, "not all arguments converted during string formatting")); |
| 559 | } |
| 560 | |
| 561 | mp_obj_t s = mp_obj_new_str((byte*)vstr->buf, vstr->len, false); |
| 562 | vstr_free(vstr); |
| 563 | return s; |
| 564 | } |
| 565 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 566 | 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] | 567 | assert(MP_OBJ_IS_STR(args[0])); |
| 568 | assert(MP_OBJ_IS_STR(args[1])); |
| 569 | assert(MP_OBJ_IS_STR(args[2])); |
| 570 | |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 571 | machine_int_t max_rep = 0; |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 572 | if (n_args == 4) { |
Paul Sokolovsky | 4e24608 | 2014-02-11 15:29:55 +0200 | [diff] [blame] | 573 | assert(MP_OBJ_IS_SMALL_INT(args[3])); |
| 574 | max_rep = MP_OBJ_SMALL_INT_VALUE(args[3]); |
| 575 | if (max_rep == 0) { |
| 576 | return args[0]; |
| 577 | } else if (max_rep < 0) { |
| 578 | max_rep = 0; |
| 579 | } |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 580 | } |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 581 | |
| 582 | // 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] | 583 | |
| 584 | GET_STR_DATA_LEN(args[0], str, str_len); |
| 585 | GET_STR_DATA_LEN(args[1], old, old_len); |
| 586 | GET_STR_DATA_LEN(args[2], new, new_len); |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 587 | |
| 588 | // 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] | 589 | if (old_len > str_len) { |
Paul Sokolovsky | 4e24608 | 2014-02-11 15:29:55 +0200 | [diff] [blame] | 590 | return args[0]; |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 591 | } |
| 592 | |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 593 | // data for the replaced string |
| 594 | byte *data = NULL; |
| 595 | mp_obj_t replaced_str = MP_OBJ_NULL; |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 596 | |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 597 | // do 2 passes over the string: |
| 598 | // first pass computes the required length of the replaced string |
| 599 | // second pass does the replacements |
| 600 | for (;;) { |
| 601 | machine_uint_t replaced_str_index = 0; |
| 602 | machine_uint_t num_replacements_done = 0; |
| 603 | const byte *old_occurrence; |
| 604 | const byte *offset_ptr = str; |
| 605 | machine_uint_t offset_num = 0; |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 606 | while ((old_occurrence = find_subbytes(offset_ptr, str_len - offset_num, old, old_len, 1)) != NULL) { |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 607 | // copy from just after end of last occurrence of to-be-replaced string to right before start of next occurrence |
| 608 | if (data != NULL) { |
| 609 | memcpy(data + replaced_str_index, offset_ptr, old_occurrence - offset_ptr); |
| 610 | } |
| 611 | replaced_str_index += old_occurrence - offset_ptr; |
| 612 | // copy the replacement string |
| 613 | if (data != NULL) { |
| 614 | memcpy(data + replaced_str_index, new, new_len); |
| 615 | } |
| 616 | replaced_str_index += new_len; |
| 617 | offset_ptr = old_occurrence + old_len; |
| 618 | offset_num = offset_ptr - str; |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 619 | |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 620 | num_replacements_done++; |
| 621 | if (max_rep != 0 && num_replacements_done == max_rep){ |
| 622 | break; |
| 623 | } |
| 624 | } |
| 625 | |
| 626 | // copy from just after end of last occurrence of to-be-replaced string to end of old string |
| 627 | if (data != NULL) { |
| 628 | memcpy(data + replaced_str_index, offset_ptr, str_len - offset_num); |
| 629 | } |
| 630 | replaced_str_index += str_len - offset_num; |
| 631 | |
| 632 | if (data == NULL) { |
| 633 | // first pass |
| 634 | if (num_replacements_done == 0) { |
| 635 | // no substr found, return original string |
| 636 | return args[0]; |
| 637 | } else { |
| 638 | // substr found, allocate new string |
| 639 | replaced_str = mp_obj_str_builder_start(mp_obj_get_type(args[0]), replaced_str_index, &data); |
| 640 | } |
| 641 | } else { |
| 642 | // second pass, we are done |
| 643 | break; |
| 644 | } |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 645 | } |
Damien George | 94f6830 | 2014-01-31 23:45:12 +0000 | [diff] [blame] | 646 | |
xbe | 480c15a | 2014-01-30 22:17:30 -0800 | [diff] [blame] | 647 | return mp_obj_str_builder_end(replaced_str); |
| 648 | } |
| 649 | |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 650 | STATIC mp_obj_t str_count(uint n_args, const mp_obj_t *args) { |
| 651 | assert(2 <= n_args && n_args <= 4); |
| 652 | assert(MP_OBJ_IS_STR(args[0])); |
| 653 | assert(MP_OBJ_IS_STR(args[1])); |
| 654 | |
| 655 | GET_STR_DATA_LEN(args[0], haystack, haystack_len); |
| 656 | GET_STR_DATA_LEN(args[1], needle, needle_len); |
| 657 | |
Damien George | 536dde2 | 2014-03-13 22:07:55 +0000 | [diff] [blame] | 658 | machine_uint_t start = 0; |
| 659 | machine_uint_t end = haystack_len; |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 660 | if (n_args >= 3 && args[2] != mp_const_none) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 661 | start = mp_get_index(&mp_type_str, haystack_len, args[2], true); |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 662 | } |
| 663 | if (n_args >= 4 && args[3] != mp_const_none) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 664 | end = mp_get_index(&mp_type_str, haystack_len, args[3], true); |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 665 | } |
| 666 | |
Damien George | 536dde2 | 2014-03-13 22:07:55 +0000 | [diff] [blame] | 667 | // if needle_len is zero then we count each gap between characters as an occurrence |
| 668 | if (needle_len == 0) { |
| 669 | return MP_OBJ_NEW_SMALL_INT(end - start + 1); |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 670 | } |
| 671 | |
Damien George | 536dde2 | 2014-03-13 22:07:55 +0000 | [diff] [blame] | 672 | // count the occurrences |
| 673 | machine_int_t num_occurrences = 0; |
xbe | c5d70ba | 2014-03-13 00:29:15 -0700 | [diff] [blame] | 674 | for (machine_uint_t haystack_index = start; haystack_index + needle_len <= end; haystack_index++) { |
| 675 | if (memcmp(&haystack[haystack_index], needle, needle_len) == 0) { |
| 676 | num_occurrences++; |
| 677 | haystack_index += needle_len - 1; |
| 678 | } |
xbe | 9e1e8cd | 2014-03-12 22:57:16 -0700 | [diff] [blame] | 679 | } |
| 680 | |
| 681 | return MP_OBJ_NEW_SMALL_INT(num_occurrences); |
| 682 | } |
| 683 | |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 684 | 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] | 685 | assert(MP_OBJ_IS_STR(self_in)); |
| 686 | if (!MP_OBJ_IS_STR(arg)) { |
| 687 | nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, |
| 688 | "Can't convert '%s' object to str implicitly", mp_obj_get_type_str(arg))); |
| 689 | } |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 690 | |
xbe | 613a8e3 | 2014-03-18 00:06:29 -0700 | [diff] [blame] | 691 | GET_STR_DATA_LEN(self_in, str, str_len); |
| 692 | GET_STR_DATA_LEN(arg, sep, sep_len); |
| 693 | |
| 694 | if (sep_len == 0) { |
| 695 | nlr_jump(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator")); |
| 696 | } |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 697 | |
| 698 | mp_obj_t result[] = {MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_)}; |
| 699 | |
| 700 | if (direction > 0) { |
| 701 | result[0] = self_in; |
xbe | 0a6894c | 2014-03-21 01:12:26 -0700 | [diff] [blame] | 702 | } else { |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 703 | result[2] = self_in; |
xbe | 0a6894c | 2014-03-21 01:12:26 -0700 | [diff] [blame] | 704 | } |
xbe | 613a8e3 | 2014-03-18 00:06:29 -0700 | [diff] [blame] | 705 | |
xbe | 17a5a83 | 2014-03-23 23:31:58 -0700 | [diff] [blame] | 706 | const byte *position_ptr = find_subbytes(str, str_len, sep, sep_len, direction); |
| 707 | if (position_ptr != NULL) { |
| 708 | machine_uint_t position = position_ptr - str; |
| 709 | result[0] = mp_obj_new_str(str, position, false); |
| 710 | result[1] = arg; |
| 711 | 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] | 712 | } |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 713 | |
xbe | 0a6894c | 2014-03-21 01:12:26 -0700 | [diff] [blame] | 714 | return mp_obj_new_tuple(3, result); |
xbe | 613a8e3 | 2014-03-18 00:06:29 -0700 | [diff] [blame] | 715 | } |
| 716 | |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 717 | STATIC mp_obj_t str_partition(mp_obj_t self_in, mp_obj_t arg) { |
| 718 | return str_partitioner(self_in, arg, 1); |
xbe | 0a6894c | 2014-03-21 01:12:26 -0700 | [diff] [blame] | 719 | } |
xbe | 4504ea8 | 2014-03-19 00:46:14 -0700 | [diff] [blame] | 720 | |
Damien George | b035db3 | 2014-03-21 20:39:40 +0000 | [diff] [blame] | 721 | STATIC mp_obj_t str_rpartition(mp_obj_t self_in, mp_obj_t arg) { |
| 722 | return str_partitioner(self_in, arg, -1); |
xbe | 4504ea8 | 2014-03-19 00:46:14 -0700 | [diff] [blame] | 723 | } |
| 724 | |
Damien George | 2da9830 | 2014-03-09 19:58:18 +0000 | [diff] [blame] | 725 | STATIC machine_int_t str_get_buffer(mp_obj_t self_in, buffer_info_t *bufinfo, int flags) { |
| 726 | if (flags == BUFFER_READ) { |
| 727 | GET_STR_DATA_LEN(self_in, str_data, str_len); |
| 728 | bufinfo->buf = (void*)str_data; |
| 729 | bufinfo->len = str_len; |
| 730 | return 0; |
| 731 | } else { |
| 732 | // can't write to a string |
| 733 | bufinfo->buf = NULL; |
| 734 | bufinfo->len = 0; |
| 735 | return 1; |
| 736 | } |
| 737 | } |
| 738 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 739 | 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] | 740 | 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] | 741 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join); |
| 742 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, str_split); |
| 743 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_startswith_obj, str_startswith); |
| 744 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip); |
| 745 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(str_format_obj, 1, str_format); |
| 746 | 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] | 747 | 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] | 748 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition); |
xbe | 4504ea8 | 2014-03-19 00:46:14 -0700 | [diff] [blame] | 749 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_rpartition_obj, str_rpartition); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 750 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 751 | STATIC const mp_map_elem_t str_locals_dict_table[] = { |
| 752 | { MP_OBJ_NEW_QSTR(MP_QSTR_find), (mp_obj_t)&str_find_obj }, |
| 753 | { MP_OBJ_NEW_QSTR(MP_QSTR_rfind), (mp_obj_t)&str_rfind_obj }, |
| 754 | { MP_OBJ_NEW_QSTR(MP_QSTR_join), (mp_obj_t)&str_join_obj }, |
| 755 | { MP_OBJ_NEW_QSTR(MP_QSTR_split), (mp_obj_t)&str_split_obj }, |
| 756 | { MP_OBJ_NEW_QSTR(MP_QSTR_startswith), (mp_obj_t)&str_startswith_obj }, |
| 757 | { MP_OBJ_NEW_QSTR(MP_QSTR_strip), (mp_obj_t)&str_strip_obj }, |
| 758 | { MP_OBJ_NEW_QSTR(MP_QSTR_format), (mp_obj_t)&str_format_obj }, |
| 759 | { MP_OBJ_NEW_QSTR(MP_QSTR_replace), (mp_obj_t)&str_replace_obj }, |
| 760 | { MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&str_count_obj }, |
| 761 | { MP_OBJ_NEW_QSTR(MP_QSTR_partition), (mp_obj_t)&str_partition_obj }, |
| 762 | { 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] | 763 | }; |
Damien George | 97209d3 | 2014-01-07 15:58:30 +0000 | [diff] [blame] | 764 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 765 | STATIC MP_DEFINE_CONST_DICT(str_locals_dict, str_locals_dict_table); |
| 766 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 767 | const mp_obj_type_t mp_type_str = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 768 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 769 | .name = MP_QSTR_str, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 770 | .print = str_print, |
Paul Sokolovsky | be020c2 | 2014-03-21 11:39:01 +0200 | [diff] [blame] | 771 | .make_new = str_make_new, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 772 | .binary_op = str_binary_op, |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 773 | .getiter = mp_obj_new_str_iterator, |
Damien George | 2da9830 | 2014-03-09 19:58:18 +0000 | [diff] [blame] | 774 | .buffer_p = { .get_buffer = str_get_buffer }, |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 775 | .locals_dict = (mp_obj_t)&str_locals_dict, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 776 | }; |
| 777 | |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 778 | // Reuses most of methods from str |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 779 | const mp_obj_type_t mp_type_bytes = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 780 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 781 | .name = MP_QSTR_bytes, |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 782 | .print = str_print, |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 783 | .make_new = bytes_make_new, |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 784 | .binary_op = str_binary_op, |
| 785 | .getiter = mp_obj_new_bytes_iterator, |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 786 | .locals_dict = (mp_obj_t)&str_locals_dict, |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 787 | }; |
| 788 | |
Paul Sokolovsky | 1ecea7c | 2014-03-21 23:46:59 +0200 | [diff] [blame] | 789 | // the zero-length bytes |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 790 | 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] | 791 | const mp_obj_t mp_const_empty_bytes = (mp_obj_t)&empty_bytes_obj; |
| 792 | |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 793 | 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] | 794 | mp_obj_str_t *o = m_new_obj(mp_obj_str_t); |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 795 | o->base.type = type; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 796 | o->len = len; |
Paul Sokolovsky | 5972b4c | 2014-03-20 16:47:44 +0200 | [diff] [blame] | 797 | byte *p = m_new(byte, len + 1); |
| 798 | o->data = p; |
| 799 | *data = p; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 800 | return o; |
| 801 | } |
| 802 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 803 | 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] | 804 | mp_obj_str_t *o = o_in; |
| 805 | o->hash = qstr_compute_hash(o->data, o->len); |
Paul Sokolovsky | 5972b4c | 2014-03-20 16:47:44 +0200 | [diff] [blame] | 806 | byte *p = (byte*)o->data; |
| 807 | 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] | 808 | return o; |
| 809 | } |
| 810 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 811 | 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] | 812 | mp_obj_str_t *o = m_new_obj(mp_obj_str_t); |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 813 | o->base.type = type; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 814 | o->len = len; |
Paul Sokolovsky | 5972b4c | 2014-03-20 16:47:44 +0200 | [diff] [blame] | 815 | if (data) { |
| 816 | o->hash = qstr_compute_hash(data, len); |
| 817 | byte *p = m_new(byte, len + 1); |
| 818 | o->data = p; |
| 819 | memcpy(p, data, len * sizeof(byte)); |
| 820 | p[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings |
| 821 | } |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 822 | return o; |
| 823 | } |
| 824 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 825 | mp_obj_t mp_obj_new_str(const byte* data, uint len, bool make_qstr_if_not_already) { |
| 826 | qstr q = qstr_find_strn(data, len); |
| 827 | if (q != MP_QSTR_NULL) { |
| 828 | // qstr with this data already exists |
| 829 | return MP_OBJ_NEW_QSTR(q); |
| 830 | } else if (make_qstr_if_not_already) { |
| 831 | // no existing qstr, make a new one |
| 832 | return MP_OBJ_NEW_QSTR(qstr_from_strn((const char*)data, len)); |
| 833 | } else { |
| 834 | // no existing qstr, don't make one |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 835 | return str_new(&mp_type_str, data, len); |
Paul Sokolovsky | 8965a5e | 2014-01-20 23:33:19 +0200 | [diff] [blame] | 836 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 837 | } |
| 838 | |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 839 | mp_obj_t mp_obj_new_bytes(const byte* data, uint len) { |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 840 | return str_new(&mp_type_bytes, data, len); |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 841 | } |
| 842 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 843 | bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) { |
| 844 | if (MP_OBJ_IS_QSTR(s1) && MP_OBJ_IS_QSTR(s2)) { |
| 845 | return s1 == s2; |
| 846 | } else { |
| 847 | GET_STR_HASH(s1, h1); |
| 848 | GET_STR_HASH(s2, h2); |
| 849 | if (h1 != h2) { |
| 850 | return false; |
| 851 | } |
| 852 | GET_STR_DATA_LEN(s1, d1, l1); |
| 853 | GET_STR_DATA_LEN(s2, d2, l2); |
| 854 | if (l1 != l2) { |
| 855 | return false; |
| 856 | } |
Damien George | 1e708fe | 2014-01-23 18:27:51 +0000 | [diff] [blame] | 857 | return memcmp(d1, d2, l1) == 0; |
Paul Sokolovsky | 8965a5e | 2014-01-20 23:33:19 +0200 | [diff] [blame] | 858 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 859 | } |
| 860 | |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 861 | void bad_implicit_conversion(mp_obj_t self_in) __attribute__((noreturn)); |
| 862 | void bad_implicit_conversion(mp_obj_t self_in) { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 863 | nlr_jump(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] | 864 | } |
| 865 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 866 | uint mp_obj_str_get_hash(mp_obj_t self_in) { |
| 867 | if (MP_OBJ_IS_STR(self_in)) { |
| 868 | GET_STR_HASH(self_in, h); |
| 869 | return h; |
| 870 | } else { |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 871 | bad_implicit_conversion(self_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 872 | } |
| 873 | } |
| 874 | |
| 875 | uint mp_obj_str_get_len(mp_obj_t self_in) { |
| 876 | if (MP_OBJ_IS_STR(self_in)) { |
| 877 | GET_STR_LEN(self_in, l); |
| 878 | return l; |
| 879 | } else { |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 880 | bad_implicit_conversion(self_in); |
| 881 | } |
| 882 | } |
| 883 | |
| 884 | // use this if you will anyway convert the string to a qstr |
| 885 | // will be more efficient for the case where it's already a qstr |
| 886 | qstr mp_obj_str_get_qstr(mp_obj_t self_in) { |
| 887 | if (MP_OBJ_IS_QSTR(self_in)) { |
| 888 | return MP_OBJ_QSTR_VALUE(self_in); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 889 | } else if (MP_OBJ_IS_TYPE(self_in, &mp_type_str)) { |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 890 | mp_obj_str_t *self = self_in; |
| 891 | return qstr_from_strn((char*)self->data, self->len); |
| 892 | } else { |
| 893 | bad_implicit_conversion(self_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 894 | } |
| 895 | } |
| 896 | |
| 897 | // only use this function if you need the str data to be zero terminated |
| 898 | // at the moment all strings are zero terminated to help with C ASCIIZ compatibility |
| 899 | const char *mp_obj_str_get_str(mp_obj_t self_in) { |
| 900 | if (MP_OBJ_IS_STR(self_in)) { |
| 901 | GET_STR_DATA_LEN(self_in, s, l); |
| 902 | (void)l; // len unused |
| 903 | return (const char*)s; |
| 904 | } else { |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 905 | bad_implicit_conversion(self_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 906 | } |
| 907 | } |
| 908 | |
Damien George | 698ec21 | 2014-02-08 18:17:23 +0000 | [diff] [blame] | 909 | 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] | 910 | if (MP_OBJ_IS_STR(self_in)) { |
| 911 | GET_STR_DATA_LEN(self_in, s, l); |
| 912 | *len = l; |
Damien George | 698ec21 | 2014-02-08 18:17:23 +0000 | [diff] [blame] | 913 | return (const char*)s; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 914 | } else { |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 915 | bad_implicit_conversion(self_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 916 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 917 | } |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 918 | |
| 919 | /******************************************************************************/ |
| 920 | /* str iterator */ |
| 921 | |
| 922 | typedef struct _mp_obj_str_it_t { |
| 923 | mp_obj_base_t base; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 924 | mp_obj_t str; |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 925 | machine_uint_t cur; |
| 926 | } mp_obj_str_it_t; |
| 927 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 928 | STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) { |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 929 | mp_obj_str_it_t *self = self_in; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 930 | GET_STR_DATA_LEN(self->str, str, len); |
| 931 | if (self->cur < len) { |
| 932 | 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] | 933 | self->cur += 1; |
| 934 | return o_out; |
| 935 | } else { |
Damien George | 66eaf84 | 2014-03-26 19:27:58 +0000 | [diff] [blame] | 936 | return MP_OBJ_NULL; |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 937 | } |
| 938 | } |
| 939 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 940 | STATIC const mp_obj_type_t mp_type_str_it = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 941 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 942 | .name = MP_QSTR_iterator, |
Paul Sokolovsky | f7eaf60 | 2014-03-30 22:00:12 +0300 | [diff] [blame] | 943 | .getiter = mp_identity, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 944 | .iternext = str_it_iternext, |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 945 | }; |
| 946 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 947 | STATIC mp_obj_t bytes_it_iternext(mp_obj_t self_in) { |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 948 | mp_obj_str_it_t *self = self_in; |
| 949 | GET_STR_DATA_LEN(self->str, str, len); |
| 950 | if (self->cur < len) { |
Damien George | 7c9c667 | 2014-01-25 00:17:36 +0000 | [diff] [blame] | 951 | 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] | 952 | self->cur += 1; |
| 953 | return o_out; |
| 954 | } else { |
Damien George | 66eaf84 | 2014-03-26 19:27:58 +0000 | [diff] [blame] | 955 | return MP_OBJ_NULL; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 956 | } |
| 957 | } |
| 958 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 959 | STATIC const mp_obj_type_t mp_type_bytes_it = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 960 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 961 | .name = MP_QSTR_iterator, |
Paul Sokolovsky | f7eaf60 | 2014-03-30 22:00:12 +0300 | [diff] [blame] | 962 | .getiter = mp_identity, |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 963 | .iternext = bytes_it_iternext, |
| 964 | }; |
| 965 | |
| 966 | mp_obj_t mp_obj_new_str_iterator(mp_obj_t str) { |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 967 | 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] | 968 | o->base.type = &mp_type_str_it; |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 969 | o->str = str; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 970 | o->cur = 0; |
| 971 | return o; |
| 972 | } |
| 973 | |
| 974 | mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str) { |
| 975 | 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] | 976 | o->base.type = &mp_type_bytes_it; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 977 | o->str = str; |
| 978 | o->cur = 0; |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 979 | return o; |
| 980 | } |