objdict.c 15 KB
Newer Older
xbe's avatar
xbe committed
1
#include <stdbool.h>
2
3
4
5
6
7
#include <string.h>
#include <assert.h>

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

14
15
STATIC mp_obj_t mp_obj_new_dict_iterator(mp_obj_dict_t *dict, int cur);
STATIC mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in);
John R. Lenton's avatar
John R. Lenton committed
16

17
STATIC void dict_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
18
19
20
    mp_obj_dict_t *self = self_in;
    bool first = true;
    print(env, "{");
John R. Lenton's avatar
John R. Lenton committed
21
22
23
24
25
    mp_obj_t *dict_iter = mp_obj_new_dict_iterator(self, 0);
    mp_map_elem_t *next = NULL;
    while ((next = dict_it_iternext_elem(dict_iter)) != NULL) {
        if (!first) {
            print(env, ", ");
26
        }
John R. Lenton's avatar
John R. Lenton committed
27
        first = false;
28
        mp_obj_print_helper(print, env, next->key, PRINT_REPR);
John R. Lenton's avatar
John R. Lenton committed
29
        print(env, ": ");
30
        mp_obj_print_helper(print, env, next->value, PRINT_REPR);
31
32
33
34
    }
    print(env, "}");
}

35
STATIC mp_obj_t dict_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
36
    // TODO create from an iterable!
Damien George's avatar
Damien George committed
37
    return mp_build_map(0);
38
39
}

40
STATIC mp_obj_t dict_unary_op(int op, mp_obj_t self_in) {
41
42
    mp_obj_dict_t *self = self_in;
    switch (op) {
Damien George's avatar
Damien George committed
43
44
        case MP_UNARY_OP_BOOL: return MP_BOOL(self->map.used != 0);
        case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT((machine_int_t)self->map.used);
45
46
47
48
        default: return MP_OBJ_NULL; // op not supported for None
    }
}

49
STATIC mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
50
51
    mp_obj_dict_t *o = lhs_in;
    switch (op) {
Damien George's avatar
Damien George committed
52
        case MP_BINARY_OP_SUBSCR:
53
54
        {
            // dict load
55
            mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
56
            if (elem == NULL) {
57
                nlr_jump(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
58
59
60
61
            } else {
                return elem->value;
            }
        }
Damien George's avatar
Damien George committed
62
        case MP_BINARY_OP_IN:
63
64
        {
            mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
65
            return MP_BOOL(elem != NULL);
66
        }
67
68
69
70
71
72
        default:
            // op not supported
            return NULL;
    }
}

John R. Lenton's avatar
John R. Lenton committed
73
74
75
76
77
78
79
80
81
82

/******************************************************************************/
/* dict iterator                                                              */

typedef struct _mp_obj_dict_it_t {
    mp_obj_base_t base;
    mp_obj_dict_t *dict;
    machine_uint_t cur;
} mp_obj_dict_it_t;

83
STATIC mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in) {
John R. Lenton's avatar
John R. Lenton committed
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
    mp_obj_dict_it_t *self = self_in;
    machine_uint_t max = self->dict->map.alloc;
    mp_map_elem_t *table = self->dict->map.table;

    for (int i = self->cur; i < max; i++) {
        if (table[i].key != NULL) {
            self->cur = i + 1;
            return &(table[i]);
        }
    }

    return NULL;
}

mp_obj_t dict_it_iternext(mp_obj_t self_in) {
    mp_map_elem_t *next = dict_it_iternext_elem(self_in);

    if (next != NULL) {
        return next->key;
    } else {
104
        return MP_OBJ_NULL;
John R. Lenton's avatar
John R. Lenton committed
105
106
107
    }
}

108
STATIC const mp_obj_type_t mp_type_dict_it = {
109
    { &mp_type_type },
110
    .name = MP_QSTR_iterator,
John R. Lenton's avatar
John R. Lenton committed
111
112
113
    .iternext = dict_it_iternext,
};

