objstr.c 65.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 "unicode.h"
36
#include "qstr.h"
37
38
39
#include "obj.h"
#include "runtime0.h"
#include "runtime.h"
Dave Hylands's avatar
Dave Hylands committed
40
#include "pfenv.h"
41
#include "objstr.h"
42
#include "objlist.h"
43

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

47
mp_obj_t mp_obj_new_str_iterator(mp_obj_t str);
48
STATIC mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str);
49
STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in);
50
51
52
53
54
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
55
56
57
58

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

59
60
void mp_str_print_quoted(void (*print)(void *env, const char *fmt, ...), void *env,
                         const byte *str_data, uint str_len, bool is_bytes) {
61
62
63
    // 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;
64
    for (const byte *s = str_data, *top = str_data + str_len; !has_double_quote && s < top; s++) {
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
        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, "\\\\");
81
82
83
84
        } 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.)
85
86
87
            print(env, "%c", *s);
        } else if (*s == '\n') {
            print(env, "\\n");
88
89
90
91
        } else if (*s == '\r') {
            print(env, "\\r");
        } else if (*s == '\t') {
            print(env, "\\t");
92
93
94
95
96
97
98
        } else {
            print(env, "\\x%02x", *s);
        }
    }
    print(env, "%c", quote_char);
}

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

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

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

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

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

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

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

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

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

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

    return mp_obj_str_builder_end(o);

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

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

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

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

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

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

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

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

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

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

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

347
348
#if !MICROPY_PY_BUILTINS_STR_UNICODE
// objstrunicode defines own version
349
350
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) {
351
    mp_uint_t index_val = mp_get_index(type, self_len, index, is_slice);
352
353
    return self_data + index_val;
}
354
#endif
355

356
357
// This is used for both bytes and 8-bit strings. This is not used for unicode strings.
STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
358
    mp_obj_type_t *type = mp_obj_get_type(self_in);
359
360
361
    GET_STR_DATA_LEN(self_in, self_data, self_len);
    if (value == MP_OBJ_SENTINEL) {
        // load
362
#if MICROPY_PY_BUILTINS_SLICE
363
        if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
364
365
            mp_bound_slice_t slice;
            if (!mp_seq_get_fast_slice_indexes(self_len, index, &slice)) {
366
                nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,
367
                    "only slices with step=1 (aka None) are supported"));
368
            }
369
            return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start);
370
371
        }
#endif
372
        mp_uint_t index_val = mp_get_index(type, self_len, index, false);
373
374
        // If we have unicode enabled the type will always be bytes, so take the short cut.
        if (MICROPY_PY_BUILTINS_STR_UNICODE || type == &mp_type_bytes) {
375
            return MP_OBJ_NEW_SMALL_INT(self_data[index_val]);
376
        } else {
377
            return mp_obj_new_str((char*)&self_data[index_val], 1, true);
378
379
        }
    } else {
380
        return MP_OBJ_NULL; // op not supported
381
382
383
    }
}

384
STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
385
386
    assert(is_str_or_bytes(self_in));
    const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
387

388
    // get separation string
389
    GET_STR_DATA_LEN(self_in, sep_str, sep_len);
390
391

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

    // count required length
    int required_len = 0;
407
    for (int i = 0; i < seq_len; i++) {
408
409
410
        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"));
411
        }
412
413
414
        if (i > 0) {
            required_len += sep_len;
        }
415
416
        GET_STR_LEN(seq_items[i], l);
        required_len += l;
417
418
419
    }

    // make joined string
420
    byte *data;
421
    mp_obj_t joined_str = mp_obj_str_builder_start(self_type, required_len, &data);
422
423
    for (int i = 0; i < seq_len; i++) {
        if (i > 0) {
424
425
            memcpy(data, sep_str, sep_len);
            data += sep_len;
426
        }
427
428
429
        GET_STR_DATA_LEN(seq_items[i], s, l);
        memcpy(data, s, l);
        data += l;
430
    }
431
432

    // return joined string
