objlist.c 15.4 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
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;
78
    if (op == RT_BINARY_OP_EQUAL && self->len != another->len) {
79
80
81
82
        return false;
    }

    // Let's deal only with > & >=
83
    if (op == RT_BINARY_OP_LESS || op == RT_BINARY_OP_LESS_EQUAL) {
84
85
86
        mp_obj_t t = self;
        self = another;
        another = t;
87
88
        if (op == RT_BINARY_OP_LESS) {
            op = RT_BINARY_OP_MORE;
89
        } else {
90
            op = RT_BINARY_OP_MORE_EQUAL;
91
92
93
94
95
96
97
98
        }
    }

    int len = self->len < another->len ? self->len : another->len;
    bool eq_status = true; // empty lists are equal
    bool rel_status;
    for (int i = 0; i < len; i++) {
        eq_status = mp_obj_equal(self->items[i], another->items[i]);
99
        if (op == RT_BINARY_OP_EQUAL && !eq_status) {
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
            return false;
        }
        rel_status = (rt_binary_op(op, self->items[i], another->items[i]) == mp_const_true);
        if (!eq_status && !rel_status) {
            return false;
        }
    }

    // If we had tie in the last element...
    if (eq_status) {
        // ... and we have lists of different lengths...
        if (self->len != another->len) {
            if (self->len < another->len) {
                // ... then longer list length wins (we deal only with >)
                return false;
            }
116
        } else if (op == RT_BINARY_OP_MORE) {
117
118
119
120
121
122
123
124
            // Otherwise, if we have strict relation, equality means failure
            return false;
        }
    }

    return true;
}

125
126
127
static mp_obj_t list_unary_op(int op, mp_obj_t self_in) {
    mp_obj_list_t *self = self_in;
    switch (op) {
128
129
        case RT_UNARY_OP_BOOL: return MP_BOOL(self->len != 0);
        case RT_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->len);
130
131
132
133
        default: return MP_OBJ_NULL; // op not supported for None
    }
}

134
135
136
137
138
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
139
140
141
142
143
144
145
146
147
#if MICROPY_ENABLE_SLICE
            if (MP_OBJ_IS_TYPE(rhs, &slice_type)) {
                machine_uint_t start, stop;
                assert(m_seq_get_fast_slice_indexes(o->len, rhs, &start, &stop));
                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
148
149
150
            uint index = mp_get_index(o->base.type, o->len, rhs);
            return o->items[index];
        }
151
152
        case RT_BINARY_OP_ADD:
        {
John R. Lenton's avatar
John R. Lenton committed
153
154
155
156
157
            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);
John R. Lenton's avatar
John R. Lenton committed
158
159
            memcpy(s->items, o->items, sizeof(mp_obj_t) * o->len);
            memcpy(s->items + o->len, p->items, sizeof(mp_obj_t) * p->len);
John R. Lenton's avatar
John R. Lenton committed
160
            return s;
161
        }
162
163
164
165
166
167
168
169
        case RT_BINARY_OP_INPLACE_ADD:
        {
            if (!MP_OBJ_IS_TYPE(rhs, &list_type)) {
                return NULL;
            }
            list_extend(lhs, rhs);
            return o;
        }
170
171
172
173
174
175
        case RT_BINARY_OP_MULTIPLY:
        {
            if (!MP_OBJ_IS_SMALL_INT(rhs)) {
                return NULL;
            }
            int n = MP_OBJ_SMALL_INT_VALUE(rhs);
176
177
            mp_obj_list_t *s = list_new(o->len * n);
            mp_seq_multiply(o->items, sizeof(*o->items), o->len, n, s->items);
178
179
            return s;
        }
180
181
182
183
184
        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:
185
            return MP_BOOL(list_cmp_helper(op, lhs, rhs));
186
187
        case RT_BINARY_OP_NOT_EQUAL:
            return MP_BOOL(!list_cmp_helper(RT_BINARY_OP_EQUAL, lhs, rhs));
188

189
190
191
192
193
194
195
196
197
198
199
200
201
202
        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) {
203
        self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc * 2);
204
        assert(self->items);
205
206
207
208
209
210
        self->alloc *= 2;
    }
    self->items[self->len++] = arg;
    return mp_const_none; // return None, as per CPython
}

211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
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
}

228
static mp_obj_t list_pop(uint n_args, const mp_obj_t *args) {
John R. Lenton's avatar
John R. Lenton committed
229
230
231
232
    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) {
233
        nlr_jump(mp_obj_new_exception_msg(MP_QSTR_IndexError, "pop from empty list"));
John R. Lenton's avatar
John R. Lenton committed
234
235
    }
    uint index = mp_get_index(self->base.type, self->len, n_args == 1 ? mp_obj_new_int(-1) : args[1]);
236
237
238
    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));
239
    if (self->alloc > LIST_MIN_ALLOC && self->alloc > 2 * self->len) {
John R. Lenton's avatar
John R. Lenton committed
240
241
242
        self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc/2);
        self->alloc /= 2;
    }
