objlist.c 14.1 KB
Newer Older
1
2
3
4
5
6
7
8
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <assert.h>

#include "nlr.h"
#include "misc.h"
#include "mpconfig.h"
9
#include "qstr.h"
10
#include "obj.h"
11
#include "map.h"
12
13
14
15
16
17
18
19
20
21
22
#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;

static mp_obj_t mp_obj_new_list_iterator(mp_obj_list_t *list, int cur);
23
static mp_obj_list_t *list_new(uint n);
24
static mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in);
25

26
27
28
// TODO: Move to mpconfig.h
#define LIST_MIN_ALLOC 4

29
30
31
/******************************************************************************/
/* list                                                                       */

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

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

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

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

        default:
            nlr_jump(mp_obj_new_exception_msg_1_arg(MP_QSTR_TypeError, "list takes at most 1 argument, %d given", (void*)(machine_int_t)n_args));
    }
67
    return NULL;
68
69
}

70
// Don't pass RT_BINARY_OP_NOT_EQUAL here
71
72
73
74
75
76
77
78
static bool list_cmp_helper(int op, mp_obj_t self_in, mp_obj_t another_in) {
    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;

79
    return mp_seq_cmp_objs(op, self->items, self->len, another->items, another->len);
80
81
}

82
83
84
static mp_obj_t list_unary_op(int op, mp_obj_t self_in) {
    mp_obj_list_t *self = self_in;
    switch (op) {
85
86
        case RT_UNARY_OP_BOOL: return MP_BOOL(self->len != 0);
        case RT_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->len);
87
88
89
90
        default: return MP_OBJ_NULL; // op not supported for None
    }
}

91
92
93
94
95
static mp_obj_t list_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
    mp_obj_list_t *o = lhs;
    switch (op) {
        case RT_BINARY_OP_SUBSCR:
        {
Paul Sokolovsky's avatar
Paul Sokolovsky committed
96
97
98
#if MICROPY_ENABLE_SLICE
            if (MP_OBJ_IS_TYPE(rhs, &slice_type)) {
                machine_uint_t start, stop;
Paul Sokolovsky's avatar
Paul Sokolovsky committed
99
100
101
                if (!m_seq_get_fast_slice_indexes(o->len, rhs, &start, &stop)) {
                    assert(0);
                }
Paul Sokolovsky's avatar
Paul Sokolovsky committed
102
103
104
105
106
                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
107
108
109
            uint index = mp_get_index(o->base.type, o->len, rhs);
            return o->items[index];
        }
110
111
        case RT_BINARY_OP_ADD:
        {
John R. Lenton's avatar
John R. Lenton committed
112
113
114
115
116
            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
117
            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
118
            return s;
119
        }
120
121
122
123
124
125
126
127
        case RT_BINARY_OP_INPLACE_ADD:
        {
            if (!MP_OBJ_IS_TYPE(rhs, &list_type)) {
                return NULL;
            }
            list_extend(lhs, rhs);
            return o;
        }
128
129
130
131
132
133
        case RT_BINARY_OP_MULTIPLY:
        {
            if (!MP_OBJ_IS_SMALL_INT(rhs)) {
                return NULL;
            }
            int n = MP_OBJ_SMALL_INT_VALUE(rhs);
134
135
            mp_obj_list_t *s = list_new(o->len * n);
            mp_seq_multiply(o->items, sizeof(*o->items), o->len, n, s->items);
136
137
            return s;
        }
138
139
140
141
142
        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:
143
            return MP_BOOL(list_cmp_helper(op, lhs, rhs));
144
145
        case RT_BINARY_OP_NOT_EQUAL:
            return MP_BOOL(!list_cmp_helper(RT_BINARY_OP_EQUAL, lhs, rhs));
146

147
148
149
150
151
152
153
154
155
156
157
158
159
160
        default:
            // op not supported
            return NULL;
    }
}

static mp_obj_t list_getiter(mp_obj_t o_in) {
    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) {
161
        self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc * 2);
162
        assert(self->items);
163
164
165
166
167
168
        self->alloc *= 2;
    }
    self->items[self->len++] = arg;
    return mp_const_none; // return None, as per CPython
}

169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
static mp_obj_t list_extend(mp_obj_t self_in, mp_obj_t arg_in) {
    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
}

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

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

227
228
229
230
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) {
231
232
233
        nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError,
                                          "list.sort takes no positional arguments"));
    }
234
    mp_obj_list_t *self = args[0];
235
    if (self->len > 1) {
236
237
        mp_map_elem_t *keyfun = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(QSTR_FROM_STR_STATIC("key")), MP_MAP_LOOKUP);
        mp_map_elem_t *reverse = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(QSTR_FROM_STR_STATIC("reverse")), MP_MAP_LOOKUP);
238
239
240
        mp_quicksort(self->items, self->items + self->len - 1,
                     keyfun ? keyfun->value : NULL,
                     reverse && reverse->value ? rt_is_true(reverse->value) : false);
