objdict.c 17.8 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 "objtuple.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);
16
STATIC mp_obj_t dict_copy(mp_obj_t self_in);
John R. Lenton's avatar
John R. Lenton committed
17

18
STATIC void dict_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
19
20
21
    mp_obj_dict_t *self = self_in;
    bool first = true;
    print(env, "{");
John R. Lenton's avatar
John R. Lenton committed
22
23
24
25
26
    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, ", ");
27
        }
John R. Lenton's avatar
John R. Lenton committed
28
        first = false;
29
        mp_obj_print_helper(print, env, next->key, PRINT_REPR);
John R. Lenton's avatar
John R. Lenton committed
30
        print(env, ": ");
31
        mp_obj_print_helper(print, env, next->value, PRINT_REPR);
32
33
34
35
    }
    print(env, "}");
}

36
STATIC mp_obj_t dict_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
37
38
39
40
41
42
    mp_obj_t dict;
    switch (n_args) {
        case 0:
            dict = mp_obj_new_dict(0);
            break;

43
        case 1: {
44
45
46
47
            if (MP_OBJ_IS_TYPE(args[0], &mp_type_dict)) {
                return dict_copy(args[0]);
            }
            // TODO create dict from an arbitrary mapping!
48
49
50
51
52
53
54
55
56
57
58

            // Make dict from iterable of pairs
            mp_obj_t iterable = mp_getiter(args[0]);
            mp_obj_t dict = mp_obj_new_dict(0);
            // TODO: support arbitrary seq as a pair
            mp_obj_tuple_t *item;
            while ((item = mp_iternext(iterable)) != MP_OBJ_NULL) {
                mp_obj_dict_store(dict, item->items[0], item->items[1]);
            }
            return dict;
        }
59
60

        default:
61
            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "dict takes at most 1 argument"));
62
63
64
65
66
67
68
69
    }

    // add to the new dict any keyword args
    for (const mp_obj_t *a = args + n_args; n_kw > 0; n_kw--, a += 2) {
        mp_obj_dict_store(dict, a[0], a[1]);
    }

    return dict;
70
71
}

72
STATIC mp_obj_t dict_unary_op(int op, mp_obj_t self_in) {
73
74
    mp_obj_dict_t *self = self_in;
    switch (op) {
Damien George's avatar
Damien George committed
75
76
        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);
77
78
79
80
        default: return MP_OBJ_NULL; // op not supported for None
    }
}

81
STATIC mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
82
83
    mp_obj_dict_t *o = lhs_in;
    switch (op) {
Damien George's avatar
Damien George committed
84
        case MP_BINARY_OP_SUBSCR:
85
86
        {
            // dict load
87
            mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
88
            if (elem == NULL) {
89
                nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
90
91
92
93
            } else {
                return elem->value;
            }
        }
Damien George's avatar
Damien George committed
94
        case MP_BINARY_OP_IN:
95
96
        {
            mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
97
            return MP_BOOL(elem != NULL);
98
        }
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
        case MP_BINARY_OP_EQUAL: {
            // TODO: Support equality to other object types
            if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_dict)) {
                mp_obj_dict_t *rhs = rhs_in;
                if (o->map.used != rhs->map.used) {
                    return mp_const_false;
                }

                machine_uint_t size = o->map.alloc;
                mp_map_t *map = &o->map;

                for (machine_uint_t i = 0; i < size; i++) {
                    if (MP_MAP_SLOT_IS_FILLED(map, i)) {
                        mp_map_elem_t *elem = mp_map_lookup(&rhs->map, map->table[i].key, MP_MAP_LOOKUP);
                        if (elem == NULL || !mp_obj_equal(map->table[i].value, elem->value)) {
                            return mp_const_false;
                        }
                    }
                }
                return mp_const_true;
            }
        }
121
122
123
124
125
126
        default:
            // op not supported
            return NULL;
    }
}

127
128
129
130
131
132
133
134
STATIC bool dict_store_item(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
    if (value == MP_OBJ_NULL) {
        mp_obj_dict_delete(self_in, index);
    } else {
        mp_obj_dict_store(self_in, index, value);
    }
    return true;
}
John R. Lenton's avatar
John R. Lenton committed
135

