objdict.c 16 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
10
11
12
#include "obj.h"
#include "runtime0.h"
#include "runtime.h"

13
14
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);
15
STATIC mp_obj_t dict_copy(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
37
38
39
40
41
42
    mp_obj_t dict;
    switch (n_args) {
        case 0:
            dict = mp_obj_new_dict(0);
            break;

        case 1:
43
44
45
46
            if (MP_OBJ_IS_TYPE(args[0], &mp_type_dict)) {
                return dict_copy(args[0]);
            }
            // TODO create dict from an arbitrary mapping!
47
48
49
50
            // TODO create dict from an iterable!
            assert(false);

        default:
51
            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "dict takes at most 1 argument"));
52
53
54
55
56
57
58
59
    }

    // 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;
60
61
}

62
STATIC mp_obj_t dict_unary_op(int op, mp_obj_t self_in) {
63
64
    mp_obj_dict_t *self = self_in;
    switch (op) {
Damien George's avatar
Damien George committed
65
66
        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);
67
68
69
70
        default: return MP_OBJ_NULL; // op not supported for None
    }
}

71
STATIC mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
72
73
    mp_obj_dict_t *o = lhs_in;
    switch (op) {
Damien George's avatar
Damien George committed
74
        case MP_BINARY_OP_SUBSCR:
75
76
        {
            // dict load
77
            mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
78
            if (elem == NULL) {
79
                nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
80
81
82
83
            } else {
                return elem->value;
            }
        }
Damien George's avatar
Damien George committed
84
        case MP_BINARY_OP_IN:
85
86
        {
            mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
87
            return MP_BOOL(elem != NULL);
88
        }
89
90
91
92
93
94
        default:
            // op not supported
            return NULL;
    }
}

John R. Lenton's avatar
John R. Lenton committed
95
96
97
98
99
100
101
102
103
104