241
242
243
244
    }
    return mp_const_none; // return None, as per CPython
}

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

254
255
256
257
258
259
static mp_obj_t list_copy(mp_obj_t self_in) {
    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);
}

John R. Lenton's avatar
John R. Lenton committed
260
261
262
263
264
265
266
267
268
269
270
271
272
static mp_obj_t list_count(mp_obj_t self_in, mp_obj_t value) {
    assert(MP_OBJ_IS_TYPE(self_in, &list_type));
    mp_obj_list_t *self = self_in;
    int count = 0;
    for (int i = 0; i < self->len; i++) {
         if (mp_obj_equal(self->items[i], value)) {
              count++;
         }
    }

    return mp_obj_new_int(count);
}

273
static mp_obj_t list_index(uint n_args, const mp_obj_t *args) {
274
275
276
277
    assert(2 <= n_args && n_args <= 4);
    assert(MP_OBJ_IS_TYPE(args[0], &list_type));
    mp_obj_list_t *self = args[0];
    mp_obj_t *value = args[1];
278
279
    uint start = 0;
    uint stop = self->len;
280

281
282
283
284
285
286
    if (n_args >= 3) {
        start = mp_get_index(self->base.type, self->len, args[2]);
        if (n_args >= 4) {
            stop = mp_get_index(self->base.type, self->len, args[3]);
        }
    }
287

288
    for (uint i = start; i < stop; i++) {
289
290
291
292
293
         if (mp_obj_equal(self->items[i], value)) {
              return mp_obj_new_int(i);
         }
    }

294
    nlr_jump(mp_obj_new_exception_msg(MP_QSTR_ValueError, "object not in list"));
295
296
}

297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
static mp_obj_t list_insert(mp_obj_t self_in, mp_obj_t idx, mp_obj_t obj) {
    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;
}

322
323
324
325
326
327
328
329
330
static mp_obj_t list_remove(mp_obj_t self_in, mp_obj_t value) {
    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;
}

331
332
333
334
335
336
337
338
339
340
341
342
343
344
static mp_obj_t list_reverse(mp_obj_t self_in) {
    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;
}

345
static MP_DEFINE_CONST_FUN_OBJ_2(list_append_obj, mp_obj_list_append);
346
static MP_DEFINE_CONST_FUN_OBJ_2(list_extend_obj, list_extend);
347
static MP_DEFINE_CONST_FUN_OBJ_1(list_clear_obj, list_clear);
348
static MP_DEFINE_CONST_FUN_OBJ_1(list_copy_obj, list_copy);
John R. Lenton's avatar
John R. Lenton committed
349
static MP_DEFINE_CONST_FUN_OBJ_2(list_count_obj, list_count);
350
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_index_obj, 2, 4, list_index);
351
static MP_DEFINE_CONST_FUN_OBJ_3(list_insert_obj, list_insert);
John R. Lenton's avatar
John R. Lenton committed
352
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop);
353
static MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, list_remove);
354
static MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse);
Damien George's avatar
Damien George committed
355
static MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 0, mp_obj_list_sort);
356

ian-v's avatar
ian-v committed
357
static const mp_method_t list_type_methods[] = {
ian-v's avatar
ian-v committed
358
359
360
361
    { "append", &list_append_obj },
    { "clear", &list_clear_obj },
    { "copy", &list_copy_obj },
    { "count", &list_count_obj },
362
    { "extend", &list_extend_obj },
ian-v's avatar
ian-v committed
363
    { "index", &list_index_obj },
364
    { "insert", &list_insert_obj },
ian-v's avatar
ian-v committed
365
366
367
368
369
370
    { "pop", &list_pop_obj },
    { "remove", &list_remove_obj },
    { "reverse", &list_reverse_obj },
    { "sort", &list_sort_obj },
    { NULL, NULL }, // end-of-list sentinel
};
371

372
const mp_obj_type_t list_type = {
373
374
    { &mp_const_type },
    "list",
375
376
    .print = list_print,
    .make_new = list_make_new,
377
    .unary_op = list_unary_op,
378
379
    .binary_op = list_binary_op,
    .getiter = list_getiter,
ian-v's avatar
ian-v committed
380
    .methods = list_type_methods,
381
382
383
384
385
};

static mp_obj_list_t *list_new(uint n) {
    mp_obj_list_t *o = m_new_obj(mp_obj_list_t);
    o->base.type = &list_type;
386
    o->alloc = n < LIST_MIN_ALLOC ? LIST_MIN_ALLOC : n;
387
388
389
390
391
392
393
    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);
394
395
396
397
    if (items != NULL) {
        for (int i = 0; i < n; i++) {
            o->items[i] = items[i];
        }
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
    }
    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;
    uint i = mp_get_index(self->base.type, self->len, index);
    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 {
        return mp_const_stop_iteration;
    }
}

static const mp_obj_type_t list_it_type = {
435
436
    { &mp_const_type },
    "list_iterator",
437
    .iternext = list_it_iternext,
438
439
440
441
442
443
444
445
446
};

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;
}