433
    return mp_obj_str_builder_end(joined_str);
434
435
}

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

438
STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) {
439
    const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
440
    mp_int_t splits = -1;
Paul Sokolovsky's avatar
Paul Sokolovsky committed
441
442
443
444
    mp_obj_t sep = mp_const_none;
    if (n_args > 1) {
        sep = args[1];
        if (n_args > 2) {
445
            splits = mp_obj_get_int(args[2]);
Paul Sokolovsky's avatar
Paul Sokolovsky committed
446
447
        }
    }
448

Paul Sokolovsky's avatar
Paul Sokolovsky committed
449
    mp_obj_t res = mp_obj_new_list(0, NULL);
450
451
    GET_STR_DATA_LEN(args[0], s, len);
    const byte *top = s + len;
452
453
454
455
456

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

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

471
        if (s < top) {
472
            mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, s, top - s));
473
474
475
476
        }

    } else {
        // sep given
477
478
479
        if (mp_obj_get_type(sep) != self_type) {
            arg_type_mixup();
        }
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498

        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++;
            }
499
            mp_obj_list_append(res, mp_obj_new_str_of_type(self_type, start, s - start));
500
501
502
503
504
505
506
507
            if (s >= top) {
                break;
            }
            s += sep_len;
            if (splits > 0) {
                splits--;
            }
        }
Paul Sokolovsky's avatar
Paul Sokolovsky committed
508
509
510
511
512
    }

    return res;
}

513
514
515
516
517
518
519
520
521
522
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);

523
524
    mp_int_t splits = mp_obj_get_int(args[2]);
    mp_int_t org_splits = splits;
525
526
527
528
529
530
    // 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) {
531
        assert(!"TODO: rsplit(None,n) not implemented");
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
    } 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) {
553
                res->items[idx] = mp_obj_new_str_of_type(self_type, beg, last - beg);
554
555
                break;
            }
556
            res->items[idx--] = mp_obj_new_str_of_type(self_type, s + sep_len, last - s - sep_len);
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
            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;
}

574
STATIC mp_obj_t str_finder(uint n_args, const mp_obj_t *args, mp_int_t direction, bool is_index) {
575
    const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
576
    assert(2 <= n_args && n_args <= 4);
577
578
    assert(MP_OBJ_IS_STR(args[0]));
    assert(MP_OBJ_IS_STR(args[1]));
579

580
581
    GET_STR_DATA_LEN(args[0], haystack, haystack_len);
    GET_STR_DATA_LEN(args[1], needle, needle_len);
582

583
584
    const byte *start = haystack;
    const byte *end = haystack + haystack_len;
585
    if (n_args >= 3 && args[2] != mp_const_none) {
586
        start = str_index_to_ptr(self_type, haystack, haystack_len, args[2], true);
587
588
    }
    if (n_args >= 4 && args[3] != mp_const_none) {
589
        end = str_index_to_ptr(self_type, haystack, haystack_len, args[3], true);
590
591
    }

592
    const byte *p = find_subbytes(start, end - start, needle, needle_len, direction);
593
594
    if (p == NULL) {
        // not found
595
596
597
598
599
        if (is_index) {
            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "substring not found"));
        } else {
            return MP_OBJ_NEW_SMALL_INT(-1);
        }
600
601
    } else {
        // found
602
603
604
605
606
        #if MICROPY_PY_BUILTINS_STR_UNICODE
        if (self_type == &mp_type_str) {
            return MP_OBJ_NEW_SMALL_INT(utf8_ptr_to_index(haystack, p));
        }
        #endif
607
        return MP_OBJ_NEW_SMALL_INT(p - haystack);
608
609
610
    }
}

611
STATIC mp_obj_t str_find(uint n_args, const mp_obj_t *args) {
612
    return str_finder(n_args, args, 1, false);
613
614
615
}

STATIC mp_obj_t str_rfind(uint n_args, const mp_obj_t *args) {
616
617
618
619
620
621
622
623
624
    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);