114
STATIC mp_obj_t mp_obj_new_dict_iterator(mp_obj_dict_t *dict, int cur) {
John R. Lenton's avatar
John R. Lenton committed
115
    mp_obj_dict_it_t *o = m_new_obj(mp_obj_dict_it_t);
116
    o->base.type = &mp_type_dict_it;
John R. Lenton's avatar
John R. Lenton committed
117
118
119
120
121
    o->dict = dict;
    o->cur = cur;
    return o;
}

122
STATIC mp_obj_t dict_getiter(mp_obj_t o_in) {
John R. Lenton's avatar
John R. Lenton committed
123
124
125
126
127
128
    return mp_obj_new_dict_iterator(o_in, 0);
}

/******************************************************************************/
/* dict methods                                                               */

129
STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
130
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
131
132
133
134
135
136
    mp_obj_dict_t *self = self_in;

    mp_map_clear(&self->map);

    return mp_const_none;
}
137
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
138

139
STATIC mp_obj_t dict_copy(mp_obj_t self_in) {
140
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
141
142
143
144
145
146
    mp_obj_dict_t *self = self_in;
    mp_obj_dict_t *other = mp_obj_new_dict(self->map.alloc);
    other->map.used = self->map.used;
    memcpy(other->map.table, self->map.table, self->map.alloc * sizeof(mp_map_elem_t));
    return other;
}
147
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy);
John R. Lenton's avatar
John R. Lenton committed
148

149
// this is a classmethod
150
STATIC mp_obj_t dict_fromkeys(uint n_args, const mp_obj_t *args) {
151
    assert(2 <= n_args && n_args <= 3);
Damien George's avatar
Damien George committed
152
    mp_obj_t iter = mp_getiter(args[1]);
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
    mp_obj_t len = mp_obj_len_maybe(iter);
    mp_obj_t value = mp_const_none;
    mp_obj_t next = NULL;
    mp_obj_dict_t *self = NULL;

    if (n_args > 2) {
        value = args[2];
    }

    if (len == MP_OBJ_NULL) {
        /* object's type doesn't have a __len__ slot */
        self = mp_obj_new_dict(0);
    } else {
        self = mp_obj_new_dict(MP_OBJ_SMALL_INT_VALUE(len));
    }

Damien George's avatar
Damien George committed
169
    while ((next = mp_iternext(iter)) != MP_OBJ_NULL) {
170
171
172
173
174
        mp_map_lookup(&self->map, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
    }

    return self;
}
175
176
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_fromkeys_fun_obj, 2, 3, dict_fromkeys);
STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(dict_fromkeys_obj, (const mp_obj_t)&dict_fromkeys_fun_obj);
177

178
STATIC mp_obj_t dict_get_helper(mp_map_t *self, mp_obj_t key, mp_obj_t deflt, mp_map_lookup_kind_t lookup_kind) {
179
    mp_map_elem_t *elem = mp_map_lookup(self, key, lookup_kind);
John R. Lenton's avatar
John R. Lenton committed
180
181
    mp_obj_t value;
    if (elem == NULL || elem->value == NULL) {
John R. Lenton's avatar
John R. Lenton committed
182
        if (deflt == NULL) {
183
            if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
184
                nlr_jump(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
John R. Lenton's avatar
John R. Lenton committed
185
            } else {
John R. Lenton's avatar
John R. Lenton committed
186
                value = mp_const_none;
John R. Lenton's avatar
John R. Lenton committed
187
188
            }
        } else {
John R. Lenton's avatar
John R. Lenton committed
189
            value = deflt;
John R. Lenton's avatar
John R. Lenton committed
190
191
        }
    } else {
John R. Lenton's avatar
John R. Lenton committed
192
        value = elem->value;
193
194
        if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
            // catch the leak (from mp_map_lookup)
195
            m_free(elem, sizeof(mp_map_elem_t));
John R. Lenton's avatar
John R. Lenton committed
196
197
        }
    }
