blob: ded449813025a736af17ef5e2ef594e74f015a42 [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
Damiend99b0522013-12-21 18:17:45 +000028#include <string.h>
29#include <assert.h>
30
Damien George51dfcb42015-01-01 20:27:54 +000031#include "py/nlr.h"
32#include "py/unicode.h"
33#include "py/objstr.h"
34#include "py/objlist.h"
35#include "py/runtime0.h"
36#include "py/runtime.h"
pohmeliee3a29de2016-01-29 12:09:10 +030037#include "py/stackctrl.h"
Damiend99b0522013-12-21 18:17:45 +000038
Damien Georgeecc88e92014-08-30 00:35:11 +010039STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, mp_uint_t n_args, const mp_obj_t *args, mp_obj_t dict);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +020040
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020041STATIC mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str);
Paul Sokolovskye9085912014-04-30 05:35:18 +030042STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in);
Paul Sokolovsky69f3eb22014-05-11 02:44:46 +030043
xyb8cfc9f02014-01-05 18:47:51 +080044/******************************************************************************/
45/* str */
46
Damien George7f9d1d62015-04-09 23:56:15 +010047void mp_str_print_quoted(const mp_print_t *print, const byte *str_data, mp_uint_t str_len, bool is_bytes) {
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020048 // this escapes characters, but it will be very slow to print (calling print many times)
49 bool has_single_quote = false;
50 bool has_double_quote = false;
Chris Angelico48674132014-06-04 03:26:40 +100051 for (const byte *s = str_data, *top = str_data + str_len; !has_double_quote && s < top; s++) {
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020052 if (*s == '\'') {
53 has_single_quote = true;
54 } else if (*s == '"') {
55 has_double_quote = true;
56 }
57 }
58 int quote_char = '\'';
59 if (has_single_quote && !has_double_quote) {
60 quote_char = '"';
61 }
Damien George7f9d1d62015-04-09 23:56:15 +010062 mp_printf(print, "%c", quote_char);
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020063 for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) {
64 if (*s == quote_char) {
Damien George7f9d1d62015-04-09 23:56:15 +010065 mp_printf(print, "\\%c", quote_char);
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020066 } else if (*s == '\\') {
Damien George7f9d1d62015-04-09 23:56:15 +010067 mp_print_str(print, "\\\\");
Paul Sokolovsky2ec38a12014-06-13 21:23:00 +030068 } else if (*s >= 0x20 && *s != 0x7f && (!is_bytes || *s < 0x80)) {
69 // In strings, anything which is not ascii control character
70 // is printed as is, this includes characters in range 0x80-0xff
71 // (which can be non-Latin letters, etc.)
Damien George7f9d1d62015-04-09 23:56:15 +010072 mp_printf(print, "%c", *s);
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020073 } else if (*s == '\n') {
Damien George7f9d1d62015-04-09 23:56:15 +010074 mp_print_str(print, "\\n");
Andrew Scheller12968fb2014-04-08 02:42:50 +010075 } else if (*s == '\r') {
Damien George7f9d1d62015-04-09 23:56:15 +010076 mp_print_str(print, "\\r");
Andrew Scheller12968fb2014-04-08 02:42:50 +010077 } else if (*s == '\t') {
Damien George7f9d1d62015-04-09 23:56:15 +010078 mp_print_str(print, "\\t");
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020079 } else {
Damien George7f9d1d62015-04-09 23:56:15 +010080 mp_printf(print, "\\x%02x", *s);
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020081 }
82 }
Damien George7f9d1d62015-04-09 23:56:15 +010083 mp_printf(print, "%c", quote_char);
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020084}
85
Damien George612045f2014-09-17 22:56:34 +010086#if MICROPY_PY_UJSON
Damien George999cedb2015-11-27 17:01:44 +000087void mp_str_print_json(const mp_print_t *print, const byte *str_data, size_t str_len) {
Damien Georgecde0ca22014-09-25 17:35:56 +010088 // for JSON spec, see http://www.ietf.org/rfc/rfc4627.txt
89 // if we are given a valid utf8-encoded string, we will print it in a JSON-conforming way
Damien George7f9d1d62015-04-09 23:56:15 +010090 mp_print_str(print, "\"");
Damien George612045f2014-09-17 22:56:34 +010091 for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) {
Damien Georgecde0ca22014-09-25 17:35:56 +010092 if (*s == '"' || *s == '\\') {
Damien George7f9d1d62015-04-09 23:56:15 +010093 mp_printf(print, "\\%c", *s);
Damien Georgecde0ca22014-09-25 17:35:56 +010094 } else if (*s >= 32) {
95 // this will handle normal and utf-8 encoded chars
Damien George7f9d1d62015-04-09 23:56:15 +010096 mp_printf(print, "%c", *s);
Damien George612045f2014-09-17 22:56:34 +010097 } else if (*s == '\n') {
Damien George7f9d1d62015-04-09 23:56:15 +010098 mp_print_str(print, "\\n");
Damien George612045f2014-09-17 22:56:34 +010099 } else if (*s == '\r') {
Damien George7f9d1d62015-04-09 23:56:15 +0100100 mp_print_str(print, "\\r");
Damien George612045f2014-09-17 22:56:34 +0100101 } else if (*s == '\t') {
Damien George7f9d1d62015-04-09 23:56:15 +0100102 mp_print_str(print, "\\t");
Damien George612045f2014-09-17 22:56:34 +0100103 } else {
Damien Georgecde0ca22014-09-25 17:35:56 +0100104 // this will handle control chars
Damien George7f9d1d62015-04-09 23:56:15 +0100105 mp_printf(print, "\\u%04x", *s);
Damien George612045f2014-09-17 22:56:34 +0100106 }
107 }
Damien George7f9d1d62015-04-09 23:56:15 +0100108 mp_print_str(print, "\"");
Damien George612045f2014-09-17 22:56:34 +0100109}
110#endif
111
Damien George7f9d1d62015-04-09 23:56:15 +0100112STATIC void str_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
Damien George5fa93b62014-01-22 14:35:10 +0000113 GET_STR_DATA_LEN(self_in, str_data, str_len);
Damien George612045f2014-09-17 22:56:34 +0100114 #if MICROPY_PY_UJSON
115 if (kind == PRINT_JSON) {
Damien George7f9d1d62015-04-09 23:56:15 +0100116 mp_str_print_json(print, str_data, str_len);
Damien George612045f2014-09-17 22:56:34 +0100117 return;
118 }
119 #endif
Damien Georgee2aa1172015-09-03 23:03:57 +0100120 #if !MICROPY_PY_BUILTINS_STR_UNICODE
Damien Georgecde0ca22014-09-25 17:35:56 +0100121 bool is_bytes = MP_OBJ_IS_TYPE(self_in, &mp_type_bytes);
Damien Georgee2aa1172015-09-03 23:03:57 +0100122 #else
123 bool is_bytes = true;
124 #endif
Paul Sokolovskyef63ab52015-12-20 16:44:36 +0200125 if (kind == PRINT_RAW || (!MICROPY_PY_BUILTINS_STR_UNICODE && kind == PRINT_STR && !is_bytes)) {
Damien George7f9d1d62015-04-09 23:56:15 +0100126 mp_printf(print, "%.*s", str_len, str_data);
Paul Sokolovsky76d982e2014-01-13 19:19:16 +0200127 } else {
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +0200128 if (is_bytes) {
Damien George7f9d1d62015-04-09 23:56:15 +0100129 mp_print_str(print, "b");
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +0200130 }
Damien George7f9d1d62015-04-09 23:56:15 +0100131 mp_str_print_quoted(print, str_data, str_len, is_bytes);
Paul Sokolovsky76d982e2014-01-13 19:19:16 +0200132 }
Damiend99b0522013-12-21 18:17:45 +0000133}
134
Damien George5b3f0b72016-01-03 15:55:55 +0000135mp_obj_t mp_obj_str_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
Paul Sokolovskyb473d0a2014-05-06 19:30:30 +0300136#if MICROPY_CPYTHON_COMPAT
137 if (n_kw != 0) {
138 mp_arg_error_unimpl_kw();
139 }
140#endif
141
Damien George1e9a92f2014-11-06 17:36:16 +0000142 mp_arg_check_num(n_args, n_kw, 0, 3, false);
143
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200144 switch (n_args) {
145 case 0:
146 return MP_OBJ_NEW_QSTR(MP_QSTR_);
147
Damien George1e9a92f2014-11-06 17:36:16 +0000148 case 1: {
Damien George0b9ee862015-01-21 19:14:25 +0000149 vstr_t vstr;
Damien George7f9d1d62015-04-09 23:56:15 +0100150 mp_print_t print;
151 vstr_init_print(&vstr, 16, &print);
152 mp_obj_print_helper(&print, args[0], PRINT_STR);
Damien George5b3f0b72016-01-03 15:55:55 +0000153 return mp_obj_new_str_from_vstr(type, &vstr);
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200154 }
155
Damien George1e9a92f2014-11-06 17:36:16 +0000156 default: // 2 or 3 args
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200157 // TODO: validate 2nd/3rd args
Paul Sokolovskye62a0fe2014-10-30 23:58:08 +0200158 if (MP_OBJ_IS_TYPE(args[0], &mp_type_bytes)) {
159 GET_STR_DATA_LEN(args[0], str_data, str_len);
160 GET_STR_HASH(args[0], str_hash);
Damien George5b3f0b72016-01-03 15:55:55 +0000161 mp_obj_str_t *o = MP_OBJ_TO_PTR(mp_obj_new_str_of_type(type, NULL, str_len));
Paul Sokolovskye62a0fe2014-10-30 23:58:08 +0200162 o->data = str_data;
163 o->hash = str_hash;
Damien George999cedb2015-11-27 17:01:44 +0000164 return MP_OBJ_FROM_PTR(o);
Paul Sokolovskye62a0fe2014-10-30 23:58:08 +0200165 } else {
166 mp_buffer_info_t bufinfo;
167 mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
168 return mp_obj_new_str(bufinfo.buf, bufinfo.len, false);
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200169 }
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200170 }
171}
172
Damien George5b3f0b72016-01-03 15:55:55 +0000173STATIC mp_obj_t bytes_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
Damien Georgeff8dd3f2015-01-20 12:47:20 +0000174 (void)type_in;
175
Damien George3a2171e2015-09-04 16:53:46 +0100176 #if MICROPY_CPYTHON_COMPAT
Paul Sokolovskyb473d0a2014-05-06 19:30:30 +0300177 if (n_kw != 0) {
178 mp_arg_error_unimpl_kw();
179 }
Damien George3a2171e2015-09-04 16:53:46 +0100180 #else
181 (void)n_kw;
182 #endif
Paul Sokolovskyb473d0a2014-05-06 19:30:30 +0300183
Damien George42cec5c2015-09-04 16:51:55 +0100184 if (n_args == 0) {
185 return mp_const_empty_bytes;
186 }
187
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200188 if (MP_OBJ_IS_STR(args[0])) {
189 if (n_args < 2 || n_args > 3) {
190 goto wrong_args;
191 }
192 GET_STR_DATA_LEN(args[0], str_data, str_len);
193 GET_STR_HASH(args[0], str_hash);
Damien George999cedb2015-11-27 17:01:44 +0000194 mp_obj_str_t *o = MP_OBJ_TO_PTR(mp_obj_new_str_of_type(&mp_type_bytes, NULL, str_len));
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200195 o->data = str_data;
196 o->hash = str_hash;
Damien George999cedb2015-11-27 17:01:44 +0000197 return MP_OBJ_FROM_PTR(o);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200198 }
199
200 if (n_args > 1) {
201 goto wrong_args;
202 }
203
204 if (MP_OBJ_IS_SMALL_INT(args[0])) {
205 uint len = MP_OBJ_SMALL_INT_VALUE(args[0]);
Damien George05005f62015-01-21 22:48:37 +0000206 vstr_t vstr;
207 vstr_init_len(&vstr, len);
208 memset(vstr.buf, 0, len);
209 return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200210 }
211
Damien George32ef3a32014-12-04 15:46:14 +0000212 // check if argument has the buffer protocol
213 mp_buffer_info_t bufinfo;
214 if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_READ)) {
215 return mp_obj_new_str_of_type(&mp_type_bytes, bufinfo.buf, bufinfo.len);
216 }
217
Damien George0b9ee862015-01-21 19:14:25 +0000218 vstr_t vstr;
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200219 // Try to create array of exact len if initializer len is known
220 mp_obj_t len_in = mp_obj_len_maybe(args[0]);
221 if (len_in == MP_OBJ_NULL) {
Damien George0b9ee862015-01-21 19:14:25 +0000222 vstr_init(&vstr, 16);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200223 } else {
Damien George0b9ee862015-01-21 19:14:25 +0000224 mp_int_t len = MP_OBJ_SMALL_INT_VALUE(len_in);
Damien George0d3cb672015-01-28 23:43:01 +0000225 vstr_init(&vstr, len);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200226 }
227
Damien Georged17926d2014-03-30 13:35:08 +0100228 mp_obj_t iterable = mp_getiter(args[0]);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200229 mp_obj_t item;
Damien Georgeea8d06c2014-04-17 23:19:36 +0100230 while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
Damien Georgeede0f3a2015-04-23 15:28:18 +0100231 mp_int_t val = mp_obj_get_int(item);
232 #if MICROPY_CPYTHON_COMPAT
233 if (val < 0 || val > 255) {
234 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "bytes value out of range"));
235 }
236 #endif
237 vstr_add_byte(&vstr, val);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200238 }
239
Damien George0b9ee862015-01-21 19:14:25 +0000240 return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200241
242wrong_args:
Damien George1e9a92f2014-11-06 17:36:16 +0000243 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "wrong number of arguments"));
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200244}
245
Damien George55baff42014-01-21 21:40:13 +0000246// like strstr but with specified length and allows \0 bytes
247// TODO replace with something more efficient/standard
Paul Sokolovskyc38809e2016-02-14 18:55:16 +0200248const 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 +0000249 if (hlen >= nlen) {
Damien George40f3c022014-07-03 13:25:24 +0100250 mp_uint_t str_index, str_index_end;
xbe17a5a832014-03-23 23:31:58 -0700251 if (direction > 0) {
252 str_index = 0;
253 str_index_end = hlen - nlen;
254 } else {
255 str_index = hlen - nlen;
256 str_index_end = 0;
257 }
258 for (;;) {
259 if (memcmp(&haystack[str_index], needle, nlen) == 0) {
260 //found
261 return haystack + str_index;
Damien George55baff42014-01-21 21:40:13 +0000262 }
xbe17a5a832014-03-23 23:31:58 -0700263 if (str_index == str_index_end) {
264 //not found
265 break;
Damien George55baff42014-01-21 21:40:13 +0000266 }
xbe17a5a832014-03-23 23:31:58 -0700267 str_index += direction;
Damien George55baff42014-01-21 21:40:13 +0000268 }
269 }
270 return NULL;
271}
272
Damien Georgea75b02e2014-08-27 09:20:30 +0100273// Note: this function is used to check if an object is a str or bytes, which
274// works because both those types use it as their binary_op method. Revisit
275// MP_OBJ_IS_STR_OR_BYTES if this fact changes.
Damien Georgeecc88e92014-08-30 00:35:11 +0100276mp_obj_t mp_obj_str_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
Damien Georgea65c03c2014-11-05 16:30:34 +0000277 // check for modulo
278 if (op == MP_BINARY_OP_MODULO) {
279 mp_obj_t *args;
280 mp_uint_t n_args;
281 mp_obj_t dict = MP_OBJ_NULL;
282 if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple)) {
283 // TODO: Support tuple subclasses?
284 mp_obj_tuple_get(rhs_in, &n_args, &args);
285 } else if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_dict)) {
286 args = NULL;
287 n_args = 0;
288 dict = rhs_in;
289 } else {
290 args = &rhs_in;
291 n_args = 1;
292 }
293 return str_modulo_format(lhs_in, n_args, args, dict);
294 }
295
296 // from now on we need lhs type and data, so extract them
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300297 mp_obj_type_t *lhs_type = mp_obj_get_type(lhs_in);
Damien Georgea65c03c2014-11-05 16:30:34 +0000298 GET_STR_DATA_LEN(lhs_in, lhs_data, lhs_len);
299
300 // check for multiply
301 if (op == MP_BINARY_OP_MULTIPLY) {
302 mp_int_t n;
303 if (!mp_obj_get_int_maybe(rhs_in, &n)) {
304 return MP_OBJ_NULL; // op not supported
305 }
306 if (n <= 0) {
307 if (lhs_type == &mp_type_str) {
308 return MP_OBJ_NEW_QSTR(MP_QSTR_); // empty str
309 } else {
310 return mp_const_empty_bytes;
311 }
312 }
Damien George05005f62015-01-21 22:48:37 +0000313 vstr_t vstr;
314 vstr_init_len(&vstr, lhs_len * n);
315 mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, vstr.buf);
316 return mp_obj_new_str_from_vstr(lhs_type, &vstr);
Damien Georgea65c03c2014-11-05 16:30:34 +0000317 }
318
319 // From now on all operations allow:
320 // - str with str
321 // - bytes with bytes
322 // - bytes with bytearray
323 // - bytes with array.array
324 // To do this efficiently we use the buffer protocol to extract the raw
325 // data for the rhs, but only if the lhs is a bytes object.
326 //
327 // NOTE: CPython does not allow comparison between bytes ard array.array
328 // (even if the array is of type 'b'), even though it allows addition of
329 // such types. We are not compatible with this (we do allow comparison
330 // of bytes with anything that has the buffer protocol). It would be
331 // easy to "fix" this with a bit of extra logic below, but it costs code
332 // size and execution time so we don't.
333
334 const byte *rhs_data;
335 mp_uint_t rhs_len;
336 if (lhs_type == mp_obj_get_type(rhs_in)) {
337 GET_STR_DATA_LEN(rhs_in, rhs_data_, rhs_len_);
338 rhs_data = rhs_data_;
339 rhs_len = rhs_len_;
340 } else if (lhs_type == &mp_type_bytes) {
341 mp_buffer_info_t bufinfo;
342 if (!mp_get_buffer(rhs_in, &bufinfo, MP_BUFFER_READ)) {
Damien Georgee233a552015-01-11 21:07:15 +0000343 return MP_OBJ_NULL; // op not supported
Damien Georgea65c03c2014-11-05 16:30:34 +0000344 }
345 rhs_data = bufinfo.buf;
346 rhs_len = bufinfo.len;
347 } else {
348 // incompatible types
Damien Georgea65c03c2014-11-05 16:30:34 +0000349 return MP_OBJ_NULL; // op not supported
350 }
351
Damiend99b0522013-12-21 18:17:45 +0000352 switch (op) {
Damien Georged17926d2014-03-30 13:35:08 +0100353 case MP_BINARY_OP_ADD:
Damien Georgea65c03c2014-11-05 16:30:34 +0000354 case MP_BINARY_OP_INPLACE_ADD: {
Damien George05005f62015-01-21 22:48:37 +0000355 vstr_t vstr;
356 vstr_init_len(&vstr, lhs_len + rhs_len);
357 memcpy(vstr.buf, lhs_data, lhs_len);
358 memcpy(vstr.buf + lhs_len, rhs_data, rhs_len);
359 return mp_obj_new_str_from_vstr(lhs_type, &vstr);
Paul Sokolovsky545591a2014-01-21 00:27:33 +0200360 }
Paul Sokolovsky87e85b72014-02-02 08:24:07 +0200361
Damien Georgea65c03c2014-11-05 16:30:34 +0000362 case MP_BINARY_OP_IN:
363 /* NOTE `a in b` is `b.__contains__(a)` */
Paul Sokolovsky1b586f32015-10-11 12:09:43 +0300364 return mp_obj_new_bool(find_subbytes(lhs_data, lhs_len, rhs_data, rhs_len, 1) != NULL);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300365
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300366 //case MP_BINARY_OP_NOT_EQUAL: // This is never passed here
367 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 +0100368 case MP_BINARY_OP_LESS:
369 case MP_BINARY_OP_LESS_EQUAL:
370 case MP_BINARY_OP_MORE:
371 case MP_BINARY_OP_MORE_EQUAL:
Paul Sokolovsky1b586f32015-10-11 12:09:43 +0300372 return mp_obj_new_bool(mp_seq_cmp_bytes(op, lhs_data, lhs_len, rhs_data, rhs_len));
Damiend99b0522013-12-21 18:17:45 +0000373 }
374
Damien George6ac5dce2014-05-21 19:42:43 +0100375 return MP_OBJ_NULL; // op not supported
Damiend99b0522013-12-21 18:17:45 +0000376}
377
Paul Sokolovskyea2c9362014-06-15 00:35:09 +0300378#if !MICROPY_PY_BUILTINS_STR_UNICODE
379// objstrunicode defines own version
Damien George999cedb2015-11-27 17:01:44 +0000380const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, size_t self_len,
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300381 mp_obj_t index, bool is_slice) {
Damien George40f3c022014-07-03 13:25:24 +0100382 mp_uint_t index_val = mp_get_index(type, self_len, index, is_slice);
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300383 return self_data + index_val;
384}
Paul Sokolovskyea2c9362014-06-15 00:35:09 +0300385#endif
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300386
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300387// This is used for both bytes and 8-bit strings. This is not used for unicode strings.
388STATIC 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 +0300389 mp_obj_type_t *type = mp_obj_get_type(self_in);
Damien George729f7b42014-04-17 22:10:53 +0100390 GET_STR_DATA_LEN(self_in, self_data, self_len);
391 if (value == MP_OBJ_SENTINEL) {
392 // load
Damien Georgefb510b32014-06-01 13:32:54 +0100393#if MICROPY_PY_BUILTINS_SLICE
Damien George729f7b42014-04-17 22:10:53 +0100394 if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
Paul Sokolovskyde4b9322014-05-25 21:21:57 +0300395 mp_bound_slice_t slice;
396 if (!mp_seq_get_fast_slice_indexes(self_len, index, &slice)) {
Damien George821b7f22015-09-03 23:14:06 +0100397 mp_not_implemented("only slices with step=1 (aka None) are supported");
Damien George729f7b42014-04-17 22:10:53 +0100398 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100399 return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start);
Damien George729f7b42014-04-17 22:10:53 +0100400 }
401#endif
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300402 mp_uint_t index_val = mp_get_index(type, self_len, index, false);
Damien George2eb1f602014-08-11 23:24:29 +0100403 // If we have unicode enabled the type will always be bytes, so take the short cut.
404 if (MICROPY_PY_BUILTINS_STR_UNICODE || type == &mp_type_bytes) {
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300405 return MP_OBJ_NEW_SMALL_INT(self_data[index_val]);
Damien George729f7b42014-04-17 22:10:53 +0100406 } else {
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300407 return mp_obj_new_str((char*)&self_data[index_val], 1, true);
Damien George729f7b42014-04-17 22:10:53 +0100408 }
409 } else {
Damien George6ac5dce2014-05-21 19:42:43 +0100410 return MP_OBJ_NULL; // op not supported
Damien George729f7b42014-04-17 22:10:53 +0100411 }
412}
413
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200414STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
Dave Hylandsb7f7c652014-08-26 12:44:46 -0700415 assert(MP_OBJ_IS_STR_OR_BYTES(self_in));
Paul Sokolovsky5e5d69b2014-05-11 21:13:01 +0300416 const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
Damiend99b0522013-12-21 18:17:45 +0000417
Damien Georgefe8fb912014-01-02 16:36:09 +0000418 // get separation string
Damien George5fa93b62014-01-22 14:35:10 +0000419 GET_STR_DATA_LEN(self_in, sep_str, sep_len);
Damien Georgefe8fb912014-01-02 16:36:09 +0000420
421 // process args
Damien George9c4cbe22014-08-30 14:04:14 +0100422 mp_uint_t seq_len;
Damiend99b0522013-12-21 18:17:45 +0000423 mp_obj_t *seq_items;
Damien George07ddab52014-03-29 13:15:08 +0000424 if (MP_OBJ_IS_TYPE(arg, &mp_type_tuple)) {
Damiend99b0522013-12-21 18:17:45 +0000425 mp_obj_tuple_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000426 } else {
Damien Georgea157e4c2014-04-09 19:17:53 +0100427 if (!MP_OBJ_IS_TYPE(arg, &mp_type_list)) {
428 // arg is not a list, try to convert it to one
Paul Sokolovsky881d9af2014-04-10 01:42:40 +0300429 // TODO: Try to optimize?
Damien George5b3f0b72016-01-03 15:55:55 +0000430 arg = mp_type_list.make_new(&mp_type_list, 1, 0, &arg);
Damien Georgea157e4c2014-04-09 19:17:53 +0100431 }
432 mp_obj_list_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000433 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000434
435 // count required length
Damien George39dc1452014-10-03 19:52:22 +0100436 mp_uint_t required_len = 0;
437 for (mp_uint_t i = 0; i < seq_len; i++) {
Paul Sokolovsky5e5d69b2014-05-11 21:13:01 +0300438 if (mp_obj_get_type(seq_items[i]) != self_type) {
439 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
440 "join expects a list of str/bytes objects consistent with self object"));
Damiend99b0522013-12-21 18:17:45 +0000441 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000442 if (i > 0) {
443 required_len += sep_len;
444 }
Damien George5fa93b62014-01-22 14:35:10 +0000445 GET_STR_LEN(seq_items[i], l);
446 required_len += l;
Damiend99b0522013-12-21 18:17:45 +0000447 }
448
449 // make joined string
Damien George05005f62015-01-21 22:48:37 +0000450 vstr_t vstr;
451 vstr_init_len(&vstr, required_len);
452 byte *data = (byte*)vstr.buf;
Damien George39dc1452014-10-03 19:52:22 +0100453 for (mp_uint_t i = 0; i < seq_len; i++) {
Damiend99b0522013-12-21 18:17:45 +0000454 if (i > 0) {
Damien George5fa93b62014-01-22 14:35:10 +0000455 memcpy(data, sep_str, sep_len);
456 data += sep_len;
Damiend99b0522013-12-21 18:17:45 +0000457 }
Damien George5fa93b62014-01-22 14:35:10 +0000458 GET_STR_DATA_LEN(seq_items[i], s, l);
459 memcpy(data, s, l);
460 data += l;
Damiend99b0522013-12-21 18:17:45 +0000461 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000462
463 // return joined string
Damien George05005f62015-01-21 22:48:37 +0000464 return mp_obj_new_str_from_vstr(self_type, &vstr);
Damiend99b0522013-12-21 18:17:45 +0000465}
466
Damien Georgecc80c4d2016-05-13 12:21:32 +0100467mp_obj_t mp_obj_str_split(size_t n_args, const mp_obj_t *args) {
Paul Sokolovskybfb88192014-05-11 21:17:28 +0300468 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Damien George40f3c022014-07-03 13:25:24 +0100469 mp_int_t splits = -1;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200470 mp_obj_t sep = mp_const_none;
471 if (n_args > 1) {
472 sep = args[1];
473 if (n_args > 2) {
Damien Georgedeed0872014-04-06 11:11:15 +0100474 splits = mp_obj_get_int(args[2]);
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200475 }
476 }
Damien Georgedeed0872014-04-06 11:11:15 +0100477
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200478 mp_obj_t res = mp_obj_new_list(0, NULL);
Damien George5fa93b62014-01-22 14:35:10 +0000479 GET_STR_DATA_LEN(args[0], s, len);
480 const byte *top = s + len;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200481
Damien Georgedeed0872014-04-06 11:11:15 +0100482 if (sep == mp_const_none) {
483 // sep not given, so separate on whitespace
484
485 // Initial whitespace is not counted as split, so we pre-do it
Paul Sokolovsky8b7faa32015-04-12 00:17:16 +0300486 while (s < top && unichar_isspace(*s)) s++;
Damien Georgedeed0872014-04-06 11:11:15 +0100487 while (s < top && splits != 0) {
488 const byte *start = s;
Paul Sokolovsky8b7faa32015-04-12 00:17:16 +0300489 while (s < top && !unichar_isspace(*s)) s++;
Damien Georgef600a6a2014-05-25 22:34:34 +0100490 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
Damien Georgedeed0872014-04-06 11:11:15 +0100491 if (s >= top) {
492 break;
493 }
Paul Sokolovsky8b7faa32015-04-12 00:17:16 +0300494 while (s < top && unichar_isspace(*s)) s++;
Damien Georgedeed0872014-04-06 11:11:15 +0100495 if (splits > 0) {
496 splits--;
497 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200498 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200499
Damien Georgedeed0872014-04-06 11:11:15 +0100500 if (s < top) {
Damien Georgef600a6a2014-05-25 22:34:34 +0100501 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, s, top - s));
Damien Georgedeed0872014-04-06 11:11:15 +0100502 }
503
504 } else {
505 // sep given
Paul Sokolovsky0c549852014-08-10 23:14:35 +0300506 if (mp_obj_get_type(sep) != self_type) {
Damien Georgec55a4d82014-12-24 20:28:30 +0000507 bad_implicit_conversion(sep);
Paul Sokolovsky0c549852014-08-10 23:14:35 +0300508 }
Damien Georgedeed0872014-04-06 11:11:15 +0100509
Damien Georged182b982014-08-30 14:19:41 +0100510 mp_uint_t sep_len;
Damien Georgedeed0872014-04-06 11:11:15 +0100511 const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
512
513 if (sep_len == 0) {
514 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
515 }
516
517 for (;;) {
518 const byte *start = s;
519 for (;;) {
520 if (splits == 0 || s + sep_len > top) {
521 s = top;
522 break;
523 } else if (memcmp(s, sep_str, sep_len) == 0) {
524 break;
525 }
526 s++;
527 }
Damien Georgecc80c4d2016-05-13 12:21:32 +0100528 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
Damien Georgedeed0872014-04-06 11:11:15 +0100529 if (s >= top) {
530 break;
531 }
532 s += sep_len;
533 if (splits > 0) {
534 splits--;
535 }
536 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200537 }
538
539 return res;
540}
541
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +0300542#if MICROPY_PY_BUILTINS_STR_SPLITLINES
Damien George4b72b3a2016-01-03 14:21:40 +0000543STATIC mp_obj_t str_splitlines(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
Damien Georgecc80c4d2016-05-13 12:21:32 +0100544 enum { ARG_keepends };
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +0300545 static const mp_arg_t allowed_args[] = {
546 { MP_QSTR_keepends, MP_ARG_BOOL, {.u_bool = false} },
547 };
548
549 // parse args
Damien Georgecc80c4d2016-05-13 12:21:32 +0100550 mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
551 mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +0300552
Damien Georgecc80c4d2016-05-13 12:21:32 +0100553 const mp_obj_type_t *self_type = mp_obj_get_type(pos_args[0]);
554 mp_obj_t res = mp_obj_new_list(0, NULL);
555
556 GET_STR_DATA_LEN(pos_args[0], s, len);
557 const byte *top = s + len;
558
559 while (s < top) {
560 const byte *start = s;
561 size_t match = 0;
562 while (s < top) {
563 if (*s == '\n') {
564 match = 1;
565 break;
566 } else if (*s == '\r') {
567 if (s[1] == '\n') {
568 match = 2;
569 } else {
570 match = 1;
571 }
572 break;
573 }
574 s++;
575 }
576 size_t sub_len = s - start;
577 if (args[ARG_keepends].u_bool) {
578 sub_len += match;
579 }
580 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, sub_len));
581 s += match;
582 }
583
584 return res;
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +0300585}
586#endif
587
Damien George4b72b3a2016-01-03 14:21:40 +0000588STATIC mp_obj_t str_rsplit(size_t n_args, const mp_obj_t *args) {
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300589 if (n_args < 3) {
590 // If we don't have split limit, it doesn't matter from which side
591 // we split.
Paul Sokolovsky87051712015-03-23 22:15:12 +0200592 return mp_obj_str_split(n_args, args);
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300593 }
594 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
595 mp_obj_t sep = args[1];
596 GET_STR_DATA_LEN(args[0], s, len);
597
Damien George40f3c022014-07-03 13:25:24 +0100598 mp_int_t splits = mp_obj_get_int(args[2]);
599 mp_int_t org_splits = splits;
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300600 // Preallocate list to the max expected # of elements, as we
601 // will fill it from the end.
Damien George999cedb2015-11-27 17:01:44 +0000602 mp_obj_list_t *res = MP_OBJ_TO_PTR(mp_obj_new_list(splits + 1, NULL));
Damien George39dc1452014-10-03 19:52:22 +0100603 mp_int_t idx = splits;
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300604
605 if (sep == mp_const_none) {
Damien George22602cc2015-09-01 15:35:31 +0100606 mp_not_implemented("rsplit(None,n)");
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300607 } else {
Damien Georged182b982014-08-30 14:19:41 +0100608 mp_uint_t sep_len;
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300609 const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
610
611 if (sep_len == 0) {
612 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
613 }
614
615 const byte *beg = s;
616 const byte *last = s + len;
617 for (;;) {
618 s = last - sep_len;
619 for (;;) {
620 if (splits == 0 || s < beg) {
621 break;
622 } else if (memcmp(s, sep_str, sep_len) == 0) {
623 break;
624 }
625 s--;
626 }
627 if (s < beg || splits == 0) {
Damien Georgef600a6a2014-05-25 22:34:34 +0100628 res->items[idx] = mp_obj_new_str_of_type(self_type, beg, last - beg);
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300629 break;
630 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100631 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 +0300632 last = s;
633 if (splits > 0) {
634 splits--;
635 }
636 }
637 if (idx != 0) {
638 // We split less parts than split limit, now go cleanup surplus
Damien George39dc1452014-10-03 19:52:22 +0100639 mp_int_t used = org_splits + 1 - idx;
Damien George17ae2392014-08-29 21:07:54 +0100640 memmove(res->items, &res->items[idx], used * sizeof(mp_obj_t));
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300641 mp_seq_clear(res->items, used, res->alloc, sizeof(*res->items));
642 res->len = used;
643 }
644 }
645
Damien George999cedb2015-11-27 17:01:44 +0000646 return MP_OBJ_FROM_PTR(res);
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300647}
648
Damien Georgeecc88e92014-08-30 00:35:11 +0100649STATIC mp_obj_t str_finder(mp_uint_t n_args, const mp_obj_t *args, mp_int_t direction, bool is_index) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300650 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
John R. Lentone8204912014-01-12 21:53:52 +0000651 assert(2 <= n_args && n_args <= 4);
Damien Georgebe8e99c2014-11-05 16:45:54 +0000652 assert(MP_OBJ_IS_STR_OR_BYTES(args[0]));
653
654 // check argument type
Damien Georgec55a4d82014-12-24 20:28:30 +0000655 if (mp_obj_get_type(args[1]) != self_type) {
Damien Georgebe8e99c2014-11-05 16:45:54 +0000656 bad_implicit_conversion(args[1]);
657 }
John R. Lentone8204912014-01-12 21:53:52 +0000658
Damien George5fa93b62014-01-22 14:35:10 +0000659 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
660 GET_STR_DATA_LEN(args[1], needle, needle_len);
John R. Lentone8204912014-01-12 21:53:52 +0000661
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300662 const byte *start = haystack;
663 const byte *end = haystack + haystack_len;
John R. Lentone8204912014-01-12 21:53:52 +0000664 if (n_args >= 3 && args[2] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300665 start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
John R. Lentone8204912014-01-12 21:53:52 +0000666 }
667 if (n_args >= 4 && args[3] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300668 end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
John R. Lentone8204912014-01-12 21:53:52 +0000669 }
670
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300671 const byte *p = find_subbytes(start, end - start, needle, needle_len, direction);
Damien George23005372014-01-13 19:39:01 +0000672 if (p == NULL) {
673 // not found
xbe3d9a39e2014-04-08 11:42:19 -0700674 if (is_index) {
675 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "substring not found"));
676 } else {
677 return MP_OBJ_NEW_SMALL_INT(-1);
678 }
Damien George23005372014-01-13 19:39:01 +0000679 } else {
680 // found
Paul Sokolovsky5048df02014-06-14 03:15:00 +0300681 #if MICROPY_PY_BUILTINS_STR_UNICODE
682 if (self_type == &mp_type_str) {
683 return MP_OBJ_NEW_SMALL_INT(utf8_ptr_to_index(haystack, p));
684 }
685 #endif
xbe17a5a832014-03-23 23:31:58 -0700686 return MP_OBJ_NEW_SMALL_INT(p - haystack);
John R. Lentone8204912014-01-12 21:53:52 +0000687 }
John R. Lentone8204912014-01-12 21:53:52 +0000688}
689
Damien George4b72b3a2016-01-03 14:21:40 +0000690STATIC mp_obj_t str_find(size_t n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700691 return str_finder(n_args, args, 1, false);
xbe17a5a832014-03-23 23:31:58 -0700692}
693
Damien George4b72b3a2016-01-03 14:21:40 +0000694STATIC mp_obj_t str_rfind(size_t n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700695 return str_finder(n_args, args, -1, false);
696}
697
Damien George4b72b3a2016-01-03 14:21:40 +0000698STATIC mp_obj_t str_index(size_t n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700699 return str_finder(n_args, args, 1, true);
700}
701
Damien George4b72b3a2016-01-03 14:21:40 +0000702STATIC mp_obj_t str_rindex(size_t n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700703 return str_finder(n_args, args, -1, true);
xbe17a5a832014-03-23 23:31:58 -0700704}
705
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200706// TODO: (Much) more variety in args
Damien George4b72b3a2016-01-03 14:21:40 +0000707STATIC mp_obj_t str_startswith(size_t n_args, const mp_obj_t *args) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300708 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300709 GET_STR_DATA_LEN(args[0], str, str_len);
710 GET_STR_DATA_LEN(args[1], prefix, prefix_len);
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300711 const byte *start = str;
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300712 if (n_args > 2) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300713 start = str_index_to_ptr(self_type, str, str_len, args[2], true);
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300714 }
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300715 if (prefix_len + (start - str) > str_len) {
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200716 return mp_const_false;
717 }
Paul Sokolovsky1b586f32015-10-11 12:09:43 +0300718 return mp_obj_new_bool(memcmp(start, prefix, prefix_len) == 0);
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200719}
720
Damien George4b72b3a2016-01-03 14:21:40 +0000721STATIC mp_obj_t str_endswith(size_t n_args, const mp_obj_t *args) {
Paul Sokolovskyd098c6b2014-05-24 22:46:51 +0300722 GET_STR_DATA_LEN(args[0], str, str_len);
723 GET_STR_DATA_LEN(args[1], suffix, suffix_len);
Damien George55b11e62015-09-04 16:49:56 +0100724 if (n_args > 2) {
725 mp_not_implemented("start/end indices");
726 }
Paul Sokolovskyd098c6b2014-05-24 22:46:51 +0300727
728 if (suffix_len > str_len) {
729 return mp_const_false;
730 }
Paul Sokolovsky1b586f32015-10-11 12:09:43 +0300731 return mp_obj_new_bool(memcmp(str + (str_len - suffix_len), suffix, suffix_len) == 0);
Paul Sokolovskyd098c6b2014-05-24 22:46:51 +0300732}
733
Paul Sokolovsky88107842014-04-26 06:20:08 +0300734enum { LSTRIP, RSTRIP, STRIP };
735
Damien Georgeecc88e92014-08-30 00:35:11 +0100736STATIC mp_obj_t str_uni_strip(int type, mp_uint_t n_args, const mp_obj_t *args) {
xbe7b0f39f2014-01-08 14:23:45 -0800737 assert(1 <= n_args && n_args <= 2);
Dave Hylandsb7f7c652014-08-26 12:44:46 -0700738 assert(MP_OBJ_IS_STR_OR_BYTES(args[0]));
Paul Sokolovskyb2d4fc02014-05-11 13:17:29 +0300739 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Damien George5fa93b62014-01-22 14:35:10 +0000740
741 const byte *chars_to_del;
742 uint chars_to_del_len;
743 static const byte whitespace[] = " \t\n\r\v\f";
xbe7b0f39f2014-01-08 14:23:45 -0800744
745 if (n_args == 1) {
746 chars_to_del = whitespace;
Damien George5fa93b62014-01-22 14:35:10 +0000747 chars_to_del_len = sizeof(whitespace);
xbe7b0f39f2014-01-08 14:23:45 -0800748 } else {
Paul Sokolovskyb2d4fc02014-05-11 13:17:29 +0300749 if (mp_obj_get_type(args[1]) != self_type) {
Damien Georgec55a4d82014-12-24 20:28:30 +0000750 bad_implicit_conversion(args[1]);
Paul Sokolovskyb2d4fc02014-05-11 13:17:29 +0300751 }
Damien George5fa93b62014-01-22 14:35:10 +0000752 GET_STR_DATA_LEN(args[1], s, l);
753 chars_to_del = s;
754 chars_to_del_len = l;
xbe7b0f39f2014-01-08 14:23:45 -0800755 }
756
Damien George5fa93b62014-01-22 14:35:10 +0000757 GET_STR_DATA_LEN(args[0], orig_str, orig_str_len);
xbe7b0f39f2014-01-08 14:23:45 -0800758
Damien George40f3c022014-07-03 13:25:24 +0100759 mp_uint_t first_good_char_pos = 0;
xbe7b0f39f2014-01-08 14:23:45 -0800760 bool first_good_char_pos_set = false;
Damien George40f3c022014-07-03 13:25:24 +0100761 mp_uint_t last_good_char_pos = 0;
762 mp_uint_t i = 0;
763 mp_int_t delta = 1;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300764 if (type == RSTRIP) {
765 i = orig_str_len - 1;
766 delta = -1;
767 }
Damien George40f3c022014-07-03 13:25:24 +0100768 for (mp_uint_t len = orig_str_len; len > 0; len--) {
xbe17a5a832014-03-23 23:31:58 -0700769 if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) {
xbe7b0f39f2014-01-08 14:23:45 -0800770 if (!first_good_char_pos_set) {
Paul Sokolovskybcdffe52014-05-30 03:07:05 +0300771 first_good_char_pos_set = true;
xbe7b0f39f2014-01-08 14:23:45 -0800772 first_good_char_pos = i;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300773 if (type == LSTRIP) {
774 last_good_char_pos = orig_str_len - 1;
775 break;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300776 } else if (type == RSTRIP) {
777 first_good_char_pos = 0;
778 last_good_char_pos = i;
779 break;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300780 }
xbe7b0f39f2014-01-08 14:23:45 -0800781 }
Paul Sokolovsky88107842014-04-26 06:20:08 +0300782 last_good_char_pos = i;
xbe7b0f39f2014-01-08 14:23:45 -0800783 }
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300784 i += delta;
xbe7b0f39f2014-01-08 14:23:45 -0800785 }
786
Paul Sokolovskybcdffe52014-05-30 03:07:05 +0300787 if (!first_good_char_pos_set) {
Damien George5fa93b62014-01-22 14:35:10 +0000788 // string is all whitespace, return ''
Damien Georgec55a4d82014-12-24 20:28:30 +0000789 if (self_type == &mp_type_str) {
790 return MP_OBJ_NEW_QSTR(MP_QSTR_);
791 } else {
792 return mp_const_empty_bytes;
793 }
xbe7b0f39f2014-01-08 14:23:45 -0800794 }
795
796 assert(last_good_char_pos >= first_good_char_pos);
797 //+1 to accomodate the last character
Damien George40f3c022014-07-03 13:25:24 +0100798 mp_uint_t stripped_len = last_good_char_pos - first_good_char_pos + 1;
Paul Sokolovsky88276822014-05-30 03:11:44 +0300799 if (stripped_len == orig_str_len) {
800 // If nothing was stripped, don't bother to dup original string
801 // TODO: watch out for this case when we'll get to bytearray.strip()
802 assert(first_good_char_pos == 0);
803 return args[0];
804 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100805 return mp_obj_new_str_of_type(self_type, orig_str + first_good_char_pos, stripped_len);
xbe7b0f39f2014-01-08 14:23:45 -0800806}
807
Damien George4b72b3a2016-01-03 14:21:40 +0000808STATIC mp_obj_t str_strip(size_t n_args, const mp_obj_t *args) {
Paul Sokolovsky88107842014-04-26 06:20:08 +0300809 return str_uni_strip(STRIP, n_args, args);
810}
811
Damien George4b72b3a2016-01-03 14:21:40 +0000812STATIC mp_obj_t str_lstrip(size_t n_args, const mp_obj_t *args) {
Paul Sokolovsky88107842014-04-26 06:20:08 +0300813 return str_uni_strip(LSTRIP, n_args, args);
814}
815
Damien George4b72b3a2016-01-03 14:21:40 +0000816STATIC mp_obj_t str_rstrip(size_t n_args, const mp_obj_t *args) {
Paul Sokolovsky88107842014-04-26 06:20:08 +0300817 return str_uni_strip(RSTRIP, n_args, args);
818}
819
Paul Sokolovsky1b5abfc2016-05-22 00:13:44 +0300820#if MICROPY_PY_BUILTINS_STR_CENTER
821STATIC mp_obj_t str_center(mp_obj_t str_in, mp_obj_t width_in) {
822 GET_STR_DATA_LEN(str_in, str, str_len);
823 int width = mp_obj_get_int(width_in);
824 if (str_len >= width) {
825 return str_in;
826 }
827
828 vstr_t vstr;
829 vstr_init_len(&vstr, width);
830 memset(vstr.buf, ' ', width);
831 int left = (width - str_len) / 2;
832 memcpy(vstr.buf + left, str, str_len);
833 return mp_obj_new_str_from_vstr(mp_obj_get_type(str_in), &vstr);
834}
835#endif
836
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700837// Takes an int arg, but only parses unsigned numbers, and only changes
838// *num if at least one digit was parsed.
Damien George87e07ea2016-02-02 15:51:57 +0000839STATIC const char *str_to_int(const char *str, const char *top, int *num) {
840 if (str < top && '0' <= *str && *str <= '9') {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700841 *num = 0;
842 do {
Damien George87e07ea2016-02-02 15:51:57 +0000843 *num = *num * 10 + (*str - '0');
844 str++;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700845 }
Damien George87e07ea2016-02-02 15:51:57 +0000846 while (str < top && '0' <= *str && *str <= '9');
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700847 }
Damien George87e07ea2016-02-02 15:51:57 +0000848 return str;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700849}
850
Damien George2801e6f2015-04-04 15:53:11 +0100851STATIC bool isalignment(char ch) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700852 return ch && strchr("<>=^", ch) != NULL;
853}
854
Damien George2801e6f2015-04-04 15:53:11 +0100855STATIC bool istype(char ch) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700856 return ch && strchr("bcdeEfFgGnosxX%", ch) != NULL;
857}
858
Damien George2801e6f2015-04-04 15:53:11 +0100859STATIC bool arg_looks_integer(mp_obj_t arg) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700860 return MP_OBJ_IS_TYPE(arg, &mp_type_bool) || MP_OBJ_IS_INT(arg);
861}
862
Damien George2801e6f2015-04-04 15:53:11 +0100863STATIC bool arg_looks_numeric(mp_obj_t arg) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700864 return arg_looks_integer(arg)
Damien Georgefb510b32014-06-01 13:32:54 +0100865#if MICROPY_PY_BUILTINS_FLOAT
Damien Georgeaaef1852015-08-20 23:30:12 +0100866 || mp_obj_is_float(arg)
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700867#endif
868 ;
869}
870
Damien George2801e6f2015-04-04 15:53:11 +0100871STATIC mp_obj_t arg_as_int(mp_obj_t arg) {
Damien Georgefb510b32014-06-01 13:32:54 +0100872#if MICROPY_PY_BUILTINS_FLOAT
Damien Georgeaaef1852015-08-20 23:30:12 +0100873 if (mp_obj_is_float(arg)) {
874 return mp_obj_new_int_from_float(mp_obj_float_get(arg));
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700875 }
876#endif
Dave Hylandsc4029e52014-04-07 11:19:51 -0700877 return arg;
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700878}
879
Damien George1e9a92f2014-11-06 17:36:16 +0000880STATIC NORETURN void terse_str_format_value_error(void) {
881 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "bad format string"));
882}
883
Damien George086d98c2016-02-02 16:51:52 +0000884STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *arg_i, mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
Damien George0b9ee862015-01-21 19:14:25 +0000885 vstr_t vstr;
Damien George7f9d1d62015-04-09 23:56:15 +0100886 mp_print_t print;
887 vstr_init_print(&vstr, 16, &print);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700888
pohmeliee3a29de2016-01-29 12:09:10 +0300889 for (; str < top; str++) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700890 if (*str == '}') {
Damiend99b0522013-12-21 18:17:45 +0000891 str++;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700892 if (str < top && *str == '}') {
Damien George51b9a0d2015-08-26 15:29:49 +0100893 vstr_add_byte(&vstr, '}');
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700894 continue;
895 }
Damien George1e9a92f2014-11-06 17:36:16 +0000896 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
897 terse_str_format_value_error();
898 } else {
899 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
900 "single '}' encountered in format string"));
901 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700902 }
903 if (*str != '{') {
Damien George51b9a0d2015-08-26 15:29:49 +0100904 vstr_add_byte(&vstr, *str);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700905 continue;
906 }
907
908 str++;
909 if (str < top && *str == '{') {
Damien George51b9a0d2015-08-26 15:29:49 +0100910 vstr_add_byte(&vstr, '{');
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700911 continue;
912 }
913
914 // replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}"
915
Damien George87e07ea2016-02-02 15:51:57 +0000916 const char *field_name = NULL;
917 const char *field_name_top = NULL;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700918 char conversion = '\0';
pohmeliee3a29de2016-01-29 12:09:10 +0300919 const char *format_spec = NULL;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700920
921 if (str < top && *str != '}' && *str != '!' && *str != ':') {
Damien George87e07ea2016-02-02 15:51:57 +0000922 field_name = (const char *)str;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700923 while (str < top && *str != '}' && *str != '!' && *str != ':') {
Damien George87e07ea2016-02-02 15:51:57 +0000924 ++str;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700925 }
Damien George87e07ea2016-02-02 15:51:57 +0000926 field_name_top = (const char *)str;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700927 }
928
929 // conversion ::= "r" | "s"
930
931 if (str < top && *str == '!') {
932 str++;
933 if (str < top && (*str == 'r' || *str == 's')) {
934 conversion = *str++;
Paul Sokolovskyf2b796e2014-01-15 22:45:20 +0200935 } else {
Damien George1e9a92f2014-11-06 17:36:16 +0000936 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
937 terse_str_format_value_error();
Damien George000730e2015-08-30 12:43:21 +0100938 } else if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL) {
Damien George1e9a92f2014-11-06 17:36:16 +0000939 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
Damien George000730e2015-08-30 12:43:21 +0100940 "bad conversion specifier"));
941 } else {
942 if (str >= top) {
943 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
944 "end of format while looking for conversion specifier"));
945 } else {
946 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
947 "unknown conversion specifier %c", *str));
948 }
Damien George1e9a92f2014-11-06 17:36:16 +0000949 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700950 }
951 }
952
953 if (str < top && *str == ':') {
954 str++;
955 // {:} is the same as {}, which is the same as {!s}
956 // This makes a difference when passing in a True or False
957 // '{}'.format(True) returns 'True'
958 // '{:d}'.format(True) returns '1'
959 // So we treat {:} as {} and this later gets treated to be {!s}
960 if (*str != '}') {
pohmeliee3a29de2016-01-29 12:09:10 +0300961 format_spec = str;
962 for (int nest = 1; str < top;) {
963 if (*str == '{') {
964 ++nest;
965 } else if (*str == '}') {
966 if (--nest == 0) {
967 break;
968 }
969 }
970 ++str;
Damiend99b0522013-12-21 18:17:45 +0000971 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700972 }
973 }
974 if (str >= top) {
Damien George1e9a92f2014-11-06 17:36:16 +0000975 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
976 terse_str_format_value_error();
977 } else {
978 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
979 "unmatched '{' in format"));
980 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700981 }
982 if (*str != '}') {
Damien George1e9a92f2014-11-06 17:36:16 +0000983 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
984 terse_str_format_value_error();
985 } else {
986 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
987 "expected ':' after format specifier"));
988 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700989 }
990
991 mp_obj_t arg = mp_const_none;
992
993 if (field_name) {
Damien George3bb8bd82014-04-14 21:20:30 +0100994 int index = 0;
Damien George87e07ea2016-02-02 15:51:57 +0000995 if (MP_LIKELY(unichar_isdigit(*field_name))) {
pohmeliee3a29de2016-01-29 12:09:10 +0300996 if (*arg_i > 0) {
Paul Sokolovskyc1144962015-01-04 00:14:13 +0200997 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
998 terse_str_format_value_error();
999 } else {
1000 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
1001 "can't switch from automatic field numbering to manual field specification"));
1002 }
1003 }
Damien George87e07ea2016-02-02 15:51:57 +00001004 field_name = str_to_int(field_name, field_name_top, &index);
Damien George963a5a32015-01-16 17:47:07 +00001005 if ((uint)index >= n_args - 1) {
Paul Sokolovskyc1144962015-01-04 00:14:13 +02001006 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
1007 }
1008 arg = args[index + 1];
pohmeliee3a29de2016-01-29 12:09:10 +03001009 *arg_i = -1;
Paul Sokolovskyc1144962015-01-04 00:14:13 +02001010 } else {
Damien George87e07ea2016-02-02 15:51:57 +00001011 const char *lookup;
1012 for (lookup = field_name; lookup < field_name_top && *lookup != '.' && *lookup != '['; lookup++);
1013 mp_obj_t field_q = mp_obj_new_str(field_name, lookup - field_name, true/*?*/);
1014 field_name = lookup;
Paul Sokolovskyc1144962015-01-04 00:14:13 +02001015 mp_map_elem_t *key_elem = mp_map_lookup(kwargs, field_q, MP_MAP_LOOKUP);
1016 if (key_elem == NULL) {
1017 nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, field_q));
1018 }
1019 arg = key_elem->value;
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001020 }
Damien George87e07ea2016-02-02 15:51:57 +00001021 if (field_name < field_name_top) {
Damien George821b7f22015-09-03 23:14:06 +01001022 mp_not_implemented("attributes not supported yet");
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001023 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001024 } else {
pohmeliee3a29de2016-01-29 12:09:10 +03001025 if (*arg_i < 0) {
Damien George1e9a92f2014-11-06 17:36:16 +00001026 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1027 terse_str_format_value_error();
1028 } else {
1029 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
1030 "can't switch from manual field specification to automatic field numbering"));
1031 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001032 }
pohmeliee3a29de2016-01-29 12:09:10 +03001033 if ((uint)*arg_i >= n_args - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +01001034 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001035 }
pohmeliee3a29de2016-01-29 12:09:10 +03001036 arg = args[(*arg_i) + 1];
1037 (*arg_i)++;
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001038 }
1039 if (!format_spec && !conversion) {
1040 conversion = 's';
1041 }
1042 if (conversion) {
1043 mp_print_kind_t print_kind;
1044 if (conversion == 's') {
1045 print_kind = PRINT_STR;
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001046 } else {
Damien George000730e2015-08-30 12:43:21 +01001047 assert(conversion == 'r');
1048 print_kind = PRINT_REPR;
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001049 }
Damien George0b9ee862015-01-21 19:14:25 +00001050 vstr_t arg_vstr;
Damien George7f9d1d62015-04-09 23:56:15 +01001051 mp_print_t arg_print;
1052 vstr_init_print(&arg_vstr, 16, &arg_print);
1053 mp_obj_print_helper(&arg_print, arg, print_kind);
Damien George0b9ee862015-01-21 19:14:25 +00001054 arg = mp_obj_new_str_from_vstr(&mp_type_str, &arg_vstr);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001055 }
1056
1057 char sign = '\0';
1058 char fill = '\0';
1059 char align = '\0';
1060 int width = -1;
1061 int precision = -1;
1062 char type = '\0';
1063 int flags = 0;
1064
1065 if (format_spec) {
1066 // The format specifier (from http://docs.python.org/2/library/string.html#formatspec)
1067 //
1068 // [[fill]align][sign][#][0][width][,][.precision][type]
1069 // fill ::= <any character>
1070 // align ::= "<" | ">" | "=" | "^"
1071 // sign ::= "+" | "-" | " "
1072 // width ::= integer
1073 // precision ::= integer
1074 // type ::= "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
1075
pohmeliee3a29de2016-01-29 12:09:10 +03001076 // recursively call the formatter to format any nested specifiers
1077 MP_STACK_CHECK();
1078 vstr_t format_spec_vstr = mp_obj_str_format_helper(format_spec, str, arg_i, n_args, args, kwargs);
Paul Sokolovsky40f00962016-05-09 23:42:42 +03001079 const char *s = vstr_null_terminated_str(&format_spec_vstr);
Damien George87e07ea2016-02-02 15:51:57 +00001080 const char *stop = s + format_spec_vstr.len;
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001081 if (isalignment(*s)) {
1082 align = *s++;
1083 } else if (*s && isalignment(s[1])) {
1084 fill = *s++;
1085 align = *s++;
1086 }
1087 if (*s == '+' || *s == '-' || *s == ' ') {
1088 if (*s == '+') {
1089 flags |= PF_FLAG_SHOW_SIGN;
1090 } else if (*s == ' ') {
1091 flags |= PF_FLAG_SPACE_SIGN;
1092 }
1093 sign = *s++;
1094 }
1095 if (*s == '#') {
1096 flags |= PF_FLAG_SHOW_PREFIX;
1097 s++;
1098 }
1099 if (*s == '0') {
1100 if (!align) {
1101 align = '=';
1102 }
1103 if (!fill) {
1104 fill = '0';
1105 }
1106 }
Damien George87e07ea2016-02-02 15:51:57 +00001107 s = str_to_int(s, stop, &width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001108 if (*s == ',') {
1109 flags |= PF_FLAG_SHOW_COMMA;
1110 s++;
1111 }
1112 if (*s == '.') {
1113 s++;
Damien George87e07ea2016-02-02 15:51:57 +00001114 s = str_to_int(s, stop, &precision);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001115 }
1116 if (istype(*s)) {
1117 type = *s++;
1118 }
Paul Sokolovsky40f00962016-05-09 23:42:42 +03001119 if (*s) {
Damien George7ef75f92015-08-26 15:42:25 +01001120 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1121 terse_str_format_value_error();
1122 } else {
1123 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
1124 "invalid format specifier"));
1125 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001126 }
pohmeliee3a29de2016-01-29 12:09:10 +03001127 vstr_clear(&format_spec_vstr);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001128 }
1129 if (!align) {
1130 if (arg_looks_numeric(arg)) {
1131 align = '>';
1132 } else {
1133 align = '<';
1134 }
1135 }
1136 if (!fill) {
1137 fill = ' ';
1138 }
1139
1140 if (sign) {
1141 if (type == 's') {
Damien George1e9a92f2014-11-06 17:36:16 +00001142 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1143 terse_str_format_value_error();
1144 } else {
1145 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
1146 "sign not allowed in string format specifier"));
1147 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001148 }
1149 if (type == 'c') {
Damien George1e9a92f2014-11-06 17:36:16 +00001150 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1151 terse_str_format_value_error();
1152 } else {
1153 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
1154 "sign not allowed with integer format specifier 'c'"));
1155 }
Damiend99b0522013-12-21 18:17:45 +00001156 }
1157 } else {
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001158 sign = '-';
1159 }
1160
1161 switch (align) {
1162 case '<': flags |= PF_FLAG_LEFT_ADJUST; break;
1163 case '=': flags |= PF_FLAG_PAD_AFTER_SIGN; break;
1164 case '^': flags |= PF_FLAG_CENTER_ADJUST; break;
1165 }
1166
1167 if (arg_looks_integer(arg)) {
1168 switch (type) {
1169 case 'b':
Damien George7f9d1d62015-04-09 23:56:15 +01001170 mp_print_mp_int(&print, arg, 2, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001171 continue;
1172
1173 case 'c':
1174 {
1175 char ch = mp_obj_get_int(arg);
Damien George7f9d1d62015-04-09 23:56:15 +01001176 mp_print_strn(&print, &ch, 1, flags, fill, width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001177 continue;
1178 }
1179
1180 case '\0': // No explicit format type implies 'd'
1181 case 'n': // I don't think we support locales in uPy so use 'd'
1182 case 'd':
Damien George7f9d1d62015-04-09 23:56:15 +01001183 mp_print_mp_int(&print, arg, 10, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001184 continue;
1185
1186 case 'o':
Dave Hylandsc4029e52014-04-07 11:19:51 -07001187 if (flags & PF_FLAG_SHOW_PREFIX) {
1188 flags |= PF_FLAG_SHOW_OCTAL_LETTER;
1189 }
1190
Damien George7f9d1d62015-04-09 23:56:15 +01001191 mp_print_mp_int(&print, arg, 8, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001192 continue;
1193
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001194 case 'X':
Damien George11de8392014-06-05 18:57:38 +01001195 case 'x':
Damien George7f9d1d62015-04-09 23:56:15 +01001196 mp_print_mp_int(&print, arg, 16, type - ('X' - 'A'), flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001197 continue;
1198
1199 case 'e':
1200 case 'E':
1201 case 'f':
1202 case 'F':
1203 case 'g':
1204 case 'G':
1205 case '%':
1206 // The floating point formatters all work with anything that
1207 // looks like an integer
1208 break;
1209
1210 default:
Damien George1e9a92f2014-11-06 17:36:16 +00001211 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1212 terse_str_format_value_error();
1213 } else {
1214 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
1215 "unknown format code '%c' for object of type '%s'",
1216 type, mp_obj_get_type_str(arg)));
1217 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001218 }
Damien Georgec322c5f2014-04-02 20:04:15 +01001219 }
Damien George70f33cd2014-04-02 17:06:05 +01001220
Dave Hylands22fe4d72014-04-02 12:07:31 -07001221 // NOTE: no else here. We need the e, f, g etc formats for integer
1222 // arguments (from above if) to take this if.
Damien Georgec322c5f2014-04-02 20:04:15 +01001223 if (arg_looks_numeric(arg)) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001224 if (!type) {
1225
1226 // Even though the docs say that an unspecified type is the same
1227 // as 'g', there is one subtle difference, when the exponent
1228 // is one less than the precision.
Damien George11de8392014-06-05 18:57:38 +01001229 //
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001230 // '{:10.1}'.format(0.0) ==> '0e+00'
1231 // '{:10.1g}'.format(0.0) ==> '0'
1232 //
1233 // TODO: Figure out how to deal with this.
1234 //
1235 // A proper solution would involve adding a special flag
1236 // or something to format_float, and create a format_double
1237 // to deal with doubles. In order to fix this when using
1238 // sprintf, we'd need to use the e format and tweak the
1239 // returned result to strip trailing zeros like the g format
1240 // does.
1241 //
1242 // {:10.3} and {:10.2e} with 1.23e2 both produce 1.23e+02
1243 // but with 1.e2 you get 1e+02 and 1.00e+02
1244 //
1245 // Stripping the trailing 0's (like g) does would make the
1246 // e format give us the right format.
1247 //
1248 // CPython sources say:
1249 // Omitted type specifier. Behaves in the same way as repr(x)
1250 // and str(x) if no precision is given, else like 'g', but with
1251 // at least one digit after the decimal point. */
1252
1253 type = 'g';
1254 }
1255 if (type == 'n') {
1256 type = 'g';
1257 }
1258
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001259 switch (type) {
Damien Georgefb510b32014-06-01 13:32:54 +01001260#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001261 case 'e':
1262 case 'E':
1263 case 'f':
1264 case 'F':
1265 case 'g':
1266 case 'G':
Damien George7f9d1d62015-04-09 23:56:15 +01001267 mp_print_float(&print, mp_obj_get_float(arg), type, flags, fill, width, precision);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001268 break;
1269
1270 case '%':
1271 flags |= PF_FLAG_ADD_PERCENT;
Damien George0178aa92015-01-12 21:56:35 +00001272 #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
1273 #define F100 100.0F
1274 #else
1275 #define F100 100.0
1276 #endif
Damien George7f9d1d62015-04-09 23:56:15 +01001277 mp_print_float(&print, mp_obj_get_float(arg) * F100, 'f', flags, fill, width, precision);
Damien George0178aa92015-01-12 21:56:35 +00001278 #undef F100
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001279 break;
Damien Georgec322c5f2014-04-02 20:04:15 +01001280#endif
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001281
1282 default:
Damien George1e9a92f2014-11-06 17:36:16 +00001283 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1284 terse_str_format_value_error();
1285 } else {
1286 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
1287 "unknown format code '%c' for object of type 'float'",
1288 type, mp_obj_get_type_str(arg)));
1289 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001290 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001291 } else {
Damien George70f33cd2014-04-02 17:06:05 +01001292 // arg doesn't look like a number
1293
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001294 if (align == '=') {
Damien George1e9a92f2014-11-06 17:36:16 +00001295 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1296 terse_str_format_value_error();
1297 } else {
1298 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
1299 "'=' alignment not allowed in string format specifier"));
1300 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001301 }
Damien George70f33cd2014-04-02 17:06:05 +01001302
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001303 switch (type) {
Damien Georged4df8f42016-01-04 13:13:39 +00001304 case '\0': // no explicit format type implies 's'
Damien Georged182b982014-08-30 14:19:41 +01001305 case 's': {
Damien George50912e72015-01-20 11:55:10 +00001306 mp_uint_t slen;
1307 const char *s = mp_obj_str_get_data(arg, &slen);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001308 if (precision < 0) {
Damien George50912e72015-01-20 11:55:10 +00001309 precision = slen;
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001310 }
Damien George50912e72015-01-20 11:55:10 +00001311 if (slen > (mp_uint_t)precision) {
1312 slen = precision;
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001313 }
Damien George7f9d1d62015-04-09 23:56:15 +01001314 mp_print_strn(&print, s, slen, flags, fill, width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001315 break;
1316 }
1317
1318 default:
Damien George1e9a92f2014-11-06 17:36:16 +00001319 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1320 terse_str_format_value_error();
1321 } else {
1322 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
1323 "unknown format code '%c' for object of type 'str'",
1324 type, mp_obj_get_type_str(arg)));
1325 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001326 }
Damiend99b0522013-12-21 18:17:45 +00001327 }
1328 }
1329
pohmeliee3a29de2016-01-29 12:09:10 +03001330 return vstr;
1331}
1332
1333mp_obj_t mp_obj_str_format(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
1334 assert(MP_OBJ_IS_STR_OR_BYTES(args[0]));
1335
1336 GET_STR_DATA_LEN(args[0], str, len);
1337 int arg_i = 0;
1338 vstr_t vstr = mp_obj_str_format_helper((const char*)str, (const char*)str + len, &arg_i, n_args, args, kwargs);
Damien George0b9ee862015-01-21 19:14:25 +00001339 return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
Damiend99b0522013-12-21 18:17:45 +00001340}
1341
Damien Georgeecc88e92014-08-30 00:35:11 +01001342STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, mp_uint_t n_args, const mp_obj_t *args, mp_obj_t dict) {
Damien Georgebe8e99c2014-11-05 16:45:54 +00001343 assert(MP_OBJ_IS_STR_OR_BYTES(pattern));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001344
1345 GET_STR_DATA_LEN(pattern, str, len);
Dave Hylands6756a372014-04-02 11:42:39 -07001346 const byte *start_str = str;
Paul Sokolovskyef63ab52015-12-20 16:44:36 +02001347 bool is_bytes = MP_OBJ_IS_TYPE(pattern, &mp_type_bytes);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001348 int arg_i = 0;
Damien George0b9ee862015-01-21 19:14:25 +00001349 vstr_t vstr;
Damien George7f9d1d62015-04-09 23:56:15 +01001350 mp_print_t print;
1351 vstr_init_print(&vstr, 16, &print);
Dave Hylands6756a372014-04-02 11:42:39 -07001352
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001353 for (const byte *top = str + len; str < top; str++) {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001354 mp_obj_t arg = MP_OBJ_NULL;
Dave Hylands6756a372014-04-02 11:42:39 -07001355 if (*str != '%') {
Damien George51b9a0d2015-08-26 15:29:49 +01001356 vstr_add_byte(&vstr, *str);
Dave Hylands6756a372014-04-02 11:42:39 -07001357 continue;
1358 }
1359 if (++str >= top) {
Damien Georgeb648e982015-08-26 15:45:06 +01001360 goto incomplete_format;
Dave Hylands6756a372014-04-02 11:42:39 -07001361 }
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001362 if (*str == '%') {
Damien George51b9a0d2015-08-26 15:29:49 +01001363 vstr_add_byte(&vstr, '%');
Dave Hylands6756a372014-04-02 11:42:39 -07001364 continue;
1365 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001366
1367 // Dictionary value lookup
1368 if (*str == '(') {
1369 const byte *key = ++str;
1370 while (*str != ')') {
1371 if (str >= top) {
Damien George1e9a92f2014-11-06 17:36:16 +00001372 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1373 terse_str_format_value_error();
1374 } else {
1375 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
1376 "incomplete format key"));
1377 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001378 }
1379 ++str;
1380 }
1381 mp_obj_t k_obj = mp_obj_new_str((const char*)key, str - key, true);
1382 arg = mp_obj_dict_get(dict, k_obj);
1383 str++;
Dave Hylands6756a372014-04-02 11:42:39 -07001384 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001385
Dave Hylands6756a372014-04-02 11:42:39 -07001386 int flags = 0;
1387 char fill = ' ';
Damien George11de8392014-06-05 18:57:38 +01001388 int alt = 0;
Dave Hylands6756a372014-04-02 11:42:39 -07001389 while (str < top) {
1390 if (*str == '-') flags |= PF_FLAG_LEFT_ADJUST;
1391 else if (*str == '+') flags |= PF_FLAG_SHOW_SIGN;
1392 else if (*str == ' ') flags |= PF_FLAG_SPACE_SIGN;
Damien George11de8392014-06-05 18:57:38 +01001393 else if (*str == '#') alt = PF_FLAG_SHOW_PREFIX;
Dave Hylands6756a372014-04-02 11:42:39 -07001394 else if (*str == '0') {
1395 flags |= PF_FLAG_PAD_AFTER_SIGN;
1396 fill = '0';
1397 } else break;
1398 str++;
1399 }
1400 // parse width, if it exists
Damien George11de8392014-06-05 18:57:38 +01001401 int width = 0;
Dave Hylands6756a372014-04-02 11:42:39 -07001402 if (str < top) {
1403 if (*str == '*') {
Damien George963a5a32015-01-16 17:47:07 +00001404 if ((uint)arg_i >= n_args) {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001405 goto not_enough_args;
1406 }
Dave Hylands6756a372014-04-02 11:42:39 -07001407 width = mp_obj_get_int(args[arg_i++]);
1408 str++;
1409 } else {
Damien George87e07ea2016-02-02 15:51:57 +00001410 str = (const byte*)str_to_int((const char*)str, (const char*)top, &width);
Dave Hylands6756a372014-04-02 11:42:39 -07001411 }
1412 }
1413 int prec = -1;
1414 if (str < top && *str == '.') {
1415 if (++str < top) {
1416 if (*str == '*') {
Damien George963a5a32015-01-16 17:47:07 +00001417 if ((uint)arg_i >= n_args) {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001418 goto not_enough_args;
1419 }
Dave Hylands6756a372014-04-02 11:42:39 -07001420 prec = mp_obj_get_int(args[arg_i++]);
1421 str++;
1422 } else {
1423 prec = 0;
Damien George87e07ea2016-02-02 15:51:57 +00001424 str = (const byte*)str_to_int((const char*)str, (const char*)top, &prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001425 }
1426 }
1427 }
1428
1429 if (str >= top) {
Damien Georgeb648e982015-08-26 15:45:06 +01001430incomplete_format:
Damien George1e9a92f2014-11-06 17:36:16 +00001431 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1432 terse_str_format_value_error();
1433 } else {
1434 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
1435 "incomplete format"));
1436 }
Dave Hylands6756a372014-04-02 11:42:39 -07001437 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001438
1439 // Tuple value lookup
1440 if (arg == MP_OBJ_NULL) {
Damien George963a5a32015-01-16 17:47:07 +00001441 if ((uint)arg_i >= n_args) {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001442not_enough_args:
1443 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not enough arguments for format string"));
1444 }
1445 arg = args[arg_i++];
1446 }
Dave Hylands6756a372014-04-02 11:42:39 -07001447 switch (*str) {
1448 case 'c':
1449 if (MP_OBJ_IS_STR(arg)) {
Damien George50912e72015-01-20 11:55:10 +00001450 mp_uint_t slen;
1451 const char *s = mp_obj_str_get_data(arg, &slen);
1452 if (slen != 1) {
Damien George1e9a92f2014-11-06 17:36:16 +00001453 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
1454 "%%c requires int or char"));
Dave Hylands6756a372014-04-02 11:42:39 -07001455 }
Damien George7f9d1d62015-04-09 23:56:15 +01001456 mp_print_strn(&print, s, 1, flags, ' ', width);
Damien George1e9a92f2014-11-06 17:36:16 +00001457 } else if (arg_looks_integer(arg)) {
Dave Hylands6756a372014-04-02 11:42:39 -07001458 char ch = mp_obj_get_int(arg);
Damien George7f9d1d62015-04-09 23:56:15 +01001459 mp_print_strn(&print, &ch, 1, flags, ' ', width);
Damien George1e9a92f2014-11-06 17:36:16 +00001460 } else {
1461 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
1462 "integer required"));
Dave Hylands6756a372014-04-02 11:42:39 -07001463 }
Damien George11de8392014-06-05 18:57:38 +01001464 break;
Dave Hylands6756a372014-04-02 11:42:39 -07001465
1466 case 'd':
1467 case 'i':
1468 case 'u':
Damien George7f9d1d62015-04-09 23:56:15 +01001469 mp_print_mp_int(&print, arg_as_int(arg), 10, 'a', flags, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001470 break;
1471
Damien Georgefb510b32014-06-01 13:32:54 +01001472#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylands6756a372014-04-02 11:42:39 -07001473 case 'e':
1474 case 'E':
1475 case 'f':
1476 case 'F':
1477 case 'g':
1478 case 'G':
Damien George7f9d1d62015-04-09 23:56:15 +01001479 mp_print_float(&print, mp_obj_get_float(arg), *str, flags, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001480 break;
1481#endif
1482
1483 case 'o':
1484 if (alt) {
Dave Hylandsc4029e52014-04-07 11:19:51 -07001485 flags |= (PF_FLAG_SHOW_PREFIX | PF_FLAG_SHOW_OCTAL_LETTER);
Dave Hylands6756a372014-04-02 11:42:39 -07001486 }
Damien George7f9d1d62015-04-09 23:56:15 +01001487 mp_print_mp_int(&print, arg, 8, 'a', flags, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001488 break;
1489
1490 case 'r':
1491 case 's':
1492 {
Damien George0b9ee862015-01-21 19:14:25 +00001493 vstr_t arg_vstr;
Damien George7f9d1d62015-04-09 23:56:15 +01001494 mp_print_t arg_print;
1495 vstr_init_print(&arg_vstr, 16, &arg_print);
Paul Sokolovskyef63ab52015-12-20 16:44:36 +02001496 mp_print_kind_t print_kind = (*str == 'r' ? PRINT_REPR : PRINT_STR);
1497 if (print_kind == PRINT_STR && is_bytes && MP_OBJ_IS_TYPE(arg, &mp_type_bytes)) {
1498 // If we have something like b"%s" % b"1", bytes arg should be
1499 // printed undecorated.
1500 print_kind = PRINT_RAW;
1501 }
1502 mp_obj_print_helper(&arg_print, arg, print_kind);
Damien George0b9ee862015-01-21 19:14:25 +00001503 uint vlen = arg_vstr.len;
Dave Hylands6756a372014-04-02 11:42:39 -07001504 if (prec < 0) {
Damien George50912e72015-01-20 11:55:10 +00001505 prec = vlen;
Dave Hylands6756a372014-04-02 11:42:39 -07001506 }
Damien George50912e72015-01-20 11:55:10 +00001507 if (vlen > (uint)prec) {
1508 vlen = prec;
Dave Hylands6756a372014-04-02 11:42:39 -07001509 }
Damien George7f9d1d62015-04-09 23:56:15 +01001510 mp_print_strn(&print, arg_vstr.buf, vlen, flags, ' ', width);
Damien George0b9ee862015-01-21 19:14:25 +00001511 vstr_clear(&arg_vstr);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001512 break;
1513 }
Dave Hylands6756a372014-04-02 11:42:39 -07001514
Dave Hylands6756a372014-04-02 11:42:39 -07001515 case 'X':
Damien George11de8392014-06-05 18:57:38 +01001516 case 'x':
Damien George7f9d1d62015-04-09 23:56:15 +01001517 mp_print_mp_int(&print, arg, 16, *str - ('X' - 'A'), flags | alt, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001518 break;
Damien Georgedeed0872014-04-06 11:11:15 +01001519
Dave Hylands6756a372014-04-02 11:42:39 -07001520 default:
Damien George1e9a92f2014-11-06 17:36:16 +00001521 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1522 terse_str_format_value_error();
1523 } else {
1524 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
1525 "unsupported format character '%c' (0x%x) at index %d",
1526 *str, *str, str - start_str));
1527 }
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001528 }
1529 }
1530
Damien George963a5a32015-01-16 17:47:07 +00001531 if ((uint)arg_i != n_args) {
Damien Georgeea13f402014-04-05 18:32:08 +01001532 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not all arguments converted during string formatting"));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001533 }
1534
Paul Sokolovskyd50f6492015-12-20 16:50:51 +02001535 return mp_obj_new_str_from_vstr(is_bytes ? &mp_type_bytes : &mp_type_str, &vstr);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001536}
1537
Paul Sokolovskyf44cc512015-06-26 17:33:21 +03001538// The implementation is optimized, returning the original string if there's
1539// nothing to replace.
Damien George4b72b3a2016-01-03 14:21:40 +00001540STATIC mp_obj_t str_replace(size_t n_args, const mp_obj_t *args) {
Damien Georgebe8e99c2014-11-05 16:45:54 +00001541 assert(MP_OBJ_IS_STR_OR_BYTES(args[0]));
xbe480c15a2014-01-30 22:17:30 -08001542
Damien George40f3c022014-07-03 13:25:24 +01001543 mp_int_t max_rep = -1;
xbe480c15a2014-01-30 22:17:30 -08001544 if (n_args == 4) {
Damien Georgeff715422014-04-07 00:39:13 +01001545 max_rep = mp_obj_get_int(args[3]);
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001546 if (max_rep == 0) {
1547 return args[0];
1548 } else if (max_rep < 0) {
Damien Georgeff715422014-04-07 00:39:13 +01001549 max_rep = -1;
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001550 }
xbe480c15a2014-01-30 22:17:30 -08001551 }
Damien George94f68302014-01-31 23:45:12 +00001552
xbe729be9b2014-04-07 14:46:39 -07001553 // if max_rep is still -1 by this point we will need to do all possible replacements
xbe480c15a2014-01-30 22:17:30 -08001554
Damien Georgeff715422014-04-07 00:39:13 +01001555 // check argument types
1556
Damien Georgec55a4d82014-12-24 20:28:30 +00001557 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
1558
1559 if (mp_obj_get_type(args[1]) != self_type) {
Damien Georgeff715422014-04-07 00:39:13 +01001560 bad_implicit_conversion(args[1]);
1561 }
1562
Damien Georgec55a4d82014-12-24 20:28:30 +00001563 if (mp_obj_get_type(args[2]) != self_type) {
Damien Georgeff715422014-04-07 00:39:13 +01001564 bad_implicit_conversion(args[2]);
1565 }
1566
1567 // extract string data
1568
xbe480c15a2014-01-30 22:17:30 -08001569 GET_STR_DATA_LEN(args[0], str, str_len);
1570 GET_STR_DATA_LEN(args[1], old, old_len);
1571 GET_STR_DATA_LEN(args[2], new, new_len);
Damien George94f68302014-01-31 23:45:12 +00001572
1573 // old won't exist in str if it's longer, so nothing to replace
xbe480c15a2014-01-30 22:17:30 -08001574 if (old_len > str_len) {
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001575 return args[0];
xbe480c15a2014-01-30 22:17:30 -08001576 }
1577
Damien George94f68302014-01-31 23:45:12 +00001578 // data for the replaced string
1579 byte *data = NULL;
Damien George05005f62015-01-21 22:48:37 +00001580 vstr_t vstr;
xbe480c15a2014-01-30 22:17:30 -08001581
Damien George94f68302014-01-31 23:45:12 +00001582 // do 2 passes over the string:
1583 // first pass computes the required length of the replaced string
1584 // second pass does the replacements
1585 for (;;) {
Damien George40f3c022014-07-03 13:25:24 +01001586 mp_uint_t replaced_str_index = 0;
1587 mp_uint_t num_replacements_done = 0;
Damien George94f68302014-01-31 23:45:12 +00001588 const byte *old_occurrence;
1589 const byte *offset_ptr = str;
Damien George40f3c022014-07-03 13:25:24 +01001590 mp_uint_t str_len_remain = str_len;
Damien Georgeff715422014-04-07 00:39:13 +01001591 if (old_len == 0) {
1592 // if old_str is empty, copy new_str to start of replaced string
1593 // copy the replacement string
1594 if (data != NULL) {
1595 memcpy(data, new, new_len);
1596 }
1597 replaced_str_index += new_len;
1598 num_replacements_done++;
1599 }
Damien George963a5a32015-01-16 17:47:07 +00001600 while (num_replacements_done != (mp_uint_t)max_rep && str_len_remain > 0 && (old_occurrence = find_subbytes(offset_ptr, str_len_remain, old, old_len, 1)) != NULL) {
Damien Georgeff715422014-04-07 00:39:13 +01001601 if (old_len == 0) {
1602 old_occurrence += 1;
1603 }
Damien George94f68302014-01-31 23:45:12 +00001604 // copy from just after end of last occurrence of to-be-replaced string to right before start of next occurrence
1605 if (data != NULL) {
1606 memcpy(data + replaced_str_index, offset_ptr, old_occurrence - offset_ptr);
1607 }
1608 replaced_str_index += old_occurrence - offset_ptr;
1609 // copy the replacement string
1610 if (data != NULL) {
1611 memcpy(data + replaced_str_index, new, new_len);
1612 }
1613 replaced_str_index += new_len;
1614 offset_ptr = old_occurrence + old_len;
Damien Georgeff715422014-04-07 00:39:13 +01001615 str_len_remain = str + str_len - offset_ptr;
Damien George94f68302014-01-31 23:45:12 +00001616 num_replacements_done++;
Damien George94f68302014-01-31 23:45:12 +00001617 }
1618
1619 // copy from just after end of last occurrence of to-be-replaced string to end of old string
1620 if (data != NULL) {
Damien Georgeff715422014-04-07 00:39:13 +01001621 memcpy(data + replaced_str_index, offset_ptr, str_len_remain);
Damien George94f68302014-01-31 23:45:12 +00001622 }
Damien Georgeff715422014-04-07 00:39:13 +01001623 replaced_str_index += str_len_remain;
Damien George94f68302014-01-31 23:45:12 +00001624
1625 if (data == NULL) {
1626 // first pass
1627 if (num_replacements_done == 0) {
1628 // no substr found, return original string
1629 return args[0];
1630 } else {
1631 // substr found, allocate new string
Damien George05005f62015-01-21 22:48:37 +00001632 vstr_init_len(&vstr, replaced_str_index);
1633 data = (byte*)vstr.buf;
Damien Georgeff715422014-04-07 00:39:13 +01001634 assert(data != NULL);
Damien George94f68302014-01-31 23:45:12 +00001635 }
1636 } else {
1637 // second pass, we are done
1638 break;
1639 }
xbe480c15a2014-01-30 22:17:30 -08001640 }
Damien George94f68302014-01-31 23:45:12 +00001641
Damien George05005f62015-01-21 22:48:37 +00001642 return mp_obj_new_str_from_vstr(self_type, &vstr);
xbe480c15a2014-01-30 22:17:30 -08001643}
1644
Damien George4b72b3a2016-01-03 14:21:40 +00001645STATIC mp_obj_t str_count(size_t n_args, const mp_obj_t *args) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001646 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
xbe9e1e8cd2014-03-12 22:57:16 -07001647 assert(2 <= n_args && n_args <= 4);
Damien Georgebe8e99c2014-11-05 16:45:54 +00001648 assert(MP_OBJ_IS_STR_OR_BYTES(args[0]));
1649
1650 // check argument type
Damien Georgec55a4d82014-12-24 20:28:30 +00001651 if (mp_obj_get_type(args[1]) != self_type) {
Damien Georgebe8e99c2014-11-05 16:45:54 +00001652 bad_implicit_conversion(args[1]);
1653 }
xbe9e1e8cd2014-03-12 22:57:16 -07001654
1655 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
1656 GET_STR_DATA_LEN(args[1], needle, needle_len);
1657
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001658 const byte *start = haystack;
1659 const byte *end = haystack + haystack_len;
xbe9e1e8cd2014-03-12 22:57:16 -07001660 if (n_args >= 3 && args[2] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001661 start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001662 }
1663 if (n_args >= 4 && args[3] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001664 end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001665 }
1666
Damien George536dde22014-03-13 22:07:55 +00001667 // if needle_len is zero then we count each gap between characters as an occurrence
1668 if (needle_len == 0) {
Paul Sokolovsky9e215fa2014-06-28 23:14:30 +03001669 return MP_OBJ_NEW_SMALL_INT(unichar_charlen((const char*)start, end - start) + 1);
xbe9e1e8cd2014-03-12 22:57:16 -07001670 }
1671
Damien George536dde22014-03-13 22:07:55 +00001672 // count the occurrences
Damien George40f3c022014-07-03 13:25:24 +01001673 mp_int_t num_occurrences = 0;
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001674 for (const byte *haystack_ptr = start; haystack_ptr + needle_len <= end;) {
1675 if (memcmp(haystack_ptr, needle, needle_len) == 0) {
xbec5d70ba2014-03-13 00:29:15 -07001676 num_occurrences++;
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001677 haystack_ptr += needle_len;
1678 } else {
1679 haystack_ptr = utf8_next_char(haystack_ptr);
xbec5d70ba2014-03-13 00:29:15 -07001680 }
xbe9e1e8cd2014-03-12 22:57:16 -07001681 }
1682
1683 return MP_OBJ_NEW_SMALL_INT(num_occurrences);
1684}
1685
Damien George40f3c022014-07-03 13:25:24 +01001686STATIC mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, mp_int_t direction) {
Damien Georgec55a4d82014-12-24 20:28:30 +00001687 assert(MP_OBJ_IS_STR_OR_BYTES(self_in));
Paul Sokolovsky69f3eb22014-05-11 02:44:46 +03001688 mp_obj_type_t *self_type = mp_obj_get_type(self_in);
1689 if (self_type != mp_obj_get_type(arg)) {
Damien Georgec55a4d82014-12-24 20:28:30 +00001690 bad_implicit_conversion(arg);
xbe613a8e32014-03-18 00:06:29 -07001691 }
Damien Georgeb035db32014-03-21 20:39:40 +00001692
xbe613a8e32014-03-18 00:06:29 -07001693 GET_STR_DATA_LEN(self_in, str, str_len);
1694 GET_STR_DATA_LEN(arg, sep, sep_len);
1695
1696 if (sep_len == 0) {
Damien Georgeea13f402014-04-05 18:32:08 +01001697 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
xbe613a8e32014-03-18 00:06:29 -07001698 }
Damien Georgeb035db32014-03-21 20:39:40 +00001699
Damien Georgec55a4d82014-12-24 20:28:30 +00001700 mp_obj_t result[3];
1701 if (self_type == &mp_type_str) {
1702 result[0] = MP_OBJ_NEW_QSTR(MP_QSTR_);
1703 result[1] = MP_OBJ_NEW_QSTR(MP_QSTR_);
1704 result[2] = MP_OBJ_NEW_QSTR(MP_QSTR_);
1705 } else {
1706 result[0] = mp_const_empty_bytes;
1707 result[1] = mp_const_empty_bytes;
1708 result[2] = mp_const_empty_bytes;
1709 }
Damien Georgeb035db32014-03-21 20:39:40 +00001710
1711 if (direction > 0) {
1712 result[0] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001713 } else {
Damien Georgeb035db32014-03-21 20:39:40 +00001714 result[2] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001715 }
xbe613a8e32014-03-18 00:06:29 -07001716
xbe17a5a832014-03-23 23:31:58 -07001717 const byte *position_ptr = find_subbytes(str, str_len, sep, sep_len, direction);
1718 if (position_ptr != NULL) {
Damien George40f3c022014-07-03 13:25:24 +01001719 mp_uint_t position = position_ptr - str;
Damien Georgef600a6a2014-05-25 22:34:34 +01001720 result[0] = mp_obj_new_str_of_type(self_type, str, position);
xbe17a5a832014-03-23 23:31:58 -07001721 result[1] = arg;
Damien Georgef600a6a2014-05-25 22:34:34 +01001722 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 -07001723 }
Damien Georgeb035db32014-03-21 20:39:40 +00001724
xbe0a6894c2014-03-21 01:12:26 -07001725 return mp_obj_new_tuple(3, result);
xbe613a8e32014-03-18 00:06:29 -07001726}
1727
Damien Georgeb035db32014-03-21 20:39:40 +00001728STATIC mp_obj_t str_partition(mp_obj_t self_in, mp_obj_t arg) {
1729 return str_partitioner(self_in, arg, 1);
xbe0a6894c2014-03-21 01:12:26 -07001730}
xbe4504ea82014-03-19 00:46:14 -07001731
Damien Georgeb035db32014-03-21 20:39:40 +00001732STATIC mp_obj_t str_rpartition(mp_obj_t self_in, mp_obj_t arg) {
1733 return str_partitioner(self_in, arg, -1);
xbe4504ea82014-03-19 00:46:14 -07001734}
1735
Paul Sokolovsky69135212014-05-10 19:47:41 +03001736// Supposedly not too critical operations, so optimize for code size
Damien Georgefcc9cf62014-06-01 18:22:09 +01001737STATIC mp_obj_t str_caseconv(unichar (*op)(unichar), mp_obj_t self_in) {
Paul Sokolovsky69135212014-05-10 19:47:41 +03001738 GET_STR_DATA_LEN(self_in, self_data, self_len);
Damien George05005f62015-01-21 22:48:37 +00001739 vstr_t vstr;
1740 vstr_init_len(&vstr, self_len);
1741 byte *data = (byte*)vstr.buf;
Damien George39dc1452014-10-03 19:52:22 +01001742 for (mp_uint_t i = 0; i < self_len; i++) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001743 *data++ = op(*self_data++);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001744 }
Damien George05005f62015-01-21 22:48:37 +00001745 return mp_obj_new_str_from_vstr(mp_obj_get_type(self_in), &vstr);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001746}
1747
1748STATIC mp_obj_t str_lower(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001749 return str_caseconv(unichar_tolower, self_in);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001750}
1751
1752STATIC mp_obj_t str_upper(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001753 return str_caseconv(unichar_toupper, self_in);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001754}
1755
Damien Georgefcc9cf62014-06-01 18:22:09 +01001756STATIC mp_obj_t str_uni_istype(bool (*f)(unichar), mp_obj_t self_in) {
Kim Bautersa3f4b832014-05-31 07:30:03 +01001757 GET_STR_DATA_LEN(self_in, self_data, self_len);
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001758
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001759 if (self_len == 0) {
1760 return mp_const_false; // default to False for empty str
1761 }
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001762
Damien Georgefcc9cf62014-06-01 18:22:09 +01001763 if (f != unichar_isupper && f != unichar_islower) {
Damien George39dc1452014-10-03 19:52:22 +01001764 for (mp_uint_t i = 0; i < self_len; i++) {
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001765 if (!f(*self_data++)) {
1766 return mp_const_false;
1767 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001768 }
1769 } else {
Kim Bautersa3f4b832014-05-31 07:30:03 +01001770 bool contains_alpha = false;
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001771
Damien George39dc1452014-10-03 19:52:22 +01001772 for (mp_uint_t i = 0; i < self_len; i++) { // only check alphanumeric characters
Kim Bautersa3f4b832014-05-31 07:30:03 +01001773 if (unichar_isalpha(*self_data++)) {
1774 contains_alpha = true;
Damien Georgefcc9cf62014-06-01 18:22:09 +01001775 if (!f(*(self_data - 1))) { // -1 because we already incremented above
1776 return mp_const_false;
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001777 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001778 }
1779 }
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001780
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001781 if (!contains_alpha) {
1782 return mp_const_false;
1783 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001784 }
1785
1786 return mp_const_true;
1787}
1788
1789STATIC mp_obj_t str_isspace(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001790 return str_uni_istype(unichar_isspace, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001791}
1792
1793STATIC mp_obj_t str_isalpha(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001794 return str_uni_istype(unichar_isalpha, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001795}
1796
1797STATIC mp_obj_t str_isdigit(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001798 return str_uni_istype(unichar_isdigit, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001799}
1800
1801STATIC mp_obj_t str_isupper(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001802 return str_uni_istype(unichar_isupper, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001803}
1804
1805STATIC mp_obj_t str_islower(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001806 return str_uni_istype(unichar_islower, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001807}
1808
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001809#if MICROPY_CPYTHON_COMPAT
1810// These methods are superfluous in the presense of str() and bytes()
1811// constructors.
1812// TODO: should accept kwargs too
Damien George4b72b3a2016-01-03 14:21:40 +00001813STATIC mp_obj_t bytes_decode(size_t n_args, const mp_obj_t *args) {
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001814 mp_obj_t new_args[2];
1815 if (n_args == 1) {
1816 new_args[0] = args[0];
1817 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1818 args = new_args;
1819 n_args++;
1820 }
Damien George5b3f0b72016-01-03 15:55:55 +00001821 return mp_obj_str_make_new(&mp_type_str, n_args, 0, args);
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001822}
1823
1824// TODO: should accept kwargs too
Damien George4b72b3a2016-01-03 14:21:40 +00001825STATIC mp_obj_t str_encode(size_t n_args, const mp_obj_t *args) {
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001826 mp_obj_t new_args[2];
1827 if (n_args == 1) {
1828 new_args[0] = args[0];
1829 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1830 args = new_args;
1831 n_args++;
1832 }
Damien George5b3f0b72016-01-03 15:55:55 +00001833 return bytes_make_new(NULL, n_args, 0, args);
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001834}
1835#endif
1836
Damien George4d917232014-08-30 14:28:06 +01001837mp_int_t mp_obj_str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
Damien George57a4b4f2014-04-18 22:29:21 +01001838 if (flags == MP_BUFFER_READ) {
Damien George2da98302014-03-09 19:58:18 +00001839 GET_STR_DATA_LEN(self_in, str_data, str_len);
1840 bufinfo->buf = (void*)str_data;
1841 bufinfo->len = str_len;
Damien George12dd8df2016-05-07 21:18:17 +01001842 bufinfo->typecode = 'B'; // bytes should be unsigned, so should unicode byte-access
Damien George2da98302014-03-09 19:58:18 +00001843 return 0;
1844 } else {
1845 // can't write to a string
1846 bufinfo->buf = NULL;
1847 bufinfo->len = 0;
Damien George57a4b4f2014-04-18 22:29:21 +01001848 bufinfo->typecode = -1;
Damien George2da98302014-03-09 19:58:18 +00001849 return 1;
1850 }
1851}
1852
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001853#if MICROPY_CPYTHON_COMPAT
Paul Sokolovsky97319122014-06-13 22:01:26 +03001854MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_decode_obj, 1, 3, bytes_decode);
1855MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_encode_obj, 1, 3, str_encode);
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001856#endif
Paul Sokolovsky97319122014-06-13 22:01:26 +03001857MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj, 2, 4, str_find);
1858MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rfind_obj, 2, 4, str_rfind);
1859MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_index_obj, 2, 4, str_index);
1860MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rindex_obj, 2, 4, str_rindex);
1861MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join);
Paul Sokolovsky87051712015-03-23 22:15:12 +02001862MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, mp_obj_str_split);
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +03001863#if MICROPY_PY_BUILTINS_STR_SPLITLINES
1864MP_DEFINE_CONST_FUN_OBJ_KW(str_splitlines_obj, 1, str_splitlines);
1865#endif
Paul Sokolovsky1b5abfc2016-05-22 00:13:44 +03001866#if MICROPY_PY_BUILTINS_STR_CENTER
1867MP_DEFINE_CONST_FUN_OBJ_2(str_center_obj, str_center);
1868#endif
Paul Sokolovsky97319122014-06-13 22:01:26 +03001869MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rsplit_obj, 1, 3, str_rsplit);
1870MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_startswith_obj, 2, 3, str_startswith);
1871MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_endswith_obj, 2, 3, str_endswith);
1872MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip);
1873MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_lstrip_obj, 1, 2, str_lstrip);
1874MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rstrip_obj, 1, 2, str_rstrip);
Paul Sokolovskyc1144962015-01-04 00:14:13 +02001875MP_DEFINE_CONST_FUN_OBJ_KW(str_format_obj, 1, mp_obj_str_format);
Paul Sokolovsky97319122014-06-13 22:01:26 +03001876MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj, 3, 4, str_replace);
1877MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count);
1878MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition);
1879MP_DEFINE_CONST_FUN_OBJ_2(str_rpartition_obj, str_rpartition);
1880MP_DEFINE_CONST_FUN_OBJ_1(str_lower_obj, str_lower);
1881MP_DEFINE_CONST_FUN_OBJ_1(str_upper_obj, str_upper);
1882MP_DEFINE_CONST_FUN_OBJ_1(str_isspace_obj, str_isspace);
1883MP_DEFINE_CONST_FUN_OBJ_1(str_isalpha_obj, str_isalpha);
1884MP_DEFINE_CONST_FUN_OBJ_1(str_isdigit_obj, str_isdigit);
1885MP_DEFINE_CONST_FUN_OBJ_1(str_isupper_obj, str_isupper);
1886MP_DEFINE_CONST_FUN_OBJ_1(str_islower_obj, str_islower);
Damiend99b0522013-12-21 18:17:45 +00001887
Damien Georgecbf76742015-11-27 13:38:15 +00001888STATIC const mp_rom_map_elem_t str8_locals_dict_table[] = {
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001889#if MICROPY_CPYTHON_COMPAT
Damien Georgecbf76742015-11-27 13:38:15 +00001890 { MP_ROM_QSTR(MP_QSTR_decode), MP_ROM_PTR(&bytes_decode_obj) },
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001891 #if !MICROPY_PY_BUILTINS_STR_UNICODE
1892 // If we have separate unicode type, then here we have methods only
1893 // for bytes type, and it should not have encode() methods. Otherwise,
1894 // we have non-compliant-but-practical bytestring type, which shares
1895 // method table with bytes, so they both have encode() and decode()
1896 // methods (which should do type checking at runtime).
Damien Georgecbf76742015-11-27 13:38:15 +00001897 { MP_ROM_QSTR(MP_QSTR_encode), MP_ROM_PTR(&str_encode_obj) },
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001898 #endif
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001899#endif
Damien Georgecbf76742015-11-27 13:38:15 +00001900 { MP_ROM_QSTR(MP_QSTR_find), MP_ROM_PTR(&str_find_obj) },
1901 { MP_ROM_QSTR(MP_QSTR_rfind), MP_ROM_PTR(&str_rfind_obj) },
1902 { MP_ROM_QSTR(MP_QSTR_index), MP_ROM_PTR(&str_index_obj) },
1903 { MP_ROM_QSTR(MP_QSTR_rindex), MP_ROM_PTR(&str_rindex_obj) },
1904 { MP_ROM_QSTR(MP_QSTR_join), MP_ROM_PTR(&str_join_obj) },
1905 { MP_ROM_QSTR(MP_QSTR_split), MP_ROM_PTR(&str_split_obj) },
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +03001906 #if MICROPY_PY_BUILTINS_STR_SPLITLINES
Damien Georgecbf76742015-11-27 13:38:15 +00001907 { MP_ROM_QSTR(MP_QSTR_splitlines), MP_ROM_PTR(&str_splitlines_obj) },
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +03001908 #endif
Damien Georgecbf76742015-11-27 13:38:15 +00001909 { MP_ROM_QSTR(MP_QSTR_rsplit), MP_ROM_PTR(&str_rsplit_obj) },
1910 { MP_ROM_QSTR(MP_QSTR_startswith), MP_ROM_PTR(&str_startswith_obj) },
1911 { MP_ROM_QSTR(MP_QSTR_endswith), MP_ROM_PTR(&str_endswith_obj) },
1912 { MP_ROM_QSTR(MP_QSTR_strip), MP_ROM_PTR(&str_strip_obj) },
1913 { MP_ROM_QSTR(MP_QSTR_lstrip), MP_ROM_PTR(&str_lstrip_obj) },
1914 { MP_ROM_QSTR(MP_QSTR_rstrip), MP_ROM_PTR(&str_rstrip_obj) },
1915 { MP_ROM_QSTR(MP_QSTR_format), MP_ROM_PTR(&str_format_obj) },
1916 { MP_ROM_QSTR(MP_QSTR_replace), MP_ROM_PTR(&str_replace_obj) },
1917 { MP_ROM_QSTR(MP_QSTR_count), MP_ROM_PTR(&str_count_obj) },
1918 { MP_ROM_QSTR(MP_QSTR_partition), MP_ROM_PTR(&str_partition_obj) },
1919 { MP_ROM_QSTR(MP_QSTR_rpartition), MP_ROM_PTR(&str_rpartition_obj) },
Paul Sokolovsky1b5abfc2016-05-22 00:13:44 +03001920 { MP_ROM_QSTR(MP_QSTR_center), MP_ROM_PTR(&str_center_obj) },
Damien Georgecbf76742015-11-27 13:38:15 +00001921 { MP_ROM_QSTR(MP_QSTR_lower), MP_ROM_PTR(&str_lower_obj) },
1922 { MP_ROM_QSTR(MP_QSTR_upper), MP_ROM_PTR(&str_upper_obj) },
1923 { MP_ROM_QSTR(MP_QSTR_isspace), MP_ROM_PTR(&str_isspace_obj) },
1924 { MP_ROM_QSTR(MP_QSTR_isalpha), MP_ROM_PTR(&str_isalpha_obj) },
1925 { MP_ROM_QSTR(MP_QSTR_isdigit), MP_ROM_PTR(&str_isdigit_obj) },
1926 { MP_ROM_QSTR(MP_QSTR_isupper), MP_ROM_PTR(&str_isupper_obj) },
1927 { MP_ROM_QSTR(MP_QSTR_islower), MP_ROM_PTR(&str_islower_obj) },
ian-v7a16fad2014-01-06 09:52:29 -08001928};
Damien George97209d32014-01-07 15:58:30 +00001929
Paul Sokolovsky6113eb22015-01-23 02:05:58 +02001930STATIC MP_DEFINE_CONST_DICT(str8_locals_dict, str8_locals_dict_table);
Damien George9b196cd2014-03-26 21:47:19 +00001931
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001932#if !MICROPY_PY_BUILTINS_STR_UNICODE
Damien George44e7cbf2015-05-17 16:44:24 +01001933STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str);
1934
Damien George3e1a5c12014-03-29 13:43:38 +00001935const mp_obj_type_t mp_type_str = {
Damien Georgec5966122014-02-15 16:10:44 +00001936 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001937 .name = MP_QSTR_str,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001938 .print = str_print,
Paul Sokolovsky344e15b2015-01-23 02:15:56 +02001939 .make_new = mp_obj_str_make_new,
Damien Georgee04a44e2014-06-28 10:27:23 +01001940 .binary_op = mp_obj_str_binary_op,
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +03001941 .subscr = bytes_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001942 .getiter = mp_obj_new_str_iterator,
Damien Georgee04a44e2014-06-28 10:27:23 +01001943 .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
Damien George999cedb2015-11-27 17:01:44 +00001944 .locals_dict = (mp_obj_dict_t*)&str8_locals_dict,
Damiend99b0522013-12-21 18:17:45 +00001945};
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001946#endif
Damiend99b0522013-12-21 18:17:45 +00001947
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001948// Reuses most of methods from str
Damien George3e1a5c12014-03-29 13:43:38 +00001949const mp_obj_type_t mp_type_bytes = {
Damien Georgec5966122014-02-15 16:10:44 +00001950 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001951 .name = MP_QSTR_bytes,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001952 .print = str_print,
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001953 .make_new = bytes_make_new,
Damien Georgee04a44e2014-06-28 10:27:23 +01001954 .binary_op = mp_obj_str_binary_op,
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +03001955 .subscr = bytes_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001956 .getiter = mp_obj_new_bytes_iterator,
Damien Georgee04a44e2014-06-28 10:27:23 +01001957 .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
Damien George999cedb2015-11-27 17:01:44 +00001958 .locals_dict = (mp_obj_dict_t*)&str8_locals_dict,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001959};
1960
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001961// the zero-length bytes
Damien George20f59e12014-10-11 17:56:43 +01001962const mp_obj_str_t mp_const_empty_bytes_obj = {{&mp_type_bytes}, 0, 0, NULL};
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001963
Damien George77089be2015-01-21 23:08:36 +00001964// Create a str/bytes object using the given data. New memory is allocated and
1965// the data is copied across.
Damien George999cedb2015-11-27 17:01:44 +00001966mp_obj_t mp_obj_new_str_of_type(const mp_obj_type_t *type, const byte* data, size_t len) {
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001967 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001968 o->base.type = type;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001969 o->len = len;
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001970 if (data) {
1971 o->hash = qstr_compute_hash(data, len);
1972 byte *p = m_new(byte, len + 1);
1973 o->data = p;
1974 memcpy(p, data, len * sizeof(byte));
1975 p[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
1976 }
Damien George999cedb2015-11-27 17:01:44 +00001977 return MP_OBJ_FROM_PTR(o);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001978}
1979
Damien George77089be2015-01-21 23:08:36 +00001980// Create a str/bytes object from the given vstr. The vstr buffer is resized to
1981// the exact length required and then reused for the str/bytes object. The vstr
1982// is cleared and can safely be passed to vstr_free if it was heap allocated.
Damien George0b9ee862015-01-21 19:14:25 +00001983mp_obj_t mp_obj_new_str_from_vstr(const mp_obj_type_t *type, vstr_t *vstr) {
1984 // if not a bytes object, look if a qstr with this data already exists
1985 if (type == &mp_type_str) {
1986 qstr q = qstr_find_strn(vstr->buf, vstr->len);
1987 if (q != MP_QSTR_NULL) {
1988 vstr_clear(vstr);
1989 vstr->alloc = 0;
1990 return MP_OBJ_NEW_QSTR(q);
1991 }
1992 }
1993
1994 // make a new str/bytes object
1995 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
1996 o->base.type = type;
1997 o->len = vstr->len;
1998 o->hash = qstr_compute_hash((byte*)vstr->buf, vstr->len);
Dave Hylands9f76dcd2015-05-18 13:25:36 -07001999 if (vstr->len + 1 == vstr->alloc) {
2000 o->data = (byte*)vstr->buf;
2001 } else {
2002 o->data = (byte*)m_renew(char, vstr->buf, vstr->alloc, vstr->len + 1);
2003 }
Damien George0d3cb672015-01-28 23:43:01 +00002004 ((byte*)o->data)[o->len] = '\0'; // add null byte
Damien George0b9ee862015-01-21 19:14:25 +00002005 vstr->buf = NULL;
2006 vstr->alloc = 0;
Damien George999cedb2015-11-27 17:01:44 +00002007 return MP_OBJ_FROM_PTR(o);
Damien George0b9ee862015-01-21 19:14:25 +00002008}
2009
Damien Georged182b982014-08-30 14:19:41 +01002010mp_obj_t mp_obj_new_str(const char* data, mp_uint_t len, bool make_qstr_if_not_already) {
Damien Georgef600a6a2014-05-25 22:34:34 +01002011 if (make_qstr_if_not_already) {
2012 // use existing, or make a new qstr
Damien George2617eeb2014-05-25 22:27:57 +01002013 return MP_OBJ_NEW_QSTR(qstr_from_strn(data, len));
Damien George5fa93b62014-01-22 14:35:10 +00002014 } else {
Damien Georgef600a6a2014-05-25 22:34:34 +01002015 qstr q = qstr_find_strn(data, len);
2016 if (q != MP_QSTR_NULL) {
2017 // qstr with this data already exists
2018 return MP_OBJ_NEW_QSTR(q);
2019 } else {
2020 // no existing qstr, don't make one
2021 return mp_obj_new_str_of_type(&mp_type_str, (const byte*)data, len);
2022 }
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02002023 }
Damien George5fa93b62014-01-22 14:35:10 +00002024}
2025
Paul Sokolovskyb4efac12014-06-08 01:13:35 +03002026mp_obj_t mp_obj_str_intern(mp_obj_t str) {
2027 GET_STR_DATA_LEN(str, data, len);
2028 return MP_OBJ_NEW_QSTR(qstr_from_strn((const char*)data, len));
2029}
2030
Damien Georged182b982014-08-30 14:19:41 +01002031mp_obj_t mp_obj_new_bytes(const byte* data, mp_uint_t len) {
Damien Georgef600a6a2014-05-25 22:34:34 +01002032 return mp_obj_new_str_of_type(&mp_type_bytes, data, len);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02002033}
2034
Damien George5fa93b62014-01-22 14:35:10 +00002035bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) {
2036 if (MP_OBJ_IS_QSTR(s1) && MP_OBJ_IS_QSTR(s2)) {
2037 return s1 == s2;
2038 } else {
2039 GET_STR_HASH(s1, h1);
2040 GET_STR_HASH(s2, h2);
Paul Sokolovsky59e269c2014-04-14 01:43:01 +03002041 // If any of hashes is 0, it means it's not valid
2042 if (h1 != 0 && h2 != 0 && h1 != h2) {
Damien George5fa93b62014-01-22 14:35:10 +00002043 return false;
2044 }
2045 GET_STR_DATA_LEN(s1, d1, l1);
2046 GET_STR_DATA_LEN(s2, d2, l2);
2047 if (l1 != l2) {
2048 return false;
2049 }
Damien George1e708fe2014-01-23 18:27:51 +00002050 return memcmp(d1, d2, l1) == 0;
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02002051 }
Damien George5fa93b62014-01-22 14:35:10 +00002052}
2053
Damien Georgedeed0872014-04-06 11:11:15 +01002054STATIC void bad_implicit_conversion(mp_obj_t self_in) {
Damien George1e9a92f2014-11-06 17:36:16 +00002055 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
2056 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
2057 "can't convert to str implicitly"));
2058 } else {
2059 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
2060 "can't convert '%s' object to str implicitly",
2061 mp_obj_get_type_str(self_in)));
2062 }
Damien Georgeb829b5c2014-01-25 13:51:19 +00002063}
2064
Damien Georgeb829b5c2014-01-25 13:51:19 +00002065// use this if you will anyway convert the string to a qstr
2066// will be more efficient for the case where it's already a qstr
2067qstr mp_obj_str_get_qstr(mp_obj_t self_in) {
2068 if (MP_OBJ_IS_QSTR(self_in)) {
2069 return MP_OBJ_QSTR_VALUE(self_in);
Damien George3e1a5c12014-03-29 13:43:38 +00002070 } else if (MP_OBJ_IS_TYPE(self_in, &mp_type_str)) {
Damien George999cedb2015-11-27 17:01:44 +00002071 mp_obj_str_t *self = MP_OBJ_TO_PTR(self_in);
Damien Georgeb829b5c2014-01-25 13:51:19 +00002072 return qstr_from_strn((char*)self->data, self->len);
2073 } else {
2074 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00002075 }
2076}
2077
2078// only use this function if you need the str data to be zero terminated
2079// at the moment all strings are zero terminated to help with C ASCIIZ compatibility
2080const char *mp_obj_str_get_str(mp_obj_t self_in) {
Paul Sokolovsky31619cc2014-10-30 16:36:41 +02002081 if (MP_OBJ_IS_STR_OR_BYTES(self_in)) {
Damien George5fa93b62014-01-22 14:35:10 +00002082 GET_STR_DATA_LEN(self_in, s, l);
2083 (void)l; // len unused
2084 return (const char*)s;
2085 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00002086 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00002087 }
2088}
2089
Damien Georged182b982014-08-30 14:19:41 +01002090const char *mp_obj_str_get_data(mp_obj_t self_in, mp_uint_t *len) {
Dave Hylandsb7f7c652014-08-26 12:44:46 -07002091 if (MP_OBJ_IS_STR_OR_BYTES(self_in)) {
Damien George5fa93b62014-01-22 14:35:10 +00002092 GET_STR_DATA_LEN(self_in, s, l);
2093 *len = l;
Damien George698ec212014-02-08 18:17:23 +00002094 return (const char*)s;
Damien George5fa93b62014-01-22 14:35:10 +00002095 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00002096 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00002097 }
Damiend99b0522013-12-21 18:17:45 +00002098}
xyb8cfc9f02014-01-05 18:47:51 +08002099
Damien George04353cc2015-10-18 23:09:04 +01002100#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C
Damien Georgec3f64d92015-11-27 12:23:18 +00002101const byte *mp_obj_str_get_data_no_check(mp_obj_t self_in, size_t *len) {
Damien George04353cc2015-10-18 23:09:04 +01002102 if (MP_OBJ_IS_QSTR(self_in)) {
2103 return qstr_data(MP_OBJ_QSTR_VALUE(self_in), len);
2104 } else {
2105 *len = ((mp_obj_str_t*)self_in)->len;
2106 return ((mp_obj_str_t*)self_in)->data;
2107 }
2108}
2109#endif
2110
xyb8cfc9f02014-01-05 18:47:51 +08002111/******************************************************************************/
2112/* str iterator */
2113
Damien George44e7cbf2015-05-17 16:44:24 +01002114typedef struct _mp_obj_str8_it_t {
xyb8cfc9f02014-01-05 18:47:51 +08002115 mp_obj_base_t base;
Damien George8212d972016-01-03 16:27:55 +00002116 mp_fun_1_t iternext;
Damien George5fa93b62014-01-22 14:35:10 +00002117 mp_obj_t str;
Damien George40f3c022014-07-03 13:25:24 +01002118 mp_uint_t cur;
Damien George44e7cbf2015-05-17 16:44:24 +01002119} mp_obj_str8_it_t;
xyb8cfc9f02014-01-05 18:47:51 +08002120
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03002121#if !MICROPY_PY_BUILTINS_STR_UNICODE
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02002122STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
Damien George44e7cbf2015-05-17 16:44:24 +01002123 mp_obj_str8_it_t *self = self_in;
Damien George5fa93b62014-01-22 14:35:10 +00002124 GET_STR_DATA_LEN(self->str, str, len);
2125 if (self->cur < len) {
Damien George2617eeb2014-05-25 22:27:57 +01002126 mp_obj_t o_out = mp_obj_new_str((const char*)str + self->cur, 1, true);
xyb8cfc9f02014-01-05 18:47:51 +08002127 self->cur += 1;
2128 return o_out;
2129 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01002130 return MP_OBJ_STOP_ITERATION;
xyb8cfc9f02014-01-05 18:47:51 +08002131 }
2132}
2133
Damien George44e7cbf2015-05-17 16:44:24 +01002134STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str) {
2135 mp_obj_str8_it_t *o = m_new_obj(mp_obj_str8_it_t);
Damien George8212d972016-01-03 16:27:55 +00002136 o->base.type = &mp_type_polymorph_iter;
2137 o->iternext = str_it_iternext;
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03002138 o->str = str;
2139 o->cur = 0;
2140 return o;
2141}
2142#endif
2143
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02002144STATIC mp_obj_t bytes_it_iternext(mp_obj_t self_in) {
Damien George999cedb2015-11-27 17:01:44 +00002145 mp_obj_str8_it_t *self = MP_OBJ_TO_PTR(self_in);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02002146 GET_STR_DATA_LEN(self->str, str, len);
2147 if (self->cur < len) {
Damien Georgebb4c6f32014-07-31 10:49:14 +01002148 mp_obj_t o_out = MP_OBJ_NEW_SMALL_INT(str[self->cur]);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02002149 self->cur += 1;
2150 return o_out;
2151 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01002152 return MP_OBJ_STOP_ITERATION;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02002153 }
2154}
2155
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02002156mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str) {
Damien George44e7cbf2015-05-17 16:44:24 +01002157 mp_obj_str8_it_t *o = m_new_obj(mp_obj_str8_it_t);
Damien George8212d972016-01-03 16:27:55 +00002158 o->base.type = &mp_type_polymorph_iter;
2159 o->iternext = bytes_it_iternext;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02002160 o->str = str;
2161 o->cur = 0;
Damien George999cedb2015-11-27 17:01:44 +00002162 return MP_OBJ_FROM_PTR(o);
xyb8cfc9f02014-01-05 18:47:51 +08002163}