136
137
138
139
140
141
STATIC mp_obj_t dict_getitem(mp_obj_t lhs_in, mp_obj_t rhs_in) {
    return dict_binary_op(MP_BINARY_OP_SUBSCR, lhs_in, rhs_in);
}

STATIC MP_DEFINE_CONST_FUN_OBJ_2(dict_getitem_obj, dict_getitem);

John R. Lenton's avatar
John R. Lenton committed
142
143
144
145
146
147
148
149
150
/******************************************************************************/
/* 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;

151
STATIC mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in) {
John R. Lenton's avatar
John R. Lenton committed
152
153
    mp_obj_dict_it_t *self = self_in;
    machine_uint_t max = self->dict->map.alloc;
154
    mp_map_t *map = &self->dict->map;
John R. Lenton's avatar
John R. Lenton committed
155
156

    for (int i = self->cur; i < max; i++) {
157
        if (MP_MAP_SLOT_IS_FILLED(map, i)) {
John R. Lenton's avatar
John R. Lenton committed
158
            self->cur = i + 1;
159
            return &(map->table[i]);
John R. Lenton's avatar
John R. Lenton committed
160
161
162
163
164
165
166
167
168
169
170
171
        }
    }

    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 {
172
        return MP_OBJ_NULL;
John R. Lenton's avatar
John R. Lenton committed
173
174
175
    }
}

176
STATIC const mp_obj_type_t mp_type_dict_it = {
177
    { &mp_type_type },
178
    .name = MP_QSTR_iterator,
179
    .getiter = mp_identity,
John R. Lenton's avatar
John R. Lenton committed
180
181
182
    .iternext = dict_it_iternext,
};

183
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
184
    mp_obj_dict_it_t *o = m_new_obj(mp_obj_dict_it_t);
185
    o->base.type = &mp_type_dict_it;
John R. Lenton's avatar
John R. Lenton committed
186
187
188
189
190
    o->dict = dict;
    o->cur = cur;
    return o;
}

191
STATIC mp_obj_t dict_getiter(mp_obj_t o_in) {
John R. Lenton's avatar
John R. Lenton committed
192
193
194
195
196
197
    return mp_obj_new_dict_iterator(o_in, 0);
}

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

198
STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
199
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
200
201
202
203
204
205
    mp_obj_dict_t *self = self_in;

    mp_map_clear(&self->map);

    return mp_const_none;
}
206
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
207

208
STATIC mp_obj_t dict_copy(mp_obj_t self_in) {
209
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
210
211
212
    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;
213
214
    other->map.all_keys_are_qstrs = self->map.all_keys_are_qstrs;
    other->map.table_is_fixed_array = 0;
John R. Lenton's avatar
John R. Lenton committed
215
216
217
    memcpy(other->map.table, self->map.table, self->map.alloc * sizeof(mp_map_elem_t));
    return other;
}
218
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy);
John R. Lenton's avatar
John R. Lenton committed
219

220
// this is a classmethod
221
STATIC mp_obj_t dict_fromkeys(uint n_args, const mp_obj_t *args) {
222
    assert(2 <= n_args && n_args <= 3);
Damien George's avatar
Damien George committed
223
    mp_obj_t iter = mp_getiter(args[1]);
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
    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
240
    while ((next = mp_iternext(iter)) != MP_OBJ_NULL) {
241
242
243
244
245
        mp_map_lookup(&self->map, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
    }

    return self;
}
246
247
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);
248

249
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) {
250
    mp_map_elem_t *elem = mp_map_lookup(self, key, lookup_kind);
John R. Lenton's avatar
John R. Lenton committed
251
252
    mp_obj_t value;
    if (elem == NULL || elem->value == NULL) {
John R. Lenton's avatar
John R. Lenton committed
253
        if (deflt == NULL) {
254
            if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
255
                nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
John R. Lenton's avatar
John R. Lenton committed
256
            } else {
John R. Lenton's avatar
John R. Lenton committed
257
                value = mp_const_none;
John R. Lenton's avatar
John R. Lenton committed
258
259
            }
        } else {
John R. Lenton's avatar
John R. Lenton committed
260
            value = deflt;
John R. Lenton's avatar
John R. Lenton committed
261
262
        }
    } else {
John R. Lenton's avatar
John R. Lenton committed
263
        value = elem->value;
John R. Lenton's avatar
John R. Lenton committed
264
    }
265
    if (lookup_kind == MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
John R. Lenton's avatar
John R. Lenton committed
266
267
268
        elem->value = value;
    }
    return value;
John R. Lenton's avatar
John R. Lenton committed
269
270
}

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

John R. Lenton's avatar
John R. Lenton committed
275
276
277
    return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
                           args[1],
                           n_args == 3 ? args[2] : NULL,
278
                           MP_MAP_LOOKUP);
John R. Lenton's avatar
John R. Lenton committed
279
}
280
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get);
John R. Lenton's avatar
John R. Lenton committed
281

282
STATIC mp_obj_t dict_pop(uint n_args, const mp_obj_t *args) {
John R. Lenton's avatar
John R. Lenton committed
283
    assert(2 <= n_args && n_args <= 3);
284
    assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
285
286
287
288

    return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
                           args[1],
                           n_args == 3 ? args[2] : NULL,
289
                           MP_MAP_LOOKUP_REMOVE_IF_FOUND);
John R. Lenton's avatar
John R. Lenton committed
290
}
291
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop);
John R. Lenton's avatar
John R. Lenton committed
292
293


294
STATIC mp_obj_t dict_setdefault(uint n_args, const mp_obj_t *args) {
John R. Lenton's avatar
John R. Lenton committed
295
    assert(2 <= n_args && n_args <= 3);
296
    assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
297
298
299
300

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

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

306
STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
307
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
308
309
    mp_obj_dict_t *self = self_in;
    if (self->map.used == 0) {
310
        nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "popitem(): dictionary is empty"));
John R. Lenton's avatar
John R. Lenton committed
311
312
313
314
315
316
317
    }
    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
318
    next->value = NULL;
John R. Lenton's avatar
John R. Lenton committed
319
320
321
322
    mp_obj_t tuple = mp_obj_new_tuple(2, items);

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

325
STATIC mp_obj_t dict_update(mp_obj_t self_in, mp_obj_t iterable) {
326
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
327
328
    mp_obj_dict_t *self = self_in;
    /* TODO: check for the "keys" method */
