objstr.c 63.8 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
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);
48
STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in);
49
50
51
52
53
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
54
55
56
57

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

58
59
void mp_str_print_quoted(void (*print)(void *env, const char *fmt, ...), void *env,
                         const byte *str_data, uint str_len, bool is_bytes) {
60
61
62
    // 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;
63
    for (const byte *s = str_data, *top = str_data + str_len; !has_double_quote && s < top; s++) {
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
        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, "\\\\");
80
81
82
83
        } else if (*s >= 0x20 && *s != 0x7f && (!is_bytes || *s < 0x80)) {
            // In strings, anything which is not ascii control character
            // is printed as is, this includes characters in range 0x80-0xff
            // (which can be non-Latin letters, etc.)
84
85
86
            print(env, "%c", *s);
        } else if (*s == '\n') {
            print(env, "\\n");
87
88
89
90
        } else if (*s == '\r') {
            print(env, "\\r");
        } else if (*s == '\t') {
            print(env, "\\t");
91
92
93
94
95
96
97
        } else {
            print(env, "\\x%02x", *s);
        }
    }
    print(env, "%c", quote_char);
}

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

111
STATIC mp_obj_t str_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
112
113
114
115
116
117
#if MICROPY_CPYTHON_COMPAT
    if (n_kw != 0) {
        mp_arg_error_unimpl_kw();
    }
#endif

118
119
120
121
122
123
124
125
    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);
126
            mp_obj_t s = mp_obj_new_str(vstr->buf, vstr->len, false);
127
128
129
130
131
132
133
134
            vstr_free(vstr);
            return s;
        }

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

        default:
147
            nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "str takes at most 3 arguments"));
148
149
150
    }
}

151
152
153
154
155
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;
    }

156
157
158
159
160
161
#if MICROPY_CPYTHON_COMPAT
    if (n_kw != 0) {
        mp_arg_error_unimpl_kw();
    }
#endif

162
163
164
165
166
167
    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);
168
        mp_obj_str_t *o = mp_obj_new_str_of_type(&mp_type_bytes, NULL, str_len);
169
170
171
172
173
174
175
176
177
178
179
180
181
        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;

182
        mp_obj_t o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
        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);
198
        o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
199
200
    }

Damien George's avatar
Damien George committed
201
    mp_obj_t iterable = mp_getiter(args[0]);
202
    mp_obj_t item;
203
    while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
204
205
206
207
208
209
210
211
212
213
214
        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);
215
        o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
216
217
218
219
220
221
222
        memcpy(data, vstr_str(vstr), len);
        vstr_free(vstr);
    }

    return mp_obj_str_builder_end(o);

wrong_args:
223
        nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "wrong number of arguments"));
224
225
}

226
227
// like strstr but with specified length and allows \0 bytes
// TODO replace with something more efficient/standard
228
STATIC const byte *find_subbytes(const byte *haystack, machine_uint_t hlen, const byte *needle, machine_uint_t nlen, machine_int_t direction) {
229
    if (hlen >= nlen) {
230
231
232
233
234
235
236
237
238
239
240
241
        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;
242
            }
243
244
245
            if (str_index == str_index_end) {
                //not found
                break;
246
            }
247
            str_index += direction;
248
249
250
251
252
        }
    }
    return NULL;
}

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

                GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
264
                int alloc_len = lhs_len + rhs_len;
265
266

                /* code for making qstr
267
268
269
270
                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);
271
272
273
274
275
                return MP_OBJ_NEW_QSTR(qstr_build_end(q_ptr));
                */

                // code for non-qstr
                byte *data;
276
                mp_obj_t s = mp_obj_str_builder_start(lhs_type, alloc_len, &data);
277
278
279
                memcpy(data, lhs_data, lhs_len);
                memcpy(data + lhs_len, rhs_data, rhs_len);
                return mp_obj_str_builder_end(s);
280
281
            }
            break;
282

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

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

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

320
321
        //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
322
323
324
325
        case MP_BINARY_OP_LESS:
        case MP_BINARY_OP_LESS_EQUAL:
        case MP_BINARY_OP_MORE:
        case MP_BINARY_OP_MORE_EQUAL:
326
            if (lhs_type == rhs_type) {
327
328
329
                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));
            }
330
331
332
333
334
335
336
337
338
339
340
            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;
            }
341
342
    }

343
    return MP_OBJ_NULL; // op not supported
344
345
}

