Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 1 | #include <stdlib.h> |
| 2 | #include <stdint.h> |
| 3 | #include <stdarg.h> |
| 4 | #include <string.h> |
| 5 | #include <assert.h> |
| 6 | |
| 7 | #include "nlr.h" |
| 8 | #include "misc.h" |
| 9 | #include "mpconfig.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 10 | #include "qstr.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 11 | #include "obj.h" |
| 12 | #include "runtime0.h" |
| 13 | #include "runtime.h" |
| 14 | |
| 15 | typedef struct _mp_obj_str_t { |
| 16 | mp_obj_base_t base; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 17 | machine_uint_t hash : 16; // XXX here we assume the hash size is 16 bits (it is at the moment; see qstr.c) |
| 18 | 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 |
| 19 | byte data[]; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 20 | } mp_obj_str_t; |
| 21 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 22 | // use this macro to extract the string hash |
| 23 | #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; } |
| 24 | |
| 25 | // use this macro to extract the string length |
| 26 | #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; } |
| 27 | |
| 28 | // use this macro to extract the string data and length |
| 29 | #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; } |
| 30 | |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 31 | static mp_obj_t mp_obj_new_str_iterator(mp_obj_t str); |
| 32 | static mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str); |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 33 | |
| 34 | /******************************************************************************/ |
| 35 | /* str */ |
| 36 | |
Paul Sokolovsky | 0b7e29c | 2014-01-28 03:40:06 +0200 | [diff] [blame^] | 37 | void mp_str_print_quoted(void (*print)(void *env, const char *fmt, ...), void *env, const byte *str_data, uint str_len) { |
| 38 | // this escapes characters, but it will be very slow to print (calling print many times) |
| 39 | bool has_single_quote = false; |
| 40 | bool has_double_quote = false; |
| 41 | for (const byte *s = str_data, *top = str_data + str_len; (!has_single_quote || !has_double_quote) && s < top; s++) { |
| 42 | if (*s == '\'') { |
| 43 | has_single_quote = true; |
| 44 | } else if (*s == '"') { |
| 45 | has_double_quote = true; |
| 46 | } |
| 47 | } |
| 48 | int quote_char = '\''; |
| 49 | if (has_single_quote && !has_double_quote) { |
| 50 | quote_char = '"'; |
| 51 | } |
| 52 | print(env, "%c", quote_char); |
| 53 | for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) { |
| 54 | if (*s == quote_char) { |
| 55 | print(env, "\\%c", quote_char); |
| 56 | } else if (*s == '\\') { |
| 57 | print(env, "\\\\"); |
| 58 | } else if (32 <= *s && *s <= 126) { |
| 59 | print(env, "%c", *s); |
| 60 | } else if (*s == '\n') { |
| 61 | print(env, "\\n"); |
| 62 | // TODO add more escape codes here if we want to match CPython |
| 63 | } else { |
| 64 | print(env, "\\x%02x", *s); |
| 65 | } |
| 66 | } |
| 67 | print(env, "%c", quote_char); |
| 68 | } |
| 69 | |
| 70 | 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] | 71 | GET_STR_DATA_LEN(self_in, str_data, str_len); |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 72 | bool is_bytes = MP_OBJ_IS_TYPE(self_in, &bytes_type); |
| 73 | if (kind == PRINT_STR && !is_bytes) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 74 | print(env, "%.*s", str_len, str_data); |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 75 | } else { |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 76 | if (is_bytes) { |
| 77 | print(env, "b"); |
| 78 | } |
Paul Sokolovsky | 0b7e29c | 2014-01-28 03:40:06 +0200 | [diff] [blame^] | 79 | mp_str_print_quoted(print, env, str_data, str_len); |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 80 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 81 | } |
| 82 | |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 83 | // like strstr but with specified length and allows \0 bytes |
| 84 | // TODO replace with something more efficient/standard |
| 85 | static const byte *find_subbytes(const byte *haystack, uint hlen, const byte *needle, uint nlen) { |
| 86 | if (hlen >= nlen) { |
| 87 | for (uint i = 0; i <= hlen - nlen; i++) { |
| 88 | bool found = true; |
| 89 | for (uint j = 0; j < nlen; j++) { |
| 90 | if (haystack[i + j] != needle[j]) { |
| 91 | found = false; |
| 92 | break; |
| 93 | } |
| 94 | } |
| 95 | if (found) { |
| 96 | return haystack + i; |
| 97 | } |
| 98 | } |
| 99 | } |
| 100 | return NULL; |
| 101 | } |
| 102 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 103 | 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] | 104 | GET_STR_DATA_LEN(lhs_in, lhs_data, lhs_len); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 105 | switch (op) { |
| 106 | case RT_BINARY_OP_SUBSCR: |
Paul Sokolovsky | 31ba60f | 2014-01-03 02:51:16 +0200 | [diff] [blame] | 107 | // TODO: need predicate to check for int-like type (bools are such for example) |
| 108 | // ["no", "yes"][1 == 2] is common idiom |
| 109 | if (MP_OBJ_IS_SMALL_INT(rhs_in)) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 110 | uint index = mp_get_index(mp_obj_get_type(lhs_in), lhs_len, rhs_in); |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 111 | if (MP_OBJ_IS_TYPE(lhs_in, &bytes_type)) { |
Damien George | 7c9c667 | 2014-01-25 00:17:36 +0000 | [diff] [blame] | 112 | 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] | 113 | } else { |
| 114 | return mp_obj_new_str(lhs_data + index, 1, true); |
| 115 | } |
Paul Sokolovsky | e606cb6 | 2014-01-04 01:34:23 +0200 | [diff] [blame] | 116 | #if MICROPY_ENABLE_SLICE |
Paul Sokolovsky | 31ba60f | 2014-01-03 02:51:16 +0200 | [diff] [blame] | 117 | } else if (MP_OBJ_IS_TYPE(rhs_in, &slice_type)) { |
Damien George | c8d1384 | 2014-01-04 01:06:10 +0000 | [diff] [blame] | 118 | machine_int_t start, stop, step; |
Paul Sokolovsky | 31ba60f | 2014-01-03 02:51:16 +0200 | [diff] [blame] | 119 | mp_obj_slice_get(rhs_in, &start, &stop, &step); |
| 120 | assert(step == 1); |
Paul Sokolovsky | decad08 | 2014-01-03 23:36:56 +0200 | [diff] [blame] | 121 | if (start < 0) { |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 122 | start = lhs_len + start; |
Paul Sokolovsky | 6ee1e38 | 2014-01-04 03:47:34 +0200 | [diff] [blame] | 123 | if (start < 0) { |
| 124 | start = 0; |
| 125 | } |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 126 | } else if (start > lhs_len) { |
| 127 | start = lhs_len; |
Paul Sokolovsky | decad08 | 2014-01-03 23:36:56 +0200 | [diff] [blame] | 128 | } |
| 129 | if (stop <= 0) { |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 130 | stop = lhs_len + stop; |
Paul Sokolovsky | 6ee1e38 | 2014-01-04 03:47:34 +0200 | [diff] [blame] | 131 | // CPython returns empty string in such case |
| 132 | if (stop < 0) { |
| 133 | stop = start; |
| 134 | } |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 135 | } else if (stop > lhs_len) { |
| 136 | stop = lhs_len; |
Paul Sokolovsky | decad08 | 2014-01-03 23:36:56 +0200 | [diff] [blame] | 137 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 138 | return mp_obj_new_str(lhs_data + start, stop - start, false); |
Paul Sokolovsky | e606cb6 | 2014-01-04 01:34:23 +0200 | [diff] [blame] | 139 | #endif |
Paul Sokolovsky | 31ba60f | 2014-01-03 02:51:16 +0200 | [diff] [blame] | 140 | } else { |
Paul Sokolovsky | f8b9d3c | 2014-01-04 01:38:26 +0200 | [diff] [blame] | 141 | // Message doesn't match CPython, but we don't have so much bytes as they |
| 142 | // to spend them on verbose wording |
Damien George | eb7bfcb | 2014-01-04 15:57:35 +0000 | [diff] [blame] | 143 | nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError, "index must be int")); |
Paul Sokolovsky | 31ba60f | 2014-01-03 02:51:16 +0200 | [diff] [blame] | 144 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 145 | |
| 146 | case RT_BINARY_OP_ADD: |
| 147 | case RT_BINARY_OP_INPLACE_ADD: |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 148 | if (MP_OBJ_IS_STR(rhs_in)) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 149 | // add 2 strings |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 150 | |
| 151 | GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len); |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 152 | int alloc_len = lhs_len + rhs_len; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 153 | |
| 154 | /* code for making qstr |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 155 | byte *q_ptr; |
| 156 | byte *val = qstr_build_start(alloc_len, &q_ptr); |
| 157 | memcpy(val, lhs_data, lhs_len); |
| 158 | memcpy(val + lhs_len, rhs_data, rhs_len); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 159 | return MP_OBJ_NEW_QSTR(qstr_build_end(q_ptr)); |
| 160 | */ |
| 161 | |
| 162 | // code for non-qstr |
| 163 | byte *data; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 164 | 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] | 165 | memcpy(data, lhs_data, lhs_len); |
| 166 | memcpy(data + lhs_len, rhs_data, rhs_len); |
| 167 | return mp_obj_str_builder_end(s); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 168 | } |
| 169 | break; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 170 | |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 171 | case RT_COMPARE_OP_IN: |
| 172 | case RT_COMPARE_OP_NOT_IN: |
| 173 | /* NOTE `a in b` is `b.__contains__(a)` */ |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 174 | if (MP_OBJ_IS_STR(rhs_in)) { |
| 175 | GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len); |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 176 | return MP_BOOL((op == RT_COMPARE_OP_IN) ^ (find_subbytes(lhs_data, lhs_len, rhs_data, rhs_len) == NULL)); |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 177 | } |
| 178 | break; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 179 | |
Paul Sokolovsky | 545591a | 2014-01-21 00:27:33 +0200 | [diff] [blame] | 180 | case RT_BINARY_OP_MULTIPLY: |
| 181 | { |
| 182 | if (!MP_OBJ_IS_SMALL_INT(rhs_in)) { |
| 183 | return NULL; |
| 184 | } |
| 185 | int n = MP_OBJ_SMALL_INT_VALUE(rhs_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 186 | byte *data; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 187 | 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] | 188 | mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, data); |
| 189 | return mp_obj_str_builder_end(s); |
Paul Sokolovsky | 545591a | 2014-01-21 00:27:33 +0200 | [diff] [blame] | 190 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 191 | } |
| 192 | |
| 193 | return MP_OBJ_NULL; // op not supported |
| 194 | } |
| 195 | |
| 196 | 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] | 197 | assert(MP_OBJ_IS_STR(self_in)); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 198 | |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 199 | // get separation string |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 200 | GET_STR_DATA_LEN(self_in, sep_str, sep_len); |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 201 | |
| 202 | // process args |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 203 | uint seq_len; |
| 204 | mp_obj_t *seq_items; |
| 205 | if (MP_OBJ_IS_TYPE(arg, &tuple_type)) { |
| 206 | mp_obj_tuple_get(arg, &seq_len, &seq_items); |
| 207 | } else if (MP_OBJ_IS_TYPE(arg, &list_type)) { |
| 208 | mp_obj_list_get(arg, &seq_len, &seq_items); |
| 209 | } else { |
| 210 | goto bad_arg; |
| 211 | } |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 212 | |
| 213 | // count required length |
| 214 | int required_len = 0; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 215 | for (int i = 0; i < seq_len; i++) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 216 | if (!MP_OBJ_IS_STR(seq_items[i])) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 217 | goto bad_arg; |
| 218 | } |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 219 | if (i > 0) { |
| 220 | required_len += sep_len; |
| 221 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 222 | GET_STR_LEN(seq_items[i], l); |
| 223 | required_len += l; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 224 | } |
| 225 | |
| 226 | // make joined string |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 227 | byte *data; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 228 | 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] | 229 | for (int i = 0; i < seq_len; i++) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 230 | if (i > 0) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 231 | memcpy(data, sep_str, sep_len); |
| 232 | data += sep_len; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 233 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 234 | GET_STR_DATA_LEN(seq_items[i], s, l); |
| 235 | memcpy(data, s, l); |
| 236 | data += l; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 237 | } |
Damien George | fe8fb91 | 2014-01-02 16:36:09 +0000 | [diff] [blame] | 238 | |
| 239 | // return joined string |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 240 | return mp_obj_str_builder_end(joined_str); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 241 | |
| 242 | bad_arg: |
Damien George | eb7bfcb | 2014-01-04 15:57:35 +0000 | [diff] [blame] | 243 | nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError, "?str.join expecting a list of str's")); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 244 | } |
| 245 | |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 246 | #define is_ws(c) ((c) == ' ' || (c) == '\t') |
| 247 | |
| 248 | static mp_obj_t str_split(uint n_args, const mp_obj_t *args) { |
| 249 | int splits = -1; |
| 250 | mp_obj_t sep = mp_const_none; |
| 251 | if (n_args > 1) { |
| 252 | sep = args[1]; |
| 253 | if (n_args > 2) { |
| 254 | splits = MP_OBJ_SMALL_INT_VALUE(args[2]); |
| 255 | } |
| 256 | } |
| 257 | assert(sep == mp_const_none); |
Damien George | 12eacca | 2014-01-21 21:54:15 +0000 | [diff] [blame] | 258 | (void)sep; // unused; to hush compiler warning |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 259 | mp_obj_t res = mp_obj_new_list(0, NULL); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 260 | GET_STR_DATA_LEN(args[0], s, len); |
| 261 | const byte *top = s + len; |
| 262 | const byte *start; |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 263 | |
| 264 | // Initial whitespace is not counted as split, so we pre-do it |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 265 | while (s < top && is_ws(*s)) s++; |
| 266 | while (s < top && splits != 0) { |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 267 | start = s; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 268 | while (s < top && !is_ws(*s)) s++; |
| 269 | rt_list_append(res, mp_obj_new_str(start, s - start, false)); |
| 270 | if (s >= top) { |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 271 | break; |
| 272 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 273 | while (s < top && is_ws(*s)) s++; |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 274 | if (splits > 0) { |
| 275 | splits--; |
| 276 | } |
| 277 | } |
| 278 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 279 | if (s < top) { |
| 280 | rt_list_append(res, mp_obj_new_str(s, top - s, false)); |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 281 | } |
| 282 | |
| 283 | return res; |
| 284 | } |
| 285 | |
Damien George | a11ceca | 2014-01-19 16:02:09 +0000 | [diff] [blame] | 286 | static mp_obj_t str_find(uint n_args, const mp_obj_t *args) { |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 287 | assert(2 <= n_args && n_args <= 4); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 288 | assert(MP_OBJ_IS_STR(args[0])); |
| 289 | assert(MP_OBJ_IS_STR(args[1])); |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 290 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 291 | GET_STR_DATA_LEN(args[0], haystack, haystack_len); |
| 292 | GET_STR_DATA_LEN(args[1], needle, needle_len); |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 293 | |
| 294 | size_t start = 0; |
| 295 | size_t end = haystack_len; |
| 296 | /* TODO use a non-exception-throwing mp_get_index */ |
| 297 | if (n_args >= 3 && args[2] != mp_const_none) { |
| 298 | start = mp_get_index(&str_type, haystack_len, args[2]); |
| 299 | } |
| 300 | if (n_args >= 4 && args[3] != mp_const_none) { |
| 301 | end = mp_get_index(&str_type, haystack_len, args[3]); |
| 302 | } |
| 303 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 304 | const byte *p = find_subbytes(haystack + start, haystack_len - start, needle, needle_len); |
Damien George | 2300537 | 2014-01-13 19:39:01 +0000 | [diff] [blame] | 305 | if (p == NULL) { |
| 306 | // not found |
| 307 | return MP_OBJ_NEW_SMALL_INT(-1); |
| 308 | } else { |
| 309 | // found |
| 310 | machine_int_t pos = p - haystack; |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 311 | if (pos + needle_len > end) { |
| 312 | pos = -1; |
| 313 | } |
Damien George | 2300537 | 2014-01-13 19:39:01 +0000 | [diff] [blame] | 314 | return MP_OBJ_NEW_SMALL_INT(pos); |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 315 | } |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 316 | } |
| 317 | |
Paul Sokolovsky | 1eacefe | 2014-01-23 01:20:40 +0200 | [diff] [blame] | 318 | // TODO: (Much) more variety in args |
| 319 | static mp_obj_t str_startswith(mp_obj_t self_in, mp_obj_t arg) { |
| 320 | GET_STR_DATA_LEN(self_in, str, str_len); |
| 321 | GET_STR_DATA_LEN(arg, prefix, prefix_len); |
| 322 | if (prefix_len > str_len) { |
| 323 | return mp_const_false; |
| 324 | } |
| 325 | return MP_BOOL(memcmp(str, prefix, prefix_len) == 0); |
| 326 | } |
| 327 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 328 | static bool chr_in_str(const byte* const str, const size_t str_len, int c) { |
| 329 | for (size_t i = 0; i < str_len; i++) { |
| 330 | if (str[i] == c) { |
| 331 | return true; |
| 332 | } |
| 333 | } |
| 334 | return false; |
| 335 | } |
| 336 | |
Damien George | a11ceca | 2014-01-19 16:02:09 +0000 | [diff] [blame] | 337 | mp_obj_t str_strip(uint n_args, const mp_obj_t *args) { |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 338 | assert(1 <= n_args && n_args <= 2); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 339 | assert(MP_OBJ_IS_STR(args[0])); |
| 340 | |
| 341 | const byte *chars_to_del; |
| 342 | uint chars_to_del_len; |
| 343 | static const byte whitespace[] = " \t\n\r\v\f"; |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 344 | |
| 345 | if (n_args == 1) { |
| 346 | chars_to_del = whitespace; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 347 | chars_to_del_len = sizeof(whitespace); |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 348 | } else { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 349 | assert(MP_OBJ_IS_STR(args[1])); |
| 350 | GET_STR_DATA_LEN(args[1], s, l); |
| 351 | chars_to_del = s; |
| 352 | chars_to_del_len = l; |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 353 | } |
| 354 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 355 | GET_STR_DATA_LEN(args[0], orig_str, orig_str_len); |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 356 | |
| 357 | size_t first_good_char_pos = 0; |
| 358 | bool first_good_char_pos_set = false; |
| 359 | size_t last_good_char_pos = 0; |
| 360 | for (size_t i = 0; i < orig_str_len; i++) { |
| 361 | if (!chr_in_str(chars_to_del, chars_to_del_len, orig_str[i])) { |
| 362 | last_good_char_pos = i; |
| 363 | if (!first_good_char_pos_set) { |
| 364 | first_good_char_pos = i; |
| 365 | first_good_char_pos_set = true; |
| 366 | } |
| 367 | } |
| 368 | } |
| 369 | |
| 370 | if (first_good_char_pos == 0 && last_good_char_pos == 0) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 371 | // string is all whitespace, return '' |
| 372 | return MP_OBJ_NEW_QSTR(MP_QSTR_); |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 373 | } |
| 374 | |
| 375 | assert(last_good_char_pos >= first_good_char_pos); |
| 376 | //+1 to accomodate the last character |
| 377 | size_t stripped_len = last_good_char_pos - first_good_char_pos + 1; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 378 | 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] | 379 | } |
| 380 | |
Damien George | a11ceca | 2014-01-19 16:02:09 +0000 | [diff] [blame] | 381 | 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] | 382 | assert(MP_OBJ_IS_STR(args[0])); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 383 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 384 | GET_STR_DATA_LEN(args[0], str, len); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 385 | int arg_i = 1; |
| 386 | vstr_t *vstr = vstr_new(); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 387 | for (const byte *top = str + len; str < top; str++) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 388 | if (*str == '{') { |
| 389 | str++; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 390 | if (str < top && *str == '{') { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 391 | vstr_add_char(vstr, '{'); |
Paul Sokolovsky | f2b796e | 2014-01-15 22:45:20 +0200 | [diff] [blame] | 392 | } else { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 393 | while (str < top && *str != '}') str++; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 394 | if (arg_i >= n_args) { |
Damien George | eb7bfcb | 2014-01-04 15:57:35 +0000 | [diff] [blame] | 395 | nlr_jump(mp_obj_new_exception_msg(MP_QSTR_IndexError, "tuple index out of range")); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 396 | } |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 397 | // TODO: may be PRINT_REPR depending on formatting code |
Damien George | 4899ff9 | 2014-01-15 22:39:03 +0000 | [diff] [blame] | 398 | 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] | 399 | arg_i++; |
| 400 | } |
| 401 | } else { |
| 402 | vstr_add_char(vstr, *str); |
| 403 | } |
| 404 | } |
| 405 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 406 | mp_obj_t s = mp_obj_new_str((byte*)vstr->buf, vstr->len, false); |
| 407 | vstr_free(vstr); |
| 408 | return s; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 409 | } |
| 410 | |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 411 | static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj, 2, 4, str_find); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 412 | static MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join); |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 413 | static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, str_split); |
Paul Sokolovsky | 1eacefe | 2014-01-23 01:20:40 +0200 | [diff] [blame] | 414 | static MP_DEFINE_CONST_FUN_OBJ_2(str_startswith_obj, str_startswith); |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 415 | static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 416 | static MP_DEFINE_CONST_FUN_OBJ_VAR(str_format_obj, 1, str_format); |
| 417 | |
ian-v | a5a01df | 2014-01-06 14:14:11 -0800 | [diff] [blame] | 418 | static const mp_method_t str_type_methods[] = { |
John R. Lenton | e820491 | 2014-01-12 21:53:52 +0000 | [diff] [blame] | 419 | { "find", &str_find_obj }, |
ian-v | 7a16fad | 2014-01-06 09:52:29 -0800 | [diff] [blame] | 420 | { "join", &str_join_obj }, |
Paul Sokolovsky | 4c31655 | 2014-01-21 05:00:21 +0200 | [diff] [blame] | 421 | { "split", &str_split_obj }, |
Paul Sokolovsky | 1eacefe | 2014-01-23 01:20:40 +0200 | [diff] [blame] | 422 | { "startswith", &str_startswith_obj }, |
xbe | 7b0f39f | 2014-01-08 14:23:45 -0800 | [diff] [blame] | 423 | { "strip", &str_strip_obj }, |
ian-v | 7a16fad | 2014-01-06 09:52:29 -0800 | [diff] [blame] | 424 | { "format", &str_format_obj }, |
| 425 | { NULL, NULL }, // end-of-list sentinel |
| 426 | }; |
Damien George | 97209d3 | 2014-01-07 15:58:30 +0000 | [diff] [blame] | 427 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 428 | const mp_obj_type_t str_type = { |
| 429 | { &mp_const_type }, |
| 430 | "str", |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 431 | .print = str_print, |
| 432 | .binary_op = str_binary_op, |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 433 | .getiter = mp_obj_new_str_iterator, |
ian-v | 7a16fad | 2014-01-06 09:52:29 -0800 | [diff] [blame] | 434 | .methods = str_type_methods, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 435 | }; |
| 436 | |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 437 | // Reuses most of methods from str |
| 438 | const mp_obj_type_t bytes_type = { |
| 439 | { &mp_const_type }, |
| 440 | "bytes", |
| 441 | .print = str_print, |
| 442 | .binary_op = str_binary_op, |
| 443 | .getiter = mp_obj_new_bytes_iterator, |
| 444 | .methods = str_type_methods, |
| 445 | }; |
| 446 | |
| 447 | mp_obj_t mp_obj_str_builder_start(const mp_obj_type_t *type, uint len, byte **data) { |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 448 | mp_obj_str_t *o = m_new_obj_var(mp_obj_str_t, byte, len + 1); |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 449 | o->base.type = type; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 450 | o->len = len; |
| 451 | *data = o->data; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 452 | return o; |
| 453 | } |
| 454 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 455 | mp_obj_t mp_obj_str_builder_end(mp_obj_t o_in) { |
| 456 | assert(MP_OBJ_IS_STR(o_in)); |
| 457 | mp_obj_str_t *o = o_in; |
| 458 | o->hash = qstr_compute_hash(o->data, o->len); |
| 459 | o->data[o->len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings |
| 460 | return o; |
| 461 | } |
| 462 | |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 463 | static mp_obj_t str_new(const mp_obj_type_t *type, const byte* data, uint len) { |
| 464 | mp_obj_str_t *o = m_new_obj_var(mp_obj_str_t, byte, len + 1); |
| 465 | o->base.type = type; |
| 466 | o->hash = qstr_compute_hash(data, len); |
| 467 | o->len = len; |
| 468 | memcpy(o->data, data, len * sizeof(byte)); |
| 469 | o->data[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings |
| 470 | return o; |
| 471 | } |
| 472 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 473 | mp_obj_t mp_obj_new_str(const byte* data, uint len, bool make_qstr_if_not_already) { |
| 474 | qstr q = qstr_find_strn(data, len); |
| 475 | if (q != MP_QSTR_NULL) { |
| 476 | // qstr with this data already exists |
| 477 | return MP_OBJ_NEW_QSTR(q); |
| 478 | } else if (make_qstr_if_not_already) { |
| 479 | // no existing qstr, make a new one |
| 480 | return MP_OBJ_NEW_QSTR(qstr_from_strn((const char*)data, len)); |
| 481 | } else { |
| 482 | // no existing qstr, don't make one |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 483 | return str_new(&str_type, data, len); |
Paul Sokolovsky | 8965a5e | 2014-01-20 23:33:19 +0200 | [diff] [blame] | 484 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 485 | } |
| 486 | |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 487 | mp_obj_t mp_obj_new_bytes(const byte* data, uint len) { |
| 488 | return str_new(&bytes_type, data, len); |
| 489 | } |
| 490 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 491 | bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) { |
| 492 | if (MP_OBJ_IS_QSTR(s1) && MP_OBJ_IS_QSTR(s2)) { |
| 493 | return s1 == s2; |
| 494 | } else { |
| 495 | GET_STR_HASH(s1, h1); |
| 496 | GET_STR_HASH(s2, h2); |
| 497 | if (h1 != h2) { |
| 498 | return false; |
| 499 | } |
| 500 | GET_STR_DATA_LEN(s1, d1, l1); |
| 501 | GET_STR_DATA_LEN(s2, d2, l2); |
| 502 | if (l1 != l2) { |
| 503 | return false; |
| 504 | } |
Damien George | 1e708fe | 2014-01-23 18:27:51 +0000 | [diff] [blame] | 505 | return memcmp(d1, d2, l1) == 0; |
Paul Sokolovsky | 8965a5e | 2014-01-20 23:33:19 +0200 | [diff] [blame] | 506 | } |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 507 | } |
| 508 | |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 509 | void bad_implicit_conversion(mp_obj_t self_in) __attribute__((noreturn)); |
| 510 | void bad_implicit_conversion(mp_obj_t self_in) { |
| 511 | nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "Can't convert '%s' object to str implicitly", mp_obj_get_type_str(self_in))); |
| 512 | } |
| 513 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 514 | uint mp_obj_str_get_hash(mp_obj_t self_in) { |
| 515 | if (MP_OBJ_IS_STR(self_in)) { |
| 516 | GET_STR_HASH(self_in, h); |
| 517 | return h; |
| 518 | } else { |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 519 | bad_implicit_conversion(self_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 520 | } |
| 521 | } |
| 522 | |
| 523 | uint mp_obj_str_get_len(mp_obj_t self_in) { |
| 524 | if (MP_OBJ_IS_STR(self_in)) { |
| 525 | GET_STR_LEN(self_in, l); |
| 526 | return l; |
| 527 | } else { |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 528 | bad_implicit_conversion(self_in); |
| 529 | } |
| 530 | } |
| 531 | |
| 532 | // use this if you will anyway convert the string to a qstr |
| 533 | // will be more efficient for the case where it's already a qstr |
| 534 | qstr mp_obj_str_get_qstr(mp_obj_t self_in) { |
| 535 | if (MP_OBJ_IS_QSTR(self_in)) { |
| 536 | return MP_OBJ_QSTR_VALUE(self_in); |
| 537 | } else if (MP_OBJ_IS_TYPE(self_in, &str_type)) { |
| 538 | mp_obj_str_t *self = self_in; |
| 539 | return qstr_from_strn((char*)self->data, self->len); |
| 540 | } else { |
| 541 | bad_implicit_conversion(self_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 542 | } |
| 543 | } |
| 544 | |
| 545 | // only use this function if you need the str data to be zero terminated |
| 546 | // at the moment all strings are zero terminated to help with C ASCIIZ compatibility |
| 547 | const char *mp_obj_str_get_str(mp_obj_t self_in) { |
| 548 | if (MP_OBJ_IS_STR(self_in)) { |
| 549 | GET_STR_DATA_LEN(self_in, s, l); |
| 550 | (void)l; // len unused |
| 551 | return (const char*)s; |
| 552 | } else { |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 553 | bad_implicit_conversion(self_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 554 | } |
| 555 | } |
| 556 | |
| 557 | const byte *mp_obj_str_get_data(mp_obj_t self_in, uint *len) { |
| 558 | if (MP_OBJ_IS_STR(self_in)) { |
| 559 | GET_STR_DATA_LEN(self_in, s, l); |
| 560 | *len = l; |
| 561 | return s; |
| 562 | } else { |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 563 | bad_implicit_conversion(self_in); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 564 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 565 | } |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 566 | |
| 567 | /******************************************************************************/ |
| 568 | /* str iterator */ |
| 569 | |
| 570 | typedef struct _mp_obj_str_it_t { |
| 571 | mp_obj_base_t base; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 572 | mp_obj_t str; |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 573 | machine_uint_t cur; |
| 574 | } mp_obj_str_it_t; |
| 575 | |
| 576 | mp_obj_t str_it_iternext(mp_obj_t self_in) { |
| 577 | mp_obj_str_it_t *self = self_in; |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 578 | GET_STR_DATA_LEN(self->str, str, len); |
| 579 | if (self->cur < len) { |
| 580 | 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] | 581 | self->cur += 1; |
| 582 | return o_out; |
| 583 | } else { |
| 584 | return mp_const_stop_iteration; |
| 585 | } |
| 586 | } |
| 587 | |
| 588 | static const mp_obj_type_t str_it_type = { |
| 589 | { &mp_const_type }, |
| 590 | "str_iterator", |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 591 | .iternext = str_it_iternext, |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 592 | }; |
| 593 | |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 594 | mp_obj_t bytes_it_iternext(mp_obj_t self_in) { |
| 595 | mp_obj_str_it_t *self = self_in; |
| 596 | GET_STR_DATA_LEN(self->str, str, len); |
| 597 | if (self->cur < len) { |
Damien George | 7c9c667 | 2014-01-25 00:17:36 +0000 | [diff] [blame] | 598 | 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] | 599 | self->cur += 1; |
| 600 | return o_out; |
| 601 | } else { |
| 602 | return mp_const_stop_iteration; |
| 603 | } |
| 604 | } |
| 605 | |
| 606 | static const mp_obj_type_t bytes_it_type = { |
| 607 | { &mp_const_type }, |
| 608 | "bytes_iterator", |
| 609 | .iternext = bytes_it_iternext, |
| 610 | }; |
| 611 | |
| 612 | mp_obj_t mp_obj_new_str_iterator(mp_obj_t str) { |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 613 | mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t); |
| 614 | o->base.type = &str_it_type; |
| 615 | o->str = str; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 616 | o->cur = 0; |
| 617 | return o; |
| 618 | } |
| 619 | |
| 620 | mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str) { |
| 621 | mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t); |
| 622 | o->base.type = &bytes_it_type; |
| 623 | o->str = str; |
| 624 | o->cur = 0; |
xyb | 8cfc9f0 | 2014-01-05 18:47:51 +0800 | [diff] [blame] | 625 | return o; |
| 626 | } |