Damien George's avatar
Damien George committed
329
    mp_obj_t iter = mp_getiter(iterable);
330
    mp_obj_t next = NULL;
Damien George's avatar
Damien George committed
331
332
333
334
335
    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);
336
337
338
        if (key == MP_OBJ_NULL
            || value == MP_OBJ_NULL
            || stop != MP_OBJ_NULL) {
339
            nlr_raise(mp_obj_new_exception_msg(
340
                         &mp_type_ValueError,
341
342
                         "dictionary update sequence has the wrong length"));
        } else {
343
            mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
344
345
346
347
348
        }
    }

    return mp_const_none;
}
349
STATIC MP_DEFINE_CONST_FUN_OBJ_2(dict_update_obj, dict_update);
350

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

352
353
354
/******************************************************************************/
/* dict views                                                                 */

355
356
STATIC const mp_obj_type_t dict_view_type;
STATIC const mp_obj_type_t dict_view_it_type;
357
358
359
360
361
362
363

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

364
STATIC char *mp_dict_view_names[] = {"dict_items", "dict_keys", "dict_values"};
365
366
367
368
369
370
371
372
373
374
375
376
377
378

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;

379
STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
380
381
382
383
384
385
    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) {
386
387
388
389
390
391
392
393
394
395
396
397
            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;
398
399
        }
    } else {
400
        return MP_OBJ_NULL;
401
402
403
    }
}

404
STATIC const mp_obj_type_t dict_view_it_type = {
405
    { &mp_type_type },
406
    .name = MP_QSTR_iterator,
407
    .getiter = mp_identity,
408
409
410
    .iternext = dict_view_it_iternext,
};