198
    if (lookup_kind == MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
John R. Lenton's avatar
John R. Lenton committed
199
200
201
        elem->value = value;
    }
    return value;
John R. Lenton's avatar
John R. Lenton committed
202
203
}

204
STATIC mp_obj_t dict_get(uint n_args, const mp_obj_t *args) {
John R. Lenton's avatar
John R. Lenton committed
205
    assert(2 <= n_args && n_args <= 3);
206
    assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
207

John R. Lenton's avatar
John R. Lenton committed
208
209
210
    return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
                           args[1],
                           n_args == 3 ? args[2] : NULL,
211
                           MP_MAP_LOOKUP);
John R. Lenton's avatar
John R. Lenton committed
212
}
213
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get);
John R. Lenton's avatar
John R. Lenton committed
214

215
STATIC mp_obj_t dict_pop(uint n_args, const mp_obj_t *args) {
John R. Lenton's avatar
John R. Lenton committed
216
    assert(2 <= n_args && n_args <= 3);
217
    assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
218
219
220
221

    return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
                           args[1],
                           n_args == 3 ? args[2] : NULL,
222
                           MP_MAP_LOOKUP_REMOVE_IF_FOUND);
John R. Lenton's avatar
John R. Lenton committed
223
}
224
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop);
John R. Lenton's avatar
John R. Lenton committed
225
226


227
STATIC mp_obj_t dict_setdefault(uint n_args, const mp_obj_t *args) {
John R. Lenton's avatar
John R. Lenton committed
228
    assert(2 <= n_args && n_args <= 3);
229
    assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
230
231
232
233

    return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
                           args[1],
                           n_args == 3 ? args[2] : NULL,
234
                           MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
John R. Lenton's avatar
John R. Lenton committed
235
}
236
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_setdefault_obj, 2, 3, dict_setdefault);
John R. Lenton's avatar
John R. Lenton committed
237

John R. Lenton's avatar
John R. Lenton committed
238

239
STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
240
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
241
242
    mp_obj_dict_t *self = self_in;
    if (self->map.used == 0) {
243
        nlr_jump(mp_obj_new_exception_msg(&mp_type_KeyError, "popitem(): dictionary is empty"));
John R. Lenton's avatar
John R. Lenton committed
244
245
246
247
248
249
250
    }
    mp_obj_dict_it_t *iter = mp_obj_new_dict_iterator(self, 0);

    mp_map_elem_t *next = dict_it_iternext_elem(iter);
    self->map.used--;
    mp_obj_t items[] = {next->key, next->value};
    next->key = NULL;
John R. Lenton's avatar
John R. Lenton committed
251
    next->value = NULL;
John R. Lenton's avatar
John R. Lenton committed
252
253
254
255
    mp_obj_t tuple = mp_obj_new_tuple(2, items);

    return tuple;
}
256
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_popitem_obj, dict_popitem);
John R. Lenton's avatar
John R. Lenton committed
257

258
STATIC mp_obj_t dict_update(mp_obj_t self_in, mp_obj_t iterable) {
259
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
260
261
    mp_obj_dict_t *self = self_in;
    /* TODO: check for the "keys" method */
Damien George's avatar
Damien George committed
262
    mp_obj_t iter = mp_getiter(iterable);
263
    mp_obj_t next = NULL;
Damien George's avatar
Damien George committed
264
265
266
267
268
    while ((next = mp_iternext(iter)) != MP_OBJ_NULL) {
        mp_obj_t inneriter = mp_getiter(next);
        mp_obj_t key = mp_iternext(inneriter);
        mp_obj_t value = mp_iternext(inneriter);
        mp_obj_t stop = mp_iternext(inneriter);
269
270
271
        if (key == MP_OBJ_NULL
            || value == MP_OBJ_NULL
            || stop != MP_OBJ_NULL) {
272
            nlr_jump(mp_obj_new_exception_msg(
273
                         &mp_type_ValueError,
274
275
                         "dictionary update sequence has the wrong length"));
        } else {
276
            mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
277
278
279
280
281
        }
    }

    return mp_const_none;
}
282
STATIC MP_DEFINE_CONST_FUN_OBJ_2(dict_update_obj, dict_update);
283

