objstr.c 64.2 KB
Newer Older
1
2
3
4
5
6
/*
 * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
 * Copyright (c) 2013, 2014 Damien P. George
7
 * Copyright (c) 2014 Paul Sokolovsky
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */

xbe's avatar
xbe committed
28
#include <stdbool.h>
29
30
31
#include <string.h>
#include <assert.h>

32
#include "mpconfig.h"
33
34
#include "nlr.h"
#include "misc.h"
35
#include "qstr.h"
36
37
38
#include "obj.h"
#include "runtime0.h"
#include "runtime.h"
Dave Hylands's avatar
Dave Hylands committed
39
#include "pfenv.h"
40
#include "objstr.h"
41
#include "objlist.h"
42

43
STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, uint n_args, const mp_obj_t *args, mp_obj_t dict);
44
45
const mp_obj_t mp_const_empty_bytes;

46
47
48
49
50
51
52
53
54
// use this macro to extract the string hash
#define GET_STR_HASH(str_obj_in, str_hash) uint str_hash; if (MP_OBJ_IS_QSTR(str_obj_in)) { str_hash = qstr_hash(MP_OBJ_QSTR_VALUE(str_obj_in)); } else { str_hash = ((mp_obj_str_t*)str_obj_in)->hash; }

// use this macro to extract the string length
#define GET_STR_LEN(str_obj_in, str_len) uint str_len; if (MP_OBJ_IS_QSTR(str_obj_in)) { str_len = qstr_len(MP_OBJ_QSTR_VALUE(str_obj_in)); } else { str_len = ((mp_obj_str_t*)str_obj_in)->len; }

// use this macro to extract the string data and length
#define GET_STR_DATA_LEN(str_obj_in, str_data, str_len) const byte *str_data; uint str_len; if (MP_OBJ_IS_QSTR(str_obj_in)) { str_data = qstr_data(MP_OBJ_QSTR_VALUE(str_obj_in), &str_len); } else { str_len = ((mp_obj_str_t*)str_obj_in)->len; str_data = ((mp_obj_str_t*)str_obj_in)->data; }

55
56
STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str);
STATIC mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str);
57
STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in);
58
59
60
61
62
STATIC NORETURN void arg_type_mixup();

STATIC bool is_str_or_bytes(mp_obj_t o) {
    return MP_OBJ_IS_STR(o) || MP_OBJ_IS_TYPE(o, &mp_type_bytes);
}
xyb's avatar
xyb committed
63
64
65
66

/******************************************************************************/
/* str                                                                        */

67
68
69
70
void mp_str_print_quoted(void (*print)(void *env, const char *fmt, ...), void *env, const byte *str_data, uint str_len) {
    // this escapes characters, but it will be very slow to print (calling print many times)
    bool has_single_quote = false;
    bool has_double_quote = false;
71
    for (const byte *s = str_data, *top = str_data + str_len; !has_double_quote && s < top; s++) {
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
        if (*s == '\'') {
            has_single_quote = true;
        } else if (*s == '"') {
            has_double_quote = true;
        }
    }
    int quote_char = '\'';
    if (has_single_quote && !has_double_quote) {
        quote_char = '"';
    }
    print(env, "%c", quote_char);
    for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) {
        if (*s == quote_char) {
            print(env, "\\%c", quote_char);
        } else if (*s == '\\') {
            print(env, "\\\\");
        } else if (32 <= *s && *s <= 126) {
            print(env, "%c", *s);
        } else if (*s == '\n') {
            print(env, "\\n");
92
93
94
95
        } else if (*s == '\r') {
            print(env, "\\r");
        } else if (*s == '\t') {
            print(env, "\\t");
96
97
98
99
100
101
102
        } else {
            print(env, "\\x%02x", *s);
        }
    }
    print(env, "%c", quote_char);
}

103
STATIC void str_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
104
    GET_STR_DATA_LEN(self_in, str_data, str_len);
105
    bool is_bytes = MP_OBJ_IS_TYPE(self_in, &mp_type_bytes);
106
    if (kind == PRINT_STR && !is_bytes) {
107
        print(env, "%.*s", str_len, str_data);
108
    } else {
109
110
111
        if (is_bytes) {
            print(env, "b");
        }
112
        mp_str_print_quoted(print, env, str_data, str_len);
113
    }
114
115
}

116
STATIC mp_obj_t str_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
117
118
119
120
121
122
#if MICROPY_CPYTHON_COMPAT
    if (n_kw != 0) {
        mp_arg_error_unimpl_kw();
    }
#endif

123
124
125
126
127
128
129
130
    switch (n_args) {
        case 0:
            return MP_OBJ_NEW_QSTR(MP_QSTR_);

        case 1:
        {
            vstr_t *vstr = vstr_new();
            mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, args[0], PRINT_STR);
131
            mp_obj_t s = mp_obj_new_str(vstr->buf, vstr->len, false);
132
133
134
135
136
137
138
139
            vstr_free(vstr);
            return s;
        }

        case 2:
        case 3:
        {
            // TODO: validate 2nd/3rd args
140
            if (!MP_OBJ_IS_TYPE(args[0], &mp_type_bytes)) {
141
                nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "bytes expected"));
142
143
144
            }
            GET_STR_DATA_LEN(args[0], str_data, str_len);
            GET_STR_HASH(args[0], str_hash);
145
            mp_obj_str_t *o = mp_obj_new_str_of_type(&mp_type_str, NULL, str_len);
146
147
148
149
150
151
            o->data = str_data;
            o->hash = str_hash;
            return o;
        }

        default:
152
            nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "str takes at most 3 arguments"));
153
154
155
    }
}

