objlist.c 14.6 KB
Newer Older
1
2
3
4
5
6
#include <string.h>
#include <assert.h>

#include "nlr.h"
#include "misc.h"
#include "mpconfig.h"
7
#include "qstr.h"
8
9
10
#include "obj.h"
#include "runtime0.h"
#include "runtime.h"
11
#include "objlist.h"
12

13
14
15
STATIC mp_obj_t mp_obj_new_list_iterator(mp_obj_list_t *list, int cur);
STATIC mp_obj_list_t *list_new(uint n);
STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in);
16
STATIC mp_obj_t list_pop(uint n_args, const mp_obj_t *args);
17

18
19
20
// TODO: Move to mpconfig.h
#define LIST_MIN_ALLOC 4

21
22
23
/******************************************************************************/
/* list                                                                       */

24
STATIC void list_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) {
25
26
27
28
29
30
    mp_obj_list_t *o = o_in;
    print(env, "[");
    for (int i = 0; i < o->len; i++) {
        if (i > 0) {
            print(env, ", ");
        }
31
        mp_obj_print_helper(print, env, o->items[i], PRINT_REPR);
32
33
34
35
    }
    print(env, "]");
}

36
37
38
39
40
41
42
43
44
STATIC mp_obj_t list_extend_from_iter(mp_obj_t list, mp_obj_t iterable) {
    mp_obj_t iter = mp_getiter(iterable);
    mp_obj_t item;
    while ((item = mp_iternext(iter)) != MP_OBJ_NULL) {
        mp_obj_list_append(list, item);
    }
    return list;
}

45
STATIC mp_obj_t list_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
46
47
    // TODO check n_kw == 0

48
49
50
    switch (n_args) {
        case 0:
            // return a new, empty list
51
            return mp_obj_new_list(0, NULL);
52
53
54
55

        case 1:
        {
            // make list from iterable
56
            // TODO: optimize list/tuple
57
            mp_obj_t list = mp_obj_new_list(0, NULL);
58
            return list_extend_from_iter(list, args[0]);
59
60
61
        }

        default:
62
            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "list takes at most 1 argument, %d given", n_args));
63
    }
64
    return NULL;
65
66
}

Damien George's avatar
Damien George committed
67
// Don't pass MP_BINARY_OP_NOT_EQUAL here
68
STATIC bool list_cmp_helper(int op, mp_obj_t self_in, mp_obj_t another_in) {
69
70
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
    if (!MP_OBJ_IS_TYPE(another_in, &mp_type_list)) {
71
72
73
74
75
        return false;
    }
    mp_obj_list_t *self = self_in;
    mp_obj_list_t *another = another_in;

76
    return mp_seq_cmp_objs(op, self->items, self->len, another->items, another->len);
77
78
}

79
STATIC mp_obj_t list_unary_op(int op, mp_obj_t self_in) {
80
81
    mp_obj_list_t *self = self_in;
    switch (op) {
Damien George's avatar
Damien George committed
82
83
        case MP_UNARY_OP_BOOL: return MP_BOOL(self->len != 0);
        case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->len);
84
85
86
87
        default: return MP_OBJ_NULL; // op not supported for None
    }
}

88
STATIC mp_obj_t list_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
89
90
    mp_obj_list_t *o = lhs;
    switch (op) {
91
        case MP_BINARY_OP_ADD: {
92
            if (!MP_OBJ_IS_TYPE(rhs, &mp_type_list)) {
John R. Lenton's avatar
John R. Lenton committed
93
94
95
96
                return NULL;
            }
            mp_obj_list_t *p = rhs;
            mp_obj_list_t *s = list_new(o->len + p->len);
Paul Sokolovsky's avatar
Paul Sokolovsky committed
97
            m_seq_cat(s->items, o->items, o->len, p->items, p->len, mp_obj_t);
John R. Lenton's avatar
John R. Lenton committed
98
            return s;
99
        }
100
        case MP_BINARY_OP_INPLACE_ADD: {
101
            if (!MP_OBJ_IS_TYPE(rhs, &mp_type_list)) {
102
103
104
105
106
                return NULL;
            }
            list_extend(lhs, rhs);
            return o;
        }
107
108
109
        case MP_BINARY_OP_MULTIPLY: {
            machine_int_t n;
            if (!mp_obj_get_int_maybe(rhs, &n)) {
110
111
                return NULL;
            }
112
113
            mp_obj_list_t *s = list_new(o->len * n);
            mp_seq_multiply(o->items, sizeof(*o->items), o->len, n, s->items);
114
115
            return s;
        }
Damien George's avatar
Damien George committed
116
117
118
119
120
        case MP_BINARY_OP_EQUAL:
        case MP_BINARY_OP_LESS:
        case MP_BINARY_OP_LESS_EQUAL:
        case MP_BINARY_OP_MORE:
        case MP_BINARY_OP_MORE_EQUAL:
121
122
            return MP_BOOL(list_cmp_helper(op, lhs, rhs));

123
124
125
126
127
128
        default:
            // op not supported
            return NULL;
    }
}

