blob: 35bb8e749cd8ceb1dbea3de47d295e0bc38155b9 [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
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300356// This is used for both bytes and 8-bit strings. This is not used for unicode strings.
357STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
Paul Sokolovsky5ebd5f02014-05-11 21:22:59 +0300358 mp_obj_type_t *type = mp_obj_get_type(self_in);
Damien George729f7b42014-04-17 22:10:53 +0100359 GET_STR_DATA_LEN(self_in, self_data, self_len);
360 if (value == MP_OBJ_SENTINEL) {
361 // load
Damien Georgefb510b32014-06-01 13:32:54 +0100362#if MICROPY_PY_BUILTINS_SLICE
Damien George729f7b42014-04-17 22:10:53 +0100363 if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
Paul Sokolovskyde4b9322014-05-25 21:21:57 +0300364 mp_bound_slice_t slice;
365 if (!mp_seq_get_fast_slice_indexes(self_len, index, &slice)) {
Paul Sokolovsky5fd5af92014-05-25 22:12:56 +0300366 nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,
Damien George11de8392014-06-05 18:57:38 +0100367 "only slices with step=1 (aka None) are supported"));
Damien George729f7b42014-04-17 22:10:53 +0100368 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100369 return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start);
Damien George729f7b42014-04-17 22:10:53 +0100370 }
371#endif
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300372 mp_uint_t index_val = mp_get_index(type, self_len, index, false);
Damien George2eb1f602014-08-11 23:24:29 +0100373 // If we have unicode enabled the type will always be bytes, so take the short cut.
374 if (MICROPY_PY_BUILTINS_STR_UNICODE || type == &mp_type_bytes) {
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300375 return MP_OBJ_NEW_SMALL_INT(self_data[index_val]);
Damien George729f7b42014-04-17 22:10:53 +0100376 } else {
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300377 return mp_obj_new_str((char*)&self_data[index_val], 1, true);
Damien George729f7b42014-04-17 22:10:53 +0100378 }
379 } else {
Damien George6ac5dce2014-05-21 19:42:43 +0100380 return MP_OBJ_NULL; // op not supported
Damien George729f7b42014-04-17 22:10:53 +0100381 }
382}
383
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200384STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
Paul Sokolovsky5e5d69b2014-05-11 21:13:01 +0300385 assert(is_str_or_bytes(self_in));
386 const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
Damiend99b0522013-12-21 18:17:45 +0000387
Damien Georgefe8fb912014-01-02 16:36:09 +0000388 // get separation string
Damien George5fa93b62014-01-22 14:35:10 +0000389 GET_STR_DATA_LEN(self_in, sep_str, sep_len);
Damien Georgefe8fb912014-01-02 16:36:09 +0000390
391 // process args
Damiend99b0522013-12-21 18:17:45 +0000392 uint seq_len;
393 mp_obj_t *seq_items;
Damien George07ddab52014-03-29 13:15:08 +0000394 if (MP_OBJ_IS_TYPE(arg, &mp_type_tuple)) {
Damiend99b0522013-12-21 18:17:45 +0000395 mp_obj_tuple_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000396 } else {
Damien Georgea157e4c2014-04-09 19:17:53 +0100397 if (!MP_OBJ_IS_TYPE(arg, &mp_type_list)) {
398 // arg is not a list, try to convert it to one
Paul Sokolovsky881d9af2014-04-10 01:42:40 +0300399 // TODO: Try to optimize?
Damien Georgea157e4c2014-04-09 19:17:53 +0100400 arg = mp_type_list.make_new((mp_obj_t)&mp_type_list, 1, 0, &arg);
401 }
402 mp_obj_list_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000403 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000404
405 // count required length
406 int required_len = 0;
Damiend99b0522013-12-21 18:17:45 +0000407 for (int i = 0; i < seq_len; i++) {
Paul Sokolovsky5e5d69b2014-05-11 21:13:01 +0300408 if (mp_obj_get_type(seq_items[i]) != self_type) {
409 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
410 "join expects a list of str/bytes objects consistent with self object"));
Damiend99b0522013-12-21 18:17:45 +0000411 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000412 if (i > 0) {
413 required_len += sep_len;
414 }
Damien George5fa93b62014-01-22 14:35:10 +0000415 GET_STR_LEN(seq_items[i], l);
416 required_len += l;
Damiend99b0522013-12-21 18:17:45 +0000417 }
418
419 // make joined string
Damien George5fa93b62014-01-22 14:35:10 +0000420 byte *data;
Paul Sokolovsky5e5d69b2014-05-11 21:13:01 +0300421 mp_obj_t joined_str = mp_obj_str_builder_start(self_type, required_len, &data);
Damiend99b0522013-12-21 18:17:45 +0000422 for (int i = 0; i < seq_len; i++) {
Damiend99b0522013-12-21 18:17:45 +0000423 if (i > 0) {
Damien George5fa93b62014-01-22 14:35:10 +0000424 memcpy(data, sep_str, sep_len);
425 data += sep_len;
Damiend99b0522013-12-21 18:17:45 +0000426 }
Damien George5fa93b62014-01-22 14:35:10 +0000427 GET_STR_DATA_LEN(seq_items[i], s, l);
428 memcpy(data, s, l);
429 data += l;
Damiend99b0522013-12-21 18:17:45 +0000430 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000431
432 // return joined string
Damien George5fa93b62014-01-22 14:35:10 +0000433 return mp_obj_str_builder_end(joined_str);
Damiend99b0522013-12-21 18:17:45 +0000434}
435
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200436#define is_ws(c) ((c) == ' ' || (c) == '\t')
437
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200438STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) {
Paul Sokolovskybfb88192014-05-11 21:17:28 +0300439 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Damien George40f3c022014-07-03 13:25:24 +0100440 mp_int_t splits = -1;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200441 mp_obj_t sep = mp_const_none;
442 if (n_args > 1) {
443 sep = args[1];
444 if (n_args > 2) {
Damien Georgedeed0872014-04-06 11:11:15 +0100445 splits = mp_obj_get_int(args[2]);
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200446 }
447 }
Damien Georgedeed0872014-04-06 11:11:15 +0100448
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200449 mp_obj_t res = mp_obj_new_list(0, NULL);
Damien George5fa93b62014-01-22 14:35:10 +0000450 GET_STR_DATA_LEN(args[0], s, len);
451 const byte *top = s + len;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200452
Damien Georgedeed0872014-04-06 11:11:15 +0100453 if (sep == mp_const_none) {
454 // sep not given, so separate on whitespace
455
456 // Initial whitespace is not counted as split, so we pre-do it
Damien George5fa93b62014-01-22 14:35:10 +0000457 while (s < top && is_ws(*s)) s++;
Damien Georgedeed0872014-04-06 11:11:15 +0100458 while (s < top && splits != 0) {
459 const byte *start = s;
460 while (s < top && !is_ws(*s)) s++;
Damien Georgef600a6a2014-05-25 22:34:34 +0100461 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
Damien Georgedeed0872014-04-06 11:11:15 +0100462 if (s >= top) {
463 break;
464 }
465 while (s < top && is_ws(*s)) s++;
466 if (splits > 0) {
467 splits--;
468 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200469 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200470
Damien Georgedeed0872014-04-06 11:11:15 +0100471 if (s < top) {
Damien Georgef600a6a2014-05-25 22:34:34 +0100472 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, s, top - s));
Damien Georgedeed0872014-04-06 11:11:15 +0100473 }
474
475 } else {
476 // sep given
Paul Sokolovsky0c549852014-08-10 23:14:35 +0300477 if (mp_obj_get_type(sep) != self_type) {
478 arg_type_mixup();
479 }
Damien Georgedeed0872014-04-06 11:11:15 +0100480
481 uint sep_len;
482 const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
483
484 if (sep_len == 0) {
485 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
486 }
487
488 for (;;) {
489 const byte *start = s;
490 for (;;) {
491 if (splits == 0 || s + sep_len > top) {
492 s = top;
493 break;
494 } else if (memcmp(s, sep_str, sep_len) == 0) {
495 break;
496 }
497 s++;
498 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100499 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
Damien Georgedeed0872014-04-06 11:11:15 +0100500 if (s >= top) {
501 break;
502 }
503 s += sep_len;
504 if (splits > 0) {
505 splits--;
506 }
507 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200508 }
509
510 return res;
511}
512
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300513STATIC mp_obj_t str_rsplit(uint n_args, const mp_obj_t *args) {
514 if (n_args < 3) {
515 // If we don't have split limit, it doesn't matter from which side
516 // we split.
517 return str_split(n_args, args);
518 }
519 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
520 mp_obj_t sep = args[1];
521 GET_STR_DATA_LEN(args[0], s, len);
522
Damien George40f3c022014-07-03 13:25:24 +0100523 mp_int_t splits = mp_obj_get_int(args[2]);
524 mp_int_t org_splits = splits;
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300525 // Preallocate list to the max expected # of elements, as we
526 // will fill it from the end.
527 mp_obj_list_t *res = mp_obj_new_list(splits + 1, NULL);
528 int idx = splits;
529
530 if (sep == mp_const_none) {
Chris Angelico9ab8ab22014-06-04 05:04:23 +1000531 assert(!"TODO: rsplit(None,n) not implemented");
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300532 } else {
533 uint sep_len;
534 const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
535
536 if (sep_len == 0) {
537 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
538 }
539
540 const byte *beg = s;
541 const byte *last = s + len;
542 for (;;) {
543 s = last - sep_len;
544 for (;;) {
545 if (splits == 0 || s < beg) {
546 break;
547 } else if (memcmp(s, sep_str, sep_len) == 0) {
548 break;
549 }
550 s--;
551 }
552 if (s < beg || splits == 0) {
Damien Georgef600a6a2014-05-25 22:34:34 +0100553 res->items[idx] = mp_obj_new_str_of_type(self_type, beg, last - beg);
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300554 break;
555 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100556 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 +0300557 last = s;
558 if (splits > 0) {
559 splits--;
560 }
561 }
562 if (idx != 0) {
563 // We split less parts than split limit, now go cleanup surplus
564 int used = org_splits + 1 - idx;
565 memcpy(res->items, &res->items[idx], used * sizeof(mp_obj_t));
566 mp_seq_clear(res->items, used, res->alloc, sizeof(*res->items));
567 res->len = used;
568 }
569 }
570
571 return res;
572}
573
Damien George40f3c022014-07-03 13:25:24 +0100574STATIC 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 +0300575 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
John R. Lentone8204912014-01-12 21:53:52 +0000576 assert(2 <= n_args && n_args <= 4);
Damien George5fa93b62014-01-22 14:35:10 +0000577 assert(MP_OBJ_IS_STR(args[0]));
578 assert(MP_OBJ_IS_STR(args[1]));
John R. Lentone8204912014-01-12 21:53:52 +0000579
Damien George5fa93b62014-01-22 14:35:10 +0000580 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
581 GET_STR_DATA_LEN(args[1], needle, needle_len);
John R. Lentone8204912014-01-12 21:53:52 +0000582
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300583 const byte *start = haystack;
584 const byte *end = haystack + haystack_len;
John R. Lentone8204912014-01-12 21:53:52 +0000585 if (n_args >= 3 && args[2] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300586 start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
John R. Lentone8204912014-01-12 21:53:52 +0000587 }
588 if (n_args >= 4 && args[3] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300589 end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
John R. Lentone8204912014-01-12 21:53:52 +0000590 }
591
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300592 const byte *p = find_subbytes(start, end - start, needle, needle_len, direction);
Damien George23005372014-01-13 19:39:01 +0000593 if (p == NULL) {
594 // not found
xbe3d9a39e2014-04-08 11:42:19 -0700595 if (is_index) {
596 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "substring not found"));
597 } else {
598 return MP_OBJ_NEW_SMALL_INT(-1);
599 }
Damien George23005372014-01-13 19:39:01 +0000600 } else {
601 // found
Paul Sokolovsky5048df02014-06-14 03:15:00 +0300602 #if MICROPY_PY_BUILTINS_STR_UNICODE
603 if (self_type == &mp_type_str) {
604 return MP_OBJ_NEW_SMALL_INT(utf8_ptr_to_index(haystack, p));
605 }
606 #endif
xbe17a5a832014-03-23 23:31:58 -0700607 return MP_OBJ_NEW_SMALL_INT(p - haystack);
John R. Lentone8204912014-01-12 21:53:52 +0000608 }
John R. Lentone8204912014-01-12 21:53:52 +0000609}
610
xbe17a5a832014-03-23 23:31:58 -0700611STATIC mp_obj_t str_find(uint n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700612 return str_finder(n_args, args, 1, false);
xbe17a5a832014-03-23 23:31:58 -0700613}
614
615STATIC mp_obj_t str_rfind(uint n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700616 return str_finder(n_args, args, -1, false);
617}
618
619STATIC mp_obj_t str_index(uint n_args, const mp_obj_t *args) {
620 return str_finder(n_args, args, 1, true);
621}
622
623STATIC mp_obj_t str_rindex(uint n_args, const mp_obj_t *args) {
624 return str_finder(n_args, args, -1, true);
xbe17a5a832014-03-23 23:31:58 -0700625}
626
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200627// TODO: (Much) more variety in args
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300628STATIC mp_obj_t str_startswith(uint n_args, const mp_obj_t *args) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300629 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300630 GET_STR_DATA_LEN(args[0], str, str_len);
631 GET_STR_DATA_LEN(args[1], prefix, prefix_len);
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300632 const byte *start = str;
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300633 if (n_args > 2) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300634 start = str_index_to_ptr(self_type, str, str_len, args[2], true);
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300635 }
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300636 if (prefix_len + (start - str) > str_len) {
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200637 return mp_const_false;
638 }
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300639 return MP_BOOL(memcmp(start, prefix, prefix_len) == 0);
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200640}
641
Paul Sokolovskyd098c6b2014-05-24 22:46:51 +0300642STATIC mp_obj_t str_endswith(uint n_args, const mp_obj_t *args) {
643 GET_STR_DATA_LEN(args[0], str, str_len);
644 GET_STR_DATA_LEN(args[1], suffix, suffix_len);
645 assert(n_args == 2);
646
647 if (suffix_len > str_len) {
648 return mp_const_false;
649 }
650 return MP_BOOL(memcmp(str + (str_len - suffix_len), suffix, suffix_len) == 0);
651}
652
Paul Sokolovsky88107842014-04-26 06:20:08 +0300653enum { LSTRIP, RSTRIP, STRIP };
654
655STATIC mp_obj_t str_uni_strip(int type, uint n_args, const mp_obj_t *args) {
xbe7b0f39f2014-01-08 14:23:45 -0800656 assert(1 <= n_args && n_args <= 2);
Paul Sokolovskyb2d4fc02014-05-11 13:17:29 +0300657 assert(is_str_or_bytes(args[0]));
658 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Damien George5fa93b62014-01-22 14:35:10 +0000659
660 const byte *chars_to_del;
661 uint chars_to_del_len;
662 static const byte whitespace[] = " \t\n\r\v\f";
xbe7b0f39f2014-01-08 14:23:45 -0800663
664 if (n_args == 1) {
665 chars_to_del = whitespace;
Damien George5fa93b62014-01-22 14:35:10 +0000666 chars_to_del_len = sizeof(whitespace);
xbe7b0f39f2014-01-08 14:23:45 -0800667 } else {
Paul Sokolovskyb2d4fc02014-05-11 13:17:29 +0300668 if (mp_obj_get_type(args[1]) != self_type) {
669 arg_type_mixup();
670 }
Damien George5fa93b62014-01-22 14:35:10 +0000671 GET_STR_DATA_LEN(args[1], s, l);
672 chars_to_del = s;
673 chars_to_del_len = l;
xbe7b0f39f2014-01-08 14:23:45 -0800674 }
675
Damien George5fa93b62014-01-22 14:35:10 +0000676 GET_STR_DATA_LEN(args[0], orig_str, orig_str_len);
xbe7b0f39f2014-01-08 14:23:45 -0800677
Damien George40f3c022014-07-03 13:25:24 +0100678 mp_uint_t first_good_char_pos = 0;
xbe7b0f39f2014-01-08 14:23:45 -0800679 bool first_good_char_pos_set = false;
Damien George40f3c022014-07-03 13:25:24 +0100680 mp_uint_t last_good_char_pos = 0;
681 mp_uint_t i = 0;
682 mp_int_t delta = 1;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300683 if (type == RSTRIP) {
684 i = orig_str_len - 1;
685 delta = -1;
686 }
Damien George40f3c022014-07-03 13:25:24 +0100687 for (mp_uint_t len = orig_str_len; len > 0; len--) {
xbe17a5a832014-03-23 23:31:58 -0700688 if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) {
xbe7b0f39f2014-01-08 14:23:45 -0800689 if (!first_good_char_pos_set) {
Paul Sokolovskybcdffe52014-05-30 03:07:05 +0300690 first_good_char_pos_set = true;
xbe7b0f39f2014-01-08 14:23:45 -0800691 first_good_char_pos = i;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300692 if (type == LSTRIP) {
693 last_good_char_pos = orig_str_len - 1;
694 break;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300695 } else if (type == RSTRIP) {
696 first_good_char_pos = 0;
697 last_good_char_pos = i;
698 break;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300699 }
xbe7b0f39f2014-01-08 14:23:45 -0800700 }
Paul Sokolovsky88107842014-04-26 06:20:08 +0300701 last_good_char_pos = i;
xbe7b0f39f2014-01-08 14:23:45 -0800702 }
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300703 i += delta;
xbe7b0f39f2014-01-08 14:23:45 -0800704 }
705
Paul Sokolovskybcdffe52014-05-30 03:07:05 +0300706 if (!first_good_char_pos_set) {
Damien George5fa93b62014-01-22 14:35:10 +0000707 // string is all whitespace, return ''
708 return MP_OBJ_NEW_QSTR(MP_QSTR_);
xbe7b0f39f2014-01-08 14:23:45 -0800709 }
710
711 assert(last_good_char_pos >= first_good_char_pos);
712 //+1 to accomodate the last character
Damien George40f3c022014-07-03 13:25:24 +0100713 mp_uint_t stripped_len = last_good_char_pos - first_good_char_pos + 1;
Paul Sokolovsky88276822014-05-30 03:11:44 +0300714 if (stripped_len == orig_str_len) {
715 // If nothing was stripped, don't bother to dup original string
716 // TODO: watch out for this case when we'll get to bytearray.strip()
717 assert(first_good_char_pos == 0);
718 return args[0];
719 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100720 return mp_obj_new_str_of_type(self_type, orig_str + first_good_char_pos, stripped_len);
xbe7b0f39f2014-01-08 14:23:45 -0800721}
722
Paul Sokolovsky88107842014-04-26 06:20:08 +0300723STATIC mp_obj_t str_strip(uint n_args, const mp_obj_t *args) {
724 return str_uni_strip(STRIP, n_args, args);
725}
726
727STATIC mp_obj_t str_lstrip(uint n_args, const mp_obj_t *args) {
728 return str_uni_strip(LSTRIP, n_args, args);
729}
730
731STATIC mp_obj_t str_rstrip(uint n_args, const mp_obj_t *args) {
732 return str_uni_strip(RSTRIP, n_args, args);
733}
734
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700735// Takes an int arg, but only parses unsigned numbers, and only changes
736// *num if at least one digit was parsed.
737static int str_to_int(const char *str, int *num) {
738 const char *s = str;
739 if (unichar_isdigit(*s)) {
740 *num = 0;
741 do {
742 *num = *num * 10 + (*s - '0');
743 s++;
744 }
745 while (unichar_isdigit(*s));
746 }
747 return s - str;
748}
749
750static bool isalignment(char ch) {
751 return ch && strchr("<>=^", ch) != NULL;
752}
753
754static bool istype(char ch) {
755 return ch && strchr("bcdeEfFgGnosxX%", ch) != NULL;
756}
757
758static bool arg_looks_integer(mp_obj_t arg) {
759 return MP_OBJ_IS_TYPE(arg, &mp_type_bool) || MP_OBJ_IS_INT(arg);
760}
761
762static bool arg_looks_numeric(mp_obj_t arg) {
763 return arg_looks_integer(arg)
Damien Georgefb510b32014-06-01 13:32:54 +0100764#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700765 || MP_OBJ_IS_TYPE(arg, &mp_type_float)
766#endif
767 ;
768}
769
Dave Hylandsc4029e52014-04-07 11:19:51 -0700770static mp_obj_t arg_as_int(mp_obj_t arg) {
Damien Georgefb510b32014-06-01 13:32:54 +0100771#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700772 if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
Dave Hylandsc4029e52014-04-07 11:19:51 -0700773
774 // TODO: Needs a way to construct an mpz integer from a float
775
Damien George40f3c022014-07-03 13:25:24 +0100776 mp_int_t num = mp_obj_get_float(arg);
Dave Hylandsc4029e52014-04-07 11:19:51 -0700777 return MP_OBJ_NEW_SMALL_INT(num);
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700778 }
779#endif
Dave Hylandsc4029e52014-04-07 11:19:51 -0700780 return arg;
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700781}
782
Damien George897fe0c2014-04-15 22:03:55 +0100783mp_obj_t mp_obj_str_format(uint n_args, const mp_obj_t *args) {
Damien George5fa93b62014-01-22 14:35:10 +0000784 assert(MP_OBJ_IS_STR(args[0]));
Damiend99b0522013-12-21 18:17:45 +0000785
Damien George5fa93b62014-01-22 14:35:10 +0000786 GET_STR_DATA_LEN(args[0], str, len);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700787 int arg_i = 0;
Damiend99b0522013-12-21 18:17:45 +0000788 vstr_t *vstr = vstr_new();
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700789 pfenv_t pfenv_vstr;
790 pfenv_vstr.data = vstr;
791 pfenv_vstr.print_strn = pfenv_vstr_add_strn;
792
Damien George5fa93b62014-01-22 14:35:10 +0000793 for (const byte *top = str + len; str < top; str++) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700794 if (*str == '}') {
Damiend99b0522013-12-21 18:17:45 +0000795 str++;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700796 if (str < top && *str == '}') {
797 vstr_add_char(vstr, '}');
798 continue;
799 }
Damien George11de8392014-06-05 18:57:38 +0100800 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "single '}' encountered in format string"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700801 }
802 if (*str != '{') {
803 vstr_add_char(vstr, *str);
804 continue;
805 }
806
807 str++;
808 if (str < top && *str == '{') {
809 vstr_add_char(vstr, '{');
810 continue;
811 }
812
813 // replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}"
814
815 vstr_t *field_name = NULL;
816 char conversion = '\0';
817 vstr_t *format_spec = NULL;
818
819 if (str < top && *str != '}' && *str != '!' && *str != ':') {
820 field_name = vstr_new();
821 while (str < top && *str != '}' && *str != '!' && *str != ':') {
822 vstr_add_char(field_name, *str++);
823 }
824 vstr_add_char(field_name, '\0');
825 }
826
827 // conversion ::= "r" | "s"
828
829 if (str < top && *str == '!') {
830 str++;
831 if (str < top && (*str == 'r' || *str == 's')) {
832 conversion = *str++;
Paul Sokolovskyf2b796e2014-01-15 22:45:20 +0200833 } else {
Damien Georgeea13f402014-04-05 18:32:08 +0100834 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 -0700835 }
836 }
837
838 if (str < top && *str == ':') {
839 str++;
840 // {:} is the same as {}, which is the same as {!s}
841 // This makes a difference when passing in a True or False
842 // '{}'.format(True) returns 'True'
843 // '{:d}'.format(True) returns '1'
844 // So we treat {:} as {} and this later gets treated to be {!s}
845 if (*str != '}') {
Damien George11de8392014-06-05 18:57:38 +0100846 format_spec = vstr_new();
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700847 while (str < top && *str != '}') {
848 vstr_add_char(format_spec, *str++);
Damiend99b0522013-12-21 18:17:45 +0000849 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700850 vstr_add_char(format_spec, '\0');
851 }
852 }
853 if (str >= top) {
Damien Georgeea13f402014-04-05 18:32:08 +0100854 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "unmatched '{' in format"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700855 }
856 if (*str != '}') {
Damien Georgeea13f402014-04-05 18:32:08 +0100857 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "expected ':' after format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700858 }
859
860 mp_obj_t arg = mp_const_none;
861
862 if (field_name) {
863 if (arg_i > 0) {
Damien George11de8392014-06-05 18:57:38 +0100864 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 -0700865 }
Damien George3bb8bd82014-04-14 21:20:30 +0100866 int index = 0;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700867 if (str_to_int(vstr_str(field_name), &index) != vstr_len(field_name) - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100868 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "attributes not supported yet"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700869 }
870 if (index >= n_args - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100871 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700872 }
873 arg = args[index + 1];
874 arg_i = -1;
875 vstr_free(field_name);
876 field_name = NULL;
877 } else {
878 if (arg_i < 0) {
Damien George11de8392014-06-05 18:57:38 +0100879 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 -0700880 }
881 if (arg_i >= n_args - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100882 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700883 }
884 arg = args[arg_i + 1];
885 arg_i++;
886 }
887 if (!format_spec && !conversion) {
888 conversion = 's';
889 }
890 if (conversion) {
891 mp_print_kind_t print_kind;
892 if (conversion == 's') {
893 print_kind = PRINT_STR;
894 } else if (conversion == 'r') {
895 print_kind = PRINT_REPR;
896 } else {
Damien George11de8392014-06-05 18:57:38 +0100897 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "unknown conversion specifier %c", conversion));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700898 }
899 vstr_t *arg_vstr = vstr_new();
900 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, arg_vstr, arg, print_kind);
Damien George2617eeb2014-05-25 22:27:57 +0100901 arg = mp_obj_new_str(vstr_str(arg_vstr), vstr_len(arg_vstr), false);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700902 vstr_free(arg_vstr);
903 }
904
905 char sign = '\0';
906 char fill = '\0';
907 char align = '\0';
908 int width = -1;
909 int precision = -1;
910 char type = '\0';
911 int flags = 0;
912
913 if (format_spec) {
914 // The format specifier (from http://docs.python.org/2/library/string.html#formatspec)
915 //
916 // [[fill]align][sign][#][0][width][,][.precision][type]
917 // fill ::= <any character>
918 // align ::= "<" | ">" | "=" | "^"
919 // sign ::= "+" | "-" | " "
920 // width ::= integer
921 // precision ::= integer
922 // type ::= "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
923
924 const char *s = vstr_str(format_spec);
925 if (isalignment(*s)) {
926 align = *s++;
927 } else if (*s && isalignment(s[1])) {
928 fill = *s++;
929 align = *s++;
930 }
931 if (*s == '+' || *s == '-' || *s == ' ') {
932 if (*s == '+') {
933 flags |= PF_FLAG_SHOW_SIGN;
934 } else if (*s == ' ') {
935 flags |= PF_FLAG_SPACE_SIGN;
936 }
937 sign = *s++;
938 }
939 if (*s == '#') {
940 flags |= PF_FLAG_SHOW_PREFIX;
941 s++;
942 }
943 if (*s == '0') {
944 if (!align) {
945 align = '=';
946 }
947 if (!fill) {
948 fill = '0';
949 }
950 }
951 s += str_to_int(s, &width);
952 if (*s == ',') {
953 flags |= PF_FLAG_SHOW_COMMA;
954 s++;
955 }
956 if (*s == '.') {
957 s++;
958 s += str_to_int(s, &precision);
959 }
960 if (istype(*s)) {
961 type = *s++;
962 }
963 if (*s) {
Damien Georgeea13f402014-04-05 18:32:08 +0100964 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "Invalid conversion specification"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700965 }
966 vstr_free(format_spec);
967 format_spec = NULL;
968 }
969 if (!align) {
970 if (arg_looks_numeric(arg)) {
971 align = '>';
972 } else {
973 align = '<';
974 }
975 }
976 if (!fill) {
977 fill = ' ';
978 }
979
980 if (sign) {
981 if (type == 's') {
Damien Georgeea13f402014-04-05 18:32:08 +0100982 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed in string format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700983 }
984 if (type == 'c') {
Damien Georgeea13f402014-04-05 18:32:08 +0100985 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed with integer format specifier 'c'"));
Damiend99b0522013-12-21 18:17:45 +0000986 }
987 } else {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700988 sign = '-';
989 }
990
991 switch (align) {
992 case '<': flags |= PF_FLAG_LEFT_ADJUST; break;
993 case '=': flags |= PF_FLAG_PAD_AFTER_SIGN; break;
994 case '^': flags |= PF_FLAG_CENTER_ADJUST; break;
995 }
996
997 if (arg_looks_integer(arg)) {
998 switch (type) {
999 case 'b':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001000 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 2, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001001 continue;
1002
1003 case 'c':
1004 {
1005 char ch = mp_obj_get_int(arg);
1006 pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, fill, width);
1007 continue;
1008 }
1009
1010 case '\0': // No explicit format type implies 'd'
1011 case 'n': // I don't think we support locales in uPy so use 'd'
1012 case 'd':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001013 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 10, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001014 continue;
1015
1016 case 'o':
Dave Hylandsc4029e52014-04-07 11:19:51 -07001017 if (flags & PF_FLAG_SHOW_PREFIX) {
1018 flags |= PF_FLAG_SHOW_OCTAL_LETTER;
1019 }
1020
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001021 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 8, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001022 continue;
1023
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001024 case 'X':
Damien George11de8392014-06-05 18:57:38 +01001025 case 'x':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001026 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, type - ('X' - 'A'), flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001027 continue;
1028
1029 case 'e':
1030 case 'E':
1031 case 'f':
1032 case 'F':
1033 case 'g':
1034 case 'G':
1035 case '%':
1036 // The floating point formatters all work with anything that
1037 // looks like an integer
1038 break;
1039
1040 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001041 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Damien George11de8392014-06-05 18:57:38 +01001042 "unknown format code '%c' for object of type '%s'", type, mp_obj_get_type_str(arg)));
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001043 }
Damien Georgec322c5f2014-04-02 20:04:15 +01001044 }
Damien George70f33cd2014-04-02 17:06:05 +01001045
Dave Hylands22fe4d72014-04-02 12:07:31 -07001046 // NOTE: no else here. We need the e, f, g etc formats for integer
1047 // arguments (from above if) to take this if.
Damien Georgec322c5f2014-04-02 20:04:15 +01001048 if (arg_looks_numeric(arg)) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001049 if (!type) {
1050
1051 // Even though the docs say that an unspecified type is the same
1052 // as 'g', there is one subtle difference, when the exponent
1053 // is one less than the precision.
Damien George11de8392014-06-05 18:57:38 +01001054 //
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001055 // '{:10.1}'.format(0.0) ==> '0e+00'
1056 // '{:10.1g}'.format(0.0) ==> '0'
1057 //
1058 // TODO: Figure out how to deal with this.
1059 //
1060 // A proper solution would involve adding a special flag
1061 // or something to format_float, and create a format_double
1062 // to deal with doubles. In order to fix this when using
1063 // sprintf, we'd need to use the e format and tweak the
1064 // returned result to strip trailing zeros like the g format
1065 // does.
1066 //
1067 // {:10.3} and {:10.2e} with 1.23e2 both produce 1.23e+02
1068 // but with 1.e2 you get 1e+02 and 1.00e+02
1069 //
1070 // Stripping the trailing 0's (like g) does would make the
1071 // e format give us the right format.
1072 //
1073 // CPython sources say:
1074 // Omitted type specifier. Behaves in the same way as repr(x)
1075 // and str(x) if no precision is given, else like 'g', but with
1076 // at least one digit after the decimal point. */
1077
1078 type = 'g';
1079 }
1080 if (type == 'n') {
1081 type = 'g';
1082 }
1083
1084 flags |= PF_FLAG_PAD_NAN_INF; // '{:06e}'.format(float('-inf')) should give '-00inf'
1085 switch (type) {
Damien Georgefb510b32014-06-01 13:32:54 +01001086#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001087 case 'e':
1088 case 'E':
1089 case 'f':
1090 case 'F':
1091 case 'g':
1092 case 'G':
Damien George11de8392014-06-05 18:57:38 +01001093 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), type, flags, fill, width, precision);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001094 break;
1095
1096 case '%':
1097 flags |= PF_FLAG_ADD_PERCENT;
1098 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg) * 100.0F, 'f', flags, fill, width, precision);
1099 break;
Damien Georgec322c5f2014-04-02 20:04:15 +01001100#endif
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001101
1102 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001103 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Damien George11de8392014-06-05 18:57:38 +01001104 "unknown format code '%c' for object of type 'float'",
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001105 type, mp_obj_get_type_str(arg)));
1106 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001107 } else {
Damien George70f33cd2014-04-02 17:06:05 +01001108 // arg doesn't look like a number
1109
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001110 if (align == '=') {
Damien Georgeea13f402014-04-05 18:32:08 +01001111 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "'=' alignment not allowed in string format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001112 }
Damien George70f33cd2014-04-02 17:06:05 +01001113
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001114 switch (type) {
1115 case '\0':
1116 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, arg, PRINT_STR);
1117 break;
1118
1119 case 's':
1120 {
1121 uint len;
1122 const char *s = mp_obj_str_get_data(arg, &len);
1123 if (precision < 0) {
1124 precision = len;
1125 }
1126 if (len > precision) {
1127 len = precision;
1128 }
1129 pfenv_print_strn(&pfenv_vstr, s, len, flags, fill, width);
1130 break;
1131 }
1132
1133 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001134 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Damien George11de8392014-06-05 18:57:38 +01001135 "unknown format code '%c' for object of type 'str'",
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001136 type, mp_obj_get_type_str(arg)));
1137 }
Damiend99b0522013-12-21 18:17:45 +00001138 }
1139 }
1140
Damien George2617eeb2014-05-25 22:27:57 +01001141 mp_obj_t s = mp_obj_new_str(vstr->buf, vstr->len, false);
Damien George5fa93b62014-01-22 14:35:10 +00001142 vstr_free(vstr);
1143 return s;
Damiend99b0522013-12-21 18:17:45 +00001144}
1145
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001146STATIC 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 +03001147 assert(MP_OBJ_IS_STR(pattern));
1148
1149 GET_STR_DATA_LEN(pattern, str, len);
Dave Hylands6756a372014-04-02 11:42:39 -07001150 const byte *start_str = str;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001151 int arg_i = 0;
1152 vstr_t *vstr = vstr_new();
Dave Hylands6756a372014-04-02 11:42:39 -07001153 pfenv_t pfenv_vstr;
1154 pfenv_vstr.data = vstr;
1155 pfenv_vstr.print_strn = pfenv_vstr_add_strn;
1156
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001157 for (const byte *top = str + len; str < top; str++) {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001158 mp_obj_t arg = MP_OBJ_NULL;
Dave Hylands6756a372014-04-02 11:42:39 -07001159 if (*str != '%') {
1160 vstr_add_char(vstr, *str);
1161 continue;
1162 }
1163 if (++str >= top) {
1164 break;
1165 }
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001166 if (*str == '%') {
Dave Hylands6756a372014-04-02 11:42:39 -07001167 vstr_add_char(vstr, '%');
1168 continue;
1169 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001170
1171 // Dictionary value lookup
1172 if (*str == '(') {
1173 const byte *key = ++str;
1174 while (*str != ')') {
1175 if (str >= top) {
1176 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "incomplete format key"));
1177 }
1178 ++str;
1179 }
1180 mp_obj_t k_obj = mp_obj_new_str((const char*)key, str - key, true);
1181 arg = mp_obj_dict_get(dict, k_obj);
1182 str++;
Dave Hylands6756a372014-04-02 11:42:39 -07001183 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001184
Dave Hylands6756a372014-04-02 11:42:39 -07001185 int flags = 0;
1186 char fill = ' ';
Damien George11de8392014-06-05 18:57:38 +01001187 int alt = 0;
Dave Hylands6756a372014-04-02 11:42:39 -07001188 while (str < top) {
1189 if (*str == '-') flags |= PF_FLAG_LEFT_ADJUST;
1190 else if (*str == '+') flags |= PF_FLAG_SHOW_SIGN;
1191 else if (*str == ' ') flags |= PF_FLAG_SPACE_SIGN;
Damien George11de8392014-06-05 18:57:38 +01001192 else if (*str == '#') alt = PF_FLAG_SHOW_PREFIX;
Dave Hylands6756a372014-04-02 11:42:39 -07001193 else if (*str == '0') {
1194 flags |= PF_FLAG_PAD_AFTER_SIGN;
1195 fill = '0';
1196 } else break;
1197 str++;
1198 }
1199 // parse width, if it exists
Damien George11de8392014-06-05 18:57:38 +01001200 int width = 0;
Dave Hylands6756a372014-04-02 11:42:39 -07001201 if (str < top) {
1202 if (*str == '*') {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001203 if (arg_i >= n_args) {
1204 goto not_enough_args;
1205 }
Dave Hylands6756a372014-04-02 11:42:39 -07001206 width = mp_obj_get_int(args[arg_i++]);
1207 str++;
1208 } else {
1209 for (; str < top && '0' <= *str && *str <= '9'; str++) {
1210 width = width * 10 + *str - '0';
1211 }
1212 }
1213 }
1214 int prec = -1;
1215 if (str < top && *str == '.') {
1216 if (++str < top) {
1217 if (*str == '*') {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001218 if (arg_i >= n_args) {
1219 goto not_enough_args;
1220 }
Dave Hylands6756a372014-04-02 11:42:39 -07001221 prec = mp_obj_get_int(args[arg_i++]);
1222 str++;
1223 } else {
1224 prec = 0;
1225 for (; str < top && '0' <= *str && *str <= '9'; str++) {
1226 prec = prec * 10 + *str - '0';
1227 }
1228 }
1229 }
1230 }
1231
1232 if (str >= top) {
Damien Georgeea13f402014-04-05 18:32:08 +01001233 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "incomplete format"));
Dave Hylands6756a372014-04-02 11:42:39 -07001234 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001235
1236 // Tuple value lookup
1237 if (arg == MP_OBJ_NULL) {
1238 if (arg_i >= n_args) {
1239not_enough_args:
1240 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not enough arguments for format string"));
1241 }
1242 arg = args[arg_i++];
1243 }
Dave Hylands6756a372014-04-02 11:42:39 -07001244 switch (*str) {
1245 case 'c':
1246 if (MP_OBJ_IS_STR(arg)) {
1247 uint len;
1248 const char *s = mp_obj_str_get_data(arg, &len);
1249 if (len != 1) {
Damien George11de8392014-06-05 18:57:38 +01001250 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "%%c requires int or char"));
Dave Hylands6756a372014-04-02 11:42:39 -07001251 break;
1252 }
1253 pfenv_print_strn(&pfenv_vstr, s, 1, flags, ' ', width);
1254 break;
1255 }
1256 if (arg_looks_integer(arg)) {
1257 char ch = mp_obj_get_int(arg);
1258 pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, ' ', width);
1259 break;
1260 }
Damien Georgefb510b32014-06-01 13:32:54 +01001261#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylands6756a372014-04-02 11:42:39 -07001262 // This is what CPython reports, so we report the same.
1263 if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
Damien George11de8392014-06-05 18:57:38 +01001264 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "integer argument expected, got float"));
Dave Hylands6756a372014-04-02 11:42:39 -07001265
1266 }
1267#endif
Damien George11de8392014-06-05 18:57:38 +01001268 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "an integer is required"));
1269 break;
Dave Hylands6756a372014-04-02 11:42:39 -07001270
1271 case 'd':
1272 case 'i':
1273 case 'u':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001274 pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 10, 'a', flags, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001275 break;
1276
Damien Georgefb510b32014-06-01 13:32:54 +01001277#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylands6756a372014-04-02 11:42:39 -07001278 case 'e':
1279 case 'E':
1280 case 'f':
1281 case 'F':
1282 case 'g':
1283 case 'G':
1284 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), *str, flags, fill, width, prec);
1285 break;
1286#endif
1287
1288 case 'o':
1289 if (alt) {
Dave Hylandsc4029e52014-04-07 11:19:51 -07001290 flags |= (PF_FLAG_SHOW_PREFIX | PF_FLAG_SHOW_OCTAL_LETTER);
Dave Hylands6756a372014-04-02 11:42:39 -07001291 }
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001292 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 8, 'a', flags, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001293 break;
1294
1295 case 'r':
1296 case 's':
1297 {
1298 vstr_t *arg_vstr = vstr_new();
1299 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf,
1300 arg_vstr, arg, *str == 'r' ? PRINT_REPR : PRINT_STR);
1301 uint len = vstr_len(arg_vstr);
1302 if (prec < 0) {
1303 prec = len;
1304 }
1305 if (len > prec) {
1306 len = prec;
1307 }
1308 pfenv_print_strn(&pfenv_vstr, vstr_str(arg_vstr), len, flags, ' ', width);
1309 vstr_free(arg_vstr);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001310 break;
1311 }
Dave Hylands6756a372014-04-02 11:42:39 -07001312
Dave Hylands6756a372014-04-02 11:42:39 -07001313 case 'X':
Damien George11de8392014-06-05 18:57:38 +01001314 case 'x':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001315 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, *str - ('X' - 'A'), flags | alt, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001316 break;
Damien Georgedeed0872014-04-06 11:11:15 +01001317
Dave Hylands6756a372014-04-02 11:42:39 -07001318 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001319 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylands6756a372014-04-02 11:42:39 -07001320 "unsupported format character '%c' (0x%x) at index %d",
1321 *str, *str, str - start_str));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001322 }
1323 }
1324
1325 if (arg_i != n_args) {
Damien Georgeea13f402014-04-05 18:32:08 +01001326 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not all arguments converted during string formatting"));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001327 }
1328
Damien George2617eeb2014-05-25 22:27:57 +01001329 mp_obj_t s = mp_obj_new_str(vstr->buf, vstr->len, false);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001330 vstr_free(vstr);
1331 return s;
1332}
1333
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001334STATIC mp_obj_t str_replace(uint n_args, const mp_obj_t *args) {
xbe480c15a2014-01-30 22:17:30 -08001335 assert(MP_OBJ_IS_STR(args[0]));
xbe480c15a2014-01-30 22:17:30 -08001336
Damien George40f3c022014-07-03 13:25:24 +01001337 mp_int_t max_rep = -1;
xbe480c15a2014-01-30 22:17:30 -08001338 if (n_args == 4) {
Damien Georgeff715422014-04-07 00:39:13 +01001339 max_rep = mp_obj_get_int(args[3]);
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001340 if (max_rep == 0) {
1341 return args[0];
1342 } else if (max_rep < 0) {
Damien Georgeff715422014-04-07 00:39:13 +01001343 max_rep = -1;
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001344 }
xbe480c15a2014-01-30 22:17:30 -08001345 }
Damien George94f68302014-01-31 23:45:12 +00001346
xbe729be9b2014-04-07 14:46:39 -07001347 // if max_rep is still -1 by this point we will need to do all possible replacements
xbe480c15a2014-01-30 22:17:30 -08001348
Damien Georgeff715422014-04-07 00:39:13 +01001349 // check argument types
1350
1351 if (!MP_OBJ_IS_STR(args[1])) {
1352 bad_implicit_conversion(args[1]);
1353 }
1354
1355 if (!MP_OBJ_IS_STR(args[2])) {
1356 bad_implicit_conversion(args[2]);
1357 }
1358
1359 // extract string data
1360
xbe480c15a2014-01-30 22:17:30 -08001361 GET_STR_DATA_LEN(args[0], str, str_len);
1362 GET_STR_DATA_LEN(args[1], old, old_len);
1363 GET_STR_DATA_LEN(args[2], new, new_len);
Damien George94f68302014-01-31 23:45:12 +00001364
1365 // old won't exist in str if it's longer, so nothing to replace
xbe480c15a2014-01-30 22:17:30 -08001366 if (old_len > str_len) {
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001367 return args[0];
xbe480c15a2014-01-30 22:17:30 -08001368 }
1369
Damien George94f68302014-01-31 23:45:12 +00001370 // data for the replaced string
1371 byte *data = NULL;
1372 mp_obj_t replaced_str = MP_OBJ_NULL;
xbe480c15a2014-01-30 22:17:30 -08001373
Damien George94f68302014-01-31 23:45:12 +00001374 // do 2 passes over the string:
1375 // first pass computes the required length of the replaced string
1376 // second pass does the replacements
1377 for (;;) {
Damien George40f3c022014-07-03 13:25:24 +01001378 mp_uint_t replaced_str_index = 0;
1379 mp_uint_t num_replacements_done = 0;
Damien George94f68302014-01-31 23:45:12 +00001380 const byte *old_occurrence;
1381 const byte *offset_ptr = str;
Damien George40f3c022014-07-03 13:25:24 +01001382 mp_uint_t str_len_remain = str_len;
Damien Georgeff715422014-04-07 00:39:13 +01001383 if (old_len == 0) {
1384 // if old_str is empty, copy new_str to start of replaced string
1385 // copy the replacement string
1386 if (data != NULL) {
1387 memcpy(data, new, new_len);
1388 }
1389 replaced_str_index += new_len;
1390 num_replacements_done++;
1391 }
1392 while (num_replacements_done != max_rep && str_len_remain > 0 && (old_occurrence = find_subbytes(offset_ptr, str_len_remain, old, old_len, 1)) != NULL) {
1393 if (old_len == 0) {
1394 old_occurrence += 1;
1395 }
Damien George94f68302014-01-31 23:45:12 +00001396 // copy from just after end of last occurrence of to-be-replaced string to right before start of next occurrence
1397 if (data != NULL) {
1398 memcpy(data + replaced_str_index, offset_ptr, old_occurrence - offset_ptr);
1399 }
1400 replaced_str_index += old_occurrence - offset_ptr;
1401 // copy the replacement string
1402 if (data != NULL) {
1403 memcpy(data + replaced_str_index, new, new_len);
1404 }
1405 replaced_str_index += new_len;
1406 offset_ptr = old_occurrence + old_len;
Damien Georgeff715422014-04-07 00:39:13 +01001407 str_len_remain = str + str_len - offset_ptr;
Damien George94f68302014-01-31 23:45:12 +00001408 num_replacements_done++;
Damien George94f68302014-01-31 23:45:12 +00001409 }
1410
1411 // copy from just after end of last occurrence of to-be-replaced string to end of old string
1412 if (data != NULL) {
Damien Georgeff715422014-04-07 00:39:13 +01001413 memcpy(data + replaced_str_index, offset_ptr, str_len_remain);
Damien George94f68302014-01-31 23:45:12 +00001414 }
Damien Georgeff715422014-04-07 00:39:13 +01001415 replaced_str_index += str_len_remain;
Damien George94f68302014-01-31 23:45:12 +00001416
1417 if (data == NULL) {
1418 // first pass
1419 if (num_replacements_done == 0) {
1420 // no substr found, return original string
1421 return args[0];
1422 } else {
1423 // substr found, allocate new string
1424 replaced_str = mp_obj_str_builder_start(mp_obj_get_type(args[0]), replaced_str_index, &data);
Damien Georgeff715422014-04-07 00:39:13 +01001425 assert(data != NULL);
Damien George94f68302014-01-31 23:45:12 +00001426 }
1427 } else {
1428 // second pass, we are done
1429 break;
1430 }
xbe480c15a2014-01-30 22:17:30 -08001431 }
Damien George94f68302014-01-31 23:45:12 +00001432
xbe480c15a2014-01-30 22:17:30 -08001433 return mp_obj_str_builder_end(replaced_str);
1434}
1435
xbe9e1e8cd2014-03-12 22:57:16 -07001436STATIC mp_obj_t str_count(uint n_args, const mp_obj_t *args) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001437 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
xbe9e1e8cd2014-03-12 22:57:16 -07001438 assert(2 <= n_args && n_args <= 4);
1439 assert(MP_OBJ_IS_STR(args[0]));
1440 assert(MP_OBJ_IS_STR(args[1]));
1441
1442 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
1443 GET_STR_DATA_LEN(args[1], needle, needle_len);
1444
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001445 const byte *start = haystack;
1446 const byte *end = haystack + haystack_len;
xbe9e1e8cd2014-03-12 22:57:16 -07001447 if (n_args >= 3 && args[2] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001448 start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001449 }
1450 if (n_args >= 4 && args[3] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001451 end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001452 }
1453
Damien George536dde22014-03-13 22:07:55 +00001454 // if needle_len is zero then we count each gap between characters as an occurrence
1455 if (needle_len == 0) {
Paul Sokolovsky9e215fa2014-06-28 23:14:30 +03001456 return MP_OBJ_NEW_SMALL_INT(unichar_charlen((const char*)start, end - start) + 1);
xbe9e1e8cd2014-03-12 22:57:16 -07001457 }
1458
Damien George536dde22014-03-13 22:07:55 +00001459 // count the occurrences
Damien George40f3c022014-07-03 13:25:24 +01001460 mp_int_t num_occurrences = 0;
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001461 for (const byte *haystack_ptr = start; haystack_ptr + needle_len <= end;) {
1462 if (memcmp(haystack_ptr, needle, needle_len) == 0) {
xbec5d70ba2014-03-13 00:29:15 -07001463 num_occurrences++;
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001464 haystack_ptr += needle_len;
1465 } else {
1466 haystack_ptr = utf8_next_char(haystack_ptr);
xbec5d70ba2014-03-13 00:29:15 -07001467 }
xbe9e1e8cd2014-03-12 22:57:16 -07001468 }
1469
1470 return MP_OBJ_NEW_SMALL_INT(num_occurrences);
1471}
1472
Damien George40f3c022014-07-03 13:25:24 +01001473STATIC 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 +03001474 if (!is_str_or_bytes(self_in)) {
1475 assert(0);
1476 }
1477 mp_obj_type_t *self_type = mp_obj_get_type(self_in);
1478 if (self_type != mp_obj_get_type(arg)) {
1479 arg_type_mixup();
xbe613a8e32014-03-18 00:06:29 -07001480 }
Damien Georgeb035db32014-03-21 20:39:40 +00001481
xbe613a8e32014-03-18 00:06:29 -07001482 GET_STR_DATA_LEN(self_in, str, str_len);
1483 GET_STR_DATA_LEN(arg, sep, sep_len);
1484
1485 if (sep_len == 0) {
Damien Georgeea13f402014-04-05 18:32:08 +01001486 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
xbe613a8e32014-03-18 00:06:29 -07001487 }
Damien Georgeb035db32014-03-21 20:39:40 +00001488
1489 mp_obj_t result[] = {MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_)};
1490
1491 if (direction > 0) {
1492 result[0] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001493 } else {
Damien Georgeb035db32014-03-21 20:39:40 +00001494 result[2] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001495 }
xbe613a8e32014-03-18 00:06:29 -07001496
xbe17a5a832014-03-23 23:31:58 -07001497 const byte *position_ptr = find_subbytes(str, str_len, sep, sep_len, direction);
1498 if (position_ptr != NULL) {
Damien George40f3c022014-07-03 13:25:24 +01001499 mp_uint_t position = position_ptr - str;
Damien Georgef600a6a2014-05-25 22:34:34 +01001500 result[0] = mp_obj_new_str_of_type(self_type, str, position);
xbe17a5a832014-03-23 23:31:58 -07001501 result[1] = arg;
Damien Georgef600a6a2014-05-25 22:34:34 +01001502 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 -07001503 }
Damien Georgeb035db32014-03-21 20:39:40 +00001504
xbe0a6894c2014-03-21 01:12:26 -07001505 return mp_obj_new_tuple(3, result);
xbe613a8e32014-03-18 00:06:29 -07001506}
1507
Damien Georgeb035db32014-03-21 20:39:40 +00001508STATIC mp_obj_t str_partition(mp_obj_t self_in, mp_obj_t arg) {
1509 return str_partitioner(self_in, arg, 1);
xbe0a6894c2014-03-21 01:12:26 -07001510}
xbe4504ea82014-03-19 00:46:14 -07001511
Damien Georgeb035db32014-03-21 20:39:40 +00001512STATIC mp_obj_t str_rpartition(mp_obj_t self_in, mp_obj_t arg) {
1513 return str_partitioner(self_in, arg, -1);
xbe4504ea82014-03-19 00:46:14 -07001514}
1515
Paul Sokolovsky69135212014-05-10 19:47:41 +03001516// Supposedly not too critical operations, so optimize for code size
Damien Georgefcc9cf62014-06-01 18:22:09 +01001517STATIC mp_obj_t str_caseconv(unichar (*op)(unichar), mp_obj_t self_in) {
Paul Sokolovsky69135212014-05-10 19:47:41 +03001518 GET_STR_DATA_LEN(self_in, self_data, self_len);
1519 byte *data;
1520 mp_obj_t s = mp_obj_str_builder_start(mp_obj_get_type(self_in), self_len, &data);
1521 for (int i = 0; i < self_len; i++) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001522 *data++ = op(*self_data++);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001523 }
1524 *data = 0;
1525 return mp_obj_str_builder_end(s);
1526}
1527
1528STATIC mp_obj_t str_lower(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001529 return str_caseconv(unichar_tolower, self_in);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001530}
1531
1532STATIC mp_obj_t str_upper(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001533 return str_caseconv(unichar_toupper, self_in);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001534}
1535
Damien Georgefcc9cf62014-06-01 18:22:09 +01001536STATIC mp_obj_t str_uni_istype(bool (*f)(unichar), mp_obj_t self_in) {
Kim Bautersa3f4b832014-05-31 07:30:03 +01001537 GET_STR_DATA_LEN(self_in, self_data, self_len);
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001538
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001539 if (self_len == 0) {
1540 return mp_const_false; // default to False for empty str
1541 }
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001542
Damien Georgefcc9cf62014-06-01 18:22:09 +01001543 if (f != unichar_isupper && f != unichar_islower) {
Kim Bautersa3f4b832014-05-31 07:30:03 +01001544 for (int i = 0; i < self_len; i++) {
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001545 if (!f(*self_data++)) {
1546 return mp_const_false;
1547 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001548 }
1549 } else {
Kim Bautersa3f4b832014-05-31 07:30:03 +01001550 bool contains_alpha = false;
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001551
Kim Bautersa3f4b832014-05-31 07:30:03 +01001552 for (int i = 0; i < self_len; i++) { // only check alphanumeric characters
1553 if (unichar_isalpha(*self_data++)) {
1554 contains_alpha = true;
Damien Georgefcc9cf62014-06-01 18:22:09 +01001555 if (!f(*(self_data - 1))) { // -1 because we already incremented above
1556 return mp_const_false;
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001557 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001558 }
1559 }
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001560
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001561 if (!contains_alpha) {
1562 return mp_const_false;
1563 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001564 }
1565
1566 return mp_const_true;
1567}
1568
1569STATIC mp_obj_t str_isspace(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001570 return str_uni_istype(unichar_isspace, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001571}
1572
1573STATIC mp_obj_t str_isalpha(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001574 return str_uni_istype(unichar_isalpha, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001575}
1576
1577STATIC mp_obj_t str_isdigit(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001578 return str_uni_istype(unichar_isdigit, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001579}
1580
1581STATIC mp_obj_t str_isupper(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001582 return str_uni_istype(unichar_isupper, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001583}
1584
1585STATIC mp_obj_t str_islower(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001586 return str_uni_istype(unichar_islower, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001587}
1588
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001589#if MICROPY_CPYTHON_COMPAT
1590// These methods are superfluous in the presense of str() and bytes()
1591// constructors.
1592// TODO: should accept kwargs too
1593STATIC mp_obj_t bytes_decode(uint n_args, const mp_obj_t *args) {
1594 mp_obj_t new_args[2];
1595 if (n_args == 1) {
1596 new_args[0] = args[0];
1597 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1598 args = new_args;
1599 n_args++;
1600 }
1601 return str_make_new(NULL, n_args, 0, args);
1602}
1603
1604// TODO: should accept kwargs too
1605STATIC mp_obj_t str_encode(uint n_args, const mp_obj_t *args) {
1606 mp_obj_t new_args[2];
1607 if (n_args == 1) {
1608 new_args[0] = args[0];
1609 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1610 args = new_args;
1611 n_args++;
1612 }
1613 return bytes_make_new(NULL, n_args, 0, args);
1614}
1615#endif
1616
Damien George40f3c022014-07-03 13:25:24 +01001617mp_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 +01001618 if (flags == MP_BUFFER_READ) {
Damien George2da98302014-03-09 19:58:18 +00001619 GET_STR_DATA_LEN(self_in, str_data, str_len);
1620 bufinfo->buf = (void*)str_data;
1621 bufinfo->len = str_len;
Damien George57a4b4f2014-04-18 22:29:21 +01001622 bufinfo->typecode = 'b';
Damien George2da98302014-03-09 19:58:18 +00001623 return 0;
1624 } else {
1625 // can't write to a string
1626 bufinfo->buf = NULL;
1627 bufinfo->len = 0;
Damien George57a4b4f2014-04-18 22:29:21 +01001628 bufinfo->typecode = -1;
Damien George2da98302014-03-09 19:58:18 +00001629 return 1;
1630 }
1631}
1632
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001633#if MICROPY_CPYTHON_COMPAT
Paul Sokolovsky97319122014-06-13 22:01:26 +03001634MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_decode_obj, 1, 3, bytes_decode);
1635MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_encode_obj, 1, 3, str_encode);
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001636#endif
Paul Sokolovsky97319122014-06-13 22:01:26 +03001637MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj, 2, 4, str_find);
1638MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rfind_obj, 2, 4, str_rfind);
1639MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_index_obj, 2, 4, str_index);
1640MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rindex_obj, 2, 4, str_rindex);
1641MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join);
1642MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, str_split);
1643MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rsplit_obj, 1, 3, str_rsplit);
1644MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_startswith_obj, 2, 3, str_startswith);
1645MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_endswith_obj, 2, 3, str_endswith);
1646MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip);
1647MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_lstrip_obj, 1, 2, str_lstrip);
1648MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rstrip_obj, 1, 2, str_rstrip);
1649MP_DEFINE_CONST_FUN_OBJ_VAR(str_format_obj, 1, mp_obj_str_format);
1650MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj, 3, 4, str_replace);
1651MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count);
1652MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition);
1653MP_DEFINE_CONST_FUN_OBJ_2(str_rpartition_obj, str_rpartition);
1654MP_DEFINE_CONST_FUN_OBJ_1(str_lower_obj, str_lower);
1655MP_DEFINE_CONST_FUN_OBJ_1(str_upper_obj, str_upper);
1656MP_DEFINE_CONST_FUN_OBJ_1(str_isspace_obj, str_isspace);
1657MP_DEFINE_CONST_FUN_OBJ_1(str_isalpha_obj, str_isalpha);
1658MP_DEFINE_CONST_FUN_OBJ_1(str_isdigit_obj, str_isdigit);
1659MP_DEFINE_CONST_FUN_OBJ_1(str_isupper_obj, str_isupper);
1660MP_DEFINE_CONST_FUN_OBJ_1(str_islower_obj, str_islower);
Damiend99b0522013-12-21 18:17:45 +00001661
Damien George9b196cd2014-03-26 21:47:19 +00001662STATIC const mp_map_elem_t str_locals_dict_table[] = {
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001663#if MICROPY_CPYTHON_COMPAT
1664 { MP_OBJ_NEW_QSTR(MP_QSTR_decode), (mp_obj_t)&bytes_decode_obj },
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001665 #if !MICROPY_PY_BUILTINS_STR_UNICODE
1666 // If we have separate unicode type, then here we have methods only
1667 // for bytes type, and it should not have encode() methods. Otherwise,
1668 // we have non-compliant-but-practical bytestring type, which shares
1669 // method table with bytes, so they both have encode() and decode()
1670 // methods (which should do type checking at runtime).
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001671 { MP_OBJ_NEW_QSTR(MP_QSTR_encode), (mp_obj_t)&str_encode_obj },
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001672 #endif
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001673#endif
Damien George9b196cd2014-03-26 21:47:19 +00001674 { MP_OBJ_NEW_QSTR(MP_QSTR_find), (mp_obj_t)&str_find_obj },
1675 { MP_OBJ_NEW_QSTR(MP_QSTR_rfind), (mp_obj_t)&str_rfind_obj },
xbe3d9a39e2014-04-08 11:42:19 -07001676 { MP_OBJ_NEW_QSTR(MP_QSTR_index), (mp_obj_t)&str_index_obj },
1677 { MP_OBJ_NEW_QSTR(MP_QSTR_rindex), (mp_obj_t)&str_rindex_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001678 { MP_OBJ_NEW_QSTR(MP_QSTR_join), (mp_obj_t)&str_join_obj },
1679 { MP_OBJ_NEW_QSTR(MP_QSTR_split), (mp_obj_t)&str_split_obj },
Paul Sokolovsky2a273652014-05-13 08:07:08 +03001680 { MP_OBJ_NEW_QSTR(MP_QSTR_rsplit), (mp_obj_t)&str_rsplit_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001681 { MP_OBJ_NEW_QSTR(MP_QSTR_startswith), (mp_obj_t)&str_startswith_obj },
Paul Sokolovskyd098c6b2014-05-24 22:46:51 +03001682 { MP_OBJ_NEW_QSTR(MP_QSTR_endswith), (mp_obj_t)&str_endswith_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001683 { MP_OBJ_NEW_QSTR(MP_QSTR_strip), (mp_obj_t)&str_strip_obj },
Paul Sokolovsky88107842014-04-26 06:20:08 +03001684 { MP_OBJ_NEW_QSTR(MP_QSTR_lstrip), (mp_obj_t)&str_lstrip_obj },
1685 { MP_OBJ_NEW_QSTR(MP_QSTR_rstrip), (mp_obj_t)&str_rstrip_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001686 { MP_OBJ_NEW_QSTR(MP_QSTR_format), (mp_obj_t)&str_format_obj },
1687 { MP_OBJ_NEW_QSTR(MP_QSTR_replace), (mp_obj_t)&str_replace_obj },
1688 { MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&str_count_obj },
1689 { MP_OBJ_NEW_QSTR(MP_QSTR_partition), (mp_obj_t)&str_partition_obj },
1690 { MP_OBJ_NEW_QSTR(MP_QSTR_rpartition), (mp_obj_t)&str_rpartition_obj },
Paul Sokolovsky69135212014-05-10 19:47:41 +03001691 { MP_OBJ_NEW_QSTR(MP_QSTR_lower), (mp_obj_t)&str_lower_obj },
1692 { MP_OBJ_NEW_QSTR(MP_QSTR_upper), (mp_obj_t)&str_upper_obj },
Kim Bautersa3f4b832014-05-31 07:30:03 +01001693 { MP_OBJ_NEW_QSTR(MP_QSTR_isspace), (mp_obj_t)&str_isspace_obj },
1694 { MP_OBJ_NEW_QSTR(MP_QSTR_isalpha), (mp_obj_t)&str_isalpha_obj },
1695 { MP_OBJ_NEW_QSTR(MP_QSTR_isdigit), (mp_obj_t)&str_isdigit_obj },
1696 { MP_OBJ_NEW_QSTR(MP_QSTR_isupper), (mp_obj_t)&str_isupper_obj },
1697 { MP_OBJ_NEW_QSTR(MP_QSTR_islower), (mp_obj_t)&str_islower_obj },
ian-v7a16fad2014-01-06 09:52:29 -08001698};
Damien George97209d32014-01-07 15:58:30 +00001699
Damien George9b196cd2014-03-26 21:47:19 +00001700STATIC MP_DEFINE_CONST_DICT(str_locals_dict, str_locals_dict_table);
1701
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001702#if !MICROPY_PY_BUILTINS_STR_UNICODE
Damien George3e1a5c12014-03-29 13:43:38 +00001703const mp_obj_type_t mp_type_str = {
Damien Georgec5966122014-02-15 16:10:44 +00001704 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001705 .name = MP_QSTR_str,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001706 .print = str_print,
Paul Sokolovskybe020c22014-03-21 11:39:01 +02001707 .make_new = str_make_new,
Damien Georgee04a44e2014-06-28 10:27:23 +01001708 .binary_op = mp_obj_str_binary_op,
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +03001709 .subscr = bytes_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001710 .getiter = mp_obj_new_str_iterator,
Damien Georgee04a44e2014-06-28 10:27:23 +01001711 .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
Damien George9b196cd2014-03-26 21:47:19 +00001712 .locals_dict = (mp_obj_t)&str_locals_dict,
Damiend99b0522013-12-21 18:17:45 +00001713};
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001714#endif
Damiend99b0522013-12-21 18:17:45 +00001715
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001716// Reuses most of methods from str
Damien George3e1a5c12014-03-29 13:43:38 +00001717const mp_obj_type_t mp_type_bytes = {
Damien Georgec5966122014-02-15 16:10:44 +00001718 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001719 .name = MP_QSTR_bytes,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001720 .print = str_print,
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001721 .make_new = bytes_make_new,
Damien Georgee04a44e2014-06-28 10:27:23 +01001722 .binary_op = mp_obj_str_binary_op,
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +03001723 .subscr = bytes_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001724 .getiter = mp_obj_new_bytes_iterator,
Damien Georgee04a44e2014-06-28 10:27:23 +01001725 .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
Damien George9b196cd2014-03-26 21:47:19 +00001726 .locals_dict = (mp_obj_t)&str_locals_dict,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001727};
1728
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001729// the zero-length bytes
Damien George3e1a5c12014-03-29 13:43:38 +00001730STATIC const mp_obj_str_t empty_bytes_obj = {{&mp_type_bytes}, 0, 0, NULL};
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001731const mp_obj_t mp_const_empty_bytes = (mp_obj_t)&empty_bytes_obj;
1732
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001733mp_obj_t mp_obj_str_builder_start(const mp_obj_type_t *type, uint len, byte **data) {
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001734 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001735 o->base.type = type;
Damien George5fa93b62014-01-22 14:35:10 +00001736 o->len = len;
Paul Sokolovsky504e2332014-04-19 03:09:17 +03001737 o->hash = 0;
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001738 byte *p = m_new(byte, len + 1);
1739 o->data = p;
1740 *data = p;
Damiend99b0522013-12-21 18:17:45 +00001741 return o;
1742}
1743
Damien George5fa93b62014-01-22 14:35:10 +00001744mp_obj_t mp_obj_str_builder_end(mp_obj_t o_in) {
Damien George5fa93b62014-01-22 14:35:10 +00001745 mp_obj_str_t *o = o_in;
1746 o->hash = qstr_compute_hash(o->data, o->len);
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001747 byte *p = (byte*)o->data;
1748 p[o->len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
Damien George5fa93b62014-01-22 14:35:10 +00001749 return o;
1750}
1751
Damien George5f27a7e2014-07-31 10:29:56 +01001752mp_obj_t mp_obj_str_builder_end_with_len(mp_obj_t o_in, mp_uint_t len) {
1753 mp_obj_str_t *o = o_in;
1754 o->data = m_renew(byte, (byte*)o->data, o->len + 1, len + 1);
1755 o->len = len;
1756 o->hash = qstr_compute_hash(o->data, o->len);
1757 byte *p = (byte*)o->data;
1758 p[o->len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
1759 return o;
1760}
1761
Damien Georgef600a6a2014-05-25 22:34:34 +01001762mp_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 +02001763 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001764 o->base.type = type;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001765 o->len = len;
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001766 if (data) {
1767 o->hash = qstr_compute_hash(data, len);
1768 byte *p = m_new(byte, len + 1);
1769 o->data = p;
1770 memcpy(p, data, len * sizeof(byte));
1771 p[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
1772 }
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001773 return o;
1774}
1775
Damien George2617eeb2014-05-25 22:27:57 +01001776mp_obj_t mp_obj_new_str(const char* data, uint len, bool make_qstr_if_not_already) {
Damien Georgef600a6a2014-05-25 22:34:34 +01001777 if (make_qstr_if_not_already) {
1778 // use existing, or make a new qstr
Damien George2617eeb2014-05-25 22:27:57 +01001779 return MP_OBJ_NEW_QSTR(qstr_from_strn(data, len));
Damien George5fa93b62014-01-22 14:35:10 +00001780 } else {
Damien Georgef600a6a2014-05-25 22:34:34 +01001781 qstr q = qstr_find_strn(data, len);
1782 if (q != MP_QSTR_NULL) {
1783 // qstr with this data already exists
1784 return MP_OBJ_NEW_QSTR(q);
1785 } else {
1786 // no existing qstr, don't make one
1787 return mp_obj_new_str_of_type(&mp_type_str, (const byte*)data, len);
1788 }
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02001789 }
Damien George5fa93b62014-01-22 14:35:10 +00001790}
1791
Paul Sokolovskyb4efac12014-06-08 01:13:35 +03001792mp_obj_t mp_obj_str_intern(mp_obj_t str) {
1793 GET_STR_DATA_LEN(str, data, len);
1794 return MP_OBJ_NEW_QSTR(qstr_from_strn((const char*)data, len));
1795}
1796
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001797mp_obj_t mp_obj_new_bytes(const byte* data, uint len) {
Damien Georgef600a6a2014-05-25 22:34:34 +01001798 return mp_obj_new_str_of_type(&mp_type_bytes, data, len);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001799}
1800
Damien George5fa93b62014-01-22 14:35:10 +00001801bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) {
1802 if (MP_OBJ_IS_QSTR(s1) && MP_OBJ_IS_QSTR(s2)) {
1803 return s1 == s2;
1804 } else {
1805 GET_STR_HASH(s1, h1);
1806 GET_STR_HASH(s2, h2);
Paul Sokolovsky59e269c2014-04-14 01:43:01 +03001807 // If any of hashes is 0, it means it's not valid
1808 if (h1 != 0 && h2 != 0 && h1 != h2) {
Damien George5fa93b62014-01-22 14:35:10 +00001809 return false;
1810 }
1811 GET_STR_DATA_LEN(s1, d1, l1);
1812 GET_STR_DATA_LEN(s2, d2, l2);
1813 if (l1 != l2) {
1814 return false;
1815 }
Damien George1e708fe2014-01-23 18:27:51 +00001816 return memcmp(d1, d2, l1) == 0;
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02001817 }
Damien George5fa93b62014-01-22 14:35:10 +00001818}
1819
Damien Georgedeed0872014-04-06 11:11:15 +01001820STATIC void bad_implicit_conversion(mp_obj_t self_in) {
Damien Georgeea13f402014-04-05 18:32:08 +01001821 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 +00001822}
1823
Paul Sokolovsky69f3eb22014-05-11 02:44:46 +03001824STATIC void arg_type_mixup() {
1825 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "Can't mix str and bytes arguments"));
1826}
1827
Damien George5fa93b62014-01-22 14:35:10 +00001828uint mp_obj_str_get_hash(mp_obj_t self_in) {
Paul Sokolovskyf130ca12014-04-13 05:41:00 +03001829 // TODO: This has too big overhead for hash accessor
1830 if (MP_OBJ_IS_STR(self_in) || MP_OBJ_IS_TYPE(self_in, &mp_type_bytes)) {
Damien George5fa93b62014-01-22 14:35:10 +00001831 GET_STR_HASH(self_in, h);
1832 return h;
1833 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001834 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001835 }
1836}
1837
1838uint mp_obj_str_get_len(mp_obj_t self_in) {
Damien Georgeee014112014-04-15 23:10:00 +01001839 // TODO This has a double check for the type, one in obj.c and one here
1840 if (MP_OBJ_IS_STR(self_in) || MP_OBJ_IS_TYPE(self_in, &mp_type_bytes)) {
Damien George5fa93b62014-01-22 14:35:10 +00001841 GET_STR_LEN(self_in, l);
1842 return l;
1843 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001844 bad_implicit_conversion(self_in);
1845 }
1846}
1847
1848// use this if you will anyway convert the string to a qstr
1849// will be more efficient for the case where it's already a qstr
1850qstr mp_obj_str_get_qstr(mp_obj_t self_in) {
1851 if (MP_OBJ_IS_QSTR(self_in)) {
1852 return MP_OBJ_QSTR_VALUE(self_in);
Damien George3e1a5c12014-03-29 13:43:38 +00001853 } else if (MP_OBJ_IS_TYPE(self_in, &mp_type_str)) {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001854 mp_obj_str_t *self = self_in;
1855 return qstr_from_strn((char*)self->data, self->len);
1856 } else {
1857 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001858 }
1859}
1860
1861// only use this function if you need the str data to be zero terminated
1862// at the moment all strings are zero terminated to help with C ASCIIZ compatibility
1863const char *mp_obj_str_get_str(mp_obj_t self_in) {
1864 if (MP_OBJ_IS_STR(self_in)) {
1865 GET_STR_DATA_LEN(self_in, s, l);
1866 (void)l; // len unused
1867 return (const char*)s;
1868 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001869 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001870 }
1871}
1872
Damien George698ec212014-02-08 18:17:23 +00001873const char *mp_obj_str_get_data(mp_obj_t self_in, uint *len) {
Paul Sokolovskyeea01182014-05-11 13:51:24 +03001874 if (is_str_or_bytes(self_in)) {
Damien George5fa93b62014-01-22 14:35:10 +00001875 GET_STR_DATA_LEN(self_in, s, l);
1876 *len = l;
Damien George698ec212014-02-08 18:17:23 +00001877 return (const char*)s;
Damien George5fa93b62014-01-22 14:35:10 +00001878 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001879 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001880 }
Damiend99b0522013-12-21 18:17:45 +00001881}
xyb8cfc9f02014-01-05 18:47:51 +08001882
1883/******************************************************************************/
1884/* str iterator */
1885
1886typedef struct _mp_obj_str_it_t {
1887 mp_obj_base_t base;
Damien George5fa93b62014-01-22 14:35:10 +00001888 mp_obj_t str;
Damien George40f3c022014-07-03 13:25:24 +01001889 mp_uint_t cur;
xyb8cfc9f02014-01-05 18:47:51 +08001890} mp_obj_str_it_t;
1891
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001892#if !MICROPY_PY_BUILTINS_STR_UNICODE
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001893STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
xyb8cfc9f02014-01-05 18:47:51 +08001894 mp_obj_str_it_t *self = self_in;
Damien George5fa93b62014-01-22 14:35:10 +00001895 GET_STR_DATA_LEN(self->str, str, len);
1896 if (self->cur < len) {
Damien George2617eeb2014-05-25 22:27:57 +01001897 mp_obj_t o_out = mp_obj_new_str((const char*)str + self->cur, 1, true);
xyb8cfc9f02014-01-05 18:47:51 +08001898 self->cur += 1;
1899 return o_out;
1900 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01001901 return MP_OBJ_STOP_ITERATION;
xyb8cfc9f02014-01-05 18:47:51 +08001902 }
1903}
1904
Damien George3e1a5c12014-03-29 13:43:38 +00001905STATIC const mp_obj_type_t mp_type_str_it = {
Damien Georgec5966122014-02-15 16:10:44 +00001906 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001907 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +03001908 .getiter = mp_identity,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001909 .iternext = str_it_iternext,
xyb8cfc9f02014-01-05 18:47:51 +08001910};
1911
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001912mp_obj_t mp_obj_new_str_iterator(mp_obj_t str) {
1913 mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
1914 o->base.type = &mp_type_str_it;
1915 o->str = str;
1916 o->cur = 0;
1917 return o;
1918}
1919#endif
1920
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001921STATIC mp_obj_t bytes_it_iternext(mp_obj_t self_in) {
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001922 mp_obj_str_it_t *self = self_in;
1923 GET_STR_DATA_LEN(self->str, str, len);
1924 if (self->cur < len) {
Damien Georgebb4c6f32014-07-31 10:49:14 +01001925 mp_obj_t o_out = MP_OBJ_NEW_SMALL_INT(str[self->cur]);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001926 self->cur += 1;
1927 return o_out;
1928 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01001929 return MP_OBJ_STOP_ITERATION;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001930 }
1931}
1932
Damien George3e1a5c12014-03-29 13:43:38 +00001933STATIC const mp_obj_type_t mp_type_bytes_it = {
Damien Georgec5966122014-02-15 16:10:44 +00001934 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001935 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +03001936 .getiter = mp_identity,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001937 .iternext = bytes_it_iternext,
1938};
1939
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001940mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str) {
1941 mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
Damien George3e1a5c12014-03-29 13:43:38 +00001942 o->base.type = &mp_type_bytes_it;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001943 o->str = str;
1944 o->cur = 0;
xyb8cfc9f02014-01-05 18:47:51 +08001945 return o;
1946}