156
157
158
159
160
STATIC mp_obj_t bytes_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
    if (n_args == 0) {
        return mp_const_empty_bytes;
    }

161
162
163
164
165
166
#if MICROPY_CPYTHON_COMPAT
    if (n_kw != 0) {
        mp_arg_error_unimpl_kw();
    }
#endif

167
168
169
170
171
172
    if (MP_OBJ_IS_STR(args[0])) {
        if (n_args < 2 || n_args > 3) {
            goto wrong_args;
        }
        GET_STR_DATA_LEN(args[0], str_data, str_len);
        GET_STR_HASH(args[0], str_hash);
173
        mp_obj_str_t *o = mp_obj_new_str_of_type(&mp_type_bytes, NULL, str_len);
174
175
176
177
178
179
180
181
182
183
184
185
186
        o->data = str_data;
        o->hash = str_hash;
        return o;
    }

    if (n_args > 1) {
        goto wrong_args;
    }

    if (MP_OBJ_IS_SMALL_INT(args[0])) {
        uint len = MP_OBJ_SMALL_INT_VALUE(args[0]);
        byte *data;

187
        mp_obj_t o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
        memset(data, 0, len);
        return mp_obj_str_builder_end(o);
    }

    int len;
    byte *data;
    vstr_t *vstr = NULL;
    mp_obj_t o = NULL;
    // Try to create array of exact len if initializer len is known
    mp_obj_t len_in = mp_obj_len_maybe(args[0]);
    if (len_in == MP_OBJ_NULL) {
        len = -1;
        vstr = vstr_new();
    } else {
        len = MP_OBJ_SMALL_INT_VALUE(len_in);
203
        o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
204
205
    }

Damien George's avatar
Damien George committed
206
    mp_obj_t iterable = mp_getiter(args[0]);
207
    mp_obj_t item;
208
    while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
209
210
211
212
213
214
215
216
217
218
219
        if (len == -1) {
            vstr_add_char(vstr, MP_OBJ_SMALL_INT_VALUE(item));
        } else {
            *data++ = MP_OBJ_SMALL_INT_VALUE(item);
        }
    }

    if (len == -1) {
        vstr_shrink(vstr);
        // TODO: Optimize, borrow buffer from vstr
        len = vstr_len(vstr);
220
        o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
221
222
223
224
225
226
227
        memcpy(data, vstr_str(vstr), len);
        vstr_free(vstr);
    }

    return mp_obj_str_builder_end(o);

wrong_args:
228
        nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "wrong number of arguments"));
229
230
}

231
232
// like strstr but with specified length and allows \0 bytes
// TODO replace with something more efficient/standard
233
STATIC const byte *find_subbytes(const byte *haystack, machine_uint_t hlen, const byte *needle, machine_uint_t nlen, machine_int_t direction) {
234
    if (hlen >= nlen) {
235
236
237
238
239
240
241
242
243
244
245
246
        machine_uint_t str_index, str_index_end;
        if (direction > 0) {
            str_index = 0;
            str_index_end = hlen - nlen;
        } else {
            str_index = hlen - nlen;
            str_index_end = 0;
        }
        for (;;) {
            if (memcmp(&haystack[str_index], needle, nlen) == 0) {
                //found
                return haystack + str_index;
247
            }
248
249
250
            if (str_index == str_index_end) {
                //not found
                break;
251
            }
252
            str_index += direction;
253
254
255
256
257
        }
    }
    return NULL;
}

258
STATIC mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
259
    GET_STR_DATA_LEN(lhs_in, lhs_data, lhs_len);
260
261
    mp_obj_type_t *lhs_type = mp_obj_get_type(lhs_in);
    mp_obj_type_t *rhs_type = mp_obj_get_type(rhs_in);
262
    switch (op) {
Damien George's avatar
Damien George committed
263
264
        case MP_BINARY_OP_ADD:
        case MP_BINARY_OP_INPLACE_ADD:
265
266
            if (lhs_type == rhs_type) {
                // add 2 strings or bytes
267
268

                GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
269
                int alloc_len = lhs_len + rhs_len;
270
271

                /* code for making qstr
272
273
274
275
                byte *q_ptr;
                byte *val = qstr_build_start(alloc_len, &q_ptr);
                memcpy(val, lhs_data, lhs_len);
                memcpy(val + lhs_len, rhs_data, rhs_len);
276
277
278
279
280
                return MP_OBJ_NEW_QSTR(qstr_build_end(q_ptr));
                */

                // code for non-qstr
                byte *data;
281
                mp_obj_t s = mp_obj_str_builder_start(lhs_type, alloc_len, &data);
282
283
284
                memcpy(data, lhs_data, lhs_len);
                memcpy(data + lhs_len, rhs_data, rhs_len);
                return mp_obj_str_builder_end(s);
285
286
            }
            break;
287

Damien George's avatar
Damien George committed
288
        case MP_BINARY_OP_IN:
289
            /* NOTE `a in b` is `b.__contains__(a)` */
290
            if (lhs_type == rhs_type) {
291
                GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
292
                return MP_BOOL(find_subbytes(lhs_data, lhs_len, rhs_data, rhs_len, 1) != NULL);
293
294
            }
            break;
295

296
        case MP_BINARY_OP_MULTIPLY: {
297
            if (!MP_OBJ_IS_SMALL_INT(rhs_in)) {
298
                return MP_OBJ_NULL; // op not supported
299
300
            }
            int n = MP_OBJ_SMALL_INT_VALUE(rhs_in);
301
            byte *data;
302
            mp_obj_t s = mp_obj_str_builder_start(lhs_type, lhs_len * n, &data);
303
304
            mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, data);
            return mp_obj_str_builder_end(s);
305
        }