346
347
348
349
350
351
const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, uint self_len,
                             mp_obj_t index, bool is_slice) {
    machine_uint_t index_val = mp_get_index(type, self_len, index, is_slice);
    return self_data + index_val;
}

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

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

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

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

    // count required length
    int required_len = 0;
401
    for (int i = 0; i < seq_len; i++) {
402
403
404
        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"));
405
        }
406
407
408
        if (i > 0) {
            required_len += sep_len;
        }
409
410
        GET_STR_LEN(seq_items[i], l);
        required_len += l;
411
412
413
    }

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

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

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

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

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

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

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

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

    } 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++;
            }
490
            mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
491
492
493
494
495
496
497
498
            if (s >= top) {
                break;
            }
            s += sep_len;
            if (splits > 0) {
                splits--;
            }
        }
Paul Sokolovsky's avatar
Paul Sokolovsky committed
499
500
501
502
503
    }

    return res;
}

504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
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) {
522
        assert(!"TODO: rsplit(None,n) not implemented");
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
    } 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) {
544
                res->items[idx] = mp_obj_new_str_of_type(self_type, beg, last - beg);
545
546
                break;
            }
547
            res->items[idx--] = mp_obj_new_str_of_type(self_type, s + sep_len, last - s - sep_len);
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
            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;
}


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

572
573
    GET_STR_DATA_LEN(args[0], haystack, haystack_len);
    GET_STR_DATA_LEN(args[1], needle, needle_len);
574

575
576
    const byte *start = haystack;
    const byte *end = haystack + haystack_len;
577
    if (n_args >= 3 && args[2] != mp_const_none) {
578
        start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
579
580
    }
    if (n_args >= 4 && args[3] != mp_const_none) {
581
        end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
582
583
    }

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

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

STATIC mp_obj_t str_rfind(uint n_args, const mp_obj_t *args) {
603
604
605
606
607
608
609
610
611
    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);
612
613
}

614
// TODO: (Much) more variety in args
615
STATIC mp_obj_t str_startswith(uint n_args, const mp_obj_t *args) {
616
    const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
617
618
    GET_STR_DATA_LEN(args[0], str, str_len);
    GET_STR_DATA_LEN(args[1], prefix, prefix_len);
619
    const byte *start = str;
620
    if (n_args > 2) {
621
        start = str_index_to_ptr(self_type, str, str_len, args[2], true);
622
    }
623
    if (prefix_len + (start - str) > str_len) {
624
625
        return mp_const_false;
    }
626
    return MP_BOOL(memcmp(start, prefix, prefix_len) == 0);
627
628
}

629
630
631
632
633
634
635
636
637
638
639
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);
}

640
641
642
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
643
    assert(1 <= n_args && n_args <= 2);
644
645
    assert(is_str_or_bytes(args[0]));
    const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
646
647
648
649

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

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

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

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

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

    assert(last_good_char_pos >= first_good_char_pos);
    //+1 to accomodate the last character
700
    machine_uint_t stripped_len = last_good_char_pos - first_good_char_pos + 1;
701
702
703
704
705
706
    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];
    }
707
    return mp_obj_new_str_of_type(self_type, orig_str + first_good_char_pos, stripped_len);
xbe's avatar
xbe committed
708
709
}

710
711
712
713
714
715
716
717
718
719
720
721
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
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
748
749
750
// 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)
751
#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylands's avatar
Dave Hylands committed
752
753
754
755
756
        || MP_OBJ_IS_TYPE(arg, &mp_type_float)
#endif
    ;
}

757
static mp_obj_t arg_as_int(mp_obj_t arg) {
758
#if MICROPY_PY_BUILTINS_FLOAT
759
    if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
760
761
762
763
764

        // 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);
765
766
    }
#endif
767
    return arg;
768
769
}

770
mp_obj_t mp_obj_str_format(uint n_args, const mp_obj_t *args) {
771
    assert(MP_OBJ_IS_STR(args[0]));
772

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

780
    for (const byte *top = str + len; str < top; str++) {
Dave Hylands's avatar
Dave Hylands committed
781
782
783
784
785
786
        if (*str == '}') {
            str++;
            if (str < top && *str == '}') {
                vstr_add_char(vstr, '}');
                continue;
            }
787
            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "single '}' encountered in format string"));
Dave Hylands's avatar
Dave Hylands committed
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
814
815
816
        }
        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 == '!') {
817
            str++;
Dave Hylands's avatar
Dave Hylands committed
818
819
            if (str < top && (*str == 'r' || *str == 's')) {
                conversion = *str++;
820
            } else {
821
                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
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 != '}') {
833
                format_spec = vstr_new();
Dave Hylands's avatar
Dave Hylands committed
834
835
                while (str < top && *str != '}') {
                    vstr_add_char(format_spec, *str++);
836
                }
Dave Hylands's avatar
Dave Hylands committed
837
838
839
840
                vstr_add_char(format_spec, '\0');
            }
        }
        if (str >= top) {
841
            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "unmatched '{' in format"));
