blob: 854878ca93471d8710915e5a66a13a0b8e7ee1a6 [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"
37#include "py/pfenv.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 Sokolovskyd215ee12014-06-13 22:41:45 +030041mp_obj_t mp_obj_new_str_iterator(mp_obj_t str);
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020042STATIC mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str);
Paul Sokolovskye9085912014-04-30 05:35:18 +030043STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in);
Paul Sokolovsky69f3eb22014-05-11 02:44:46 +030044
xyb8cfc9f02014-01-05 18:47:51 +080045/******************************************************************************/
46/* str */
47
Paul Sokolovsky2ec38a12014-06-13 21:23:00 +030048void mp_str_print_quoted(void (*print)(void *env, const char *fmt, ...), void *env,
Damien Georged182b982014-08-30 14:19:41 +010049 const byte *str_data, mp_uint_t str_len, bool is_bytes) {
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020050 // this escapes characters, but it will be very slow to print (calling print many times)
51 bool has_single_quote = false;
52 bool has_double_quote = false;
Chris Angelico48674132014-06-04 03:26:40 +100053 for (const byte *s = str_data, *top = str_data + str_len; !has_double_quote && s < top; s++) {
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020054 if (*s == '\'') {
55 has_single_quote = true;
56 } else if (*s == '"') {
57 has_double_quote = true;
58 }
59 }
60 int quote_char = '\'';
61 if (has_single_quote && !has_double_quote) {
62 quote_char = '"';
63 }
64 print(env, "%c", quote_char);
65 for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) {
66 if (*s == quote_char) {
67 print(env, "\\%c", quote_char);
68 } else if (*s == '\\') {
69 print(env, "\\\\");
Paul Sokolovsky2ec38a12014-06-13 21:23:00 +030070 } else if (*s >= 0x20 && *s != 0x7f && (!is_bytes || *s < 0x80)) {
71 // In strings, anything which is not ascii control character
72 // is printed as is, this includes characters in range 0x80-0xff
73 // (which can be non-Latin letters, etc.)
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020074 print(env, "%c", *s);
75 } else if (*s == '\n') {
76 print(env, "\\n");
Andrew Scheller12968fb2014-04-08 02:42:50 +010077 } else if (*s == '\r') {
78 print(env, "\\r");
79 } else if (*s == '\t') {
80 print(env, "\\t");
Paul Sokolovsky0b7e29c2014-01-28 03:40:06 +020081 } else {
82 print(env, "\\x%02x", *s);
83 }
84 }
85 print(env, "%c", quote_char);
86}
87
Damien George612045f2014-09-17 22:56:34 +010088#if MICROPY_PY_UJSON
Damien Georgecde0ca22014-09-25 17:35:56 +010089void mp_str_print_json(void (*print)(void *env, const char *fmt, ...), void *env, const byte *str_data, mp_uint_t str_len) {
90 // for JSON spec, see http://www.ietf.org/rfc/rfc4627.txt
91 // if we are given a valid utf8-encoded string, we will print it in a JSON-conforming way
Damien George612045f2014-09-17 22:56:34 +010092 print(env, "\"");
93 for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) {
Damien Georgecde0ca22014-09-25 17:35:56 +010094 if (*s == '"' || *s == '\\') {
Damien George612045f2014-09-17 22:56:34 +010095 print(env, "\\%c", *s);
Damien Georgecde0ca22014-09-25 17:35:56 +010096 } else if (*s >= 32) {
97 // this will handle normal and utf-8 encoded chars
Damien George612045f2014-09-17 22:56:34 +010098 print(env, "%c", *s);
Damien George612045f2014-09-17 22:56:34 +010099 } else if (*s == '\n') {
100 print(env, "\\n");
101 } else if (*s == '\r') {
102 print(env, "\\r");
103 } else if (*s == '\t') {
104 print(env, "\\t");
105 } else {
Damien Georgecde0ca22014-09-25 17:35:56 +0100106 // this will handle control chars
Damien George612045f2014-09-17 22:56:34 +0100107 print(env, "\\u%04x", *s);
108 }
109 }
110 print(env, "\"");
111}
112#endif
113
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200114STATIC void str_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
Damien George5fa93b62014-01-22 14:35:10 +0000115 GET_STR_DATA_LEN(self_in, str_data, str_len);
Damien George612045f2014-09-17 22:56:34 +0100116 #if MICROPY_PY_UJSON
117 if (kind == PRINT_JSON) {
Damien Georgecde0ca22014-09-25 17:35:56 +0100118 mp_str_print_json(print, env, str_data, str_len);
Damien George612045f2014-09-17 22:56:34 +0100119 return;
120 }
121 #endif
Damien Georgecde0ca22014-09-25 17:35:56 +0100122 bool is_bytes = MP_OBJ_IS_TYPE(self_in, &mp_type_bytes);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +0200123 if (kind == PRINT_STR && !is_bytes) {
Damien George5fa93b62014-01-22 14:35:10 +0000124 print(env, "%.*s", str_len, str_data);
Paul Sokolovsky76d982e2014-01-13 19:19:16 +0200125 } else {
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +0200126 if (is_bytes) {
127 print(env, "b");
128 }
Paul Sokolovsky2ec38a12014-06-13 21:23:00 +0300129 mp_str_print_quoted(print, env, str_data, str_len, is_bytes);
Paul Sokolovsky76d982e2014-01-13 19:19:16 +0200130 }
Damiend99b0522013-12-21 18:17:45 +0000131}
132
Paul Sokolovsky344e15b2015-01-23 02:15:56 +0200133mp_obj_t mp_obj_str_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
Paul Sokolovskyb473d0a2014-05-06 19:30:30 +0300134#if MICROPY_CPYTHON_COMPAT
135 if (n_kw != 0) {
136 mp_arg_error_unimpl_kw();
137 }
138#endif
139
Damien George1e9a92f2014-11-06 17:36:16 +0000140 mp_arg_check_num(n_args, n_kw, 0, 3, false);
141
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200142 switch (n_args) {
143 case 0:
144 return MP_OBJ_NEW_QSTR(MP_QSTR_);
145
Damien George1e9a92f2014-11-06 17:36:16 +0000146 case 1: {
Damien George0b9ee862015-01-21 19:14:25 +0000147 vstr_t vstr;
148 vstr_init(&vstr, 16);
149 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, &vstr, args[0], PRINT_STR);
150 return mp_obj_new_str_from_vstr(type_in, &vstr);
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200151 }
152
Damien George1e9a92f2014-11-06 17:36:16 +0000153 default: // 2 or 3 args
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200154 // TODO: validate 2nd/3rd args
Paul Sokolovskye62a0fe2014-10-30 23:58:08 +0200155 if (MP_OBJ_IS_TYPE(args[0], &mp_type_bytes)) {
156 GET_STR_DATA_LEN(args[0], str_data, str_len);
157 GET_STR_HASH(args[0], str_hash);
Damien George0b9ee862015-01-21 19:14:25 +0000158 mp_obj_str_t *o = mp_obj_new_str_of_type(type_in, NULL, str_len);
Paul Sokolovskye62a0fe2014-10-30 23:58:08 +0200159 o->data = str_data;
160 o->hash = str_hash;
161 return o;
162 } else {
163 mp_buffer_info_t bufinfo;
164 mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
165 return mp_obj_new_str(bufinfo.buf, bufinfo.len, false);
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200166 }
Paul Sokolovskybe020c22014-03-21 11:39:01 +0200167 }
168}
169
Damien Georgeecc88e92014-08-30 00:35:11 +0100170STATIC mp_obj_t bytes_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
Damien Georgeff8dd3f2015-01-20 12:47:20 +0000171 (void)type_in;
172
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200173 if (n_args == 0) {
174 return mp_const_empty_bytes;
175 }
176
Paul Sokolovskyb473d0a2014-05-06 19:30:30 +0300177#if MICROPY_CPYTHON_COMPAT
178 if (n_kw != 0) {
179 mp_arg_error_unimpl_kw();
180 }
181#endif
182
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200183 if (MP_OBJ_IS_STR(args[0])) {
184 if (n_args < 2 || n_args > 3) {
185 goto wrong_args;
186 }
187 GET_STR_DATA_LEN(args[0], str_data, str_len);
188 GET_STR_HASH(args[0], str_hash);
Damien Georgef600a6a2014-05-25 22:34:34 +0100189 mp_obj_str_t *o = mp_obj_new_str_of_type(&mp_type_bytes, NULL, str_len);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200190 o->data = str_data;
191 o->hash = str_hash;
192 return o;
193 }
194
195 if (n_args > 1) {
196 goto wrong_args;
197 }
198
199 if (MP_OBJ_IS_SMALL_INT(args[0])) {
200 uint len = MP_OBJ_SMALL_INT_VALUE(args[0]);
Damien George05005f62015-01-21 22:48:37 +0000201 vstr_t vstr;
202 vstr_init_len(&vstr, len);
203 memset(vstr.buf, 0, len);
204 return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200205 }
206
Damien George32ef3a32014-12-04 15:46:14 +0000207 // check if argument has the buffer protocol
208 mp_buffer_info_t bufinfo;
209 if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_READ)) {
210 return mp_obj_new_str_of_type(&mp_type_bytes, bufinfo.buf, bufinfo.len);
211 }
212
Damien George0b9ee862015-01-21 19:14:25 +0000213 vstr_t vstr;
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200214 // Try to create array of exact len if initializer len is known
215 mp_obj_t len_in = mp_obj_len_maybe(args[0]);
216 if (len_in == MP_OBJ_NULL) {
Damien George0b9ee862015-01-21 19:14:25 +0000217 vstr_init(&vstr, 16);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200218 } else {
Damien George0b9ee862015-01-21 19:14:25 +0000219 mp_int_t len = MP_OBJ_SMALL_INT_VALUE(len_in);
Damien George0d3cb672015-01-28 23:43:01 +0000220 vstr_init(&vstr, len);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200221 }
222
Damien Georged17926d2014-03-30 13:35:08 +0100223 mp_obj_t iterable = mp_getiter(args[0]);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200224 mp_obj_t item;
Damien Georgeea8d06c2014-04-17 23:19:36 +0100225 while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
Paul Sokolovsky194117a2015-02-09 12:11:49 +0800226 vstr_add_byte(&vstr, mp_obj_get_int(item));
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200227 }
228
Damien George0b9ee862015-01-21 19:14:25 +0000229 return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200230
231wrong_args:
Damien George1e9a92f2014-11-06 17:36:16 +0000232 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "wrong number of arguments"));
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +0200233}
234
Damien George55baff42014-01-21 21:40:13 +0000235// like strstr but with specified length and allows \0 bytes
236// TODO replace with something more efficient/standard
Damien George40f3c022014-07-03 13:25:24 +0100237STATIC const byte *find_subbytes(const byte *haystack, mp_uint_t hlen, const byte *needle, mp_uint_t nlen, mp_int_t direction) {
Damien George55baff42014-01-21 21:40:13 +0000238 if (hlen >= nlen) {
Damien George40f3c022014-07-03 13:25:24 +0100239 mp_uint_t str_index, str_index_end;
xbe17a5a832014-03-23 23:31:58 -0700240 if (direction > 0) {
241 str_index = 0;
242 str_index_end = hlen - nlen;
243 } else {
244 str_index = hlen - nlen;
245 str_index_end = 0;
246 }
247 for (;;) {
248 if (memcmp(&haystack[str_index], needle, nlen) == 0) {
249 //found
250 return haystack + str_index;
Damien George55baff42014-01-21 21:40:13 +0000251 }
xbe17a5a832014-03-23 23:31:58 -0700252 if (str_index == str_index_end) {
253 //not found
254 break;
Damien George55baff42014-01-21 21:40:13 +0000255 }
xbe17a5a832014-03-23 23:31:58 -0700256 str_index += direction;
Damien George55baff42014-01-21 21:40:13 +0000257 }
258 }
259 return NULL;
260}
261
Damien Georgea75b02e2014-08-27 09:20:30 +0100262// Note: this function is used to check if an object is a str or bytes, which
263// works because both those types use it as their binary_op method. Revisit
264// MP_OBJ_IS_STR_OR_BYTES if this fact changes.
Damien Georgeecc88e92014-08-30 00:35:11 +0100265mp_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 +0000266 // check for modulo
267 if (op == MP_BINARY_OP_MODULO) {
268 mp_obj_t *args;
269 mp_uint_t n_args;
270 mp_obj_t dict = MP_OBJ_NULL;
271 if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple)) {
272 // TODO: Support tuple subclasses?
273 mp_obj_tuple_get(rhs_in, &n_args, &args);
274 } else if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_dict)) {
275 args = NULL;
276 n_args = 0;
277 dict = rhs_in;
278 } else {
279 args = &rhs_in;
280 n_args = 1;
281 }
282 return str_modulo_format(lhs_in, n_args, args, dict);
283 }
284
285 // from now on we need lhs type and data, so extract them
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300286 mp_obj_type_t *lhs_type = mp_obj_get_type(lhs_in);
Damien Georgea65c03c2014-11-05 16:30:34 +0000287 GET_STR_DATA_LEN(lhs_in, lhs_data, lhs_len);
288
289 // check for multiply
290 if (op == MP_BINARY_OP_MULTIPLY) {
291 mp_int_t n;
292 if (!mp_obj_get_int_maybe(rhs_in, &n)) {
293 return MP_OBJ_NULL; // op not supported
294 }
295 if (n <= 0) {
296 if (lhs_type == &mp_type_str) {
297 return MP_OBJ_NEW_QSTR(MP_QSTR_); // empty str
298 } else {
299 return mp_const_empty_bytes;
300 }
301 }
Damien George05005f62015-01-21 22:48:37 +0000302 vstr_t vstr;
303 vstr_init_len(&vstr, lhs_len * n);
304 mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, vstr.buf);
305 return mp_obj_new_str_from_vstr(lhs_type, &vstr);
Damien Georgea65c03c2014-11-05 16:30:34 +0000306 }
307
308 // From now on all operations allow:
309 // - str with str
310 // - bytes with bytes
311 // - bytes with bytearray
312 // - bytes with array.array
313 // To do this efficiently we use the buffer protocol to extract the raw
314 // data for the rhs, but only if the lhs is a bytes object.
315 //
316 // NOTE: CPython does not allow comparison between bytes ard array.array
317 // (even if the array is of type 'b'), even though it allows addition of
318 // such types. We are not compatible with this (we do allow comparison
319 // of bytes with anything that has the buffer protocol). It would be
320 // easy to "fix" this with a bit of extra logic below, but it costs code
321 // size and execution time so we don't.
322
323 const byte *rhs_data;
324 mp_uint_t rhs_len;
325 if (lhs_type == mp_obj_get_type(rhs_in)) {
326 GET_STR_DATA_LEN(rhs_in, rhs_data_, rhs_len_);
327 rhs_data = rhs_data_;
328 rhs_len = rhs_len_;
329 } else if (lhs_type == &mp_type_bytes) {
330 mp_buffer_info_t bufinfo;
331 if (!mp_get_buffer(rhs_in, &bufinfo, MP_BUFFER_READ)) {
Damien Georgee233a552015-01-11 21:07:15 +0000332 return MP_OBJ_NULL; // op not supported
Damien Georgea65c03c2014-11-05 16:30:34 +0000333 }
334 rhs_data = bufinfo.buf;
335 rhs_len = bufinfo.len;
336 } else {
337 // incompatible types
Damien Georgea65c03c2014-11-05 16:30:34 +0000338 return MP_OBJ_NULL; // op not supported
339 }
340
Damiend99b0522013-12-21 18:17:45 +0000341 switch (op) {
Damien Georged17926d2014-03-30 13:35:08 +0100342 case MP_BINARY_OP_ADD:
Damien Georgea65c03c2014-11-05 16:30:34 +0000343 case MP_BINARY_OP_INPLACE_ADD: {
Damien George05005f62015-01-21 22:48:37 +0000344 vstr_t vstr;
345 vstr_init_len(&vstr, lhs_len + rhs_len);
346 memcpy(vstr.buf, lhs_data, lhs_len);
347 memcpy(vstr.buf + lhs_len, rhs_data, rhs_len);
348 return mp_obj_new_str_from_vstr(lhs_type, &vstr);
Paul Sokolovsky545591a2014-01-21 00:27:33 +0200349 }
Paul Sokolovsky87e85b72014-02-02 08:24:07 +0200350
Damien Georgea65c03c2014-11-05 16:30:34 +0000351 case MP_BINARY_OP_IN:
352 /* NOTE `a in b` is `b.__contains__(a)` */
353 return MP_BOOL(find_subbytes(lhs_data, lhs_len, rhs_data, rhs_len, 1) != NULL);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +0300354
Paul Sokolovsky7b0f9a72014-05-10 04:26:10 +0300355 //case MP_BINARY_OP_NOT_EQUAL: // This is never passed here
356 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 +0100357 case MP_BINARY_OP_LESS:
358 case MP_BINARY_OP_LESS_EQUAL:
359 case MP_BINARY_OP_MORE:
360 case MP_BINARY_OP_MORE_EQUAL:
Damien Georgea65c03c2014-11-05 16:30:34 +0000361 return MP_BOOL(mp_seq_cmp_bytes(op, lhs_data, lhs_len, rhs_data, rhs_len));
Damiend99b0522013-12-21 18:17:45 +0000362 }
363
Damien George6ac5dce2014-05-21 19:42:43 +0100364 return MP_OBJ_NULL; // op not supported
Damiend99b0522013-12-21 18:17:45 +0000365}
366
Paul Sokolovskyea2c9362014-06-15 00:35:09 +0300367#if !MICROPY_PY_BUILTINS_STR_UNICODE
368// objstrunicode defines own version
Damien George4abff752014-08-30 14:59:21 +0100369const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, mp_uint_t self_len,
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300370 mp_obj_t index, bool is_slice) {
Damien George40f3c022014-07-03 13:25:24 +0100371 mp_uint_t index_val = mp_get_index(type, self_len, index, is_slice);
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300372 return self_data + index_val;
373}
Paul Sokolovskyea2c9362014-06-15 00:35:09 +0300374#endif
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300375
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300376// This is used for both bytes and 8-bit strings. This is not used for unicode strings.
377STATIC 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 +0300378 mp_obj_type_t *type = mp_obj_get_type(self_in);
Damien George729f7b42014-04-17 22:10:53 +0100379 GET_STR_DATA_LEN(self_in, self_data, self_len);
380 if (value == MP_OBJ_SENTINEL) {
381 // load
Damien Georgefb510b32014-06-01 13:32:54 +0100382#if MICROPY_PY_BUILTINS_SLICE
Damien George729f7b42014-04-17 22:10:53 +0100383 if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
Paul Sokolovskyde4b9322014-05-25 21:21:57 +0300384 mp_bound_slice_t slice;
385 if (!mp_seq_get_fast_slice_indexes(self_len, index, &slice)) {
Paul Sokolovsky5fd5af92014-05-25 22:12:56 +0300386 nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,
Damien George11de8392014-06-05 18:57:38 +0100387 "only slices with step=1 (aka None) are supported"));
Damien George729f7b42014-04-17 22:10:53 +0100388 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100389 return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start);
Damien George729f7b42014-04-17 22:10:53 +0100390 }
391#endif
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300392 mp_uint_t index_val = mp_get_index(type, self_len, index, false);
Damien George2eb1f602014-08-11 23:24:29 +0100393 // If we have unicode enabled the type will always be bytes, so take the short cut.
394 if (MICROPY_PY_BUILTINS_STR_UNICODE || type == &mp_type_bytes) {
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300395 return MP_OBJ_NEW_SMALL_INT(self_data[index_val]);
Damien George729f7b42014-04-17 22:10:53 +0100396 } else {
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +0300397 return mp_obj_new_str((char*)&self_data[index_val], 1, true);
Damien George729f7b42014-04-17 22:10:53 +0100398 }
399 } else {
Damien George6ac5dce2014-05-21 19:42:43 +0100400 return MP_OBJ_NULL; // op not supported
Damien George729f7b42014-04-17 22:10:53 +0100401 }
402}
403
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200404STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
Dave Hylandsb7f7c652014-08-26 12:44:46 -0700405 assert(MP_OBJ_IS_STR_OR_BYTES(self_in));
Paul Sokolovsky5e5d69b2014-05-11 21:13:01 +0300406 const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
Damiend99b0522013-12-21 18:17:45 +0000407
Damien Georgefe8fb912014-01-02 16:36:09 +0000408 // get separation string
Damien George5fa93b62014-01-22 14:35:10 +0000409 GET_STR_DATA_LEN(self_in, sep_str, sep_len);
Damien Georgefe8fb912014-01-02 16:36:09 +0000410
411 // process args
Damien George9c4cbe22014-08-30 14:04:14 +0100412 mp_uint_t seq_len;
Damiend99b0522013-12-21 18:17:45 +0000413 mp_obj_t *seq_items;
Damien George07ddab52014-03-29 13:15:08 +0000414 if (MP_OBJ_IS_TYPE(arg, &mp_type_tuple)) {
Damiend99b0522013-12-21 18:17:45 +0000415 mp_obj_tuple_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000416 } else {
Damien Georgea157e4c2014-04-09 19:17:53 +0100417 if (!MP_OBJ_IS_TYPE(arg, &mp_type_list)) {
418 // arg is not a list, try to convert it to one
Paul Sokolovsky881d9af2014-04-10 01:42:40 +0300419 // TODO: Try to optimize?
Damien Georgea157e4c2014-04-09 19:17:53 +0100420 arg = mp_type_list.make_new((mp_obj_t)&mp_type_list, 1, 0, &arg);
421 }
422 mp_obj_list_get(arg, &seq_len, &seq_items);
Damiend99b0522013-12-21 18:17:45 +0000423 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000424
425 // count required length
Damien George39dc1452014-10-03 19:52:22 +0100426 mp_uint_t required_len = 0;
427 for (mp_uint_t i = 0; i < seq_len; i++) {
Paul Sokolovsky5e5d69b2014-05-11 21:13:01 +0300428 if (mp_obj_get_type(seq_items[i]) != self_type) {
429 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
430 "join expects a list of str/bytes objects consistent with self object"));
Damiend99b0522013-12-21 18:17:45 +0000431 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000432 if (i > 0) {
433 required_len += sep_len;
434 }
Damien George5fa93b62014-01-22 14:35:10 +0000435 GET_STR_LEN(seq_items[i], l);
436 required_len += l;
Damiend99b0522013-12-21 18:17:45 +0000437 }
438
439 // make joined string
Damien George05005f62015-01-21 22:48:37 +0000440 vstr_t vstr;
441 vstr_init_len(&vstr, required_len);
442 byte *data = (byte*)vstr.buf;
Damien George39dc1452014-10-03 19:52:22 +0100443 for (mp_uint_t i = 0; i < seq_len; i++) {
Damiend99b0522013-12-21 18:17:45 +0000444 if (i > 0) {
Damien George5fa93b62014-01-22 14:35:10 +0000445 memcpy(data, sep_str, sep_len);
446 data += sep_len;
Damiend99b0522013-12-21 18:17:45 +0000447 }
Damien George5fa93b62014-01-22 14:35:10 +0000448 GET_STR_DATA_LEN(seq_items[i], s, l);
449 memcpy(data, s, l);
450 data += l;
Damiend99b0522013-12-21 18:17:45 +0000451 }
Damien Georgefe8fb912014-01-02 16:36:09 +0000452
453 // return joined string
Damien George05005f62015-01-21 22:48:37 +0000454 return mp_obj_new_str_from_vstr(self_type, &vstr);
Damiend99b0522013-12-21 18:17:45 +0000455}
456
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200457#define is_ws(c) ((c) == ' ' || (c) == '\t')
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +0300458enum {SPLIT = 0, KEEP = 1, SPLITLINES = 2};
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200459
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +0300460STATIC inline mp_obj_t str_split_internal(mp_uint_t n_args, const mp_obj_t *args, int type) {
Paul Sokolovskybfb88192014-05-11 21:17:28 +0300461 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Damien George40f3c022014-07-03 13:25:24 +0100462 mp_int_t splits = -1;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200463 mp_obj_t sep = mp_const_none;
464 if (n_args > 1) {
465 sep = args[1];
466 if (n_args > 2) {
Damien Georgedeed0872014-04-06 11:11:15 +0100467 splits = mp_obj_get_int(args[2]);
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200468 }
469 }
Damien Georgedeed0872014-04-06 11:11:15 +0100470
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200471 mp_obj_t res = mp_obj_new_list(0, NULL);
Damien George5fa93b62014-01-22 14:35:10 +0000472 GET_STR_DATA_LEN(args[0], s, len);
473 const byte *top = s + len;
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200474
Damien Georgedeed0872014-04-06 11:11:15 +0100475 if (sep == mp_const_none) {
476 // sep not given, so separate on whitespace
477
478 // Initial whitespace is not counted as split, so we pre-do it
Damien George5fa93b62014-01-22 14:35:10 +0000479 while (s < top && is_ws(*s)) s++;
Damien Georgedeed0872014-04-06 11:11:15 +0100480 while (s < top && splits != 0) {
481 const byte *start = s;
482 while (s < top && !is_ws(*s)) s++;
Damien Georgef600a6a2014-05-25 22:34:34 +0100483 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
Damien Georgedeed0872014-04-06 11:11:15 +0100484 if (s >= top) {
485 break;
486 }
487 while (s < top && is_ws(*s)) s++;
488 if (splits > 0) {
489 splits--;
490 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200491 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200492
Damien Georgedeed0872014-04-06 11:11:15 +0100493 if (s < top) {
Damien Georgef600a6a2014-05-25 22:34:34 +0100494 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, s, top - s));
Damien Georgedeed0872014-04-06 11:11:15 +0100495 }
496
497 } else {
498 // sep given
Paul Sokolovsky0c549852014-08-10 23:14:35 +0300499 if (mp_obj_get_type(sep) != self_type) {
Damien Georgec55a4d82014-12-24 20:28:30 +0000500 bad_implicit_conversion(sep);
Paul Sokolovsky0c549852014-08-10 23:14:35 +0300501 }
Damien Georgedeed0872014-04-06 11:11:15 +0100502
Damien Georged182b982014-08-30 14:19:41 +0100503 mp_uint_t sep_len;
Damien Georgedeed0872014-04-06 11:11:15 +0100504 const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
505
506 if (sep_len == 0) {
507 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
508 }
509
510 for (;;) {
511 const byte *start = s;
512 for (;;) {
513 if (splits == 0 || s + sep_len > top) {
514 s = top;
515 break;
516 } else if (memcmp(s, sep_str, sep_len) == 0) {
517 break;
518 }
519 s++;
520 }
Paul Sokolovskyacf6aec2015-04-04 01:23:18 +0300521 mp_uint_t sub_len = s - start;
Paul Sokolovsky7f59b4b2015-04-04 01:55:40 +0300522 if (MP_LIKELY(!(sub_len == 0 && s == top && (type && SPLITLINES)))) {
523 if (start + sub_len != top && (type & KEEP)) {
Paul Sokolovskyacf6aec2015-04-04 01:23:18 +0300524 sub_len++;
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +0300525 }
Paul Sokolovskyacf6aec2015-04-04 01:23:18 +0300526 mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, sub_len));
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +0300527 }
Damien Georgedeed0872014-04-06 11:11:15 +0100528 if (s >= top) {
529 break;
530 }
531 s += sep_len;
532 if (splits > 0) {
533 splits--;
534 }
535 }
Paul Sokolovsky4c316552014-01-21 05:00:21 +0200536 }
537
538 return res;
539}
540
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +0300541mp_obj_t mp_obj_str_split(mp_uint_t n_args, const mp_obj_t *args) {
542 return str_split_internal(n_args, args, SPLIT);
543}
544
545#if MICROPY_PY_BUILTINS_STR_SPLITLINES
546STATIC mp_obj_t str_splitlines(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
547 static const mp_arg_t allowed_args[] = {
548 { MP_QSTR_keepends, MP_ARG_BOOL, {.u_bool = false} },
549 };
550
551 // parse args
552 mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
553 mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
554
555 mp_obj_t new_args[2] = {pos_args[0], MP_OBJ_NEW_QSTR(MP_QSTR__backslash_n)};
556 return str_split_internal(2, new_args, SPLITLINES | (args[0].u_bool ? KEEP : 0));
557}
558#endif
559
Damien Georgeecc88e92014-08-30 00:35:11 +0100560STATIC mp_obj_t str_rsplit(mp_uint_t n_args, const mp_obj_t *args) {
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300561 if (n_args < 3) {
562 // If we don't have split limit, it doesn't matter from which side
563 // we split.
Paul Sokolovsky87051712015-03-23 22:15:12 +0200564 return mp_obj_str_split(n_args, args);
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300565 }
566 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
567 mp_obj_t sep = args[1];
568 GET_STR_DATA_LEN(args[0], s, len);
569
Damien George40f3c022014-07-03 13:25:24 +0100570 mp_int_t splits = mp_obj_get_int(args[2]);
571 mp_int_t org_splits = splits;
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300572 // Preallocate list to the max expected # of elements, as we
573 // will fill it from the end.
574 mp_obj_list_t *res = mp_obj_new_list(splits + 1, NULL);
Damien George39dc1452014-10-03 19:52:22 +0100575 mp_int_t idx = splits;
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300576
577 if (sep == mp_const_none) {
Chris Angelico9ab8ab22014-06-04 05:04:23 +1000578 assert(!"TODO: rsplit(None,n) not implemented");
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300579 } else {
Damien Georged182b982014-08-30 14:19:41 +0100580 mp_uint_t sep_len;
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300581 const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
582
583 if (sep_len == 0) {
584 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
585 }
586
587 const byte *beg = s;
588 const byte *last = s + len;
589 for (;;) {
590 s = last - sep_len;
591 for (;;) {
592 if (splits == 0 || s < beg) {
593 break;
594 } else if (memcmp(s, sep_str, sep_len) == 0) {
595 break;
596 }
597 s--;
598 }
599 if (s < beg || splits == 0) {
Damien Georgef600a6a2014-05-25 22:34:34 +0100600 res->items[idx] = mp_obj_new_str_of_type(self_type, beg, last - beg);
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300601 break;
602 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100603 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 +0300604 last = s;
605 if (splits > 0) {
606 splits--;
607 }
608 }
609 if (idx != 0) {
610 // We split less parts than split limit, now go cleanup surplus
Damien George39dc1452014-10-03 19:52:22 +0100611 mp_int_t used = org_splits + 1 - idx;
Damien George17ae2392014-08-29 21:07:54 +0100612 memmove(res->items, &res->items[idx], used * sizeof(mp_obj_t));
Paul Sokolovsky2a273652014-05-13 08:07:08 +0300613 mp_seq_clear(res->items, used, res->alloc, sizeof(*res->items));
614 res->len = used;
615 }
616 }
617
618 return res;
619}
620
Damien Georgeecc88e92014-08-30 00:35:11 +0100621STATIC 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 +0300622 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
John R. Lentone8204912014-01-12 21:53:52 +0000623 assert(2 <= n_args && n_args <= 4);
Damien Georgebe8e99c2014-11-05 16:45:54 +0000624 assert(MP_OBJ_IS_STR_OR_BYTES(args[0]));
625
626 // check argument type
Damien Georgec55a4d82014-12-24 20:28:30 +0000627 if (mp_obj_get_type(args[1]) != self_type) {
Damien Georgebe8e99c2014-11-05 16:45:54 +0000628 bad_implicit_conversion(args[1]);
629 }
John R. Lentone8204912014-01-12 21:53:52 +0000630
Damien George5fa93b62014-01-22 14:35:10 +0000631 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
632 GET_STR_DATA_LEN(args[1], needle, needle_len);
John R. Lentone8204912014-01-12 21:53:52 +0000633
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300634 const byte *start = haystack;
635 const byte *end = haystack + haystack_len;
John R. Lentone8204912014-01-12 21:53:52 +0000636 if (n_args >= 3 && args[2] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300637 start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
John R. Lentone8204912014-01-12 21:53:52 +0000638 }
639 if (n_args >= 4 && args[3] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300640 end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
John R. Lentone8204912014-01-12 21:53:52 +0000641 }
642
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300643 const byte *p = find_subbytes(start, end - start, needle, needle_len, direction);
Damien George23005372014-01-13 19:39:01 +0000644 if (p == NULL) {
645 // not found
xbe3d9a39e2014-04-08 11:42:19 -0700646 if (is_index) {
647 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "substring not found"));
648 } else {
649 return MP_OBJ_NEW_SMALL_INT(-1);
650 }
Damien George23005372014-01-13 19:39:01 +0000651 } else {
652 // found
Paul Sokolovsky5048df02014-06-14 03:15:00 +0300653 #if MICROPY_PY_BUILTINS_STR_UNICODE
654 if (self_type == &mp_type_str) {
655 return MP_OBJ_NEW_SMALL_INT(utf8_ptr_to_index(haystack, p));
656 }
657 #endif
xbe17a5a832014-03-23 23:31:58 -0700658 return MP_OBJ_NEW_SMALL_INT(p - haystack);
John R. Lentone8204912014-01-12 21:53:52 +0000659 }
John R. Lentone8204912014-01-12 21:53:52 +0000660}
661
Damien Georgeecc88e92014-08-30 00:35:11 +0100662STATIC mp_obj_t str_find(mp_uint_t n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700663 return str_finder(n_args, args, 1, false);
xbe17a5a832014-03-23 23:31:58 -0700664}
665
Damien Georgeecc88e92014-08-30 00:35:11 +0100666STATIC mp_obj_t str_rfind(mp_uint_t n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700667 return str_finder(n_args, args, -1, false);
668}
669
Damien Georgeecc88e92014-08-30 00:35:11 +0100670STATIC mp_obj_t str_index(mp_uint_t n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700671 return str_finder(n_args, args, 1, true);
672}
673
Damien Georgeecc88e92014-08-30 00:35:11 +0100674STATIC mp_obj_t str_rindex(mp_uint_t n_args, const mp_obj_t *args) {
xbe3d9a39e2014-04-08 11:42:19 -0700675 return str_finder(n_args, args, -1, true);
xbe17a5a832014-03-23 23:31:58 -0700676}
677
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200678// TODO: (Much) more variety in args
Damien Georgeecc88e92014-08-30 00:35:11 +0100679STATIC mp_obj_t str_startswith(mp_uint_t n_args, const mp_obj_t *args) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300680 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300681 GET_STR_DATA_LEN(args[0], str, str_len);
682 GET_STR_DATA_LEN(args[1], prefix, prefix_len);
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300683 const byte *start = str;
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300684 if (n_args > 2) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300685 start = str_index_to_ptr(self_type, str, str_len, args[2], true);
Paul Sokolovskyc18ef2a2014-05-15 21:18:34 +0300686 }
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300687 if (prefix_len + (start - str) > str_len) {
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200688 return mp_const_false;
689 }
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +0300690 return MP_BOOL(memcmp(start, prefix, prefix_len) == 0);
Paul Sokolovsky1eacefe2014-01-23 01:20:40 +0200691}
692
Damien Georgeecc88e92014-08-30 00:35:11 +0100693STATIC mp_obj_t str_endswith(mp_uint_t n_args, const mp_obj_t *args) {
Paul Sokolovskyd098c6b2014-05-24 22:46:51 +0300694 GET_STR_DATA_LEN(args[0], str, str_len);
695 GET_STR_DATA_LEN(args[1], suffix, suffix_len);
696 assert(n_args == 2);
697
698 if (suffix_len > str_len) {
699 return mp_const_false;
700 }
701 return MP_BOOL(memcmp(str + (str_len - suffix_len), suffix, suffix_len) == 0);
702}
703
Paul Sokolovsky88107842014-04-26 06:20:08 +0300704enum { LSTRIP, RSTRIP, STRIP };
705
Damien Georgeecc88e92014-08-30 00:35:11 +0100706STATIC mp_obj_t str_uni_strip(int type, mp_uint_t n_args, const mp_obj_t *args) {
xbe7b0f39f2014-01-08 14:23:45 -0800707 assert(1 <= n_args && n_args <= 2);
Dave Hylandsb7f7c652014-08-26 12:44:46 -0700708 assert(MP_OBJ_IS_STR_OR_BYTES(args[0]));
Paul Sokolovskyb2d4fc02014-05-11 13:17:29 +0300709 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
Damien George5fa93b62014-01-22 14:35:10 +0000710
711 const byte *chars_to_del;
712 uint chars_to_del_len;
713 static const byte whitespace[] = " \t\n\r\v\f";
xbe7b0f39f2014-01-08 14:23:45 -0800714
715 if (n_args == 1) {
716 chars_to_del = whitespace;
Damien George5fa93b62014-01-22 14:35:10 +0000717 chars_to_del_len = sizeof(whitespace);
xbe7b0f39f2014-01-08 14:23:45 -0800718 } else {
Paul Sokolovskyb2d4fc02014-05-11 13:17:29 +0300719 if (mp_obj_get_type(args[1]) != self_type) {
Damien Georgec55a4d82014-12-24 20:28:30 +0000720 bad_implicit_conversion(args[1]);
Paul Sokolovskyb2d4fc02014-05-11 13:17:29 +0300721 }
Damien George5fa93b62014-01-22 14:35:10 +0000722 GET_STR_DATA_LEN(args[1], s, l);
723 chars_to_del = s;
724 chars_to_del_len = l;
xbe7b0f39f2014-01-08 14:23:45 -0800725 }
726
Damien George5fa93b62014-01-22 14:35:10 +0000727 GET_STR_DATA_LEN(args[0], orig_str, orig_str_len);
xbe7b0f39f2014-01-08 14:23:45 -0800728
Damien George40f3c022014-07-03 13:25:24 +0100729 mp_uint_t first_good_char_pos = 0;
xbe7b0f39f2014-01-08 14:23:45 -0800730 bool first_good_char_pos_set = false;
Damien George40f3c022014-07-03 13:25:24 +0100731 mp_uint_t last_good_char_pos = 0;
732 mp_uint_t i = 0;
733 mp_int_t delta = 1;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300734 if (type == RSTRIP) {
735 i = orig_str_len - 1;
736 delta = -1;
737 }
Damien George40f3c022014-07-03 13:25:24 +0100738 for (mp_uint_t len = orig_str_len; len > 0; len--) {
xbe17a5a832014-03-23 23:31:58 -0700739 if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) {
xbe7b0f39f2014-01-08 14:23:45 -0800740 if (!first_good_char_pos_set) {
Paul Sokolovskybcdffe52014-05-30 03:07:05 +0300741 first_good_char_pos_set = true;
xbe7b0f39f2014-01-08 14:23:45 -0800742 first_good_char_pos = i;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300743 if (type == LSTRIP) {
744 last_good_char_pos = orig_str_len - 1;
745 break;
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300746 } else if (type == RSTRIP) {
747 first_good_char_pos = 0;
748 last_good_char_pos = i;
749 break;
Paul Sokolovsky88107842014-04-26 06:20:08 +0300750 }
xbe7b0f39f2014-01-08 14:23:45 -0800751 }
Paul Sokolovsky88107842014-04-26 06:20:08 +0300752 last_good_char_pos = i;
xbe7b0f39f2014-01-08 14:23:45 -0800753 }
Paul Sokolovskye14d0962014-04-26 06:48:31 +0300754 i += delta;
xbe7b0f39f2014-01-08 14:23:45 -0800755 }
756
Paul Sokolovskybcdffe52014-05-30 03:07:05 +0300757 if (!first_good_char_pos_set) {
Damien George5fa93b62014-01-22 14:35:10 +0000758 // string is all whitespace, return ''
Damien Georgec55a4d82014-12-24 20:28:30 +0000759 if (self_type == &mp_type_str) {
760 return MP_OBJ_NEW_QSTR(MP_QSTR_);
761 } else {
762 return mp_const_empty_bytes;
763 }
xbe7b0f39f2014-01-08 14:23:45 -0800764 }
765
766 assert(last_good_char_pos >= first_good_char_pos);
767 //+1 to accomodate the last character
Damien George40f3c022014-07-03 13:25:24 +0100768 mp_uint_t stripped_len = last_good_char_pos - first_good_char_pos + 1;
Paul Sokolovsky88276822014-05-30 03:11:44 +0300769 if (stripped_len == orig_str_len) {
770 // If nothing was stripped, don't bother to dup original string
771 // TODO: watch out for this case when we'll get to bytearray.strip()
772 assert(first_good_char_pos == 0);
773 return args[0];
774 }
Damien Georgef600a6a2014-05-25 22:34:34 +0100775 return mp_obj_new_str_of_type(self_type, orig_str + first_good_char_pos, stripped_len);
xbe7b0f39f2014-01-08 14:23:45 -0800776}
777
Damien Georgeecc88e92014-08-30 00:35:11 +0100778STATIC mp_obj_t str_strip(mp_uint_t n_args, const mp_obj_t *args) {
Paul Sokolovsky88107842014-04-26 06:20:08 +0300779 return str_uni_strip(STRIP, n_args, args);
780}
781
Damien Georgeecc88e92014-08-30 00:35:11 +0100782STATIC mp_obj_t str_lstrip(mp_uint_t n_args, const mp_obj_t *args) {
Paul Sokolovsky88107842014-04-26 06:20:08 +0300783 return str_uni_strip(LSTRIP, n_args, args);
784}
785
Damien Georgeecc88e92014-08-30 00:35:11 +0100786STATIC mp_obj_t str_rstrip(mp_uint_t n_args, const mp_obj_t *args) {
Paul Sokolovsky88107842014-04-26 06:20:08 +0300787 return str_uni_strip(RSTRIP, n_args, args);
788}
789
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700790// Takes an int arg, but only parses unsigned numbers, and only changes
791// *num if at least one digit was parsed.
Damien George2801e6f2015-04-04 15:53:11 +0100792STATIC int str_to_int(const char *str, int *num) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700793 const char *s = str;
Damien George81836c22014-12-21 21:07:03 +0000794 if ('0' <= *s && *s <= '9') {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700795 *num = 0;
796 do {
797 *num = *num * 10 + (*s - '0');
798 s++;
799 }
Damien George81836c22014-12-21 21:07:03 +0000800 while ('0' <= *s && *s <= '9');
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700801 }
802 return s - str;
803}
804
Damien George2801e6f2015-04-04 15:53:11 +0100805STATIC bool isalignment(char ch) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700806 return ch && strchr("<>=^", ch) != NULL;
807}
808
Damien George2801e6f2015-04-04 15:53:11 +0100809STATIC bool istype(char ch) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700810 return ch && strchr("bcdeEfFgGnosxX%", ch) != NULL;
811}
812
Damien George2801e6f2015-04-04 15:53:11 +0100813STATIC bool arg_looks_integer(mp_obj_t arg) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700814 return MP_OBJ_IS_TYPE(arg, &mp_type_bool) || MP_OBJ_IS_INT(arg);
815}
816
Damien George2801e6f2015-04-04 15:53:11 +0100817STATIC bool arg_looks_numeric(mp_obj_t arg) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700818 return arg_looks_integer(arg)
Damien Georgefb510b32014-06-01 13:32:54 +0100819#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700820 || MP_OBJ_IS_TYPE(arg, &mp_type_float)
821#endif
822 ;
823}
824
Damien George2801e6f2015-04-04 15:53:11 +0100825STATIC mp_obj_t arg_as_int(mp_obj_t arg) {
Damien Georgefb510b32014-06-01 13:32:54 +0100826#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700827 if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
Paul Sokolovsky2c756652014-12-31 02:20:57 +0200828 return mp_obj_new_int_from_float(mp_obj_get_float(arg));
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700829 }
830#endif
Dave Hylandsc4029e52014-04-07 11:19:51 -0700831 return arg;
Dave Hylandsf81a49e2014-04-05 08:21:45 -0700832}
833
Damien George1e9a92f2014-11-06 17:36:16 +0000834STATIC NORETURN void terse_str_format_value_error(void) {
835 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "bad format string"));
836}
837
Paul Sokolovskyc1144962015-01-04 00:14:13 +0200838mp_obj_t mp_obj_str_format(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
Damien Georgebe8e99c2014-11-05 16:45:54 +0000839 assert(MP_OBJ_IS_STR_OR_BYTES(args[0]));
Damiend99b0522013-12-21 18:17:45 +0000840
Damien George5fa93b62014-01-22 14:35:10 +0000841 GET_STR_DATA_LEN(args[0], str, len);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700842 int arg_i = 0;
Damien George0b9ee862015-01-21 19:14:25 +0000843 vstr_t vstr;
844 vstr_init(&vstr, 16);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700845 pfenv_t pfenv_vstr;
Damien George0b9ee862015-01-21 19:14:25 +0000846 pfenv_vstr.data = &vstr;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700847 pfenv_vstr.print_strn = pfenv_vstr_add_strn;
848
Damien George5fa93b62014-01-22 14:35:10 +0000849 for (const byte *top = str + len; str < top; str++) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700850 if (*str == '}') {
Damiend99b0522013-12-21 18:17:45 +0000851 str++;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700852 if (str < top && *str == '}') {
Damien George0b9ee862015-01-21 19:14:25 +0000853 vstr_add_char(&vstr, '}');
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700854 continue;
855 }
Damien George1e9a92f2014-11-06 17:36:16 +0000856 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
857 terse_str_format_value_error();
858 } else {
859 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
860 "single '}' encountered in format string"));
861 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700862 }
863 if (*str != '{') {
Damien George0b9ee862015-01-21 19:14:25 +0000864 vstr_add_char(&vstr, *str);
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700865 continue;
866 }
867
868 str++;
869 if (str < top && *str == '{') {
Damien George0b9ee862015-01-21 19:14:25 +0000870 vstr_add_char(&vstr, '{');
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700871 continue;
872 }
873
874 // replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}"
875
876 vstr_t *field_name = NULL;
877 char conversion = '\0';
878 vstr_t *format_spec = NULL;
879
880 if (str < top && *str != '}' && *str != '!' && *str != ':') {
881 field_name = vstr_new();
882 while (str < top && *str != '}' && *str != '!' && *str != ':') {
883 vstr_add_char(field_name, *str++);
884 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700885 }
886
887 // conversion ::= "r" | "s"
888
889 if (str < top && *str == '!') {
890 str++;
891 if (str < top && (*str == 'r' || *str == 's')) {
892 conversion = *str++;
Paul Sokolovskyf2b796e2014-01-15 22:45:20 +0200893 } else {
Damien George1e9a92f2014-11-06 17:36:16 +0000894 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
895 terse_str_format_value_error();
896 } else {
897 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
898 "end of format while looking for conversion specifier"));
899 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700900 }
901 }
902
903 if (str < top && *str == ':') {
904 str++;
905 // {:} is the same as {}, which is the same as {!s}
906 // This makes a difference when passing in a True or False
907 // '{}'.format(True) returns 'True'
908 // '{:d}'.format(True) returns '1'
909 // So we treat {:} as {} and this later gets treated to be {!s}
910 if (*str != '}') {
Damien George11de8392014-06-05 18:57:38 +0100911 format_spec = vstr_new();
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700912 while (str < top && *str != '}') {
913 vstr_add_char(format_spec, *str++);
Damiend99b0522013-12-21 18:17:45 +0000914 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700915 }
916 }
917 if (str >= top) {
Damien George1e9a92f2014-11-06 17:36:16 +0000918 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
919 terse_str_format_value_error();
920 } else {
921 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
922 "unmatched '{' in format"));
923 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700924 }
925 if (*str != '}') {
Damien George1e9a92f2014-11-06 17:36:16 +0000926 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
927 terse_str_format_value_error();
928 } else {
929 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
930 "expected ':' after format specifier"));
931 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700932 }
933
934 mp_obj_t arg = mp_const_none;
935
936 if (field_name) {
Damien George3bb8bd82014-04-14 21:20:30 +0100937 int index = 0;
Damien George827b0f72015-01-29 13:57:23 +0000938 const char *field = vstr_null_terminated_str(field_name);
Paul Sokolovskyc1144962015-01-04 00:14:13 +0200939 const char *lookup = NULL;
940 if (MP_LIKELY(unichar_isdigit(*field))) {
941 if (arg_i > 0) {
942 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
943 terse_str_format_value_error();
944 } else {
945 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
946 "can't switch from automatic field numbering to manual field specification"));
947 }
948 }
Paul Sokolovskyff8e35b2015-01-04 13:23:44 +0200949 lookup = str_to_int(field, &index) + field;
Damien George963a5a32015-01-16 17:47:07 +0000950 if ((uint)index >= n_args - 1) {
Paul Sokolovskyc1144962015-01-04 00:14:13 +0200951 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
952 }
953 arg = args[index + 1];
954 arg_i = -1;
955 } else {
956 for (lookup = field; *lookup && *lookup != '.' && *lookup != '['; lookup++);
957 mp_obj_t field_q = mp_obj_new_str(field, lookup - field, true/*?*/);
958 mp_map_elem_t *key_elem = mp_map_lookup(kwargs, field_q, MP_MAP_LOOKUP);
959 if (key_elem == NULL) {
960 nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, field_q));
961 }
962 arg = key_elem->value;
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700963 }
Paul Sokolovskyc1144962015-01-04 00:14:13 +0200964 if (*lookup) {
965 nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError, "attributes not supported yet"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700966 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700967 vstr_free(field_name);
968 field_name = NULL;
969 } else {
970 if (arg_i < 0) {
Damien George1e9a92f2014-11-06 17:36:16 +0000971 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
972 terse_str_format_value_error();
973 } else {
974 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
975 "can't switch from manual field specification to automatic field numbering"));
976 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700977 }
Damien George963a5a32015-01-16 17:47:07 +0000978 if ((uint)arg_i >= n_args - 1) {
Damien Georgeea13f402014-04-05 18:32:08 +0100979 nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -0700980 }
981 arg = args[arg_i + 1];
982 arg_i++;
983 }
984 if (!format_spec && !conversion) {
985 conversion = 's';
986 }
987 if (conversion) {
988 mp_print_kind_t print_kind;
989 if (conversion == 's') {
990 print_kind = PRINT_STR;
991 } else if (conversion == 'r') {
992 print_kind = PRINT_REPR;
993 } else {
Damien George1e9a92f2014-11-06 17:36:16 +0000994 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
995 terse_str_format_value_error();
996 } else {
997 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
998 "unknown conversion specifier %c", conversion));
999 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001000 }
Damien George0b9ee862015-01-21 19:14:25 +00001001 vstr_t arg_vstr;
1002 vstr_init(&arg_vstr, 16);
1003 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, &arg_vstr, arg, print_kind);
1004 arg = mp_obj_new_str_from_vstr(&mp_type_str, &arg_vstr);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001005 }
1006
1007 char sign = '\0';
1008 char fill = '\0';
1009 char align = '\0';
1010 int width = -1;
1011 int precision = -1;
1012 char type = '\0';
1013 int flags = 0;
1014
1015 if (format_spec) {
1016 // The format specifier (from http://docs.python.org/2/library/string.html#formatspec)
1017 //
1018 // [[fill]align][sign][#][0][width][,][.precision][type]
1019 // fill ::= <any character>
1020 // align ::= "<" | ">" | "=" | "^"
1021 // sign ::= "+" | "-" | " "
1022 // width ::= integer
1023 // precision ::= integer
1024 // type ::= "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
1025
Damien George827b0f72015-01-29 13:57:23 +00001026 const char *s = vstr_null_terminated_str(format_spec);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001027 if (isalignment(*s)) {
1028 align = *s++;
1029 } else if (*s && isalignment(s[1])) {
1030 fill = *s++;
1031 align = *s++;
1032 }
1033 if (*s == '+' || *s == '-' || *s == ' ') {
1034 if (*s == '+') {
1035 flags |= PF_FLAG_SHOW_SIGN;
1036 } else if (*s == ' ') {
1037 flags |= PF_FLAG_SPACE_SIGN;
1038 }
1039 sign = *s++;
1040 }
1041 if (*s == '#') {
1042 flags |= PF_FLAG_SHOW_PREFIX;
1043 s++;
1044 }
1045 if (*s == '0') {
1046 if (!align) {
1047 align = '=';
1048 }
1049 if (!fill) {
1050 fill = '0';
1051 }
1052 }
1053 s += str_to_int(s, &width);
1054 if (*s == ',') {
1055 flags |= PF_FLAG_SHOW_COMMA;
1056 s++;
1057 }
1058 if (*s == '.') {
1059 s++;
1060 s += str_to_int(s, &precision);
1061 }
1062 if (istype(*s)) {
1063 type = *s++;
1064 }
1065 if (*s) {
Damien Georgeea13f402014-04-05 18:32:08 +01001066 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "Invalid conversion specification"));
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001067 }
1068 vstr_free(format_spec);
1069 format_spec = NULL;
1070 }
1071 if (!align) {
1072 if (arg_looks_numeric(arg)) {
1073 align = '>';
1074 } else {
1075 align = '<';
1076 }
1077 }
1078 if (!fill) {
1079 fill = ' ';
1080 }
1081
1082 if (sign) {
1083 if (type == 's') {
Damien George1e9a92f2014-11-06 17:36:16 +00001084 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1085 terse_str_format_value_error();
1086 } else {
1087 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
1088 "sign not allowed in string format specifier"));
1089 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001090 }
1091 if (type == 'c') {
Damien George1e9a92f2014-11-06 17:36:16 +00001092 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1093 terse_str_format_value_error();
1094 } else {
1095 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
1096 "sign not allowed with integer format specifier 'c'"));
1097 }
Damiend99b0522013-12-21 18:17:45 +00001098 }
1099 } else {
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001100 sign = '-';
1101 }
1102
1103 switch (align) {
1104 case '<': flags |= PF_FLAG_LEFT_ADJUST; break;
1105 case '=': flags |= PF_FLAG_PAD_AFTER_SIGN; break;
1106 case '^': flags |= PF_FLAG_CENTER_ADJUST; break;
1107 }
1108
1109 if (arg_looks_integer(arg)) {
1110 switch (type) {
1111 case 'b':
Damien Georgefa1edff2015-03-14 22:32:40 +00001112 pfenv_print_mp_int(&pfenv_vstr, arg, 2, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001113 continue;
1114
1115 case 'c':
1116 {
1117 char ch = mp_obj_get_int(arg);
1118 pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, fill, width);
1119 continue;
1120 }
1121
1122 case '\0': // No explicit format type implies 'd'
1123 case 'n': // I don't think we support locales in uPy so use 'd'
1124 case 'd':
Damien Georgefa1edff2015-03-14 22:32:40 +00001125 pfenv_print_mp_int(&pfenv_vstr, arg, 10, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001126 continue;
1127
1128 case 'o':
Dave Hylandsc4029e52014-04-07 11:19:51 -07001129 if (flags & PF_FLAG_SHOW_PREFIX) {
1130 flags |= PF_FLAG_SHOW_OCTAL_LETTER;
1131 }
1132
Damien Georgefa1edff2015-03-14 22:32:40 +00001133 pfenv_print_mp_int(&pfenv_vstr, arg, 8, 'a', flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001134 continue;
1135
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001136 case 'X':
Damien George11de8392014-06-05 18:57:38 +01001137 case 'x':
Damien Georgefa1edff2015-03-14 22:32:40 +00001138 pfenv_print_mp_int(&pfenv_vstr, arg, 16, type - ('X' - 'A'), flags, fill, width, 0);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001139 continue;
1140
1141 case 'e':
1142 case 'E':
1143 case 'f':
1144 case 'F':
1145 case 'g':
1146 case 'G':
1147 case '%':
1148 // The floating point formatters all work with anything that
1149 // looks like an integer
1150 break;
1151
1152 default:
Damien George1e9a92f2014-11-06 17:36:16 +00001153 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1154 terse_str_format_value_error();
1155 } else {
1156 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
1157 "unknown format code '%c' for object of type '%s'",
1158 type, mp_obj_get_type_str(arg)));
1159 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001160 }
Damien Georgec322c5f2014-04-02 20:04:15 +01001161 }
Damien George70f33cd2014-04-02 17:06:05 +01001162
Dave Hylands22fe4d72014-04-02 12:07:31 -07001163 // NOTE: no else here. We need the e, f, g etc formats for integer
1164 // arguments (from above if) to take this if.
Damien Georgec322c5f2014-04-02 20:04:15 +01001165 if (arg_looks_numeric(arg)) {
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001166 if (!type) {
1167
1168 // Even though the docs say that an unspecified type is the same
1169 // as 'g', there is one subtle difference, when the exponent
1170 // is one less than the precision.
Damien George11de8392014-06-05 18:57:38 +01001171 //
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001172 // '{:10.1}'.format(0.0) ==> '0e+00'
1173 // '{:10.1g}'.format(0.0) ==> '0'
1174 //
1175 // TODO: Figure out how to deal with this.
1176 //
1177 // A proper solution would involve adding a special flag
1178 // or something to format_float, and create a format_double
1179 // to deal with doubles. In order to fix this when using
1180 // sprintf, we'd need to use the e format and tweak the
1181 // returned result to strip trailing zeros like the g format
1182 // does.
1183 //
1184 // {:10.3} and {:10.2e} with 1.23e2 both produce 1.23e+02
1185 // but with 1.e2 you get 1e+02 and 1.00e+02
1186 //
1187 // Stripping the trailing 0's (like g) does would make the
1188 // e format give us the right format.
1189 //
1190 // CPython sources say:
1191 // Omitted type specifier. Behaves in the same way as repr(x)
1192 // and str(x) if no precision is given, else like 'g', but with
1193 // at least one digit after the decimal point. */
1194
1195 type = 'g';
1196 }
1197 if (type == 'n') {
1198 type = 'g';
1199 }
1200
1201 flags |= PF_FLAG_PAD_NAN_INF; // '{:06e}'.format(float('-inf')) should give '-00inf'
1202 switch (type) {
Damien Georgefb510b32014-06-01 13:32:54 +01001203#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001204 case 'e':
1205 case 'E':
1206 case 'f':
1207 case 'F':
1208 case 'g':
1209 case 'G':
Damien George11de8392014-06-05 18:57:38 +01001210 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), type, flags, fill, width, precision);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001211 break;
1212
1213 case '%':
1214 flags |= PF_FLAG_ADD_PERCENT;
Damien George0178aa92015-01-12 21:56:35 +00001215 #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
1216 #define F100 100.0F
1217 #else
1218 #define F100 100.0
1219 #endif
1220 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg) * F100, 'f', flags, fill, width, precision);
1221 #undef F100
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001222 break;
Damien Georgec322c5f2014-04-02 20:04:15 +01001223#endif
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001224
1225 default:
Damien George1e9a92f2014-11-06 17:36:16 +00001226 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1227 terse_str_format_value_error();
1228 } else {
1229 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
1230 "unknown format code '%c' for object of type 'float'",
1231 type, mp_obj_get_type_str(arg)));
1232 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001233 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001234 } else {
Damien George70f33cd2014-04-02 17:06:05 +01001235 // arg doesn't look like a number
1236
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001237 if (align == '=') {
Damien George1e9a92f2014-11-06 17:36:16 +00001238 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1239 terse_str_format_value_error();
1240 } else {
1241 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
1242 "'=' alignment not allowed in string format specifier"));
1243 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001244 }
Damien George70f33cd2014-04-02 17:06:05 +01001245
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001246 switch (type) {
1247 case '\0':
Damien George0b9ee862015-01-21 19:14:25 +00001248 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, &vstr, arg, PRINT_STR);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001249 break;
1250
Damien Georged182b982014-08-30 14:19:41 +01001251 case 's': {
Damien George50912e72015-01-20 11:55:10 +00001252 mp_uint_t slen;
1253 const char *s = mp_obj_str_get_data(arg, &slen);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001254 if (precision < 0) {
Damien George50912e72015-01-20 11:55:10 +00001255 precision = slen;
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001256 }
Damien George50912e72015-01-20 11:55:10 +00001257 if (slen > (mp_uint_t)precision) {
1258 slen = precision;
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001259 }
Damien George50912e72015-01-20 11:55:10 +00001260 pfenv_print_strn(&pfenv_vstr, s, slen, flags, fill, width);
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001261 break;
1262 }
1263
1264 default:
Damien George1e9a92f2014-11-06 17:36:16 +00001265 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1266 terse_str_format_value_error();
1267 } else {
1268 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
1269 "unknown format code '%c' for object of type 'str'",
1270 type, mp_obj_get_type_str(arg)));
1271 }
Dave Hylandsbaf6f142014-03-30 21:06:50 -07001272 }
Damiend99b0522013-12-21 18:17:45 +00001273 }
1274 }
1275
Damien George0b9ee862015-01-21 19:14:25 +00001276 return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
Damiend99b0522013-12-21 18:17:45 +00001277}
1278
Damien Georgeecc88e92014-08-30 00:35:11 +01001279STATIC 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 +00001280 assert(MP_OBJ_IS_STR_OR_BYTES(pattern));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001281
1282 GET_STR_DATA_LEN(pattern, str, len);
Dave Hylands6756a372014-04-02 11:42:39 -07001283 const byte *start_str = str;
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001284 int arg_i = 0;
Damien George0b9ee862015-01-21 19:14:25 +00001285 vstr_t vstr;
1286 vstr_init(&vstr, 16);
Dave Hylands6756a372014-04-02 11:42:39 -07001287 pfenv_t pfenv_vstr;
Damien George0b9ee862015-01-21 19:14:25 +00001288 pfenv_vstr.data = &vstr;
Dave Hylands6756a372014-04-02 11:42:39 -07001289 pfenv_vstr.print_strn = pfenv_vstr_add_strn;
1290
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001291 for (const byte *top = str + len; str < top; str++) {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001292 mp_obj_t arg = MP_OBJ_NULL;
Dave Hylands6756a372014-04-02 11:42:39 -07001293 if (*str != '%') {
Damien George0b9ee862015-01-21 19:14:25 +00001294 vstr_add_char(&vstr, *str);
Dave Hylands6756a372014-04-02 11:42:39 -07001295 continue;
1296 }
1297 if (++str >= top) {
1298 break;
1299 }
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001300 if (*str == '%') {
Damien George0b9ee862015-01-21 19:14:25 +00001301 vstr_add_char(&vstr, '%');
Dave Hylands6756a372014-04-02 11:42:39 -07001302 continue;
1303 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001304
1305 // Dictionary value lookup
1306 if (*str == '(') {
1307 const byte *key = ++str;
1308 while (*str != ')') {
1309 if (str >= top) {
Damien George1e9a92f2014-11-06 17:36:16 +00001310 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1311 terse_str_format_value_error();
1312 } else {
1313 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
1314 "incomplete format key"));
1315 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001316 }
1317 ++str;
1318 }
1319 mp_obj_t k_obj = mp_obj_new_str((const char*)key, str - key, true);
1320 arg = mp_obj_dict_get(dict, k_obj);
1321 str++;
Dave Hylands6756a372014-04-02 11:42:39 -07001322 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001323
Dave Hylands6756a372014-04-02 11:42:39 -07001324 int flags = 0;
1325 char fill = ' ';
Damien George11de8392014-06-05 18:57:38 +01001326 int alt = 0;
Dave Hylands6756a372014-04-02 11:42:39 -07001327 while (str < top) {
1328 if (*str == '-') flags |= PF_FLAG_LEFT_ADJUST;
1329 else if (*str == '+') flags |= PF_FLAG_SHOW_SIGN;
1330 else if (*str == ' ') flags |= PF_FLAG_SPACE_SIGN;
Damien George11de8392014-06-05 18:57:38 +01001331 else if (*str == '#') alt = PF_FLAG_SHOW_PREFIX;
Dave Hylands6756a372014-04-02 11:42:39 -07001332 else if (*str == '0') {
1333 flags |= PF_FLAG_PAD_AFTER_SIGN;
1334 fill = '0';
1335 } else break;
1336 str++;
1337 }
1338 // parse width, if it exists
Damien George11de8392014-06-05 18:57:38 +01001339 int width = 0;
Dave Hylands6756a372014-04-02 11:42:39 -07001340 if (str < top) {
1341 if (*str == '*') {
Damien George963a5a32015-01-16 17:47:07 +00001342 if ((uint)arg_i >= n_args) {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001343 goto not_enough_args;
1344 }
Dave Hylands6756a372014-04-02 11:42:39 -07001345 width = mp_obj_get_int(args[arg_i++]);
1346 str++;
1347 } else {
Damien George81836c22014-12-21 21:07:03 +00001348 str += str_to_int((const char*)str, &width);
Dave Hylands6756a372014-04-02 11:42:39 -07001349 }
1350 }
1351 int prec = -1;
1352 if (str < top && *str == '.') {
1353 if (++str < top) {
1354 if (*str == '*') {
Damien George963a5a32015-01-16 17:47:07 +00001355 if ((uint)arg_i >= n_args) {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001356 goto not_enough_args;
1357 }
Dave Hylands6756a372014-04-02 11:42:39 -07001358 prec = mp_obj_get_int(args[arg_i++]);
1359 str++;
1360 } else {
1361 prec = 0;
Damien George81836c22014-12-21 21:07:03 +00001362 str += str_to_int((const char*)str, &prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001363 }
1364 }
1365 }
1366
1367 if (str >= top) {
Damien George1e9a92f2014-11-06 17:36:16 +00001368 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1369 terse_str_format_value_error();
1370 } else {
1371 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
1372 "incomplete format"));
1373 }
Dave Hylands6756a372014-04-02 11:42:39 -07001374 }
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001375
1376 // Tuple value lookup
1377 if (arg == MP_OBJ_NULL) {
Damien George963a5a32015-01-16 17:47:07 +00001378 if ((uint)arg_i >= n_args) {
Paul Sokolovsky75ce9252014-06-05 20:02:15 +03001379not_enough_args:
1380 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not enough arguments for format string"));
1381 }
1382 arg = args[arg_i++];
1383 }
Dave Hylands6756a372014-04-02 11:42:39 -07001384 switch (*str) {
1385 case 'c':
1386 if (MP_OBJ_IS_STR(arg)) {
Damien George50912e72015-01-20 11:55:10 +00001387 mp_uint_t slen;
1388 const char *s = mp_obj_str_get_data(arg, &slen);
1389 if (slen != 1) {
Damien George1e9a92f2014-11-06 17:36:16 +00001390 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
1391 "%%c requires int or char"));
Dave Hylands6756a372014-04-02 11:42:39 -07001392 }
1393 pfenv_print_strn(&pfenv_vstr, s, 1, flags, ' ', width);
Damien George1e9a92f2014-11-06 17:36:16 +00001394 } else if (arg_looks_integer(arg)) {
Dave Hylands6756a372014-04-02 11:42:39 -07001395 char ch = mp_obj_get_int(arg);
1396 pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, ' ', width);
Damien George1e9a92f2014-11-06 17:36:16 +00001397 } else {
1398 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
1399 "integer required"));
Dave Hylands6756a372014-04-02 11:42:39 -07001400 }
Damien George11de8392014-06-05 18:57:38 +01001401 break;
Dave Hylands6756a372014-04-02 11:42:39 -07001402
1403 case 'd':
1404 case 'i':
1405 case 'u':
Damien Georgefa1edff2015-03-14 22:32:40 +00001406 pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 10, 'a', flags, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001407 break;
1408
Damien Georgefb510b32014-06-01 13:32:54 +01001409#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylands6756a372014-04-02 11:42:39 -07001410 case 'e':
1411 case 'E':
1412 case 'f':
1413 case 'F':
1414 case 'g':
1415 case 'G':
1416 pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), *str, flags, fill, width, prec);
1417 break;
1418#endif
1419
1420 case 'o':
1421 if (alt) {
Dave Hylandsc4029e52014-04-07 11:19:51 -07001422 flags |= (PF_FLAG_SHOW_PREFIX | PF_FLAG_SHOW_OCTAL_LETTER);
Dave Hylands6756a372014-04-02 11:42:39 -07001423 }
Damien Georgefa1edff2015-03-14 22:32:40 +00001424 pfenv_print_mp_int(&pfenv_vstr, arg, 8, 'a', flags, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001425 break;
1426
1427 case 'r':
1428 case 's':
1429 {
Damien George0b9ee862015-01-21 19:14:25 +00001430 vstr_t arg_vstr;
1431 vstr_init(&arg_vstr, 16);
Dave Hylands6756a372014-04-02 11:42:39 -07001432 mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf,
Damien George0b9ee862015-01-21 19:14:25 +00001433 &arg_vstr, arg, *str == 'r' ? PRINT_REPR : PRINT_STR);
1434 uint vlen = arg_vstr.len;
Dave Hylands6756a372014-04-02 11:42:39 -07001435 if (prec < 0) {
Damien George50912e72015-01-20 11:55:10 +00001436 prec = vlen;
Dave Hylands6756a372014-04-02 11:42:39 -07001437 }
Damien George50912e72015-01-20 11:55:10 +00001438 if (vlen > (uint)prec) {
1439 vlen = prec;
Dave Hylands6756a372014-04-02 11:42:39 -07001440 }
Damien George0b9ee862015-01-21 19:14:25 +00001441 pfenv_print_strn(&pfenv_vstr, arg_vstr.buf, vlen, flags, ' ', width);
1442 vstr_clear(&arg_vstr);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001443 break;
1444 }
Dave Hylands6756a372014-04-02 11:42:39 -07001445
Dave Hylands6756a372014-04-02 11:42:39 -07001446 case 'X':
Damien George11de8392014-06-05 18:57:38 +01001447 case 'x':
Damien Georgefa1edff2015-03-14 22:32:40 +00001448 pfenv_print_mp_int(&pfenv_vstr, arg, 16, *str - ('X' - 'A'), flags | alt, fill, width, prec);
Dave Hylands6756a372014-04-02 11:42:39 -07001449 break;
Damien Georgedeed0872014-04-06 11:11:15 +01001450
Dave Hylands6756a372014-04-02 11:42:39 -07001451 default:
Damien George1e9a92f2014-11-06 17:36:16 +00001452 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1453 terse_str_format_value_error();
1454 } else {
1455 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
1456 "unsupported format character '%c' (0x%x) at index %d",
1457 *str, *str, str - start_str));
1458 }
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001459 }
1460 }
1461
Damien George963a5a32015-01-16 17:47:07 +00001462 if ((uint)arg_i != n_args) {
Damien Georgeea13f402014-04-05 18:32:08 +01001463 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not all arguments converted during string formatting"));
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001464 }
1465
Damien George0b9ee862015-01-21 19:14:25 +00001466 return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
Paul Sokolovsky4db727a2014-03-31 21:18:28 +03001467}
1468
Damien Georgeecc88e92014-08-30 00:35:11 +01001469STATIC mp_obj_t str_replace(mp_uint_t n_args, const mp_obj_t *args) {
Damien Georgebe8e99c2014-11-05 16:45:54 +00001470 assert(MP_OBJ_IS_STR_OR_BYTES(args[0]));
xbe480c15a2014-01-30 22:17:30 -08001471
Damien George40f3c022014-07-03 13:25:24 +01001472 mp_int_t max_rep = -1;
xbe480c15a2014-01-30 22:17:30 -08001473 if (n_args == 4) {
Damien Georgeff715422014-04-07 00:39:13 +01001474 max_rep = mp_obj_get_int(args[3]);
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001475 if (max_rep == 0) {
1476 return args[0];
1477 } else if (max_rep < 0) {
Damien Georgeff715422014-04-07 00:39:13 +01001478 max_rep = -1;
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001479 }
xbe480c15a2014-01-30 22:17:30 -08001480 }
Damien George94f68302014-01-31 23:45:12 +00001481
xbe729be9b2014-04-07 14:46:39 -07001482 // if max_rep is still -1 by this point we will need to do all possible replacements
xbe480c15a2014-01-30 22:17:30 -08001483
Damien Georgeff715422014-04-07 00:39:13 +01001484 // check argument types
1485
Damien Georgec55a4d82014-12-24 20:28:30 +00001486 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
1487
1488 if (mp_obj_get_type(args[1]) != self_type) {
Damien Georgeff715422014-04-07 00:39:13 +01001489 bad_implicit_conversion(args[1]);
1490 }
1491
Damien Georgec55a4d82014-12-24 20:28:30 +00001492 if (mp_obj_get_type(args[2]) != self_type) {
Damien Georgeff715422014-04-07 00:39:13 +01001493 bad_implicit_conversion(args[2]);
1494 }
1495
1496 // extract string data
1497
xbe480c15a2014-01-30 22:17:30 -08001498 GET_STR_DATA_LEN(args[0], str, str_len);
1499 GET_STR_DATA_LEN(args[1], old, old_len);
1500 GET_STR_DATA_LEN(args[2], new, new_len);
Damien George94f68302014-01-31 23:45:12 +00001501
1502 // old won't exist in str if it's longer, so nothing to replace
xbe480c15a2014-01-30 22:17:30 -08001503 if (old_len > str_len) {
Paul Sokolovsky4e246082014-02-11 15:29:55 +02001504 return args[0];
xbe480c15a2014-01-30 22:17:30 -08001505 }
1506
Damien George94f68302014-01-31 23:45:12 +00001507 // data for the replaced string
1508 byte *data = NULL;
Damien George05005f62015-01-21 22:48:37 +00001509 vstr_t vstr;
xbe480c15a2014-01-30 22:17:30 -08001510
Damien George94f68302014-01-31 23:45:12 +00001511 // do 2 passes over the string:
1512 // first pass computes the required length of the replaced string
1513 // second pass does the replacements
1514 for (;;) {
Damien George40f3c022014-07-03 13:25:24 +01001515 mp_uint_t replaced_str_index = 0;
1516 mp_uint_t num_replacements_done = 0;
Damien George94f68302014-01-31 23:45:12 +00001517 const byte *old_occurrence;
1518 const byte *offset_ptr = str;
Damien George40f3c022014-07-03 13:25:24 +01001519 mp_uint_t str_len_remain = str_len;
Damien Georgeff715422014-04-07 00:39:13 +01001520 if (old_len == 0) {
1521 // if old_str is empty, copy new_str to start of replaced string
1522 // copy the replacement string
1523 if (data != NULL) {
1524 memcpy(data, new, new_len);
1525 }
1526 replaced_str_index += new_len;
1527 num_replacements_done++;
1528 }
Damien George963a5a32015-01-16 17:47:07 +00001529 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 +01001530 if (old_len == 0) {
1531 old_occurrence += 1;
1532 }
Damien George94f68302014-01-31 23:45:12 +00001533 // copy from just after end of last occurrence of to-be-replaced string to right before start of next occurrence
1534 if (data != NULL) {
1535 memcpy(data + replaced_str_index, offset_ptr, old_occurrence - offset_ptr);
1536 }
1537 replaced_str_index += old_occurrence - offset_ptr;
1538 // copy the replacement string
1539 if (data != NULL) {
1540 memcpy(data + replaced_str_index, new, new_len);
1541 }
1542 replaced_str_index += new_len;
1543 offset_ptr = old_occurrence + old_len;
Damien Georgeff715422014-04-07 00:39:13 +01001544 str_len_remain = str + str_len - offset_ptr;
Damien George94f68302014-01-31 23:45:12 +00001545 num_replacements_done++;
Damien George94f68302014-01-31 23:45:12 +00001546 }
1547
1548 // copy from just after end of last occurrence of to-be-replaced string to end of old string
1549 if (data != NULL) {
Damien Georgeff715422014-04-07 00:39:13 +01001550 memcpy(data + replaced_str_index, offset_ptr, str_len_remain);
Damien George94f68302014-01-31 23:45:12 +00001551 }
Damien Georgeff715422014-04-07 00:39:13 +01001552 replaced_str_index += str_len_remain;
Damien George94f68302014-01-31 23:45:12 +00001553
1554 if (data == NULL) {
1555 // first pass
1556 if (num_replacements_done == 0) {
1557 // no substr found, return original string
1558 return args[0];
1559 } else {
1560 // substr found, allocate new string
Damien George05005f62015-01-21 22:48:37 +00001561 vstr_init_len(&vstr, replaced_str_index);
1562 data = (byte*)vstr.buf;
Damien Georgeff715422014-04-07 00:39:13 +01001563 assert(data != NULL);
Damien George94f68302014-01-31 23:45:12 +00001564 }
1565 } else {
1566 // second pass, we are done
1567 break;
1568 }
xbe480c15a2014-01-30 22:17:30 -08001569 }
Damien George94f68302014-01-31 23:45:12 +00001570
Damien George05005f62015-01-21 22:48:37 +00001571 return mp_obj_new_str_from_vstr(self_type, &vstr);
xbe480c15a2014-01-30 22:17:30 -08001572}
1573
Damien Georgeecc88e92014-08-30 00:35:11 +01001574STATIC mp_obj_t str_count(mp_uint_t n_args, const mp_obj_t *args) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001575 const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
xbe9e1e8cd2014-03-12 22:57:16 -07001576 assert(2 <= n_args && n_args <= 4);
Damien Georgebe8e99c2014-11-05 16:45:54 +00001577 assert(MP_OBJ_IS_STR_OR_BYTES(args[0]));
1578
1579 // check argument type
Damien Georgec55a4d82014-12-24 20:28:30 +00001580 if (mp_obj_get_type(args[1]) != self_type) {
Damien Georgebe8e99c2014-11-05 16:45:54 +00001581 bad_implicit_conversion(args[1]);
1582 }
xbe9e1e8cd2014-03-12 22:57:16 -07001583
1584 GET_STR_DATA_LEN(args[0], haystack, haystack_len);
1585 GET_STR_DATA_LEN(args[1], needle, needle_len);
1586
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001587 const byte *start = haystack;
1588 const byte *end = haystack + haystack_len;
xbe9e1e8cd2014-03-12 22:57:16 -07001589 if (n_args >= 3 && args[2] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001590 start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001591 }
1592 if (n_args >= 4 && args[3] != mp_const_none) {
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001593 end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
xbe9e1e8cd2014-03-12 22:57:16 -07001594 }
1595
Damien George536dde22014-03-13 22:07:55 +00001596 // if needle_len is zero then we count each gap between characters as an occurrence
1597 if (needle_len == 0) {
Paul Sokolovsky9e215fa2014-06-28 23:14:30 +03001598 return MP_OBJ_NEW_SMALL_INT(unichar_charlen((const char*)start, end - start) + 1);
xbe9e1e8cd2014-03-12 22:57:16 -07001599 }
1600
Damien George536dde22014-03-13 22:07:55 +00001601 // count the occurrences
Damien George40f3c022014-07-03 13:25:24 +01001602 mp_int_t num_occurrences = 0;
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001603 for (const byte *haystack_ptr = start; haystack_ptr + needle_len <= end;) {
1604 if (memcmp(haystack_ptr, needle, needle_len) == 0) {
xbec5d70ba2014-03-13 00:29:15 -07001605 num_occurrences++;
Paul Sokolovskye3cfc0d2014-06-14 06:06:36 +03001606 haystack_ptr += needle_len;
1607 } else {
1608 haystack_ptr = utf8_next_char(haystack_ptr);
xbec5d70ba2014-03-13 00:29:15 -07001609 }
xbe9e1e8cd2014-03-12 22:57:16 -07001610 }
1611
1612 return MP_OBJ_NEW_SMALL_INT(num_occurrences);
1613}
1614
Damien George40f3c022014-07-03 13:25:24 +01001615STATIC 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 +00001616 assert(MP_OBJ_IS_STR_OR_BYTES(self_in));
Paul Sokolovsky69f3eb22014-05-11 02:44:46 +03001617 mp_obj_type_t *self_type = mp_obj_get_type(self_in);
1618 if (self_type != mp_obj_get_type(arg)) {
Damien Georgec55a4d82014-12-24 20:28:30 +00001619 bad_implicit_conversion(arg);
xbe613a8e32014-03-18 00:06:29 -07001620 }
Damien Georgeb035db32014-03-21 20:39:40 +00001621
xbe613a8e32014-03-18 00:06:29 -07001622 GET_STR_DATA_LEN(self_in, str, str_len);
1623 GET_STR_DATA_LEN(arg, sep, sep_len);
1624
1625 if (sep_len == 0) {
Damien Georgeea13f402014-04-05 18:32:08 +01001626 nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
xbe613a8e32014-03-18 00:06:29 -07001627 }
Damien Georgeb035db32014-03-21 20:39:40 +00001628
Damien Georgec55a4d82014-12-24 20:28:30 +00001629 mp_obj_t result[3];
1630 if (self_type == &mp_type_str) {
1631 result[0] = MP_OBJ_NEW_QSTR(MP_QSTR_);
1632 result[1] = MP_OBJ_NEW_QSTR(MP_QSTR_);
1633 result[2] = MP_OBJ_NEW_QSTR(MP_QSTR_);
1634 } else {
1635 result[0] = mp_const_empty_bytes;
1636 result[1] = mp_const_empty_bytes;
1637 result[2] = mp_const_empty_bytes;
1638 }
Damien Georgeb035db32014-03-21 20:39:40 +00001639
1640 if (direction > 0) {
1641 result[0] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001642 } else {
Damien Georgeb035db32014-03-21 20:39:40 +00001643 result[2] = self_in;
xbe0a6894c2014-03-21 01:12:26 -07001644 }
xbe613a8e32014-03-18 00:06:29 -07001645
xbe17a5a832014-03-23 23:31:58 -07001646 const byte *position_ptr = find_subbytes(str, str_len, sep, sep_len, direction);
1647 if (position_ptr != NULL) {
Damien George40f3c022014-07-03 13:25:24 +01001648 mp_uint_t position = position_ptr - str;
Damien Georgef600a6a2014-05-25 22:34:34 +01001649 result[0] = mp_obj_new_str_of_type(self_type, str, position);
xbe17a5a832014-03-23 23:31:58 -07001650 result[1] = arg;
Damien Georgef600a6a2014-05-25 22:34:34 +01001651 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 -07001652 }
Damien Georgeb035db32014-03-21 20:39:40 +00001653
xbe0a6894c2014-03-21 01:12:26 -07001654 return mp_obj_new_tuple(3, result);
xbe613a8e32014-03-18 00:06:29 -07001655}
1656
Damien Georgeb035db32014-03-21 20:39:40 +00001657STATIC mp_obj_t str_partition(mp_obj_t self_in, mp_obj_t arg) {
1658 return str_partitioner(self_in, arg, 1);
xbe0a6894c2014-03-21 01:12:26 -07001659}
xbe4504ea82014-03-19 00:46:14 -07001660
Damien Georgeb035db32014-03-21 20:39:40 +00001661STATIC mp_obj_t str_rpartition(mp_obj_t self_in, mp_obj_t arg) {
1662 return str_partitioner(self_in, arg, -1);
xbe4504ea82014-03-19 00:46:14 -07001663}
1664
Paul Sokolovsky69135212014-05-10 19:47:41 +03001665// Supposedly not too critical operations, so optimize for code size
Damien Georgefcc9cf62014-06-01 18:22:09 +01001666STATIC mp_obj_t str_caseconv(unichar (*op)(unichar), mp_obj_t self_in) {
Paul Sokolovsky69135212014-05-10 19:47:41 +03001667 GET_STR_DATA_LEN(self_in, self_data, self_len);
Damien George05005f62015-01-21 22:48:37 +00001668 vstr_t vstr;
1669 vstr_init_len(&vstr, self_len);
1670 byte *data = (byte*)vstr.buf;
Damien George39dc1452014-10-03 19:52:22 +01001671 for (mp_uint_t i = 0; i < self_len; i++) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001672 *data++ = op(*self_data++);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001673 }
Damien George05005f62015-01-21 22:48:37 +00001674 return mp_obj_new_str_from_vstr(mp_obj_get_type(self_in), &vstr);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001675}
1676
1677STATIC mp_obj_t str_lower(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001678 return str_caseconv(unichar_tolower, self_in);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001679}
1680
1681STATIC mp_obj_t str_upper(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001682 return str_caseconv(unichar_toupper, self_in);
Paul Sokolovsky69135212014-05-10 19:47:41 +03001683}
1684
Damien Georgefcc9cf62014-06-01 18:22:09 +01001685STATIC mp_obj_t str_uni_istype(bool (*f)(unichar), mp_obj_t self_in) {
Kim Bautersa3f4b832014-05-31 07:30:03 +01001686 GET_STR_DATA_LEN(self_in, self_data, self_len);
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001687
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001688 if (self_len == 0) {
1689 return mp_const_false; // default to False for empty str
1690 }
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001691
Damien Georgefcc9cf62014-06-01 18:22:09 +01001692 if (f != unichar_isupper && f != unichar_islower) {
Damien George39dc1452014-10-03 19:52:22 +01001693 for (mp_uint_t i = 0; i < self_len; i++) {
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001694 if (!f(*self_data++)) {
1695 return mp_const_false;
1696 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001697 }
1698 } else {
Kim Bautersa3f4b832014-05-31 07:30:03 +01001699 bool contains_alpha = false;
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001700
Damien George39dc1452014-10-03 19:52:22 +01001701 for (mp_uint_t i = 0; i < self_len; i++) { // only check alphanumeric characters
Kim Bautersa3f4b832014-05-31 07:30:03 +01001702 if (unichar_isalpha(*self_data++)) {
1703 contains_alpha = true;
Damien Georgefcc9cf62014-06-01 18:22:09 +01001704 if (!f(*(self_data - 1))) { // -1 because we already incremented above
1705 return mp_const_false;
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001706 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001707 }
1708 }
Paul Sokolovskyae9c82d2014-05-31 11:00:25 +03001709
Paul Sokolovskyf69b9d32014-05-31 10:59:34 +03001710 if (!contains_alpha) {
1711 return mp_const_false;
1712 }
Kim Bautersa3f4b832014-05-31 07:30:03 +01001713 }
1714
1715 return mp_const_true;
1716}
1717
1718STATIC mp_obj_t str_isspace(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001719 return str_uni_istype(unichar_isspace, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001720}
1721
1722STATIC mp_obj_t str_isalpha(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001723 return str_uni_istype(unichar_isalpha, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001724}
1725
1726STATIC mp_obj_t str_isdigit(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001727 return str_uni_istype(unichar_isdigit, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001728}
1729
1730STATIC mp_obj_t str_isupper(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001731 return str_uni_istype(unichar_isupper, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001732}
1733
1734STATIC mp_obj_t str_islower(mp_obj_t self_in) {
Damien Georgefcc9cf62014-06-01 18:22:09 +01001735 return str_uni_istype(unichar_islower, self_in);
Kim Bautersa3f4b832014-05-31 07:30:03 +01001736}
1737
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001738#if MICROPY_CPYTHON_COMPAT
1739// These methods are superfluous in the presense of str() and bytes()
1740// constructors.
1741// TODO: should accept kwargs too
Damien Georgeecc88e92014-08-30 00:35:11 +01001742STATIC mp_obj_t bytes_decode(mp_uint_t n_args, const mp_obj_t *args) {
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001743 mp_obj_t new_args[2];
1744 if (n_args == 1) {
1745 new_args[0] = args[0];
1746 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1747 args = new_args;
1748 n_args++;
1749 }
Paul Sokolovsky344e15b2015-01-23 02:15:56 +02001750 return mp_obj_str_make_new((mp_obj_t)&mp_type_str, n_args, 0, args);
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001751}
1752
1753// TODO: should accept kwargs too
Damien Georgeecc88e92014-08-30 00:35:11 +01001754STATIC mp_obj_t str_encode(mp_uint_t n_args, const mp_obj_t *args) {
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001755 mp_obj_t new_args[2];
1756 if (n_args == 1) {
1757 new_args[0] = args[0];
1758 new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
1759 args = new_args;
1760 n_args++;
1761 }
1762 return bytes_make_new(NULL, n_args, 0, args);
1763}
1764#endif
1765
Damien George4d917232014-08-30 14:28:06 +01001766mp_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 +01001767 if (flags == MP_BUFFER_READ) {
Damien George2da98302014-03-09 19:58:18 +00001768 GET_STR_DATA_LEN(self_in, str_data, str_len);
1769 bufinfo->buf = (void*)str_data;
1770 bufinfo->len = str_len;
Damien George57a4b4f2014-04-18 22:29:21 +01001771 bufinfo->typecode = 'b';
Damien George2da98302014-03-09 19:58:18 +00001772 return 0;
1773 } else {
1774 // can't write to a string
1775 bufinfo->buf = NULL;
1776 bufinfo->len = 0;
Damien George57a4b4f2014-04-18 22:29:21 +01001777 bufinfo->typecode = -1;
Damien George2da98302014-03-09 19:58:18 +00001778 return 1;
1779 }
1780}
1781
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001782#if MICROPY_CPYTHON_COMPAT
Paul Sokolovsky97319122014-06-13 22:01:26 +03001783MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_decode_obj, 1, 3, bytes_decode);
1784MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_encode_obj, 1, 3, str_encode);
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001785#endif
Paul Sokolovsky97319122014-06-13 22:01:26 +03001786MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj, 2, 4, str_find);
1787MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rfind_obj, 2, 4, str_rfind);
1788MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_index_obj, 2, 4, str_index);
1789MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rindex_obj, 2, 4, str_rindex);
1790MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join);
Paul Sokolovsky87051712015-03-23 22:15:12 +02001791MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, mp_obj_str_split);
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +03001792#if MICROPY_PY_BUILTINS_STR_SPLITLINES
1793MP_DEFINE_CONST_FUN_OBJ_KW(str_splitlines_obj, 1, str_splitlines);
1794#endif
Paul Sokolovsky97319122014-06-13 22:01:26 +03001795MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rsplit_obj, 1, 3, str_rsplit);
1796MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_startswith_obj, 2, 3, str_startswith);
1797MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_endswith_obj, 2, 3, str_endswith);
1798MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip);
1799MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_lstrip_obj, 1, 2, str_lstrip);
1800MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rstrip_obj, 1, 2, str_rstrip);
Paul Sokolovskyc1144962015-01-04 00:14:13 +02001801MP_DEFINE_CONST_FUN_OBJ_KW(str_format_obj, 1, mp_obj_str_format);
Paul Sokolovsky97319122014-06-13 22:01:26 +03001802MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj, 3, 4, str_replace);
1803MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count);
1804MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition);
1805MP_DEFINE_CONST_FUN_OBJ_2(str_rpartition_obj, str_rpartition);
1806MP_DEFINE_CONST_FUN_OBJ_1(str_lower_obj, str_lower);
1807MP_DEFINE_CONST_FUN_OBJ_1(str_upper_obj, str_upper);
1808MP_DEFINE_CONST_FUN_OBJ_1(str_isspace_obj, str_isspace);
1809MP_DEFINE_CONST_FUN_OBJ_1(str_isalpha_obj, str_isalpha);
1810MP_DEFINE_CONST_FUN_OBJ_1(str_isdigit_obj, str_isdigit);
1811MP_DEFINE_CONST_FUN_OBJ_1(str_isupper_obj, str_isupper);
1812MP_DEFINE_CONST_FUN_OBJ_1(str_islower_obj, str_islower);
Damiend99b0522013-12-21 18:17:45 +00001813
Paul Sokolovsky6113eb22015-01-23 02:05:58 +02001814STATIC const mp_map_elem_t str8_locals_dict_table[] = {
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001815#if MICROPY_CPYTHON_COMPAT
1816 { MP_OBJ_NEW_QSTR(MP_QSTR_decode), (mp_obj_t)&bytes_decode_obj },
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001817 #if !MICROPY_PY_BUILTINS_STR_UNICODE
1818 // If we have separate unicode type, then here we have methods only
1819 // for bytes type, and it should not have encode() methods. Otherwise,
1820 // we have non-compliant-but-practical bytestring type, which shares
1821 // method table with bytes, so they both have encode() and decode()
1822 // methods (which should do type checking at runtime).
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001823 { MP_OBJ_NEW_QSTR(MP_QSTR_encode), (mp_obj_t)&str_encode_obj },
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001824 #endif
Paul Sokolovsky73b70272014-04-13 05:28:46 +03001825#endif
Damien George9b196cd2014-03-26 21:47:19 +00001826 { MP_OBJ_NEW_QSTR(MP_QSTR_find), (mp_obj_t)&str_find_obj },
1827 { MP_OBJ_NEW_QSTR(MP_QSTR_rfind), (mp_obj_t)&str_rfind_obj },
xbe3d9a39e2014-04-08 11:42:19 -07001828 { MP_OBJ_NEW_QSTR(MP_QSTR_index), (mp_obj_t)&str_index_obj },
1829 { MP_OBJ_NEW_QSTR(MP_QSTR_rindex), (mp_obj_t)&str_rindex_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001830 { MP_OBJ_NEW_QSTR(MP_QSTR_join), (mp_obj_t)&str_join_obj },
1831 { MP_OBJ_NEW_QSTR(MP_QSTR_split), (mp_obj_t)&str_split_obj },
Paul Sokolovskyac2f7a72015-04-04 00:09:23 +03001832 #if MICROPY_PY_BUILTINS_STR_SPLITLINES
1833 { MP_OBJ_NEW_QSTR(MP_QSTR_splitlines), (mp_obj_t)&str_splitlines_obj },
1834 #endif
Paul Sokolovsky2a273652014-05-13 08:07:08 +03001835 { MP_OBJ_NEW_QSTR(MP_QSTR_rsplit), (mp_obj_t)&str_rsplit_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001836 { MP_OBJ_NEW_QSTR(MP_QSTR_startswith), (mp_obj_t)&str_startswith_obj },
Paul Sokolovskyd098c6b2014-05-24 22:46:51 +03001837 { MP_OBJ_NEW_QSTR(MP_QSTR_endswith), (mp_obj_t)&str_endswith_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001838 { MP_OBJ_NEW_QSTR(MP_QSTR_strip), (mp_obj_t)&str_strip_obj },
Paul Sokolovsky88107842014-04-26 06:20:08 +03001839 { MP_OBJ_NEW_QSTR(MP_QSTR_lstrip), (mp_obj_t)&str_lstrip_obj },
1840 { MP_OBJ_NEW_QSTR(MP_QSTR_rstrip), (mp_obj_t)&str_rstrip_obj },
Damien George9b196cd2014-03-26 21:47:19 +00001841 { MP_OBJ_NEW_QSTR(MP_QSTR_format), (mp_obj_t)&str_format_obj },
1842 { MP_OBJ_NEW_QSTR(MP_QSTR_replace), (mp_obj_t)&str_replace_obj },
1843 { MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&str_count_obj },
1844 { MP_OBJ_NEW_QSTR(MP_QSTR_partition), (mp_obj_t)&str_partition_obj },
1845 { MP_OBJ_NEW_QSTR(MP_QSTR_rpartition), (mp_obj_t)&str_rpartition_obj },
Paul Sokolovsky69135212014-05-10 19:47:41 +03001846 { MP_OBJ_NEW_QSTR(MP_QSTR_lower), (mp_obj_t)&str_lower_obj },
1847 { MP_OBJ_NEW_QSTR(MP_QSTR_upper), (mp_obj_t)&str_upper_obj },
Kim Bautersa3f4b832014-05-31 07:30:03 +01001848 { MP_OBJ_NEW_QSTR(MP_QSTR_isspace), (mp_obj_t)&str_isspace_obj },
1849 { MP_OBJ_NEW_QSTR(MP_QSTR_isalpha), (mp_obj_t)&str_isalpha_obj },
1850 { MP_OBJ_NEW_QSTR(MP_QSTR_isdigit), (mp_obj_t)&str_isdigit_obj },
1851 { MP_OBJ_NEW_QSTR(MP_QSTR_isupper), (mp_obj_t)&str_isupper_obj },
1852 { MP_OBJ_NEW_QSTR(MP_QSTR_islower), (mp_obj_t)&str_islower_obj },
ian-v7a16fad2014-01-06 09:52:29 -08001853};
Damien George97209d32014-01-07 15:58:30 +00001854
Paul Sokolovsky6113eb22015-01-23 02:05:58 +02001855STATIC MP_DEFINE_CONST_DICT(str8_locals_dict, str8_locals_dict_table);
Damien George9b196cd2014-03-26 21:47:19 +00001856
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001857#if !MICROPY_PY_BUILTINS_STR_UNICODE
Damien George3e1a5c12014-03-29 13:43:38 +00001858const mp_obj_type_t mp_type_str = {
Damien Georgec5966122014-02-15 16:10:44 +00001859 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001860 .name = MP_QSTR_str,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02001861 .print = str_print,
Paul Sokolovsky344e15b2015-01-23 02:15:56 +02001862 .make_new = mp_obj_str_make_new,
Damien Georgee04a44e2014-06-28 10:27:23 +01001863 .binary_op = mp_obj_str_binary_op,
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +03001864 .subscr = bytes_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001865 .getiter = mp_obj_new_str_iterator,
Damien Georgee04a44e2014-06-28 10:27:23 +01001866 .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
Paul Sokolovsky6113eb22015-01-23 02:05:58 +02001867 .locals_dict = (mp_obj_t)&str8_locals_dict,
Damiend99b0522013-12-21 18:17:45 +00001868};
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03001869#endif
Damiend99b0522013-12-21 18:17:45 +00001870
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001871// Reuses most of methods from str
Damien George3e1a5c12014-03-29 13:43:38 +00001872const mp_obj_type_t mp_type_bytes = {
Damien Georgec5966122014-02-15 16:10:44 +00001873 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00001874 .name = MP_QSTR_bytes,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001875 .print = str_print,
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001876 .make_new = bytes_make_new,
Damien Georgee04a44e2014-06-28 10:27:23 +01001877 .binary_op = mp_obj_str_binary_op,
Paul Sokolovsky9749b2f2014-08-11 22:36:38 +03001878 .subscr = bytes_subscr,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001879 .getiter = mp_obj_new_bytes_iterator,
Damien Georgee04a44e2014-06-28 10:27:23 +01001880 .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
Paul Sokolovsky6113eb22015-01-23 02:05:58 +02001881 .locals_dict = (mp_obj_t)&str8_locals_dict,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001882};
1883
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001884// the zero-length bytes
Damien George20f59e12014-10-11 17:56:43 +01001885const mp_obj_str_t mp_const_empty_bytes_obj = {{&mp_type_bytes}, 0, 0, NULL};
Paul Sokolovsky1ecea7c2014-03-21 23:46:59 +02001886
Damien George77089be2015-01-21 23:08:36 +00001887// Create a str/bytes object using the given data. New memory is allocated and
1888// the data is copied across.
Damien George4abff752014-08-30 14:59:21 +01001889mp_obj_t mp_obj_new_str_of_type(const mp_obj_type_t *type, const byte* data, mp_uint_t len) {
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001890 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001891 o->base.type = type;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001892 o->len = len;
Paul Sokolovsky5972b4c2014-03-20 16:47:44 +02001893 if (data) {
1894 o->hash = qstr_compute_hash(data, len);
1895 byte *p = m_new(byte, len + 1);
1896 o->data = p;
1897 memcpy(p, data, len * sizeof(byte));
1898 p[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
1899 }
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001900 return o;
1901}
1902
Damien George77089be2015-01-21 23:08:36 +00001903// Create a str/bytes object from the given vstr. The vstr buffer is resized to
1904// the exact length required and then reused for the str/bytes object. The vstr
1905// is cleared and can safely be passed to vstr_free if it was heap allocated.
Damien George0b9ee862015-01-21 19:14:25 +00001906mp_obj_t mp_obj_new_str_from_vstr(const mp_obj_type_t *type, vstr_t *vstr) {
1907 // if not a bytes object, look if a qstr with this data already exists
1908 if (type == &mp_type_str) {
1909 qstr q = qstr_find_strn(vstr->buf, vstr->len);
1910 if (q != MP_QSTR_NULL) {
1911 vstr_clear(vstr);
1912 vstr->alloc = 0;
1913 return MP_OBJ_NEW_QSTR(q);
1914 }
1915 }
1916
1917 // make a new str/bytes object
1918 mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
1919 o->base.type = type;
1920 o->len = vstr->len;
1921 o->hash = qstr_compute_hash((byte*)vstr->buf, vstr->len);
1922 o->data = (byte*)m_renew(char, vstr->buf, vstr->alloc, vstr->len + 1);
Damien George0d3cb672015-01-28 23:43:01 +00001923 ((byte*)o->data)[o->len] = '\0'; // add null byte
Damien George0b9ee862015-01-21 19:14:25 +00001924 vstr->buf = NULL;
1925 vstr->alloc = 0;
1926 return o;
1927}
1928
Damien Georged182b982014-08-30 14:19:41 +01001929mp_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 +01001930 if (make_qstr_if_not_already) {
1931 // use existing, or make a new qstr
Damien George2617eeb2014-05-25 22:27:57 +01001932 return MP_OBJ_NEW_QSTR(qstr_from_strn(data, len));
Damien George5fa93b62014-01-22 14:35:10 +00001933 } else {
Damien Georgef600a6a2014-05-25 22:34:34 +01001934 qstr q = qstr_find_strn(data, len);
1935 if (q != MP_QSTR_NULL) {
1936 // qstr with this data already exists
1937 return MP_OBJ_NEW_QSTR(q);
1938 } else {
1939 // no existing qstr, don't make one
1940 return mp_obj_new_str_of_type(&mp_type_str, (const byte*)data, len);
1941 }
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02001942 }
Damien George5fa93b62014-01-22 14:35:10 +00001943}
1944
Paul Sokolovskyb4efac12014-06-08 01:13:35 +03001945mp_obj_t mp_obj_str_intern(mp_obj_t str) {
1946 GET_STR_DATA_LEN(str, data, len);
1947 return MP_OBJ_NEW_QSTR(qstr_from_strn((const char*)data, len));
1948}
1949
Damien Georged182b982014-08-30 14:19:41 +01001950mp_obj_t mp_obj_new_bytes(const byte* data, mp_uint_t len) {
Damien Georgef600a6a2014-05-25 22:34:34 +01001951 return mp_obj_new_str_of_type(&mp_type_bytes, data, len);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02001952}
1953
Damien George5fa93b62014-01-22 14:35:10 +00001954bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) {
1955 if (MP_OBJ_IS_QSTR(s1) && MP_OBJ_IS_QSTR(s2)) {
1956 return s1 == s2;
1957 } else {
1958 GET_STR_HASH(s1, h1);
1959 GET_STR_HASH(s2, h2);
Paul Sokolovsky59e269c2014-04-14 01:43:01 +03001960 // If any of hashes is 0, it means it's not valid
1961 if (h1 != 0 && h2 != 0 && h1 != h2) {
Damien George5fa93b62014-01-22 14:35:10 +00001962 return false;
1963 }
1964 GET_STR_DATA_LEN(s1, d1, l1);
1965 GET_STR_DATA_LEN(s2, d2, l2);
1966 if (l1 != l2) {
1967 return false;
1968 }
Damien George1e708fe2014-01-23 18:27:51 +00001969 return memcmp(d1, d2, l1) == 0;
Paul Sokolovsky8965a5e2014-01-20 23:33:19 +02001970 }
Damien George5fa93b62014-01-22 14:35:10 +00001971}
1972
Damien Georgedeed0872014-04-06 11:11:15 +01001973STATIC void bad_implicit_conversion(mp_obj_t self_in) {
Damien George1e9a92f2014-11-06 17:36:16 +00001974 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
1975 nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
1976 "can't convert to str implicitly"));
1977 } else {
1978 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
1979 "can't convert '%s' object to str implicitly",
1980 mp_obj_get_type_str(self_in)));
1981 }
Damien Georgeb829b5c2014-01-25 13:51:19 +00001982}
1983
Damien Georged182b982014-08-30 14:19:41 +01001984mp_uint_t mp_obj_str_get_hash(mp_obj_t self_in) {
Paul Sokolovskyf130ca12014-04-13 05:41:00 +03001985 // TODO: This has too big overhead for hash accessor
Damien Georgebe8e99c2014-11-05 16:45:54 +00001986 if (MP_OBJ_IS_STR_OR_BYTES(self_in)) {
Damien George5fa93b62014-01-22 14:35:10 +00001987 GET_STR_HASH(self_in, h);
1988 return h;
1989 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00001990 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00001991 }
1992}
1993
Damien Georged182b982014-08-30 14:19:41 +01001994mp_uint_t mp_obj_str_get_len(mp_obj_t self_in) {
Damien Georgeee014112014-04-15 23:10:00 +01001995 // TODO This has a double check for the type, one in obj.c and one here
Damien Georgebe8e99c2014-11-05 16:45:54 +00001996 if (MP_OBJ_IS_STR_OR_BYTES(self_in)) {
Damien George5fa93b62014-01-22 14:35:10 +00001997 GET_STR_LEN(self_in, l);
1998 return l;
1999 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00002000 bad_implicit_conversion(self_in);
2001 }
2002}
2003
2004// use this if you will anyway convert the string to a qstr
2005// will be more efficient for the case where it's already a qstr
2006qstr mp_obj_str_get_qstr(mp_obj_t self_in) {
2007 if (MP_OBJ_IS_QSTR(self_in)) {
2008 return MP_OBJ_QSTR_VALUE(self_in);
Damien George3e1a5c12014-03-29 13:43:38 +00002009 } else if (MP_OBJ_IS_TYPE(self_in, &mp_type_str)) {
Damien Georgeb829b5c2014-01-25 13:51:19 +00002010 mp_obj_str_t *self = self_in;
2011 return qstr_from_strn((char*)self->data, self->len);
2012 } else {
2013 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00002014 }
2015}
2016
2017// only use this function if you need the str data to be zero terminated
2018// at the moment all strings are zero terminated to help with C ASCIIZ compatibility
2019const char *mp_obj_str_get_str(mp_obj_t self_in) {
Paul Sokolovsky31619cc2014-10-30 16:36:41 +02002020 if (MP_OBJ_IS_STR_OR_BYTES(self_in)) {
Damien George5fa93b62014-01-22 14:35:10 +00002021 GET_STR_DATA_LEN(self_in, s, l);
2022 (void)l; // len unused
2023 return (const char*)s;
2024 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00002025 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00002026 }
2027}
2028
Damien Georged182b982014-08-30 14:19:41 +01002029const char *mp_obj_str_get_data(mp_obj_t self_in, mp_uint_t *len) {
Dave Hylandsb7f7c652014-08-26 12:44:46 -07002030 if (MP_OBJ_IS_STR_OR_BYTES(self_in)) {
Damien George5fa93b62014-01-22 14:35:10 +00002031 GET_STR_DATA_LEN(self_in, s, l);
2032 *len = l;
Damien George698ec212014-02-08 18:17:23 +00002033 return (const char*)s;
Damien George5fa93b62014-01-22 14:35:10 +00002034 } else {
Damien Georgeb829b5c2014-01-25 13:51:19 +00002035 bad_implicit_conversion(self_in);
Damien George5fa93b62014-01-22 14:35:10 +00002036 }
Damiend99b0522013-12-21 18:17:45 +00002037}
xyb8cfc9f02014-01-05 18:47:51 +08002038
2039/******************************************************************************/
2040/* str iterator */
2041
2042typedef struct _mp_obj_str_it_t {
2043 mp_obj_base_t base;
Damien George5fa93b62014-01-22 14:35:10 +00002044 mp_obj_t str;
Damien George40f3c022014-07-03 13:25:24 +01002045 mp_uint_t cur;
xyb8cfc9f02014-01-05 18:47:51 +08002046} mp_obj_str_it_t;
2047
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03002048#if !MICROPY_PY_BUILTINS_STR_UNICODE
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02002049STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
xyb8cfc9f02014-01-05 18:47:51 +08002050 mp_obj_str_it_t *self = self_in;
Damien George5fa93b62014-01-22 14:35:10 +00002051 GET_STR_DATA_LEN(self->str, str, len);
2052 if (self->cur < len) {
Damien George2617eeb2014-05-25 22:27:57 +01002053 mp_obj_t o_out = mp_obj_new_str((const char*)str + self->cur, 1, true);
xyb8cfc9f02014-01-05 18:47:51 +08002054 self->cur += 1;
2055 return o_out;
2056 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01002057 return MP_OBJ_STOP_ITERATION;
xyb8cfc9f02014-01-05 18:47:51 +08002058 }
2059}
2060
Damien George3e1a5c12014-03-29 13:43:38 +00002061STATIC const mp_obj_type_t mp_type_str_it = {
Damien Georgec5966122014-02-15 16:10:44 +00002062 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00002063 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +03002064 .getiter = mp_identity,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +02002065 .iternext = str_it_iternext,
xyb8cfc9f02014-01-05 18:47:51 +08002066};
2067
Paul Sokolovskyd215ee12014-06-13 22:41:45 +03002068mp_obj_t mp_obj_new_str_iterator(mp_obj_t str) {
2069 mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
2070 o->base.type = &mp_type_str_it;
2071 o->str = str;
2072 o->cur = 0;
2073 return o;
2074}
2075#endif
2076
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +02002077STATIC mp_obj_t bytes_it_iternext(mp_obj_t self_in) {
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02002078 mp_obj_str_it_t *self = self_in;
2079 GET_STR_DATA_LEN(self->str, str, len);
2080 if (self->cur < len) {
Damien Georgebb4c6f32014-07-31 10:49:14 +01002081 mp_obj_t o_out = MP_OBJ_NEW_SMALL_INT(str[self->cur]);
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02002082 self->cur += 1;
2083 return o_out;
2084 } else {
Damien Georgeea8d06c2014-04-17 23:19:36 +01002085 return MP_OBJ_STOP_ITERATION;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02002086 }
2087}
2088
Damien George3e1a5c12014-03-29 13:43:38 +00002089STATIC const mp_obj_type_t mp_type_bytes_it = {
Damien Georgec5966122014-02-15 16:10:44 +00002090 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +00002091 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +03002092 .getiter = mp_identity,
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02002093 .iternext = bytes_it_iternext,
2094};
2095
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02002096mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str) {
2097 mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
Damien George3e1a5c12014-03-29 13:43:38 +00002098 o->base.type = &mp_type_bytes_it;
Paul Sokolovsky91fb1c92014-01-24 22:50:40 +02002099 o->str = str;
2100 o->cur = 0;
xyb8cfc9f02014-01-05 18:47:51 +08002101 return o;
2102}