/******************************************************************************/
/* 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;

105
STATIC mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in) {
John R. Lenton's avatar
John R. Lenton committed
106
107
    mp_obj_dict_it_t *self = self_in;
    machine_uint_t max = self->dict->map.alloc;
108
    mp_map_t *map = &self->dict->map;
John R. Lenton's avatar
John R. Lenton committed
109
110

    for (int i = self->cur; i < max; i++) {
111
        if (MP_MAP_SLOT_IS_FILLED(map, i)) {
John R. Lenton's avatar
John R. Lenton committed
112
            self->cur = i + 1;
113
            return &(map->table[i]);
John R. Lenton's avatar
John R. Lenton committed
114
115
116
117
118
119
120
121
122
123
124
125
        }
    }

    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 {
126
        return MP_OBJ_NULL;
John R. Lenton's avatar
John R. Lenton committed
127
128
129
    }
}

130
STATIC const mp_obj_type_t mp_type_dict_it = {
131
    { &mp_type_type },
132
    .name = MP_QSTR_iterator,
133
    .getiter = mp_identity,
John R. Lenton's avatar
John R. Lenton committed
134
135
136
    .iternext = dict_it_iternext,
};

137
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
138
    mp_obj_dict_it_t *o = m_new_obj(mp_obj_dict_it_t);
139
    o->base.type = &mp_type_dict_it;
John R. Lenton's avatar
John R. Lenton committed
140
141
142
143
144
    o->dict = dict;
    o->cur = cur;
    return o;
}

145
STATIC mp_obj_t dict_getiter(mp_obj_t o_in) {
John R. Lenton's avatar
John R. Lenton committed
146
147
148
149
150
151
    return mp_obj_new_dict_iterator(o_in, 0);
}

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

152
STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
153
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
154
155
156
157
158
159
    mp_obj_dict_t *self = self_in;

    mp_map_clear(&self->map);

    return mp_const_none;
}
160
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
161

162
STATIC mp_obj_t dict_copy(mp_obj_t self_in) {
163
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
164
165
166
    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;
167
168
    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
169
170
171
    memcpy(other->map.table, self->map.table, self->map.alloc * sizeof(mp_map_elem_t));
    return other;
}
172
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy);
John R. Lenton's avatar
John R. Lenton committed
173

174
// this is a classmethod
175
STATIC mp_obj_t dict_fromkeys(uint n_args, const mp_obj_t *args) {
176
    assert(2 <= n_args && n_args <= 3);
Damien George's avatar
Damien George committed
177
    mp_obj_t iter = mp_getiter(args[1]);
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
    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
194
    while ((next = mp_iternext(iter)) != MP_OBJ_NULL) {
195
196
197
198
199
        mp_map_lookup(&self->map, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
    }

    return self;
}
200
201
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);
202

203
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) {
204
    mp_map_elem_t *elem = mp_map_lookup(self, key, lookup_kind);
John R. Lenton's avatar
John R. Lenton committed
205
206
    mp_obj_t value;
    if (elem == NULL || elem->value == NULL) {
John R. Lenton's avatar
John R. Lenton committed
207
        if (deflt == NULL) {
208
            if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
209
                nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
John R. Lenton's avatar
John R. Lenton committed
210
            } else {
John R. Lenton's avatar
John R. Lenton committed
211
                value = mp_const_none;
John R. Lenton's avatar
John R. Lenton committed
212
213
            }
        } else {
John R. Lenton's avatar
John R. Lenton committed
214
            value = deflt;
John R. Lenton's avatar
John R. Lenton committed
215
216
        }
    } else {
John R. Lenton's avatar
John R. Lenton committed
217
        value = elem->value;
John R. Lenton's avatar
John R. Lenton committed
218
    }
219
    if (lookup_kind == MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
John R. Lenton's avatar
John R. Lenton committed
220
221
222
        elem->value = value;
    }
    return value;
John R. Lenton's avatar
John R. Lenton committed
223
224
}

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

John R. Lenton's avatar
John R. Lenton committed
229
230
231
    return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
                           args[1],
                           n_args == 3 ? args[2] : NULL,
232
                           MP_MAP_LOOKUP);
John R. Lenton's avatar
John R. Lenton committed
233
}
234
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get);
John R. Lenton's avatar
John R. Lenton committed
235

236
STATIC mp_obj_t dict_pop(uint n_args, const mp_obj_t *args) {
John R. Lenton's avatar
John R. Lenton committed
237
    assert(2 <= n_args && n_args <= 3);
238
    assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
239
240
241
242

    return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
                           args[1],
                           n_args == 3 ? args[2] : NULL,
243
                           MP_MAP_LOOKUP_REMOVE_IF_FOUND);
John R. Lenton's avatar
John R. Lenton committed
244
}
245
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop);
John R. Lenton's avatar
John R. Lenton committed
246
247


248
STATIC mp_obj_t dict_setdefault(uint n_args, const mp_obj_t *args) {
John R. Lenton's avatar
John R. Lenton committed
249
    assert(2 <= n_args && n_args <= 3);
250
    assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
251
252
253
254

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

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

260
STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
261
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
262
263
    mp_obj_dict_t *self = self_in;
    if (self->map.used == 0) {
264
        nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "popitem(): dictionary is empty"));
John R. Lenton's avatar
John R. Lenton committed
265
266
267
268
269
270
271
    }
    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
272
    next->value = NULL;
John R. Lenton's avatar
John R. Lenton committed
273
274
275
276
    mp_obj_t tuple = mp_obj_new_tuple(2, items);

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

279
STATIC mp_obj_t dict_update(mp_obj_t self_in, mp_obj_t iterable) {
280
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
281
282
    mp_obj_dict_t *self = self_in;
    /* TODO: check for the "keys" method */
Damien George's avatar
Damien George committed
283
    mp_obj_t iter = mp_getiter(iterable);
284
    mp_obj_t next = NULL;
Damien George's avatar
Damien George committed
285
286
287
288
289
    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);
290
291
292
        if (key == MP_OBJ_NULL
            || value == MP_OBJ_NULL
            || stop != MP_OBJ_NULL) {
293
            nlr_raise(mp_obj_new_exception_msg(
294
                         &mp_type_ValueError,
295
296
                         "dictionary update sequence has the wrong length"));
        } else {
297
            mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
298
299
300
301
302
        }
    }

    return mp_const_none;
}
303
STATIC MP_DEFINE_CONST_FUN_OBJ_2(dict_update_obj, dict_update);
304

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

306
307
308
/******************************************************************************/
/* dict views                                                                 */