411
STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in) {
412
413
414
415
416
417
418
419
420
    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;
}

421
STATIC void dict_view_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
422
423
424
425
426
427
428
    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;
429
    while ((next = dict_view_it_iternext(self_iter)) != MP_OBJ_NULL) {
430
431
432
433
        if (!first) {
            print(env, ", ");
        }
        first = false;
434
        mp_obj_print_helper(print, env, next, PRINT_REPR);
435
436
437
438
    }
    print(env, "])");
}

439
STATIC mp_obj_t dict_view_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
440
441
442
    /* 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
443
    if (op != MP_BINARY_OP_IN) return NULL;
444
445
446
447
    return dict_binary_op(op, o->dict, rhs_in);
}


448
STATIC const mp_obj_type_t dict_view_type = {
449
    { &mp_type_type },
450
    .name = MP_QSTR_dict_view,
451
    .print = dict_view_print,
452
    .binary_op = dict_view_binary_op,
453
454
455
456
457
458
459
460
461
462
463
    .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;
}

464
STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) {
465
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
466
467
468
469
    mp_obj_dict_t *self = self_in;
    return mp_obj_new_dict_view(self, kind);
}

470
STATIC mp_obj_t dict_items(mp_obj_t self_in) {
471
472
    return dict_view(self_in, MP_DICT_VIEW_ITEMS);
}
473
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_items_obj, dict_items);
474

475
STATIC mp_obj_t dict_keys(mp_obj_t self_in) {
476
477
    return dict_view(self_in, MP_DICT_VIEW_KEYS);
}
478
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_keys_obj, dict_keys);
479

480
STATIC mp_obj_t dict_values(mp_obj_t self_in) {
481
482
    return dict_view(self_in, MP_DICT_VIEW_VALUES);
}
483
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
484

John R. Lenton's avatar
John R. Lenton committed
485
/******************************************************************************/
486
/* dict constructors & public C API                                           */
John R. Lenton's avatar
John R. Lenton committed
487

488
489
490
491
492
493
494
495
496
497
498
499
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 },
500
    { MP_OBJ_NEW_QSTR(MP_QSTR___getitem__), (mp_obj_t)&dict_getitem_obj },
501
502
};

503
504
STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);

505
const mp_obj_type_t mp_type_dict = {
506
    { &mp_type_type },
507
    .name = MP_QSTR_dict,
508
509
    .print = dict_print,
    .make_new = dict_make_new,
510
    .unary_op = dict_unary_op,
511
    .binary_op = dict_binary_op,
512
    .store_item = dict_store_item,
John R. Lenton's avatar
John R. Lenton committed
513
    .getiter = dict_getiter,
514
    .locals_dict = (mp_obj_t)&dict_locals_dict,
515
516
};

517
518
519
520
521
void mp_obj_dict_init(mp_obj_dict_t *dict, int n_args) {
    dict->base.type = &mp_type_dict;
    mp_map_init(&dict->map, n_args);
}

522
523
mp_obj_t mp_obj_new_dict(int n_args) {
    mp_obj_dict_t *o = m_new_obj(mp_obj_dict_t);
524
    mp_obj_dict_init(o, n_args);
525
526
    return o;
}
527
528

uint mp_obj_dict_len(mp_obj_t self_in) {
John R. Lenton's avatar
John R. Lenton committed
529
    return ((mp_obj_dict_t *)self_in)->map.used;
530
531
532
}

mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {
533
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
534
    mp_obj_dict_t *self = self_in;
535
    mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
536
537
    return self_in;
}
538

539
540
541
542
543
544
545
mp_obj_t mp_obj_dict_delete(mp_obj_t self_in, mp_obj_t key) {
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
    mp_obj_dict_t *self = self_in;
    dict_get_helper(&self->map, key, NULL, MP_MAP_LOOKUP_REMOVE_IF_FOUND);
    return self_in;
}

546
mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) {
547
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
548
549
550
    mp_obj_dict_t *self = self_in;
    return &self->map;
}