objdict.c 15.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
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);
John R. Lenton's avatar
John R. Lenton committed
15

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

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

        case 1:
            // TODO create dict from an iterable!
            assert(false);

        default:
46
            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "dict takes at most 1 argument"));
47
48
49
50
51
52
53
54
    }

    // 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;
55
56
}

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

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

John R. Lenton's avatar
John R. Lenton committed
90
91
92
93
94
95
96
97
98
99

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

100
STATIC mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in) {
John R. Lenton's avatar
John R. Lenton committed
101
102
    mp_obj_dict_it_t *self = self_in;
    machine_uint_t max = self->dict->map.alloc;
103
    mp_map_t *map = &self->dict->map;
John R. Lenton's avatar
John R. Lenton committed
104
105

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

    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 {
121
        return MP_OBJ_NULL;
John R. Lenton's avatar
John R. Lenton committed
122
123
124
    }
}

125
STATIC const mp_obj_type_t mp_type_dict_it = {
126
    { &mp_type_type },
127
    .name = MP_QSTR_iterator,
128
    .getiter = mp_identity,
John R. Lenton's avatar
John R. Lenton committed
129
130
131
    .iternext = dict_it_iternext,
};

132
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
133
    mp_obj_dict_it_t *o = m_new_obj(mp_obj_dict_it_t);
134
    o->base.type = &mp_type_dict_it;
John R. Lenton's avatar
John R. Lenton committed
135
136
137
138
139
    o->dict = dict;
    o->cur = cur;
    return o;
}

140
STATIC mp_obj_t dict_getiter(mp_obj_t o_in) {
John R. Lenton's avatar
John R. Lenton committed
141
142
143
144
145
146
    return mp_obj_new_dict_iterator(o_in, 0);
}

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

147
STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
148
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
149
150
151
152
153
154
    mp_obj_dict_t *self = self_in;

    mp_map_clear(&self->map);

    return mp_const_none;
}
155
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
156

157
STATIC mp_obj_t dict_copy(mp_obj_t self_in) {
158
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton's avatar
John R. Lenton committed
159
160
161
162
163
164
    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;
}
165
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy);
John R. Lenton's avatar
John R. Lenton committed
166

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

    return self;
}
193
194
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);
195

196
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) {
197
    mp_map_elem_t *elem = mp_map_lookup(self, key, lookup_kind);
John R. Lenton's avatar
John R. Lenton committed
198
199
    mp_obj_t value;
    if (elem == NULL || elem->value == NULL) {
John R. Lenton's avatar
John R. Lenton committed
200
        if (deflt == NULL) {
201
            if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
202
                nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
John R. Lenton's avatar
John R. Lenton committed
203
            } else {
John R. Lenton's avatar
John R. Lenton committed
204
                value = mp_const_none;
John R. Lenton's avatar
John R. Lenton committed
205
206
            }
        } else {
John R. Lenton's avatar
John R. Lenton committed
207
            value = deflt;
John R. Lenton's avatar
John R. Lenton committed
208
209
        }
    } else {
John R. Lenton's avatar
John R. Lenton committed
210
        value = elem->value;
211
212
        if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
            // catch the leak (from mp_map_lookup)
213
            m_free(elem, sizeof(mp_map_elem_t));
John R. Lenton's avatar
John R. Lenton committed
214
215
        }
    }
216
    if (lookup_kind == MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
John R. Lenton's avatar
John R. Lenton committed
217
218
219
        elem->value = value;
    }
    return value;
John R. Lenton's avatar
John R. Lenton committed
220
221
}

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

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

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

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


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

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

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

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

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

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

    return mp_const_none;
}
300
STATIC MP_DEFINE_CONST_FUN_OBJ_2(dict_update_obj, dict_update);
301

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

303
304
305
/******************************************************************************/
/* dict views                                                                 */

306
307
STATIC const mp_obj_type_t dict_view_type;
STATIC const mp_obj_type_t dict_view_it_type;
308
309
310
311
312
313
314

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

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

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;

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

355
STATIC const mp_obj_type_t dict_view_it_type = {
356
    { &mp_type_type },
357
    .name = MP_QSTR_iterator,
358
    .getiter = mp_identity,
359
360
361
    .iternext = dict_view_it_iternext,
};

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

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

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


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

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

421
STATIC mp_obj_t dict_items(mp_obj_t self_in) {
422
423
    return dict_view(self_in, MP_DICT_VIEW_ITEMS);
}
424
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_items_obj, dict_items);
425

426
STATIC mp_obj_t dict_keys(mp_obj_t self_in) {
427
428
    return dict_view(self_in, MP_DICT_VIEW_KEYS);
}
429
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_keys_obj, dict_keys);
430

431
STATIC mp_obj_t dict_values(mp_obj_t self_in) {
432
433
    return dict_view(self_in, MP_DICT_VIEW_VALUES);
}
434
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
435

John R. Lenton's avatar
John R. Lenton committed
436
/******************************************************************************/
437
/* dict constructors & public C API                                           */
John R. Lenton's avatar
John R. Lenton committed
438

439
440
441
442
443
444
445
446
447
448
449
450
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 },
451
452
};

453
454
STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);

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

466
467
468
469
470
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);
}

471
472
mp_obj_t mp_obj_new_dict(int n_args) {
    mp_obj_dict_t *o = m_new_obj(mp_obj_dict_t);
473
    mp_obj_dict_init(o, n_args);
474
475
    return o;
}
476
477

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

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

488
489
490
491
492
493
494
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;
}

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