blob: 80b0cf876643456387f08c79a0958b7b9f17587e [file] [log] [blame]
Damien George04b91472014-05-03 23:27:38 +01001/*
2 * This file is part of the Micro Python project, http://micropython.org/
3 *
4 * The MIT License (MIT)
5 *
6 * Copyright (c) 2013, 2014 Damien P. George
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a copy
9 * of this software and associated documentation files (the "Software"), to deal
10 * in the Software without restriction, including without limitation the rights
11 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12 * copies of the Software, and to permit persons to whom the Software is
13 * furnished to do so, subject to the following conditions:
14 *
15 * The above copyright notice and this permission notice shall be included in
16 * all copies or substantial portions of the Software.
17 *
18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24 * THE SOFTWARE.
25 */
26
xbeefe34222014-03-16 00:14:26 -070027#include <stdbool.h>
Damiend99b0522013-12-21 18:17:45 +000028#include <string.h>
29#include <assert.h>
30
Paul Sokolovskyf54bcbf2014-05-02 17:47:01 +030031#include "mpconfig.h"
Damiend99b0522013-12-21 18:17:45 +000032#include "nlr.h"
33#include "misc.h"
Damien George55baff42014-01-21 21:40:13 +000034#include "qstr.h"
Damiend99b0522013-12-21 18:17:45 +000035#include "obj.h"
36#include "runtime0.h"
37#include "runtime.h"
Dave Hylandsbaf6f142014-03-30 21:06:50 -070038#include "pfenv.h"
Paul Sokolovsky58676fc2014-04-14 01:45:06 +030039#include "objstr.h"
Damiend99b0522013-12-21 18:17:45 +000040
Paul Sokolovsky4db727a2014-03-31 21:18:28 +030041STATIC 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 +020042const mp_obj_t mp_const_empty_bytes;
43
Damien George5fa93b62014-01-22 14:35:10 +000044// use this macro to extract the string hash
45#define GET_STR_HASH(str_obj_in, str_hash) uint str_hash; if (MP_OBJ_IS_QSTR(str_obj_in)) { str_hash = qstr_hash(MP_OBJ_QSTR_VALUE(str_obj_in)); } else { str_hash = ((mp_obj_str_t*)str_obj_in)->hash; }
46
47// use this macro to extract the string length
48#define GET_STR_LEN(str_obj_in, str_len) uint str_len; if (MP_OBJ_IS_QSTR(str_obj_in)) { str_len = qstr_len(MP_OBJ_QSTR_VALUE(str_obj_in)); } else { str_len = ((mp_obj_str_t*)str_obj_in)->len; }
49
50// use this macro to extract the string data and length
51#define GET_STR_DATA_LEN(str_obj_in, str_data, str_len) const byte *str_data; uint str_len; if (MP_OBJ_IS_QSTR(str_obj_in)) { str_data = qstr_data(MP_OBJ_QSTR_VALUE(str_obj_in), &str_len); } else { str_len = ((mp_obj_str_t*)str_obj_in)->len; str_data = ((mp_obj_str_t*)str_obj_in)->data; }
52
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020053STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str);
54STATIC mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str);
Paul Sokolovskybe020c22014-03-21 11:39:01 +020055STATIC mp_obj_t str_new(const mp_obj_type_t *type, const byte* data, uint len);
Paul Sokolovskye9085912014-04-30 05:35:18 +030056STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in);
xyb8cfc9f02014-01-05 18:47:51 +080057
58/******************************************************************************/
59/* str */
60
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020061void mp_str_print_quoted(void (*print)(void *env, const char *fmt, ...), void *env, const byte *str_data, uint str_len) {
62 // this escapes characters, but it will be very slow to print (calling print many times)
63 bool has_single_quote = false;
64 bool has_double_quote = false;
65 for (const byte *s = str_data, *top = str_data + str_len; (!has_single_quote || !has_double_quote) && s < top; s++) {
66 if (*s == '\'') {
67 has_single_quote = true;
68 } else if (*s == '"') {
69 has_double_quote = true;
70 }
71 }
72 int quote_char = '\'';
73 if (has_single_quote && !has_double_quote) {
74 quote_char = '"';
75 }
76 print(env, "%c", quote_char);
77 for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) {
78 if (*s == quote_char) {
79 print(env, "\\%c", quote_char);
80 } else if (*s == '\\') {
81 print(env, "\\\\");
82 } else if (32 <= *s && *s <= 126) {
83 print(env, "%c", *s);
84 } else if (*s == '\n') {
85 print(env, "\\n");
Andrew Scheller12968fb2014-04-08 02:42:50 +010086 } else if (*s == '\r') {
87 print(env, "\\r");
88 } else if (*s == '\t') {
89 print(env, "\\t");
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020090 } else {
91 print(env, "\\x%02x", *s);
92 }
93 }
94 print(env, "%c", quote_char);
95}
96
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020097STATIC 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 +000098 GET_STR_DATA_LEN(self_in, str_data, str_len);
Damien George3e1a5c12014-03-29 13:43:38 +000099 bool is_bytes = MP_OBJ_IS_TYPE(self_in, &mp_type_bytes);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +0200100 if (kind == PRINT_STR && !is_bytes) {
Damien George5fa93b62014-01-22 14:35:10 +0000101 print(env, "%.*s", str_len, str_data);
Paul Sokolovsky76d982e2014-01-13 19:19:16 +0200102 } else {
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +0200103 if (is_bytes) {
104 print(env, "b");
105 }
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +0200106 mp_str_print_quoted(print, env, str_data, str_len);
Paul Sokolovsky76d982e2014-01-13 19:19:16 +0200107 }
Damiend99b0522013-12-21 18:17:45 +0000108}
109
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200110STATIC mp_obj_t str_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
Paul Sokolovskyb473d0a2014-05-06 19:30:30 +0300111#if MICROPY_CPYTHON_COMPAT
112 if (n_kw != 0) {
113 mp_arg_error_unimpl_kw();
114 }
115#endif
116
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200117 switch (n_args) {
118 case 0:
119 return MP_OBJ_NEW_QSTR(MP_QSTR_);
120
121 case 1:
122 {
123 vstr_t *vstr = vstr_new();
124 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, args[0], PRINT_STR);
125 mp_obj_t s = mp_obj_new_str((byte*)vstr->buf, vstr->len, false);
126 vstr_free(vstr);
127 return s;
128 }
129
130 case 2:
131 case 3:
132 {
133 // TODO: validate 2nd/3rd args
Damien George3e1a5c12014-03-29 13:43:38 +0000134 if (!MP_OBJ_IS_TYPE(args[0], &mp_type_bytes)) {
Damien Georgeea13f402014-04-05 18:32:08 +0100135 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "bytes expected"));
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200136 }
137 GET_STR_DATA_LEN(args[0], str_data, str_len);
138 GET_STR_HASH(args[0], str_hash);
Damien George3e1a5c12014-03-29 13:43:38 +0000139 mp_obj_str_t *o = str_new(&mp_type_str, NULL, str_len);
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200140 o->data = str_data;
141 o->hash = str_hash;
142 return o;
143 }
144
145 default:
Damien Georgeea13f402014-04-05 18:32:08 +0100146 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "str takes at most 3 arguments"));
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200147 }
148}
149
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200150STATIC mp_obj_t bytes_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
151 if (n_args == 0) {
152 return mp_const_empty_bytes;
153 }
154
Paul Sokolovskyb473d0a2014-05-06 19:30:30 +0300155#if MICROPY_CPYTHON_COMPAT
156 if (n_kw != 0) {
157 mp_arg_error_unimpl_kw();
158 }
159#endif
160
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200161 if (MP_OBJ_IS_STR(args[0])) {
162 if (n_args < 2 || n_args > 3) {
163 goto wrong_args;
164 }
165 GET_STR_DATA_LEN(args[0], str_data, str_len);
166 GET_STR_HASH(args[0], str_hash);
Damien George3e1a5c12014-03-29 13:43:38 +0000167 mp_obj_str_t *o = str_new(&mp_type_bytes, NULL, str_len);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200168 o->data = str_data;
169 o->hash = str_hash;
170 return o;
171 }
172
173 if (n_args > 1) {
174 goto wrong_args;
175 }
176
177 if (MP_OBJ_IS_SMALL_INT(args[0])) {
178 uint len = MP_OBJ_SMALL_INT_VALUE(args[0]);
179 byte *data;
180
Damien George3e1a5c12014-03-29 13:43:38 +0000181 mp_obj_t o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200182 memset(data, 0, len);
183 return mp_obj_str_builder_end(o);
184 }
185
186 int len;
187 byte *data;
188 vstr_t *vstr = NULL;
189 mp_obj_t o = NULL;
190 // Try to create array of exact len if initializer len is known
191 mp_obj_t len_in = mp_obj_len_maybe(args[0]);
192 if (len_in == MP_OBJ_NULL) {
193 len = -1;
194 vstr = vstr_new();
195 } else {
196 len = MP_OBJ_SMALL_INT_VALUE(len_in);
Damien George3e1a5c12014-03-29 13:43:38 +0000197 o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200198 }
199
Damien Georged17926d2014-03-30 13:35:08 +0100200 mp_obj_t iterable = mp_getiter(args[0]);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200201 mp_obj_t item;
Damien Georgeea8d06c2014-04-17 23:19:36 +0100202 while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200203 if (len == -1) {
204 vstr_add_char(vstr, MP_OBJ_SMALL_INT_VALUE(item));
205 } else {
206 *data++ = MP_OBJ_SMALL_INT_VALUE(item);
207 }
208 }
209
210 if (len == -1) {
211 vstr_shrink(vstr);
212 // TODO: Optimize, borrow buffer from vstr
213 len = vstr_len(vstr);
Damien George3e1a5c12014-03-29 13:43:38 +0000214 o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200215 memcpy(data, vstr_str(vstr), len);
216 vstr_free(vstr);
217 }
218
219 return mp_obj_str_builder_end(o);
220
221wrong_args:
Damien Georgeea13f402014-04-05 18:32:08 +0100222 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "wrong number of arguments"));
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200223}
224
Damien George55baff42014-01-21 21:40:13 +0000225// like strstr but with specified length and allows \0 bytes
226// TODO replace with something more efficient/standard
xbe17a5a832014-03-23 23:31:58 -0700227STATIC 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 +0000228 if (hlen >= nlen) {
xbe17a5a832014-03-23 23:31:58 -0700229 machine_uint_t str_index, str_index_end;
230 if (direction > 0) {
231 str_index = 0;
232 str_index_end = hlen - nlen;
233 } else {
234 str_index = hlen - nlen;
235 str_index_end = 0;
236 }
237 for (;;) {
238 if (memcmp(&haystack[str_index], needle, nlen) == 0) {
239 //found
240 return haystack + str_index;
Damien George55baff42014-01-21 21:40:13 +0000241 }
xbe17a5a832014-03-23 23:31:58 -0700242 if (str_index == str_index_end) {
243 //not found
244 break;
Damien George55baff42014-01-21 21:40:13 +0000245 }
xbe17a5a832014-03-23 23:31:58 -0700246 str_index += direction;
Damien George55baff42014-01-21 21:40:13 +0000247 }
248 }
249 return NULL;
250}
251
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200252STATIC 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 +0000253 GET_STR_DATA_LEN(lhs_in, lhs_data, lhs_len);
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300254 mp_obj_type_t *lhs_type = mp_obj_get_type(lhs_in);
255 mp_obj_type_t *rhs_type = mp_obj_get_type(rhs_in);
Damiend99b0522013-12-21 18:17:45 +0000256 switch (op) {
Damien Georged17926d2014-03-30 13:35:08 +0100257 case MP_BINARY_OP_ADD:
258 case MP_BINARY_OP_INPLACE_ADD:
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300259 if (lhs_type == rhs_type) {
260 // add 2 strings or bytes
Damien George5fa93b62014-01-22 14:35:10 +0000261
262 GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
Damien George55baff42014-01-21 21:40:13 +0000263 int alloc_len = lhs_len + rhs_len;
Damien George5fa93b62014-01-22 14:35:10 +0000264
265 /* code for making qstr
Damien George55baff42014-01-21 21:40:13 +0000266 byte *q_ptr;
267 byte *val = qstr_build_start(alloc_len, &q_ptr);
268 memcpy(val, lhs_data, lhs_len);
269 memcpy(val + lhs_len, rhs_data, rhs_len);
Damien George5fa93b62014-01-22 14:35:10 +0000270 return MP_OBJ_NEW_QSTR(qstr_build_end(q_ptr));
271 */
272
273 // code for non-qstr
274 byte *data;
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300275 mp_obj_t s = mp_obj_str_builder_start(lhs_type, alloc_len, &data);
Damien George5fa93b62014-01-22 14:35:10 +0000276 memcpy(data, lhs_data, lhs_len);
277 memcpy(data + lhs_len, rhs_data, rhs_len);
278 return mp_obj_str_builder_end(s);
Damiend99b0522013-12-21 18:17:45 +0000279 }
280 break;
Damien George5fa93b62014-01-22 14:35:10 +0000281
Damien Georged17926d2014-03-30 13:35:08 +0100282 case MP_BINARY_OP_IN:
John R. Lentonc1bef212014-01-11 12:39:33 +0000283 /* NOTE `a in b` is `b.__contains__(a)` */
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300284 if (lhs_type == rhs_type) {
Damien George5fa93b62014-01-22 14:35:10 +0000285 GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
xbe17a5a832014-03-23 23:31:58 -0700286 return MP_BOOL(find_subbytes(lhs_data, lhs_len, rhs_data, rhs_len, 1) != NULL);
John R. Lentonc1bef212014-01-11 12:39:33 +0000287 }
288 break;
Damien George5fa93b62014-01-22 14:35:10 +0000289
Damien Georged0a5bf32014-05-10 13:55:11 +0100290 case MP_BINARY_OP_MULTIPLY: {
Paul Sokolovsky545591a2014-01-21 00:27:33 +0200291 if (!MP_OBJ_IS_SMALL_INT(rhs_in)) {
Damien Georged0a5bf32014-05-10 13:55:11 +0100292 return MP_OBJ_NOT_SUPPORTED;
Paul Sokolovsky545591a2014-01-21 00:27:33 +0200293 }
294 int n = MP_OBJ_SMALL_INT_VALUE(rhs_in);
Damien George5fa93b62014-01-22 14:35:10 +0000295 byte *data;
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300296 mp_obj_t s = mp_obj_str_builder_start(lhs_type, lhs_len * n, &data);
Damien George5fa93b62014-01-22 14:35:10 +0000297 mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, data);
298 return mp_obj_str_builder_end(s);
Paul Sokolovsky545591a2014-01-21 00:27:33 +0200299 }
Paul Sokolovsky87e85b72014-02-02 08:24:07 +0200300
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300301 case MP_BINARY_OP_MODULO: {
302 mp_obj_t *args;
303 uint n_args;
304 if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple)) {
305 // TODO: Support tuple subclasses?
306 mp_obj_tuple_get(rhs_in, &n_args, &args);
307 } else {
308 args = &rhs_in;
309 n_args = 1;
310 }
311 return str_modulo_format(lhs_in, n_args, args);
312 }
313
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300314 //case MP_BINARY_OP_NOT_EQUAL: // This is never passed here
315 case MP_BINARY_OP_EQUAL: // This will be passed only for bytes, str is dealt with in mp_obj_equal()
Damien Georged17926d2014-03-30 13:35:08 +0100316 case MP_BINARY_OP_LESS:
317 case MP_BINARY_OP_LESS_EQUAL:
318 case MP_BINARY_OP_MORE:
319 case MP_BINARY_OP_MORE_EQUAL:
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300320 if (lhs_type == rhs_type) {
Paul Sokolovsky87e85b72014-02-02 08:24:07 +0200321 GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
322 return MP_BOOL(mp_seq_cmp_bytes(op, lhs_data, lhs_len, rhs_data, rhs_len));
323 }
Damiend99b0522013-12-21 18:17:45 +0000324 }
325
Damien Georgeea8d06c2014-04-17 23:19:36 +0100326 return MP_OBJ_NOT_SUPPORTED;
Damiend99b0522013-12-21 18:17:45 +0000327}
328
Damien George729f7b42014-04-17 22:10:53 +0100329STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
330 GET_STR_DATA_LEN(self_in, self_data, self_len);
331 if (value == MP_OBJ_SENTINEL) {
332 // load
333#if MICROPY_ENABLE_SLICE
334 if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
335 machine_uint_t start, stop;
Paul Sokolovskyd915a522014-05-10 21:36:33 +0300336 if (!mp_seq_get_fast_slice_indexes(self_len, index, &start, &stop)) {
Damien George729f7b42014-04-17 22:10:53 +0100337 assert(0);
338 }
339 return mp_obj_new_str(self_data + start, stop - start, false);
340 }
341#endif
342 mp_obj_type_t *type = mp_obj_get_type(self_in);
343 uint index_val = mp_get_index(type, self_len, index, false);
344 if (type == &mp_type_bytes) {
345 return MP_OBJ_NEW_SMALL_INT((mp_small_int_t)self_data[index_val]);
346 } else {
347 return mp_obj_new_str(self_data + index_val, 1, true);
348 }
349 } else {
350 return MP_OBJ_NOT_SUPPORTED;
351 }
352}
353
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200354STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
Damien George5fa93b62014-01-22 14:35:10 +0000355 assert(MP_OBJ_IS_STR(self_in));
Damiend99b0522013-12-21 18:17:45 +0000356
Damien Georgefe8fb912014-01-02 16:36:09 +0000357 // get separation string
Damien George5fa93b62014-01-22 14:35:10 +0000358 GET_STR_DATA_LEN(self_in, sep_str, sep_len);
Damien Georgefe8fb912014-01-02 16:36:09 +0000359
360 // process args
Damiend99b0522013-12-21 18:17:45 +0000361 uint seq_len;
362 mp_obj_t *seq_items;
Damien George07ddab52014-03-29 13:15:08 +0000363 if (MP_OBJ_IS_TYPE(arg, &mp_type_tuple)) {
Damiend99b0522013-12-21 18:17:45 +0000364 mp_obj_tuple_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000365 } else {
Damien Georgea157e4c2014-04-09 19:17:53 +0100366 if (!MP_OBJ_IS_TYPE(arg, &mp_type_list)) {
367 // arg is not a list, try to convert it to one
Paul Sokolovsky881d9af2014-04-10 01:42:40 +0300368 // TODO: Try to optimize?
Damien Georgea157e4c2014-04-09 19:17:53 +0100369 arg = mp_type_list.make_new((mp_obj_t)&mp_type_list, 1, 0, &arg);
370 }
371 mp_obj_list_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000372 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000373
374 // count required length
375 int required_len = 0;
Damiend99b0522013-12-21 18:17:45 +0000376 for (int i = 0; i < seq_len; i++) {
Damien George5fa93b62014-01-22 14:35:10 +0000377 if (!MP_OBJ_IS_STR(seq_items[i])) {
Damien Georgea157e4c2014-04-09 19:17:53 +0100378 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "join expected a list of str's"));
Damiend99b0522013-12-21 18:17:45 +0000379 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000380 if (i > 0) {
381 required_len += sep_len;
382 }
Damien George5fa93b62014-01-22 14:35:10 +0000383 GET_STR_LEN(seq_items[i], l);
384 required_len += l;
Damiend99b0522013-12-21 18:17:45 +0000385 }
386
387 // make joined string
Damien George5fa93b62014-01-22 14:35:10 +0000388 byte *data;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +0200389 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 +0000390 for (int i = 0; i < seq_len; i++) {
Damiend99b0522013-12-21 18:17:45 +0000391 if (i > 0) {
Damien George5fa93b62014-01-22 14:35:10 +0000392 memcpy(data, sep_str, sep_len);
393 data += sep_len;
Damiend99b0522013-12-21 18:17:45 +0000394 }
Damien George5fa93b62014-01-22 14:35:10 +0000395 GET_STR_DATA_LEN(seq_items[i], s, l);
396 memcpy(data, s, l);
397 data += l;
Damiend99b0522013-12-21 18:17:45 +0000398 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000399
400 // return joined string
Damien George5fa93b62014-01-22 14:35:10 +0000401 return mp_obj_str_builder_end(joined_str);
Damiend99b0522013-12-21 18:17:45 +0000402}
403
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200404#define is_ws(c) ((c) == ' ' || (c) == '\t')
405
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200406STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) {
Damien Georgedeed0872014-04-06 11:11:15 +0100407 machine_int_t splits = -1;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200408 mp_obj_t sep = mp_const_none;
409 if (n_args > 1) {
410 sep = args[1];
411 if (n_args > 2) {
Damien Georgedeed0872014-04-06 11:11:15 +0100412 splits = mp_obj_get_int(args[2]);
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200413 }
414 }
Damien Georgedeed0872014-04-06 11:11:15 +0100415
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200416 mp_obj_t res = mp_obj_new_list(0, NULL);
Damien George5fa93b62014-01-22 14:35:10 +0000417 GET_STR_DATA_LEN(args[0], s, len);
418 const byte *top = s + len;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200419
Damien Georgedeed0872014-04-06 11:11:15 +0100420 if (sep == mp_const_none) {
421 // sep not given, so separate on whitespace
422
423 // Initial whitespace is not counted as split, so we pre-do it
Damien George5fa93b62014-01-22 14:35:10 +0000424 while (s < top && is_ws(*s)) s++;
Damien Georgedeed0872014-04-06 11:11:15 +0100425 while (s < top && splits != 0) {
426 const byte *start = s;
427 while (s < top && !is_ws(*s)) s++;
428 mp_obj_list_append(res, mp_obj_new_str(start, s - start, false));
429 if (s >= top) {
430 break;
431 }
432 while (s < top && is_ws(*s)) s++;
433 if (splits > 0) {
434 splits--;
435 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200436 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200437
Damien Georgedeed0872014-04-06 11:11:15 +0100438 if (s < top) {
439 mp_obj_list_append(res, mp_obj_new_str(s, top - s, false));
440 }
441
442 } else {
443 // sep given
444
445 uint sep_len;
446 const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
447
448 if (sep_len == 0) {
449 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
450 }
451
452 for (;;) {
453 const byte *start = s;
454 for (;;) {
455 if (splits == 0 || s + sep_len > top) {
456 s = top;
457 break;
458 } else if (memcmp(s, sep_str, sep_len) == 0) {
459 break;
460 }
461 s++;
462 }
463 mp_obj_list_append(res, mp_obj_new_str(start, s - start, false));
464 if (s >= top) {
465 break;
466 }
467 s += sep_len;
468 if (splits > 0) {
469 splits--;
470 }
471 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200472 }
473
474 return res;
475}
476
xbe3d9a39e2014-04-08 11:42:19 -0700477STATIC 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 +0000478 assert(2 <= n_args && n_args <= 4);
Damien George5fa93b62014-01-22 14:35:10 +0000479 assert(MP_OBJ_IS_STR(args[0]));
480 assert(MP_OBJ_IS_STR(args[1]));
John R. Lentone8204912014-01-12 21:53:52 +0000481
Damien George5fa93b62014-01-22 14:35:10 +0000482 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
483 GET_STR_DATA_LEN(args[1], needle, needle_len);
John R. Lentone8204912014-01-12 21:53:52 +0000484
xbec5538882014-03-16 17:58:35 -0700485 machine_uint_t start = 0;
486 machine_uint_t end = haystack_len;
John R. Lentone8204912014-01-12 21:53:52 +0000487 if (n_args >= 3 && args[2] != mp_const_none) {
Damien George3e1a5c12014-03-29 13:43:38 +0000488 start = mp_get_index(&mp_type_str, haystack_len, args[2], true);
John R. Lentone8204912014-01-12 21:53:52 +0000489 }
490 if (n_args >= 4 && args[3] != mp_const_none) {
Damien George3e1a5c12014-03-29 13:43:38 +0000491 end = mp_get_index(&mp_type_str, haystack_len, args[3], true);
John R. Lentone8204912014-01-12 21:53:52 +0000492 }
493
xbe17a5a832014-03-23 23:31:58 -0700494 const byte *p = find_subbytes(haystack + start, end - start, needle, needle_len, direction);
Damien George23005372014-01-13 19:39:01 +0000495 if (p == NULL) {
496 // not found
xbe3d9a39e2014-04-08 11:42:19 -0700497 if (is_index) {
498 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "substring not found"));
499 } else {
500 return MP_OBJ_NEW_SMALL_INT(-1);
501 }
Damien George23005372014-01-13 19:39:01 +0000502 } else {
503 // found
xbe17a5a832014-03-23 23:31:58 -0700504 return MP_OBJ_NEW_SMALL_INT(p - haystack);
John R. Lentone8204912014-01-12 21:53:52 +0000505 }
John R. Lentone8204912014-01-12 21:53:52 +0000506}
507
xbe17a5a832014-03-23 23:31:58 -0700508STATIC mp_obj_t str_find(uint n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700509 return str_finder(n_args, args, 1, false);
xbe17a5a832014-03-23 23:31:58 -0700510}
511
512STATIC mp_obj_t str_rfind(uint n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700513 return str_finder(n_args, args, -1, false);
514}
515
516STATIC mp_obj_t str_index(uint n_args, const mp_obj_t *args) {
517 return str_finder(n_args, args, 1, true);
518}
519
520STATIC mp_obj_t str_rindex(uint n_args, const mp_obj_t *args) {
521 return str_finder(n_args, args, -1, true);
xbe17a5a832014-03-23 23:31:58 -0700522}
523
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200524// TODO: (Much) more variety in args
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200525STATIC mp_obj_t str_startswith(mp_obj_t self_in, mp_obj_t arg) {
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200526 GET_STR_DATA_LEN(self_in, str, str_len);
527 GET_STR_DATA_LEN(arg, prefix, prefix_len);
528 if (prefix_len > str_len) {
529 return mp_const_false;
530 }
531 return MP_BOOL(memcmp(str, prefix, prefix_len) == 0);
532}
533
Paul Sokolovsky88107842014-04-26 06:20:08 +0300534enum { LSTRIP, RSTRIP, STRIP };
535
536STATIC mp_obj_t str_uni_strip(int type, uint n_args, const mp_obj_t *args) {
xbe7b0f39f2014-01-08 14:23:45 -0800537 assert(1 <= n_args && n_args <= 2);
Damien George5fa93b62014-01-22 14:35:10 +0000538 assert(MP_OBJ_IS_STR(args[0]));
539
540 const byte *chars_to_del;
541 uint chars_to_del_len;
542 static const byte whitespace[] = " \t\n\r\v\f";
xbe7b0f39f2014-01-08 14:23:45 -0800543
544 if (n_args == 1) {
545 chars_to_del = whitespace;
Damien George5fa93b62014-01-22 14:35:10 +0000546 chars_to_del_len = sizeof(whitespace);
xbe7b0f39f2014-01-08 14:23:45 -0800547 } else {
Damien George5fa93b62014-01-22 14:35:10 +0000548 assert(MP_OBJ_IS_STR(args[1]));
549 GET_STR_DATA_LEN(args[1], s, l);
550 chars_to_del = s;
551 chars_to_del_len = l;
xbe7b0f39f2014-01-08 14:23:45 -0800552 }
553
Damien George5fa93b62014-01-22 14:35:10 +0000554 GET_STR_DATA_LEN(args[0], orig_str, orig_str_len);
xbe7b0f39f2014-01-08 14:23:45 -0800555
xbec5538882014-03-16 17:58:35 -0700556 machine_uint_t first_good_char_pos = 0;
xbe7b0f39f2014-01-08 14:23:45 -0800557 bool first_good_char_pos_set = false;
xbec5538882014-03-16 17:58:35 -0700558 machine_uint_t last_good_char_pos = 0;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300559 machine_uint_t i = 0;
560 machine_int_t delta = 1;
561 if (type == RSTRIP) {
562 i = orig_str_len - 1;
563 delta = -1;
564 }
565 for (machine_uint_t len = orig_str_len; len > 0; len--) {
xbe17a5a832014-03-23 23:31:58 -0700566 if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) {
xbe7b0f39f2014-01-08 14:23:45 -0800567 if (!first_good_char_pos_set) {
568 first_good_char_pos = i;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300569 if (type == LSTRIP) {
570 last_good_char_pos = orig_str_len - 1;
571 break;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300572 } else if (type == RSTRIP) {
573 first_good_char_pos = 0;
574 last_good_char_pos = i;
575 break;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300576 }
xbe7b0f39f2014-01-08 14:23:45 -0800577 first_good_char_pos_set = true;
578 }
Paul Sokolovsky88107842014-04-26 06:20:08 +0300579 last_good_char_pos = i;
xbe7b0f39f2014-01-08 14:23:45 -0800580 }
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300581 i += delta;
xbe7b0f39f2014-01-08 14:23:45 -0800582 }
583
584 if (first_good_char_pos == 0 && last_good_char_pos == 0) {
Damien George5fa93b62014-01-22 14:35:10 +0000585 // string is all whitespace, return ''
586 return MP_OBJ_NEW_QSTR(MP_QSTR_);
xbe7b0f39f2014-01-08 14:23:45 -0800587 }
588
589 assert(last_good_char_pos >= first_good_char_pos);
590 //+1 to accomodate the last character
xbec5538882014-03-16 17:58:35 -0700591 machine_uint_t stripped_len = last_good_char_pos - first_good_char_pos + 1;
Damien George5fa93b62014-01-22 14:35:10 +0000592 return mp_obj_new_str(orig_str + first_good_char_pos, stripped_len, false);
xbe7b0f39f2014-01-08 14:23:45 -0800593}
594
Paul Sokolovsky88107842014-04-26 06:20:08 +0300595STATIC mp_obj_t str_strip(uint n_args, const mp_obj_t *args) {
596 return str_uni_strip(STRIP, n_args, args);
597}
598
599STATIC mp_obj_t str_lstrip(uint n_args, const mp_obj_t *args) {
600 return str_uni_strip(LSTRIP, n_args, args);
601}
602
603STATIC mp_obj_t str_rstrip(uint n_args, const mp_obj_t *args) {
604 return str_uni_strip(RSTRIP, n_args, args);
605}
606
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700607// Takes an int arg, but only parses unsigned numbers, and only changes
608// *num if at least one digit was parsed.
609static int str_to_int(const char *str, int *num) {
610 const char *s = str;
611 if (unichar_isdigit(*s)) {
612 *num = 0;
613 do {
614 *num = *num * 10 + (*s - '0');
615 s++;
616 }
617 while (unichar_isdigit(*s));
618 }
619 return s - str;
620}
621
622static bool isalignment(char ch) {
623 return ch && strchr("<>=^", ch) != NULL;
624}
625
626static bool istype(char ch) {
627 return ch && strchr("bcdeEfFgGnosxX%", ch) != NULL;
628}
629
630static bool arg_looks_integer(mp_obj_t arg) {
631 return MP_OBJ_IS_TYPE(arg, &mp_type_bool) || MP_OBJ_IS_INT(arg);
632}
633
634static bool arg_looks_numeric(mp_obj_t arg) {
635 return arg_looks_integer(arg)
636#if MICROPY_ENABLE_FLOAT
637 || MP_OBJ_IS_TYPE(arg, &mp_type_float)
638#endif
639 ;
640}
641
Dave Hylandsc4029e52014-04-07 11:19:51 -0700642static mp_obj_t arg_as_int(mp_obj_t arg) {
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700643#if MICROPY_ENABLE_FLOAT
644 if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
Dave Hylandsc4029e52014-04-07 11:19:51 -0700645
646 // TODO: Needs a way to construct an mpz integer from a float
647
648 mp_small_int_t num = mp_obj_get_float(arg);
649 return MP_OBJ_NEW_SMALL_INT(num);
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700650 }
651#endif
Dave Hylandsc4029e52014-04-07 11:19:51 -0700652 return arg;
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700653}
654
Damien George897fe0c2014-04-15 22:03:55 +0100655mp_obj_t mp_obj_str_format(uint n_args, const mp_obj_t *args) {
Damien George5fa93b62014-01-22 14:35:10 +0000656 assert(MP_OBJ_IS_STR(args[0]));
Damiend99b0522013-12-21 18:17:45 +0000657
Damien George5fa93b62014-01-22 14:35:10 +0000658 GET_STR_DATA_LEN(args[0], str, len);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700659 int arg_i = 0;
Damiend99b0522013-12-21 18:17:45 +0000660 vstr_t *vstr = vstr_new();
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700661 pfenv_t pfenv_vstr;
662 pfenv_vstr.data = vstr;
663 pfenv_vstr.print_strn = pfenv_vstr_add_strn;
664
Damien George5fa93b62014-01-22 14:35:10 +0000665 for (const byte *top = str + len; str < top; str++) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700666 if (*str == '}') {
Damiend99b0522013-12-21 18:17:45 +0000667 str++;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700668 if (str < top && *str == '}') {
669 vstr_add_char(vstr, '}');
670 continue;
671 }
Damien Georgeea13f402014-04-05 18:32:08 +0100672 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Single '}' encountered in format string"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700673 }
674 if (*str != '{') {
675 vstr_add_char(vstr, *str);
676 continue;
677 }
678
679 str++;
680 if (str < top && *str == '{') {
681 vstr_add_char(vstr, '{');
682 continue;
683 }
684
685 // replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}"
686
687 vstr_t *field_name = NULL;
688 char conversion = '\0';
689 vstr_t *format_spec = NULL;
690
691 if (str < top && *str != '}' && *str != '!' && *str != ':') {
692 field_name = vstr_new();
693 while (str < top && *str != '}' && *str != '!' && *str != ':') {
694 vstr_add_char(field_name, *str++);
695 }
696 vstr_add_char(field_name, '\0');
697 }
698
699 // conversion ::= "r" | "s"
700
701 if (str < top && *str == '!') {
702 str++;
703 if (str < top && (*str == 'r' || *str == 's')) {
704 conversion = *str++;
Paul Sokolovskyf2b796e2014-01-15 22:45:20 +0200705 } else {
Damien Georgeea13f402014-04-05 18:32:08 +0100706 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 -0700707 }
708 }
709
710 if (str < top && *str == ':') {
711 str++;
712 // {:} is the same as {}, which is the same as {!s}
713 // This makes a difference when passing in a True or False
714 // '{}'.format(True) returns 'True'
715 // '{:d}'.format(True) returns '1'
716 // So we treat {:} as {} and this later gets treated to be {!s}
717 if (*str != '}') {
718 format_spec = vstr_new();
719 while (str < top && *str != '}') {
720 vstr_add_char(format_spec, *str++);
Damiend99b0522013-12-21 18:17:45 +0000721 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700722 vstr_add_char(format_spec, '\0');
723 }
724 }
725 if (str >= top) {
Damien Georgeea13f402014-04-05 18:32:08 +0100726 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "unmatched '{' in format"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700727 }
728 if (*str != '}') {
Damien Georgeea13f402014-04-05 18:32:08 +0100729 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "expected ':' after format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700730 }
731
732 mp_obj_t arg = mp_const_none;
733
734 if (field_name) {
735 if (arg_i > 0) {
Damien Georgeea13f402014-04-05 18:32:08 +0100736 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 -0700737 }
Damien George3bb8bd82014-04-14 21:20:30 +0100738 int index = 0;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700739 if (str_to_int(vstr_str(field_name), &index) != vstr_len(field_name) - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100740 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "attributes not supported yet"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700741 }
742 if (index >= n_args - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100743 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700744 }
745 arg = args[index + 1];
746 arg_i = -1;
747 vstr_free(field_name);
748 field_name = NULL;
749 } else {
750 if (arg_i < 0) {
Damien Georgeea13f402014-04-05 18:32:08 +0100751 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 -0700752 }
753 if (arg_i >= n_args - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100754 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700755 }
756 arg = args[arg_i + 1];
757 arg_i++;
758 }
759 if (!format_spec && !conversion) {
760 conversion = 's';
761 }
762 if (conversion) {
763 mp_print_kind_t print_kind;
764 if (conversion == 's') {
765 print_kind = PRINT_STR;
766 } else if (conversion == 'r') {
767 print_kind = PRINT_REPR;
768 } else {
Damien Georgeea13f402014-04-05 18:32:08 +0100769 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Unknown conversion specifier %c", conversion));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700770 }
771 vstr_t *arg_vstr = vstr_new();
772 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, arg_vstr, arg, print_kind);
773 arg = mp_obj_new_str((const byte *)vstr_str(arg_vstr), vstr_len(arg_vstr), false);
774 vstr_free(arg_vstr);
775 }
776
777 char sign = '\0';
778 char fill = '\0';
779 char align = '\0';
780 int width = -1;
781 int precision = -1;
782 char type = '\0';
783 int flags = 0;
784
785 if (format_spec) {
786 // The format specifier (from http://docs.python.org/2/library/string.html#formatspec)
787 //
788 // [[fill]align][sign][#][0][width][,][.precision][type]
789 // fill ::= <any character>
790 // align ::= "<" | ">" | "=" | "^"
791 // sign ::= "+" | "-" | " "
792 // width ::= integer
793 // precision ::= integer
794 // type ::= "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
795
796 const char *s = vstr_str(format_spec);
797 if (isalignment(*s)) {
798 align = *s++;
799 } else if (*s && isalignment(s[1])) {
800 fill = *s++;
801 align = *s++;
802 }
803 if (*s == '+' || *s == '-' || *s == ' ') {
804 if (*s == '+') {
805 flags |= PF_FLAG_SHOW_SIGN;
806 } else if (*s == ' ') {
807 flags |= PF_FLAG_SPACE_SIGN;
808 }
809 sign = *s++;
810 }
811 if (*s == '#') {
812 flags |= PF_FLAG_SHOW_PREFIX;
813 s++;
814 }
815 if (*s == '0') {
816 if (!align) {
817 align = '=';
818 }
819 if (!fill) {
820 fill = '0';
821 }
822 }
823 s += str_to_int(s, &width);
824 if (*s == ',') {
825 flags |= PF_FLAG_SHOW_COMMA;
826 s++;
827 }
828 if (*s == '.') {
829 s++;
830 s += str_to_int(s, &precision);
831 }
832 if (istype(*s)) {
833 type = *s++;
834 }
835 if (*s) {
Damien Georgeea13f402014-04-05 18:32:08 +0100836 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "Invalid conversion specification"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700837 }
838 vstr_free(format_spec);
839 format_spec = NULL;
840 }
841 if (!align) {
842 if (arg_looks_numeric(arg)) {
843 align = '>';
844 } else {
845 align = '<';
846 }
847 }
848 if (!fill) {
849 fill = ' ';
850 }
851
852 if (sign) {
853 if (type == 's') {
Damien Georgeea13f402014-04-05 18:32:08 +0100854 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed in string format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700855 }
856 if (type == 'c') {
Damien Georgeea13f402014-04-05 18:32:08 +0100857 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed with integer format specifier 'c'"));
Damiend99b0522013-12-21 18:17:45 +0000858 }
859 } else {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700860 sign = '-';
861 }
862
863 switch (align) {
864 case '<': flags |= PF_FLAG_LEFT_ADJUST; break;
865 case '=': flags |= PF_FLAG_PAD_AFTER_SIGN; break;
866 case '^': flags |= PF_FLAG_CENTER_ADJUST; break;
867 }
868
869 if (arg_looks_integer(arg)) {
870 switch (type) {
871 case 'b':
Damien Georgea12a0f72014-04-08 01:29:53 +0100872 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 2, 'a', flags, fill, width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700873 continue;
874
875 case 'c':
876 {
877 char ch = mp_obj_get_int(arg);
878 pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, fill, width);
879 continue;
880 }
881
882 case '\0': // No explicit format type implies 'd'
883 case 'n': // I don't think we support locales in uPy so use 'd'
884 case 'd':
Damien Georgea12a0f72014-04-08 01:29:53 +0100885 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 10, 'a', flags, fill, width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700886 continue;
887
888 case 'o':
Dave Hylandsc4029e52014-04-07 11:19:51 -0700889 if (flags & PF_FLAG_SHOW_PREFIX) {
890 flags |= PF_FLAG_SHOW_OCTAL_LETTER;
891 }
892
Damien Georgea12a0f72014-04-08 01:29:53 +0100893 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 8, 'a', flags, fill, width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700894 continue;
895
896 case 'x':
Damien Georgea12a0f72014-04-08 01:29:53 +0100897 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, 'a', flags, fill, width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700898 continue;
899
900 case 'X':
Damien Georgea12a0f72014-04-08 01:29:53 +0100901 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, 'A', flags, fill, width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700902 continue;
903
904 case 'e':
905 case 'E':
906 case 'f':
907 case 'F':
908 case 'g':
909 case 'G':
910 case '%':
911 // The floating point formatters all work with anything that
912 // looks like an integer
913 break;
914
915 default:
Damien Georgeea13f402014-04-05 18:32:08 +0100916 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700917 "Unknown format code '%c' for object of type '%s'", type, mp_obj_get_type_str(arg)));
918 }
Damien Georgec322c5f2014-04-02 20:04:15 +0100919 }
Damien George70f33cd2014-04-02 17:06:05 +0100920
Dave Hylands22fe4d72014-04-02 12:07:31 -0700921 // NOTE: no else here. We need the e, f, g etc formats for integer
922 // arguments (from above if) to take this if.
Damien Georgec322c5f2014-04-02 20:04:15 +0100923 if (arg_looks_numeric(arg)) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700924 if (!type) {
925
926 // Even though the docs say that an unspecified type is the same
927 // as 'g', there is one subtle difference, when the exponent
928 // is one less than the precision.
929 //
930 // '{:10.1}'.format(0.0) ==> '0e+00'
931 // '{:10.1g}'.format(0.0) ==> '0'
932 //
933 // TODO: Figure out how to deal with this.
934 //
935 // A proper solution would involve adding a special flag
936 // or something to format_float, and create a format_double
937 // to deal with doubles. In order to fix this when using
938 // sprintf, we'd need to use the e format and tweak the
939 // returned result to strip trailing zeros like the g format
940 // does.
941 //
942 // {:10.3} and {:10.2e} with 1.23e2 both produce 1.23e+02
943 // but with 1.e2 you get 1e+02 and 1.00e+02
944 //
945 // Stripping the trailing 0's (like g) does would make the
946 // e format give us the right format.
947 //
948 // CPython sources say:
949 // Omitted type specifier. Behaves in the same way as repr(x)
950 // and str(x) if no precision is given, else like 'g', but with
951 // at least one digit after the decimal point. */
952
953 type = 'g';
954 }
955 if (type == 'n') {
956 type = 'g';
957 }
958
959 flags |= PF_FLAG_PAD_NAN_INF; // '{:06e}'.format(float('-inf')) should give '-00inf'
960 switch (type) {
Damien Georgec322c5f2014-04-02 20:04:15 +0100961#if MICROPY_ENABLE_FLOAT
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700962 case 'e':
963 case 'E':
964 case 'f':
965 case 'F':
966 case 'g':
967 case 'G':
968 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), type, flags, fill, width, precision);
969 break;
970
971 case '%':
972 flags |= PF_FLAG_ADD_PERCENT;
973 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg) * 100.0F, 'f', flags, fill, width, precision);
974 break;
Damien Georgec322c5f2014-04-02 20:04:15 +0100975#endif
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700976
977 default:
Damien Georgeea13f402014-04-05 18:32:08 +0100978 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700979 "Unknown format code '%c' for object of type 'float'",
980 type, mp_obj_get_type_str(arg)));
981 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700982 } else {
Damien George70f33cd2014-04-02 17:06:05 +0100983 // arg doesn't look like a number
984
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700985 if (align == '=') {
Damien Georgeea13f402014-04-05 18:32:08 +0100986 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "'=' alignment not allowed in string format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700987 }
Damien George70f33cd2014-04-02 17:06:05 +0100988
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700989 switch (type) {
990 case '\0':
991 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, arg, PRINT_STR);
992 break;
993
994 case 's':
995 {
996 uint len;
997 const char *s = mp_obj_str_get_data(arg, &len);
998 if (precision < 0) {
999 precision = len;
1000 }
1001 if (len > precision) {
1002 len = precision;
1003 }
1004 pfenv_print_strn(&pfenv_vstr, s, len, flags, fill, width);
1005 break;
1006 }
1007
1008 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001009 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001010 "Unknown format code '%c' for object of type 'str'",
1011 type, mp_obj_get_type_str(arg)));
1012 }
Damiend99b0522013-12-21 18:17:45 +00001013 }
1014 }
1015
Damien George5fa93b62014-01-22 14:35:10 +00001016 mp_obj_t s = mp_obj_new_str((byte*)vstr->buf, vstr->len, false);
1017 vstr_free(vstr);
1018 return s;
Damiend99b0522013-12-21 18:17:45 +00001019}
1020
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001021STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, uint n_args, const mp_obj_t *args) {
1022 assert(MP_OBJ_IS_STR(pattern));
1023
1024 GET_STR_DATA_LEN(pattern, str, len);
Dave Hylands6756a372014-04-02 11:42:39 -07001025 const byte *start_str = str;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001026 int arg_i = 0;
1027 vstr_t *vstr = vstr_new();
Dave Hylands6756a372014-04-02 11:42:39 -07001028 pfenv_t pfenv_vstr;
1029 pfenv_vstr.data = vstr;
1030 pfenv_vstr.print_strn = pfenv_vstr_add_strn;
1031
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001032 for (const byte *top = str + len; str < top; str++) {
Dave Hylands6756a372014-04-02 11:42:39 -07001033 if (*str != '%') {
1034 vstr_add_char(vstr, *str);
1035 continue;
1036 }
1037 if (++str >= top) {
1038 break;
1039 }
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001040 if (*str == '%') {
Dave Hylands6756a372014-04-02 11:42:39 -07001041 vstr_add_char(vstr, '%');
1042 continue;
1043 }
1044 if (arg_i >= n_args) {
Damien Georgeea13f402014-04-05 18:32:08 +01001045 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not enough arguments for format string"));
Dave Hylands6756a372014-04-02 11:42:39 -07001046 }
1047 int flags = 0;
1048 char fill = ' ';
1049 bool alt = false;
1050 while (str < top) {
1051 if (*str == '-') flags |= PF_FLAG_LEFT_ADJUST;
1052 else if (*str == '+') flags |= PF_FLAG_SHOW_SIGN;
1053 else if (*str == ' ') flags |= PF_FLAG_SPACE_SIGN;
1054 else if (*str == '#') alt = true;
1055 else if (*str == '0') {
1056 flags |= PF_FLAG_PAD_AFTER_SIGN;
1057 fill = '0';
1058 } else break;
1059 str++;
1060 }
1061 // parse width, if it exists
1062 int width = 0;
1063 if (str < top) {
1064 if (*str == '*') {
1065 width = mp_obj_get_int(args[arg_i++]);
1066 str++;
1067 } else {
1068 for (; str < top && '0' <= *str && *str <= '9'; str++) {
1069 width = width * 10 + *str - '0';
1070 }
1071 }
1072 }
1073 int prec = -1;
1074 if (str < top && *str == '.') {
1075 if (++str < top) {
1076 if (*str == '*') {
1077 prec = mp_obj_get_int(args[arg_i++]);
1078 str++;
1079 } else {
1080 prec = 0;
1081 for (; str < top && '0' <= *str && *str <= '9'; str++) {
1082 prec = prec * 10 + *str - '0';
1083 }
1084 }
1085 }
1086 }
1087
1088 if (str >= top) {
Damien Georgeea13f402014-04-05 18:32:08 +01001089 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "incomplete format"));
Dave Hylands6756a372014-04-02 11:42:39 -07001090 }
1091 mp_obj_t arg = args[arg_i];
1092 switch (*str) {
1093 case 'c':
1094 if (MP_OBJ_IS_STR(arg)) {
1095 uint len;
1096 const char *s = mp_obj_str_get_data(arg, &len);
1097 if (len != 1) {
Damien Georgeea13f402014-04-05 18:32:08 +01001098 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "%c requires int or char"));
Dave Hylands6756a372014-04-02 11:42:39 -07001099 break;
1100 }
1101 pfenv_print_strn(&pfenv_vstr, s, 1, flags, ' ', width);
1102 break;
1103 }
1104 if (arg_looks_integer(arg)) {
1105 char ch = mp_obj_get_int(arg);
1106 pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, ' ', width);
1107 break;
1108 }
1109#if MICROPY_ENABLE_FLOAT
1110 // This is what CPython reports, so we report the same.
1111 if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
Damien Georgeea13f402014-04-05 18:32:08 +01001112 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "integer argument expected, got float"));
Dave Hylands6756a372014-04-02 11:42:39 -07001113
1114 }
1115#endif
Damien Georgeea13f402014-04-05 18:32:08 +01001116 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "an integer is required"));
Dave Hylands6756a372014-04-02 11:42:39 -07001117 break;
1118
1119 case 'd':
1120 case 'i':
1121 case 'u':
Damien Georgea12a0f72014-04-08 01:29:53 +01001122 pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 10, 'a', flags, fill, width);
Dave Hylands6756a372014-04-02 11:42:39 -07001123 break;
1124
1125#if MICROPY_ENABLE_FLOAT
1126 case 'e':
1127 case 'E':
1128 case 'f':
1129 case 'F':
1130 case 'g':
1131 case 'G':
1132 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), *str, flags, fill, width, prec);
1133 break;
1134#endif
1135
1136 case 'o':
1137 if (alt) {
Dave Hylandsc4029e52014-04-07 11:19:51 -07001138 flags |= (PF_FLAG_SHOW_PREFIX | PF_FLAG_SHOW_OCTAL_LETTER);
Dave Hylands6756a372014-04-02 11:42:39 -07001139 }
Damien Georgea12a0f72014-04-08 01:29:53 +01001140 pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 8, 'a', flags, fill, width);
Dave Hylands6756a372014-04-02 11:42:39 -07001141 break;
1142
1143 case 'r':
1144 case 's':
1145 {
1146 vstr_t *arg_vstr = vstr_new();
1147 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf,
1148 arg_vstr, arg, *str == 'r' ? PRINT_REPR : PRINT_STR);
1149 uint len = vstr_len(arg_vstr);
1150 if (prec < 0) {
1151 prec = len;
1152 }
1153 if (len > prec) {
1154 len = prec;
1155 }
1156 pfenv_print_strn(&pfenv_vstr, vstr_str(arg_vstr), len, flags, ' ', width);
1157 vstr_free(arg_vstr);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001158 break;
1159 }
Dave Hylands6756a372014-04-02 11:42:39 -07001160
1161 case 'x':
1162 if (alt) {
1163 flags |= PF_FLAG_SHOW_PREFIX;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001164 }
Damien Georgea12a0f72014-04-08 01:29:53 +01001165 pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 16, 'a', flags, fill, width);
Dave Hylands6756a372014-04-02 11:42:39 -07001166 break;
1167
1168 case 'X':
1169 if (alt) {
1170 flags |= PF_FLAG_SHOW_PREFIX;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001171 }
Damien Georgea12a0f72014-04-08 01:29:53 +01001172 pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 16, 'A', flags, fill, width);
Dave Hylands6756a372014-04-02 11:42:39 -07001173 break;
Damien Georgedeed0872014-04-06 11:11:15 +01001174
Dave Hylands6756a372014-04-02 11:42:39 -07001175 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001176 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylands6756a372014-04-02 11:42:39 -07001177 "unsupported format character '%c' (0x%x) at index %d",
1178 *str, *str, str - start_str));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001179 }
Dave Hylands6756a372014-04-02 11:42:39 -07001180 arg_i++;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001181 }
1182
1183 if (arg_i != n_args) {
Damien Georgeea13f402014-04-05 18:32:08 +01001184 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not all arguments converted during string formatting"));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001185 }
1186
1187 mp_obj_t s = mp_obj_new_str((byte*)vstr->buf, vstr->len, false);
1188 vstr_free(vstr);
1189 return s;
1190}
1191
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001192STATIC mp_obj_t str_replace(uint n_args, const mp_obj_t *args) {
xbe480c15a2014-01-30 22:17:30 -08001193 assert(MP_OBJ_IS_STR(args[0]));
xbe480c15a2014-01-30 22:17:30 -08001194
Damien Georgeff715422014-04-07 00:39:13 +01001195 machine_int_t max_rep = -1;
xbe480c15a2014-01-30 22:17:30 -08001196 if (n_args == 4) {
Damien Georgeff715422014-04-07 00:39:13 +01001197 max_rep = mp_obj_get_int(args[3]);
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001198 if (max_rep == 0) {
1199 return args[0];
1200 } else if (max_rep < 0) {
Damien Georgeff715422014-04-07 00:39:13 +01001201 max_rep = -1;
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001202 }
xbe480c15a2014-01-30 22:17:30 -08001203 }
Damien George94f68302014-01-31 23:45:12 +00001204
xbe729be9b2014-04-07 14:46:39 -07001205 // if max_rep is still -1 by this point we will need to do all possible replacements
xbe480c15a2014-01-30 22:17:30 -08001206
Damien Georgeff715422014-04-07 00:39:13 +01001207 // check argument types
1208
1209 if (!MP_OBJ_IS_STR(args[1])) {
1210 bad_implicit_conversion(args[1]);
1211 }
1212
1213 if (!MP_OBJ_IS_STR(args[2])) {
1214 bad_implicit_conversion(args[2]);
1215 }
1216
1217 // extract string data
1218
xbe480c15a2014-01-30 22:17:30 -08001219 GET_STR_DATA_LEN(args[0], str, str_len);
1220 GET_STR_DATA_LEN(args[1], old, old_len);
1221 GET_STR_DATA_LEN(args[2], new, new_len);
Damien George94f68302014-01-31 23:45:12 +00001222
1223 // old won't exist in str if it's longer, so nothing to replace
xbe480c15a2014-01-30 22:17:30 -08001224 if (old_len > str_len) {
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001225 return args[0];
xbe480c15a2014-01-30 22:17:30 -08001226 }
1227
Damien George94f68302014-01-31 23:45:12 +00001228 // data for the replaced string
1229 byte *data = NULL;
1230 mp_obj_t replaced_str = MP_OBJ_NULL;
xbe480c15a2014-01-30 22:17:30 -08001231
Damien George94f68302014-01-31 23:45:12 +00001232 // do 2 passes over the string:
1233 // first pass computes the required length of the replaced string
1234 // second pass does the replacements
1235 for (;;) {
1236 machine_uint_t replaced_str_index = 0;
1237 machine_uint_t num_replacements_done = 0;
1238 const byte *old_occurrence;
1239 const byte *offset_ptr = str;
Damien Georgeff715422014-04-07 00:39:13 +01001240 machine_uint_t str_len_remain = str_len;
1241 if (old_len == 0) {
1242 // if old_str is empty, copy new_str to start of replaced string
1243 // copy the replacement string
1244 if (data != NULL) {
1245 memcpy(data, new, new_len);
1246 }
1247 replaced_str_index += new_len;
1248 num_replacements_done++;
1249 }
1250 while (num_replacements_done != max_rep && str_len_remain > 0 && (old_occurrence = find_subbytes(offset_ptr, str_len_remain, old, old_len, 1)) != NULL) {
1251 if (old_len == 0) {
1252 old_occurrence += 1;
1253 }
Damien George94f68302014-01-31 23:45:12 +00001254 // copy from just after end of last occurrence of to-be-replaced string to right before start of next occurrence
1255 if (data != NULL) {
1256 memcpy(data + replaced_str_index, offset_ptr, old_occurrence - offset_ptr);
1257 }
1258 replaced_str_index += old_occurrence - offset_ptr;
1259 // copy the replacement string
1260 if (data != NULL) {
1261 memcpy(data + replaced_str_index, new, new_len);
1262 }
1263 replaced_str_index += new_len;
1264 offset_ptr = old_occurrence + old_len;
Damien Georgeff715422014-04-07 00:39:13 +01001265 str_len_remain = str + str_len - offset_ptr;
Damien George94f68302014-01-31 23:45:12 +00001266 num_replacements_done++;
Damien George94f68302014-01-31 23:45:12 +00001267 }
1268
1269 // copy from just after end of last occurrence of to-be-replaced string to end of old string
1270 if (data != NULL) {
Damien Georgeff715422014-04-07 00:39:13 +01001271 memcpy(data + replaced_str_index, offset_ptr, str_len_remain);
Damien George94f68302014-01-31 23:45:12 +00001272 }
Damien Georgeff715422014-04-07 00:39:13 +01001273 replaced_str_index += str_len_remain;
Damien George94f68302014-01-31 23:45:12 +00001274
1275 if (data == NULL) {
1276 // first pass
1277 if (num_replacements_done == 0) {
1278 // no substr found, return original string
1279 return args[0];
1280 } else {
1281 // substr found, allocate new string
1282 replaced_str = mp_obj_str_builder_start(mp_obj_get_type(args[0]), replaced_str_index, &data);
Damien Georgeff715422014-04-07 00:39:13 +01001283 assert(data != NULL);
Damien George94f68302014-01-31 23:45:12 +00001284 }
1285 } else {
1286 // second pass, we are done
1287 break;
1288 }
xbe480c15a2014-01-30 22:17:30 -08001289 }
Damien George94f68302014-01-31 23:45:12 +00001290
xbe480c15a2014-01-30 22:17:30 -08001291 return mp_obj_str_builder_end(replaced_str);
1292}
1293
xbe9e1e8cd2014-03-12 22:57:16 -07001294STATIC mp_obj_t str_count(uint n_args, const mp_obj_t *args) {
1295 assert(2 <= n_args && n_args <= 4);
1296 assert(MP_OBJ_IS_STR(args[0]));
1297 assert(MP_OBJ_IS_STR(args[1]));
1298
1299 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
1300 GET_STR_DATA_LEN(args[1], needle, needle_len);
1301
Damien George536dde22014-03-13 22:07:55 +00001302 machine_uint_t start = 0;
1303 machine_uint_t end = haystack_len;
xbe9e1e8cd2014-03-12 22:57:16 -07001304 if (n_args >= 3 && args[2] != mp_const_none) {
Damien George3e1a5c12014-03-29 13:43:38 +00001305 start = mp_get_index(&mp_type_str, haystack_len, args[2], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001306 }
1307 if (n_args >= 4 && args[3] != mp_const_none) {
Damien George3e1a5c12014-03-29 13:43:38 +00001308 end = mp_get_index(&mp_type_str, haystack_len, args[3], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001309 }
1310
Damien George536dde22014-03-13 22:07:55 +00001311 // if needle_len is zero then we count each gap between characters as an occurrence
1312 if (needle_len == 0) {
1313 return MP_OBJ_NEW_SMALL_INT(end - start + 1);
xbe9e1e8cd2014-03-12 22:57:16 -07001314 }
1315
Damien George536dde22014-03-13 22:07:55 +00001316 // count the occurrences
1317 machine_int_t num_occurrences = 0;
xbec5d70ba2014-03-13 00:29:15 -07001318 for (machine_uint_t haystack_index = start; haystack_index + needle_len <= end; haystack_index++) {
1319 if (memcmp(&haystack[haystack_index], needle, needle_len) == 0) {
1320 num_occurrences++;
1321 haystack_index += needle_len - 1;
1322 }
xbe9e1e8cd2014-03-12 22:57:16 -07001323 }
1324
1325 return MP_OBJ_NEW_SMALL_INT(num_occurrences);
1326}
1327
Damien Georgeb035db32014-03-21 20:39:40 +00001328STATIC mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, machine_int_t direction) {
xbe613a8e32014-03-18 00:06:29 -07001329 assert(MP_OBJ_IS_STR(self_in));
1330 if (!MP_OBJ_IS_STR(arg)) {
Damien Georgedeed0872014-04-06 11:11:15 +01001331 bad_implicit_conversion(arg);
xbe613a8e32014-03-18 00:06:29 -07001332 }
Damien Georgeb035db32014-03-21 20:39:40 +00001333
xbe613a8e32014-03-18 00:06:29 -07001334 GET_STR_DATA_LEN(self_in, str, str_len);
1335 GET_STR_DATA_LEN(arg, sep, sep_len);
1336
1337 if (sep_len == 0) {
Damien Georgeea13f402014-04-05 18:32:08 +01001338 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
xbe613a8e32014-03-18 00:06:29 -07001339 }
Damien Georgeb035db32014-03-21 20:39:40 +00001340
1341 mp_obj_t result[] = {MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_)};
1342
1343 if (direction > 0) {
1344 result[0] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001345 } else {
Damien Georgeb035db32014-03-21 20:39:40 +00001346 result[2] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001347 }
xbe613a8e32014-03-18 00:06:29 -07001348
xbe17a5a832014-03-23 23:31:58 -07001349 const byte *position_ptr = find_subbytes(str, str_len, sep, sep_len, direction);
1350 if (position_ptr != NULL) {
1351 machine_uint_t position = position_ptr - str;
1352 result[0] = mp_obj_new_str(str, position, false);
1353 result[1] = arg;
1354 result[2] = mp_obj_new_str(str + position + sep_len, str_len - position - sep_len, false);
xbe613a8e32014-03-18 00:06:29 -07001355 }
Damien Georgeb035db32014-03-21 20:39:40 +00001356
xbe0a6894c2014-03-21 01:12:26 -07001357 return mp_obj_new_tuple(3, result);
xbe613a8e32014-03-18 00:06:29 -07001358}
1359
Damien Georgeb035db32014-03-21 20:39:40 +00001360STATIC mp_obj_t str_partition(mp_obj_t self_in, mp_obj_t arg) {
1361 return str_partitioner(self_in, arg, 1);
xbe0a6894c2014-03-21 01:12:26 -07001362}
xbe4504ea82014-03-19 00:46:14 -07001363
Damien Georgeb035db32014-03-21 20:39:40 +00001364STATIC mp_obj_t str_rpartition(mp_obj_t self_in, mp_obj_t arg) {
1365 return str_partitioner(self_in, arg, -1);
xbe4504ea82014-03-19 00:46:14 -07001366}
1367
Paul Sokolovsky69135212014-05-10 19:47:41 +03001368enum { CASE_UPPER, CASE_LOWER };
1369
1370// Supposedly not too critical operations, so optimize for code size
1371STATIC mp_obj_t str_caseconv(int op, mp_obj_t self_in) {
1372 GET_STR_DATA_LEN(self_in, self_data, self_len);
1373 byte *data;
1374 mp_obj_t s = mp_obj_str_builder_start(mp_obj_get_type(self_in), self_len, &data);
1375 for (int i = 0; i < self_len; i++) {
1376 if (op == CASE_UPPER) {
1377 *data++ = unichar_toupper(*self_data++);
1378 } else {
1379 *data++ = unichar_tolower(*self_data++);
1380 }
1381 }
1382 *data = 0;
1383 return mp_obj_str_builder_end(s);
1384}
1385
1386STATIC mp_obj_t str_lower(mp_obj_t self_in) {
1387 return str_caseconv(CASE_LOWER, self_in);
1388}
1389
1390STATIC mp_obj_t str_upper(mp_obj_t self_in) {
1391 return str_caseconv(CASE_UPPER, self_in);
1392}
1393
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001394#if MICROPY_CPYTHON_COMPAT
1395// These methods are superfluous in the presense of str() and bytes()
1396// constructors.
1397// TODO: should accept kwargs too
1398STATIC mp_obj_t bytes_decode(uint n_args, const mp_obj_t *args) {
1399 mp_obj_t new_args[2];
1400 if (n_args == 1) {
1401 new_args[0] = args[0];
1402 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1403 args = new_args;
1404 n_args++;
1405 }
1406 return str_make_new(NULL, n_args, 0, args);
1407}
1408
1409// TODO: should accept kwargs too
1410STATIC mp_obj_t str_encode(uint n_args, const mp_obj_t *args) {
1411 mp_obj_t new_args[2];
1412 if (n_args == 1) {
1413 new_args[0] = args[0];
1414 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1415 args = new_args;
1416 n_args++;
1417 }
1418 return bytes_make_new(NULL, n_args, 0, args);
1419}
1420#endif
1421
Damien George57a4b4f2014-04-18 22:29:21 +01001422STATIC machine_int_t str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, int flags) {
1423 if (flags == MP_BUFFER_READ) {
Damien George2da98302014-03-09 19:58:18 +00001424 GET_STR_DATA_LEN(self_in, str_data, str_len);
1425 bufinfo->buf = (void*)str_data;
1426 bufinfo->len = str_len;
Damien George57a4b4f2014-04-18 22:29:21 +01001427 bufinfo->typecode = 'b';
Damien George2da98302014-03-09 19:58:18 +00001428 return 0;
1429 } else {
1430 // can't write to a string
1431 bufinfo->buf = NULL;
1432 bufinfo->len = 0;
Damien George57a4b4f2014-04-18 22:29:21 +01001433 bufinfo->typecode = -1;
Damien George2da98302014-03-09 19:58:18 +00001434 return 1;
1435 }
1436}
1437
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001438#if MICROPY_CPYTHON_COMPAT
1439STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_decode_obj, 1, 3, bytes_decode);
1440STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_encode_obj, 1, 3, str_encode);
1441#endif
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001442STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj, 2, 4, str_find);
xbe17a5a832014-03-23 23:31:58 -07001443STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rfind_obj, 2, 4, str_rfind);
xbe3d9a39e2014-04-08 11:42:19 -07001444STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_index_obj, 2, 4, str_index);
1445STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rindex_obj, 2, 4, str_rindex);
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001446STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join);
1447STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, str_split);
1448STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_startswith_obj, str_startswith);
1449STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip);
Paul Sokolovsky88107842014-04-26 06:20:08 +03001450STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_lstrip_obj, 1, 2, str_lstrip);
1451STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rstrip_obj, 1, 2, str_rstrip);
Damien George897fe0c2014-04-15 22:03:55 +01001452STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(str_format_obj, 1, mp_obj_str_format);
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001453STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj, 3, 4, str_replace);
xbe9e1e8cd2014-03-12 22:57:16 -07001454STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count);
xbe613a8e32014-03-18 00:06:29 -07001455STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition);
xbe4504ea82014-03-19 00:46:14 -07001456STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_rpartition_obj, str_rpartition);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001457STATIC MP_DEFINE_CONST_FUN_OBJ_1(str_lower_obj, str_lower);
1458STATIC MP_DEFINE_CONST_FUN_OBJ_1(str_upper_obj, str_upper);
Damiend99b0522013-12-21 18:17:45 +00001459
Damien George9b196cd2014-03-26 21:47:19 +00001460STATIC const mp_map_elem_t str_locals_dict_table[] = {
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001461#if MICROPY_CPYTHON_COMPAT
1462 { MP_OBJ_NEW_QSTR(MP_QSTR_decode), (mp_obj_t)&bytes_decode_obj },
1463 { MP_OBJ_NEW_QSTR(MP_QSTR_encode), (mp_obj_t)&str_encode_obj },
1464#endif
Damien George9b196cd2014-03-26 21:47:19 +00001465 { MP_OBJ_NEW_QSTR(MP_QSTR_find), (mp_obj_t)&str_find_obj },
1466 { MP_OBJ_NEW_QSTR(MP_QSTR_rfind), (mp_obj_t)&str_rfind_obj },
xbe3d9a39e2014-04-08 11:42:19 -07001467 { MP_OBJ_NEW_QSTR(MP_QSTR_index), (mp_obj_t)&str_index_obj },
1468 { MP_OBJ_NEW_QSTR(MP_QSTR_rindex), (mp_obj_t)&str_rindex_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001469 { MP_OBJ_NEW_QSTR(MP_QSTR_join), (mp_obj_t)&str_join_obj },
1470 { MP_OBJ_NEW_QSTR(MP_QSTR_split), (mp_obj_t)&str_split_obj },
1471 { MP_OBJ_NEW_QSTR(MP_QSTR_startswith), (mp_obj_t)&str_startswith_obj },
1472 { MP_OBJ_NEW_QSTR(MP_QSTR_strip), (mp_obj_t)&str_strip_obj },
Paul Sokolovsky88107842014-04-26 06:20:08 +03001473 { MP_OBJ_NEW_QSTR(MP_QSTR_lstrip), (mp_obj_t)&str_lstrip_obj },
1474 { MP_OBJ_NEW_QSTR(MP_QSTR_rstrip), (mp_obj_t)&str_rstrip_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001475 { MP_OBJ_NEW_QSTR(MP_QSTR_format), (mp_obj_t)&str_format_obj },
1476 { MP_OBJ_NEW_QSTR(MP_QSTR_replace), (mp_obj_t)&str_replace_obj },
1477 { MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&str_count_obj },
1478 { MP_OBJ_NEW_QSTR(MP_QSTR_partition), (mp_obj_t)&str_partition_obj },
1479 { MP_OBJ_NEW_QSTR(MP_QSTR_rpartition), (mp_obj_t)&str_rpartition_obj },
Paul Sokolovsky69135212014-05-10 19:47:41 +03001480 { MP_OBJ_NEW_QSTR(MP_QSTR_lower), (mp_obj_t)&str_lower_obj },
1481 { MP_OBJ_NEW_QSTR(MP_QSTR_upper), (mp_obj_t)&str_upper_obj },
ian-v7a16fad2014-01-06 09:52:29 -08001482};
Damien George97209d32014-01-07 15:58:30 +00001483
Damien George9b196cd2014-03-26 21:47:19 +00001484STATIC MP_DEFINE_CONST_DICT(str_locals_dict, str_locals_dict_table);
1485
Damien George3e1a5c12014-03-29 13:43:38 +00001486const mp_obj_type_t mp_type_str = {
Damien Georgec5966122014-02-15 16:10:44 +00001487 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001488 .name = MP_QSTR_str,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001489 .print = str_print,
Paul Sokolovskybe020c22014-03-21 11:39:01 +02001490 .make_new = str_make_new,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001491 .binary_op = str_binary_op,
Damien George729f7b42014-04-17 22:10:53 +01001492 .subscr = str_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001493 .getiter = mp_obj_new_str_iterator,
Damien George2da98302014-03-09 19:58:18 +00001494 .buffer_p = { .get_buffer = str_get_buffer },
Damien George9b196cd2014-03-26 21:47:19 +00001495 .locals_dict = (mp_obj_t)&str_locals_dict,
Damiend99b0522013-12-21 18:17:45 +00001496};
1497
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001498// Reuses most of methods from str
Damien George3e1a5c12014-03-29 13:43:38 +00001499const mp_obj_type_t mp_type_bytes = {
Damien Georgec5966122014-02-15 16:10:44 +00001500 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001501 .name = MP_QSTR_bytes,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001502 .print = str_print,
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001503 .make_new = bytes_make_new,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001504 .binary_op = str_binary_op,
Damien George729f7b42014-04-17 22:10:53 +01001505 .subscr = str_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001506 .getiter = mp_obj_new_bytes_iterator,
Paul Sokolovsky7a70a3a2014-04-08 17:30:47 +03001507 .buffer_p = { .get_buffer = str_get_buffer },
Damien George9b196cd2014-03-26 21:47:19 +00001508 .locals_dict = (mp_obj_t)&str_locals_dict,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001509};
1510
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001511// the zero-length bytes
Damien George3e1a5c12014-03-29 13:43:38 +00001512STATIC const mp_obj_str_t empty_bytes_obj = {{&mp_type_bytes}, 0, 0, NULL};
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001513const mp_obj_t mp_const_empty_bytes = (mp_obj_t)&empty_bytes_obj;
1514
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001515mp_obj_t mp_obj_str_builder_start(const mp_obj_type_t *type, uint len, byte **data) {
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001516 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001517 o->base.type = type;
Damien George5fa93b62014-01-22 14:35:10 +00001518 o->len = len;
Paul Sokolovsky504e2332014-04-19 03:09:17 +03001519 o->hash = 0;
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001520 byte *p = m_new(byte, len + 1);
1521 o->data = p;
1522 *data = p;
Damiend99b0522013-12-21 18:17:45 +00001523 return o;
1524}
1525
Damien George5fa93b62014-01-22 14:35:10 +00001526mp_obj_t mp_obj_str_builder_end(mp_obj_t o_in) {
Damien George5fa93b62014-01-22 14:35:10 +00001527 mp_obj_str_t *o = o_in;
1528 o->hash = qstr_compute_hash(o->data, o->len);
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001529 byte *p = (byte*)o->data;
1530 p[o->len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
Damien George5fa93b62014-01-22 14:35:10 +00001531 return o;
1532}
1533
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001534STATIC mp_obj_t str_new(const mp_obj_type_t *type, const byte* data, uint len) {
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001535 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001536 o->base.type = type;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001537 o->len = len;
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001538 if (data) {
1539 o->hash = qstr_compute_hash(data, len);
1540 byte *p = m_new(byte, len + 1);
1541 o->data = p;
1542 memcpy(p, data, len * sizeof(byte));
1543 p[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
1544 }
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001545 return o;
1546}
1547
Damien George5fa93b62014-01-22 14:35:10 +00001548mp_obj_t mp_obj_new_str(const byte* data, uint len, bool make_qstr_if_not_already) {
1549 qstr q = qstr_find_strn(data, len);
1550 if (q != MP_QSTR_NULL) {
1551 // qstr with this data already exists
1552 return MP_OBJ_NEW_QSTR(q);
1553 } else if (make_qstr_if_not_already) {
1554 // no existing qstr, make a new one
1555 return MP_OBJ_NEW_QSTR(qstr_from_strn((const char*)data, len));
1556 } else {
1557 // no existing qstr, don't make one
Damien George3e1a5c12014-03-29 13:43:38 +00001558 return str_new(&mp_type_str, data, len);
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02001559 }
Damien George5fa93b62014-01-22 14:35:10 +00001560}
1561
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001562mp_obj_t mp_obj_new_bytes(const byte* data, uint len) {
Damien George3e1a5c12014-03-29 13:43:38 +00001563 return str_new(&mp_type_bytes, data, len);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001564}
1565
Damien George5fa93b62014-01-22 14:35:10 +00001566bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) {
1567 if (MP_OBJ_IS_QSTR(s1) && MP_OBJ_IS_QSTR(s2)) {
1568 return s1 == s2;
1569 } else {
1570 GET_STR_HASH(s1, h1);
1571 GET_STR_HASH(s2, h2);
Paul Sokolovsky59e269c2014-04-14 01:43:01 +03001572 // If any of hashes is 0, it means it's not valid
1573 if (h1 != 0 && h2 != 0 && h1 != h2) {
Damien George5fa93b62014-01-22 14:35:10 +00001574 return false;
1575 }
1576 GET_STR_DATA_LEN(s1, d1, l1);
1577 GET_STR_DATA_LEN(s2, d2, l2);
1578 if (l1 != l2) {
1579 return false;
1580 }
Damien George1e708fe2014-01-23 18:27:51 +00001581 return memcmp(d1, d2, l1) == 0;
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02001582 }
Damien George5fa93b62014-01-22 14:35:10 +00001583}
1584
Damien Georgedeed0872014-04-06 11:11:15 +01001585STATIC void bad_implicit_conversion(mp_obj_t self_in) {
Damien Georgeea13f402014-04-05 18:32:08 +01001586 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 +00001587}
1588
Damien George5fa93b62014-01-22 14:35:10 +00001589uint mp_obj_str_get_hash(mp_obj_t self_in) {
Paul Sokolovskyf130ca12014-04-13 05:41:00 +03001590 // TODO: This has too big overhead for hash accessor
1591 if (MP_OBJ_IS_STR(self_in) || MP_OBJ_IS_TYPE(self_in, &mp_type_bytes)) {
Damien George5fa93b62014-01-22 14:35:10 +00001592 GET_STR_HASH(self_in, h);
1593 return h;
1594 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001595 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001596 }
1597}
1598
1599uint mp_obj_str_get_len(mp_obj_t self_in) {
Damien Georgeee014112014-04-15 23:10:00 +01001600 // TODO This has a double check for the type, one in obj.c and one here
1601 if (MP_OBJ_IS_STR(self_in) || MP_OBJ_IS_TYPE(self_in, &mp_type_bytes)) {
Damien George5fa93b62014-01-22 14:35:10 +00001602 GET_STR_LEN(self_in, l);
1603 return l;
1604 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001605 bad_implicit_conversion(self_in);
1606 }
1607}
1608
1609// use this if you will anyway convert the string to a qstr
1610// will be more efficient for the case where it's already a qstr
1611qstr mp_obj_str_get_qstr(mp_obj_t self_in) {
1612 if (MP_OBJ_IS_QSTR(self_in)) {
1613 return MP_OBJ_QSTR_VALUE(self_in);
Damien George3e1a5c12014-03-29 13:43:38 +00001614 } else if (MP_OBJ_IS_TYPE(self_in, &mp_type_str)) {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001615 mp_obj_str_t *self = self_in;
1616 return qstr_from_strn((char*)self->data, self->len);
1617 } else {
1618 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001619 }
1620}
1621
1622// only use this function if you need the str data to be zero terminated
1623// at the moment all strings are zero terminated to help with C ASCIIZ compatibility
1624const char *mp_obj_str_get_str(mp_obj_t self_in) {
1625 if (MP_OBJ_IS_STR(self_in)) {
1626 GET_STR_DATA_LEN(self_in, s, l);
1627 (void)l; // len unused
1628 return (const char*)s;
1629 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001630 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001631 }
1632}
1633
Damien George698ec212014-02-08 18:17:23 +00001634const char *mp_obj_str_get_data(mp_obj_t self_in, uint *len) {
Damien George5fa93b62014-01-22 14:35:10 +00001635 if (MP_OBJ_IS_STR(self_in)) {
1636 GET_STR_DATA_LEN(self_in, s, l);
1637 *len = l;
Damien George698ec212014-02-08 18:17:23 +00001638 return (const char*)s;
Damien George5fa93b62014-01-22 14:35:10 +00001639 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001640 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001641 }
Damiend99b0522013-12-21 18:17:45 +00001642}
xyb8cfc9f02014-01-05 18:47:51 +08001643
1644/******************************************************************************/
1645/* str iterator */
1646
1647typedef struct _mp_obj_str_it_t {
1648 mp_obj_base_t base;
Damien George5fa93b62014-01-22 14:35:10 +00001649 mp_obj_t str;
xyb8cfc9f02014-01-05 18:47:51 +08001650 machine_uint_t cur;
1651} mp_obj_str_it_t;
1652
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001653STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
xyb8cfc9f02014-01-05 18:47:51 +08001654 mp_obj_str_it_t *self = self_in;
Damien George5fa93b62014-01-22 14:35:10 +00001655 GET_STR_DATA_LEN(self->str, str, len);
1656 if (self->cur < len) {
1657 mp_obj_t o_out = mp_obj_new_str(str + self->cur, 1, true);
xyb8cfc9f02014-01-05 18:47:51 +08001658 self->cur += 1;
1659 return o_out;
1660 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01001661 return MP_OBJ_STOP_ITERATION;
xyb8cfc9f02014-01-05 18:47:51 +08001662 }
1663}
1664
Damien George3e1a5c12014-03-29 13:43:38 +00001665STATIC const mp_obj_type_t mp_type_str_it = {
Damien Georgec5966122014-02-15 16:10:44 +00001666 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001667 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +03001668 .getiter = mp_identity,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001669 .iternext = str_it_iternext,
xyb8cfc9f02014-01-05 18:47:51 +08001670};
1671
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001672STATIC mp_obj_t bytes_it_iternext(mp_obj_t self_in) {
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001673 mp_obj_str_it_t *self = self_in;
1674 GET_STR_DATA_LEN(self->str, str, len);
1675 if (self->cur < len) {
Damien George7c9c6672014-01-25 00:17:36 +00001676 mp_obj_t o_out = MP_OBJ_NEW_SMALL_INT((mp_small_int_t)str[self->cur]);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001677 self->cur += 1;
1678 return o_out;
1679 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01001680 return MP_OBJ_STOP_ITERATION;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001681 }
1682}
1683
Damien George3e1a5c12014-03-29 13:43:38 +00001684STATIC const mp_obj_type_t mp_type_bytes_it = {
Damien Georgec5966122014-02-15 16:10:44 +00001685 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001686 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +03001687 .getiter = mp_identity,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001688 .iternext = bytes_it_iternext,
1689};
1690
1691mp_obj_t mp_obj_new_str_iterator(mp_obj_t str) {
xyb8cfc9f02014-01-05 18:47:51 +08001692 mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
Damien George3e1a5c12014-03-29 13:43:38 +00001693 o->base.type = &mp_type_str_it;
xyb8cfc9f02014-01-05 18:47:51 +08001694 o->str = str;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001695 o->cur = 0;
1696 return o;
1697}
1698
1699mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str) {
1700 mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
Damien George3e1a5c12014-03-29 13:43:38 +00001701 o->base.type = &mp_type_bytes_it;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001702 o->str = str;
1703 o->cur = 0;
xyb8cfc9f02014-01-05 18:47:51 +08001704 return o;
1705}