306

307
308
309
        case MP_BINARY_OP_MODULO: {
            mp_obj_t *args;
            uint n_args;
310
            mp_obj_t dict = MP_OBJ_NULL;
311
312
313
            if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple)) {
                // TODO: Support tuple subclasses?
                mp_obj_tuple_get(rhs_in, &n_args, &args);
314
315
316
317
            } else if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_dict)) {
                args = NULL;
                n_args = 0;
                dict = rhs_in;
318
319
320
321
            } else {
                args = &rhs_in;
                n_args = 1;
            }
322
            return str_modulo_format(lhs_in, n_args, args, dict);
323
324
        }

325
326
        //case MP_BINARY_OP_NOT_EQUAL: // This is never passed here
        case MP_BINARY_OP_EQUAL: // This will be passed only for bytes, str is dealt with in mp_obj_equal()
Damien George's avatar
Damien George committed
327
328
329
330
        case MP_BINARY_OP_LESS:
        case MP_BINARY_OP_LESS_EQUAL:
        case MP_BINARY_OP_MORE:
        case MP_BINARY_OP_MORE_EQUAL:
331
            if (lhs_type == rhs_type) {
332
333
334
                GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
                return MP_BOOL(mp_seq_cmp_bytes(op, lhs_data, lhs_len, rhs_data, rhs_len));
            }
335
336
337
338
339
340
341
342
343
344
345
            if (lhs_type == &mp_type_bytes) {
                mp_buffer_info_t bufinfo;
                if (!mp_get_buffer(rhs_in, &bufinfo, MP_BUFFER_READ)) {
                    goto uncomparable;
                }
                return MP_BOOL(mp_seq_cmp_bytes(op, lhs_data, lhs_len, bufinfo.buf, bufinfo.len));
            }
uncomparable:
            if (op == MP_BINARY_OP_EQUAL) {
                return mp_const_false;
            }
346
347
    }

348
    return MP_OBJ_NULL; // op not supported
349
350
}

351
STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
352
    mp_obj_type_t *type = mp_obj_get_type(self_in);
353
354
355
    GET_STR_DATA_LEN(self_in, self_data, self_len);
    if (value == MP_OBJ_SENTINEL) {
        // load
356
#if MICROPY_PY_BUILTINS_SLICE
357
        if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
358
359
            mp_bound_slice_t slice;
            if (!mp_seq_get_fast_slice_indexes(self_len, index, &slice)) {
360
361
                nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,
                    "Only slices with step=1 (aka None) are supported"));
362
            }
363
            return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start);
364
365
366
367
368
369
        }
#endif
        uint index_val = mp_get_index(type, self_len, index, false);
        if (type == &mp_type_bytes) {
            return MP_OBJ_NEW_SMALL_INT((mp_small_int_t)self_data[index_val]);
        } else {
370
            return mp_obj_new_str((char*)self_data + index_val, 1, true);
371
372
        }
    } else {
373
        return MP_OBJ_NULL; // op not supported
374
375
376
    }
}

377
STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
378
379
    assert(is_str_or_bytes(self_in));
    const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
380

381
    // get separation string
382
    GET_STR_DATA_LEN(self_in, sep_str, sep_len);
383
384

    // process args
385
386
    uint seq_len;
    mp_obj_t *seq_items;
387
    if (MP_OBJ_IS_TYPE(arg, &mp_type_tuple)) {
388
389
        mp_obj_tuple_get(arg, &seq_len, &seq_items);
    } else {
390
391
        if (!MP_OBJ_IS_TYPE(arg, &mp_type_list)) {
            // arg is not a list, try to convert it to one
392
            // TODO: Try to optimize?
393
394
395
            arg = mp_type_list.make_new((mp_obj_t)&mp_type_list, 1, 0, &arg);
        }
        mp_obj_list_get(arg, &seq_len, &seq_items);
396
    }
397
398
399

    // count required length
    int required_len = 0;
400
    for (int i = 0; i < seq_len; i++) {
401
402
403
        if (mp_obj_get_type(seq_items[i]) != self_type) {
            nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
                "join expects a list of str/bytes objects consistent with self object"));
404
        }
405
406
407
        if (i > 0) {
            required_len += sep_len;
        }
408
409
        GET_STR_LEN(seq_items[i], l);
        required_len += l;
410
411
412
    }

    // make joined string
413
    byte *data;
414
    mp_obj_t joined_str = mp_obj_str_builder_start(self_type, required_len, &data);
415
416
    for (int i = 0; i < seq_len; i++) {
        if (i > 0) {
417
418
            memcpy(data, sep_str, sep_len);
            data += sep_len;
419
        }
420
421
422
        GET_STR_DATA_LEN(seq_items[i], s, l);
        memcpy(data, s, l);
        data += l;
423
    }
424
425

    // return joined string
426
    return mp_obj_str_builder_end(joined_str);
427
428
}

Paul Sokolovsky's avatar
Paul Sokolovsky committed
429
430
#define is_ws(c) ((c) == ' ' || (c) == '\t')