Dave Hylands's avatar
Dave Hylands committed
842
843
        }
        if (*str != '}') {
844
            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "expected ':' after format specifier"));
Dave Hylands's avatar
Dave Hylands committed
845
846
847
848
849
850
        }

        mp_obj_t arg = mp_const_none;

        if (field_name) {
            if (arg_i > 0) {
851
                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "can't switch from automatic field numbering to manual field specification"));
Dave Hylands's avatar
Dave Hylands committed
852
            }
853
            int index = 0;
Dave Hylands's avatar
Dave Hylands committed
854
            if (str_to_int(vstr_str(field_name), &index) != vstr_len(field_name) - 1) {
855
                nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "attributes not supported yet"));
856
            }
Dave Hylands's avatar
Dave Hylands committed
857
            if (index >= n_args - 1) {
858
                nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylands's avatar
Dave Hylands committed
859
860
861
862
863
            }
            arg = args[index + 1];
            arg_i = -1;
            vstr_free(field_name);
            field_name = NULL;
864
        } else {
Dave Hylands's avatar
Dave Hylands committed
865
            if (arg_i < 0) {
866
                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "can't switch from manual field specification to automatic field numbering"));
Dave Hylands's avatar
Dave Hylands committed
867
868
            }
            if (arg_i >= n_args - 1) {
869
                nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylands's avatar
Dave Hylands committed
870
871
872
873
874
875
876
877
878
879
880
881
882
883
            }
            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 {
884
                nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "unknown conversion specifier %c", conversion));
Dave Hylands's avatar
Dave Hylands committed
885
886
887
            }
            vstr_t *arg_vstr = vstr_new();
            mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, arg_vstr, arg, print_kind);
888
            arg = mp_obj_new_str(vstr_str(arg_vstr), vstr_len(arg_vstr), false);
Dave Hylands's avatar
Dave Hylands committed
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
948
949
950
            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) {
951
                nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "Invalid conversion specification"));
Dave Hylands's avatar
Dave Hylands committed
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
            }
            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') {
969
                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed in string format specifier"));
Dave Hylands's avatar
Dave Hylands committed
970
971
            }
            if (type == 'c') {
972
                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
973
974
975
976
977
978
979
980
981
982
983
984
985
986
            }
        } 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':
987
                    pfenv_print_mp_int(&pfenv_vstr, arg, 1, 2, 'a', flags, fill, width, 0);
Dave Hylands's avatar
Dave Hylands committed
988
989
990
991
992
993
994
995
996
997
998
999
                    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':
1000
                    pfenv_print_mp_int(&pfenv_vstr, arg, 1, 10, 'a', flags, fill, width, 0);
Dave Hylands's avatar
Dave Hylands committed
1001
1002
1003
                    continue;

                case 'o':
1004
1005
1006
1007
                    if (flags & PF_FLAG_SHOW_PREFIX) {
                        flags |= PF_FLAG_SHOW_OCTAL_LETTER;
                    }

1008
                    pfenv_print_mp_int(&pfenv_vstr, arg, 1, 8, 'a', flags, fill, width, 0);
Dave Hylands's avatar
Dave Hylands committed
1009
1010
1011
                    continue;

                case 'X':
1012
                case 'x':
1013
                    pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, type - ('X' - 'A'), flags, fill, width, 0);
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,
1029
                        "unknown format code '%c' for object of type '%s'", type, mp_obj_get_type_str(arg)));
Dave Hylands's avatar
Dave Hylands committed
1030
            }
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
            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.
1041
                //
Dave Hylands's avatar
Dave Hylands committed
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
                // '{: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
                case 'e':
                case 'E':
                case 'f':
                case 'F':
                case 'g':
                case 'G':
1080
                    pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), type, flags, fill, width, precision);
Dave Hylands's avatar
Dave Hylands committed
1081
1082
1083
1084
1085
1086
                    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,
1091
                        "unknown format code '%c' for object of type 'float'",
Dave Hylands's avatar
Dave Hylands committed
1092
1093
1094
                        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,
1122
                        "unknown format code '%c' for object of type 'str'",
Dave Hylands's avatar
Dave Hylands committed
1123
1124
                        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 == '%')