625
626
}

627
// TODO: (Much) more variety in args
628
STATIC mp_obj_t str_startswith(uint n_args, const mp_obj_t *args) {
629
    const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
630
631
    GET_STR_DATA_LEN(args[0], str, str_len);
    GET_STR_DATA_LEN(args[1], prefix, prefix_len);
632
    const byte *start = str;
633
    if (n_args > 2) {
634
        start = str_index_to_ptr(self_type, str, str_len, args[2], true);
635
    }
636
    if (prefix_len + (start - str) > str_len) {
637
638
        return mp_const_false;
    }
639
    return MP_BOOL(memcmp(start, prefix, prefix_len) == 0);
640
641
}

642
643
644
645
646
647
648
649
650
651
652
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);
}

653
654
655
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
656
    assert(1 <= n_args && n_args <= 2);
657
658
    assert(is_str_or_bytes(args[0]));
    const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
659
660
661
662

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

    if (n_args == 1) {
        chars_to_del = whitespace;
666
        chars_to_del_len = sizeof(whitespace);
xbe's avatar
xbe committed
667
    } else {
668
669
670
        if (mp_obj_get_type(args[1]) != self_type) {
            arg_type_mixup();
        }
671
672
673
        GET_STR_DATA_LEN(args[1], s, l);
        chars_to_del = s;
        chars_to_del_len = l;
xbe's avatar
xbe committed
674
675
    }

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

678
    mp_uint_t first_good_char_pos = 0;
xbe's avatar
xbe committed
679
    bool first_good_char_pos_set = false;
680
681
682
    mp_uint_t last_good_char_pos = 0;
    mp_uint_t i = 0;
    mp_int_t delta = 1;
683
684
685
686
    if (type == RSTRIP) {
        i = orig_str_len - 1;
        delta = -1;
    }
687
    for (mp_uint_t len = orig_str_len; len > 0; len--) {
688
        if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) {
xbe's avatar
xbe committed
689
            if (!first_good_char_pos_set) {
690
                first_good_char_pos_set = true;
xbe's avatar
xbe committed
691
                first_good_char_pos = i;
692
693
694
                if (type == LSTRIP) {
                    last_good_char_pos = orig_str_len - 1;
                    break;
695
696
697
698
                } else if (type == RSTRIP) {
                    first_good_char_pos = 0;
                    last_good_char_pos = i;
                    break;
699
                }
xbe's avatar
xbe committed
700
            }
701
            last_good_char_pos = i;
xbe's avatar
xbe committed
702
        }
703
        i += delta;
xbe's avatar
xbe committed
704
705
    }

706
    if (!first_good_char_pos_set) {
707
708
        // string is all whitespace, return ''
        return MP_OBJ_NEW_QSTR(MP_QSTR_);
xbe's avatar
xbe committed
709
710
711
712
    }

    assert(last_good_char_pos >= first_good_char_pos);
    //+1 to accomodate the last character
713
    mp_uint_t stripped_len = last_good_char_pos - first_good_char_pos + 1;
714
715
716
717
718
719
    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];
    }
720
    return mp_obj_new_str_of_type(self_type, orig_str + first_good_char_pos, stripped_len);
xbe's avatar
xbe committed
721
722
}

723
724
725
726
727
728
729
730
731
732
733
734
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
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
// 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)
764
#if MICROPY_PY_BUILTINS_FLOAT
Dave Hylands's avatar
Dave Hylands committed
765
766
767
768
769
        || MP_OBJ_IS_TYPE(arg, &mp_type_float)
#endif
    ;
}

770
static mp_obj_t arg_as_int(mp_obj_t arg) {
771
#if MICROPY_PY_BUILTINS_FLOAT
772
    if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
773
774
775

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

776
        mp_int_t num = mp_obj_get_float(arg);
777
        return MP_OBJ_NEW_SMALL_INT(num);
778
779
    }
#endif
780
    return arg;
781
782
}