431
STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) {
432
    const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
433
    machine_int_t splits = -1;
Paul Sokolovsky's avatar
Paul Sokolovsky committed
434
435
436
437
    mp_obj_t sep = mp_const_none;
    if (n_args > 1) {
        sep = args[1];
        if (n_args > 2) {
438
            splits = mp_obj_get_int(args[2]);
Paul Sokolovsky's avatar
Paul Sokolovsky committed
439
440
        }
    }
441

Paul Sokolovsky's avatar
Paul Sokolovsky committed
442
    mp_obj_t res = mp_obj_new_list(0, NULL);
443
444
    GET_STR_DATA_LEN(args[0], s, len);
    const byte *top = s + len;
445
446
447
448
449

    if (sep == mp_const_none) {
        // sep not given, so separate on whitespace

        // Initial whitespace is not counted as split, so we pre-do it
450
        while (s < top && is_ws(*s)) s++;
451
452
453
        while (s < top && splits != 0) {
            const byte *start = s;
            while (s < top && !is_ws(*s)) s++;
454
            mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
455
456
457
458
459
460
461
            if (s >= top) {
                break;
            }
            while (s < top && is_ws(*s)) s++;
            if (splits > 0) {
                splits--;
            }
Paul Sokolovsky's avatar
Paul Sokolovsky committed
462
463
        }

464
        if (s < top) {
465
            mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, s, top - s));
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
        }

    } else {
        // sep given

        uint sep_len;
        const char *sep_str = mp_obj_str_get_data(sep, &sep_len);

        if (sep_len == 0) {
            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
        }

        for (;;) {
            const byte *start = s;
            for (;;) {
                if (splits == 0 || s + sep_len > top) {
                    s = top;
                    break;
                } else if (memcmp(s, sep_str, sep_len) == 0) {
                    break;
                }
                s++;
            }
489
            mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
490
491
492
493
494
495
496
497
            if (s >= top) {
                break;
            }
            s += sep_len;
            if (splits > 0) {
                splits--;
            }
        }
Paul Sokolovsky's avatar
Paul Sokolovsky committed
498
499
500
501
502
    }

    return res;
}

503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
STATIC mp_obj_t str_rsplit(uint n_args, const mp_obj_t *args) {
    if (n_args < 3) {
        // If we don't have split limit, it doesn't matter from which side
        // we split.
        return str_split(n_args, args);
    }
    const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
    mp_obj_t sep = args[1];
    GET_STR_DATA_LEN(args[0], s, len);

    machine_int_t splits = mp_obj_get_int(args[2]);
    machine_int_t org_splits = splits;
    // Preallocate list to the max expected # of elements, as we
    // will fill it from the end.
    mp_obj_list_t *res = mp_obj_new_list(splits + 1, NULL);
    int idx = splits;

    if (sep == mp_const_none) {
521
        assert(!"TODO: rsplit(None,n) not implemented");
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
    } else {
        uint sep_len;
        const char *sep_str = mp_obj_str_get_data(sep, &sep_len);

        if (sep_len == 0) {
            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
        }

        const byte *beg = s;
        const byte *last = s + len;
        for (;;) {
            s = last - sep_len;
            for (;;) {
                if (splits == 0 || s < beg) {
                    break;
                } else if (memcmp(s, sep_str, sep_len) == 0) {
                    break;
                }
                s--;
            }
            if (s < beg || splits == 0) {
543
                res->items[idx] = mp_obj_new_str_of_type(self_type, beg, last - beg);
544
545
                break;
            }
546
            res->items[idx--] = mp_obj_new_str_of_type(self_type, s + sep_len, last - s - sep_len);
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
            last = s;
            if (splits > 0) {
                splits--;
            }
        }
        if (idx != 0) {
            // We split less parts than split limit, now go cleanup surplus
            int used = org_splits + 1 - idx;
            memcpy(res->items, &res->items[idx], used * sizeof(mp_obj_t));
            mp_seq_clear(res->items, used, res->alloc, sizeof(*res->items));
            res->len = used;
        }
    }

    return res;
}


565
STATIC mp_obj_t str_finder(uint n_args, const mp_obj_t *args, machine_int_t direction, bool is_index) {
566
    assert(2 <= n_args && n_args <= 4);
567
568
    assert(MP_OBJ_IS_STR(args[0]));
    assert(MP_OBJ_IS_STR(args[1]));
569

570
571
    GET_STR_DATA_LEN(args[0], haystack, haystack_len);
    GET_STR_DATA_LEN(args[1], needle, needle_len);
572

573
574
    machine_uint_t start = 0;
    machine_uint_t end = haystack_len;
575
    if (n_args >= 3 && args[2] != mp_const_none) {
576
        start = mp_get_index(&mp_type_str, haystack_len, args[2], true);
577
578
    }
    if (n_args >= 4 && args[3] != mp_const_none) {
579
        end = mp_get_index(&mp_type_str, haystack_len, args[3], true);
580
581
    }

582
    const byte *p = find_subbytes(haystack + start, end - start, needle, needle_len, direction);
583
584
    if (p == NULL) {
        // not found
585
586
587
588
589
        if (is_index) {
            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "substring not found"));
        } else {
            return MP_OBJ_NEW_SMALL_INT(-1);
        }
590
591
    } else {
        // found
592
        return MP_OBJ_NEW_SMALL_INT(p - haystack);
593
594
595
    }
}

596
STATIC mp_obj_t str_find(uint n_args, const mp_obj_t *args) {
597
    return str_finder(n_args, args, 1, false);
598
599
600
}

STATIC mp_obj_t str_rfind(uint n_args, const mp_obj_t *args) {
601
602
603
604
605
606
607
608
609
    return str_finder(n_args, args, -1, false);
}

STATIC mp_obj_t str_index(uint n_args, const mp_obj_t *args) {
    return str_finder(n_args, args, 1, true);
}

STATIC mp_obj_t str_rindex(uint n_args, const mp_obj_t *args) {
    return str_finder(n_args, args, -1, true);
610
611
}