243
244
245
246
    return ret;
}

// TODO make this conform to CPython's definition of sort
247
static void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, bool reversed) {
248
    int op = reversed ? RT_BINARY_OP_MORE : RT_BINARY_OP_LESS;
249
250
251
    while (head < tail) {
        mp_obj_t *h = head - 1;
        mp_obj_t *t = tail;
252
        mp_obj_t v = key_fn == NULL ? tail[0] : rt_call_function_1(key_fn, tail[0]); // get pivot using key_fn
253
        for (;;) {
John R. Lenton's avatar
John R. Lenton committed
254
255
            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);
256
257
258
259
260
261
262
263
            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;
264
        mp_quicksort(head, t, key_fn, reversed);
265
266
267
268
        head = h + 1;
    }
}

269
270
271
272
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) {
273
274
275
        nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError,
                                          "list.sort takes no positional arguments"));
    }
276
    mp_obj_list_t *self = args[0];
277
    if (self->len > 1) {
278
279
        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);
280
281
282
        mp_quicksort(self->items, self->items + self->len - 1,
                     keyfun ? keyfun->value : NULL,
                     reverse && reverse->value ? rt_is_true(reverse->value) : false);
283
284
285
286
    }
    return mp_const_none; // return None, as per CPython
}

287
288
289
290
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;
291
292
    self->items = m_renew(mp_obj_t, self->items, self->alloc, LIST_MIN_ALLOC);
    self->alloc = LIST_MIN_ALLOC;
293
294
295
    return mp_const_none;
}

296
297
298
299
300
301
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
302
303
304
305
306
307
308
309
310
311
312
313
314
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);
}

315
static mp_obj_t list_index(uint n_args, const mp_obj_t *args) {
316
317
318
319
    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];
320
321
    uint start = 0;
    uint stop = self->len;
322

323
324
325
326
327
328
    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]);
        }
    }
329

330
    for (uint i = start; i < stop; i++) {
331
332
333
334
335
         if (mp_obj_equal(self->items[i], value)) {
              return mp_obj_new_int(i);
         }
    }

336
    nlr_jump(mp_obj_new_exception_msg(MP_QSTR_ValueError, "object not in list"));
337
338
}

339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
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;
}

364
365
366
367
368
369
370
371
372
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;
}

373
374
375
376
377
378
379
380
381
382
383
384
385
386
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;
}

387
static MP_DEFINE_CONST_FUN_OBJ_2(list_append_obj, mp_obj_list_append);
388
static MP_DEFINE_CONST_FUN_OBJ_2(list_extend_obj, list_extend);
389
static MP_DEFINE_CONST_FUN_OBJ_1(list_clear_obj, list_clear);
390
static MP_DEFINE_CONST_FUN_OBJ_1(list_copy_obj, list_copy);
John R. Lenton's avatar
John R. Lenton committed
391
static MP_DEFINE_CONST_FUN_OBJ_2(list_count_obj, list_count);
392
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_index_obj, 2, 4, list_index);
393
static MP_DEFINE_CONST_FUN_OBJ_3(list_insert_obj, list_insert);
John R. Lenton's avatar
John R. Lenton committed
394
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop);
395
static MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, list_remove);
396
static MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse);
Damien George's avatar
Damien George committed
397
static MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 0, mp_obj_list_sort);
398

ian-v's avatar
ian-v committed
399
static const mp_method_t list_type_methods[] = {
ian-v's avatar
ian-v committed
400
401
402
403
    { "append", &list_append_obj },
    { "clear", &list_clear_obj },
    { "copy", &list_copy_obj },
    { "count", &list_count_obj },
404
    { "extend", &list_extend_obj },
ian-v's avatar
ian-v committed
405
    { "index", &list_index_obj },
406
    { "insert", &list_insert_obj },
ian-v's avatar
ian-v committed
407
408
409
410
411
412
    { "pop", &list_pop_obj },
    { "remove", &list_remove_obj },
    { "reverse", &list_reverse_obj },
    { "sort", &list_sort_obj },
    { NULL, NULL }, // end-of-list sentinel
};
413

414
const mp_obj_type_t list_type = {
415
416
    { &mp_const_type },
    "list",
417
418
    .print = list_print,
    .make_new = list_make_new,
419
    .unary_op = list_unary_op,
420
421
    .binary_op = list_binary_op,
    .getiter = list_getiter,
ian-v's avatar
ian-v committed
422
    .methods = list_type_methods,
423
424
425
426
427
};

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;
428
    o->alloc = n < LIST_MIN_ALLOC ? LIST_MIN_ALLOC : n;
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
    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);
    for (int i = 0; i < n; i++) {
        o->items[i] = items[i];
    }
    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 = {
475
476
    { &mp_const_type },
    "list_iterator",
477
    .iternext = list_it_iternext,
478
479
480
481
482
483
484
485
486
};

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