129
STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
130
    if (value == MP_OBJ_NULL) {
131
        // delete
132
133
        mp_obj_t args[2] = {self_in, index};
        list_pop(2, args);
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
        return mp_const_none;
    } else if (value == MP_OBJ_SENTINEL) {
        // load
        mp_obj_list_t *self = self_in;
#if MICROPY_ENABLE_SLICE
        if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
            machine_uint_t start, stop;
            if (!m_seq_get_fast_slice_indexes(self->len, index, &start, &stop)) {
                assert(0);
            }
            mp_obj_list_t *res = list_new(stop - start);
            m_seq_copy(res->items, self->items + start, res->len, mp_obj_t);
            return res;
        }
#endif
        uint index_val = mp_get_index(self->base.type, self->len, index, false);
        return self->items[index_val];
151
152
    } else {
        mp_obj_list_store(self_in, index, value);
153
        return mp_const_none;
154
155
156
    }
}

157
STATIC mp_obj_t list_getiter(mp_obj_t o_in) {
158
159
160
161
    return mp_obj_new_list_iterator(o_in, 0);
}

mp_obj_t mp_obj_list_append(mp_obj_t self_in, mp_obj_t arg) {
162
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
163
164
    mp_obj_list_t *self = self_in;
    if (self->len >= self->alloc) {
165
        self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc * 2);
166
        assert(self->items);
167
168
169
170
171
172
        self->alloc *= 2;
    }
    self->items[self->len++] = arg;
    return mp_const_none; // return None, as per CPython
}

173
STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in) {
174
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
175
176
177
178
179
180
181
182
183
    if (MP_OBJ_IS_TYPE(arg_in, &mp_type_list)) {
        mp_obj_list_t *self = self_in;
        mp_obj_list_t *arg = arg_in;

        if (self->len + arg->len > self->alloc) {
            // TODO: use alloc policy for "4"
            self->items = m_renew(mp_obj_t, self->items, self->alloc, self->len + arg->len + 4);
            self->alloc = self->len + arg->len + 4;
        }
184

185
186
187
188
        memcpy(self->items + self->len, arg->items, sizeof(mp_obj_t) * arg->len);
        self->len += arg->len;
    } else {
        list_extend_from_iter(self_in, arg_in);
189
190
191
192
    }
    return mp_const_none; // return None, as per CPython
}

193
STATIC mp_obj_t list_pop(uint n_args, const mp_obj_t *args) {
John R. Lenton's avatar
John R. Lenton committed
194
    assert(1 <= n_args && n_args <= 2);
195
    assert(MP_OBJ_IS_TYPE(args[0], &mp_type_list));
John R. Lenton's avatar
John R. Lenton committed
196
197
    mp_obj_list_t *self = args[0];
    if (self->len == 0) {
198
        nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "pop from empty list"));
John R. Lenton's avatar
John R. Lenton committed
199
    }
200
    uint index = mp_get_index(self->base.type, self->len, n_args == 1 ? mp_obj_new_int(-1) : args[1], false);
201
202
203
    mp_obj_t ret = self->items[index];
    self->len -= 1;
    memcpy(self->items + index, self->items + index + 1, (self->len - index) * sizeof(mp_obj_t));
204
    if (self->alloc > LIST_MIN_ALLOC && self->alloc > 2 * self->len) {
John R. Lenton's avatar
John R. Lenton committed
205
206
207
        self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc/2);
        self->alloc /= 2;
    }
208
209
210
211
    return ret;
}