612
// TODO: (Much) more variety in args
613
614
615
616
617
618
619
620
STATIC mp_obj_t str_startswith(uint n_args, const mp_obj_t *args) {
    GET_STR_DATA_LEN(args[0], str, str_len);
    GET_STR_DATA_LEN(args[1], prefix, prefix_len);
    uint index_val = 0;
    if (n_args > 2) {
        index_val = mp_get_index(&mp_type_str, str_len, args[2], true);
    }
    if (prefix_len + index_val > str_len) {
621
622
        return mp_const_false;
    }
623
    return MP_BOOL(memcmp(str + index_val, prefix, prefix_len) == 0);
624
625
}

626
627
628
629
630
631
632
633
634
635
636
STATIC mp_obj_t str_endswith(uint n_args, const mp_obj_t *args) {
    GET_STR_DATA_LEN(args[0], str, str_len);
    GET_STR_DATA_LEN(args[1], suffix, suffix_len);
    assert(n_args == 2);

    if (suffix_len > str_len) {
        return mp_const_false;
    }
    return MP_BOOL(memcmp(str + (str_len - suffix_len), suffix, suffix_len) == 0);
}

637
638
639
enum { LSTRIP, RSTRIP, STRIP };

STATIC mp_obj_t str_uni_strip(int type, uint n_args, const mp_obj_t *args) {
xbe's avatar
xbe committed
640
    assert(1 <= n_args && n_args <= 2);
641
642
    assert(is_str_or_bytes(args[0]));
    const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
643
644
645
646

    const byte *chars_to_del;
    uint chars_to_del_len;
    static const byte whitespace[] = " \t\n\r\v\f";
xbe's avatar
xbe committed
647
648
649

    if (n_args == 1) {
        chars_to_del = whitespace;
650
        chars_to_del_len = sizeof(whitespace);
xbe's avatar
xbe committed
651
    } else {
652
653
654
        if (mp_obj_get_type(args[1]) != self_type) {
            arg_type_mixup();
        }
655
656
657
        GET_STR_DATA_LEN(args[1], s, l);
        chars_to_del = s;
        chars_to_del_len = l;
xbe's avatar
xbe committed
658
659
    }

660
    GET_STR_DATA_LEN(args[0], orig_str, orig_str_len);
xbe's avatar
xbe committed
661

662
    machine_uint_t first_good_char_pos = 0;
xbe's avatar
xbe committed
663
    bool first_good_char_pos_set = false;
664
    machine_uint_t last_good_char_pos = 0;
665
666
667
668
669
670
671
    machine_uint_t i = 0;
    machine_int_t delta = 1;
    if (type == RSTRIP) {
        i = orig_str_len - 1;
        delta = -1;
    }
    for (machine_uint_t len = orig_str_len; len > 0; len--) {
672
        if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) {
xbe's avatar
xbe committed
673
            if (!first_good_char_pos_set) {
674
                first_good_char_pos_set = true;
xbe's avatar
xbe committed
675
                first_good_char_pos = i;
676
677
678
                if (type == LSTRIP) {
                    last_good_char_pos = orig_str_len - 1;
                    break;
679
680
681
682
                } else if (type == RSTRIP) {
                    first_good_char_pos = 0;
                    last_good_char_pos = i;
                    break;
683
                }
xbe's avatar
xbe committed
684
            }
685
            last_good_char_pos = i;
xbe's avatar
xbe committed
686
        }
687
        i += delta;
xbe's avatar
xbe committed
688
689
    }

690
    if (!first_good_char_pos_set) {
691
692
        // string is all whitespace, return ''
        return MP_OBJ_NEW_QSTR(MP_QSTR_);
xbe's avatar
xbe committed
693
694
695
696
    }

    assert(last_good_char_pos >= first_good_char_pos);
    //+1 to accomodate the last character
697
    machine_uint_t stripped_len = last_good_char_pos - first_good_char_pos + 1;
698
699
700
701
702
703
    if (stripped_len == orig_str_len) {
        // If nothing was stripped, don't bother to dup original string
        // TODO: watch out for this case when we'll get to bytearray.strip()
        assert(first_good_char_pos == 0);
        return args[0];
    }
704
    return mp_obj_new_str_of_type(self_type, orig_str + first_good_char_pos, stripped_len);
xbe's avatar
xbe committed
705
706
}

707
708
709
710
711
712
713
714
715
716
717
718
STATIC mp_obj_t str_strip(uint n_args, const mp_obj_t *args) {
    return str_uni_strip(STRIP, n_args, args);
}

STATIC mp_obj_t str_lstrip(uint n_args, const mp_obj_t *args) {
    return str_uni_strip(LSTRIP, n_args, args);
}

STATIC mp_obj_t str_rstrip(uint n_args, const mp_obj_t *args) {
    return str_uni_strip(RSTRIP, n_args, args);
}

Dave Hylands's avatar
Dave Hylands committed
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
// Takes an int arg, but only parses unsigned numbers, and only changes
// *num if at least one digit was parsed.
static int str_to_int(const char *str, int *num) {
    const char *s = str;
    if (unichar_isdigit(*s)) {
        *num = 0;
        do {
            *num = *num * 10 + (*s - '0');
            s++;
        }
        while (unichar_isdigit(*s));
    }
    return s - str;
}

static bool isalignment(char ch) {
    return ch && strchr("<>=^", ch) != NULL;
}

static bool istype(char ch) {
    return ch && strchr("bcdeEfFgGnosxX%", ch) != NULL;
}

static bool arg_looks_integer(mp_obj_t arg) {
    return MP_OBJ_IS_TYPE(arg, &mp_type_bool) || MP_OBJ_IS_INT(arg);
}