John R. Lenton's avatar
John R. Lenton committed
284

285
286
287
/******************************************************************************/
/* dict views                                                                 */

288
289
STATIC const mp_obj_type_t dict_view_type;
STATIC const mp_obj_type_t dict_view_it_type;
290
291
292
293
294
295
296

typedef enum _mp_dict_view_kind_t {
    MP_DICT_VIEW_ITEMS,
    MP_DICT_VIEW_KEYS,
    MP_DICT_VIEW_VALUES,
} mp_dict_view_kind_t;

297
STATIC char *mp_dict_view_names[] = {"dict_items", "dict_keys", "dict_values"};
298
299
300
301
302
303
304
305
306
307
308
309
310
311

typedef struct _mp_obj_dict_view_it_t {
    mp_obj_base_t base;
    mp_dict_view_kind_t kind;
    mp_obj_dict_it_t *iter;
    machine_uint_t cur;
} mp_obj_dict_view_it_t;

typedef struct _mp_obj_dict_view_t {
    mp_obj_base_t base;
    mp_obj_dict_t *dict;
    mp_dict_view_kind_t kind;
} mp_obj_dict_view_t;

312
STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
313
314
315
316
317
318
    assert(MP_OBJ_IS_TYPE(self_in, &dict_view_it_type));
    mp_obj_dict_view_it_t *self = self_in;
    mp_map_elem_t *next = dict_it_iternext_elem(self->iter);

    if (next != NULL) {
        switch (self->kind) {
319
320
321
322
323
324
325
326
327
328
329
330
            case MP_DICT_VIEW_ITEMS:
            {
                mp_obj_t items[] = {next->key, next->value};
                return mp_obj_new_tuple(2, items);
            }
            case MP_DICT_VIEW_KEYS:
                return next->key;
            case MP_DICT_VIEW_VALUES:
                return next->value;
            default:
                assert(0);          /* can't happen */
                return mp_const_none;
331
332
        }
    } else {
333
        return MP_OBJ_NULL;
334
335
336
    }
}

337
STATIC const mp_obj_type_t dict_view_it_type = {
338
    { &mp_type_type },
339
    .name = MP_QSTR_iterator,
340
341
342
    .iternext = dict_view_it_iternext,
};

343
STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in) {
344
345
346
347
348
349
350
351
352
    assert(MP_OBJ_IS_TYPE(view_in, &dict_view_type));
    mp_obj_dict_view_t *view = view_in;
    mp_obj_dict_view_it_t *o = m_new_obj(mp_obj_dict_view_it_t);
    o->base.type = &dict_view_it_type;
    o->kind = view->kind;
    o->iter = mp_obj_new_dict_iterator(view->dict, 0);
    return o;
}

353
STATIC void dict_view_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
354
355
356
357
358
359
360
    assert(MP_OBJ_IS_TYPE(self_in, &dict_view_type));
    mp_obj_dict_view_t *self = self_in;
    bool first = true;
    print(env, mp_dict_view_names[self->kind]);
    print(env, "([");
    mp_obj_t *self_iter = dict_view_getiter(self);
    mp_obj_t *next = NULL;
361
    while ((next = dict_view_it_iternext(self_iter)) != MP_OBJ_NULL) {
362
363
364
365
        if (!first) {
            print(env, ", ");
        }
        first = false;
366
        mp_obj_print_helper(print, env, next, PRINT_REPR);
367
368
369
370
    }
    print(env, "])");
}

371
STATIC mp_obj_t dict_view_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
372
373
374
    /* only supported for the 'keys' kind until sets and dicts are refactored */
    mp_obj_dict_view_t *o = lhs_in;
    if (o->kind != MP_DICT_VIEW_KEYS) return NULL;