// TODO make this conform to CPython's definition of sort
212
STATIC void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, bool reversed) {
Damien George's avatar
Damien George committed
213
    int op = reversed ? MP_BINARY_OP_MORE : MP_BINARY_OP_LESS;
214
215
216
    while (head < tail) {
        mp_obj_t *h = head - 1;
        mp_obj_t *t = tail;
Damien George's avatar
Damien George committed
217
        mp_obj_t v = key_fn == NULL ? tail[0] : mp_call_function_1(key_fn, tail[0]); // get pivot using key_fn
218
        for (;;) {
Damien George's avatar
Damien George committed
219
220
            do ++h; while (mp_binary_op(op, key_fn == NULL ? h[0] : mp_call_function_1(key_fn, h[0]), v) == mp_const_true);
            do --t; while (h < t && mp_binary_op(op, v, key_fn == NULL ? t[0] : mp_call_function_1(key_fn, t[0])) == mp_const_true);
221
222
223
224
225
226
227
228
            if (h >= t) break;
            mp_obj_t x = h[0];
            h[0] = t[0];
            t[0] = x;
        }
        mp_obj_t x = h[0];
        h[0] = tail[0];
        tail[0] = x;
229
        mp_quicksort(head, t, key_fn, reversed);
230
231
232
233
        head = h + 1;
    }
}

234
235
mp_obj_t mp_obj_list_sort(uint n_args, const mp_obj_t *args, mp_map_t *kwargs) {
    assert(n_args >= 1);
236
    assert(MP_OBJ_IS_TYPE(args[0], &mp_type_list));
237
    if (n_args > 1) {
238
        nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError,
239
240
                                          "list.sort takes no positional arguments"));
    }
241
    mp_obj_list_t *self = args[0];
242
    if (self->len > 1) {
243
244
        mp_map_elem_t *keyfun = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(MP_QSTR_key), MP_MAP_LOOKUP);
        mp_map_elem_t *reverse = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(MP_QSTR_reverse), MP_MAP_LOOKUP);
245
246
        mp_quicksort(self->items, self->items + self->len - 1,
                     keyfun ? keyfun->value : NULL,
Damien George's avatar
Damien George committed
247
                     reverse && reverse->value ? mp_obj_is_true(reverse->value) : false);
248
249
250
251
    }
    return mp_const_none; // return None, as per CPython
}

252
STATIC mp_obj_t list_clear(mp_obj_t self_in) {
253
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
254
255
    mp_obj_list_t *self = self_in;
    self->len = 0;
256
257
    self->items = m_renew(mp_obj_t, self->items, self->alloc, LIST_MIN_ALLOC);
    self->alloc = LIST_MIN_ALLOC;
258
259
260
    return mp_const_none;
}

261
STATIC mp_obj_t list_copy(mp_obj_t self_in) {
262
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
263
264
265
266
    mp_obj_list_t *self = self_in;
    return mp_obj_new_list(self->len, self->items);
}

267
STATIC mp_obj_t list_count(mp_obj_t self_in, mp_obj_t value) {
268
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
John R. Lenton's avatar
John R. Lenton committed
269
    mp_obj_list_t *self = self_in;
270
    return mp_seq_count_obj(self->items, self->len, value);
John R. Lenton's avatar
John R. Lenton committed
271
272
}

273
STATIC mp_obj_t list_index(uint n_args, const mp_obj_t *args) {
274
    assert(2 <= n_args && n_args <= 4);
275
    assert(MP_OBJ_IS_TYPE(args[0], &mp_type_list));
276
    mp_obj_list_t *self = args[0];
277
    return mp_seq_index_obj(self->items, self->len, n_args, args);
278
279
}

280
STATIC mp_obj_t list_insert(mp_obj_t self_in, mp_obj_t idx, mp_obj_t obj) {
281
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
    mp_obj_list_t *self = self_in;
    // insert has its own strange index logic
    int index = MP_OBJ_SMALL_INT_VALUE(idx);
    if (index < 0) {
         index += self->len;
    }
    if (index < 0) {
         index = 0;
    }
    if (index > self->len) {
         index = self->len;
    }

    mp_obj_list_append(self_in, mp_const_none);

    for (int i = self->len-1; i > index; i--) {
         self->items[i] = self->items[i-1];
    }
    self->items[index] = obj;

    return mp_const_none;
}

305
STATIC mp_obj_t list_remove(mp_obj_t self_in, mp_obj_t value) {
306
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
307
308
309
310
311
312
313
    mp_obj_t args[] = {self_in, value};
    args[1] = list_index(2, args);
    list_pop(2, args);

    return mp_const_none;
}

314
STATIC mp_obj_t list_reverse(mp_obj_t self_in) {
315
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
316
317
318
319
320
321
322
323
324
325
326
327
    mp_obj_list_t *self = self_in;

    int len = self->len;
    for (int i = 0; i < len/2; i++) {
         mp_obj_t *a = self->items[i];
         self->items[i] = self->items[len-i-1];
         self->items[len-i-1] = a;
    }

    return mp_const_none;
}

