objlist.c 13.5 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
#include "obj.h"
9
#include "map.h"
10
11
12
13
14
15
16
17
18
19
#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;

20
21
22
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);
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
53

        case 1:
        {
            // make list from iterable
            mp_obj_t iterable = rt_getiter(args[0]);
54
            mp_obj_t list = mp_obj_new_list(0, NULL);
55
            mp_obj_t item;
56
            while ((item = rt_iternext(iterable)) != MP_OBJ_NULL) {
57
                mp_obj_list_append(list, item);
58
59
60
61
62
            }
            return list;
        }

        default:
63
            nlr_jump(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
}

68
// Don't pass RT_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
72
73
74
75
76
    assert(MP_OBJ_IS_TYPE(self_in, &list_type));
    if (!MP_OBJ_IS_TYPE(another_in, &list_type)) {
        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) {
83
84
        case RT_UNARY_OP_BOOL: return MP_BOOL(self->len != 0);
        case RT_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
92
93
    mp_obj_list_t *o = lhs;
    switch (op) {
        case RT_BINARY_OP_SUBSCR:
        {
Paul Sokolovsky's avatar
Paul Sokolovsky committed
94
95
96
#if MICROPY_ENABLE_SLICE
            if (MP_OBJ_IS_TYPE(rhs, &slice_type)) {
                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];
        }
108
109
        case RT_BINARY_OP_ADD:
        {
John R. Lenton's avatar
John R. Lenton committed
110
111
112
113
114
            if (!MP_OBJ_IS_TYPE(rhs, &list_type)) {
                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
        }
118
119
120
121
122
123
124
125
        case RT_BINARY_OP_INPLACE_ADD:
        {
            if (!MP_OBJ_IS_TYPE(rhs, &list_type)) {
                return NULL;
            }
            list_extend(lhs, rhs);
            return o;
        }
126
127
128
129
130
131
        case RT_BINARY_OP_MULTIPLY:
        {
            if (!MP_OBJ_IS_SMALL_INT(rhs)) {
                return NULL;
            }
            int n = MP_OBJ_SMALL_INT_VALUE(rhs);
132
133
            mp_obj_list_t *s = list_new(o->len * n);
            mp_seq_multiply(o->items, sizeof(*o->items), o->len, n, s->items);
134
135
            return s;
        }
136
137
138
139
140
        case RT_BINARY_OP_EQUAL:
        case RT_BINARY_OP_LESS:
        case RT_BINARY_OP_LESS_EQUAL:
        case RT_BINARY_OP_MORE:
        case RT_BINARY_OP_MORE_EQUAL:
141
            return MP_BOOL(list_cmp_helper(op, lhs, rhs));
142
143
        case RT_BINARY_OP_NOT_EQUAL:
            return MP_BOOL(!list_cmp_helper(RT_BINARY_OP_EQUAL, lhs, rhs));
144

145
146
147
148
149
150
        default:
            // op not supported
            return NULL;
    }
}

151
STATIC mp_obj_t list_getiter(mp_obj_t o_in) {
152
153
154
155
156
157
158
    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) {
    assert(MP_OBJ_IS_TYPE(self_in, &list_type));
    mp_obj_list_t *self = self_in;
    if (self->len >= self->alloc) {
159
        self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc * 2);
160
        assert(self->items);
161
162
163
164
165
166
        self->alloc *= 2;
    }
    self->items[self->len++] = arg;
    return mp_const_none; // return None, as per CPython
}

167
STATIC mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in) {
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
    assert(MP_OBJ_IS_TYPE(self_in, &list_type));
    assert(MP_OBJ_IS_TYPE(arg_in, &list_type));
    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
}

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

// TODO make this conform to CPython's definition of sort
203
STATIC void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, bool reversed) {
204
    int op = reversed ? RT_BINARY_OP_MORE : RT_BINARY_OP_LESS;
205
206
207
    while (head < tail) {
        mp_obj_t *h = head - 1;
        mp_obj_t *t = tail;
208
        mp_obj_t v = key_fn == NULL ? tail[0] : rt_call_function_1(key_fn, tail[0]); // get pivot using key_fn
209
        for (;;) {
John R. Lenton's avatar
John R. Lenton committed
210
211
            do ++h; while (rt_binary_op(op, key_fn == NULL ? h[0] : rt_call_function_1(key_fn, h[0]), v) == mp_const_true);
            do --t; while (h < t && rt_binary_op(op, v, key_fn == NULL ? t[0] : rt_call_function_1(key_fn, t[0])) == mp_const_true);
212
213
214
215
216
217
218
219
            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;
220
        mp_quicksort(head, t, key_fn, reversed);
221
222
223
224
        head = h + 1;
    }
}

225
226
227
228
mp_obj_t mp_obj_list_sort(uint n_args, const mp_obj_t *args, mp_map_t *kwargs) {
    assert(n_args >= 1);
    assert(MP_OBJ_IS_TYPE(args[0], &list_type));
    if (n_args > 1) {
229
        nlr_jump(mp_obj_new_exception_msg(&mp_type_TypeError,
230
231
                                          "list.sort takes no positional arguments"));
    }
232
    mp_obj_list_t *self = args[0];
233
    if (self->len > 1) {
234
235
        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);
236
237
238
        mp_quicksort(self->items, self->items + self->len - 1,
                     keyfun ? keyfun->value : NULL,
                     reverse && reverse->value ? rt_is_true(reverse->value) : false);
239
240
241
242
    }
    return mp_const_none; // return None, as per CPython
}