static bool arg_looks_numeric(mp_obj_t arg) {
    return arg_looks_integer(arg)
748
#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylands's avatar
Dave Hylands committed
749
750
751
752
753
        || MP_OBJ_IS_TYPE(arg, &mp_type_float)
#endif
    ;
}

754
static mp_obj_t arg_as_int(mp_obj_t arg) {
755
#if MICROPY_PY_BUILTINS_FLOAT
756
    if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
757
758
759
760
761

        // TODO: Needs a way to construct an mpz integer from a float

        mp_small_int_t num = mp_obj_get_float(arg);
        return MP_OBJ_NEW_SMALL_INT(num);
762
763
    }
#endif
764
    return arg;
765
766
}

767
mp_obj_t mp_obj_str_format(uint n_args, const mp_obj_t *args) {
768
    assert(MP_OBJ_IS_STR(args[0]));
769

770
    GET_STR_DATA_LEN(args[0], str, len);
Dave Hylands's avatar
Dave Hylands committed
771
    int arg_i = 0;
772
    vstr_t *vstr = vstr_new();
Dave Hylands's avatar
Dave Hylands committed
773
774
775
776
    pfenv_t pfenv_vstr;
    pfenv_vstr.data = vstr;
    pfenv_vstr.print_strn = pfenv_vstr_add_strn;

777
    for (const byte *top = str + len; str < top; str++) {
Dave Hylands's avatar
Dave Hylands committed
778
779
780
781
782
783
        if (*str == '}') {
            str++;
            if (str < top && *str == '}') {
                vstr_add_char(vstr, '}');
                continue;
            }
784
            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Single '}' encountered in format string"));
Dave Hylands's avatar
Dave Hylands committed
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
        }
        if (*str != '{') {
            vstr_add_char(vstr, *str);
            continue;
        }

        str++;
        if (str < top && *str == '{') {
            vstr_add_char(vstr, '{');
            continue;
        }

        // replacement_field ::=  "{" [field_name] ["!" conversion] [":" format_spec] "}"

        vstr_t *field_name = NULL;
        char conversion = '\0';
        vstr_t *format_spec = NULL;

        if (str < top && *str != '}' && *str != '!' && *str != ':') {
            field_name = vstr_new();
            while (str < top && *str != '}' && *str != '!' && *str != ':') {
                vstr_add_char(field_name, *str++);
            }
            vstr_add_char(field_name, '\0');
        }

        // conversion ::=  "r" | "s"

        if (str < top && *str == '!') {
814
            str++;
Dave Hylands's avatar
Dave Hylands committed
815
816
            if (str < top && (*str == 'r' || *str == 's')) {
                conversion = *str++;
817
            } else {
818
                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "end of format while looking for conversion specifier"));
Dave Hylands's avatar
Dave Hylands committed
819
820
821
822
823
824
825
826
827
828
829
830
831
832
            }
        }

        if (str < top && *str == ':') {
            str++;
            // {:} is the same as {}, which is the same as {!s}
            // This makes a difference when passing in a True or False
            // '{}'.format(True) returns 'True'
            // '{:d}'.format(True) returns '1'
            // So we treat {:} as {} and this later gets treated to be {!s}
            if (*str != '}') {
                format_spec = vstr_new(); 
                while (str < top && *str != '}') {
                    vstr_add_char(format_spec, *str++);
833
                }
Dave Hylands's avatar
Dave Hylands committed
834
835
836
837
                vstr_add_char(format_spec, '\0');
            }
        }
        if (str >= top) {
838
            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "unmatched '{' in format"));
Dave Hylands's avatar
Dave Hylands committed
839
840
        }
        if (*str != '}') {
841
            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "expected ':' after format specifier"));
Dave Hylands's avatar
Dave Hylands committed
842
843
844
845
846
847
        }

        mp_obj_t arg = mp_const_none;

        if (field_name) {
            if (arg_i > 0) {
848
                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "cannot switch from automatic field numbering to manual field specification"));
Dave Hylands's avatar
Dave Hylands committed
849
            }
850
            int index = 0;
Dave Hylands's avatar
Dave Hylands committed
851
            if (str_to_int(vstr_str(field_name), &index) != vstr_len(field_name) - 1) {
852
                nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "attributes not supported yet"));
853
            }
Dave Hylands's avatar
Dave Hylands committed
854
            if (index >= n_args - 1) {
855
                nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylands's avatar
Dave Hylands committed
856
857
858
859
860
            }
            arg = args[index + 1];
            arg_i = -1;
            vstr_free(field_name);
            field_name = NULL;
861
        } else {
Dave Hylands's avatar
Dave Hylands committed
862
            if (arg_i < 0) {
863
                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "cannot switch from manual field specification to automatic field numbering"));
Dave Hylands's avatar
Dave Hylands committed
864
865
            }
            if (arg_i >= n_args - 1) {
866
                nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylands's avatar
Dave Hylands committed
867
868
869
870
871
872
873
874
875
876
877
878
879
880
            }
            arg = args[arg_i + 1];
            arg_i++;
        }
        if (!format_spec && !conversion) {
            conversion = 's';
        }
        if (conversion) {
            mp_print_kind_t print_kind;
            if (conversion == 's') {
                print_kind = PRINT_STR;
            } else if (conversion == 'r') {
                print_kind = PRINT_REPR;
            } else {
881
                nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Unknown conversion specifier %c", conversion));
Dave Hylands's avatar
Dave Hylands committed
882
883
884
            }
            vstr_t *arg_vstr = vstr_new();
            mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, arg_vstr, arg, print_kind);
885
            arg = mp_obj_new_str(vstr_str(arg_vstr), vstr_len(arg_vstr), false);
