blob: e884794591726e73c04e283b7fc0c55d3725cf88 [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: {
Damien George9b7a8ee2014-08-13 13:22:24 +0100293 mp_int_t n;
294 if (!mp_obj_get_int_maybe(rhs_in, &n)) {
Damien George6ac5dce2014-05-21 19:42:43 +0100295 return MP_OBJ_NULL; // op not supported
Paul Sokolovsky545591a2014-01-21 00:27:33 +0200296 }
Damien George9b7a8ee2014-08-13 13:22:24 +0100297 if (n <= 0) {
298 if (lhs_type == &mp_type_str) {
299 return MP_OBJ_NEW_QSTR(MP_QSTR_); // empty str
300 }
301 n = 0;
302 }
Damien George5fa93b62014-01-22 14:35:10 +0000303 byte *data;
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300304 mp_obj_t s = mp_obj_str_builder_start(lhs_type, lhs_len * n, &data);
Damien George5fa93b62014-01-22 14:35:10 +0000305 mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, data);
306 return mp_obj_str_builder_end(s);
Paul Sokolovsky545591a2014-01-21 00:27:33 +0200307 }
Paul Sokolovsky87e85b72014-02-02 08:24:07 +0200308
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300309 case MP_BINARY_OP_MODULO: {
310 mp_obj_t *args;
311 uint n_args;
Paul Sokolovsky75ce9252014-06-05 20:02:15 +0300312 mp_obj_t dict = MP_OBJ_NULL;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300313 if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple)) {
314 // TODO: Support tuple subclasses?
315 mp_obj_tuple_get(rhs_in, &n_args, &args);
Paul Sokolovsky75ce9252014-06-05 20:02:15 +0300316 } else if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_dict)) {
317 args = NULL;
318 n_args = 0;
319 dict = rhs_in;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300320 } else {
321 args = &rhs_in;
322 n_args = 1;
323 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +0300324 return str_modulo_format(lhs_in, n_args, args, dict);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300325 }
326
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300327 //case MP_BINARY_OP_NOT_EQUAL: // This is never passed here
328 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 +0100329 case MP_BINARY_OP_LESS:
330 case MP_BINARY_OP_LESS_EQUAL:
331 case MP_BINARY_OP_MORE:
332 case MP_BINARY_OP_MORE_EQUAL:
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300333 if (lhs_type == rhs_type) {
Paul Sokolovsky87e85b72014-02-02 08:24:07 +0200334 GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
335 return MP_BOOL(mp_seq_cmp_bytes(op, lhs_data, lhs_len, rhs_data, rhs_len));
336 }
Paul Sokolovsky70328e42014-05-15 20:58:40 +0300337 if (lhs_type == &mp_type_bytes) {
338 mp_buffer_info_t bufinfo;
339 if (!mp_get_buffer(rhs_in, &bufinfo, MP_BUFFER_READ)) {
340 goto uncomparable;
341 }
342 return MP_BOOL(mp_seq_cmp_bytes(op, lhs_data, lhs_len, bufinfo.buf, bufinfo.len));
343 }
344uncomparable:
345 if (op == MP_BINARY_OP_EQUAL) {
346 return mp_const_false;
347 }
Damiend99b0522013-12-21 18:17:45 +0000348 }
349
Damien George6ac5dce2014-05-21 19:42:43 +0100350 return MP_OBJ_NULL; // op not supported
Damiend99b0522013-12-21 18:17:45 +0000351}
352
Paul Sokolovskyea2c9362014-06-15 00:35:09 +0300353#if !MICROPY_PY_BUILTINS_STR_UNICODE
354// objstrunicode defines own version
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300355const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, uint self_len,
356 mp_obj_t index, bool is_slice) {
Damien George40f3c022014-07-03 13:25:24 +0100357 mp_uint_t index_val = mp_get_index(type, self_len, index, is_slice);
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300358 return self_data + index_val;
359}
Paul Sokolovskyea2c9362014-06-15 00:35:09 +0300360#endif
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300361
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300362// This is used for both bytes and 8-bit strings. This is not used for unicode strings.
363STATIC 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 +0300364 mp_obj_type_t *type = mp_obj_get_type(self_in);
Damien George729f7b42014-04-17 22:10:53 +0100365 GET_STR_DATA_LEN(self_in, self_data, self_len);
366 if (value == MP_OBJ_SENTINEL) {
367 // load
Damien Georgefb510b32014-06-01 13:32:54 +0100368#if MICROPY_PY_BUILTINS_SLICE
Damien George729f7b42014-04-17 22:10:53 +0100369 if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
Paul Sokolovskyde4b9322014-05-25 21:21:57 +0300370 mp_bound_slice_t slice;
371 if (!mp_seq_get_fast_slice_indexes(self_len, index, &slice)) {
Paul Sokolovsky5fd5af92014-05-25 22:12:56 +0300372 nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,
Damien George11de8392014-06-05 18:57:38 +0100373 "only slices with step=1 (aka None) are supported"));
Damien George729f7b42014-04-17 22:10:53 +0100374 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100375 return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start);
Damien George729f7b42014-04-17 22:10:53 +0100376 }
377#endif
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300378 mp_uint_t index_val = mp_get_index(type, self_len, index, false);
Damien George2eb1f602014-08-11 23:24:29 +0100379 // If we have unicode enabled the type will always be bytes, so take the short cut.
380 if (MICROPY_PY_BUILTINS_STR_UNICODE || type == &mp_type_bytes) {
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300381 return MP_OBJ_NEW_SMALL_INT(self_data[index_val]);
Damien George729f7b42014-04-17 22:10:53 +0100382 } else {
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300383 return mp_obj_new_str((char*)&self_data[index_val], 1, true);
Damien George729f7b42014-04-17 22:10:53 +0100384 }
385 } else {
Damien George6ac5dce2014-05-21 19:42:43 +0100386 return MP_OBJ_NULL; // op not supported
Damien George729f7b42014-04-17 22:10:53 +0100387 }
388}
389
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200390STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
Paul Sokolovsky5e5d69b2014-05-11 21:13:01 +0300391 assert(is_str_or_bytes(self_in));
392 const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
Damiend99b0522013-12-21 18:17:45 +0000393
Damien Georgefe8fb912014-01-02 16:36:09 +0000394 // get separation string
Damien George5fa93b62014-01-22 14:35:10 +0000395 GET_STR_DATA_LEN(self_in, sep_str, sep_len);
Damien Georgefe8fb912014-01-02 16:36:09 +0000396
397 // process args
Damiend99b0522013-12-21 18:17:45 +0000398 uint seq_len;
399 mp_obj_t *seq_items;
Damien George07ddab52014-03-29 13:15:08 +0000400 if (MP_OBJ_IS_TYPE(arg, &mp_type_tuple)) {
Damiend99b0522013-12-21 18:17:45 +0000401 mp_obj_tuple_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000402 } else {
Damien Georgea157e4c2014-04-09 19:17:53 +0100403 if (!MP_OBJ_IS_TYPE(arg, &mp_type_list)) {
404 // arg is not a list, try to convert it to one
Paul Sokolovsky881d9af2014-04-10 01:42:40 +0300405 // TODO: Try to optimize?
Damien Georgea157e4c2014-04-09 19:17:53 +0100406 arg = mp_type_list.make_new((mp_obj_t)&mp_type_list, 1, 0, &arg);
407 }
408 mp_obj_list_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000409 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000410
411 // count required length
412 int required_len = 0;
Damiend99b0522013-12-21 18:17:45 +0000413 for (int i = 0; i < seq_len; i++) {
Paul Sokolovsky5e5d69b2014-05-11 21:13:01 +0300414 if (mp_obj_get_type(seq_items[i]) != self_type) {
415 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
416 "join expects a list of str/bytes objects consistent with self object"));
Damiend99b0522013-12-21 18:17:45 +0000417 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000418 if (i > 0) {
419 required_len += sep_len;
420 }
Damien George5fa93b62014-01-22 14:35:10 +0000421 GET_STR_LEN(seq_items[i], l);
422 required_len += l;
Damiend99b0522013-12-21 18:17:45 +0000423 }
424
425 // make joined string
Damien George5fa93b62014-01-22 14:35:10 +0000426 byte *data;
Paul Sokolovsky5e5d69b2014-05-11 21:13:01 +0300427 mp_obj_t joined_str = mp_obj_str_builder_start(self_type, required_len, &data);
Damiend99b0522013-12-21 18:17:45 +0000428 for (int i = 0; i < seq_len; i++) {
Damiend99b0522013-12-21 18:17:45 +0000429 if (i > 0) {
Damien George5fa93b62014-01-22 14:35:10 +0000430 memcpy(data, sep_str, sep_len);
431 data += sep_len;
Damiend99b0522013-12-21 18:17:45 +0000432 }
Damien George5fa93b62014-01-22 14:35:10 +0000433 GET_STR_DATA_LEN(seq_items[i], s, l);
434 memcpy(data, s, l);
435 data += l;
Damiend99b0522013-12-21 18:17:45 +0000436 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000437
438 // return joined string
Damien George5fa93b62014-01-22 14:35:10 +0000439 return mp_obj_str_builder_end(joined_str);
Damiend99b0522013-12-21 18:17:45 +0000440}
441
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200442#define is_ws(c) ((c) == ' ' || (c) == '\t')
443
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200444STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) {
Paul Sokolovskybfb88192014-05-11 21:17:28 +0300445 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Damien George40f3c022014-07-03 13:25:24 +0100446 mp_int_t splits = -1;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200447 mp_obj_t sep = mp_const_none;
448 if (n_args > 1) {
449 sep = args[1];
450 if (n_args > 2) {
Damien Georgedeed0872014-04-06 11:11:15 +0100451 splits = mp_obj_get_int(args[2]);
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200452 }
453 }
Damien Georgedeed0872014-04-06 11:11:15 +0100454
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200455 mp_obj_t res = mp_obj_new_list(0, NULL);
Damien George5fa93b62014-01-22 14:35:10 +0000456 GET_STR_DATA_LEN(args[0], s, len);
457 const byte *top = s + len;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200458
Damien Georgedeed0872014-04-06 11:11:15 +0100459 if (sep == mp_const_none) {
460 // sep not given, so separate on whitespace
461
462 // Initial whitespace is not counted as split, so we pre-do it
Damien George5fa93b62014-01-22 14:35:10 +0000463 while (s < top && is_ws(*s)) s++;
Damien Georgedeed0872014-04-06 11:11:15 +0100464 while (s < top && splits != 0) {
465 const byte *start = s;
466 while (s < top && !is_ws(*s)) s++;
Damien Georgef600a6a2014-05-25 22:34:34 +0100467 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
Damien Georgedeed0872014-04-06 11:11:15 +0100468 if (s >= top) {
469 break;
470 }
471 while (s < top && is_ws(*s)) s++;
472 if (splits > 0) {
473 splits--;
474 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200475 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200476
Damien Georgedeed0872014-04-06 11:11:15 +0100477 if (s < top) {
Damien Georgef600a6a2014-05-25 22:34:34 +0100478 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, s, top - s));
Damien Georgedeed0872014-04-06 11:11:15 +0100479 }
480
481 } else {
482 // sep given
Paul Sokolovsky0c549852014-08-10 23:14:35 +0300483 if (mp_obj_get_type(sep) != self_type) {
484 arg_type_mixup();
485 }
Damien Georgedeed0872014-04-06 11:11:15 +0100486
487 uint sep_len;
488 const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
489
490 if (sep_len == 0) {
491 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
492 }
493
494 for (;;) {
495 const byte *start = s;
496 for (;;) {
497 if (splits == 0 || s + sep_len > top) {
498 s = top;
499 break;
500 } else if (memcmp(s, sep_str, sep_len) == 0) {
501 break;
502 }
503 s++;
504 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100505 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
Damien Georgedeed0872014-04-06 11:11:15 +0100506 if (s >= top) {
507 break;
508 }
509 s += sep_len;
510 if (splits > 0) {
511 splits--;
512 }
513 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200514 }
515
516 return res;
517}
518
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300519STATIC mp_obj_t str_rsplit(uint n_args, const mp_obj_t *args) {
520 if (n_args < 3) {
521 // If we don't have split limit, it doesn't matter from which side
522 // we split.
523 return str_split(n_args, args);
524 }
525 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
526 mp_obj_t sep = args[1];
527 GET_STR_DATA_LEN(args[0], s, len);
528
Damien George40f3c022014-07-03 13:25:24 +0100529 mp_int_t splits = mp_obj_get_int(args[2]);
530 mp_int_t org_splits = splits;
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300531 // Preallocate list to the max expected # of elements, as we
532 // will fill it from the end.
533 mp_obj_list_t *res = mp_obj_new_list(splits + 1, NULL);
534 int idx = splits;
535
536 if (sep == mp_const_none) {
Chris Angelico9ab8ab22014-06-04 05:04:23 +1000537 assert(!"TODO: rsplit(None,n) not implemented");
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300538 } else {
539 uint sep_len;
540 const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
541
542 if (sep_len == 0) {
543 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
544 }
545
546 const byte *beg = s;
547 const byte *last = s + len;
548 for (;;) {
549 s = last - sep_len;
550 for (;;) {
551 if (splits == 0 || s < beg) {
552 break;
553 } else if (memcmp(s, sep_str, sep_len) == 0) {
554 break;
555 }
556 s--;
557 }
558 if (s < beg || splits == 0) {
Damien Georgef600a6a2014-05-25 22:34:34 +0100559 res->items[idx] = mp_obj_new_str_of_type(self_type, beg, last - beg);
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300560 break;
561 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100562 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 +0300563 last = s;
564 if (splits > 0) {
565 splits--;
566 }
567 }
568 if (idx != 0) {
569 // We split less parts than split limit, now go cleanup surplus
570 int used = org_splits + 1 - idx;
571 memcpy(res->items, &res->items[idx], used * sizeof(mp_obj_t));
572 mp_seq_clear(res->items, used, res->alloc, sizeof(*res->items));
573 res->len = used;
574 }
575 }
576
577 return res;
578}
579
Damien George40f3c022014-07-03 13:25:24 +0100580STATIC 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 +0300581 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
John R. Lentone8204912014-01-12 21:53:52 +0000582 assert(2 <= n_args && n_args <= 4);
Damien George5fa93b62014-01-22 14:35:10 +0000583 assert(MP_OBJ_IS_STR(args[0]));
584 assert(MP_OBJ_IS_STR(args[1]));
John R. Lentone8204912014-01-12 21:53:52 +0000585
Damien George5fa93b62014-01-22 14:35:10 +0000586 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
587 GET_STR_DATA_LEN(args[1], needle, needle_len);
John R. Lentone8204912014-01-12 21:53:52 +0000588
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300589 const byte *start = haystack;
590 const byte *end = haystack + haystack_len;
John R. Lentone8204912014-01-12 21:53:52 +0000591 if (n_args >= 3 && args[2] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300592 start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
John R. Lentone8204912014-01-12 21:53:52 +0000593 }
594 if (n_args >= 4 && args[3] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300595 end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
John R. Lentone8204912014-01-12 21:53:52 +0000596 }
597
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300598 const byte *p = find_subbytes(start, end - start, needle, needle_len, direction);
Damien George23005372014-01-13 19:39:01 +0000599 if (p == NULL) {
600 // not found
xbe3d9a39e2014-04-08 11:42:19 -0700601 if (is_index) {
602 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "substring not found"));
603 } else {
604 return MP_OBJ_NEW_SMALL_INT(-1);
605 }
Damien George23005372014-01-13 19:39:01 +0000606 } else {
607 // found
Paul Sokolovsky5048df02014-06-14 03:15:00 +0300608 #if MICROPY_PY_BUILTINS_STR_UNICODE
609 if (self_type == &mp_type_str) {
610 return MP_OBJ_NEW_SMALL_INT(utf8_ptr_to_index(haystack, p));
611 }
612 #endif
xbe17a5a832014-03-23 23:31:58 -0700613 return MP_OBJ_NEW_SMALL_INT(p - haystack);
John R. Lentone8204912014-01-12 21:53:52 +0000614 }
John R. Lentone8204912014-01-12 21:53:52 +0000615}
616
xbe17a5a832014-03-23 23:31:58 -0700617STATIC mp_obj_t str_find(uint n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700618 return str_finder(n_args, args, 1, false);
xbe17a5a832014-03-23 23:31:58 -0700619}
620
621STATIC mp_obj_t str_rfind(uint n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700622 return str_finder(n_args, args, -1, false);
623}
624
625STATIC mp_obj_t str_index(uint n_args, const mp_obj_t *args) {
626 return str_finder(n_args, args, 1, true);
627}
628
629STATIC mp_obj_t str_rindex(uint n_args, const mp_obj_t *args) {
630 return str_finder(n_args, args, -1, true);
xbe17a5a832014-03-23 23:31:58 -0700631}
632
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200633// TODO: (Much) more variety in args
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300634STATIC mp_obj_t str_startswith(uint n_args, const mp_obj_t *args) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300635 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300636 GET_STR_DATA_LEN(args[0], str, str_len);
637 GET_STR_DATA_LEN(args[1], prefix, prefix_len);
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300638 const byte *start = str;
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300639 if (n_args > 2) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300640 start = str_index_to_ptr(self_type, str, str_len, args[2], true);
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300641 }
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300642 if (prefix_len + (start - str) > str_len) {
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200643 return mp_const_false;
644 }
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300645 return MP_BOOL(memcmp(start, prefix, prefix_len) == 0);
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200646}
647
Paul Sokolovskyd098c6b2014-05-24 22:46:51 +0300648STATIC mp_obj_t str_endswith(uint n_args, const mp_obj_t *args) {
649 GET_STR_DATA_LEN(args[0], str, str_len);
650 GET_STR_DATA_LEN(args[1], suffix, suffix_len);
651 assert(n_args == 2);
652
653 if (suffix_len > str_len) {
654 return mp_const_false;
655 }
656 return MP_BOOL(memcmp(str + (str_len - suffix_len), suffix, suffix_len) == 0);
657}
658
Paul Sokolovsky88107842014-04-26 06:20:08 +0300659enum { LSTRIP, RSTRIP, STRIP };
660
661STATIC mp_obj_t str_uni_strip(int type, uint n_args, const mp_obj_t *args) {
xbe7b0f39f2014-01-08 14:23:45 -0800662 assert(1 <= n_args && n_args <= 2);
Paul Sokolovskyb2d4fc02014-05-11 13:17:29 +0300663 assert(is_str_or_bytes(args[0]));
664 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Damien George5fa93b62014-01-22 14:35:10 +0000665
666 const byte *chars_to_del;
667 uint chars_to_del_len;
668 static const byte whitespace[] = " \t\n\r\v\f";
xbe7b0f39f2014-01-08 14:23:45 -0800669
670 if (n_args == 1) {
671 chars_to_del = whitespace;
Damien George5fa93b62014-01-22 14:35:10 +0000672 chars_to_del_len = sizeof(whitespace);
xbe7b0f39f2014-01-08 14:23:45 -0800673 } else {
Paul Sokolovskyb2d4fc02014-05-11 13:17:29 +0300674 if (mp_obj_get_type(args[1]) != self_type) {
675 arg_type_mixup();
676 }
Damien George5fa93b62014-01-22 14:35:10 +0000677 GET_STR_DATA_LEN(args[1], s, l);
678 chars_to_del = s;
679 chars_to_del_len = l;
xbe7b0f39f2014-01-08 14:23:45 -0800680 }
681
Damien George5fa93b62014-01-22 14:35:10 +0000682 GET_STR_DATA_LEN(args[0], orig_str, orig_str_len);
xbe7b0f39f2014-01-08 14:23:45 -0800683
Damien George40f3c022014-07-03 13:25:24 +0100684 mp_uint_t first_good_char_pos = 0;
xbe7b0f39f2014-01-08 14:23:45 -0800685 bool first_good_char_pos_set = false;
Damien George40f3c022014-07-03 13:25:24 +0100686 mp_uint_t last_good_char_pos = 0;
687 mp_uint_t i = 0;
688 mp_int_t delta = 1;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300689 if (type == RSTRIP) {
690 i = orig_str_len - 1;
691 delta = -1;
692 }
Damien George40f3c022014-07-03 13:25:24 +0100693 for (mp_uint_t len = orig_str_len; len > 0; len--) {
xbe17a5a832014-03-23 23:31:58 -0700694 if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) {
xbe7b0f39f2014-01-08 14:23:45 -0800695 if (!first_good_char_pos_set) {
Paul Sokolovskybcdffe52014-05-30 03:07:05 +0300696 first_good_char_pos_set = true;
xbe7b0f39f2014-01-08 14:23:45 -0800697 first_good_char_pos = i;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300698 if (type == LSTRIP) {
699 last_good_char_pos = orig_str_len - 1;
700 break;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300701 } else if (type == RSTRIP) {
702 first_good_char_pos = 0;
703 last_good_char_pos = i;
704 break;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300705 }
xbe7b0f39f2014-01-08 14:23:45 -0800706 }
Paul Sokolovsky88107842014-04-26 06:20:08 +0300707 last_good_char_pos = i;
xbe7b0f39f2014-01-08 14:23:45 -0800708 }
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300709 i += delta;
xbe7b0f39f2014-01-08 14:23:45 -0800710 }
711
Paul Sokolovskybcdffe52014-05-30 03:07:05 +0300712 if (!first_good_char_pos_set) {
Damien George5fa93b62014-01-22 14:35:10 +0000713 // string is all whitespace, return ''
714 return MP_OBJ_NEW_QSTR(MP_QSTR_);
xbe7b0f39f2014-01-08 14:23:45 -0800715 }
716
717 assert(last_good_char_pos >= first_good_char_pos);
718 //+1 to accomodate the last character
Damien George40f3c022014-07-03 13:25:24 +0100719 mp_uint_t stripped_len = last_good_char_pos - first_good_char_pos + 1;
Paul Sokolovsky88276822014-05-30 03:11:44 +0300720 if (stripped_len == orig_str_len) {
721 // If nothing was stripped, don't bother to dup original string
722 // TODO: watch out for this case when we'll get to bytearray.strip()
723 assert(first_good_char_pos == 0);
724 return args[0];
725 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100726 return mp_obj_new_str_of_type(self_type, orig_str + first_good_char_pos, stripped_len);
xbe7b0f39f2014-01-08 14:23:45 -0800727}
728
Paul Sokolovsky88107842014-04-26 06:20:08 +0300729STATIC mp_obj_t str_strip(uint n_args, const mp_obj_t *args) {
730 return str_uni_strip(STRIP, n_args, args);
731}
732
733STATIC mp_obj_t str_lstrip(uint n_args, const mp_obj_t *args) {
734 return str_uni_strip(LSTRIP, n_args, args);
735}
736
737STATIC mp_obj_t str_rstrip(uint n_args, const mp_obj_t *args) {
738 return str_uni_strip(RSTRIP, n_args, args);
739}
740
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700741// Takes an int arg, but only parses unsigned numbers, and only changes
742// *num if at least one digit was parsed.
743static int str_to_int(const char *str, int *num) {
744 const char *s = str;
745 if (unichar_isdigit(*s)) {
746 *num = 0;
747 do {
748 *num = *num * 10 + (*s - '0');
749 s++;
750 }
751 while (unichar_isdigit(*s));
752 }
753 return s - str;
754}
755
756static bool isalignment(char ch) {
757 return ch && strchr("<>=^", ch) != NULL;
758}
759
760static bool istype(char ch) {
761 return ch && strchr("bcdeEfFgGnosxX%", ch) != NULL;
762}
763
764static bool arg_looks_integer(mp_obj_t arg) {
765 return MP_OBJ_IS_TYPE(arg, &mp_type_bool) || MP_OBJ_IS_INT(arg);
766}
767
768static bool arg_looks_numeric(mp_obj_t arg) {
769 return arg_looks_integer(arg)
Damien Georgefb510b32014-06-01 13:32:54 +0100770#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700771 || MP_OBJ_IS_TYPE(arg, &mp_type_float)
772#endif
773 ;
774}
775
Dave Hylandsc4029e52014-04-07 11:19:51 -0700776static mp_obj_t arg_as_int(mp_obj_t arg) {
Damien Georgefb510b32014-06-01 13:32:54 +0100777#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700778 if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
Dave Hylandsc4029e52014-04-07 11:19:51 -0700779
780 // TODO: Needs a way to construct an mpz integer from a float
781
Damien George40f3c022014-07-03 13:25:24 +0100782 mp_int_t num = mp_obj_get_float(arg);
Dave Hylandsc4029e52014-04-07 11:19:51 -0700783 return MP_OBJ_NEW_SMALL_INT(num);
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700784 }
785#endif
Dave Hylandsc4029e52014-04-07 11:19:51 -0700786 return arg;
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700787}
788
Damien George897fe0c2014-04-15 22:03:55 +0100789mp_obj_t mp_obj_str_format(uint n_args, const mp_obj_t *args) {
Damien George5fa93b62014-01-22 14:35:10 +0000790 assert(MP_OBJ_IS_STR(args[0]));
Damiend99b0522013-12-21 18:17:45 +0000791
Damien George5fa93b62014-01-22 14:35:10 +0000792 GET_STR_DATA_LEN(args[0], str, len);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700793 int arg_i = 0;
Damiend99b0522013-12-21 18:17:45 +0000794 vstr_t *vstr = vstr_new();
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700795 pfenv_t pfenv_vstr;
796 pfenv_vstr.data = vstr;
797 pfenv_vstr.print_strn = pfenv_vstr_add_strn;
798
Damien George5fa93b62014-01-22 14:35:10 +0000799 for (const byte *top = str + len; str < top; str++) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700800 if (*str == '}') {
Damiend99b0522013-12-21 18:17:45 +0000801 str++;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700802 if (str < top && *str == '}') {
803 vstr_add_char(vstr, '}');
804 continue;
805 }
Damien George11de8392014-06-05 18:57:38 +0100806 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "single '}' encountered in format string"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700807 }
808 if (*str != '{') {
809 vstr_add_char(vstr, *str);
810 continue;
811 }
812
813 str++;
814 if (str < top && *str == '{') {
815 vstr_add_char(vstr, '{');
816 continue;
817 }
818
819 // replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}"
820
821 vstr_t *field_name = NULL;
822 char conversion = '\0';
823 vstr_t *format_spec = NULL;
824
825 if (str < top && *str != '}' && *str != '!' && *str != ':') {
826 field_name = vstr_new();
827 while (str < top && *str != '}' && *str != '!' && *str != ':') {
828 vstr_add_char(field_name, *str++);
829 }
830 vstr_add_char(field_name, '\0');
831 }
832
833 // conversion ::= "r" | "s"
834
835 if (str < top && *str == '!') {
836 str++;
837 if (str < top && (*str == 'r' || *str == 's')) {
838 conversion = *str++;
Paul Sokolovskyf2b796e2014-01-15 22:45:20 +0200839 } else {
Damien Georgeea13f402014-04-05 18:32:08 +0100840 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 -0700841 }
842 }
843
844 if (str < top && *str == ':') {
845 str++;
846 // {:} is the same as {}, which is the same as {!s}
847 // This makes a difference when passing in a True or False
848 // '{}'.format(True) returns 'True'
849 // '{:d}'.format(True) returns '1'
850 // So we treat {:} as {} and this later gets treated to be {!s}
851 if (*str != '}') {
Damien George11de8392014-06-05 18:57:38 +0100852 format_spec = vstr_new();
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700853 while (str < top && *str != '}') {
854 vstr_add_char(format_spec, *str++);
Damiend99b0522013-12-21 18:17:45 +0000855 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700856 vstr_add_char(format_spec, '\0');
857 }
858 }
859 if (str >= top) {
Damien Georgeea13f402014-04-05 18:32:08 +0100860 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "unmatched '{' in format"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700861 }
862 if (*str != '}') {
Damien Georgeea13f402014-04-05 18:32:08 +0100863 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "expected ':' after format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700864 }
865
866 mp_obj_t arg = mp_const_none;
867
868 if (field_name) {
869 if (arg_i > 0) {
Damien George11de8392014-06-05 18:57:38 +0100870 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 -0700871 }
Damien George3bb8bd82014-04-14 21:20:30 +0100872 int index = 0;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700873 if (str_to_int(vstr_str(field_name), &index) != vstr_len(field_name) - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100874 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "attributes not supported yet"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700875 }
876 if (index >= n_args - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100877 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700878 }
879 arg = args[index + 1];
880 arg_i = -1;
881 vstr_free(field_name);
882 field_name = NULL;
883 } else {
884 if (arg_i < 0) {
Damien George11de8392014-06-05 18:57:38 +0100885 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 -0700886 }
887 if (arg_i >= n_args - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100888 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700889 }
890 arg = args[arg_i + 1];
891 arg_i++;
892 }
893 if (!format_spec && !conversion) {
894 conversion = 's';
895 }
896 if (conversion) {
897 mp_print_kind_t print_kind;
898 if (conversion == 's') {
899 print_kind = PRINT_STR;
900 } else if (conversion == 'r') {
901 print_kind = PRINT_REPR;
902 } else {
Damien George11de8392014-06-05 18:57:38 +0100903 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "unknown conversion specifier %c", conversion));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700904 }
905 vstr_t *arg_vstr = vstr_new();
906 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, arg_vstr, arg, print_kind);
Damien George2617eeb2014-05-25 22:27:57 +0100907 arg = mp_obj_new_str(vstr_str(arg_vstr), vstr_len(arg_vstr), false);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700908 vstr_free(arg_vstr);
909 }
910
911 char sign = '\0';
912 char fill = '\0';
913 char align = '\0';
914 int width = -1;
915 int precision = -1;
916 char type = '\0';
917 int flags = 0;
918
919 if (format_spec) {
920 // The format specifier (from http://docs.python.org/2/library/string.html#formatspec)
921 //
922 // [[fill]align][sign][#][0][width][,][.precision][type]
923 // fill ::= <any character>
924 // align ::= "<" | ">" | "=" | "^"
925 // sign ::= "+" | "-" | " "
926 // width ::= integer
927 // precision ::= integer
928 // type ::= "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
929
930 const char *s = vstr_str(format_spec);
931 if (isalignment(*s)) {
932 align = *s++;
933 } else if (*s && isalignment(s[1])) {
934 fill = *s++;
935 align = *s++;
936 }
937 if (*s == '+' || *s == '-' || *s == ' ') {
938 if (*s == '+') {
939 flags |= PF_FLAG_SHOW_SIGN;
940 } else if (*s == ' ') {
941 flags |= PF_FLAG_SPACE_SIGN;
942 }
943 sign = *s++;
944 }
945 if (*s == '#') {
946 flags |= PF_FLAG_SHOW_PREFIX;
947 s++;
948 }
949 if (*s == '0') {
950 if (!align) {
951 align = '=';
952 }
953 if (!fill) {
954 fill = '0';
955 }
956 }
957 s += str_to_int(s, &width);
958 if (*s == ',') {
959 flags |= PF_FLAG_SHOW_COMMA;
960 s++;
961 }
962 if (*s == '.') {
963 s++;
964 s += str_to_int(s, &precision);
965 }
966 if (istype(*s)) {
967 type = *s++;
968 }
969 if (*s) {
Damien Georgeea13f402014-04-05 18:32:08 +0100970 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "Invalid conversion specification"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700971 }
972 vstr_free(format_spec);
973 format_spec = NULL;
974 }
975 if (!align) {
976 if (arg_looks_numeric(arg)) {
977 align = '>';
978 } else {
979 align = '<';
980 }
981 }
982 if (!fill) {
983 fill = ' ';
984 }
985
986 if (sign) {
987 if (type == 's') {
Damien Georgeea13f402014-04-05 18:32:08 +0100988 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed in string format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700989 }
990 if (type == 'c') {
Damien Georgeea13f402014-04-05 18:32:08 +0100991 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed with integer format specifier 'c'"));
Damiend99b0522013-12-21 18:17:45 +0000992 }
993 } else {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700994 sign = '-';
995 }
996
997 switch (align) {
998 case '<': flags |= PF_FLAG_LEFT_ADJUST; break;
999 case '=': flags |= PF_FLAG_PAD_AFTER_SIGN; break;
1000 case '^': flags |= PF_FLAG_CENTER_ADJUST; break;
1001 }
1002
1003 if (arg_looks_integer(arg)) {
1004 switch (type) {
1005 case 'b':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001006 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 2, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001007 continue;
1008
1009 case 'c':
1010 {
1011 char ch = mp_obj_get_int(arg);
1012 pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, fill, width);
1013 continue;
1014 }
1015
1016 case '\0': // No explicit format type implies 'd'
1017 case 'n': // I don't think we support locales in uPy so use 'd'
1018 case 'd':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001019 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 10, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001020 continue;
1021
1022 case 'o':
Dave Hylandsc4029e52014-04-07 11:19:51 -07001023 if (flags & PF_FLAG_SHOW_PREFIX) {
1024 flags |= PF_FLAG_SHOW_OCTAL_LETTER;
1025 }
1026
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001027 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 8, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001028 continue;
1029
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001030 case 'X':
Damien George11de8392014-06-05 18:57:38 +01001031 case 'x':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001032 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, type - ('X' - 'A'), flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001033 continue;
1034
1035 case 'e':
1036 case 'E':
1037 case 'f':
1038 case 'F':
1039 case 'g':
1040 case 'G':
1041 case '%':
1042 // The floating point formatters all work with anything that
1043 // looks like an integer
1044 break;
1045
1046 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001047 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Damien George11de8392014-06-05 18:57:38 +01001048 "unknown format code '%c' for object of type '%s'", type, mp_obj_get_type_str(arg)));
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001049 }
Damien Georgec322c5f2014-04-02 20:04:15 +01001050 }
Damien George70f33cd2014-04-02 17:06:05 +01001051
Dave Hylands22fe4d72014-04-02 12:07:31 -07001052 // NOTE: no else here. We need the e, f, g etc formats for integer
1053 // arguments (from above if) to take this if.
Damien Georgec322c5f2014-04-02 20:04:15 +01001054 if (arg_looks_numeric(arg)) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001055 if (!type) {
1056
1057 // Even though the docs say that an unspecified type is the same
1058 // as 'g', there is one subtle difference, when the exponent
1059 // is one less than the precision.
Damien George11de8392014-06-05 18:57:38 +01001060 //
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001061 // '{:10.1}'.format(0.0) ==> '0e+00'
1062 // '{:10.1g}'.format(0.0) ==> '0'
1063 //
1064 // TODO: Figure out how to deal with this.
1065 //
1066 // A proper solution would involve adding a special flag
1067 // or something to format_float, and create a format_double
1068 // to deal with doubles. In order to fix this when using
1069 // sprintf, we'd need to use the e format and tweak the
1070 // returned result to strip trailing zeros like the g format
1071 // does.
1072 //
1073 // {:10.3} and {:10.2e} with 1.23e2 both produce 1.23e+02
1074 // but with 1.e2 you get 1e+02 and 1.00e+02
1075 //
1076 // Stripping the trailing 0's (like g) does would make the
1077 // e format give us the right format.
1078 //
1079 // CPython sources say:
1080 // Omitted type specifier. Behaves in the same way as repr(x)
1081 // and str(x) if no precision is given, else like 'g', but with
1082 // at least one digit after the decimal point. */
1083
1084 type = 'g';
1085 }
1086 if (type == 'n') {
1087 type = 'g';
1088 }
1089
1090 flags |= PF_FLAG_PAD_NAN_INF; // '{:06e}'.format(float('-inf')) should give '-00inf'
1091 switch (type) {
Damien Georgefb510b32014-06-01 13:32:54 +01001092#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001093 case 'e':
1094 case 'E':
1095 case 'f':
1096 case 'F':
1097 case 'g':
1098 case 'G':
Damien George11de8392014-06-05 18:57:38 +01001099 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), type, flags, fill, width, precision);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001100 break;
1101
1102 case '%':
1103 flags |= PF_FLAG_ADD_PERCENT;
1104 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg) * 100.0F, 'f', flags, fill, width, precision);
1105 break;
Damien Georgec322c5f2014-04-02 20:04:15 +01001106#endif
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001107
1108 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001109 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Damien George11de8392014-06-05 18:57:38 +01001110 "unknown format code '%c' for object of type 'float'",
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001111 type, mp_obj_get_type_str(arg)));
1112 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001113 } else {
Damien George70f33cd2014-04-02 17:06:05 +01001114 // arg doesn't look like a number
1115
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001116 if (align == '=') {
Damien Georgeea13f402014-04-05 18:32:08 +01001117 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "'=' alignment not allowed in string format specifier"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001118 }
Damien George70f33cd2014-04-02 17:06:05 +01001119
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001120 switch (type) {
1121 case '\0':
1122 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, arg, PRINT_STR);
1123 break;
1124
1125 case 's':
1126 {
1127 uint len;
1128 const char *s = mp_obj_str_get_data(arg, &len);
1129 if (precision < 0) {
1130 precision = len;
1131 }
1132 if (len > precision) {
1133 len = precision;
1134 }
1135 pfenv_print_strn(&pfenv_vstr, s, len, flags, fill, width);
1136 break;
1137 }
1138
1139 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001140 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Damien George11de8392014-06-05 18:57:38 +01001141 "unknown format code '%c' for object of type 'str'",
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001142 type, mp_obj_get_type_str(arg)));
1143 }
Damiend99b0522013-12-21 18:17:45 +00001144 }
1145 }
1146
Damien George2617eeb2014-05-25 22:27:57 +01001147 mp_obj_t s = mp_obj_new_str(vstr->buf, vstr->len, false);
Damien George5fa93b62014-01-22 14:35:10 +00001148 vstr_free(vstr);
1149 return s;
Damiend99b0522013-12-21 18:17:45 +00001150}
1151
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001152STATIC 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 +03001153 assert(MP_OBJ_IS_STR(pattern));
1154
1155 GET_STR_DATA_LEN(pattern, str, len);
Dave Hylands6756a372014-04-02 11:42:39 -07001156 const byte *start_str = str;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001157 int arg_i = 0;
1158 vstr_t *vstr = vstr_new();
Dave Hylands6756a372014-04-02 11:42:39 -07001159 pfenv_t pfenv_vstr;
1160 pfenv_vstr.data = vstr;
1161 pfenv_vstr.print_strn = pfenv_vstr_add_strn;
1162
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001163 for (const byte *top = str + len; str < top; str++) {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001164 mp_obj_t arg = MP_OBJ_NULL;
Dave Hylands6756a372014-04-02 11:42:39 -07001165 if (*str != '%') {
1166 vstr_add_char(vstr, *str);
1167 continue;
1168 }
1169 if (++str >= top) {
1170 break;
1171 }
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001172 if (*str == '%') {
Dave Hylands6756a372014-04-02 11:42:39 -07001173 vstr_add_char(vstr, '%');
1174 continue;
1175 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001176
1177 // Dictionary value lookup
1178 if (*str == '(') {
1179 const byte *key = ++str;
1180 while (*str != ')') {
1181 if (str >= top) {
1182 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "incomplete format key"));
1183 }
1184 ++str;
1185 }
1186 mp_obj_t k_obj = mp_obj_new_str((const char*)key, str - key, true);
1187 arg = mp_obj_dict_get(dict, k_obj);
1188 str++;
Dave Hylands6756a372014-04-02 11:42:39 -07001189 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001190
Dave Hylands6756a372014-04-02 11:42:39 -07001191 int flags = 0;
1192 char fill = ' ';
Damien George11de8392014-06-05 18:57:38 +01001193 int alt = 0;
Dave Hylands6756a372014-04-02 11:42:39 -07001194 while (str < top) {
1195 if (*str == '-') flags |= PF_FLAG_LEFT_ADJUST;
1196 else if (*str == '+') flags |= PF_FLAG_SHOW_SIGN;
1197 else if (*str == ' ') flags |= PF_FLAG_SPACE_SIGN;
Damien George11de8392014-06-05 18:57:38 +01001198 else if (*str == '#') alt = PF_FLAG_SHOW_PREFIX;
Dave Hylands6756a372014-04-02 11:42:39 -07001199 else if (*str == '0') {
1200 flags |= PF_FLAG_PAD_AFTER_SIGN;
1201 fill = '0';
1202 } else break;
1203 str++;
1204 }
1205 // parse width, if it exists
Damien George11de8392014-06-05 18:57:38 +01001206 int width = 0;
Dave Hylands6756a372014-04-02 11:42:39 -07001207 if (str < top) {
1208 if (*str == '*') {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001209 if (arg_i >= n_args) {
1210 goto not_enough_args;
1211 }
Dave Hylands6756a372014-04-02 11:42:39 -07001212 width = mp_obj_get_int(args[arg_i++]);
1213 str++;
1214 } else {
1215 for (; str < top && '0' <= *str && *str <= '9'; str++) {
1216 width = width * 10 + *str - '0';
1217 }
1218 }
1219 }
1220 int prec = -1;
1221 if (str < top && *str == '.') {
1222 if (++str < top) {
1223 if (*str == '*') {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001224 if (arg_i >= n_args) {
1225 goto not_enough_args;
1226 }
Dave Hylands6756a372014-04-02 11:42:39 -07001227 prec = mp_obj_get_int(args[arg_i++]);
1228 str++;
1229 } else {
1230 prec = 0;
1231 for (; str < top && '0' <= *str && *str <= '9'; str++) {
1232 prec = prec * 10 + *str - '0';
1233 }
1234 }
1235 }
1236 }
1237
1238 if (str >= top) {
Damien Georgeea13f402014-04-05 18:32:08 +01001239 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "incomplete format"));
Dave Hylands6756a372014-04-02 11:42:39 -07001240 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001241
1242 // Tuple value lookup
1243 if (arg == MP_OBJ_NULL) {
1244 if (arg_i >= n_args) {
1245not_enough_args:
1246 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not enough arguments for format string"));
1247 }
1248 arg = args[arg_i++];
1249 }
Dave Hylands6756a372014-04-02 11:42:39 -07001250 switch (*str) {
1251 case 'c':
1252 if (MP_OBJ_IS_STR(arg)) {
1253 uint len;
1254 const char *s = mp_obj_str_get_data(arg, &len);
1255 if (len != 1) {
Damien George11de8392014-06-05 18:57:38 +01001256 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "%%c requires int or char"));
Dave Hylands6756a372014-04-02 11:42:39 -07001257 break;
1258 }
1259 pfenv_print_strn(&pfenv_vstr, s, 1, flags, ' ', width);
1260 break;
1261 }
1262 if (arg_looks_integer(arg)) {
1263 char ch = mp_obj_get_int(arg);
1264 pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, ' ', width);
1265 break;
1266 }
Damien Georgefb510b32014-06-01 13:32:54 +01001267#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylands6756a372014-04-02 11:42:39 -07001268 // This is what CPython reports, so we report the same.
1269 if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
Damien George11de8392014-06-05 18:57:38 +01001270 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "integer argument expected, got float"));
Dave Hylands6756a372014-04-02 11:42:39 -07001271
1272 }
1273#endif
Damien George11de8392014-06-05 18:57:38 +01001274 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "an integer is required"));
1275 break;
Dave Hylands6756a372014-04-02 11:42:39 -07001276
1277 case 'd':
1278 case 'i':
1279 case 'u':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001280 pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 10, 'a', flags, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001281 break;
1282
Damien Georgefb510b32014-06-01 13:32:54 +01001283#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylands6756a372014-04-02 11:42:39 -07001284 case 'e':
1285 case 'E':
1286 case 'f':
1287 case 'F':
1288 case 'g':
1289 case 'G':
1290 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), *str, flags, fill, width, prec);
1291 break;
1292#endif
1293
1294 case 'o':
1295 if (alt) {
Dave Hylandsc4029e52014-04-07 11:19:51 -07001296 flags |= (PF_FLAG_SHOW_PREFIX | PF_FLAG_SHOW_OCTAL_LETTER);
Dave Hylands6756a372014-04-02 11:42:39 -07001297 }
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001298 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 8, 'a', flags, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001299 break;
1300
1301 case 'r':
1302 case 's':
1303 {
1304 vstr_t *arg_vstr = vstr_new();
1305 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf,
1306 arg_vstr, arg, *str == 'r' ? PRINT_REPR : PRINT_STR);
1307 uint len = vstr_len(arg_vstr);
1308 if (prec < 0) {
1309 prec = len;
1310 }
1311 if (len > prec) {
1312 len = prec;
1313 }
1314 pfenv_print_strn(&pfenv_vstr, vstr_str(arg_vstr), len, flags, ' ', width);
1315 vstr_free(arg_vstr);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001316 break;
1317 }
Dave Hylands6756a372014-04-02 11:42:39 -07001318
Dave Hylands6756a372014-04-02 11:42:39 -07001319 case 'X':
Damien George11de8392014-06-05 18:57:38 +01001320 case 'x':
Dave Hylandsb69f9fa2014-06-05 23:09:02 -07001321 pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, *str - ('X' - 'A'), flags | alt, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001322 break;
Damien Georgedeed0872014-04-06 11:11:15 +01001323
Dave Hylands6756a372014-04-02 11:42:39 -07001324 default:
Damien Georgeea13f402014-04-05 18:32:08 +01001325 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylands6756a372014-04-02 11:42:39 -07001326 "unsupported format character '%c' (0x%x) at index %d",
1327 *str, *str, str - start_str));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001328 }
1329 }
1330
1331 if (arg_i != n_args) {
Damien Georgeea13f402014-04-05 18:32:08 +01001332 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not all arguments converted during string formatting"));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001333 }
1334
Damien George2617eeb2014-05-25 22:27:57 +01001335 mp_obj_t s = mp_obj_new_str(vstr->buf, vstr->len, false);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001336 vstr_free(vstr);
1337 return s;
1338}
1339
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001340STATIC mp_obj_t str_replace(uint n_args, const mp_obj_t *args) {
xbe480c15a2014-01-30 22:17:30 -08001341 assert(MP_OBJ_IS_STR(args[0]));
xbe480c15a2014-01-30 22:17:30 -08001342
Damien George40f3c022014-07-03 13:25:24 +01001343 mp_int_t max_rep = -1;
xbe480c15a2014-01-30 22:17:30 -08001344 if (n_args == 4) {
Damien Georgeff715422014-04-07 00:39:13 +01001345 max_rep = mp_obj_get_int(args[3]);
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001346 if (max_rep == 0) {
1347 return args[0];
1348 } else if (max_rep < 0) {
Damien Georgeff715422014-04-07 00:39:13 +01001349 max_rep = -1;
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001350 }
xbe480c15a2014-01-30 22:17:30 -08001351 }
Damien George94f68302014-01-31 23:45:12 +00001352
xbe729be9b2014-04-07 14:46:39 -07001353 // if max_rep is still -1 by this point we will need to do all possible replacements
xbe480c15a2014-01-30 22:17:30 -08001354
Damien Georgeff715422014-04-07 00:39:13 +01001355 // check argument types
1356
1357 if (!MP_OBJ_IS_STR(args[1])) {
1358 bad_implicit_conversion(args[1]);
1359 }
1360
1361 if (!MP_OBJ_IS_STR(args[2])) {
1362 bad_implicit_conversion(args[2]);
1363 }
1364
1365 // extract string data
1366
xbe480c15a2014-01-30 22:17:30 -08001367 GET_STR_DATA_LEN(args[0], str, str_len);
1368 GET_STR_DATA_LEN(args[1], old, old_len);
1369 GET_STR_DATA_LEN(args[2], new, new_len);
Damien George94f68302014-01-31 23:45:12 +00001370
1371 // old won't exist in str if it's longer, so nothing to replace
xbe480c15a2014-01-30 22:17:30 -08001372 if (old_len > str_len) {
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001373 return args[0];
xbe480c15a2014-01-30 22:17:30 -08001374 }
1375
Damien George94f68302014-01-31 23:45:12 +00001376 // data for the replaced string
1377 byte *data = NULL;
1378 mp_obj_t replaced_str = MP_OBJ_NULL;
xbe480c15a2014-01-30 22:17:30 -08001379
Damien George94f68302014-01-31 23:45:12 +00001380 // do 2 passes over the string:
1381 // first pass computes the required length of the replaced string
1382 // second pass does the replacements
1383 for (;;) {
Damien George40f3c022014-07-03 13:25:24 +01001384 mp_uint_t replaced_str_index = 0;
1385 mp_uint_t num_replacements_done = 0;
Damien George94f68302014-01-31 23:45:12 +00001386 const byte *old_occurrence;
1387 const byte *offset_ptr = str;
Damien George40f3c022014-07-03 13:25:24 +01001388 mp_uint_t str_len_remain = str_len;
Damien Georgeff715422014-04-07 00:39:13 +01001389 if (old_len == 0) {
1390 // if old_str is empty, copy new_str to start of replaced string
1391 // copy the replacement string
1392 if (data != NULL) {
1393 memcpy(data, new, new_len);
1394 }
1395 replaced_str_index += new_len;
1396 num_replacements_done++;
1397 }
1398 while (num_replacements_done != max_rep && str_len_remain > 0 && (old_occurrence = find_subbytes(offset_ptr, str_len_remain, old, old_len, 1)) != NULL) {
1399 if (old_len == 0) {
1400 old_occurrence += 1;
1401 }
Damien George94f68302014-01-31 23:45:12 +00001402 // copy from just after end of last occurrence of to-be-replaced string to right before start of next occurrence
1403 if (data != NULL) {
1404 memcpy(data + replaced_str_index, offset_ptr, old_occurrence - offset_ptr);
1405 }
1406 replaced_str_index += old_occurrence - offset_ptr;
1407 // copy the replacement string
1408 if (data != NULL) {
1409 memcpy(data + replaced_str_index, new, new_len);
1410 }
1411 replaced_str_index += new_len;
1412 offset_ptr = old_occurrence + old_len;
Damien Georgeff715422014-04-07 00:39:13 +01001413 str_len_remain = str + str_len - offset_ptr;
Damien George94f68302014-01-31 23:45:12 +00001414 num_replacements_done++;
Damien George94f68302014-01-31 23:45:12 +00001415 }
1416
1417 // copy from just after end of last occurrence of to-be-replaced string to end of old string
1418 if (data != NULL) {
Damien Georgeff715422014-04-07 00:39:13 +01001419 memcpy(data + replaced_str_index, offset_ptr, str_len_remain);
Damien George94f68302014-01-31 23:45:12 +00001420 }
Damien Georgeff715422014-04-07 00:39:13 +01001421 replaced_str_index += str_len_remain;
Damien George94f68302014-01-31 23:45:12 +00001422
1423 if (data == NULL) {
1424 // first pass
1425 if (num_replacements_done == 0) {
1426 // no substr found, return original string
1427 return args[0];
1428 } else {
1429 // substr found, allocate new string
1430 replaced_str = mp_obj_str_builder_start(mp_obj_get_type(args[0]), replaced_str_index, &data);
Damien Georgeff715422014-04-07 00:39:13 +01001431 assert(data != NULL);
Damien George94f68302014-01-31 23:45:12 +00001432 }
1433 } else {
1434 // second pass, we are done
1435 break;
1436 }
xbe480c15a2014-01-30 22:17:30 -08001437 }
Damien George94f68302014-01-31 23:45:12 +00001438
xbe480c15a2014-01-30 22:17:30 -08001439 return mp_obj_str_builder_end(replaced_str);
1440}
1441
xbe9e1e8cd2014-03-12 22:57:16 -07001442STATIC mp_obj_t str_count(uint n_args, const mp_obj_t *args) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001443 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
xbe9e1e8cd2014-03-12 22:57:16 -07001444 assert(2 <= n_args && n_args <= 4);
1445 assert(MP_OBJ_IS_STR(args[0]));
1446 assert(MP_OBJ_IS_STR(args[1]));
1447
1448 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
1449 GET_STR_DATA_LEN(args[1], needle, needle_len);
1450
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001451 const byte *start = haystack;
1452 const byte *end = haystack + haystack_len;
xbe9e1e8cd2014-03-12 22:57:16 -07001453 if (n_args >= 3 && args[2] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001454 start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001455 }
1456 if (n_args >= 4 && args[3] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001457 end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001458 }
1459
Damien George536dde22014-03-13 22:07:55 +00001460 // if needle_len is zero then we count each gap between characters as an occurrence
1461 if (needle_len == 0) {
Paul Sokolovsky9e215fa2014-06-28 23:14:30 +03001462 return MP_OBJ_NEW_SMALL_INT(unichar_charlen((const char*)start, end - start) + 1);
xbe9e1e8cd2014-03-12 22:57:16 -07001463 }
1464
Damien George536dde22014-03-13 22:07:55 +00001465 // count the occurrences
Damien George40f3c022014-07-03 13:25:24 +01001466 mp_int_t num_occurrences = 0;
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001467 for (const byte *haystack_ptr = start; haystack_ptr + needle_len <= end;) {
1468 if (memcmp(haystack_ptr, needle, needle_len) == 0) {
xbec5d70ba2014-03-13 00:29:15 -07001469 num_occurrences++;
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001470 haystack_ptr += needle_len;
1471 } else {
1472 haystack_ptr = utf8_next_char(haystack_ptr);
xbec5d70ba2014-03-13 00:29:15 -07001473 }
xbe9e1e8cd2014-03-12 22:57:16 -07001474 }
1475
1476 return MP_OBJ_NEW_SMALL_INT(num_occurrences);
1477}
1478
Damien George40f3c022014-07-03 13:25:24 +01001479STATIC 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 +03001480 if (!is_str_or_bytes(self_in)) {
1481 assert(0);
1482 }
1483 mp_obj_type_t *self_type = mp_obj_get_type(self_in);
1484 if (self_type != mp_obj_get_type(arg)) {
1485 arg_type_mixup();
xbe613a8e32014-03-18 00:06:29 -07001486 }
Damien Georgeb035db32014-03-21 20:39:40 +00001487
xbe613a8e32014-03-18 00:06:29 -07001488 GET_STR_DATA_LEN(self_in, str, str_len);
1489 GET_STR_DATA_LEN(arg, sep, sep_len);
1490
1491 if (sep_len == 0) {
Damien Georgeea13f402014-04-05 18:32:08 +01001492 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
xbe613a8e32014-03-18 00:06:29 -07001493 }
Damien Georgeb035db32014-03-21 20:39:40 +00001494
1495 mp_obj_t result[] = {MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_)};
1496
1497 if (direction > 0) {
1498 result[0] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001499 } else {
Damien Georgeb035db32014-03-21 20:39:40 +00001500 result[2] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001501 }
xbe613a8e32014-03-18 00:06:29 -07001502
xbe17a5a832014-03-23 23:31:58 -07001503 const byte *position_ptr = find_subbytes(str, str_len, sep, sep_len, direction);
1504 if (position_ptr != NULL) {
Damien George40f3c022014-07-03 13:25:24 +01001505 mp_uint_t position = position_ptr - str;
Damien Georgef600a6a2014-05-25 22:34:34 +01001506 result[0] = mp_obj_new_str_of_type(self_type, str, position);
xbe17a5a832014-03-23 23:31:58 -07001507 result[1] = arg;
Damien Georgef600a6a2014-05-25 22:34:34 +01001508 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 -07001509 }
Damien Georgeb035db32014-03-21 20:39:40 +00001510
xbe0a6894c2014-03-21 01:12:26 -07001511 return mp_obj_new_tuple(3, result);
xbe613a8e32014-03-18 00:06:29 -07001512}
1513
Damien Georgeb035db32014-03-21 20:39:40 +00001514STATIC mp_obj_t str_partition(mp_obj_t self_in, mp_obj_t arg) {
1515 return str_partitioner(self_in, arg, 1);
xbe0a6894c2014-03-21 01:12:26 -07001516}
xbe4504ea82014-03-19 00:46:14 -07001517
Damien Georgeb035db32014-03-21 20:39:40 +00001518STATIC mp_obj_t str_rpartition(mp_obj_t self_in, mp_obj_t arg) {
1519 return str_partitioner(self_in, arg, -1);
xbe4504ea82014-03-19 00:46:14 -07001520}
1521
Paul Sokolovsky69135212014-05-10 19:47:41 +03001522// Supposedly not too critical operations, so optimize for code size
Damien Georgefcc9cf62014-06-01 18:22:09 +01001523STATIC mp_obj_t str_caseconv(unichar (*op)(unichar), mp_obj_t self_in) {
Paul Sokolovsky69135212014-05-10 19:47:41 +03001524 GET_STR_DATA_LEN(self_in, self_data, self_len);
1525 byte *data;
1526 mp_obj_t s = mp_obj_str_builder_start(mp_obj_get_type(self_in), self_len, &data);
1527 for (int i = 0; i < self_len; i++) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001528 *data++ = op(*self_data++);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001529 }
1530 *data = 0;
1531 return mp_obj_str_builder_end(s);
1532}
1533
1534STATIC mp_obj_t str_lower(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001535 return str_caseconv(unichar_tolower, self_in);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001536}
1537
1538STATIC mp_obj_t str_upper(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001539 return str_caseconv(unichar_toupper, self_in);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001540}
1541
Damien Georgefcc9cf62014-06-01 18:22:09 +01001542STATIC mp_obj_t str_uni_istype(bool (*f)(unichar), mp_obj_t self_in) {
Kim Bautersa3f4b832014-05-31 07:30:03 +01001543 GET_STR_DATA_LEN(self_in, self_data, self_len);
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001544
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001545 if (self_len == 0) {
1546 return mp_const_false; // default to False for empty str
1547 }
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001548
Damien Georgefcc9cf62014-06-01 18:22:09 +01001549 if (f != unichar_isupper && f != unichar_islower) {
Kim Bautersa3f4b832014-05-31 07:30:03 +01001550 for (int i = 0; i < self_len; i++) {
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001551 if (!f(*self_data++)) {
1552 return mp_const_false;
1553 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001554 }
1555 } else {
Kim Bautersa3f4b832014-05-31 07:30:03 +01001556 bool contains_alpha = false;
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001557
Kim Bautersa3f4b832014-05-31 07:30:03 +01001558 for (int i = 0; i < self_len; i++) { // only check alphanumeric characters
1559 if (unichar_isalpha(*self_data++)) {
1560 contains_alpha = true;
Damien Georgefcc9cf62014-06-01 18:22:09 +01001561 if (!f(*(self_data - 1))) { // -1 because we already incremented above
1562 return mp_const_false;
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001563 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001564 }
1565 }
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001566
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001567 if (!contains_alpha) {
1568 return mp_const_false;
1569 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001570 }
1571
1572 return mp_const_true;
1573}
1574
1575STATIC mp_obj_t str_isspace(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001576 return str_uni_istype(unichar_isspace, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001577}
1578
1579STATIC mp_obj_t str_isalpha(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001580 return str_uni_istype(unichar_isalpha, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001581}
1582
1583STATIC mp_obj_t str_isdigit(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001584 return str_uni_istype(unichar_isdigit, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001585}
1586
1587STATIC mp_obj_t str_isupper(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001588 return str_uni_istype(unichar_isupper, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001589}
1590
1591STATIC mp_obj_t str_islower(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001592 return str_uni_istype(unichar_islower, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001593}
1594
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001595#if MICROPY_CPYTHON_COMPAT
1596// These methods are superfluous in the presense of str() and bytes()
1597// constructors.
1598// TODO: should accept kwargs too
1599STATIC mp_obj_t bytes_decode(uint n_args, const mp_obj_t *args) {
1600 mp_obj_t new_args[2];
1601 if (n_args == 1) {
1602 new_args[0] = args[0];
1603 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1604 args = new_args;
1605 n_args++;
1606 }
1607 return str_make_new(NULL, n_args, 0, args);
1608}
1609
1610// TODO: should accept kwargs too
1611STATIC mp_obj_t str_encode(uint n_args, const mp_obj_t *args) {
1612 mp_obj_t new_args[2];
1613 if (n_args == 1) {
1614 new_args[0] = args[0];
1615 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1616 args = new_args;
1617 n_args++;
1618 }
1619 return bytes_make_new(NULL, n_args, 0, args);
1620}
1621#endif
1622
Damien George40f3c022014-07-03 13:25:24 +01001623mp_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 +01001624 if (flags == MP_BUFFER_READ) {
Damien George2da98302014-03-09 19:58:18 +00001625 GET_STR_DATA_LEN(self_in, str_data, str_len);
1626 bufinfo->buf = (void*)str_data;
1627 bufinfo->len = str_len;
Damien George57a4b4f2014-04-18 22:29:21 +01001628 bufinfo->typecode = 'b';
Damien George2da98302014-03-09 19:58:18 +00001629 return 0;
1630 } else {
1631 // can't write to a string
1632 bufinfo->buf = NULL;
1633 bufinfo->len = 0;
Damien George57a4b4f2014-04-18 22:29:21 +01001634 bufinfo->typecode = -1;
Damien George2da98302014-03-09 19:58:18 +00001635 return 1;
1636 }
1637}
1638
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001639#if MICROPY_CPYTHON_COMPAT
Paul Sokolovsky97319122014-06-13 22:01:26 +03001640MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_decode_obj, 1, 3, bytes_decode);
1641MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_encode_obj, 1, 3, str_encode);
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001642#endif
Paul Sokolovsky97319122014-06-13 22:01:26 +03001643MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj, 2, 4, str_find);
1644MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rfind_obj, 2, 4, str_rfind);
1645MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_index_obj, 2, 4, str_index);
1646MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rindex_obj, 2, 4, str_rindex);
1647MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join);
1648MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, str_split);
1649MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rsplit_obj, 1, 3, str_rsplit);
1650MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_startswith_obj, 2, 3, str_startswith);
1651MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_endswith_obj, 2, 3, str_endswith);
1652MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip);
1653MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_lstrip_obj, 1, 2, str_lstrip);
1654MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rstrip_obj, 1, 2, str_rstrip);
1655MP_DEFINE_CONST_FUN_OBJ_VAR(str_format_obj, 1, mp_obj_str_format);
1656MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj, 3, 4, str_replace);
1657MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count);
1658MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition);
1659MP_DEFINE_CONST_FUN_OBJ_2(str_rpartition_obj, str_rpartition);
1660MP_DEFINE_CONST_FUN_OBJ_1(str_lower_obj, str_lower);
1661MP_DEFINE_CONST_FUN_OBJ_1(str_upper_obj, str_upper);
1662MP_DEFINE_CONST_FUN_OBJ_1(str_isspace_obj, str_isspace);
1663MP_DEFINE_CONST_FUN_OBJ_1(str_isalpha_obj, str_isalpha);
1664MP_DEFINE_CONST_FUN_OBJ_1(str_isdigit_obj, str_isdigit);
1665MP_DEFINE_CONST_FUN_OBJ_1(str_isupper_obj, str_isupper);
1666MP_DEFINE_CONST_FUN_OBJ_1(str_islower_obj, str_islower);
Damiend99b0522013-12-21 18:17:45 +00001667
Damien George9b196cd2014-03-26 21:47:19 +00001668STATIC const mp_map_elem_t str_locals_dict_table[] = {
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001669#if MICROPY_CPYTHON_COMPAT
1670 { MP_OBJ_NEW_QSTR(MP_QSTR_decode), (mp_obj_t)&bytes_decode_obj },
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001671 #if !MICROPY_PY_BUILTINS_STR_UNICODE
1672 // If we have separate unicode type, then here we have methods only
1673 // for bytes type, and it should not have encode() methods. Otherwise,
1674 // we have non-compliant-but-practical bytestring type, which shares
1675 // method table with bytes, so they both have encode() and decode()
1676 // methods (which should do type checking at runtime).
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001677 { MP_OBJ_NEW_QSTR(MP_QSTR_encode), (mp_obj_t)&str_encode_obj },
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001678 #endif
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001679#endif
Damien George9b196cd2014-03-26 21:47:19 +00001680 { MP_OBJ_NEW_QSTR(MP_QSTR_find), (mp_obj_t)&str_find_obj },
1681 { MP_OBJ_NEW_QSTR(MP_QSTR_rfind), (mp_obj_t)&str_rfind_obj },
xbe3d9a39e2014-04-08 11:42:19 -07001682 { MP_OBJ_NEW_QSTR(MP_QSTR_index), (mp_obj_t)&str_index_obj },
1683 { MP_OBJ_NEW_QSTR(MP_QSTR_rindex), (mp_obj_t)&str_rindex_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001684 { MP_OBJ_NEW_QSTR(MP_QSTR_join), (mp_obj_t)&str_join_obj },
1685 { MP_OBJ_NEW_QSTR(MP_QSTR_split), (mp_obj_t)&str_split_obj },
Paul Sokolovsky2a273652014-05-13 08:07:08 +03001686 { MP_OBJ_NEW_QSTR(MP_QSTR_rsplit), (mp_obj_t)&str_rsplit_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001687 { MP_OBJ_NEW_QSTR(MP_QSTR_startswith), (mp_obj_t)&str_startswith_obj },
Paul Sokolovskyd098c6b2014-05-24 22:46:51 +03001688 { MP_OBJ_NEW_QSTR(MP_QSTR_endswith), (mp_obj_t)&str_endswith_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001689 { MP_OBJ_NEW_QSTR(MP_QSTR_strip), (mp_obj_t)&str_strip_obj },
Paul Sokolovsky88107842014-04-26 06:20:08 +03001690 { MP_OBJ_NEW_QSTR(MP_QSTR_lstrip), (mp_obj_t)&str_lstrip_obj },
1691 { MP_OBJ_NEW_QSTR(MP_QSTR_rstrip), (mp_obj_t)&str_rstrip_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001692 { MP_OBJ_NEW_QSTR(MP_QSTR_format), (mp_obj_t)&str_format_obj },
1693 { MP_OBJ_NEW_QSTR(MP_QSTR_replace), (mp_obj_t)&str_replace_obj },
1694 { MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&str_count_obj },
1695 { MP_OBJ_NEW_QSTR(MP_QSTR_partition), (mp_obj_t)&str_partition_obj },
1696 { MP_OBJ_NEW_QSTR(MP_QSTR_rpartition), (mp_obj_t)&str_rpartition_obj },
Paul Sokolovsky69135212014-05-10 19:47:41 +03001697 { MP_OBJ_NEW_QSTR(MP_QSTR_lower), (mp_obj_t)&str_lower_obj },
1698 { MP_OBJ_NEW_QSTR(MP_QSTR_upper), (mp_obj_t)&str_upper_obj },
Kim Bautersa3f4b832014-05-31 07:30:03 +01001699 { MP_OBJ_NEW_QSTR(MP_QSTR_isspace), (mp_obj_t)&str_isspace_obj },
1700 { MP_OBJ_NEW_QSTR(MP_QSTR_isalpha), (mp_obj_t)&str_isalpha_obj },
1701 { MP_OBJ_NEW_QSTR(MP_QSTR_isdigit), (mp_obj_t)&str_isdigit_obj },
1702 { MP_OBJ_NEW_QSTR(MP_QSTR_isupper), (mp_obj_t)&str_isupper_obj },
1703 { MP_OBJ_NEW_QSTR(MP_QSTR_islower), (mp_obj_t)&str_islower_obj },
ian-v7a16fad2014-01-06 09:52:29 -08001704};
Damien George97209d32014-01-07 15:58:30 +00001705
Damien George9b196cd2014-03-26 21:47:19 +00001706STATIC MP_DEFINE_CONST_DICT(str_locals_dict, str_locals_dict_table);
1707
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001708#if !MICROPY_PY_BUILTINS_STR_UNICODE
Damien George3e1a5c12014-03-29 13:43:38 +00001709const mp_obj_type_t mp_type_str = {
Damien Georgec5966122014-02-15 16:10:44 +00001710 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001711 .name = MP_QSTR_str,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001712 .print = str_print,
Paul Sokolovskybe020c22014-03-21 11:39:01 +02001713 .make_new = str_make_new,
Damien Georgee04a44e2014-06-28 10:27:23 +01001714 .binary_op = mp_obj_str_binary_op,
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +03001715 .subscr = bytes_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001716 .getiter = mp_obj_new_str_iterator,
Damien Georgee04a44e2014-06-28 10:27:23 +01001717 .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
Damien George9b196cd2014-03-26 21:47:19 +00001718 .locals_dict = (mp_obj_t)&str_locals_dict,
Damiend99b0522013-12-21 18:17:45 +00001719};
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001720#endif
Damiend99b0522013-12-21 18:17:45 +00001721
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001722// Reuses most of methods from str
Damien George3e1a5c12014-03-29 13:43:38 +00001723const mp_obj_type_t mp_type_bytes = {
Damien Georgec5966122014-02-15 16:10:44 +00001724 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001725 .name = MP_QSTR_bytes,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001726 .print = str_print,
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001727 .make_new = bytes_make_new,
Damien Georgee04a44e2014-06-28 10:27:23 +01001728 .binary_op = mp_obj_str_binary_op,
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +03001729 .subscr = bytes_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001730 .getiter = mp_obj_new_bytes_iterator,
Damien Georgee04a44e2014-06-28 10:27:23 +01001731 .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
Damien George9b196cd2014-03-26 21:47:19 +00001732 .locals_dict = (mp_obj_t)&str_locals_dict,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001733};
1734
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001735// the zero-length bytes
Damien George3e1a5c12014-03-29 13:43:38 +00001736STATIC const mp_obj_str_t empty_bytes_obj = {{&mp_type_bytes}, 0, 0, NULL};
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001737const mp_obj_t mp_const_empty_bytes = (mp_obj_t)&empty_bytes_obj;
1738
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001739mp_obj_t mp_obj_str_builder_start(const mp_obj_type_t *type, uint len, byte **data) {
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001740 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001741 o->base.type = type;
Damien George5fa93b62014-01-22 14:35:10 +00001742 o->len = len;
Paul Sokolovsky504e2332014-04-19 03:09:17 +03001743 o->hash = 0;
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001744 byte *p = m_new(byte, len + 1);
1745 o->data = p;
1746 *data = p;
Damiend99b0522013-12-21 18:17:45 +00001747 return o;
1748}
1749
Damien George5fa93b62014-01-22 14:35:10 +00001750mp_obj_t mp_obj_str_builder_end(mp_obj_t o_in) {
Damien George5fa93b62014-01-22 14:35:10 +00001751 mp_obj_str_t *o = o_in;
1752 o->hash = qstr_compute_hash(o->data, o->len);
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001753 byte *p = (byte*)o->data;
1754 p[o->len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
Damien George5fa93b62014-01-22 14:35:10 +00001755 return o;
1756}
1757
Damien George5f27a7e2014-07-31 10:29:56 +01001758mp_obj_t mp_obj_str_builder_end_with_len(mp_obj_t o_in, mp_uint_t len) {
1759 mp_obj_str_t *o = o_in;
1760 o->data = m_renew(byte, (byte*)o->data, o->len + 1, len + 1);
1761 o->len = len;
1762 o->hash = qstr_compute_hash(o->data, o->len);
1763 byte *p = (byte*)o->data;
1764 p[o->len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
1765 return o;
1766}
1767
Damien Georgef600a6a2014-05-25 22:34:34 +01001768mp_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 +02001769 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001770 o->base.type = type;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001771 o->len = len;
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001772 if (data) {
1773 o->hash = qstr_compute_hash(data, len);
1774 byte *p = m_new(byte, len + 1);
1775 o->data = p;
1776 memcpy(p, data, len * sizeof(byte));
1777 p[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
1778 }
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001779 return o;
1780}
1781
Damien George2617eeb2014-05-25 22:27:57 +01001782mp_obj_t mp_obj_new_str(const char* data, uint len, bool make_qstr_if_not_already) {
Damien Georgef600a6a2014-05-25 22:34:34 +01001783 if (make_qstr_if_not_already) {
1784 // use existing, or make a new qstr
Damien George2617eeb2014-05-25 22:27:57 +01001785 return MP_OBJ_NEW_QSTR(qstr_from_strn(data, len));
Damien George5fa93b62014-01-22 14:35:10 +00001786 } else {
Damien Georgef600a6a2014-05-25 22:34:34 +01001787 qstr q = qstr_find_strn(data, len);
1788 if (q != MP_QSTR_NULL) {
1789 // qstr with this data already exists
1790 return MP_OBJ_NEW_QSTR(q);
1791 } else {
1792 // no existing qstr, don't make one
1793 return mp_obj_new_str_of_type(&mp_type_str, (const byte*)data, len);
1794 }
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02001795 }
Damien George5fa93b62014-01-22 14:35:10 +00001796}
1797
Paul Sokolovskyb4efac12014-06-08 01:13:35 +03001798mp_obj_t mp_obj_str_intern(mp_obj_t str) {
1799 GET_STR_DATA_LEN(str, data, len);
1800 return MP_OBJ_NEW_QSTR(qstr_from_strn((const char*)data, len));
1801}
1802
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001803mp_obj_t mp_obj_new_bytes(const byte* data, uint len) {
Damien Georgef600a6a2014-05-25 22:34:34 +01001804 return mp_obj_new_str_of_type(&mp_type_bytes, data, len);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001805}
1806
Damien George5fa93b62014-01-22 14:35:10 +00001807bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) {
1808 if (MP_OBJ_IS_QSTR(s1) && MP_OBJ_IS_QSTR(s2)) {
1809 return s1 == s2;
1810 } else {
1811 GET_STR_HASH(s1, h1);
1812 GET_STR_HASH(s2, h2);
Paul Sokolovsky59e269c2014-04-14 01:43:01 +03001813 // If any of hashes is 0, it means it's not valid
1814 if (h1 != 0 && h2 != 0 && h1 != h2) {
Damien George5fa93b62014-01-22 14:35:10 +00001815 return false;
1816 }
1817 GET_STR_DATA_LEN(s1, d1, l1);
1818 GET_STR_DATA_LEN(s2, d2, l2);
1819 if (l1 != l2) {
1820 return false;
1821 }
Damien George1e708fe2014-01-23 18:27:51 +00001822 return memcmp(d1, d2, l1) == 0;
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02001823 }
Damien George5fa93b62014-01-22 14:35:10 +00001824}
1825
Damien Georgedeed0872014-04-06 11:11:15 +01001826STATIC void bad_implicit_conversion(mp_obj_t self_in) {
Damien Georgeea13f402014-04-05 18:32:08 +01001827 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 +00001828}
1829
Paul Sokolovsky69f3eb22014-05-11 02:44:46 +03001830STATIC void arg_type_mixup() {
1831 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "Can't mix str and bytes arguments"));
1832}
1833
Damien George5fa93b62014-01-22 14:35:10 +00001834uint mp_obj_str_get_hash(mp_obj_t self_in) {
Paul Sokolovskyf130ca12014-04-13 05:41:00 +03001835 // TODO: This has too big overhead for hash accessor
1836 if (MP_OBJ_IS_STR(self_in) || MP_OBJ_IS_TYPE(self_in, &mp_type_bytes)) {
Damien George5fa93b62014-01-22 14:35:10 +00001837 GET_STR_HASH(self_in, h);
1838 return h;
1839 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001840 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001841 }
1842}
1843
1844uint mp_obj_str_get_len(mp_obj_t self_in) {
Damien Georgeee014112014-04-15 23:10:00 +01001845 // TODO This has a double check for the type, one in obj.c and one here
1846 if (MP_OBJ_IS_STR(self_in) || MP_OBJ_IS_TYPE(self_in, &mp_type_bytes)) {
Damien George5fa93b62014-01-22 14:35:10 +00001847 GET_STR_LEN(self_in, l);
1848 return l;
1849 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001850 bad_implicit_conversion(self_in);
1851 }
1852}
1853
1854// use this if you will anyway convert the string to a qstr
1855// will be more efficient for the case where it's already a qstr
1856qstr mp_obj_str_get_qstr(mp_obj_t self_in) {
1857 if (MP_OBJ_IS_QSTR(self_in)) {
1858 return MP_OBJ_QSTR_VALUE(self_in);
Damien George3e1a5c12014-03-29 13:43:38 +00001859 } else if (MP_OBJ_IS_TYPE(self_in, &mp_type_str)) {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001860 mp_obj_str_t *self = self_in;
1861 return qstr_from_strn((char*)self->data, self->len);
1862 } else {
1863 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001864 }
1865}
1866
1867// only use this function if you need the str data to be zero terminated
1868// at the moment all strings are zero terminated to help with C ASCIIZ compatibility
1869const char *mp_obj_str_get_str(mp_obj_t self_in) {
1870 if (MP_OBJ_IS_STR(self_in)) {
1871 GET_STR_DATA_LEN(self_in, s, l);
1872 (void)l; // len unused
1873 return (const char*)s;
1874 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001875 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001876 }
1877}
1878
Damien George698ec212014-02-08 18:17:23 +00001879const char *mp_obj_str_get_data(mp_obj_t self_in, uint *len) {
Paul Sokolovskyeea01182014-05-11 13:51:24 +03001880 if (is_str_or_bytes(self_in)) {
Damien George5fa93b62014-01-22 14:35:10 +00001881 GET_STR_DATA_LEN(self_in, s, l);
1882 *len = l;
Damien George698ec212014-02-08 18:17:23 +00001883 return (const char*)s;
Damien George5fa93b62014-01-22 14:35:10 +00001884 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001885 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001886 }
Damiend99b0522013-12-21 18:17:45 +00001887}
xyb8cfc9f02014-01-05 18:47:51 +08001888
1889/******************************************************************************/
1890/* str iterator */
1891
1892typedef struct _mp_obj_str_it_t {
1893 mp_obj_base_t base;
Damien George5fa93b62014-01-22 14:35:10 +00001894 mp_obj_t str;
Damien George40f3c022014-07-03 13:25:24 +01001895 mp_uint_t cur;
xyb8cfc9f02014-01-05 18:47:51 +08001896} mp_obj_str_it_t;
1897
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001898#if !MICROPY_PY_BUILTINS_STR_UNICODE
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001899STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
xyb8cfc9f02014-01-05 18:47:51 +08001900 mp_obj_str_it_t *self = self_in;
Damien George5fa93b62014-01-22 14:35:10 +00001901 GET_STR_DATA_LEN(self->str, str, len);
1902 if (self->cur < len) {
Damien George2617eeb2014-05-25 22:27:57 +01001903 mp_obj_t o_out = mp_obj_new_str((const char*)str + self->cur, 1, true);
xyb8cfc9f02014-01-05 18:47:51 +08001904 self->cur += 1;
1905 return o_out;
1906 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01001907 return MP_OBJ_STOP_ITERATION;
xyb8cfc9f02014-01-05 18:47:51 +08001908 }
1909}
1910
Damien George3e1a5c12014-03-29 13:43:38 +00001911STATIC const mp_obj_type_t mp_type_str_it = {
Damien Georgec5966122014-02-15 16:10:44 +00001912 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001913 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +03001914 .getiter = mp_identity,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001915 .iternext = str_it_iternext,
xyb8cfc9f02014-01-05 18:47:51 +08001916};
1917
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001918mp_obj_t mp_obj_new_str_iterator(mp_obj_t str) {
1919 mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
1920 o->base.type = &mp_type_str_it;
1921 o->str = str;
1922 o->cur = 0;
1923 return o;
1924}
1925#endif
1926
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02001927STATIC mp_obj_t bytes_it_iternext(mp_obj_t self_in) {
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001928 mp_obj_str_it_t *self = self_in;
1929 GET_STR_DATA_LEN(self->str, str, len);
1930 if (self->cur < len) {
Damien Georgebb4c6f32014-07-31 10:49:14 +01001931 mp_obj_t o_out = MP_OBJ_NEW_SMALL_INT(str[self->cur]);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001932 self->cur += 1;
1933 return o_out;
1934 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01001935 return MP_OBJ_STOP_ITERATION;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001936 }
1937}
1938
Damien George3e1a5c12014-03-29 13:43:38 +00001939STATIC const mp_obj_type_t mp_type_bytes_it = {
Damien Georgec5966122014-02-15 16:10:44 +00001940 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001941 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +03001942 .getiter = mp_identity,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001943 .iternext = bytes_it_iternext,
1944};
1945
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001946mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str) {
1947 mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
Damien George3e1a5c12014-03-29 13:43:38 +00001948 o->base.type = &mp_type_bytes_it;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001949 o->str = str;
1950 o->cur = 0;
xyb8cfc9f02014-01-05 18:47:51 +08001951 return o;
1952}