243
STATIC mp_obj_t list_clear(mp_obj_t self_in) {
244
245
246
    assert(MP_OBJ_IS_TYPE(self_in, &list_type));
    mp_obj_list_t *self = self_in;
    self->len = 0;
247
248
    self->items = m_renew(mp_obj_t, self->items, self->alloc, LIST_MIN_ALLOC);
    self->alloc = LIST_MIN_ALLOC;
249
250
251
    return mp_const_none;
}

252
STATIC mp_obj_t list_copy(mp_obj_t self_in) {
253
254
255
256
257
    assert(MP_OBJ_IS_TYPE(self_in, &list_type));
    mp_obj_list_t *self = self_in;
    return mp_obj_new_list(self->len, self->items);
}

258
STATIC mp_obj_t list_count(mp_obj_t self_in, mp_obj_t value) {
John R. Lenton's avatar
John R. Lenton committed
259
260
    assert(MP_OBJ_IS_TYPE(self_in, &list_type));
    mp_obj_list_t *self = self_in;
261
    return mp_seq_count_obj(self->items, self->len, value);
John R. Lenton's avatar
John R. Lenton committed
262
263
}

264
STATIC mp_obj_t list_index(uint n_args, const mp_obj_t *args) {
265
266
267
    assert(2 <= n_args && n_args <= 4);
    assert(MP_OBJ_IS_TYPE(args[0], &list_type));
    mp_obj_list_t *self = args[0];
268
    return mp_seq_index_obj(self->items, self->len, n_args, args);
269
270
}

271
STATIC mp_obj_t list_insert(mp_obj_t self_in, mp_obj_t idx, mp_obj_t obj) {
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
    assert(MP_OBJ_IS_TYPE(self_in, &list_type));
    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;
}

296
STATIC mp_obj_t list_remove(mp_obj_t self_in, mp_obj_t value) {
297
298
299
300
301
302
303
304
    assert(MP_OBJ_IS_TYPE(self_in, &list_type));
    mp_obj_t args[] = {self_in, value};
    args[1] = list_index(2, args);
    list_pop(2, args);

    return mp_const_none;
}

305
STATIC mp_obj_t list_reverse(mp_obj_t self_in) {
306
307
308
309
310
311
312
313
314
315
316
317
318
    assert(MP_OBJ_IS_TYPE(self_in, &list_type));
    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;
}

319
320
321
322
323
324
325
326
327
328
329
330
331
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);

STATIC const mp_method_t list_type_methods[] = {
332
333
334
335
336
337
338
339
340
341
342
343
    { MP_QSTR_append, &list_append_obj },
    { MP_QSTR_clear, &list_clear_obj },
    { MP_QSTR_copy, &list_copy_obj },
    { MP_QSTR_count, &list_count_obj },
    { MP_QSTR_extend, &list_extend_obj },
    { MP_QSTR_index, &list_index_obj },
    { MP_QSTR_insert, &list_insert_obj },
    { MP_QSTR_pop, &list_pop_obj },
    { MP_QSTR_remove, &list_remove_obj },
    { MP_QSTR_reverse, &list_reverse_obj },
    { MP_QSTR_sort, &list_sort_obj },
    { MP_QSTR_NULL, NULL }, // end-of-list sentinel
ian-v's avatar
ian-v committed
344
};
345

346
const mp_obj_type_t list_type = {
347
    { &mp_type_type },
348
    .name = MP_QSTR_list,
349
350
    .print = list_print,
    .make_new = list_make_new,
351
    .unary_op = list_unary_op,
352
353
    .binary_op = list_binary_op,
    .getiter = list_getiter,
ian-v's avatar
ian-v committed
354
    .methods = list_type_methods,
355
356
};

357
STATIC mp_obj_list_t *list_new(uint n) {
358
359
    mp_obj_list_t *o = m_new_obj(mp_obj_list_t);
    o->base.type = &list_type;
360
    o->alloc = n < LIST_MIN_ALLOC ? LIST_MIN_ALLOC : n;
361
362
363
364
365
366
367
    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);
368
369
370
371
    if (items != NULL) {
        for (int i = 0; i < n; i++) {
            o->items[i] = items[i];
        }
372
373
374
375
376
377
378
379
380
381
382
383
    }
    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;
}

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;
384
    uint i = mp_get_index(self->base.type, self->len, index, false);
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
    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 {
404
        return MP_OBJ_NULL;
405
406
407
    }
}

408
STATIC const mp_obj_type_t list_it_type = {
409
    { &mp_type_type },
410
    .name = MP_QSTR_iterator,
411
    .iternext = list_it_iternext,
412
413
414
415
416
417
418
419
420
};

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);
    o->base.type = &list_it_type;
    o->list = list;
    o->cur = cur;
    return o;
}