Dave Hylands's avatar
Dave Hylands committed
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
            vstr_free(arg_vstr);
        }

        char sign = '\0';
        char fill = '\0';
        char align = '\0';
        int width = -1;
        int precision = -1;
        char type = '\0';
        int flags = 0;

        if (format_spec) {
            // The format specifier (from http://docs.python.org/2/library/string.html#formatspec)
            //
            // [[fill]align][sign][#][0][width][,][.precision][type]
            // fill        ::=  <any character>
            // align       ::=  "<" | ">" | "=" | "^"
            // sign        ::=  "+" | "-" | " "
            // width       ::=  integer
            // precision   ::=  integer
            // type        ::=  "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"

            const char *s = vstr_str(format_spec);
            if (isalignment(*s)) {
                align = *s++;
            } else if (*s && isalignment(s[1])) {
                fill = *s++;
                align = *s++;
            }
            if (*s == '+' || *s == '-' || *s == ' ') {
                if (*s == '+') {
                    flags |= PF_FLAG_SHOW_SIGN;
                } else if (*s == ' ') {
                    flags |= PF_FLAG_SPACE_SIGN;
                }
                sign = *s++;
            }
            if (*s == '#') {
                flags |= PF_FLAG_SHOW_PREFIX;
                s++;
            }
            if (*s == '0') {
                if (!align) {
                    align = '=';
                }
                if (!fill) {
                    fill = '0';
                }
            }
            s += str_to_int(s, &width);
            if (*s == ',') {
                flags |= PF_FLAG_SHOW_COMMA;
                s++;
            }
            if (*s == '.') {
                s++;
                s += str_to_int(s, &precision);
            }
            if (istype(*s)) {
                type = *s++;
            }
            if (*s) {
948
                nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "Invalid conversion specification"));
Dave Hylands's avatar
Dave Hylands committed
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
            }
            vstr_free(format_spec);
            format_spec = NULL;
        }
        if (!align) {
            if (arg_looks_numeric(arg)) {
                align = '>';
            } else {
                align = '<';
            }
        }
        if (!fill) {
            fill = ' ';
        }

        if (sign) {
            if (type == 's') {
966
                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed in string format specifier"));
Dave Hylands's avatar
Dave Hylands committed
967
968
            }
            if (type == 'c') {
969
                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed with integer format specifier 'c'"));
Dave Hylands's avatar
Dave Hylands committed
970
971
972
973
974
975
976
977
978
979
980
981
982
983
            }
        } else {
            sign = '-';
        }

        switch (align) {
            case '<': flags |= PF_FLAG_LEFT_ADJUST;     break;
            case '=': flags |= PF_FLAG_PAD_AFTER_SIGN;  break;
            case '^': flags |= PF_FLAG_CENTER_ADJUST;   break;
        }

        if (arg_looks_integer(arg)) {
            switch (type) {
                case 'b':
984
                    pfenv_print_mp_int(&pfenv_vstr, arg, 1, 2, 'a', flags, fill, width);
Dave Hylands's avatar
Dave Hylands committed
985
986
987
988
989
990
991
992
993
994
995
996
                    continue;

                case 'c':
                {
                    char ch = mp_obj_get_int(arg);
                    pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, fill, width);
                    continue;
                }

                case '\0':  // No explicit format type implies 'd'
                case 'n':   // I don't think we support locales in uPy so use 'd'
                case 'd':
997
                    pfenv_print_mp_int(&pfenv_vstr, arg, 1, 10, 'a', flags, fill, width);
Dave Hylands's avatar
Dave Hylands committed
998
999
1000
                    continue;

                case 'o':
1001
1002
1003
1004
                    if (flags & PF_FLAG_SHOW_PREFIX) {
                        flags |= PF_FLAG_SHOW_OCTAL_LETTER;
                    }

1005
                    pfenv_print_mp_int(&pfenv_vstr, arg, 1, 8, 'a', flags, fill, width);
Dave Hylands's avatar
Dave Hylands committed
1006
1007
1008
                    continue;

                case 'x':
1009
                    pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, 'a', flags, fill, width);
Dave Hylands's avatar
Dave Hylands committed
1010
1011
1012
                    continue;

                case 'X':
1013
                    pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, 'A', flags, fill, width);
Dave Hylands's avatar
Dave Hylands committed
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
                    continue;

                case 'e':
                case 'E':
                case 'f':
                case 'F':
                case 'g':
                case 'G':
                case '%':
                    // The floating point formatters all work with anything that
                    // looks like an integer
                    break;

                default:
1028
                    nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylands's avatar
Dave Hylands committed
1029
1030
                        "Unknown format code '%c' for object of type '%s'", type, mp_obj_get_type_str(arg)));
            }
1031
        }
1032

1033
1034
        // NOTE: no else here. We need the e, f, g etc formats for integer
        //       arguments (from above if) to take this if.