309
310
STATIC const mp_obj_type_t dict_view_type;
STATIC const mp_obj_type_t dict_view_it_type;
311
312
313
314
315
316
317

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

318
STATIC char *mp_dict_view_names[] = {"dict_items", "dict_keys", "dict_values"};
319
320
321
322
323
324
325
326
327
328
329
330
331
332

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;

333
STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
334
335
336
337
338
339
    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) {
340
341
342
343
344
345
346
347
348
349
350
351
            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;
352
353
        }
    } else {
354
        return MP_OBJ_NULL;
355
356
357
    }
}

358
STATIC const mp_obj_type_t dict_view_it_type = {
359
    { &mp_type_type },
360
    .name = MP_QSTR_iterator,
361
    .getiter = mp_identity,
362
363
364
    .iternext = dict_view_it_iternext,
};

365
STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in) {
366
367
368
369
370
371
372
373
374
    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;
}

375
STATIC void dict_view_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
376
377
378
379
380
381
382
    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;
383
    while ((next = dict_view_it_iternext(self_iter)) != MP_OBJ_NULL) {
384
385
386
387
        if (!first) {
            print(env, ", ");
        }
        first = false;
388
        mp_obj_print_helper(print, env, next, PRINT_REPR);
389
390
391
392
    }
    print(env, "])");
}

393
STATIC mp_obj_t dict_view_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
394
395
396
    /* 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
397
    if (op != MP_BINARY_OP_IN) return NULL;
398
399
400
401
    return dict_binary_op(op, o->dict, rhs_in);
}


402
STATIC const mp_obj_type_t dict_view_type = {
403
    { &mp_type_type },
404
    .name = MP_QSTR_dict_view,
405
    .print = dict_view_print,
406
    .binary_op = dict_view_binary_op,
407
408
409
410
411
412
413
414
415
416
417
    .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;
}

418
STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) {
419
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
420
421
422
423
    mp_obj_dict_t *self = self_in;
    return mp_obj_new_dict_view(self, kind);
}

424
STATIC mp_obj_t dict_items(mp_obj_t self_in) {
425
426
    return dict_view(self_in, MP_DICT_VIEW_ITEMS);
}
427
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_items_obj, dict_items);
428

429
STATIC mp_obj_t dict_keys(mp_obj_t self_in) {
430
431
    return dict_view(self_in, MP_DICT_VIEW_KEYS);
}
432
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_keys_obj, dict_keys);
433

434
STATIC mp_obj_t dict_values(mp_obj_t self_in) {
435
436
    return dict_view(self_in, MP_DICT_VIEW_VALUES);
}
437
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
438

John R. Lenton's avatar
John R. Lenton committed
439
/******************************************************************************/
440
/* dict constructors & public C API                                           */
John R. Lenton's avatar
John R. Lenton committed
441

442
443
444
445
446
447
448
449
450
451
452
453
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 },
454
455
};

456
457
STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);

458
const mp_obj_type_t mp_type_dict = {
459
    { &mp_type_type },
460
    .name = MP_QSTR_dict,
461
462
    .print = dict_print,
    .make_new = dict_make_new,
463
    .unary_op = dict_unary_op,
464
    .binary_op = dict_binary_op,
John R. Lenton's avatar
John R. Lenton committed
465
    .getiter = dict_getiter,
466
    .locals_dict = (mp_obj_t)&dict_locals_dict,
467
468
};

469
470
471
472
473
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);
}

474
475
mp_obj_t mp_obj_new_dict(int n_args) {
    mp_obj_dict_t *o = m_new_obj(mp_obj_dict_t);
476
    mp_obj_dict_init(o, n_args);
477
478
    return o;
}
479
480

uint mp_obj_dict_len(mp_obj_t self_in) {
John R. Lenton's avatar
John R. Lenton committed
481
    return ((mp_obj_dict_t *)self_in)->map.used;
482
483
484
}

mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {
485
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
486
    mp_obj_dict_t *self = self_in;
487
    mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
488
489
    return self_in;
}
490

491
492
493
494
495
496
497
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;
}

498
mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) {
499
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
500
501
502
    mp_obj_dict_t *self = self_in;
    return &self->map;
}