objlist.c 14.4 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
11
12
13
14
15
16
17
18
#include "obj.h"
#include "runtime0.h"
#include "runtime.h"

typedef struct _mp_obj_list_t {
    mp_obj_base_t base;
    machine_uint_t alloc;
    machine_uint_t len;
    mp_obj_t *items;
} mp_obj_list_t;

19
20
21
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);
22
STATIC mp_obj_t list_pop(uint n_args, const mp_obj_t *args);
23

24
25
26
// TODO: Move to mpconfig.h
#define LIST_MIN_ALLOC 4

27
28
29
/******************************************************************************/
/* list                                                                       */

30
STATIC void list_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) {
31
32
33
34
35
36
    mp_obj_list_t *o = o_in;
    print(env, "[");
    for (int i = 0; i < o->len; i++) {
        if (i > 0) {
            print(env, ", ");
        }
37
        mp_obj_print_helper(print, env, o->items[i], PRINT_REPR);
38
39
40
41
    }
    print(env, "]");
}

42
STATIC mp_obj_t list_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
43
44
    // TODO check n_kw == 0

45
46
47
    switch (n_args) {
        case 0:
            // return a new, empty list
48
            return mp_obj_new_list(0, NULL);
49
50
51
52

        case 1:
        {
            // make list from iterable
Damien George's avatar
Damien George committed
53
            mp_obj_t iterable = mp_getiter(args[0]);
54
            mp_obj_t list = mp_obj_new_list(0, NULL);
55
            mp_obj_t item;
Damien George's avatar
Damien George committed
56
            while ((item = mp_iternext(iterable)) != MP_OBJ_NULL) {
57
                mp_obj_list_append(list, item);
58
59
60
61
62
            }
            return list;
        }

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

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

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

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

89
STATIC mp_obj_t list_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
90
91
    mp_obj_list_t *o = lhs;
    switch (op) {
Damien George's avatar
Damien George committed
92
        case MP_BINARY_OP_SUBSCR:
93
        {
Paul Sokolovsky's avatar
Paul Sokolovsky committed
94
#if MICROPY_ENABLE_SLICE
95
            if (MP_OBJ_IS_TYPE(rhs, &mp_type_slice)) {
Paul Sokolovsky's avatar
Paul Sokolovsky committed
96
                machine_uint_t start, stop;
Paul Sokolovsky's avatar
Paul Sokolovsky committed
97
98
99
                if (!m_seq_get_fast_slice_indexes(o->len, rhs, &start, &stop)) {
                    assert(0);
                }
Paul Sokolovsky's avatar
Paul Sokolovsky committed
100
101
102
103
104
                mp_obj_list_t *res = list_new(stop - start);
                m_seq_copy(res->items, o->items + start, res->len, mp_obj_t);
                return res;
            }
#endif
105
            uint index = mp_get_index(o->base.type, o->len, rhs, false);
106
107
            return o->items[index];
        }
Damien George's avatar
Damien George committed
108
        case MP_BINARY_OP_ADD:
109
        {
110
            if (!MP_OBJ_IS_TYPE(rhs, &mp_type_list)) {
John R. Lenton's avatar
John R. Lenton committed
111
112
113
114
                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
115
            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
116
            return s;
117
        }
Damien George's avatar
Damien George committed
118
        case MP_BINARY_OP_INPLACE_ADD:
119
        {
120
            if (!MP_OBJ_IS_TYPE(rhs, &mp_type_list)) {
121
122
123
124
125
                return NULL;
            }
            list_extend(lhs, rhs);
            return o;
        }
126
127
128
        case MP_BINARY_OP_MULTIPLY: {
            machine_int_t n;
            if (!mp_obj_get_int_maybe(rhs, &n)) {
129
130
                return NULL;
            }
131
132
            mp_obj_list_t *s = list_new(o->len * n);
            mp_seq_multiply(o->items, sizeof(*o->items), o->len, n, s->items);
133
134
            return s;
        }
Damien George's avatar
Damien George committed
135
136
137
138
139
        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:
140
141
            return MP_BOOL(list_cmp_helper(op, lhs, rhs));

142
143
144
145
146
147
        default:
            // op not supported
            return NULL;
    }
}

148
149
150
151
152
153
154
155
156
157
STATIC bool list_store_item(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
    if (value == MP_OBJ_NULL) {
        mp_obj_t args[2] = {self_in, index};
        list_pop(2, args);
    } else {
        mp_obj_list_store(self_in, index, value);
    }
    return true;
}

158
STATIC mp_obj_t list_getiter(mp_obj_t o_in) {
159
160
161
162
    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) {
163
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
164
165
    mp_obj_list_t *self = self_in;
    if (self->len >= self->alloc) {
166
        self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc * 2);
167
        assert(self->items);
168
169
170
171
172
173
        self->alloc *= 2;
    }
    self->items[self->len++] = arg;
    return mp_const_none; // return None, as per CPython
}

174
STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in) {
175
176
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
    assert(MP_OBJ_IS_TYPE(arg_in, &mp_type_list));
177
178
179
180
181
182
183
184
185
186
187
188
189
190
    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;
    }

    memcpy(self->items + self->len, arg->items, sizeof(mp_obj_t) * arg->len);
    self->len += arg->len;
    return mp_const_none; // return None, as per CPython
}

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

// TODO make this conform to CPython's definition of sort
210
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
211
    int op = reversed ? MP_BINARY_OP_MORE : MP_BINARY_OP_LESS;
212
213
214
    while (head < tail) {
        mp_obj_t *h = head - 1;
        mp_obj_t *t = tail;
Damien George's avatar
Damien George committed
215
        mp_obj_t v = key_fn == NULL ? tail[0] : mp_call_function_1(key_fn, tail[0]); // get pivot using key_fn
216
        for (;;) {
Damien George's avatar
Damien George committed
217
218
            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);
219
220
221
222
223
224
225
226
            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;
227
        mp_quicksort(head, t, key_fn, reversed);
228
229
230
231
        head = h + 1;
    }
}

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

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

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

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

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

278
STATIC mp_obj_t list_insert(mp_obj_t self_in, mp_obj_t idx, mp_obj_t obj) {
279
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
    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;
}

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

    return mp_const_none;
}

312
STATIC mp_obj_t list_reverse(mp_obj_t self_in) {
313
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_list));
314
315
316
317
318
319
320
321
322
323
324
325
    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;
}

326
327
328
329
330
331
332
333
334
335
336
337
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);

338
339
340
341
342
343
344
345
346
347
348
349
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
350
};
351

352
353
STATIC MP_DEFINE_CONST_DICT(list_locals_dict, list_locals_dict_table);

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

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

mp_obj_t mp_obj_new_list(uint n, mp_obj_t *items) {
    mp_obj_list_t *o = list_new(n);
377
378
379
380
    if (items != NULL) {
        for (int i = 0; i < n; i++) {
            o->items[i] = items[i];
        }
381
382
383
384
385
386
387
388
389
390
    }
    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;
}

391
392
393
394
395
396
397
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;
}

398
399
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;
400
    uint i = mp_get_index(self->base.type, self->len, index, false);
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
    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 {
420
        return MP_OBJ_NULL;
421
422
423
    }
}

424
STATIC const mp_obj_type_t mp_type_list_it = {
425
    { &mp_type_type },
426
    .name = MP_QSTR_iterator,
427
    .getiter = mp_identity,
428
    .iternext = list_it_iternext,
429
430
431
432
};

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);
433
    o->base.type = &mp_type_list_it;
434
435
436
437
    o->list = list;
    o->cur = cur;
    return o;
}