blob: 6ec997f4bf26952a4ad431f15bcfd0128602653a [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
Paul Sokolovskyda9f0922014-05-13 08:44:45 +03007 * Copyright (c) 2014 Paul Sokolovsky
Damien George04b91472014-05-03 23:27:38 +01008 *
9 * Permission is hereby granted, free of charge, to any person obtaining a copy
10 * of this software and associated documentation files (the "Software"), to deal
11 * in the Software without restriction, including without limitation the rights
12 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13 * copies of the Software, and to permit persons to whom the Software is
14 * furnished to do so, subject to the following conditions:
15 *
16 * The above copyright notice and this permission notice shall be included in
17 * all copies or substantial portions of the Software.
18 *
19 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25 * THE SOFTWARE.
26 */
27
xbeefe34222014-03-16 00:14:26 -070028#include <stdbool.h>
Damiend99b0522013-12-21 18:17:45 +000029#include <string.h>
30#include <assert.h>
31
Paul Sokolovskyf54bcbf2014-05-02 17:47:01 +030032#include "mpconfig.h"
Damiend99b0522013-12-21 18:17:45 +000033#include "nlr.h"
34#include "misc.h"
Paul Sokolovsky5048df02014-06-14 03:15:00 +030035#include "unicode.h"
Damien George55baff42014-01-21 21:40:13 +000036#include "qstr.h"
Damiend99b0522013-12-21 18:17:45 +000037#include "obj.h"
38#include "runtime0.h"
39#include "runtime.h"
Dave Hylandsbaf6f142014-03-30 21:06:50 -070040#include "pfenv.h"
Paul Sokolovsky58676fc2014-04-14 01:45:06 +030041#include "objstr.h"
Paul Sokolovsky2a273652014-05-13 08:07:08 +030042#include "objlist.h"
Damiend99b0522013-12-21 18:17:45 +000043
Paul Sokolovsky75ce9252014-06-05 20:02:15 +030044STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, uint n_args, const mp_obj_t *args, mp_obj_t dict);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +020045const mp_obj_t mp_const_empty_bytes;
46
Paul Sokolovskyd215ee12014-06-13 22:41:45 +030047mp_obj_t mp_obj_new_str_iterator(mp_obj_t str);
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020048STATIC mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str);
Paul Sokolovskye9085912014-04-30 05:35:18 +030049STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in);
Paul Sokolovsky69f3eb22014-05-11 02:44:46 +030050STATIC NORETURN void arg_type_mixup();
51
52STATIC bool is_str_or_bytes(mp_obj_t o) {
53 return MP_OBJ_IS_STR(o) || MP_OBJ_IS_TYPE(o, &mp_type_bytes);
54}
xyb8cfc9f02014-01-05 18:47:51 +080055
56/******************************************************************************/
57/* str */
58
Paul Sokolovsky2ec38a12014-06-13 21:23:00 +030059void mp_str_print_quoted(void (*print)(void *env, const char *fmt, ...), void *env,
60 const byte *str_data, uint str_len, bool is_bytes) {
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020061 // this escapes characters, but it will be very slow to print (calling print many times)
62 bool has_single_quote = false;
63 bool has_double_quote = false;
Chris Angelico48674132014-06-04 03:26:40 +100064 for (const byte *s = str_data, *top = str_data + str_len; !has_double_quote && s < top; s++) {
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020065 if (*s == '\'') {
66 has_single_quote = true;
67 } else if (*s == '"') {
68 has_double_quote = true;
69 }
70 }
71 int quote_char = '\'';
72 if (has_single_quote && !has_double_quote) {
73 quote_char = '"';
74 }
75 print(env, "%c", quote_char);
76 for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) {
77 if (*s == quote_char) {
78 print(env, "\\%c", quote_char);
79 } else if (*s == '\\') {
80 print(env, "\\\\");
Paul Sokolovsky2ec38a12014-06-13 21:23:00 +030081 } else if (*s >= 0x20 && *s != 0x7f && (!is_bytes || *s < 0x80)) {
82 // In strings, anything which is not ascii control character
83 // is printed as is, this includes characters in range 0x80-0xff
84 // (which can be non-Latin letters, etc.)
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020085 print(env, "%c", *s);
86 } else if (*s == '\n') {
87 print(env, "\\n");
Andrew Scheller12968fb2014-04-08 02:42:50 +010088 } else if (*s == '\r') {
89 print(env, "\\r");
90 } else if (*s == '\t') {
91 print(env, "\\t");
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020092 } else {
93 print(env, "\\x%02x", *s);
94 }
95 }
96 print(env, "%c", quote_char);
97}
98
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020099STATIC 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 +0000100 GET_STR_DATA_LEN(self_in, str_data, str_len);
Damien George3e1a5c12014-03-29 13:43:38 +0000101 bool is_bytes = MP_OBJ_IS_TYPE(self_in, &mp_type_bytes);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +0200102 if (kind == PRINT_STR && !is_bytes) {
Damien George5fa93b62014-01-22 14:35:10 +0000103 print(env, "%.*s", str_len, str_data);
Paul Sokolovsky76d982e2014-01-13 19:19:16 +0200104 } else {
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +0200105 if (is_bytes) {
106 print(env, "b");
107 }
Paul Sokolovsky2ec38a12014-06-13 21:23:00 +0300108 mp_str_print_quoted(print, env, str_data, str_len, is_bytes);
Paul Sokolovsky76d982e2014-01-13 19:19:16 +0200109 }
Damiend99b0522013-12-21 18:17:45 +0000110}
111
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200112STATIC 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 +0300113#if MICROPY_CPYTHON_COMPAT
114 if (n_kw != 0) {
115 mp_arg_error_unimpl_kw();
116 }
117#endif
118
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200119 switch (n_args) {
120 case 0:
121 return MP_OBJ_NEW_QSTR(MP_QSTR_);
122
123 case 1:
124 {
125 vstr_t *vstr = vstr_new();
126 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, args[0], PRINT_STR);
Damien George2617eeb2014-05-25 22:27:57 +0100127 mp_obj_t s = mp_obj_new_str(vstr->buf, vstr->len, false);
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200128 vstr_free(vstr);
129 return s;
130 }
131
132 case 2:
133 case 3:
134 {
135 // TODO: validate 2nd/3rd args
Damien George3e1a5c12014-03-29 13:43:38 +0000136 if (!MP_OBJ_IS_TYPE(args[0], &mp_type_bytes)) {
Damien Georgeea13f402014-04-05 18:32:08 +0100137 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "bytes expected"));
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200138 }
139 GET_STR_DATA_LEN(args[0], str_data, str_len);
140 GET_STR_HASH(args[0], str_hash);
Damien Georgef600a6a2014-05-25 22:34:34 +0100141 mp_obj_str_t *o = mp_obj_new_str_of_type(&mp_type_str, NULL, str_len);
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200142 o->data = str_data;
143 o->hash = str_hash;
144 return o;
145 }
146
147 default:
Damien Georgeea13f402014-04-05 18:32:08 +0100148 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "str takes at most 3 arguments"));
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200149 }
150}
151
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200152STATIC mp_obj_t bytes_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
153 if (n_args == 0) {
154 return mp_const_empty_bytes;
155 }
156
Paul Sokolovskyb473d0a2014-05-06 19:30:30 +0300157#if MICROPY_CPYTHON_COMPAT
158 if (n_kw != 0) {
159 mp_arg_error_unimpl_kw();
160 }
161#endif
162
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200163 if (MP_OBJ_IS_STR(args[0])) {
164 if (n_args < 2 || n_args > 3) {
165 goto wrong_args;
166 }
167 GET_STR_DATA_LEN(args[0], str_data, str_len);
168 GET_STR_HASH(args[0], str_hash);
Damien Georgef600a6a2014-05-25 22:34:34 +0100169 mp_obj_str_t *o = mp_obj_new_str_of_type(&mp_type_bytes, NULL, str_len);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200170 o->data = str_data;
171 o->hash = str_hash;
172 return o;
173 }
174
175 if (n_args > 1) {
176 goto wrong_args;
177 }
178
179 if (MP_OBJ_IS_SMALL_INT(args[0])) {
180 uint len = MP_OBJ_SMALL_INT_VALUE(args[0]);
181 byte *data;
182
Damien George3e1a5c12014-03-29 13:43:38 +0000183 mp_obj_t o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200184 memset(data, 0, len);
185 return mp_obj_str_builder_end(o);
186 }
187
188 int len;
189 byte *data;
190 vstr_t *vstr = NULL;
191 mp_obj_t o = NULL;
192 // Try to create array of exact len if initializer len is known
193 mp_obj_t len_in = mp_obj_len_maybe(args[0]);
194 if (len_in == MP_OBJ_NULL) {
195 len = -1;
196 vstr = vstr_new();
197 } else {
198 len = MP_OBJ_SMALL_INT_VALUE(len_in);
Damien George3e1a5c12014-03-29 13:43:38 +0000199 o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200200 }
201
Damien Georged17926d2014-03-30 13:35:08 +0100202 mp_obj_t iterable = mp_getiter(args[0]);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200203 mp_obj_t item;
Damien Georgeea8d06c2014-04-17 23:19:36 +0100204 while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200205 if (len == -1) {
206 vstr_add_char(vstr, MP_OBJ_SMALL_INT_VALUE(item));
207 } else {
208 *data++ = MP_OBJ_SMALL_INT_VALUE(item);
209 }
210 }
211
212 if (len == -1) {
213 vstr_shrink(vstr);
214 // TODO: Optimize, borrow buffer from vstr
215 len = vstr_len(vstr);
Damien George3e1a5c12014-03-29 13:43:38 +0000216 o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200217 memcpy(data, vstr_str(vstr), len);
218 vstr_free(vstr);
219 }
220
221 return mp_obj_str_builder_end(o);
222
223wrong_args:
Damien Georgeea13f402014-04-05 18:32:08 +0100224 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "wrong number of arguments"));
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200225}
226
Damien George55baff42014-01-21 21:40:13 +0000227// like strstr but with specified length and allows \0 bytes
228// TODO replace with something more efficient/standard
Damien George40f3c022014-07-03 13:25:24 +0100229STATIC const byte *find_subbytes(const byte *haystack, mp_uint_t hlen, const byte *needle, mp_uint_t nlen, mp_int_t direction) {
Damien George55baff42014-01-21 21:40:13 +0000230 if (hlen >= nlen) {
Damien George40f3c022014-07-03 13:25:24 +0100231 mp_uint_t str_index, str_index_end;
xbe17a5a832014-03-23 23:31:58 -0700232 if (direction > 0) {
233 str_index = 0;
234 str_index_end = hlen - nlen;
235 } else {
236 str_index = hlen - nlen;
237 str_index_end = 0;
238 }
239 for (;;) {
240 if (memcmp(&haystack[str_index], needle, nlen) == 0) {
241 //found
242 return haystack + str_index;
Damien George55baff42014-01-21 21:40:13 +0000243 }
xbe17a5a832014-03-23 23:31:58 -0700244 if (str_index == str_index_end) {
245 //not found
246 break;
Damien George55baff42014-01-21 21:40:13 +0000247 }
xbe17a5a832014-03-23 23:31:58 -0700248 str_index += direction;
Damien George55baff42014-01-21 21:40:13 +0000249 }
250 }
251 return NULL;
252}
253
Damien Georgee04a44e2014-06-28 10:27:23 +0100254mp_obj_t mp_obj_str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
Damien George5fa93b62014-01-22 14:35:10 +0000255 GET_STR_DATA_LEN(lhs_in, lhs_data, lhs_len);
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300256 mp_obj_type_t *lhs_type = mp_obj_get_type(lhs_in);
257 mp_obj_type_t *rhs_type = mp_obj_get_type(rhs_in);
Damiend99b0522013-12-21 18:17:45 +0000258 switch (op) {
Damien Georged17926d2014-03-30 13:35:08 +0100259 case MP_BINARY_OP_ADD:
260 case MP_BINARY_OP_INPLACE_ADD:
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300261 if (lhs_type == rhs_type) {
262 // add 2 strings or bytes
Damien George5fa93b62014-01-22 14:35:10 +0000263
264 GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
Damien George55baff42014-01-21 21:40:13 +0000265 int alloc_len = lhs_len + rhs_len;
Damien George5fa93b62014-01-22 14:35:10 +0000266
267 /* code for making qstr
Damien George55baff42014-01-21 21:40:13 +0000268 byte *q_ptr;
269 byte *val = qstr_build_start(alloc_len, &q_ptr);
270 memcpy(val, lhs_data, lhs_len);
271 memcpy(val + lhs_len, rhs_data, rhs_len);
Damien George5fa93b62014-01-22 14:35:10 +0000272 return MP_OBJ_NEW_QSTR(qstr_build_end(q_ptr));
273 */
274
275 // code for non-qstr
276 byte *data;
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300277 mp_obj_t s = mp_obj_str_builder_start(lhs_type, alloc_len, &data);
Damien George5fa93b62014-01-22 14:35:10 +0000278 memcpy(data, lhs_data, lhs_len);
279 memcpy(data + lhs_len, rhs_data, rhs_len);
280 return mp_obj_str_builder_end(s);
Damiend99b0522013-12-21 18:17:45 +0000281 }
282 break;
Damien George5fa93b62014-01-22 14:35:10 +0000283
Damien Georged17926d2014-03-30 13:35:08 +0100284 case MP_BINARY_OP_IN:
John R. Lentonc1bef212014-01-11 12:39:33 +0000285 /* NOTE `a in b` is `b.__contains__(a)` */
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300286 if (lhs_type == rhs_type) {
Damien George5fa93b62014-01-22 14:35:10 +0000287 GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
xbe17a5a832014-03-23 23:31:58 -0700288 return MP_BOOL(find_subbytes(lhs_data, lhs_len, rhs_data, rhs_len, 1) != NULL);
John R. Lentonc1bef212014-01-11 12:39:33 +0000289 }
290 break;
Damien George5fa93b62014-01-22 14:35:10 +0000291
Damien Georged0a5bf32014-05-10 13:55:11 +0100292 case MP_BINARY_OP_MULTIPLY: {
Paul Sokolovsky545591a2014-01-21 00:27:33 +0200293 if (!MP_OBJ_IS_SMALL_INT(rhs_in)) {
Damien George6ac5dce2014-05-21 19:42:43 +0100294 return MP_OBJ_NULL; // op not supported
Paul Sokolovsky545591a2014-01-21 00:27:33 +0200295 }
296 int n = MP_OBJ_SMALL_INT_VALUE(rhs_in);
Damien George5fa93b62014-01-22 14:35:10 +0000297 byte *data;
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300298 mp_obj_t s = mp_obj_str_builder_start(lhs_type, lhs_len * n, &data);
Damien George5fa93b62014-01-22 14:35:10 +0000299 mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, data);
300 return mp_obj_str_builder_end(s);
Paul Sokolovsky545591a2014-01-21 00:27:33 +0200301 }
Paul Sokolovsky87e85b72014-02-02 08:24:07 +0200302
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300303 case MP_BINARY_OP_MODULO: {
304 mp_obj_t *args;
305 uint n_args;
Paul Sokolovsky75ce9252014-06-05 20:02:15 +0300306 mp_obj_t dict = MP_OBJ_NULL;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300307 if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple)) {
308 // TODO: Support tuple subclasses?
309 mp_obj_tuple_get(rhs_in, &n_args, &args);
Paul Sokolovsky75ce9252014-06-05 20:02:15 +0300310 } else if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_dict)) {
311 args = NULL;
312 n_args = 0;
313 dict = rhs_in;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300314 } else {
315 args = &rhs_in;
316 n_args = 1;
317 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +0300318 return str_modulo_format(lhs_in, n_args, args, dict);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300319 }
320
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300321 //case MP_BINARY_OP_NOT_EQUAL: // This is never passed here
322 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 +0100323 case MP_BINARY_OP_LESS:
324 case MP_BINARY_OP_LESS_EQUAL:
325 case MP_BINARY_OP_MORE:
326 case MP_BINARY_OP_MORE_EQUAL:
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300327 if (lhs_type == rhs_type) {
Paul Sokolovsky87e85b72014-02-02 08:24:07 +0200328 GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
329 return MP_BOOL(mp_seq_cmp_bytes(op, lhs_data, lhs_len, rhs_data, rhs_len));
330 }
Paul Sokolovsky70328e42014-05-15 20:58:40 +0300331 if (lhs_type == &mp_type_bytes) {
332 mp_buffer_info_t bufinfo;
333 if (!mp_get_buffer(rhs_in, &bufinfo, MP_BUFFER_READ)) {
334 goto uncomparable;
335 }
336 return MP_BOOL(mp_seq_cmp_bytes(op, lhs_data, lhs_len, bufinfo.buf, bufinfo.len));
337 }
338uncomparable:
339 if (op == MP_BINARY_OP_EQUAL) {
340 return mp_const_false;
341 }
Damiend99b0522013-12-21 18:17:45 +0000342 }
343
Damien George6ac5dce2014-05-21 19:42:43 +0100344 return MP_OBJ_NULL; // op not supported
Damiend99b0522013-12-21 18:17:45 +0000345}
346
Paul Sokolovskyea2c9362014-06-15 00:35:09 +0300347#if !MICROPY_PY_BUILTINS_STR_UNICODE
348// objstrunicode defines own version
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300349const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, uint self_len,
350 mp_obj_t index, bool is_slice) {
Damien George40f3c022014-07-03 13:25:24 +0100351 mp_uint_t index_val = mp_get_index(type, self_len, index, is_slice);
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300352 return self_data + index_val;
353}
Paul Sokolovskyea2c9362014-06-15 00:35:09 +0300354#endif
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300355
Damien George729f7b42014-04-17 22:10:53 +0100356STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
Paul Sokolovsky5ebd5f02014-05-11 21:22:59 +0300357 mp_obj_type_t *type = mp_obj_get_type(self_in);
Damien George729f7b42014-04-17 22:10:53 +0100358 GET_STR_DATA_LEN(self_in, self_data, self_len);
359 if (value == MP_OBJ_SENTINEL) {
360 // load
Damien Georgefb510b32014-06-01 13:32:54 +0100361#if MICROPY_PY_BUILTINS_SLICE
Damien George729f7b42014-04-17 22:10:53 +0100362 if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
Paul Sokolovskyde4b9322014-05-25 21:21:57 +0300363 mp_bound_slice_t slice;
364 if (!mp_seq_get_fast_slice_indexes(self_len, index, &slice)) {
Paul Sokolovsky5fd5af92014-05-25 22:12:56 +0300365 nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,
Damien George11de8392014-06-05 18:57:38 +0100366 "only slices with step=1 (aka None) are supported"));
Damien George729f7b42014-04-17 22:10:53 +0100367 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100368 return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start);
Damien George729f7b42014-04-17 22:10:53 +0100369 }
370#endif
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300371 const byte *p = str_index_to_ptr(type, self_data, self_len, index, false);
Damien George729f7b42014-04-17 22:10:53 +0100372 if (type == &mp_type_bytes) {
Damien Georgebb4c6f32014-07-31 10:49:14 +0100373 return MP_OBJ_NEW_SMALL_INT(*p);
Damien George729f7b42014-04-17 22:10:53 +0100374 } else {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300375 return mp_obj_new_str((char*)p, 1, true);
Damien George729f7b42014-04-17 22:10:53 +0100376 }
377 } else {
Damien George6ac5dce2014-05-21 19:42:43 +0100378 return MP_OBJ_NULL; // op not supported
Damien George729f7b42014-04-17 22:10:53 +0100379 }
380}
381
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200382STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
Paul Sokolovsky5e5d69b2014-05-11 21:13:01 +0300383 assert(is_str_or_bytes(self_in));
384 const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
Damiend99b0522013-12-21 18:17:45 +0000385
Damien Georgefe8fb912014-01-02 16:36:09 +0000386 // get separation string
Damien George5fa93b62014-01-22 14:35:10 +0000387 GET_STR_DATA_LEN(self_in, sep_str, sep_len);
Damien Georgefe8fb912014-01-02 16:36:09 +0000388
389 // process args
Damiend99b0522013-12-21 18:17:45 +0000390 uint seq_len;
391 mp_obj_t *seq_items;
Damien George07ddab52014-03-29 13:15:08 +0000392 if (MP_OBJ_IS_TYPE(arg, &mp_type_tuple)) {
Damiend99b0522013-12-21 18:17:45 +0000393 mp_obj_tuple_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000394 } else {
Damien Georgea157e4c2014-04-09 19:17:53 +0100395 if (!MP_OBJ_IS_TYPE(arg, &mp_type_list)) {
396 // arg is not a list, try to convert it to one
Paul Sokolovsky881d9af2014-04-10 01:42:40 +0300397 // TODO: Try to optimize?
Damien Georgea157e4c2014-04-09 19:17:53 +0100398 arg = mp_type_list.make_new((mp_obj_t)&mp_type_list, 1, 0, &arg);
399 }
400 mp_obj_list_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000401 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000402
403 // count required length
404 int required_len = 0;
Damiend99b0522013-12-21 18:17:45 +0000405 for (int i = 0; i < seq_len; i++) {
Paul Sokolovsky5e5d69b2014-05-11 21:13:01 +0300406 if (mp_obj_get_type(seq_items[i]) != self_type) {
407 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
408 "join expects a list of str/bytes objects consistent with self object"));
Damiend99b0522013-12-21 18:17:45 +0000409 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000410 if (i > 0) {
411 required_len += sep_len;
412 }
Damien George5fa93b62014-01-22 14:35:10 +0000413 GET_STR_LEN(seq_items[i], l);
414 required_len += l;
Damiend99b0522013-12-21 18:17:45 +0000415 }
416
417 // make joined string
Damien George5fa93b62014-01-22 14:35:10 +0000418 byte *data;
Paul Sokolovsky5e5d69b2014-05-11 21:13:01 +0300419 mp_obj_t joined_str = mp_obj_str_builder_start(self_type, required_len, &data);
Damiend99b0522013-12-21 18:17:45 +0000420 for (int i = 0; i < seq_len; i++) {
Damiend99b0522013-12-21 18:17:45 +0000421 if (i > 0) {
Damien George5fa93b62014-01-22 14:35:10 +0000422 memcpy(data, sep_str, sep_len);
423 data += sep_len;
Damiend99b0522013-12-21 18:17:45 +0000424 }
Damien George5fa93b62014-01-22 14:35:10 +0000425 GET_STR_DATA_LEN(seq_items[i], s, l);
426 memcpy(data, s, l);
427 data += l;
Damiend99b0522013-12-21 18:17:45 +0000428 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000429
430 // return joined string
Damien George5fa93b62014-01-22 14:35:10 +0000431 return mp_obj_str_builder_end(joined_str);
Damiend99b0522013-12-21 18:17:45 +0000432}
433
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200434#define is_ws(c) ((c) == ' ' || (c) == '\t')
435
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200436STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) {
Paul Sokolovskybfb88192014-05-11 21:17:28 +0300437 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Damien George40f3c022014-07-03 13:25:24 +0100438 mp_int_t splits = -1;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200439 mp_obj_t sep = mp_const_none;
440 if (n_args > 1) {
441 sep = args[1];
442 if (n_args > 2) {
Damien Georgedeed0872014-04-06 11:11:15 +0100443 splits = mp_obj_get_int(args[2]);
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200444 }
445 }
Damien Georgedeed0872014-04-06 11:11:15 +0100446
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200447 mp_obj_t res = mp_obj_new_list(0, NULL);
Damien George5fa93b62014-01-22 14:35:10 +0000448 GET_STR_DATA_LEN(args[0], s, len);
449 const byte *top = s + len;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200450
Damien Georgedeed0872014-04-06 11:11:15 +0100451 if (sep == mp_const_none) {
452 // sep not given, so separate on whitespace
453
454 // Initial whitespace is not counted as split, so we pre-do it
Damien George5fa93b62014-01-22 14:35:10 +0000455 while (s < top && is_ws(*s)) s++;
Damien Georgedeed0872014-04-06 11:11:15 +0100456 while (s < top && splits != 0) {
457 const byte *start = s;
458 while (s < top && !is_ws(*s)) s++;
Damien Georgef600a6a2014-05-25 22:34:34 +0100459 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
Damien Georgedeed0872014-04-06 11:11:15 +0100460 if (s >= top) {
461 break;
462 }
463 while (s < top && is_ws(*s)) s++;
464 if (splits > 0) {
465 splits--;
466 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200467 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200468
Damien Georgedeed0872014-04-06 11:11:15 +0100469 if (s < top) {
Damien Georgef600a6a2014-05-25 22:34:34 +0100470 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, s, top - s));
Damien Georgedeed0872014-04-06 11:11:15 +0100471 }
472
473 } else {
474 // sep given
475
476 uint sep_len;
477 const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
478
479 if (sep_len == 0) {
480 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
481 }
482
483 for (;;) {
484 const byte *start = s;
485 for (;;) {
486 if (splits == 0 || s + sep_len > top) {
487 s = top;
488 break;
489 } else if (memcmp(s, sep_str, sep_len) == 0) {
490 break;
491 }
492 s++;
493 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100494 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
Damien Georgedeed0872014-04-06 11:11:15 +0100495 if (s >= top) {
496 break;
497 }
498 s += sep_len;
499 if (splits > 0) {
500 splits--;
501 }
502 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200503 }
504
505 return res;
506}
507
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300508STATIC mp_obj_t str_rsplit(uint n_args, const mp_obj_t *args) {
509 if (n_args < 3) {
510 // If we don't have split limit, it doesn't matter from which side
511 // we split.
512 return str_split(n_args, args);
513 }
514 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
515 mp_obj_t sep = args[1];
516 GET_STR_DATA_LEN(args[0], s, len);
517
Damien George40f3c022014-07-03 13:25:24 +0100518 mp_int_t splits = mp_obj_get_int(args[2]);
519 mp_int_t org_splits = splits;
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300520 // Preallocate list to the max expected # of elements, as we
521 // will fill it from the end.
522 mp_obj_list_t *res = mp_obj_new_list(splits + 1, NULL);
523 int idx = splits;
524
525 if (sep == mp_const_none) {
Chris Angelico9ab8ab22014-06-04 05:04:23 +1000526 assert(!"TODO: rsplit(None,n) not implemented");
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300527 } else {
528 uint sep_len;
529 const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
530
531 if (sep_len == 0) {
532 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
533 }
534
535 const byte *beg = s;
536 const byte *last = s + len;
537 for (;;) {
538 s = last - sep_len;
539 for (;;) {
540 if (splits == 0 || s < beg) {
541 break;
542 } else if (memcmp(s, sep_str, sep_len) == 0) {
543 break;
544 }
545 s--;
546 }
547 if (s < beg || splits == 0) {
Damien Georgef600a6a2014-05-25 22:34:34 +0100548 res->items[idx] = mp_obj_new_str_of_type(self_type, beg, last - beg);
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300549 break;
550 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100551 res->items[idx--] = mp_obj_new_str_of_type(self_type, s + sep_len, last - s - sep_len);
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300552 last = s;
553 if (splits > 0) {
554 splits--;
555 }
556 }
557 if (idx != 0) {
558 // We split less parts than split limit, now go cleanup surplus
559 int used = org_splits + 1 - idx;
560 memcpy(res->items, &res->items[idx], used * sizeof(mp_obj_t));
561 mp_seq_clear(res->items, used, res->alloc, sizeof(*res->items));
562 res->len = used;
563 }
564 }
565
566 return res;
567}
568
Damien George40f3c022014-07-03 13:25:24 +0100569STATIC mp_obj_t str_finder(uint n_args, const mp_obj_t *args, mp_int_t direction, bool is_index) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300570 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
John R. Lentone8204912014-01-12 21:53:52 +0000571 assert(2 <= n_args && n_args <= 4);
Damien George5fa93b62014-01-22 14:35:10 +0000572 assert(MP_OBJ_IS_STR(args[0]));
573 assert(MP_OBJ_IS_STR(args[1]));
John R. Lentone8204912014-01-12 21:53:52 +0000574
Damien George5fa93b62014-01-22 14:35:10 +0000575 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
576 GET_STR_DATA_LEN(args[1], needle, needle_len);
John R. Lentone8204912014-01-12 21:53:52 +0000577
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300578 const byte *start = haystack;
579 const byte *end = haystack + haystack_len;
John R. Lentone8204912014-01-12 21:53:52 +0000580 if (n_args >= 3 && args[2] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300581 start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
John R. Lentone8204912014-01-12 21:53:52 +0000582 }
583 if (n_args >= 4 && args[3] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300584 end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
John R. Lentone8204912014-01-12 21:53:52 +0000585 }
586
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300587 const byte *p = find_subbytes(start, end - start, needle, needle_len, direction);
Damien George23005372014-01-13 19:39:01 +0000588 if (p == NULL) {
589 // not found
xbe3d9a39e2014-04-08 11:42:19 -0700590 if (is_index) {
591 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "substring not found"));
592 } else {
593 return MP_OBJ_NEW_SMALL_INT(-1);
594 }
Damien George23005372014-01-13 19:39:01 +0000595 } else {
596 // found
Paul Sokolovsky5048df02014-06-14 03:15:00 +0300597 #if MICROPY_PY_BUILTINS_STR_UNICODE
598 if (self_type == &mp_type_str) {
599 return MP_OBJ_NEW_SMALL_INT(utf8_ptr_to_index(haystack, p));
600 }
601 #endif
xbe17a5a832014-03-23 23:31:58 -0700602 return MP_OBJ_NEW_SMALL_INT(p - haystack);
John R. Lentone8204912014-01-12 21:53:52 +0000603 }
John R. Lentone8204912014-01-12 21:53:52 +0000604}
605
xbe17a5a832014-03-23 23:31:58 -0700606STATIC mp_obj_t str_find(uint n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700607 return str_finder(n_args, args, 1, false);
xbe17a5a832014-03-23 23:31:58 -0700608}
609
610STATIC mp_obj_t str_rfind(uint n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700611 return str_finder(n_args, args, -1, false);
612}
613
614STATIC mp_obj_t str_index(uint n_args, const mp_obj_t *args) {
615 return str_finder(n_args, args, 1, true);
616}
617
618STATIC mp_obj_t str_rindex(uint n_args, const mp_obj_t *args) {
619 return str_finder(n_args, args, -1, true);
xbe17a5a832014-03-23 23:31:58 -0700620}
621
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200622// TODO: (Much) more variety in args
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300623STATIC mp_obj_t str_startswith(uint n_args, const mp_obj_t *args) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300624 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300625 GET_STR_DATA_LEN(args[0], str, str_len);
626 GET_STR_DATA_LEN(args[1], prefix, prefix_len);
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300627 const byte *start = str;
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300628 if (n_args > 2) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300629 start = str_index_to_ptr(self_type, str, str_len, args[2], true);
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300630 }
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300631 if (prefix_len + (start - str) > str_len) {
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200632 return mp_const_false;
633 }
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300634 return MP_BOOL(memcmp(start, prefix, prefix_len) == 0);
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200635}
636
Paul Sokolovskyd098c6b2014-05-24 22:46:51 +0300637STATIC mp_obj_t str_endswith(uint n_args, const mp_obj_t *args) {
638 GET_STR_DATA_LEN(args[0], str, str_len);
639 GET_STR_DATA_LEN(args[1], suffix, suffix_len);
640 assert(n_args == 2);
641
642 if (suffix_len > str_len) {
643 return mp_const_false;
644 }
645 return MP_BOOL(memcmp(str + (str_len - suffix_len), suffix, suffix_len) == 0);
646}
647
Paul Sokolovsky88107842014-04-26 06:20:08 +0300648enum { LSTRIP, RSTRIP, STRIP };
649
650STATIC mp_obj_t str_uni_strip(int type, uint n_args, const mp_obj_t *args) {
xbe7b0f39f2014-01-08 14:23:45 -0800651 assert(1 <= n_args && n_args <= 2);
Paul Sokolovskyb2d4fc02014-05-11 13:17:29 +0300652 assert(is_str_or_bytes(args[0]));
653 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Damien George5fa93b62014-01-22 14:35:10 +0000654
655 const byte *chars_to_del;
656 uint chars_to_del_len;
657 static const byte whitespace[] = " \t\n\r\v\f";
xbe7b0f39f2014-01-08 14:23:45 -0800658
659 if (n_args == 1) {
660 chars_to_del = whitespace;
Damien George5fa93b62014-01-22 14:35:10 +0000661 chars_to_del_len = sizeof(whitespace);
xbe7b0f39f2014-01-08 14:23:45 -0800662 } else {
Paul Sokolovskyb2d4fc02014-05-11 13:17:29 +0300663 if (mp_obj_get_type(args[1]) != self_type) {
664 arg_type_mixup();
665 }
Damien George5fa93b62014-01-22 14:35:10 +0000666 GET_STR_DATA_LEN(args[1], s, l);
667 chars_to_del = s;
668 chars_to_del_len = l;
xbe7b0f39f2014-01-08 14:23:45 -0800669 }
670
Damien George5fa93b62014-01-22 14:35:10 +0000671 GET_STR_DATA_LEN(args[0], orig_str, orig_str_len);
xbe7b0f39f2014-01-08 14:23:45 -0800672
Damien George40f3c022014-07-03 13:25:24 +0100673 mp_uint_t first_good_char_pos = 0;
xbe7b0f39f2014-01-08 14:23:45 -0800674 bool first_good_char_pos_set = false;
Damien George40f3c022014-07-03 13:25:24 +0100675 mp_uint_t last_good_char_pos = 0;
676 mp_uint_t i = 0;
677 mp_int_t delta = 1;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300678 if (type == RSTRIP) {
679 i = orig_str_len - 1;
680 delta = -1;
681 }
Damien George40f3c022014-07-03 13:25:24 +0100682 for (mp_uint_t len = orig_str_len; len > 0; len--) {
xbe17a5a832014-03-23 23:31:58 -0700683 if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) {
xbe7b0f39f2014-01-08 14:23:45 -0800684 if (!first_good_char_pos_set) {
Paul Sokolovskybcdffe52014-05-30 03:07:05 +0300685 first_good_char_pos_set = true;
xbe7b0f39f2014-01-08 14:23:45 -0800686 first_good_char_pos = i;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300687 if (type == LSTRIP) {
688 last_good_char_pos = orig_str_len - 1;
689 break;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300690 } else if (type == RSTRIP) {
691 first_good_char_pos = 0;
692 last_good_char_pos = i;
693 break;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300694 }
xbe7b0f39f2014-01-08 14:23:45 -0800695 }
Paul Sokolovsky88107842014-04-26 06:20:08 +0300696 last_good_char_pos = i;
xbe7b0f39f2014-01-08 14:23:45 -0800697 }
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300698 i += delta;
xbe7b0f39f2014-01-08 14:23:45 -0800699 }
700
Paul Sokolovskybcdffe52014-05-30 03:07:05 +0300701 if (!first_good_char_pos_set) {
Damien George5fa93b62014-01-22 14:35:10 +0000702 // string is all whitespace, return ''
703 return MP_OBJ_NEW_QSTR(MP_QSTR_);
xbe7b0f39f2014-01-08 14:23:45 -0800704 }
705
706 assert(last_good_char_pos >= first_good_char_pos);
707 //+1 to accomodate the last character
Damien George40f3c022014-07-03 13:25:24 +0100708 mp_uint_t stripped_len = last_good_char_pos - first_good_char_pos + 1;
Paul Sokolovsky88276822014-05-30 03:11:44 +0300709 if (stripped_len == orig_str_len) {
710 // If nothing was stripped, don't bother to dup original string
711 // TODO: watch out for this case when we'll get to bytearray.strip()
712 assert(first_good_char_pos == 0);
713 return args[0];
714 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100715 return mp_obj_new_str_of_type(self_type, orig_str + first_good_char_pos, stripped_len);
xbe7b0f39f2014-01-08 14:23:45 -0800716}
717
Paul Sokolovsky88107842014-04-26 06:20:08 +0300718STATIC mp_obj_t str_strip(uint n_args, const mp_obj_t *args) {
719 return str_uni_strip(STRIP, n_args, args);
720}
721
722STATIC mp_obj_t str_lstrip(uint n_args, const mp_obj_t *args) {
723 return str_uni_strip(LSTRIP, n_args, args);
724}
725
726STATIC mp_obj_t str_rstrip(uint n_args, const mp_obj_t *args) {
727 return str_uni_strip(RSTRIP, n_args, args);
728}
729
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700730// Takes an int arg, but only parses unsigned numbers, and only changes
731// *num if at least one digit was parsed.
732static int str_to_int(const char *str, int *num) {
733 const char *s = str;
734 if (unichar_isdigit(*s)) {
735 *num = 0;
736 do {
737 *num = *num * 10 + (*s - '0');
738 s++;
739 }
740 while (unichar_isdigit(*s));
741 }
742 return s - str;
743}
744
745static bool isalignment(char ch) {
746 return ch && strchr("<>=^", ch) != NULL;
747}
748
749static bool istype(char ch) {
750 return ch && strchr("bcdeEfFgGnosxX%", ch) != NULL;
751}
752
753static bool arg_looks_integer(mp_obj_t arg) {
754 return MP_OBJ_IS_TYPE(arg, &mp_type_bool) || MP_OBJ_IS_INT(arg);
755}
756
757static bool arg_looks_numeric(mp_obj_t arg) {
758 return arg_looks_integer(arg)
Damien Georgefb510b32014-06-01 13:32:54 +0100759#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700760 || MP_OBJ_IS_TYPE(arg, &mp_type_float)
761#endif
762 ;
763}
764
Dave Hylandsc4029e52014-04-07 11:19:51 -0700765static mp_obj_t arg_as_int(mp_obj_t arg) {
Damien Georgefb510b32014-06-01 13:32:54 +0100766#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700767 if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
Dave Hylandsc4029e52014-04-07 11:19:51 -0700768
769 // TODO: Needs a way to construct an mpz integer from a float
770
Damien George40f3c022014-07-03 13:25:24 +0100771 mp_int_t num = mp_obj_get_float(arg);
Dave Hylandsc4029e52014-04-07 11:19:51 -0700772 return MP_OBJ_NEW_SMALL_INT(num);
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700773 }
774#endif
Dave Hylandsc4029e52014-04-07 11:19:51 -0700775 return arg;
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700776}
777
Damien George897fe0c2014-04-15 22:03:55 +0100778mp_obj_t mp_obj_str_format(uint n_args, const mp_obj_t *args) {
Damien George5fa93b62014-01-22 14:35:10 +0000779 assert(MP_OBJ_IS_STR(args[0]));
Damiend99b0522013-12-21 18:17:45 +0000780
Damien George5fa93b62014-01-22 14:35:10 +0000781 GET_STR_DATA_LEN(args[0], str, len);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700782 int arg_i = 0;
Damiend99b0522013-12-21 18:17:45 +0000783 vstr_t *vstr = vstr_new();
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700784 pfenv_t pfenv_vstr;
785 pfenv_vstr.data = vstr;
786 pfenv_vstr.print_strn = pfenv_vstr_add_strn;
787
Damien George5fa93b62014-01-22 14:35:10 +0000788 for (const byte *top = str + len; str < top; str++) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700789 if (*str == '}') {
Damiend99b0522013-12-21 18:17:45 +0000790 str++;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700791 if (str < top && *str == '}') {
792 vstr_add_char(vstr, '}');
793 continue;
794 }
Damien George11de8392014-06-05 18:57:38 +0100795 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "single '}' encountered in format string"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700796 }
797 if (*str != '{') {
798 vstr_add_char(vstr, *str);
799 continue;
800 }
801
802 str++;
803 if (str < top && *str == '{') {
804 vstr_add_char(vstr, '{');
805 continue;
806 }
807
808 // replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}"
809
810 vstr_t *field_name = NULL;
811 char conversion = '\0';
812 vstr_t *format_spec = NULL;
813
814 if (str < top && *str != '}' && *str != '!' && *str != ':') {
815 field_name = vstr_new();
816 while (str < top && *str != '}' && *str != '!' && *str != ':') {
817 vstr_add_char(field_name, *str++);
818 }
819 vstr_add_char(field_name, '\0');
820 }
821
822 // conversion ::= "r" | "s"
823
824 if (str < top && *str == '!') {
825 str++;
826 if (str < top && (*str == 'r' || *str == 's')) {
827 conversion = *str++;
Paul Sokolovskyf2b796e2014-01-15 22:45:20 +0200828 } else {
Damien Georgeea13f402014-04-05 18:32:08 +0100829 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 -0700830 }
831 }
832
833 if (str < top && *str == ':') {
834 str++;
835 // {:} is the same as {}, which is the same as {!s}
836 // This makes a difference when passing in a True or False
837 // '{}'.format(True) returns 'True'
838 // '{:d}'.format(True) returns '1'
839 // So we treat {:} as {} and this later gets treated to be {!s}
840 if (*str != '}') {
Damien George11de8392014-06-05 18:57:38 +0100841 format_spec = vstr_new();
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700842 while (str < top && *str != '}') {
843 vstr_add_char(format_spec, *str++);
Damiend99b0522013-12-21 18:17:45 +0000844 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700845 vstr_add_char(format_spec, '\0');
846 }
847 }
848 if (str >= top) {
Damien Georgeea13f402014-04-05 18:32:08 +0100849 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "unmatched '{' in format"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700850 }
851 if (*str != '}') {
Damien Georgeea13f402014-04-05 18:32:08 +0100852 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "expected ':' after format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700853 }
854
855 mp_obj_t arg = mp_const_none;
856
857 if (field_name) {
858 if (arg_i > 0) {
Damien George11de8392014-06-05 18:57:38 +0100859 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "can't switch from automatic field numbering to manual field specification"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700860 }
Damien George3bb8bd82014-04-14 21:20:30 +0100861 int index = 0;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700862 if (str_to_int(vstr_str(field_name), &index) != vstr_len(field_name) - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100863 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "attributes not supported yet"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700864 }
865 if (index >= n_args - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100866 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700867 }
868 arg = args[index + 1];
869 arg_i = -1;
870 vstr_free(field_name);
871 field_name = NULL;
872 } else {
873 if (arg_i < 0) {
Damien George11de8392014-06-05 18:57:38 +0100874 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "can't switch from manual field specification to automatic field numbering"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700875 }
876 if (arg_i >= n_args - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100877 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700878 }
879 arg = args[arg_i + 1];
880 arg_i++;
881 }
882 if (!format_spec && !conversion) {
883 conversion = 's';
884 }
885 if (conversion) {
886 mp_print_kind_t print_kind;
887 if (conversion == 's') {
888 print_kind = PRINT_STR;
889 } else if (conversion == 'r') {
890 print_kind = PRINT_REPR;
891 } else {
Damien George11de8392014-06-05 18:57:38 +0100892 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "unknown conversion specifier %c", conversion));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700893 }
894 vstr_t *arg_vstr = vstr_new();
895 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, arg_vstr, arg, print_kind);
Damien George2617eeb2014-05-25 22:27:57 +0100896 arg = mp_obj_new_str(vstr_str(arg_vstr), vstr_len(arg_vstr), false);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700897 vstr_free(arg_vstr);
898 }
899
900 char sign = '\0';
901 char fill = '\0';
902 char align = '\0';
903 int width = -1;
904 int precision = -1;
905 char type = '\0';
906 int flags = 0;
907
908 if (format_spec) {
909 // The format specifier (from http://docs.python.org/2/library/string.html#formatspec)
910 //
911 // [[fill]align][sign][#][0][width][,][.precision][type]
912 // fill ::= <any character>
913 // align ::= "<" | ">" | "=" | "^"
914 // sign ::= "+" | "-" | " "
915 // width ::= integer
916 // precision ::= integer
917 // type ::= "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
918
919 const char *s = vstr_str(format_spec);
920 if (isalignment(*s)) {
921 align = *s++;
922 } else if (*s && isalignment(s[1])) {
923 fill = *s++;
924 align = *s++;
925 }
926 if (*s == '+' || *s == '-' || *s == ' ') {
927 if (*s == '+') {
928 flags |= PF_FLAG_SHOW_SIGN;
929 } else if (*s == ' ') {
930 flags |= PF_FLAG_SPACE_SIGN;
931 }
932 sign = *s++;
933 }
934 if (*s == '#') {
935 flags |= PF_FLAG_SHOW_PREFIX;
936 s++;
937 }
938 if (*s == '0') {
939 if (!align) {
940 align = '=';
941 }
942 if (!fill) {
943 fill = '0';
944 }
945 }
946 s += str_to_int(s, &width);
947 if (*s == ',') {
948 flags |= PF_FLAG_SHOW_COMMA;
949 s++;
950 }
951 if (*s == '.') {
952 s++;
953 s += str_to_int(s, &precision);
954 }
955 if (istype(*s)) {
956 type = *s++;
957 }
958 if (*s) {
Damien Georgeea13f402014-04-05 18:32:08 +0100959 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "Invalid conversion specification"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700960 }
961 vstr_free(format_spec);
962 format_spec = NULL;
963 }
964 if (!align) {
965 if (arg_looks_numeric(arg)) {
966 align = '>';
967 } else {
968 align = '<';
969 }
970 }
971 if (!fill) {
972 fill = ' ';
973 }
974
975 if (sign) {
976 if (type == 's') {
Damien Georgeea13f402014-04-05 18:32:08 +0100977 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed in string format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700978 }
979 if (type == 'c') {
Damien Georgeea13f402014-04-05 18:32:08 +0100980 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed with integer format specifier 'c'"));
Damiend99b0522013-12-21 18:17:45 +0000981 }
982 } else {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700983 sign = '-';
984 }
985
986 switch (align) {
987 case '<': flags |= PF_FLAG_LEFT_ADJUST; break;
988 case '=': flags |= PF_FLAG_PAD_AFTER_SIGN; break;
989 case '^': flags |= PF_FLAG_CENTER_ADJUST; break;
990 }
991
992 if (arg_looks_integer(arg)) {
993 switch (type) {
994 case 'b':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -0700995 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 2, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700996 continue;
997
998 case 'c':
999 {
1000 char ch = mp_obj_get_int(arg);
1001 pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, fill, width);
1002 continue;
1003 }
1004
1005 case '\0': // No explicit format type implies 'd'
1006 case 'n': // I don't think we support locales in uPy so use 'd'
1007 case 'd':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001008 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 10, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001009 continue;
1010
1011 case 'o':
Dave Hylandsc4029e52014-04-07 11:19:51 -07001012 if (flags & PF_FLAG_SHOW_PREFIX) {
1013 flags |= PF_FLAG_SHOW_OCTAL_LETTER;
1014 }
1015
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001016 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 8, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001017 continue;
1018
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001019 case 'X':
Damien George11de8392014-06-05 18:57:38 +01001020 case 'x':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001021 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, type - ('X' - 'A'), flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001022 continue;
1023
1024 case 'e':
1025 case 'E':
1026 case 'f':
1027 case 'F':
1028 case 'g':
1029 case 'G':
1030 case '%':
1031 // The floating point formatters all work with anything that
1032 // looks like an integer
1033 break;
1034
1035 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001036 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Damien George11de8392014-06-05 18:57:38 +01001037 "unknown format code '%c' for object of type '%s'", type, mp_obj_get_type_str(arg)));
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001038 }
Damien Georgec322c5f2014-04-02 20:04:15 +01001039 }
Damien George70f33cd2014-04-02 17:06:05 +01001040
Dave Hylands22fe4d72014-04-02 12:07:31 -07001041 // NOTE: no else here. We need the e, f, g etc formats for integer
1042 // arguments (from above if) to take this if.
Damien Georgec322c5f2014-04-02 20:04:15 +01001043 if (arg_looks_numeric(arg)) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001044 if (!type) {
1045
1046 // Even though the docs say that an unspecified type is the same
1047 // as 'g', there is one subtle difference, when the exponent
1048 // is one less than the precision.
Damien George11de8392014-06-05 18:57:38 +01001049 //
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001050 // '{:10.1}'.format(0.0) ==> '0e+00'
1051 // '{:10.1g}'.format(0.0) ==> '0'
1052 //
1053 // TODO: Figure out how to deal with this.
1054 //
1055 // A proper solution would involve adding a special flag
1056 // or something to format_float, and create a format_double
1057 // to deal with doubles. In order to fix this when using
1058 // sprintf, we'd need to use the e format and tweak the
1059 // returned result to strip trailing zeros like the g format
1060 // does.
1061 //
1062 // {:10.3} and {:10.2e} with 1.23e2 both produce 1.23e+02
1063 // but with 1.e2 you get 1e+02 and 1.00e+02
1064 //
1065 // Stripping the trailing 0's (like g) does would make the
1066 // e format give us the right format.
1067 //
1068 // CPython sources say:
1069 // Omitted type specifier. Behaves in the same way as repr(x)
1070 // and str(x) if no precision is given, else like 'g', but with
1071 // at least one digit after the decimal point. */
1072
1073 type = 'g';
1074 }
1075 if (type == 'n') {
1076 type = 'g';
1077 }
1078
1079 flags |= PF_FLAG_PAD_NAN_INF; // '{:06e}'.format(float('-inf')) should give '-00inf'
1080 switch (type) {
Damien Georgefb510b32014-06-01 13:32:54 +01001081#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001082 case 'e':
1083 case 'E':
1084 case 'f':
1085 case 'F':
1086 case 'g':
1087 case 'G':
Damien George11de8392014-06-05 18:57:38 +01001088 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), type, flags, fill, width, precision);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001089 break;
1090
1091 case '%':
1092 flags |= PF_FLAG_ADD_PERCENT;
1093 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg) * 100.0F, 'f', flags, fill, width, precision);
1094 break;
Damien Georgec322c5f2014-04-02 20:04:15 +01001095#endif
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001096
1097 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001098 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Damien George11de8392014-06-05 18:57:38 +01001099 "unknown format code '%c' for object of type 'float'",
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001100 type, mp_obj_get_type_str(arg)));
1101 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001102 } else {
Damien George70f33cd2014-04-02 17:06:05 +01001103 // arg doesn't look like a number
1104
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001105 if (align == '=') {
Damien Georgeea13f402014-04-05 18:32:08 +01001106 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "'=' alignment not allowed in string format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001107 }
Damien George70f33cd2014-04-02 17:06:05 +01001108
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001109 switch (type) {
1110 case '\0':
1111 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, arg, PRINT_STR);
1112 break;
1113
1114 case 's':
1115 {
1116 uint len;
1117 const char *s = mp_obj_str_get_data(arg, &len);
1118 if (precision < 0) {
1119 precision = len;
1120 }
1121 if (len > precision) {
1122 len = precision;
1123 }
1124 pfenv_print_strn(&pfenv_vstr, s, len, flags, fill, width);
1125 break;
1126 }
1127
1128 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001129 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Damien George11de8392014-06-05 18:57:38 +01001130 "unknown format code '%c' for object of type 'str'",
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001131 type, mp_obj_get_type_str(arg)));
1132 }
Damiend99b0522013-12-21 18:17:45 +00001133 }
1134 }
1135
Damien George2617eeb2014-05-25 22:27:57 +01001136 mp_obj_t s = mp_obj_new_str(vstr->buf, vstr->len, false);
Damien George5fa93b62014-01-22 14:35:10 +00001137 vstr_free(vstr);
1138 return s;
Damiend99b0522013-12-21 18:17:45 +00001139}
1140
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001141STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, uint n_args, const mp_obj_t *args, mp_obj_t dict) {
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001142 assert(MP_OBJ_IS_STR(pattern));
1143
1144 GET_STR_DATA_LEN(pattern, str, len);
Dave Hylands6756a372014-04-02 11:42:39 -07001145 const byte *start_str = str;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001146 int arg_i = 0;
1147 vstr_t *vstr = vstr_new();
Dave Hylands6756a372014-04-02 11:42:39 -07001148 pfenv_t pfenv_vstr;
1149 pfenv_vstr.data = vstr;
1150 pfenv_vstr.print_strn = pfenv_vstr_add_strn;
1151
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001152 for (const byte *top = str + len; str < top; str++) {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001153 mp_obj_t arg = MP_OBJ_NULL;
Dave Hylands6756a372014-04-02 11:42:39 -07001154 if (*str != '%') {
1155 vstr_add_char(vstr, *str);
1156 continue;
1157 }
1158 if (++str >= top) {
1159 break;
1160 }
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001161 if (*str == '%') {
Dave Hylands6756a372014-04-02 11:42:39 -07001162 vstr_add_char(vstr, '%');
1163 continue;
1164 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001165
1166 // Dictionary value lookup
1167 if (*str == '(') {
1168 const byte *key = ++str;
1169 while (*str != ')') {
1170 if (str >= top) {
1171 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "incomplete format key"));
1172 }
1173 ++str;
1174 }
1175 mp_obj_t k_obj = mp_obj_new_str((const char*)key, str - key, true);
1176 arg = mp_obj_dict_get(dict, k_obj);
1177 str++;
Dave Hylands6756a372014-04-02 11:42:39 -07001178 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001179
Dave Hylands6756a372014-04-02 11:42:39 -07001180 int flags = 0;
1181 char fill = ' ';
Damien George11de8392014-06-05 18:57:38 +01001182 int alt = 0;
Dave Hylands6756a372014-04-02 11:42:39 -07001183 while (str < top) {
1184 if (*str == '-') flags |= PF_FLAG_LEFT_ADJUST;
1185 else if (*str == '+') flags |= PF_FLAG_SHOW_SIGN;
1186 else if (*str == ' ') flags |= PF_FLAG_SPACE_SIGN;
Damien George11de8392014-06-05 18:57:38 +01001187 else if (*str == '#') alt = PF_FLAG_SHOW_PREFIX;
Dave Hylands6756a372014-04-02 11:42:39 -07001188 else if (*str == '0') {
1189 flags |= PF_FLAG_PAD_AFTER_SIGN;
1190 fill = '0';
1191 } else break;
1192 str++;
1193 }
1194 // parse width, if it exists
Damien George11de8392014-06-05 18:57:38 +01001195 int width = 0;
Dave Hylands6756a372014-04-02 11:42:39 -07001196 if (str < top) {
1197 if (*str == '*') {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001198 if (arg_i >= n_args) {
1199 goto not_enough_args;
1200 }
Dave Hylands6756a372014-04-02 11:42:39 -07001201 width = mp_obj_get_int(args[arg_i++]);
1202 str++;
1203 } else {
1204 for (; str < top && '0' <= *str && *str <= '9'; str++) {
1205 width = width * 10 + *str - '0';
1206 }
1207 }
1208 }
1209 int prec = -1;
1210 if (str < top && *str == '.') {
1211 if (++str < top) {
1212 if (*str == '*') {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001213 if (arg_i >= n_args) {
1214 goto not_enough_args;
1215 }
Dave Hylands6756a372014-04-02 11:42:39 -07001216 prec = mp_obj_get_int(args[arg_i++]);
1217 str++;
1218 } else {
1219 prec = 0;
1220 for (; str < top && '0' <= *str && *str <= '9'; str++) {
1221 prec = prec * 10 + *str - '0';
1222 }
1223 }
1224 }
1225 }
1226
1227 if (str >= top) {
Damien Georgeea13f402014-04-05 18:32:08 +01001228 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "incomplete format"));
Dave Hylands6756a372014-04-02 11:42:39 -07001229 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001230
1231 // Tuple value lookup
1232 if (arg == MP_OBJ_NULL) {
1233 if (arg_i >= n_args) {
1234not_enough_args:
1235 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not enough arguments for format string"));
1236 }
1237 arg = args[arg_i++];
1238 }
Dave Hylands6756a372014-04-02 11:42:39 -07001239 switch (*str) {
1240 case 'c':
1241 if (MP_OBJ_IS_STR(arg)) {
1242 uint len;
1243 const char *s = mp_obj_str_get_data(arg, &len);
1244 if (len != 1) {
Damien George11de8392014-06-05 18:57:38 +01001245 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "%%c requires int or char"));
Dave Hylands6756a372014-04-02 11:42:39 -07001246 break;
1247 }
1248 pfenv_print_strn(&pfenv_vstr, s, 1, flags, ' ', width);
1249 break;
1250 }
1251 if (arg_looks_integer(arg)) {
1252 char ch = mp_obj_get_int(arg);
1253 pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, ' ', width);
1254 break;
1255 }
Damien Georgefb510b32014-06-01 13:32:54 +01001256#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylands6756a372014-04-02 11:42:39 -07001257 // This is what CPython reports, so we report the same.
1258 if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
Damien George11de8392014-06-05 18:57:38 +01001259 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "integer argument expected, got float"));
Dave Hylands6756a372014-04-02 11:42:39 -07001260
1261 }
1262#endif
Damien George11de8392014-06-05 18:57:38 +01001263 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "an integer is required"));
1264 break;
Dave Hylands6756a372014-04-02 11:42:39 -07001265
1266 case 'd':
1267 case 'i':
1268 case 'u':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001269 pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 10, 'a', flags, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001270 break;
1271
Damien Georgefb510b32014-06-01 13:32:54 +01001272#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylands6756a372014-04-02 11:42:39 -07001273 case 'e':
1274 case 'E':
1275 case 'f':
1276 case 'F':
1277 case 'g':
1278 case 'G':
1279 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), *str, flags, fill, width, prec);
1280 break;
1281#endif
1282
1283 case 'o':
1284 if (alt) {
Dave Hylandsc4029e52014-04-07 11:19:51 -07001285 flags |= (PF_FLAG_SHOW_PREFIX | PF_FLAG_SHOW_OCTAL_LETTER);
Dave Hylands6756a372014-04-02 11:42:39 -07001286 }
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001287 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 8, 'a', flags, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001288 break;
1289
1290 case 'r':
1291 case 's':
1292 {
1293 vstr_t *arg_vstr = vstr_new();
1294 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf,
1295 arg_vstr, arg, *str == 'r' ? PRINT_REPR : PRINT_STR);
1296 uint len = vstr_len(arg_vstr);
1297 if (prec < 0) {
1298 prec = len;
1299 }
1300 if (len > prec) {
1301 len = prec;
1302 }
1303 pfenv_print_strn(&pfenv_vstr, vstr_str(arg_vstr), len, flags, ' ', width);
1304 vstr_free(arg_vstr);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001305 break;
1306 }
Dave Hylands6756a372014-04-02 11:42:39 -07001307
Dave Hylands6756a372014-04-02 11:42:39 -07001308 case 'X':
Damien George11de8392014-06-05 18:57:38 +01001309 case 'x':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001310 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, *str - ('X' - 'A'), flags | alt, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001311 break;
Damien Georgedeed0872014-04-06 11:11:15 +01001312
Dave Hylands6756a372014-04-02 11:42:39 -07001313 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001314 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylands6756a372014-04-02 11:42:39 -07001315 "unsupported format character '%c' (0x%x) at index %d",
1316 *str, *str, str - start_str));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001317 }
1318 }
1319
1320 if (arg_i != n_args) {
Damien Georgeea13f402014-04-05 18:32:08 +01001321 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not all arguments converted during string formatting"));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001322 }
1323
Damien George2617eeb2014-05-25 22:27:57 +01001324 mp_obj_t s = mp_obj_new_str(vstr->buf, vstr->len, false);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001325 vstr_free(vstr);
1326 return s;
1327}
1328
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001329STATIC mp_obj_t str_replace(uint n_args, const mp_obj_t *args) {
xbe480c15a2014-01-30 22:17:30 -08001330 assert(MP_OBJ_IS_STR(args[0]));
xbe480c15a2014-01-30 22:17:30 -08001331
Damien George40f3c022014-07-03 13:25:24 +01001332 mp_int_t max_rep = -1;
xbe480c15a2014-01-30 22:17:30 -08001333 if (n_args == 4) {
Damien Georgeff715422014-04-07 00:39:13 +01001334 max_rep = mp_obj_get_int(args[3]);
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001335 if (max_rep == 0) {
1336 return args[0];
1337 } else if (max_rep < 0) {
Damien Georgeff715422014-04-07 00:39:13 +01001338 max_rep = -1;
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001339 }
xbe480c15a2014-01-30 22:17:30 -08001340 }
Damien George94f68302014-01-31 23:45:12 +00001341
xbe729be9b2014-04-07 14:46:39 -07001342 // if max_rep is still -1 by this point we will need to do all possible replacements
xbe480c15a2014-01-30 22:17:30 -08001343
Damien Georgeff715422014-04-07 00:39:13 +01001344 // check argument types
1345
1346 if (!MP_OBJ_IS_STR(args[1])) {
1347 bad_implicit_conversion(args[1]);
1348 }
1349
1350 if (!MP_OBJ_IS_STR(args[2])) {
1351 bad_implicit_conversion(args[2]);
1352 }
1353
1354 // extract string data
1355
xbe480c15a2014-01-30 22:17:30 -08001356 GET_STR_DATA_LEN(args[0], str, str_len);
1357 GET_STR_DATA_LEN(args[1], old, old_len);
1358 GET_STR_DATA_LEN(args[2], new, new_len);
Damien George94f68302014-01-31 23:45:12 +00001359
1360 // old won't exist in str if it's longer, so nothing to replace
xbe480c15a2014-01-30 22:17:30 -08001361 if (old_len > str_len) {
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001362 return args[0];
xbe480c15a2014-01-30 22:17:30 -08001363 }
1364
Damien George94f68302014-01-31 23:45:12 +00001365 // data for the replaced string
1366 byte *data = NULL;
1367 mp_obj_t replaced_str = MP_OBJ_NULL;
xbe480c15a2014-01-30 22:17:30 -08001368
Damien George94f68302014-01-31 23:45:12 +00001369 // do 2 passes over the string:
1370 // first pass computes the required length of the replaced string
1371 // second pass does the replacements
1372 for (;;) {
Damien George40f3c022014-07-03 13:25:24 +01001373 mp_uint_t replaced_str_index = 0;
1374 mp_uint_t num_replacements_done = 0;
Damien George94f68302014-01-31 23:45:12 +00001375 const byte *old_occurrence;
1376 const byte *offset_ptr = str;
Damien George40f3c022014-07-03 13:25:24 +01001377 mp_uint_t str_len_remain = str_len;
Damien Georgeff715422014-04-07 00:39:13 +01001378 if (old_len == 0) {
1379 // if old_str is empty, copy new_str to start of replaced string
1380 // copy the replacement string
1381 if (data != NULL) {
1382 memcpy(data, new, new_len);
1383 }
1384 replaced_str_index += new_len;
1385 num_replacements_done++;
1386 }
1387 while (num_replacements_done != max_rep && str_len_remain > 0 && (old_occurrence = find_subbytes(offset_ptr, str_len_remain, old, old_len, 1)) != NULL) {
1388 if (old_len == 0) {
1389 old_occurrence += 1;
1390 }
Damien George94f68302014-01-31 23:45:12 +00001391 // copy from just after end of last occurrence of to-be-replaced string to right before start of next occurrence
1392 if (data != NULL) {
1393 memcpy(data + replaced_str_index, offset_ptr, old_occurrence - offset_ptr);
1394 }
1395 replaced_str_index += old_occurrence - offset_ptr;
1396 // copy the replacement string
1397 if (data != NULL) {
1398 memcpy(data + replaced_str_index, new, new_len);
1399 }
1400 replaced_str_index += new_len;
1401 offset_ptr = old_occurrence + old_len;
Damien Georgeff715422014-04-07 00:39:13 +01001402 str_len_remain = str + str_len - offset_ptr;
Damien George94f68302014-01-31 23:45:12 +00001403 num_replacements_done++;
Damien George94f68302014-01-31 23:45:12 +00001404 }
1405
1406 // copy from just after end of last occurrence of to-be-replaced string to end of old string
1407 if (data != NULL) {
Damien Georgeff715422014-04-07 00:39:13 +01001408 memcpy(data + replaced_str_index, offset_ptr, str_len_remain);
Damien George94f68302014-01-31 23:45:12 +00001409 }
Damien Georgeff715422014-04-07 00:39:13 +01001410 replaced_str_index += str_len_remain;
Damien George94f68302014-01-31 23:45:12 +00001411
1412 if (data == NULL) {
1413 // first pass
1414 if (num_replacements_done == 0) {
1415 // no substr found, return original string
1416 return args[0];
1417 } else {
1418 // substr found, allocate new string
1419 replaced_str = mp_obj_str_builder_start(mp_obj_get_type(args[0]), replaced_str_index, &data);
Damien Georgeff715422014-04-07 00:39:13 +01001420 assert(data != NULL);
Damien George94f68302014-01-31 23:45:12 +00001421 }
1422 } else {
1423 // second pass, we are done
1424 break;
1425 }
xbe480c15a2014-01-30 22:17:30 -08001426 }
Damien George94f68302014-01-31 23:45:12 +00001427
xbe480c15a2014-01-30 22:17:30 -08001428 return mp_obj_str_builder_end(replaced_str);
1429}
1430
xbe9e1e8cd2014-03-12 22:57:16 -07001431STATIC mp_obj_t str_count(uint n_args, const mp_obj_t *args) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001432 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
xbe9e1e8cd2014-03-12 22:57:16 -07001433 assert(2 <= n_args && n_args <= 4);
1434 assert(MP_OBJ_IS_STR(args[0]));
1435 assert(MP_OBJ_IS_STR(args[1]));
1436
1437 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
1438 GET_STR_DATA_LEN(args[1], needle, needle_len);
1439
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001440 const byte *start = haystack;
1441 const byte *end = haystack + haystack_len;
xbe9e1e8cd2014-03-12 22:57:16 -07001442 if (n_args >= 3 && args[2] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001443 start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001444 }
1445 if (n_args >= 4 && args[3] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001446 end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001447 }
1448
Damien George536dde22014-03-13 22:07:55 +00001449 // if needle_len is zero then we count each gap between characters as an occurrence
1450 if (needle_len == 0) {
Paul Sokolovsky9e215fa2014-06-28 23:14:30 +03001451 return MP_OBJ_NEW_SMALL_INT(unichar_charlen((const char*)start, end - start) + 1);
xbe9e1e8cd2014-03-12 22:57:16 -07001452 }
1453
Damien George536dde22014-03-13 22:07:55 +00001454 // count the occurrences
Damien George40f3c022014-07-03 13:25:24 +01001455 mp_int_t num_occurrences = 0;
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001456 for (const byte *haystack_ptr = start; haystack_ptr + needle_len <= end;) {
1457 if (memcmp(haystack_ptr, needle, needle_len) == 0) {
xbec5d70ba2014-03-13 00:29:15 -07001458 num_occurrences++;
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001459 haystack_ptr += needle_len;
1460 } else {
1461 haystack_ptr = utf8_next_char(haystack_ptr);
xbec5d70ba2014-03-13 00:29:15 -07001462 }
xbe9e1e8cd2014-03-12 22:57:16 -07001463 }
1464
1465 return MP_OBJ_NEW_SMALL_INT(num_occurrences);
1466}
1467
Damien George40f3c022014-07-03 13:25:24 +01001468STATIC mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, mp_int_t direction) {
Paul Sokolovsky69f3eb22014-05-11 02:44:46 +03001469 if (!is_str_or_bytes(self_in)) {
1470 assert(0);
1471 }
1472 mp_obj_type_t *self_type = mp_obj_get_type(self_in);
1473 if (self_type != mp_obj_get_type(arg)) {
1474 arg_type_mixup();
xbe613a8e32014-03-18 00:06:29 -07001475 }
Damien Georgeb035db32014-03-21 20:39:40 +00001476
xbe613a8e32014-03-18 00:06:29 -07001477 GET_STR_DATA_LEN(self_in, str, str_len);
1478 GET_STR_DATA_LEN(arg, sep, sep_len);
1479
1480 if (sep_len == 0) {
Damien Georgeea13f402014-04-05 18:32:08 +01001481 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
xbe613a8e32014-03-18 00:06:29 -07001482 }
Damien Georgeb035db32014-03-21 20:39:40 +00001483
1484 mp_obj_t result[] = {MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_)};
1485
1486 if (direction > 0) {
1487 result[0] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001488 } else {
Damien Georgeb035db32014-03-21 20:39:40 +00001489 result[2] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001490 }
xbe613a8e32014-03-18 00:06:29 -07001491
xbe17a5a832014-03-23 23:31:58 -07001492 const byte *position_ptr = find_subbytes(str, str_len, sep, sep_len, direction);
1493 if (position_ptr != NULL) {
Damien George40f3c022014-07-03 13:25:24 +01001494 mp_uint_t position = position_ptr - str;
Damien Georgef600a6a2014-05-25 22:34:34 +01001495 result[0] = mp_obj_new_str_of_type(self_type, str, position);
xbe17a5a832014-03-23 23:31:58 -07001496 result[1] = arg;
Damien Georgef600a6a2014-05-25 22:34:34 +01001497 result[2] = mp_obj_new_str_of_type(self_type, str + position + sep_len, str_len - position - sep_len);
xbe613a8e32014-03-18 00:06:29 -07001498 }
Damien Georgeb035db32014-03-21 20:39:40 +00001499
xbe0a6894c2014-03-21 01:12:26 -07001500 return mp_obj_new_tuple(3, result);
xbe613a8e32014-03-18 00:06:29 -07001501}
1502
Damien Georgeb035db32014-03-21 20:39:40 +00001503STATIC mp_obj_t str_partition(mp_obj_t self_in, mp_obj_t arg) {
1504 return str_partitioner(self_in, arg, 1);
xbe0a6894c2014-03-21 01:12:26 -07001505}
xbe4504ea82014-03-19 00:46:14 -07001506
Damien Georgeb035db32014-03-21 20:39:40 +00001507STATIC mp_obj_t str_rpartition(mp_obj_t self_in, mp_obj_t arg) {
1508 return str_partitioner(self_in, arg, -1);
xbe4504ea82014-03-19 00:46:14 -07001509}
1510
Paul Sokolovsky69135212014-05-10 19:47:41 +03001511// Supposedly not too critical operations, so optimize for code size
Damien Georgefcc9cf62014-06-01 18:22:09 +01001512STATIC mp_obj_t str_caseconv(unichar (*op)(unichar), mp_obj_t self_in) {
Paul Sokolovsky69135212014-05-10 19:47:41 +03001513 GET_STR_DATA_LEN(self_in, self_data, self_len);
1514 byte *data;
1515 mp_obj_t s = mp_obj_str_builder_start(mp_obj_get_type(self_in), self_len, &data);
1516 for (int i = 0; i < self_len; i++) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001517 *data++ = op(*self_data++);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001518 }
1519 *data = 0;
1520 return mp_obj_str_builder_end(s);
1521}
1522
1523STATIC mp_obj_t str_lower(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001524 return str_caseconv(unichar_tolower, self_in);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001525}
1526
1527STATIC mp_obj_t str_upper(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001528 return str_caseconv(unichar_toupper, self_in);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001529}
1530
Damien Georgefcc9cf62014-06-01 18:22:09 +01001531STATIC mp_obj_t str_uni_istype(bool (*f)(unichar), mp_obj_t self_in) {
Kim Bautersa3f4b832014-05-31 07:30:03 +01001532 GET_STR_DATA_LEN(self_in, self_data, self_len);
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001533
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001534 if (self_len == 0) {
1535 return mp_const_false; // default to False for empty str
1536 }
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001537
Damien Georgefcc9cf62014-06-01 18:22:09 +01001538 if (f != unichar_isupper && f != unichar_islower) {
Kim Bautersa3f4b832014-05-31 07:30:03 +01001539 for (int i = 0; i < self_len; i++) {
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001540 if (!f(*self_data++)) {
1541 return mp_const_false;
1542 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001543 }
1544 } else {
Kim Bautersa3f4b832014-05-31 07:30:03 +01001545 bool contains_alpha = false;
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001546
Kim Bautersa3f4b832014-05-31 07:30:03 +01001547 for (int i = 0; i < self_len; i++) { // only check alphanumeric characters
1548 if (unichar_isalpha(*self_data++)) {
1549 contains_alpha = true;
Damien Georgefcc9cf62014-06-01 18:22:09 +01001550 if (!f(*(self_data - 1))) { // -1 because we already incremented above
1551 return mp_const_false;
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001552 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001553 }
1554 }
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001555
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001556 if (!contains_alpha) {
1557 return mp_const_false;
1558 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001559 }
1560
1561 return mp_const_true;
1562}
1563
1564STATIC mp_obj_t str_isspace(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001565 return str_uni_istype(unichar_isspace, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001566}
1567
1568STATIC mp_obj_t str_isalpha(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001569 return str_uni_istype(unichar_isalpha, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001570}
1571
1572STATIC mp_obj_t str_isdigit(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001573 return str_uni_istype(unichar_isdigit, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001574}
1575
1576STATIC mp_obj_t str_isupper(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001577 return str_uni_istype(unichar_isupper, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001578}
1579
1580STATIC mp_obj_t str_islower(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001581 return str_uni_istype(unichar_islower, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001582}
1583
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001584#if MICROPY_CPYTHON_COMPAT
1585// These methods are superfluous in the presense of str() and bytes()
1586// constructors.
1587// TODO: should accept kwargs too
1588STATIC mp_obj_t bytes_decode(uint n_args, const mp_obj_t *args) {
1589 mp_obj_t new_args[2];
1590 if (n_args == 1) {
1591 new_args[0] = args[0];
1592 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1593 args = new_args;
1594 n_args++;
1595 }
1596 return str_make_new(NULL, n_args, 0, args);
1597}
1598
1599// TODO: should accept kwargs too
1600STATIC mp_obj_t str_encode(uint n_args, const mp_obj_t *args) {
1601 mp_obj_t new_args[2];
1602 if (n_args == 1) {
1603 new_args[0] = args[0];
1604 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1605 args = new_args;
1606 n_args++;
1607 }
1608 return bytes_make_new(NULL, n_args, 0, args);
1609}
1610#endif
1611
Damien George40f3c022014-07-03 13:25:24 +01001612mp_int_t mp_obj_str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, int flags) {
Damien George57a4b4f2014-04-18 22:29:21 +01001613 if (flags == MP_BUFFER_READ) {
Damien George2da98302014-03-09 19:58:18 +00001614 GET_STR_DATA_LEN(self_in, str_data, str_len);
1615 bufinfo->buf = (void*)str_data;
1616 bufinfo->len = str_len;
Damien George57a4b4f2014-04-18 22:29:21 +01001617 bufinfo->typecode = 'b';
Damien George2da98302014-03-09 19:58:18 +00001618 return 0;
1619 } else {
1620 // can't write to a string
1621 bufinfo->buf = NULL;
1622 bufinfo->len = 0;
Damien George57a4b4f2014-04-18 22:29:21 +01001623 bufinfo->typecode = -1;
Damien George2da98302014-03-09 19:58:18 +00001624 return 1;
1625 }
1626}
1627
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001628#if MICROPY_CPYTHON_COMPAT
Paul Sokolovsky97319122014-06-13 22:01:26 +03001629MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_decode_obj, 1, 3, bytes_decode);
1630MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_encode_obj, 1, 3, str_encode);
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001631#endif
Paul Sokolovsky97319122014-06-13 22:01:26 +03001632MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj, 2, 4, str_find);
1633MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rfind_obj, 2, 4, str_rfind);
1634MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_index_obj, 2, 4, str_index);
1635MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rindex_obj, 2, 4, str_rindex);
1636MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join);
1637MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, str_split);
1638MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rsplit_obj, 1, 3, str_rsplit);
1639MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_startswith_obj, 2, 3, str_startswith);
1640MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_endswith_obj, 2, 3, str_endswith);
1641MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip);
1642MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_lstrip_obj, 1, 2, str_lstrip);
1643MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rstrip_obj, 1, 2, str_rstrip);
1644MP_DEFINE_CONST_FUN_OBJ_VAR(str_format_obj, 1, mp_obj_str_format);
1645MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj, 3, 4, str_replace);
1646MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count);
1647MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition);
1648MP_DEFINE_CONST_FUN_OBJ_2(str_rpartition_obj, str_rpartition);
1649MP_DEFINE_CONST_FUN_OBJ_1(str_lower_obj, str_lower);
1650MP_DEFINE_CONST_FUN_OBJ_1(str_upper_obj, str_upper);
1651MP_DEFINE_CONST_FUN_OBJ_1(str_isspace_obj, str_isspace);
1652MP_DEFINE_CONST_FUN_OBJ_1(str_isalpha_obj, str_isalpha);
1653MP_DEFINE_CONST_FUN_OBJ_1(str_isdigit_obj, str_isdigit);
1654MP_DEFINE_CONST_FUN_OBJ_1(str_isupper_obj, str_isupper);
1655MP_DEFINE_CONST_FUN_OBJ_1(str_islower_obj, str_islower);
Damiend99b0522013-12-21 18:17:45 +00001656
Damien George9b196cd2014-03-26 21:47:19 +00001657STATIC const mp_map_elem_t str_locals_dict_table[] = {
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001658#if MICROPY_CPYTHON_COMPAT
1659 { MP_OBJ_NEW_QSTR(MP_QSTR_decode), (mp_obj_t)&bytes_decode_obj },
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001660 #if !MICROPY_PY_BUILTINS_STR_UNICODE
1661 // If we have separate unicode type, then here we have methods only
1662 // for bytes type, and it should not have encode() methods. Otherwise,
1663 // we have non-compliant-but-practical bytestring type, which shares
1664 // method table with bytes, so they both have encode() and decode()
1665 // methods (which should do type checking at runtime).
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001666 { MP_OBJ_NEW_QSTR(MP_QSTR_encode), (mp_obj_t)&str_encode_obj },
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001667 #endif
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001668#endif
Damien George9b196cd2014-03-26 21:47:19 +00001669 { MP_OBJ_NEW_QSTR(MP_QSTR_find), (mp_obj_t)&str_find_obj },
1670 { MP_OBJ_NEW_QSTR(MP_QSTR_rfind), (mp_obj_t)&str_rfind_obj },
xbe3d9a39e2014-04-08 11:42:19 -07001671 { MP_OBJ_NEW_QSTR(MP_QSTR_index), (mp_obj_t)&str_index_obj },
1672 { MP_OBJ_NEW_QSTR(MP_QSTR_rindex), (mp_obj_t)&str_rindex_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001673 { MP_OBJ_NEW_QSTR(MP_QSTR_join), (mp_obj_t)&str_join_obj },
1674 { MP_OBJ_NEW_QSTR(MP_QSTR_split), (mp_obj_t)&str_split_obj },
Paul Sokolovsky2a273652014-05-13 08:07:08 +03001675 { MP_OBJ_NEW_QSTR(MP_QSTR_rsplit), (mp_obj_t)&str_rsplit_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001676 { MP_OBJ_NEW_QSTR(MP_QSTR_startswith), (mp_obj_t)&str_startswith_obj },
Paul Sokolovskyd098c6b2014-05-24 22:46:51 +03001677 { MP_OBJ_NEW_QSTR(MP_QSTR_endswith), (mp_obj_t)&str_endswith_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001678 { MP_OBJ_NEW_QSTR(MP_QSTR_strip), (mp_obj_t)&str_strip_obj },
Paul Sokolovsky88107842014-04-26 06:20:08 +03001679 { MP_OBJ_NEW_QSTR(MP_QSTR_lstrip), (mp_obj_t)&str_lstrip_obj },
1680 { MP_OBJ_NEW_QSTR(MP_QSTR_rstrip), (mp_obj_t)&str_rstrip_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001681 { MP_OBJ_NEW_QSTR(MP_QSTR_format), (mp_obj_t)&str_format_obj },
1682 { MP_OBJ_NEW_QSTR(MP_QSTR_replace), (mp_obj_t)&str_replace_obj },
1683 { MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&str_count_obj },
1684 { MP_OBJ_NEW_QSTR(MP_QSTR_partition), (mp_obj_t)&str_partition_obj },
1685 { MP_OBJ_NEW_QSTR(MP_QSTR_rpartition), (mp_obj_t)&str_rpartition_obj },
Paul Sokolovsky69135212014-05-10 19:47:41 +03001686 { MP_OBJ_NEW_QSTR(MP_QSTR_lower), (mp_obj_t)&str_lower_obj },
1687 { MP_OBJ_NEW_QSTR(MP_QSTR_upper), (mp_obj_t)&str_upper_obj },
Kim Bautersa3f4b832014-05-31 07:30:03 +01001688 { MP_OBJ_NEW_QSTR(MP_QSTR_isspace), (mp_obj_t)&str_isspace_obj },
1689 { MP_OBJ_NEW_QSTR(MP_QSTR_isalpha), (mp_obj_t)&str_isalpha_obj },
1690 { MP_OBJ_NEW_QSTR(MP_QSTR_isdigit), (mp_obj_t)&str_isdigit_obj },
1691 { MP_OBJ_NEW_QSTR(MP_QSTR_isupper), (mp_obj_t)&str_isupper_obj },
1692 { MP_OBJ_NEW_QSTR(MP_QSTR_islower), (mp_obj_t)&str_islower_obj },
ian-v7a16fad2014-01-06 09:52:29 -08001693};
Damien George97209d32014-01-07 15:58:30 +00001694
Damien George9b196cd2014-03-26 21:47:19 +00001695STATIC MP_DEFINE_CONST_DICT(str_locals_dict, str_locals_dict_table);
1696
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001697#if !MICROPY_PY_BUILTINS_STR_UNICODE
Damien George3e1a5c12014-03-29 13:43:38 +00001698const mp_obj_type_t mp_type_str = {
Damien Georgec5966122014-02-15 16:10:44 +00001699 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001700 .name = MP_QSTR_str,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001701 .print = str_print,
Paul Sokolovskybe020c22014-03-21 11:39:01 +02001702 .make_new = str_make_new,
Damien Georgee04a44e2014-06-28 10:27:23 +01001703 .binary_op = mp_obj_str_binary_op,
Damien George729f7b42014-04-17 22:10:53 +01001704 .subscr = str_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001705 .getiter = mp_obj_new_str_iterator,
Damien Georgee04a44e2014-06-28 10:27:23 +01001706 .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
Damien George9b196cd2014-03-26 21:47:19 +00001707 .locals_dict = (mp_obj_t)&str_locals_dict,
Damiend99b0522013-12-21 18:17:45 +00001708};
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001709#endif
Damiend99b0522013-12-21 18:17:45 +00001710
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001711// Reuses most of methods from str
Damien George3e1a5c12014-03-29 13:43:38 +00001712const mp_obj_type_t mp_type_bytes = {
Damien Georgec5966122014-02-15 16:10:44 +00001713 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001714 .name = MP_QSTR_bytes,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001715 .print = str_print,
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001716 .make_new = bytes_make_new,
Damien Georgee04a44e2014-06-28 10:27:23 +01001717 .binary_op = mp_obj_str_binary_op,
Damien George729f7b42014-04-17 22:10:53 +01001718 .subscr = str_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001719 .getiter = mp_obj_new_bytes_iterator,
Damien Georgee04a44e2014-06-28 10:27:23 +01001720 .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
Damien George9b196cd2014-03-26 21:47:19 +00001721 .locals_dict = (mp_obj_t)&str_locals_dict,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001722};
1723
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001724// the zero-length bytes
Damien George3e1a5c12014-03-29 13:43:38 +00001725STATIC const mp_obj_str_t empty_bytes_obj = {{&mp_type_bytes}, 0, 0, NULL};
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001726const mp_obj_t mp_const_empty_bytes = (mp_obj_t)&empty_bytes_obj;
1727
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001728mp_obj_t mp_obj_str_builder_start(const mp_obj_type_t *type, uint len, byte **data) {
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001729 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001730 o->base.type = type;
Damien George5fa93b62014-01-22 14:35:10 +00001731 o->len = len;
Paul Sokolovsky504e2332014-04-19 03:09:17 +03001732 o->hash = 0;
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001733 byte *p = m_new(byte, len + 1);
1734 o->data = p;
1735 *data = p;
Damiend99b0522013-12-21 18:17:45 +00001736 return o;
1737}
1738
Damien George5fa93b62014-01-22 14:35:10 +00001739mp_obj_t mp_obj_str_builder_end(mp_obj_t o_in) {
Damien George5fa93b62014-01-22 14:35:10 +00001740 mp_obj_str_t *o = o_in;
1741 o->hash = qstr_compute_hash(o->data, o->len);
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001742 byte *p = (byte*)o->data;
1743 p[o->len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
Damien George5fa93b62014-01-22 14:35:10 +00001744 return o;
1745}
1746
Damien George5f27a7e2014-07-31 10:29:56 +01001747mp_obj_t mp_obj_str_builder_end_with_len(mp_obj_t o_in, mp_uint_t len) {
1748 mp_obj_str_t *o = o_in;
1749 o->data = m_renew(byte, (byte*)o->data, o->len + 1, len + 1);
1750 o->len = len;
1751 o->hash = qstr_compute_hash(o->data, o->len);
1752 byte *p = (byte*)o->data;
1753 p[o->len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
1754 return o;
1755}
1756
Damien Georgef600a6a2014-05-25 22:34:34 +01001757mp_obj_t mp_obj_new_str_of_type(const mp_obj_type_t *type, const byte* data, uint len) {
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001758 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001759 o->base.type = type;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001760 o->len = len;
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001761 if (data) {
1762 o->hash = qstr_compute_hash(data, len);
1763 byte *p = m_new(byte, len + 1);
1764 o->data = p;
1765 memcpy(p, data, len * sizeof(byte));
1766 p[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
1767 }
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001768 return o;
1769}
1770
Damien George2617eeb2014-05-25 22:27:57 +01001771mp_obj_t mp_obj_new_str(const char* data, uint len, bool make_qstr_if_not_already) {
Damien Georgef600a6a2014-05-25 22:34:34 +01001772 if (make_qstr_if_not_already) {
1773 // use existing, or make a new qstr
Damien George2617eeb2014-05-25 22:27:57 +01001774 return MP_OBJ_NEW_QSTR(qstr_from_strn(data, len));
Damien George5fa93b62014-01-22 14:35:10 +00001775 } else {
Damien Georgef600a6a2014-05-25 22:34:34 +01001776 qstr q = qstr_find_strn(data, len);
1777 if (q != MP_QSTR_NULL) {
1778 // qstr with this data already exists
1779 return MP_OBJ_NEW_QSTR(q);
1780 } else {
1781 // no existing qstr, don't make one
1782 return mp_obj_new_str_of_type(&mp_type_str, (const byte*)data, len);
1783 }
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02001784 }
Damien George5fa93b62014-01-22 14:35:10 +00001785}
1786
Paul Sokolovskyb4efac12014-06-08 01:13:35 +03001787mp_obj_t mp_obj_str_intern(mp_obj_t str) {
1788 GET_STR_DATA_LEN(str, data, len);
1789 return MP_OBJ_NEW_QSTR(qstr_from_strn((const char*)data, len));
1790}
1791
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001792mp_obj_t mp_obj_new_bytes(const byte* data, uint len) {
Damien Georgef600a6a2014-05-25 22:34:34 +01001793 return mp_obj_new_str_of_type(&mp_type_bytes, data, len);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001794}
1795
Damien George5fa93b62014-01-22 14:35:10 +00001796bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) {
1797 if (MP_OBJ_IS_QSTR(s1) && MP_OBJ_IS_QSTR(s2)) {
1798 return s1 == s2;
1799 } else {
1800 GET_STR_HASH(s1, h1);
1801 GET_STR_HASH(s2, h2);
Paul Sokolovsky59e269c2014-04-14 01:43:01 +03001802 // If any of hashes is 0, it means it's not valid
1803 if (h1 != 0 && h2 != 0 && h1 != h2) {
Damien George5fa93b62014-01-22 14:35:10 +00001804 return false;
1805 }
1806 GET_STR_DATA_LEN(s1, d1, l1);
1807 GET_STR_DATA_LEN(s2, d2, l2);
1808 if (l1 != l2) {
1809 return false;
1810 }
Damien George1e708fe2014-01-23 18:27:51 +00001811 return memcmp(d1, d2, l1) == 0;
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02001812 }
Damien George5fa93b62014-01-22 14:35:10 +00001813}
1814
Damien Georgedeed0872014-04-06 11:11:15 +01001815STATIC void bad_implicit_conversion(mp_obj_t self_in) {
Damien Georgeea13f402014-04-05 18:32:08 +01001816 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 +00001817}
1818
Paul Sokolovsky69f3eb22014-05-11 02:44:46 +03001819STATIC void arg_type_mixup() {
1820 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "Can't mix str and bytes arguments"));
1821}
1822
Damien George5fa93b62014-01-22 14:35:10 +00001823uint mp_obj_str_get_hash(mp_obj_t self_in) {
Paul Sokolovskyf130ca12014-04-13 05:41:00 +03001824 // TODO: This has too big overhead for hash accessor
1825 if (MP_OBJ_IS_STR(self_in) || MP_OBJ_IS_TYPE(self_in, &mp_type_bytes)) {
Damien George5fa93b62014-01-22 14:35:10 +00001826 GET_STR_HASH(self_in, h);
1827 return h;
1828 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001829 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001830 }
1831}
1832
1833uint mp_obj_str_get_len(mp_obj_t self_in) {
Damien Georgeee014112014-04-15 23:10:00 +01001834 // TODO This has a double check for the type, one in obj.c and one here
1835 if (MP_OBJ_IS_STR(self_in) || MP_OBJ_IS_TYPE(self_in, &mp_type_bytes)) {
Damien George5fa93b62014-01-22 14:35:10 +00001836 GET_STR_LEN(self_in, l);
1837 return l;
1838 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001839 bad_implicit_conversion(self_in);
1840 }
1841}
1842
1843// use this if you will anyway convert the string to a qstr
1844// will be more efficient for the case where it's already a qstr
1845qstr mp_obj_str_get_qstr(mp_obj_t self_in) {
1846 if (MP_OBJ_IS_QSTR(self_in)) {
1847 return MP_OBJ_QSTR_VALUE(self_in);
Damien George3e1a5c12014-03-29 13:43:38 +00001848 } else if (MP_OBJ_IS_TYPE(self_in, &mp_type_str)) {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001849 mp_obj_str_t *self = self_in;
1850 return qstr_from_strn((char*)self->data, self->len);
1851 } else {
1852 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001853 }
1854}
1855
1856// only use this function if you need the str data to be zero terminated
1857// at the moment all strings are zero terminated to help with C ASCIIZ compatibility
1858const char *mp_obj_str_get_str(mp_obj_t self_in) {
1859 if (MP_OBJ_IS_STR(self_in)) {
1860 GET_STR_DATA_LEN(self_in, s, l);
1861 (void)l; // len unused
1862 return (const char*)s;
1863 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001864 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001865 }
1866}
1867
Damien George698ec212014-02-08 18:17:23 +00001868const char *mp_obj_str_get_data(mp_obj_t self_in, uint *len) {
Paul Sokolovskyeea01182014-05-11 13:51:24 +03001869 if (is_str_or_bytes(self_in)) {
Damien George5fa93b62014-01-22 14:35:10 +00001870 GET_STR_DATA_LEN(self_in, s, l);
1871 *len = l;
Damien George698ec212014-02-08 18:17:23 +00001872 return (const char*)s;
Damien George5fa93b62014-01-22 14:35:10 +00001873 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001874 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001875 }
Damiend99b0522013-12-21 18:17:45 +00001876}
xyb8cfc9f02014-01-05 18:47:51 +08001877
1878/******************************************************************************/
1879/* str iterator */
1880
1881typedef struct _mp_obj_str_it_t {
1882 mp_obj_base_t base;
Damien George5fa93b62014-01-22 14:35:10 +00001883 mp_obj_t str;
Damien George40f3c022014-07-03 13:25:24 +01001884 mp_uint_t cur;
xyb8cfc9f02014-01-05 18:47:51 +08001885} mp_obj_str_it_t;
1886
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001887#if !MICROPY_PY_BUILTINS_STR_UNICODE
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001888STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
xyb8cfc9f02014-01-05 18:47:51 +08001889 mp_obj_str_it_t *self = self_in;
Damien George5fa93b62014-01-22 14:35:10 +00001890 GET_STR_DATA_LEN(self->str, str, len);
1891 if (self->cur < len) {
Damien George2617eeb2014-05-25 22:27:57 +01001892 mp_obj_t o_out = mp_obj_new_str((const char*)str + self->cur, 1, true);
xyb8cfc9f02014-01-05 18:47:51 +08001893 self->cur += 1;
1894 return o_out;
1895 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01001896 return MP_OBJ_STOP_ITERATION;
xyb8cfc9f02014-01-05 18:47:51 +08001897 }
1898}
1899
Damien George3e1a5c12014-03-29 13:43:38 +00001900STATIC const mp_obj_type_t mp_type_str_it = {
Damien Georgec5966122014-02-15 16:10:44 +00001901 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001902 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +03001903 .getiter = mp_identity,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001904 .iternext = str_it_iternext,
xyb8cfc9f02014-01-05 18:47:51 +08001905};
1906
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001907mp_obj_t mp_obj_new_str_iterator(mp_obj_t str) {
1908 mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
1909 o->base.type = &mp_type_str_it;
1910 o->str = str;
1911 o->cur = 0;
1912 return o;
1913}
1914#endif
1915
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001916STATIC mp_obj_t bytes_it_iternext(mp_obj_t self_in) {
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001917 mp_obj_str_it_t *self = self_in;
1918 GET_STR_DATA_LEN(self->str, str, len);
1919 if (self->cur < len) {
Damien Georgebb4c6f32014-07-31 10:49:14 +01001920 mp_obj_t o_out = MP_OBJ_NEW_SMALL_INT(str[self->cur]);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001921 self->cur += 1;
1922 return o_out;
1923 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01001924 return MP_OBJ_STOP_ITERATION;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001925 }
1926}
1927
Damien George3e1a5c12014-03-29 13:43:38 +00001928STATIC const mp_obj_type_t mp_type_bytes_it = {
Damien Georgec5966122014-02-15 16:10:44 +00001929 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001930 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +03001931 .getiter = mp_identity,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001932 .iternext = bytes_it_iternext,
1933};
1934
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001935mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str) {
1936 mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
Damien George3e1a5c12014-03-29 13:43:38 +00001937 o->base.type = &mp_type_bytes_it;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001938 o->str = str;
1939 o->cur = 0;
xyb8cfc9f02014-01-05 18:47:51 +08001940 return o;
1941}