blob: fc7415fe15e1beb7daf78828a5a248c46fd1f354 [file] [log] [blame]
xbeefe34222014-03-16 00:14:26 -07001#include <stdbool.h>
Damiend99b0522013-12-21 18:17:45 +00002#include <string.h>
3#include <assert.h>
4
Paul Sokolovskyf54bcbf2014-05-02 17:47:01 +03005#include "mpconfig.h"
Damiend99b0522013-12-21 18:17:45 +00006#include "nlr.h"
7#include "misc.h"
Damien George55baff42014-01-21 21:40:13 +00008#include "qstr.h"
Damiend99b0522013-12-21 18:17:45 +00009#include "obj.h"
10#include "runtime0.h"
11#include "runtime.h"
Dave Hylandsbaf6f142014-03-30 21:06:50 -070012#include "pfenv.h"
Paul Sokolovsky58676fc2014-04-14 01:45:06 +030013#include "objstr.h"
Damiend99b0522013-12-21 18:17:45 +000014
Paul Sokolovsky4db727a2014-03-31 21:18:28 +030015STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, uint n_args, const mp_obj_t *args);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +020016const mp_obj_t mp_const_empty_bytes;
17
Damien George5fa93b62014-01-22 14:35:10 +000018// use this macro to extract the string hash
19#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; }
20
21// use this macro to extract the string length
22#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; }
23
24// use this macro to extract the string data and length
25#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; }
26
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020027STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str);
28STATIC mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str);
Paul Sokolovskybe020c22014-03-21 11:39:01 +020029STATIC mp_obj_t str_new(const mp_obj_type_t *type, const byte* data, uint len);
Paul Sokolovskye9085912014-04-30 05:35:18 +030030STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in);
xyb8cfc9f02014-01-05 18:47:51 +080031
32/******************************************************************************/
33/* str */
34
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020035void mp_str_print_quoted(void (*print)(void *env, const char *fmt, ...), void *env, const byte *str_data, uint str_len) {
36 // this escapes characters, but it will be very slow to print (calling print many times)
37 bool has_single_quote = false;
38 bool has_double_quote = false;
39 for (const byte *s = str_data, *top = str_data + str_len; (!has_single_quote || !has_double_quote) && s < top; s++) {
40 if (*s == '\'') {
41 has_single_quote = true;
42 } else if (*s == '"') {
43 has_double_quote = true;
44 }
45 }
46 int quote_char = '\'';
47 if (has_single_quote && !has_double_quote) {
48 quote_char = '"';
49 }
50 print(env, "%c", quote_char);
51 for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) {
52 if (*s == quote_char) {
53 print(env, "\\%c", quote_char);
54 } else if (*s == '\\') {
55 print(env, "\\\\");
56 } else if (32 <= *s && *s <= 126) {
57 print(env, "%c", *s);
58 } else if (*s == '\n') {
59 print(env, "\\n");
Andrew Scheller12968fb2014-04-08 02:42:50 +010060 } else if (*s == '\r') {
61 print(env, "\\r");
62 } else if (*s == '\t') {
63 print(env, "\\t");
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020064 } else {
65 print(env, "\\x%02x", *s);
66 }
67 }
68 print(env, "%c", quote_char);
69}
70
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020071STATIC void str_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
Damien George5fa93b62014-01-22 14:35:10 +000072 GET_STR_DATA_LEN(self_in, str_data, str_len);
Damien George3e1a5c12014-03-29 13:43:38 +000073 bool is_bytes = MP_OBJ_IS_TYPE(self_in, &mp_type_bytes);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +020074 if (kind == PRINT_STR && !is_bytes) {
Damien George5fa93b62014-01-22 14:35:10 +000075 print(env, "%.*s", str_len, str_data);
Paul Sokolovsky76d982e2014-01-13 19:19:16 +020076 } else {
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +020077 if (is_bytes) {
78 print(env, "b");
79 }
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020080 mp_str_print_quoted(print, env, str_data, str_len);
Paul Sokolovsky76d982e2014-01-13 19:19:16 +020081 }
Damiend99b0522013-12-21 18:17:45 +000082}
83
Paul Sokolovskybe020c22014-03-21 11:39:01 +020084STATIC mp_obj_t str_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
85 switch (n_args) {
86 case 0:
87 return MP_OBJ_NEW_QSTR(MP_QSTR_);
88
89 case 1:
90 {
91 vstr_t *vstr = vstr_new();
92 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, args[0], PRINT_STR);
93 mp_obj_t s = mp_obj_new_str((byte*)vstr->buf, vstr->len, false);
94 vstr_free(vstr);
95 return s;
96 }
97
98 case 2:
99 case 3:
100 {
101 // TODO: validate 2nd/3rd args
Damien George3e1a5c12014-03-29 13:43:38 +0000102 if (!MP_OBJ_IS_TYPE(args[0], &mp_type_bytes)) {
Damien Georgeea13f402014-04-05 18:32:08 +0100103 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "bytes expected"));
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200104 }
105 GET_STR_DATA_LEN(args[0], str_data, str_len);
106 GET_STR_HASH(args[0], str_hash);
Damien George3e1a5c12014-03-29 13:43:38 +0000107 mp_obj_str_t *o = str_new(&mp_type_str, NULL, str_len);
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200108 o->data = str_data;
109 o->hash = str_hash;
110 return o;
111 }
112
113 default:
Damien Georgeea13f402014-04-05 18:32:08 +0100114 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "str takes at most 3 arguments"));
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200115 }
116}
117
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200118STATIC mp_obj_t bytes_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
119 if (n_args == 0) {
120 return mp_const_empty_bytes;
121 }
122
123 if (MP_OBJ_IS_STR(args[0])) {
124 if (n_args < 2 || n_args > 3) {
125 goto wrong_args;
126 }
127 GET_STR_DATA_LEN(args[0], str_data, str_len);
128 GET_STR_HASH(args[0], str_hash);
Damien George3e1a5c12014-03-29 13:43:38 +0000129 mp_obj_str_t *o = str_new(&mp_type_bytes, NULL, str_len);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200130 o->data = str_data;
131 o->hash = str_hash;
132 return o;
133 }
134
135 if (n_args > 1) {
136 goto wrong_args;
137 }
138
139 if (MP_OBJ_IS_SMALL_INT(args[0])) {
140 uint len = MP_OBJ_SMALL_INT_VALUE(args[0]);
141 byte *data;
142
Damien George3e1a5c12014-03-29 13:43:38 +0000143 mp_obj_t o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200144 memset(data, 0, len);
145 return mp_obj_str_builder_end(o);
146 }
147
148 int len;
149 byte *data;
150 vstr_t *vstr = NULL;
151 mp_obj_t o = NULL;
152 // Try to create array of exact len if initializer len is known
153 mp_obj_t len_in = mp_obj_len_maybe(args[0]);
154 if (len_in == MP_OBJ_NULL) {
155 len = -1;
156 vstr = vstr_new();
157 } else {
158 len = MP_OBJ_SMALL_INT_VALUE(len_in);
Damien George3e1a5c12014-03-29 13:43:38 +0000159 o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200160 }
161
Damien Georged17926d2014-03-30 13:35:08 +0100162 mp_obj_t iterable = mp_getiter(args[0]);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200163 mp_obj_t item;
Damien Georgeea8d06c2014-04-17 23:19:36 +0100164 while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200165 if (len == -1) {
166 vstr_add_char(vstr, MP_OBJ_SMALL_INT_VALUE(item));
167 } else {
168 *data++ = MP_OBJ_SMALL_INT_VALUE(item);
169 }
170 }
171
172 if (len == -1) {
173 vstr_shrink(vstr);
174 // TODO: Optimize, borrow buffer from vstr
175 len = vstr_len(vstr);
Damien George3e1a5c12014-03-29 13:43:38 +0000176 o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200177 memcpy(data, vstr_str(vstr), len);
178 vstr_free(vstr);
179 }
180
181 return mp_obj_str_builder_end(o);
182
183wrong_args:
Damien Georgeea13f402014-04-05 18:32:08 +0100184 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "wrong number of arguments"));
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200185}
186
Damien George55baff42014-01-21 21:40:13 +0000187// like strstr but with specified length and allows \0 bytes
188// TODO replace with something more efficient/standard
xbe17a5a832014-03-23 23:31:58 -0700189STATIC const byte *find_subbytes(const byte *haystack, machine_uint_t hlen, const byte *needle, machine_uint_t nlen, machine_int_t direction) {
Damien George55baff42014-01-21 21:40:13 +0000190 if (hlen >= nlen) {
xbe17a5a832014-03-23 23:31:58 -0700191 machine_uint_t str_index, str_index_end;
192 if (direction > 0) {
193 str_index = 0;
194 str_index_end = hlen - nlen;
195 } else {
196 str_index = hlen - nlen;
197 str_index_end = 0;
198 }
199 for (;;) {
200 if (memcmp(&haystack[str_index], needle, nlen) == 0) {
201 //found
202 return haystack + str_index;
Damien George55baff42014-01-21 21:40:13 +0000203 }
xbe17a5a832014-03-23 23:31:58 -0700204 if (str_index == str_index_end) {
205 //not found
206 break;
Damien George55baff42014-01-21 21:40:13 +0000207 }
xbe17a5a832014-03-23 23:31:58 -0700208 str_index += direction;
Damien George55baff42014-01-21 21:40:13 +0000209 }
210 }
211 return NULL;
212}
213
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200214STATIC mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
Damien George5fa93b62014-01-22 14:35:10 +0000215 GET_STR_DATA_LEN(lhs_in, lhs_data, lhs_len);
Damiend99b0522013-12-21 18:17:45 +0000216 switch (op) {
Damien Georged17926d2014-03-30 13:35:08 +0100217 case MP_BINARY_OP_ADD:
218 case MP_BINARY_OP_INPLACE_ADD:
Damien George5fa93b62014-01-22 14:35:10 +0000219 if (MP_OBJ_IS_STR(rhs_in)) {
Damiend99b0522013-12-21 18:17:45 +0000220 // add 2 strings
Damien George5fa93b62014-01-22 14:35:10 +0000221
222 GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
Damien George55baff42014-01-21 21:40:13 +0000223 int alloc_len = lhs_len + rhs_len;
Damien George5fa93b62014-01-22 14:35:10 +0000224
225 /* code for making qstr
Damien George55baff42014-01-21 21:40:13 +0000226 byte *q_ptr;
227 byte *val = qstr_build_start(alloc_len, &q_ptr);
228 memcpy(val, lhs_data, lhs_len);
229 memcpy(val + lhs_len, rhs_data, rhs_len);
Damien George5fa93b62014-01-22 14:35:10 +0000230 return MP_OBJ_NEW_QSTR(qstr_build_end(q_ptr));
231 */
232
233 // code for non-qstr
234 byte *data;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +0200235 mp_obj_t s = mp_obj_str_builder_start(mp_obj_get_type(lhs_in), alloc_len, &data);
Damien George5fa93b62014-01-22 14:35:10 +0000236 memcpy(data, lhs_data, lhs_len);
237 memcpy(data + lhs_len, rhs_data, rhs_len);
238 return mp_obj_str_builder_end(s);
Damiend99b0522013-12-21 18:17:45 +0000239 }
240 break;
Damien George5fa93b62014-01-22 14:35:10 +0000241
Damien Georged17926d2014-03-30 13:35:08 +0100242 case MP_BINARY_OP_IN:
John R. Lentonc1bef212014-01-11 12:39:33 +0000243 /* NOTE `a in b` is `b.__contains__(a)` */
Damien George5fa93b62014-01-22 14:35:10 +0000244 if (MP_OBJ_IS_STR(rhs_in)) {
245 GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
xbe17a5a832014-03-23 23:31:58 -0700246 return MP_BOOL(find_subbytes(lhs_data, lhs_len, rhs_data, rhs_len, 1) != NULL);
John R. Lentonc1bef212014-01-11 12:39:33 +0000247 }
248 break;
Damien George5fa93b62014-01-22 14:35:10 +0000249
Damien Georged17926d2014-03-30 13:35:08 +0100250 case MP_BINARY_OP_MULTIPLY:
Paul Sokolovsky545591a2014-01-21 00:27:33 +0200251 {
252 if (!MP_OBJ_IS_SMALL_INT(rhs_in)) {
253 return NULL;
254 }
255 int n = MP_OBJ_SMALL_INT_VALUE(rhs_in);
Damien George5fa93b62014-01-22 14:35:10 +0000256 byte *data;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +0200257 mp_obj_t s = mp_obj_str_builder_start(mp_obj_get_type(lhs_in), lhs_len * n, &data);
Damien George5fa93b62014-01-22 14:35:10 +0000258 mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, data);
259 return mp_obj_str_builder_end(s);
Paul Sokolovsky545591a2014-01-21 00:27:33 +0200260 }
Paul Sokolovsky87e85b72014-02-02 08:24:07 +0200261
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300262 case MP_BINARY_OP_MODULO: {
263 mp_obj_t *args;
264 uint n_args;
265 if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple)) {
266 // TODO: Support tuple subclasses?
267 mp_obj_tuple_get(rhs_in, &n_args, &args);
268 } else {
269 args = &rhs_in;
270 n_args = 1;
271 }
272 return str_modulo_format(lhs_in, n_args, args);
273 }
274
Damien Georged17926d2014-03-30 13:35:08 +0100275 // These 2 are never passed here, dealt with as a special case in mp_binary_op().
276 //case MP_BINARY_OP_EQUAL:
277 //case MP_BINARY_OP_NOT_EQUAL:
278 case MP_BINARY_OP_LESS:
279 case MP_BINARY_OP_LESS_EQUAL:
280 case MP_BINARY_OP_MORE:
281 case MP_BINARY_OP_MORE_EQUAL:
Paul Sokolovsky87e85b72014-02-02 08:24:07 +0200282 if (MP_OBJ_IS_STR(rhs_in)) {
283 GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
284 return MP_BOOL(mp_seq_cmp_bytes(op, lhs_data, lhs_len, rhs_data, rhs_len));
285 }
Damiend99b0522013-12-21 18:17:45 +0000286 }
287
Damien Georgeea8d06c2014-04-17 23:19:36 +0100288 return MP_OBJ_NOT_SUPPORTED;
Damiend99b0522013-12-21 18:17:45 +0000289}
290
Damien George729f7b42014-04-17 22:10:53 +0100291STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
292 GET_STR_DATA_LEN(self_in, self_data, self_len);
293 if (value == MP_OBJ_SENTINEL) {
294 // load
295#if MICROPY_ENABLE_SLICE
296 if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
297 machine_uint_t start, stop;
298 if (!m_seq_get_fast_slice_indexes(self_len, index, &start, &stop)) {
299 assert(0);
300 }
301 return mp_obj_new_str(self_data + start, stop - start, false);
302 }
303#endif
304 mp_obj_type_t *type = mp_obj_get_type(self_in);
305 uint index_val = mp_get_index(type, self_len, index, false);
306 if (type == &mp_type_bytes) {
307 return MP_OBJ_NEW_SMALL_INT((mp_small_int_t)self_data[index_val]);
308 } else {
309 return mp_obj_new_str(self_data + index_val, 1, true);
310 }
311 } else {
312 return MP_OBJ_NOT_SUPPORTED;
313 }
314}
315
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200316STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
Damien George5fa93b62014-01-22 14:35:10 +0000317 assert(MP_OBJ_IS_STR(self_in));
Damiend99b0522013-12-21 18:17:45 +0000318
Damien Georgefe8fb912014-01-02 16:36:09 +0000319 // get separation string
Damien George5fa93b62014-01-22 14:35:10 +0000320 GET_STR_DATA_LEN(self_in, sep_str, sep_len);
Damien Georgefe8fb912014-01-02 16:36:09 +0000321
322 // process args
Damiend99b0522013-12-21 18:17:45 +0000323 uint seq_len;
324 mp_obj_t *seq_items;
Damien George07ddab52014-03-29 13:15:08 +0000325 if (MP_OBJ_IS_TYPE(arg, &mp_type_tuple)) {
Damiend99b0522013-12-21 18:17:45 +0000326 mp_obj_tuple_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000327 } else {
Damien Georgea157e4c2014-04-09 19:17:53 +0100328 if (!MP_OBJ_IS_TYPE(arg, &mp_type_list)) {
329 // arg is not a list, try to convert it to one
Paul Sokolovsky881d9af2014-04-10 01:42:40 +0300330 // TODO: Try to optimize?
Damien Georgea157e4c2014-04-09 19:17:53 +0100331 arg = mp_type_list.make_new((mp_obj_t)&mp_type_list, 1, 0, &arg);
332 }
333 mp_obj_list_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000334 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000335
336 // count required length
337 int required_len = 0;
Damiend99b0522013-12-21 18:17:45 +0000338 for (int i = 0; i < seq_len; i++) {
Damien George5fa93b62014-01-22 14:35:10 +0000339 if (!MP_OBJ_IS_STR(seq_items[i])) {
Damien Georgea157e4c2014-04-09 19:17:53 +0100340 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "join expected a list of str's"));
Damiend99b0522013-12-21 18:17:45 +0000341 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000342 if (i > 0) {
343 required_len += sep_len;
344 }
Damien George5fa93b62014-01-22 14:35:10 +0000345 GET_STR_LEN(seq_items[i], l);
346 required_len += l;
Damiend99b0522013-12-21 18:17:45 +0000347 }
348
349 // make joined string
Damien George5fa93b62014-01-22 14:35:10 +0000350 byte *data;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +0200351 mp_obj_t joined_str = mp_obj_str_builder_start(mp_obj_get_type(self_in), required_len, &data);
Damiend99b0522013-12-21 18:17:45 +0000352 for (int i = 0; i < seq_len; i++) {
Damiend99b0522013-12-21 18:17:45 +0000353 if (i > 0) {
Damien George5fa93b62014-01-22 14:35:10 +0000354 memcpy(data, sep_str, sep_len);
355 data += sep_len;
Damiend99b0522013-12-21 18:17:45 +0000356 }
Damien George5fa93b62014-01-22 14:35:10 +0000357 GET_STR_DATA_LEN(seq_items[i], s, l);
358 memcpy(data, s, l);
359 data += l;
Damiend99b0522013-12-21 18:17:45 +0000360 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000361
362 // return joined string
Damien George5fa93b62014-01-22 14:35:10 +0000363 return mp_obj_str_builder_end(joined_str);
Damiend99b0522013-12-21 18:17:45 +0000364}
365
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200366#define is_ws(c) ((c) == ' ' || (c) == '\t')
367
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200368STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) {
Damien Georgedeed0872014-04-06 11:11:15 +0100369 machine_int_t splits = -1;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200370 mp_obj_t sep = mp_const_none;
371 if (n_args > 1) {
372 sep = args[1];
373 if (n_args > 2) {
Damien Georgedeed0872014-04-06 11:11:15 +0100374 splits = mp_obj_get_int(args[2]);
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200375 }
376 }
Damien Georgedeed0872014-04-06 11:11:15 +0100377
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200378 mp_obj_t res = mp_obj_new_list(0, NULL);
Damien George5fa93b62014-01-22 14:35:10 +0000379 GET_STR_DATA_LEN(args[0], s, len);
380 const byte *top = s + len;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200381
Damien Georgedeed0872014-04-06 11:11:15 +0100382 if (sep == mp_const_none) {
383 // sep not given, so separate on whitespace
384
385 // Initial whitespace is not counted as split, so we pre-do it
Damien George5fa93b62014-01-22 14:35:10 +0000386 while (s < top && is_ws(*s)) s++;
Damien Georgedeed0872014-04-06 11:11:15 +0100387 while (s < top && splits != 0) {
388 const byte *start = s;
389 while (s < top && !is_ws(*s)) s++;
390 mp_obj_list_append(res, mp_obj_new_str(start, s - start, false));
391 if (s >= top) {
392 break;
393 }
394 while (s < top && is_ws(*s)) s++;
395 if (splits > 0) {
396 splits--;
397 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200398 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200399
Damien Georgedeed0872014-04-06 11:11:15 +0100400 if (s < top) {
401 mp_obj_list_append(res, mp_obj_new_str(s, top - s, false));
402 }
403
404 } else {
405 // sep given
406
407 uint sep_len;
408 const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
409
410 if (sep_len == 0) {
411 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
412 }
413
414 for (;;) {
415 const byte *start = s;
416 for (;;) {
417 if (splits == 0 || s + sep_len > top) {
418 s = top;
419 break;
420 } else if (memcmp(s, sep_str, sep_len) == 0) {
421 break;
422 }
423 s++;
424 }
425 mp_obj_list_append(res, mp_obj_new_str(start, s - start, false));
426 if (s >= top) {
427 break;
428 }
429 s += sep_len;
430 if (splits > 0) {
431 splits--;
432 }
433 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200434 }
435
436 return res;
437}
438
xbe3d9a39e2014-04-08 11:42:19 -0700439STATIC mp_obj_t str_finder(uint n_args, const mp_obj_t *args, machine_int_t direction, bool is_index) {
John R. Lentone8204912014-01-12 21:53:52 +0000440 assert(2 <= n_args && n_args <= 4);
Damien George5fa93b62014-01-22 14:35:10 +0000441 assert(MP_OBJ_IS_STR(args[0]));
442 assert(MP_OBJ_IS_STR(args[1]));
John R. Lentone8204912014-01-12 21:53:52 +0000443
Damien George5fa93b62014-01-22 14:35:10 +0000444 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
445 GET_STR_DATA_LEN(args[1], needle, needle_len);
John R. Lentone8204912014-01-12 21:53:52 +0000446
xbec5538882014-03-16 17:58:35 -0700447 machine_uint_t start = 0;
448 machine_uint_t end = haystack_len;
John R. Lentone8204912014-01-12 21:53:52 +0000449 if (n_args >= 3 && args[2] != mp_const_none) {
Damien George3e1a5c12014-03-29 13:43:38 +0000450 start = mp_get_index(&mp_type_str, haystack_len, args[2], true);
John R. Lentone8204912014-01-12 21:53:52 +0000451 }
452 if (n_args >= 4 && args[3] != mp_const_none) {
Damien George3e1a5c12014-03-29 13:43:38 +0000453 end = mp_get_index(&mp_type_str, haystack_len, args[3], true);
John R. Lentone8204912014-01-12 21:53:52 +0000454 }
455
xbe17a5a832014-03-23 23:31:58 -0700456 const byte *p = find_subbytes(haystack + start, end - start, needle, needle_len, direction);
Damien George23005372014-01-13 19:39:01 +0000457 if (p == NULL) {
458 // not found
xbe3d9a39e2014-04-08 11:42:19 -0700459 if (is_index) {
460 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "substring not found"));
461 } else {
462 return MP_OBJ_NEW_SMALL_INT(-1);
463 }
Damien George23005372014-01-13 19:39:01 +0000464 } else {
465 // found
xbe17a5a832014-03-23 23:31:58 -0700466 return MP_OBJ_NEW_SMALL_INT(p - haystack);
John R. Lentone8204912014-01-12 21:53:52 +0000467 }
John R. Lentone8204912014-01-12 21:53:52 +0000468}
469
xbe17a5a832014-03-23 23:31:58 -0700470STATIC mp_obj_t str_find(uint n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700471 return str_finder(n_args, args, 1, false);
xbe17a5a832014-03-23 23:31:58 -0700472}
473
474STATIC mp_obj_t str_rfind(uint n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700475 return str_finder(n_args, args, -1, false);
476}
477
478STATIC mp_obj_t str_index(uint n_args, const mp_obj_t *args) {
479 return str_finder(n_args, args, 1, true);
480}
481
482STATIC mp_obj_t str_rindex(uint n_args, const mp_obj_t *args) {
483 return str_finder(n_args, args, -1, true);
xbe17a5a832014-03-23 23:31:58 -0700484}
485
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200486// TODO: (Much) more variety in args
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200487STATIC mp_obj_t str_startswith(mp_obj_t self_in, mp_obj_t arg) {
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200488 GET_STR_DATA_LEN(self_in, str, str_len);
489 GET_STR_DATA_LEN(arg, prefix, prefix_len);
490 if (prefix_len > str_len) {
491 return mp_const_false;
492 }
493 return MP_BOOL(memcmp(str, prefix, prefix_len) == 0);
494}
495
Paul Sokolovsky88107842014-04-26 06:20:08 +0300496enum { LSTRIP, RSTRIP, STRIP };
497
498STATIC mp_obj_t str_uni_strip(int type, uint n_args, const mp_obj_t *args) {
xbe7b0f39f2014-01-08 14:23:45 -0800499 assert(1 <= n_args && n_args <= 2);
Damien George5fa93b62014-01-22 14:35:10 +0000500 assert(MP_OBJ_IS_STR(args[0]));
501
502 const byte *chars_to_del;
503 uint chars_to_del_len;
504 static const byte whitespace[] = " \t\n\r\v\f";
xbe7b0f39f2014-01-08 14:23:45 -0800505
506 if (n_args == 1) {
507 chars_to_del = whitespace;
Damien George5fa93b62014-01-22 14:35:10 +0000508 chars_to_del_len = sizeof(whitespace);
xbe7b0f39f2014-01-08 14:23:45 -0800509 } else {
Damien George5fa93b62014-01-22 14:35:10 +0000510 assert(MP_OBJ_IS_STR(args[1]));
511 GET_STR_DATA_LEN(args[1], s, l);
512 chars_to_del = s;
513 chars_to_del_len = l;
xbe7b0f39f2014-01-08 14:23:45 -0800514 }
515
Damien George5fa93b62014-01-22 14:35:10 +0000516 GET_STR_DATA_LEN(args[0], orig_str, orig_str_len);
xbe7b0f39f2014-01-08 14:23:45 -0800517
xbec5538882014-03-16 17:58:35 -0700518 machine_uint_t first_good_char_pos = 0;
xbe7b0f39f2014-01-08 14:23:45 -0800519 bool first_good_char_pos_set = false;
xbec5538882014-03-16 17:58:35 -0700520 machine_uint_t last_good_char_pos = 0;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300521 machine_uint_t i = 0;
522 machine_int_t delta = 1;
523 if (type == RSTRIP) {
524 i = orig_str_len - 1;
525 delta = -1;
526 }
527 for (machine_uint_t len = orig_str_len; len > 0; len--) {
xbe17a5a832014-03-23 23:31:58 -0700528 if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) {
xbe7b0f39f2014-01-08 14:23:45 -0800529 if (!first_good_char_pos_set) {
530 first_good_char_pos = i;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300531 if (type == LSTRIP) {
532 last_good_char_pos = orig_str_len - 1;
533 break;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300534 } else if (type == RSTRIP) {
535 first_good_char_pos = 0;
536 last_good_char_pos = i;
537 break;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300538 }
xbe7b0f39f2014-01-08 14:23:45 -0800539 first_good_char_pos_set = true;
540 }
Paul Sokolovsky88107842014-04-26 06:20:08 +0300541 last_good_char_pos = i;
xbe7b0f39f2014-01-08 14:23:45 -0800542 }
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300543 i += delta;
xbe7b0f39f2014-01-08 14:23:45 -0800544 }
545
546 if (first_good_char_pos == 0 && last_good_char_pos == 0) {
Damien George5fa93b62014-01-22 14:35:10 +0000547 // string is all whitespace, return ''
548 return MP_OBJ_NEW_QSTR(MP_QSTR_);
xbe7b0f39f2014-01-08 14:23:45 -0800549 }
550
551 assert(last_good_char_pos >= first_good_char_pos);
552 //+1 to accomodate the last character
xbec5538882014-03-16 17:58:35 -0700553 machine_uint_t stripped_len = last_good_char_pos - first_good_char_pos + 1;
Damien George5fa93b62014-01-22 14:35:10 +0000554 return mp_obj_new_str(orig_str + first_good_char_pos, stripped_len, false);
xbe7b0f39f2014-01-08 14:23:45 -0800555}
556
Paul Sokolovsky88107842014-04-26 06:20:08 +0300557STATIC mp_obj_t str_strip(uint n_args, const mp_obj_t *args) {
558 return str_uni_strip(STRIP, n_args, args);
559}
560
561STATIC mp_obj_t str_lstrip(uint n_args, const mp_obj_t *args) {
562 return str_uni_strip(LSTRIP, n_args, args);
563}
564
565STATIC mp_obj_t str_rstrip(uint n_args, const mp_obj_t *args) {
566 return str_uni_strip(RSTRIP, n_args, args);
567}
568
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700569// Takes an int arg, but only parses unsigned numbers, and only changes
570// *num if at least one digit was parsed.
571static int str_to_int(const char *str, int *num) {
572 const char *s = str;
573 if (unichar_isdigit(*s)) {
574 *num = 0;
575 do {
576 *num = *num * 10 + (*s - '0');
577 s++;
578 }
579 while (unichar_isdigit(*s));
580 }
581 return s - str;
582}
583
584static bool isalignment(char ch) {
585 return ch && strchr("<>=^", ch) != NULL;
586}
587
588static bool istype(char ch) {
589 return ch && strchr("bcdeEfFgGnosxX%", ch) != NULL;
590}
591
592static bool arg_looks_integer(mp_obj_t arg) {
593 return MP_OBJ_IS_TYPE(arg, &mp_type_bool) || MP_OBJ_IS_INT(arg);
594}
595
596static bool arg_looks_numeric(mp_obj_t arg) {
597 return arg_looks_integer(arg)
598#if MICROPY_ENABLE_FLOAT
599 || MP_OBJ_IS_TYPE(arg, &mp_type_float)
600#endif
601 ;
602}
603
Dave Hylandsc4029e52014-04-07 11:19:51 -0700604static mp_obj_t arg_as_int(mp_obj_t arg) {
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700605#if MICROPY_ENABLE_FLOAT
606 if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
Dave Hylandsc4029e52014-04-07 11:19:51 -0700607
608 // TODO: Needs a way to construct an mpz integer from a float
609
610 mp_small_int_t num = mp_obj_get_float(arg);
611 return MP_OBJ_NEW_SMALL_INT(num);
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700612 }
613#endif
Dave Hylandsc4029e52014-04-07 11:19:51 -0700614 return arg;
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700615}
616
Damien George897fe0c2014-04-15 22:03:55 +0100617mp_obj_t mp_obj_str_format(uint n_args, const mp_obj_t *args) {
Damien George5fa93b62014-01-22 14:35:10 +0000618 assert(MP_OBJ_IS_STR(args[0]));
Damiend99b0522013-12-21 18:17:45 +0000619
Damien George5fa93b62014-01-22 14:35:10 +0000620 GET_STR_DATA_LEN(args[0], str, len);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700621 int arg_i = 0;
Damiend99b0522013-12-21 18:17:45 +0000622 vstr_t *vstr = vstr_new();
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700623 pfenv_t pfenv_vstr;
624 pfenv_vstr.data = vstr;
625 pfenv_vstr.print_strn = pfenv_vstr_add_strn;
626
Damien George5fa93b62014-01-22 14:35:10 +0000627 for (const byte *top = str + len; str < top; str++) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700628 if (*str == '}') {
Damiend99b0522013-12-21 18:17:45 +0000629 str++;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700630 if (str < top && *str == '}') {
631 vstr_add_char(vstr, '}');
632 continue;
633 }
Damien Georgeea13f402014-04-05 18:32:08 +0100634 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Single '}' encountered in format string"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700635 }
636 if (*str != '{') {
637 vstr_add_char(vstr, *str);
638 continue;
639 }
640
641 str++;
642 if (str < top && *str == '{') {
643 vstr_add_char(vstr, '{');
644 continue;
645 }
646
647 // replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}"
648
649 vstr_t *field_name = NULL;
650 char conversion = '\0';
651 vstr_t *format_spec = NULL;
652
653 if (str < top && *str != '}' && *str != '!' && *str != ':') {
654 field_name = vstr_new();
655 while (str < top && *str != '}' && *str != '!' && *str != ':') {
656 vstr_add_char(field_name, *str++);
657 }
658 vstr_add_char(field_name, '\0');
659 }
660
661 // conversion ::= "r" | "s"
662
663 if (str < top && *str == '!') {
664 str++;
665 if (str < top && (*str == 'r' || *str == 's')) {
666 conversion = *str++;
Paul Sokolovskyf2b796e2014-01-15 22:45:20 +0200667 } else {
Damien Georgeea13f402014-04-05 18:32:08 +0100668 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "end of format while looking for conversion specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700669 }
670 }
671
672 if (str < top && *str == ':') {
673 str++;
674 // {:} is the same as {}, which is the same as {!s}
675 // This makes a difference when passing in a True or False
676 // '{}'.format(True) returns 'True'
677 // '{:d}'.format(True) returns '1'
678 // So we treat {:} as {} and this later gets treated to be {!s}
679 if (*str != '}') {
680 format_spec = vstr_new();
681 while (str < top && *str != '}') {
682 vstr_add_char(format_spec, *str++);
Damiend99b0522013-12-21 18:17:45 +0000683 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700684 vstr_add_char(format_spec, '\0');
685 }
686 }
687 if (str >= top) {
Damien Georgeea13f402014-04-05 18:32:08 +0100688 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "unmatched '{' in format"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700689 }
690 if (*str != '}') {
Damien Georgeea13f402014-04-05 18:32:08 +0100691 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "expected ':' after format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700692 }
693
694 mp_obj_t arg = mp_const_none;
695
696 if (field_name) {
697 if (arg_i > 0) {
Damien Georgeea13f402014-04-05 18:32:08 +0100698 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "cannot switch from automatic field numbering to manual field specification"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700699 }
Damien George3bb8bd82014-04-14 21:20:30 +0100700 int index = 0;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700701 if (str_to_int(vstr_str(field_name), &index) != vstr_len(field_name) - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100702 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "attributes not supported yet"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700703 }
704 if (index >= n_args - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100705 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700706 }
707 arg = args[index + 1];
708 arg_i = -1;
709 vstr_free(field_name);
710 field_name = NULL;
711 } else {
712 if (arg_i < 0) {
Damien Georgeea13f402014-04-05 18:32:08 +0100713 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "cannot switch from manual field specification to automatic field numbering"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700714 }
715 if (arg_i >= n_args - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100716 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700717 }
718 arg = args[arg_i + 1];
719 arg_i++;
720 }
721 if (!format_spec && !conversion) {
722 conversion = 's';
723 }
724 if (conversion) {
725 mp_print_kind_t print_kind;
726 if (conversion == 's') {
727 print_kind = PRINT_STR;
728 } else if (conversion == 'r') {
729 print_kind = PRINT_REPR;
730 } else {
Damien Georgeea13f402014-04-05 18:32:08 +0100731 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Unknown conversion specifier %c", conversion));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700732 }
733 vstr_t *arg_vstr = vstr_new();
734 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, arg_vstr, arg, print_kind);
735 arg = mp_obj_new_str((const byte *)vstr_str(arg_vstr), vstr_len(arg_vstr), false);
736 vstr_free(arg_vstr);
737 }
738
739 char sign = '\0';
740 char fill = '\0';
741 char align = '\0';
742 int width = -1;
743 int precision = -1;
744 char type = '\0';
745 int flags = 0;
746
747 if (format_spec) {
748 // The format specifier (from http://docs.python.org/2/library/string.html#formatspec)
749 //
750 // [[fill]align][sign][#][0][width][,][.precision][type]
751 // fill ::= <any character>
752 // align ::= "<" | ">" | "=" | "^"
753 // sign ::= "+" | "-" | " "
754 // width ::= integer
755 // precision ::= integer
756 // type ::= "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
757
758 const char *s = vstr_str(format_spec);
759 if (isalignment(*s)) {
760 align = *s++;
761 } else if (*s && isalignment(s[1])) {
762 fill = *s++;
763 align = *s++;
764 }
765 if (*s == '+' || *s == '-' || *s == ' ') {
766 if (*s == '+') {
767 flags |= PF_FLAG_SHOW_SIGN;
768 } else if (*s == ' ') {
769 flags |= PF_FLAG_SPACE_SIGN;
770 }
771 sign = *s++;
772 }
773 if (*s == '#') {
774 flags |= PF_FLAG_SHOW_PREFIX;
775 s++;
776 }
777 if (*s == '0') {
778 if (!align) {
779 align = '=';
780 }
781 if (!fill) {
782 fill = '0';
783 }
784 }
785 s += str_to_int(s, &width);
786 if (*s == ',') {
787 flags |= PF_FLAG_SHOW_COMMA;
788 s++;
789 }
790 if (*s == '.') {
791 s++;
792 s += str_to_int(s, &precision);
793 }
794 if (istype(*s)) {
795 type = *s++;
796 }
797 if (*s) {
Damien Georgeea13f402014-04-05 18:32:08 +0100798 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "Invalid conversion specification"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700799 }
800 vstr_free(format_spec);
801 format_spec = NULL;
802 }
803 if (!align) {
804 if (arg_looks_numeric(arg)) {
805 align = '>';
806 } else {
807 align = '<';
808 }
809 }
810 if (!fill) {
811 fill = ' ';
812 }
813
814 if (sign) {
815 if (type == 's') {
Damien Georgeea13f402014-04-05 18:32:08 +0100816 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed in string format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700817 }
818 if (type == 'c') {
Damien Georgeea13f402014-04-05 18:32:08 +0100819 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed with integer format specifier 'c'"));
Damiend99b0522013-12-21 18:17:45 +0000820 }
821 } else {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700822 sign = '-';
823 }
824
825 switch (align) {
826 case '<': flags |= PF_FLAG_LEFT_ADJUST; break;
827 case '=': flags |= PF_FLAG_PAD_AFTER_SIGN; break;
828 case '^': flags |= PF_FLAG_CENTER_ADJUST; break;
829 }
830
831 if (arg_looks_integer(arg)) {
832 switch (type) {
833 case 'b':
Damien Georgea12a0f72014-04-08 01:29:53 +0100834 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 2, 'a', flags, fill, width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700835 continue;
836
837 case 'c':
838 {
839 char ch = mp_obj_get_int(arg);
840 pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, fill, width);
841 continue;
842 }
843
844 case '\0': // No explicit format type implies 'd'
845 case 'n': // I don't think we support locales in uPy so use 'd'
846 case 'd':
Damien Georgea12a0f72014-04-08 01:29:53 +0100847 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 10, 'a', flags, fill, width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700848 continue;
849
850 case 'o':
Dave Hylandsc4029e52014-04-07 11:19:51 -0700851 if (flags & PF_FLAG_SHOW_PREFIX) {
852 flags |= PF_FLAG_SHOW_OCTAL_LETTER;
853 }
854
Damien Georgea12a0f72014-04-08 01:29:53 +0100855 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 8, 'a', flags, fill, width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700856 continue;
857
858 case 'x':
Damien Georgea12a0f72014-04-08 01:29:53 +0100859 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, 'a', flags, fill, width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700860 continue;
861
862 case 'X':
Damien Georgea12a0f72014-04-08 01:29:53 +0100863 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, 'A', flags, fill, width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700864 continue;
865
866 case 'e':
867 case 'E':
868 case 'f':
869 case 'F':
870 case 'g':
871 case 'G':
872 case '%':
873 // The floating point formatters all work with anything that
874 // looks like an integer
875 break;
876
877 default:
Damien Georgeea13f402014-04-05 18:32:08 +0100878 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700879 "Unknown format code '%c' for object of type '%s'", type, mp_obj_get_type_str(arg)));
880 }
Damien Georgec322c5f2014-04-02 20:04:15 +0100881 }
Damien George70f33cd2014-04-02 17:06:05 +0100882
Dave Hylands22fe4d72014-04-02 12:07:31 -0700883 // NOTE: no else here. We need the e, f, g etc formats for integer
884 // arguments (from above if) to take this if.
Damien Georgec322c5f2014-04-02 20:04:15 +0100885 if (arg_looks_numeric(arg)) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700886 if (!type) {
887
888 // Even though the docs say that an unspecified type is the same
889 // as 'g', there is one subtle difference, when the exponent
890 // is one less than the precision.
891 //
892 // '{:10.1}'.format(0.0) ==> '0e+00'
893 // '{:10.1g}'.format(0.0) ==> '0'
894 //
895 // TODO: Figure out how to deal with this.
896 //
897 // A proper solution would involve adding a special flag
898 // or something to format_float, and create a format_double
899 // to deal with doubles. In order to fix this when using
900 // sprintf, we'd need to use the e format and tweak the
901 // returned result to strip trailing zeros like the g format
902 // does.
903 //
904 // {:10.3} and {:10.2e} with 1.23e2 both produce 1.23e+02
905 // but with 1.e2 you get 1e+02 and 1.00e+02
906 //
907 // Stripping the trailing 0's (like g) does would make the
908 // e format give us the right format.
909 //
910 // CPython sources say:
911 // Omitted type specifier. Behaves in the same way as repr(x)
912 // and str(x) if no precision is given, else like 'g', but with
913 // at least one digit after the decimal point. */
914
915 type = 'g';
916 }
917 if (type == 'n') {
918 type = 'g';
919 }
920
921 flags |= PF_FLAG_PAD_NAN_INF; // '{:06e}'.format(float('-inf')) should give '-00inf'
922 switch (type) {
Damien Georgec322c5f2014-04-02 20:04:15 +0100923#if MICROPY_ENABLE_FLOAT
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700924 case 'e':
925 case 'E':
926 case 'f':
927 case 'F':
928 case 'g':
929 case 'G':
930 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), type, flags, fill, width, precision);
931 break;
932
933 case '%':
934 flags |= PF_FLAG_ADD_PERCENT;
935 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg) * 100.0F, 'f', flags, fill, width, precision);
936 break;
Damien Georgec322c5f2014-04-02 20:04:15 +0100937#endif
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700938
939 default:
Damien Georgeea13f402014-04-05 18:32:08 +0100940 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700941 "Unknown format code '%c' for object of type 'float'",
942 type, mp_obj_get_type_str(arg)));
943 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700944 } else {
Damien George70f33cd2014-04-02 17:06:05 +0100945 // arg doesn't look like a number
946
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700947 if (align == '=') {
Damien Georgeea13f402014-04-05 18:32:08 +0100948 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "'=' alignment not allowed in string format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700949 }
Damien George70f33cd2014-04-02 17:06:05 +0100950
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700951 switch (type) {
952 case '\0':
953 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, arg, PRINT_STR);
954 break;
955
956 case 's':
957 {
958 uint len;
959 const char *s = mp_obj_str_get_data(arg, &len);
960 if (precision < 0) {
961 precision = len;
962 }
963 if (len > precision) {
964 len = precision;
965 }
966 pfenv_print_strn(&pfenv_vstr, s, len, flags, fill, width);
967 break;
968 }
969
970 default:
Damien Georgeea13f402014-04-05 18:32:08 +0100971 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700972 "Unknown format code '%c' for object of type 'str'",
973 type, mp_obj_get_type_str(arg)));
974 }
Damiend99b0522013-12-21 18:17:45 +0000975 }
976 }
977
Damien George5fa93b62014-01-22 14:35:10 +0000978 mp_obj_t s = mp_obj_new_str((byte*)vstr->buf, vstr->len, false);
979 vstr_free(vstr);
980 return s;
Damiend99b0522013-12-21 18:17:45 +0000981}
982
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300983STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, uint n_args, const mp_obj_t *args) {
984 assert(MP_OBJ_IS_STR(pattern));
985
986 GET_STR_DATA_LEN(pattern, str, len);
Dave Hylands6756a372014-04-02 11:42:39 -0700987 const byte *start_str = str;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300988 int arg_i = 0;
989 vstr_t *vstr = vstr_new();
Dave Hylands6756a372014-04-02 11:42:39 -0700990 pfenv_t pfenv_vstr;
991 pfenv_vstr.data = vstr;
992 pfenv_vstr.print_strn = pfenv_vstr_add_strn;
993
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300994 for (const byte *top = str + len; str < top; str++) {
Dave Hylands6756a372014-04-02 11:42:39 -0700995 if (*str != '%') {
996 vstr_add_char(vstr, *str);
997 continue;
998 }
999 if (++str >= top) {
1000 break;
1001 }
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001002 if (*str == '%') {
Dave Hylands6756a372014-04-02 11:42:39 -07001003 vstr_add_char(vstr, '%');
1004 continue;
1005 }
1006 if (arg_i >= n_args) {
Damien Georgeea13f402014-04-05 18:32:08 +01001007 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not enough arguments for format string"));
Dave Hylands6756a372014-04-02 11:42:39 -07001008 }
1009 int flags = 0;
1010 char fill = ' ';
1011 bool alt = false;
1012 while (str < top) {
1013 if (*str == '-') flags |= PF_FLAG_LEFT_ADJUST;
1014 else if (*str == '+') flags |= PF_FLAG_SHOW_SIGN;
1015 else if (*str == ' ') flags |= PF_FLAG_SPACE_SIGN;
1016 else if (*str == '#') alt = true;
1017 else if (*str == '0') {
1018 flags |= PF_FLAG_PAD_AFTER_SIGN;
1019 fill = '0';
1020 } else break;
1021 str++;
1022 }
1023 // parse width, if it exists
1024 int width = 0;
1025 if (str < top) {
1026 if (*str == '*') {
1027 width = mp_obj_get_int(args[arg_i++]);
1028 str++;
1029 } else {
1030 for (; str < top && '0' <= *str && *str <= '9'; str++) {
1031 width = width * 10 + *str - '0';
1032 }
1033 }
1034 }
1035 int prec = -1;
1036 if (str < top && *str == '.') {
1037 if (++str < top) {
1038 if (*str == '*') {
1039 prec = mp_obj_get_int(args[arg_i++]);
1040 str++;
1041 } else {
1042 prec = 0;
1043 for (; str < top && '0' <= *str && *str <= '9'; str++) {
1044 prec = prec * 10 + *str - '0';
1045 }
1046 }
1047 }
1048 }
1049
1050 if (str >= top) {
Damien Georgeea13f402014-04-05 18:32:08 +01001051 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "incomplete format"));
Dave Hylands6756a372014-04-02 11:42:39 -07001052 }
1053 mp_obj_t arg = args[arg_i];
1054 switch (*str) {
1055 case 'c':
1056 if (MP_OBJ_IS_STR(arg)) {
1057 uint len;
1058 const char *s = mp_obj_str_get_data(arg, &len);
1059 if (len != 1) {
Damien Georgeea13f402014-04-05 18:32:08 +01001060 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "%c requires int or char"));
Dave Hylands6756a372014-04-02 11:42:39 -07001061 break;
1062 }
1063 pfenv_print_strn(&pfenv_vstr, s, 1, flags, ' ', width);
1064 break;
1065 }
1066 if (arg_looks_integer(arg)) {
1067 char ch = mp_obj_get_int(arg);
1068 pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, ' ', width);
1069 break;
1070 }
1071#if MICROPY_ENABLE_FLOAT
1072 // This is what CPython reports, so we report the same.
1073 if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
Damien Georgeea13f402014-04-05 18:32:08 +01001074 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "integer argument expected, got float"));
Dave Hylands6756a372014-04-02 11:42:39 -07001075
1076 }
1077#endif
Damien Georgeea13f402014-04-05 18:32:08 +01001078 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "an integer is required"));
Dave Hylands6756a372014-04-02 11:42:39 -07001079 break;
1080
1081 case 'd':
1082 case 'i':
1083 case 'u':
Damien Georgea12a0f72014-04-08 01:29:53 +01001084 pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 10, 'a', flags, fill, width);
Dave Hylands6756a372014-04-02 11:42:39 -07001085 break;
1086
1087#if MICROPY_ENABLE_FLOAT
1088 case 'e':
1089 case 'E':
1090 case 'f':
1091 case 'F':
1092 case 'g':
1093 case 'G':
1094 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), *str, flags, fill, width, prec);
1095 break;
1096#endif
1097
1098 case 'o':
1099 if (alt) {
Dave Hylandsc4029e52014-04-07 11:19:51 -07001100 flags |= (PF_FLAG_SHOW_PREFIX | PF_FLAG_SHOW_OCTAL_LETTER);
Dave Hylands6756a372014-04-02 11:42:39 -07001101 }
Damien Georgea12a0f72014-04-08 01:29:53 +01001102 pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 8, 'a', flags, fill, width);
Dave Hylands6756a372014-04-02 11:42:39 -07001103 break;
1104
1105 case 'r':
1106 case 's':
1107 {
1108 vstr_t *arg_vstr = vstr_new();
1109 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf,
1110 arg_vstr, arg, *str == 'r' ? PRINT_REPR : PRINT_STR);
1111 uint len = vstr_len(arg_vstr);
1112 if (prec < 0) {
1113 prec = len;
1114 }
1115 if (len > prec) {
1116 len = prec;
1117 }
1118 pfenv_print_strn(&pfenv_vstr, vstr_str(arg_vstr), len, flags, ' ', width);
1119 vstr_free(arg_vstr);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001120 break;
1121 }
Dave Hylands6756a372014-04-02 11:42:39 -07001122
1123 case 'x':
1124 if (alt) {
1125 flags |= PF_FLAG_SHOW_PREFIX;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001126 }
Damien Georgea12a0f72014-04-08 01:29:53 +01001127 pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 16, 'a', flags, fill, width);
Dave Hylands6756a372014-04-02 11:42:39 -07001128 break;
1129
1130 case 'X':
1131 if (alt) {
1132 flags |= PF_FLAG_SHOW_PREFIX;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001133 }
Damien Georgea12a0f72014-04-08 01:29:53 +01001134 pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 16, 'A', flags, fill, width);
Dave Hylands6756a372014-04-02 11:42:39 -07001135 break;
Damien Georgedeed0872014-04-06 11:11:15 +01001136
Dave Hylands6756a372014-04-02 11:42:39 -07001137 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001138 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylands6756a372014-04-02 11:42:39 -07001139 "unsupported format character '%c' (0x%x) at index %d",
1140 *str, *str, str - start_str));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001141 }
Dave Hylands6756a372014-04-02 11:42:39 -07001142 arg_i++;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001143 }
1144
1145 if (arg_i != n_args) {
Damien Georgeea13f402014-04-05 18:32:08 +01001146 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not all arguments converted during string formatting"));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001147 }
1148
1149 mp_obj_t s = mp_obj_new_str((byte*)vstr->buf, vstr->len, false);
1150 vstr_free(vstr);
1151 return s;
1152}
1153
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001154STATIC mp_obj_t str_replace(uint n_args, const mp_obj_t *args) {
xbe480c15a2014-01-30 22:17:30 -08001155 assert(MP_OBJ_IS_STR(args[0]));
xbe480c15a2014-01-30 22:17:30 -08001156
Damien Georgeff715422014-04-07 00:39:13 +01001157 machine_int_t max_rep = -1;
xbe480c15a2014-01-30 22:17:30 -08001158 if (n_args == 4) {
Damien Georgeff715422014-04-07 00:39:13 +01001159 max_rep = mp_obj_get_int(args[3]);
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001160 if (max_rep == 0) {
1161 return args[0];
1162 } else if (max_rep < 0) {
Damien Georgeff715422014-04-07 00:39:13 +01001163 max_rep = -1;
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001164 }
xbe480c15a2014-01-30 22:17:30 -08001165 }
Damien George94f68302014-01-31 23:45:12 +00001166
xbe729be9b2014-04-07 14:46:39 -07001167 // if max_rep is still -1 by this point we will need to do all possible replacements
xbe480c15a2014-01-30 22:17:30 -08001168
Damien Georgeff715422014-04-07 00:39:13 +01001169 // check argument types
1170
1171 if (!MP_OBJ_IS_STR(args[1])) {
1172 bad_implicit_conversion(args[1]);
1173 }
1174
1175 if (!MP_OBJ_IS_STR(args[2])) {
1176 bad_implicit_conversion(args[2]);
1177 }
1178
1179 // extract string data
1180
xbe480c15a2014-01-30 22:17:30 -08001181 GET_STR_DATA_LEN(args[0], str, str_len);
1182 GET_STR_DATA_LEN(args[1], old, old_len);
1183 GET_STR_DATA_LEN(args[2], new, new_len);
Damien George94f68302014-01-31 23:45:12 +00001184
1185 // old won't exist in str if it's longer, so nothing to replace
xbe480c15a2014-01-30 22:17:30 -08001186 if (old_len > str_len) {
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001187 return args[0];
xbe480c15a2014-01-30 22:17:30 -08001188 }
1189
Damien George94f68302014-01-31 23:45:12 +00001190 // data for the replaced string
1191 byte *data = NULL;
1192 mp_obj_t replaced_str = MP_OBJ_NULL;
xbe480c15a2014-01-30 22:17:30 -08001193
Damien George94f68302014-01-31 23:45:12 +00001194 // do 2 passes over the string:
1195 // first pass computes the required length of the replaced string
1196 // second pass does the replacements
1197 for (;;) {
1198 machine_uint_t replaced_str_index = 0;
1199 machine_uint_t num_replacements_done = 0;
1200 const byte *old_occurrence;
1201 const byte *offset_ptr = str;
Damien Georgeff715422014-04-07 00:39:13 +01001202 machine_uint_t str_len_remain = str_len;
1203 if (old_len == 0) {
1204 // if old_str is empty, copy new_str to start of replaced string
1205 // copy the replacement string
1206 if (data != NULL) {
1207 memcpy(data, new, new_len);
1208 }
1209 replaced_str_index += new_len;
1210 num_replacements_done++;
1211 }
1212 while (num_replacements_done != max_rep && str_len_remain > 0 && (old_occurrence = find_subbytes(offset_ptr, str_len_remain, old, old_len, 1)) != NULL) {
1213 if (old_len == 0) {
1214 old_occurrence += 1;
1215 }
Damien George94f68302014-01-31 23:45:12 +00001216 // copy from just after end of last occurrence of to-be-replaced string to right before start of next occurrence
1217 if (data != NULL) {
1218 memcpy(data + replaced_str_index, offset_ptr, old_occurrence - offset_ptr);
1219 }
1220 replaced_str_index += old_occurrence - offset_ptr;
1221 // copy the replacement string
1222 if (data != NULL) {
1223 memcpy(data + replaced_str_index, new, new_len);
1224 }
1225 replaced_str_index += new_len;
1226 offset_ptr = old_occurrence + old_len;
Damien Georgeff715422014-04-07 00:39:13 +01001227 str_len_remain = str + str_len - offset_ptr;
Damien George94f68302014-01-31 23:45:12 +00001228 num_replacements_done++;
Damien George94f68302014-01-31 23:45:12 +00001229 }
1230
1231 // copy from just after end of last occurrence of to-be-replaced string to end of old string
1232 if (data != NULL) {
Damien Georgeff715422014-04-07 00:39:13 +01001233 memcpy(data + replaced_str_index, offset_ptr, str_len_remain);
Damien George94f68302014-01-31 23:45:12 +00001234 }
Damien Georgeff715422014-04-07 00:39:13 +01001235 replaced_str_index += str_len_remain;
Damien George94f68302014-01-31 23:45:12 +00001236
1237 if (data == NULL) {
1238 // first pass
1239 if (num_replacements_done == 0) {
1240 // no substr found, return original string
1241 return args[0];
1242 } else {
1243 // substr found, allocate new string
1244 replaced_str = mp_obj_str_builder_start(mp_obj_get_type(args[0]), replaced_str_index, &data);
Damien Georgeff715422014-04-07 00:39:13 +01001245 assert(data != NULL);
Damien George94f68302014-01-31 23:45:12 +00001246 }
1247 } else {
1248 // second pass, we are done
1249 break;
1250 }
xbe480c15a2014-01-30 22:17:30 -08001251 }
Damien George94f68302014-01-31 23:45:12 +00001252
xbe480c15a2014-01-30 22:17:30 -08001253 return mp_obj_str_builder_end(replaced_str);
1254}
1255
xbe9e1e8cd2014-03-12 22:57:16 -07001256STATIC mp_obj_t str_count(uint n_args, const mp_obj_t *args) {
1257 assert(2 <= n_args && n_args <= 4);
1258 assert(MP_OBJ_IS_STR(args[0]));
1259 assert(MP_OBJ_IS_STR(args[1]));
1260
1261 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
1262 GET_STR_DATA_LEN(args[1], needle, needle_len);
1263
Damien George536dde22014-03-13 22:07:55 +00001264 machine_uint_t start = 0;
1265 machine_uint_t end = haystack_len;
xbe9e1e8cd2014-03-12 22:57:16 -07001266 if (n_args >= 3 && args[2] != mp_const_none) {
Damien George3e1a5c12014-03-29 13:43:38 +00001267 start = mp_get_index(&mp_type_str, haystack_len, args[2], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001268 }
1269 if (n_args >= 4 && args[3] != mp_const_none) {
Damien George3e1a5c12014-03-29 13:43:38 +00001270 end = mp_get_index(&mp_type_str, haystack_len, args[3], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001271 }
1272
Damien George536dde22014-03-13 22:07:55 +00001273 // if needle_len is zero then we count each gap between characters as an occurrence
1274 if (needle_len == 0) {
1275 return MP_OBJ_NEW_SMALL_INT(end - start + 1);
xbe9e1e8cd2014-03-12 22:57:16 -07001276 }
1277
Damien George536dde22014-03-13 22:07:55 +00001278 // count the occurrences
1279 machine_int_t num_occurrences = 0;
xbec5d70ba2014-03-13 00:29:15 -07001280 for (machine_uint_t haystack_index = start; haystack_index + needle_len <= end; haystack_index++) {
1281 if (memcmp(&haystack[haystack_index], needle, needle_len) == 0) {
1282 num_occurrences++;
1283 haystack_index += needle_len - 1;
1284 }
xbe9e1e8cd2014-03-12 22:57:16 -07001285 }
1286
1287 return MP_OBJ_NEW_SMALL_INT(num_occurrences);
1288}
1289
Damien Georgeb035db32014-03-21 20:39:40 +00001290STATIC mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, machine_int_t direction) {
xbe613a8e32014-03-18 00:06:29 -07001291 assert(MP_OBJ_IS_STR(self_in));
1292 if (!MP_OBJ_IS_STR(arg)) {
Damien Georgedeed0872014-04-06 11:11:15 +01001293 bad_implicit_conversion(arg);
xbe613a8e32014-03-18 00:06:29 -07001294 }
Damien Georgeb035db32014-03-21 20:39:40 +00001295
xbe613a8e32014-03-18 00:06:29 -07001296 GET_STR_DATA_LEN(self_in, str, str_len);
1297 GET_STR_DATA_LEN(arg, sep, sep_len);
1298
1299 if (sep_len == 0) {
Damien Georgeea13f402014-04-05 18:32:08 +01001300 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
xbe613a8e32014-03-18 00:06:29 -07001301 }
Damien Georgeb035db32014-03-21 20:39:40 +00001302
1303 mp_obj_t result[] = {MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_)};
1304
1305 if (direction > 0) {
1306 result[0] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001307 } else {
Damien Georgeb035db32014-03-21 20:39:40 +00001308 result[2] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001309 }
xbe613a8e32014-03-18 00:06:29 -07001310
xbe17a5a832014-03-23 23:31:58 -07001311 const byte *position_ptr = find_subbytes(str, str_len, sep, sep_len, direction);
1312 if (position_ptr != NULL) {
1313 machine_uint_t position = position_ptr - str;
1314 result[0] = mp_obj_new_str(str, position, false);
1315 result[1] = arg;
1316 result[2] = mp_obj_new_str(str + position + sep_len, str_len - position - sep_len, false);
xbe613a8e32014-03-18 00:06:29 -07001317 }
Damien Georgeb035db32014-03-21 20:39:40 +00001318
xbe0a6894c2014-03-21 01:12:26 -07001319 return mp_obj_new_tuple(3, result);
xbe613a8e32014-03-18 00:06:29 -07001320}
1321
Damien Georgeb035db32014-03-21 20:39:40 +00001322STATIC mp_obj_t str_partition(mp_obj_t self_in, mp_obj_t arg) {
1323 return str_partitioner(self_in, arg, 1);
xbe0a6894c2014-03-21 01:12:26 -07001324}
xbe4504ea82014-03-19 00:46:14 -07001325
Damien Georgeb035db32014-03-21 20:39:40 +00001326STATIC mp_obj_t str_rpartition(mp_obj_t self_in, mp_obj_t arg) {
1327 return str_partitioner(self_in, arg, -1);
xbe4504ea82014-03-19 00:46:14 -07001328}
1329
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001330#if MICROPY_CPYTHON_COMPAT
1331// These methods are superfluous in the presense of str() and bytes()
1332// constructors.
1333// TODO: should accept kwargs too
1334STATIC mp_obj_t bytes_decode(uint n_args, const mp_obj_t *args) {
1335 mp_obj_t new_args[2];
1336 if (n_args == 1) {
1337 new_args[0] = args[0];
1338 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1339 args = new_args;
1340 n_args++;
1341 }
1342 return str_make_new(NULL, n_args, 0, args);
1343}
1344
1345// TODO: should accept kwargs too
1346STATIC mp_obj_t str_encode(uint n_args, const mp_obj_t *args) {
1347 mp_obj_t new_args[2];
1348 if (n_args == 1) {
1349 new_args[0] = args[0];
1350 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1351 args = new_args;
1352 n_args++;
1353 }
1354 return bytes_make_new(NULL, n_args, 0, args);
1355}
1356#endif
1357
Damien George57a4b4f2014-04-18 22:29:21 +01001358STATIC machine_int_t str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, int flags) {
1359 if (flags == MP_BUFFER_READ) {
Damien George2da98302014-03-09 19:58:18 +00001360 GET_STR_DATA_LEN(self_in, str_data, str_len);
1361 bufinfo->buf = (void*)str_data;
1362 bufinfo->len = str_len;
Damien George57a4b4f2014-04-18 22:29:21 +01001363 bufinfo->typecode = 'b';
Damien George2da98302014-03-09 19:58:18 +00001364 return 0;
1365 } else {
1366 // can't write to a string
1367 bufinfo->buf = NULL;
1368 bufinfo->len = 0;
Damien George57a4b4f2014-04-18 22:29:21 +01001369 bufinfo->typecode = -1;
Damien George2da98302014-03-09 19:58:18 +00001370 return 1;
1371 }
1372}
1373
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001374#if MICROPY_CPYTHON_COMPAT
1375STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_decode_obj, 1, 3, bytes_decode);
1376STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_encode_obj, 1, 3, str_encode);
1377#endif
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001378STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj, 2, 4, str_find);
xbe17a5a832014-03-23 23:31:58 -07001379STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rfind_obj, 2, 4, str_rfind);
xbe3d9a39e2014-04-08 11:42:19 -07001380STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_index_obj, 2, 4, str_index);
1381STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rindex_obj, 2, 4, str_rindex);
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001382STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join);
1383STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, str_split);
1384STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_startswith_obj, str_startswith);
1385STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip);
Paul Sokolovsky88107842014-04-26 06:20:08 +03001386STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_lstrip_obj, 1, 2, str_lstrip);
1387STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rstrip_obj, 1, 2, str_rstrip);
Damien George897fe0c2014-04-15 22:03:55 +01001388STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(str_format_obj, 1, mp_obj_str_format);
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001389STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj, 3, 4, str_replace);
xbe9e1e8cd2014-03-12 22:57:16 -07001390STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count);
xbe613a8e32014-03-18 00:06:29 -07001391STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition);
xbe4504ea82014-03-19 00:46:14 -07001392STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_rpartition_obj, str_rpartition);
Damiend99b0522013-12-21 18:17:45 +00001393
Damien George9b196cd2014-03-26 21:47:19 +00001394STATIC const mp_map_elem_t str_locals_dict_table[] = {
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001395#if MICROPY_CPYTHON_COMPAT
1396 { MP_OBJ_NEW_QSTR(MP_QSTR_decode), (mp_obj_t)&bytes_decode_obj },
1397 { MP_OBJ_NEW_QSTR(MP_QSTR_encode), (mp_obj_t)&str_encode_obj },
1398#endif
Damien George9b196cd2014-03-26 21:47:19 +00001399 { MP_OBJ_NEW_QSTR(MP_QSTR_find), (mp_obj_t)&str_find_obj },
1400 { MP_OBJ_NEW_QSTR(MP_QSTR_rfind), (mp_obj_t)&str_rfind_obj },
xbe3d9a39e2014-04-08 11:42:19 -07001401 { MP_OBJ_NEW_QSTR(MP_QSTR_index), (mp_obj_t)&str_index_obj },
1402 { MP_OBJ_NEW_QSTR(MP_QSTR_rindex), (mp_obj_t)&str_rindex_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001403 { MP_OBJ_NEW_QSTR(MP_QSTR_join), (mp_obj_t)&str_join_obj },
1404 { MP_OBJ_NEW_QSTR(MP_QSTR_split), (mp_obj_t)&str_split_obj },
1405 { MP_OBJ_NEW_QSTR(MP_QSTR_startswith), (mp_obj_t)&str_startswith_obj },
1406 { MP_OBJ_NEW_QSTR(MP_QSTR_strip), (mp_obj_t)&str_strip_obj },
Paul Sokolovsky88107842014-04-26 06:20:08 +03001407 { MP_OBJ_NEW_QSTR(MP_QSTR_lstrip), (mp_obj_t)&str_lstrip_obj },
1408 { MP_OBJ_NEW_QSTR(MP_QSTR_rstrip), (mp_obj_t)&str_rstrip_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001409 { MP_OBJ_NEW_QSTR(MP_QSTR_format), (mp_obj_t)&str_format_obj },
1410 { MP_OBJ_NEW_QSTR(MP_QSTR_replace), (mp_obj_t)&str_replace_obj },
1411 { MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&str_count_obj },
1412 { MP_OBJ_NEW_QSTR(MP_QSTR_partition), (mp_obj_t)&str_partition_obj },
1413 { MP_OBJ_NEW_QSTR(MP_QSTR_rpartition), (mp_obj_t)&str_rpartition_obj },
ian-v7a16fad2014-01-06 09:52:29 -08001414};
Damien George97209d32014-01-07 15:58:30 +00001415
Damien George9b196cd2014-03-26 21:47:19 +00001416STATIC MP_DEFINE_CONST_DICT(str_locals_dict, str_locals_dict_table);
1417
Damien George3e1a5c12014-03-29 13:43:38 +00001418const mp_obj_type_t mp_type_str = {
Damien Georgec5966122014-02-15 16:10:44 +00001419 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001420 .name = MP_QSTR_str,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001421 .print = str_print,
Paul Sokolovskybe020c22014-03-21 11:39:01 +02001422 .make_new = str_make_new,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001423 .binary_op = str_binary_op,
Damien George729f7b42014-04-17 22:10:53 +01001424 .subscr = str_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001425 .getiter = mp_obj_new_str_iterator,
Damien George2da98302014-03-09 19:58:18 +00001426 .buffer_p = { .get_buffer = str_get_buffer },
Damien George9b196cd2014-03-26 21:47:19 +00001427 .locals_dict = (mp_obj_t)&str_locals_dict,
Damiend99b0522013-12-21 18:17:45 +00001428};
1429
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001430// Reuses most of methods from str
Damien George3e1a5c12014-03-29 13:43:38 +00001431const mp_obj_type_t mp_type_bytes = {
Damien Georgec5966122014-02-15 16:10:44 +00001432 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001433 .name = MP_QSTR_bytes,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001434 .print = str_print,
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001435 .make_new = bytes_make_new,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001436 .binary_op = str_binary_op,
Damien George729f7b42014-04-17 22:10:53 +01001437 .subscr = str_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001438 .getiter = mp_obj_new_bytes_iterator,
Paul Sokolovsky7a70a3a2014-04-08 17:30:47 +03001439 .buffer_p = { .get_buffer = str_get_buffer },
Damien George9b196cd2014-03-26 21:47:19 +00001440 .locals_dict = (mp_obj_t)&str_locals_dict,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001441};
1442
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001443// the zero-length bytes
Damien George3e1a5c12014-03-29 13:43:38 +00001444STATIC const mp_obj_str_t empty_bytes_obj = {{&mp_type_bytes}, 0, 0, NULL};
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001445const mp_obj_t mp_const_empty_bytes = (mp_obj_t)&empty_bytes_obj;
1446
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001447mp_obj_t mp_obj_str_builder_start(const mp_obj_type_t *type, uint len, byte **data) {
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001448 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001449 o->base.type = type;
Damien George5fa93b62014-01-22 14:35:10 +00001450 o->len = len;
Paul Sokolovsky504e2332014-04-19 03:09:17 +03001451 o->hash = 0;
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001452 byte *p = m_new(byte, len + 1);
1453 o->data = p;
1454 *data = p;
Damiend99b0522013-12-21 18:17:45 +00001455 return o;
1456}
1457
Damien George5fa93b62014-01-22 14:35:10 +00001458mp_obj_t mp_obj_str_builder_end(mp_obj_t o_in) {
Damien George5fa93b62014-01-22 14:35:10 +00001459 mp_obj_str_t *o = o_in;
1460 o->hash = qstr_compute_hash(o->data, o->len);
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001461 byte *p = (byte*)o->data;
1462 p[o->len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
Damien George5fa93b62014-01-22 14:35:10 +00001463 return o;
1464}
1465
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001466STATIC mp_obj_t str_new(const mp_obj_type_t *type, const byte* data, uint len) {
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001467 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001468 o->base.type = type;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001469 o->len = len;
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001470 if (data) {
1471 o->hash = qstr_compute_hash(data, len);
1472 byte *p = m_new(byte, len + 1);
1473 o->data = p;
1474 memcpy(p, data, len * sizeof(byte));
1475 p[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
1476 }
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001477 return o;
1478}
1479
Damien George5fa93b62014-01-22 14:35:10 +00001480mp_obj_t mp_obj_new_str(const byte* data, uint len, bool make_qstr_if_not_already) {
1481 qstr q = qstr_find_strn(data, len);
1482 if (q != MP_QSTR_NULL) {
1483 // qstr with this data already exists
1484 return MP_OBJ_NEW_QSTR(q);
1485 } else if (make_qstr_if_not_already) {
1486 // no existing qstr, make a new one
1487 return MP_OBJ_NEW_QSTR(qstr_from_strn((const char*)data, len));
1488 } else {
1489 // no existing qstr, don't make one
Damien George3e1a5c12014-03-29 13:43:38 +00001490 return str_new(&mp_type_str, data, len);
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02001491 }
Damien George5fa93b62014-01-22 14:35:10 +00001492}
1493
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001494mp_obj_t mp_obj_new_bytes(const byte* data, uint len) {
Damien George3e1a5c12014-03-29 13:43:38 +00001495 return str_new(&mp_type_bytes, data, len);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001496}
1497
Damien George5fa93b62014-01-22 14:35:10 +00001498bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) {
1499 if (MP_OBJ_IS_QSTR(s1) && MP_OBJ_IS_QSTR(s2)) {
1500 return s1 == s2;
1501 } else {
1502 GET_STR_HASH(s1, h1);
1503 GET_STR_HASH(s2, h2);
Paul Sokolovsky59e269c2014-04-14 01:43:01 +03001504 // If any of hashes is 0, it means it's not valid
1505 if (h1 != 0 && h2 != 0 && h1 != h2) {
Damien George5fa93b62014-01-22 14:35:10 +00001506 return false;
1507 }
1508 GET_STR_DATA_LEN(s1, d1, l1);
1509 GET_STR_DATA_LEN(s2, d2, l2);
1510 if (l1 != l2) {
1511 return false;
1512 }
Damien George1e708fe2014-01-23 18:27:51 +00001513 return memcmp(d1, d2, l1) == 0;
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02001514 }
Damien George5fa93b62014-01-22 14:35:10 +00001515}
1516
Damien Georgedeed0872014-04-06 11:11:15 +01001517STATIC void bad_implicit_conversion(mp_obj_t self_in) {
Damien Georgeea13f402014-04-05 18:32:08 +01001518 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "Can't convert '%s' object to str implicitly", mp_obj_get_type_str(self_in)));
Damien Georgeb829b5c2014-01-25 13:51:19 +00001519}
1520
Damien George5fa93b62014-01-22 14:35:10 +00001521uint mp_obj_str_get_hash(mp_obj_t self_in) {
Paul Sokolovskyf130ca12014-04-13 05:41:00 +03001522 // TODO: This has too big overhead for hash accessor
1523 if (MP_OBJ_IS_STR(self_in) || MP_OBJ_IS_TYPE(self_in, &mp_type_bytes)) {
Damien George5fa93b62014-01-22 14:35:10 +00001524 GET_STR_HASH(self_in, h);
1525 return h;
1526 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001527 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001528 }
1529}
1530
1531uint mp_obj_str_get_len(mp_obj_t self_in) {
Damien Georgeee014112014-04-15 23:10:00 +01001532 // TODO This has a double check for the type, one in obj.c and one here
1533 if (MP_OBJ_IS_STR(self_in) || MP_OBJ_IS_TYPE(self_in, &mp_type_bytes)) {
Damien George5fa93b62014-01-22 14:35:10 +00001534 GET_STR_LEN(self_in, l);
1535 return l;
1536 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001537 bad_implicit_conversion(self_in);
1538 }
1539}
1540
1541// use this if you will anyway convert the string to a qstr
1542// will be more efficient for the case where it's already a qstr
1543qstr mp_obj_str_get_qstr(mp_obj_t self_in) {
1544 if (MP_OBJ_IS_QSTR(self_in)) {
1545 return MP_OBJ_QSTR_VALUE(self_in);
Damien George3e1a5c12014-03-29 13:43:38 +00001546 } else if (MP_OBJ_IS_TYPE(self_in, &mp_type_str)) {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001547 mp_obj_str_t *self = self_in;
1548 return qstr_from_strn((char*)self->data, self->len);
1549 } else {
1550 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001551 }
1552}
1553
1554// only use this function if you need the str data to be zero terminated
1555// at the moment all strings are zero terminated to help with C ASCIIZ compatibility
1556const char *mp_obj_str_get_str(mp_obj_t self_in) {
1557 if (MP_OBJ_IS_STR(self_in)) {
1558 GET_STR_DATA_LEN(self_in, s, l);
1559 (void)l; // len unused
1560 return (const char*)s;
1561 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001562 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001563 }
1564}
1565
Damien George698ec212014-02-08 18:17:23 +00001566const char *mp_obj_str_get_data(mp_obj_t self_in, uint *len) {
Damien George5fa93b62014-01-22 14:35:10 +00001567 if (MP_OBJ_IS_STR(self_in)) {
1568 GET_STR_DATA_LEN(self_in, s, l);
1569 *len = l;
Damien George698ec212014-02-08 18:17:23 +00001570 return (const char*)s;
Damien George5fa93b62014-01-22 14:35:10 +00001571 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001572 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001573 }
Damiend99b0522013-12-21 18:17:45 +00001574}
xyb8cfc9f02014-01-05 18:47:51 +08001575
1576/******************************************************************************/
1577/* str iterator */
1578
1579typedef struct _mp_obj_str_it_t {
1580 mp_obj_base_t base;
Damien George5fa93b62014-01-22 14:35:10 +00001581 mp_obj_t str;
xyb8cfc9f02014-01-05 18:47:51 +08001582 machine_uint_t cur;
1583} mp_obj_str_it_t;
1584
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001585STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
xyb8cfc9f02014-01-05 18:47:51 +08001586 mp_obj_str_it_t *self = self_in;
Damien George5fa93b62014-01-22 14:35:10 +00001587 GET_STR_DATA_LEN(self->str, str, len);
1588 if (self->cur < len) {
1589 mp_obj_t o_out = mp_obj_new_str(str + self->cur, 1, true);
xyb8cfc9f02014-01-05 18:47:51 +08001590 self->cur += 1;
1591 return o_out;
1592 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01001593 return MP_OBJ_STOP_ITERATION;
xyb8cfc9f02014-01-05 18:47:51 +08001594 }
1595}
1596
Damien George3e1a5c12014-03-29 13:43:38 +00001597STATIC const mp_obj_type_t mp_type_str_it = {
Damien Georgec5966122014-02-15 16:10:44 +00001598 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001599 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +03001600 .getiter = mp_identity,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001601 .iternext = str_it_iternext,
xyb8cfc9f02014-01-05 18:47:51 +08001602};
1603
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001604STATIC mp_obj_t bytes_it_iternext(mp_obj_t self_in) {
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001605 mp_obj_str_it_t *self = self_in;
1606 GET_STR_DATA_LEN(self->str, str, len);
1607 if (self->cur < len) {
Damien George7c9c6672014-01-25 00:17:36 +00001608 mp_obj_t o_out = MP_OBJ_NEW_SMALL_INT((mp_small_int_t)str[self->cur]);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001609 self->cur += 1;
1610 return o_out;
1611 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01001612 return MP_OBJ_STOP_ITERATION;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001613 }
1614}
1615
Damien George3e1a5c12014-03-29 13:43:38 +00001616STATIC const mp_obj_type_t mp_type_bytes_it = {
Damien Georgec5966122014-02-15 16:10:44 +00001617 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001618 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +03001619 .getiter = mp_identity,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001620 .iternext = bytes_it_iternext,
1621};
1622
1623mp_obj_t mp_obj_new_str_iterator(mp_obj_t str) {
xyb8cfc9f02014-01-05 18:47:51 +08001624 mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
Damien George3e1a5c12014-03-29 13:43:38 +00001625 o->base.type = &mp_type_str_it;
xyb8cfc9f02014-01-05 18:47:51 +08001626 o->str = str;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001627 o->cur = 0;
1628 return o;
1629}
1630
1631mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str) {
1632 mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
Damien George3e1a5c12014-03-29 13:43:38 +00001633 o->base.type = &mp_type_bytes_it;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001634 o->str = str;
1635 o->cur = 0;
xyb8cfc9f02014-01-05 18:47:51 +08001636 return o;
1637}