Damien George's avatar
Damien George committed
375
    if (op != MP_BINARY_OP_IN) return NULL;
376
377
378
379
    return dict_binary_op(op, o->dict, rhs_in);
}


380
STATIC const mp_obj_type_t dict_view_type = {
381
    { &mp_type_type },
382
    .name = MP_QSTR_dict_view,
383
    .print = dict_view_print,
384
    .binary_op = dict_view_binary_op,
385
386
387
388
389
390
391
392
393
394
395
    .getiter = dict_view_getiter,
};

mp_obj_t mp_obj_new_dict_view(mp_obj_dict_t *dict, mp_dict_view_kind_t kind) {
    mp_obj_dict_view_t *o = m_new_obj(mp_obj_dict_view_t);
    o->base.type = &dict_view_type;
    o->dict = dict;
    o->kind = kind;
    return o;
}

396
STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) {
397
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
398
399
400
401
    mp_obj_dict_t *self = self_in;
    return mp_obj_new_dict_view(self, kind);
}

402
STATIC mp_obj_t dict_items(mp_obj_t self_in) {
403
404
    return dict_view(self_in, MP_DICT_VIEW_ITEMS);
}
405
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_items_obj, dict_items);
406

407
STATIC mp_obj_t dict_keys(mp_obj_t self_in) {
408
409
    return dict_view(self_in, MP_DICT_VIEW_KEYS);
}
410
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_keys_obj, dict_keys);
411

412
STATIC mp_obj_t dict_values(mp_obj_t self_in) {
413
414
    return dict_view(self_in, MP_DICT_VIEW_VALUES);
}
415
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
416

John R. Lenton's avatar
John R. Lenton committed
417
/******************************************************************************/
418
/* dict constructors & public C API                                           */
John R. Lenton's avatar
John R. Lenton committed
419

420
421
422
423
424
425
426
427
428
429
430
431
STATIC const mp_map_elem_t dict_locals_dict_table[] = {
    { MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&dict_clear_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&dict_copy_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_fromkeys), (mp_obj_t)&dict_fromkeys_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_get), (mp_obj_t)&dict_get_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_items), (mp_obj_t)&dict_items_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_keys), (mp_obj_t)&dict_keys_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_pop), (mp_obj_t)&dict_pop_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_popitem), (mp_obj_t)&dict_popitem_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_setdefault), (mp_obj_t)&dict_setdefault_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_update), (mp_obj_t)&dict_update_obj },
    { MP_OBJ_NEW_QSTR(MP_QSTR_values), (mp_obj_t)&dict_values_obj },
432
433
};

434
435
STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);

436
const mp_obj_type_t mp_type_dict = {
437
    { &mp_type_type },
438
    .name = MP_QSTR_dict,
439
440
    .print = dict_print,
    .make_new = dict_make_new,
441
    .unary_op = dict_unary_op,
442
    .binary_op = dict_binary_op,
John R. Lenton's avatar
John R. Lenton committed
443
    .getiter = dict_getiter,
444
    .locals_dict = (mp_obj_t)&dict_locals_dict,
445
446
447
448
};

mp_obj_t mp_obj_new_dict(int n_args) {
    mp_obj_dict_t *o = m_new_obj(mp_obj_dict_t);
449
    o->base.type = &mp_type_dict;
450
    mp_map_init(&o->map, n_args);
451
452
    return o;
}
453
454

uint mp_obj_dict_len(mp_obj_t self_in) {
John R. Lenton's avatar
John R. Lenton committed
455
    return ((mp_obj_dict_t *)self_in)->map.used;
456
457
458
}

mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {
459
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
460
    mp_obj_dict_t *self = self_in;
461
    mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
462
463
    return self_in;
}
464
465

mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) {
466
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
467
468
469
    mp_obj_dict_t *self = self_in;
    return &self->map;
}