1035
        if (arg_looks_numeric(arg)) {
Dave Hylands's avatar
Dave Hylands committed
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
            if (!type) {

                // Even though the docs say that an unspecified type is the same
                // as 'g', there is one subtle difference, when the exponent
                // is one less than the precision.
                //  
                // '{:10.1}'.format(0.0) ==> '0e+00'
                // '{:10.1g}'.format(0.0) ==> '0'
                //
                // TODO: Figure out how to deal with this.
                //
                // A proper solution would involve adding a special flag
                // or something to format_float, and create a format_double
                // to deal with doubles. In order to fix this when using
                // sprintf, we'd need to use the e format and tweak the
                // returned result to strip trailing zeros like the g format
                // does.
                //
                // {:10.3} and {:10.2e} with 1.23e2 both produce 1.23e+02
                // but with 1.e2 you get 1e+02 and 1.00e+02
                //
                // Stripping the trailing 0's (like g) does would make the
                // e format give us the right format.
                //
                // CPython sources say:
                //   Omitted type specifier.  Behaves in the same way as repr(x)
                //   and str(x) if no precision is given, else like 'g', but with
                //   at least one digit after the decimal point. */

                type = 'g';
            }
            if (type == 'n') {
                type = 'g';
            }

            flags |= PF_FLAG_PAD_NAN_INF; // '{:06e}'.format(float('-inf')) should give '-00inf'
            switch (type) {
1073
#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylands's avatar
Dave Hylands committed
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
                case 'e':
                case 'E':
                case 'f':
                case 'F':
                case 'g':
                case 'G':
                    pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), type, flags, fill, width, precision); 
                    break;

                case '%':
                    flags |= PF_FLAG_ADD_PERCENT;
                    pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg) * 100.0F, 'f', flags, fill, width, precision);
                    break;
1087
#endif
Dave Hylands's avatar
Dave Hylands committed
1088
1089

                default:
1090
                    nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylands's avatar
Dave Hylands committed
1091
1092
1093
1094
                        "Unknown format code '%c' for object of type 'float'",
                        type, mp_obj_get_type_str(arg)));
            }
        } else {
1095
1096
            // arg doesn't look like a number

Dave Hylands's avatar
Dave Hylands committed
1097
            if (align == '=') {
1098
                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "'=' alignment not allowed in string format specifier"));
Dave Hylands's avatar
Dave Hylands committed
1099
            }
1100

Dave Hylands's avatar
Dave Hylands committed
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
            switch (type) {
                case '\0':
                    mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, arg, PRINT_STR);
                    break;

                case 's':
                {
                    uint len;
                    const char *s = mp_obj_str_get_data(arg, &len);
                    if (precision < 0) {
                        precision = len;
                    }
                    if (len > precision) {
                        len = precision;
                    }
                    pfenv_print_strn(&pfenv_vstr, s, len, flags, fill, width);
                    break;
                }

                default:
1121
                    nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
Dave Hylands's avatar
Dave Hylands committed
1122
1123
1124
                        "Unknown format code '%c' for object of type 'str'",
                        type, mp_obj_get_type_str(arg)));
            }
1125
1126
1127
        }
    }

1128
    mp_obj_t s = mp_obj_new_str(vstr->buf, vstr->len, false);
1129
1130
    vstr_free(vstr);
    return s;
1131
1132
}

1133
STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, uint n_args, const mp_obj_t *args, mp_obj_t dict) {
1134
1135
1136
    assert(MP_OBJ_IS_STR(pattern));

    GET_STR_DATA_LEN(pattern, str, len);
Dave Hylands's avatar
Dave Hylands committed
1137
    const byte *start_str = str;
1138
1139
    int arg_i = 0;
    vstr_t *vstr = vstr_new();
Dave Hylands's avatar
Dave Hylands committed
1140
1141
1142
1143
    pfenv_t pfenv_vstr;
    pfenv_vstr.data = vstr;
    pfenv_vstr.print_strn = pfenv_vstr_add_strn;

1144
    for (const byte *top = str + len; str < top; str++) {
1145
        mp_obj_t arg = MP_OBJ_NULL;
Dave Hylands's avatar
Dave Hylands committed
1146
1147
1148
1149
1150
1151
1152
        if (*str != '%') {
            vstr_add_char(vstr, *str);
            continue;
        }
        if (++str >= top) {
            break;
        }
1153
        if (*str == '%') {
Dave Hylands's avatar
Dave Hylands committed
1154
1155
1156
            vstr_add_char(vstr, '%');
            continue;
        }
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169

        // Dictionary value lookup
        if (*str == '(') {
            const byte *key = ++str;
            while (*str != ')') {
                if (str >= top) {
                    nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "incomplete format key"));
                }
                ++str;
            }
            mp_obj_t k_obj = mp_obj_new_str((const char*)key, str - key, true);
            arg = mp_obj_dict_get(dict, k_obj);
            str++;
Dave Hylands's avatar
Dave Hylands committed
1170
        }
1171

Dave Hylands's avatar
Dave Hylands committed
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
        int flags = 0;
        char fill = ' ';
        bool alt = false;
        while (str < top) {
            if (*str == '-')      flags |= PF_FLAG_LEFT_ADJUST;
            else if (*str == '+') flags |= PF_FLAG_SHOW_SIGN;
            else if (*str == ' ') flags |= PF_FLAG_SPACE_SIGN;
            else if (*str == '#') alt = true;
            else if (*str == '0') {
                flags |= PF_FLAG_PAD_AFTER_SIGN;
                fill = '0';
            } else break;
            str++;
        }
        // parse width, if it exists
        int width = 0; 
        if (str < top) {
            if (*str == '*') {
1190
1191
1192
                if (arg_i >= n_args) {
                    goto not_enough_args;
                }
Dave Hylands's avatar
Dave Hylands committed
1193
1194
                width = mp_obj_get_int(args[arg_i++]);
                str++;
1195
            } else {
Dave Hylands's avatar
Dave Hylands committed
1196
1197
                for (; str < top && '0' <= *str && *str <= '9'; str++) {
                    width = width * 10 + *str - '0';
1198
                }
Dave Hylands's avatar
Dave Hylands committed
1199
1200
1201
1202
1203
1204
            }
        }
        int prec = -1;
        if (str < top && *str == '.') {
            if (++str < top) {
                if (*str == '*') {
1205
1206
1207
                    if (arg_i >= n_args<