328
329
330
331
332
333
334
335
336
337
338
339
STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_append_obj, mp_obj_list_append);
STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_extend_obj, list_extend);
STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_clear_obj, list_clear);
STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_copy_obj, list_copy);
STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_count_obj, list_count);
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_index_obj, 2, 4, list_index);
STATIC MP_DEFINE_CONST_FUN_OBJ_3(list_insert_obj, list_insert);
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop);
STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, list_remove);
STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse);
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 0, mp_obj_list_sort);

340
341
342
343
344
345
346
347
348
349
350
351
STATIC const mp_map_elem_t list_locals_dict_table[] = {
    { MP_OBJ_NEW_QSTR(MP_QSTR_append), (mp_obj_t)&list_append_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&list_clear_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&list_copy_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&list_count_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_extend), (mp_obj_t)&list_extend_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_index), (mp_obj_t)&list_index_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_insert), (mp_obj_t)&list_insert_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_pop), (mp_obj_t)&list_pop_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_remove), (mp_obj_t)&list_remove_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_reverse), (mp_obj_t)&list_reverse_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_sort), (mp_obj_t)&list_sort_obj },
ian-v's avatar
ian-v committed
352
};
353

354
355
STATIC MP_DEFINE_CONST_DICT(list_locals_dict, list_locals_dict_table);

356
const mp_obj_type_t mp_type_list = {
357
    { &mp_type_type },
358
    .name = MP_QSTR_list,
359
360
    .print = list_print,
    .make_new = list_make_new,
361
    .unary_op = list_unary_op,
362
    .binary_op = list_binary_op,
363
    .subscr = list_subscr,
364
    .getiter = list_getiter,
365
    .locals_dict = (mp_obj_t)&list_locals_dict,
366
367
};

368
void mp_obj_list_init(mp_obj_list_t *o, uint n) {
369
    o->base.type = &mp_type_list;
370
    o->alloc = n < LIST_MIN_ALLOC ? LIST_MIN_ALLOC : n;
371
372
    o->len = n;
    o->items = m_new(mp_obj_t, o->alloc);
373
374
375
376
377
}

STATIC mp_obj_list_t *list_new(uint n) {
    mp_obj_list_t *o = m_new_obj(mp_obj_list_t);
    mp_obj_list_init(o, n);
378
379
380
381
382
    return o;
}

mp_obj_t mp_obj_new_list(uint n, mp_obj_t *items) {
    mp_obj_list_t *o = list_new(n);
383
384
385
386
    if (items != NULL) {
        for (int i = 0; i < n; i++) {
            o->items[i] = items[i];
        }
387
388
389
390
391
392
393
394
395
396
    }
    return o;
}

void mp_obj_list_get(mp_obj_t self_in, uint *len, mp_obj_t **items) {
    mp_obj_list_t *self = self_in;
    *len = self->len;
    *items = self->items;
}

397
398
399
400
401
402
403
void mp_obj_list_set_len(mp_obj_t self_in, uint len) {
    // trust that the caller knows what it's doing
    // TODO realloc if len got much smaller than alloc
    mp_obj_list_t *self = self_in;
    self->len = len;
}

404
405
void mp_obj_list_store(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
    mp_obj_list_t *self = self_in;
406
    uint i = mp_get_index(self->base.type, self->len, index, false);
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
    self->items[i] = value;
}

/******************************************************************************/
/* list iterator                                                              */

typedef struct _mp_obj_list_it_t {
    mp_obj_base_t base;
    mp_obj_list_t *list;
    machine_uint_t cur;
} mp_obj_list_it_t;

mp_obj_t list_it_iternext(mp_obj_t self_in) {
    mp_obj_list_it_t *self = self_in;
    if (self->cur < self->list->len) {
        mp_obj_t o_out = self->list->items[self->cur];
        self->cur += 1;
        return o_out;
    } else {
426
        return MP_OBJ_NULL;
427
428
429
    }
}

430
STATIC const mp_obj_type_t mp_type_list_it = {
431
    { &mp_type_type },
432
    .name = MP_QSTR_iterator,
433
    .getiter = mp_identity,
434
    .iternext = list_it_iternext,
435
436
437
438
};

mp_obj_t mp_obj_new_list_iterator(mp_obj_list_t *list, int cur) {
    mp_obj_list_it_t *o = m_new_obj(mp_obj_list_it_t);
439
    o->base.type = &mp_type_list_it;
440
441
442
443
    o->list = list;
    o->cur = cur;
    return o;
}