783
mp_obj_t mp_obj_str_format(uint n_args, const mp_obj_t *args) {
784
    assert(MP_OBJ_IS_STR(args[0]));
785

786
    GET_STR_DATA_LEN(args[0], str, len);
Dave Hylands's avatar
Dave Hylands committed
787
    int arg_i = 0;
788
    vstr_t *vstr = vstr_new();
Dave Hylands's avatar
Dave Hylands committed
789
790
791
792
    pfenv_t pfenv_vstr;
    pfenv_vstr.data = vstr;
    pfenv_vstr.print_strn = pfenv_vstr_add_strn;

793
    for (const byte *top = str + len; str < top; str++) {
Dave Hylands's avatar
Dave Hylands committed
794
795
796
797
798
799
        if (*str == '}') {
            str++;
            if (str < top && *str == '}') {
                vstr_add_char(vstr, '}');
                continue;
            }
800
            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "single '}' encountered in format string"));
Dave Hylands's avatar
Dave Hylands committed
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
        }
        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 == '!') {
830
            str++;
Dave Hylands's avatar
Dave Hylands committed
831
832
            if (str < top && (*str == 'r' || *str == 's')) {
                conversion = *str++;
833
            } else {
834
                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
835
836
837
838
839
840
841
842
843
844
845
            }
        }

        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 != '}') {
846
                format_spec = vstr_new();
Dave Hylands's avatar
Dave Hylands committed
847
848
                while (str < top && *str != '}') {
                    vstr_add_char(format_spec, *str++);
849
                }
Dave Hylands's avatar
Dave Hylands committed
850
851
852
853
                vstr_add_char(format_spec, '\0');
            }
        }
        if (str >= top) {
854
            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "unmatched '{' in format"));
Dave Hylands's avatar
Dave Hylands committed
855
856
        }
        if (*str != '}') {
857
            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "expected ':' after format specifier"));
Dave Hylands's avatar
Dave Hylands committed
858
859
860
861
862
863
        }

        mp_obj_t arg = mp_const_none;

        if (field_name) {
            if (arg_i > 0) {
864
                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
865
            }
866
            int index = 0;
Dave Hylands's avatar
Dave Hylands committed
867
            if (str_to_int(vstr_str(field_name), &index) != vstr_len(field_name) - 1) {
868
                nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "attributes not supported yet"));
869
            }
Dave Hylands's avatar
Dave Hylands committed
870
            if (index >= n_args - 1) {
871
                nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylands's avatar
Dave Hylands committed
872
873
874
875
876
            }
            arg = args[index + 1];
            arg_i = -1;
            vstr_free(field_name);
            field_name = NULL;
877
        } else {
Dave Hylands's avatar
Dave Hylands committed
878
            if (arg_i < 0) {
879
                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
880
881
            }
            if (arg_i >= n_args - 1) {
882
                nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
Dave Hylands's avatar
Dave Hylands committed
883
884
885
886
887
888
889
890
891
892
893
894
895
896
            }
            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 {
897
                nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "unknown conversion specifier %c", conversion));
Dave Hylands's avatar
Dave Hylands committed
898
899
900
            }
            vstr_t *arg_vstr = vstr_new();
            mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, arg_vstr, arg, print_kind);
901
            arg = mp_obj_new_str(vstr_str(arg_vstr), vstr_len(arg_vstr), false);
Dave Hylands's avatar
Dave Hylands committed
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
951
952
953
954
955
956
957
958
959
960
961
962
963
            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) {
964
                nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "Invalid conversion specification"));
Dave Hylands's avatar
Dave Hylands committed
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
            }
            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') {
982
                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed in string format specifier"));
Dave Hylands's avatar
Dave Hylands committed
983
984
            }
            if (type == 'c') {
985
                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
986
987
988
989
990
991
992
993
994
995
996
997
998
999
            }
        } 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':
1000
                    pfenv_print_mp_int(&pfenv_vstr, arg, 1, 2, 'a', flags, fill, width, 0);
For faster browsing, not all history is shown. View entire blame