objdict.c 19.9 KB
Newer Older
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
/*
 * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
 * Copyright (c) 2013, 2014 Damien P. George
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */

xbe's avatar
xbe committed
27
#include <stdbool.h>
28
29
30
#include <string.h>
#include <assert.h>

31
#include "mpconfig.h"
32
33
#include "nlr.h"
#include "misc.h"
34
#include "qstr.h"
35
#include "obj.h"
36
#include "objtuple.h"
37
38
#include "runtime0.h"
#include "runtime.h"
39
#include "builtin.h"
40

41
42
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);
43
STATIC mp_obj_t dict_update(uint n_args, const mp_obj_t *args, mp_map_t *kwargs);
John R. Lenton's avatar
John R. Lenton committed
44

45
STATIC void dict_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
46
47
48
    mp_obj_dict_t *self = self_in;
    bool first = true;
    print(env, "{");
John R. Lenton's avatar
John R. Lenton committed
49
50
    mp_obj_t *dict_iter = mp_obj_new_dict_iterator(self, 0);
    mp_map_elem_t *next = NULL;
51
    while ((next = dict_it_iternext_elem(dict_iter)) != MP_OBJ_STOP_ITERATION) {
John R. Lenton's avatar
John R. Lenton committed
52
53
        if (!first) {
            print(env, ", ");
54
        }
John R. Lenton's avatar
John R. Lenton committed
55
        first = false;
56
        mp_obj_print_helper(print, env, next->key, PRINT_REPR);
John R. Lenton's avatar
John R. Lenton committed
57
        print(env, ": ");
58
        mp_obj_print_helper(print, env, next->value, PRINT_REPR);
59
60
61
62
    }
    print(env, "}");
}

63
STATIC mp_obj_t dict_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
64
65
66
67
68
69
    mp_obj_t dict = mp_obj_new_dict(0);
    if (n_args > 0 || n_kw > 0) {
        mp_obj_t args2[2] = {dict, args[0]}; // args[0] is always valid, even if it's not a positional arg
        mp_map_t kwargs;
        mp_map_init_fixed_table(&kwargs, n_kw, args + n_args);
        dict_update(n_args + 1, args2, &kwargs); // dict_update will check that n_args + 1 == 1 or 2
70
71
    }
    return dict;
72
73
}

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

83
STATIC mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
84
85
    mp_obj_dict_t *o = lhs_in;
    switch (op) {
86
        case MP_BINARY_OP_IN: {
87
            mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
88
            return MP_BOOL(elem != NULL);
89
        }
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
        case MP_BINARY_OP_EQUAL: {
            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;
109
110
111
            } else {
                // dict is not equal to instance of any other type
                return mp_const_false;
112
113
            }
        }
114
115
        default:
            // op not supported
116
            return MP_OBJ_NULL;
117
118
119
    }
}

120
STATIC mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
121
    if (value == MP_OBJ_NULL) {
122
        // delete
123
        mp_obj_dict_delete(self_in, index);
124
125
126
127
128
129
130
131
132
133
        return mp_const_none;
    } else if (value == MP_OBJ_SENTINEL) {
        // load
        mp_obj_dict_t *self = self_in;
        mp_map_elem_t *elem = mp_map_lookup(&self->map, index, MP_MAP_LOOKUP);
        if (elem == NULL) {
            nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
        } else {
            return elem->value;
        }
134
    } else {
135
        // store
136
        mp_obj_dict_store(self_in, index, value);
137
        return mp_const_none;
138
139
    }
}
John R. Lenton's avatar
John R. Lenton committed
140
141
142
143
144
145
146
147
148
149

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

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

    for (int i = self->cur; i < max; i++) {
156
        if (MP_MAP_SLOT_IS_FILLED(map, i)) {
John R. Lenton's avatar
John R. Lenton committed
157
            self->cur = i + 1;
158
            return &(map->table[i]);
John R. Lenton's avatar
John R. Lenton committed
159
160
161
        }
    }

162
    return MP_OBJ_STOP_ITERATION;
John R. Lenton's avatar
John R. Lenton committed
163
164
165
166
167
}

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

168
    if (next != MP_OBJ_STOP_ITERATION) {
John R. Lenton's avatar
John R. Lenton committed
169
170
        return next->key;
    } else {
171
        return MP_OBJ_STOP_ITERATION;
John R. Lenton's avatar
John R. Lenton committed
172
173
174
    }
}

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

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

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

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

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

    mp_map_clear(&self->map);

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

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

219
// this is a classmethod
220
STATIC mp_obj_t dict_fromkeys(uint n_args, const mp_obj_t *args) {
221
    assert(2 <= n_args && n_args <= 3);
Damien George's avatar
Damien George committed
222
    mp_obj_t iter = mp_getiter(args[1]);
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
    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));
    }

239
    while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
240
241
242
243
244
        mp_map_lookup(&self->map, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
    }

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

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

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

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

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

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


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

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

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

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

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

324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
STATIC mp_obj_t dict_update(uint n_args, const mp_obj_t *args, mp_map_t *kwargs) {
    assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
    mp_obj_dict_t *self = args[0];

    mp_arg_check_num(n_args, kwargs->used, 1, 2, true);

    if (n_args == 2) {
        // given a positional argument

        if (MP_OBJ_IS_TYPE(args[1], &mp_type_dict)) {
            // update from other dictionary (make sure other is not self)
            if (args[1] != self) {
                // TODO don't allocate heap object for this iterator
                mp_obj_t *dict_iter = mp_obj_new_dict_iterator(args[1], 0);
                mp_map_elem_t *elem = NULL;
                while ((elem = dict_it_iternext_elem(dict_iter)) != MP_OBJ_STOP_ITERATION) {
                    mp_map_lookup(&self->map, elem->key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = elem->value;
                }
            }
343
        } else {
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
            // update from a generic iterable of pairs
            mp_obj_t iter = mp_getiter(args[1]);
            mp_obj_t next = NULL;
            while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
                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);
                if (key == MP_OBJ_STOP_ITERATION
                    || value == MP_OBJ_STOP_ITERATION
                    || stop != MP_OBJ_STOP_ITERATION) {
                    nlr_raise(mp_obj_new_exception_msg(
                                 &mp_type_ValueError,
                                 "dictionary update sequence has the wrong length"));
                } else {
                    mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
                }
            }
        }
    }

    // update the dict with any keyword args
    for (machine_uint_t i = 0; i < kwargs->alloc; i++) {
        if (MP_MAP_SLOT_IS_FILLED(kwargs, i)) {
            mp_map_lookup(&self->map, kwargs->table[i].key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = kwargs->table[i].value;
369
370
371
372
373
        }
    }

    return mp_const_none;
}
374
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(dict_update_obj, 1, dict_update);
375

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

377
378
379
/******************************************************************************/
/* dict views                                                                 */

380
381
STATIC const mp_obj_type_t dict_view_type;
STATIC const mp_obj_type_t dict_view_it_type;
382
383
384
385
386
387
388

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

389
STATIC char *mp_dict_view_names[] = {"dict_items", "dict_keys", "dict_values"};
390
391
392
393
394
395
396
397
398
399
400
401
402
403

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;

404
STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
405
406
407
408
    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);

409
    if (next != MP_OBJ_STOP_ITERATION) {
410
        switch (self->kind) {
411
412
413
414
415
416
417
418
419
420
421
422
            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;
423
424
        }
    } else {
425
        return MP_OBJ_STOP_ITERATION;
426
427
428
    }
}

429
STATIC const mp_obj_type_t dict_view_it_type = {
430
    { &mp_type_type },
431
    .name = MP_QSTR_iterator,
432
    .getiter = mp_identity,
433
434
435
    .iternext = dict_view_it_iternext,
};

436
STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in) {
437
438
439
440
441
442
443
444
445
    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;
}

446
STATIC void dict_view_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
447
448
449
450
451
452
453
    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;
454
    while ((next = dict_view_it_iternext(self_iter)) != MP_OBJ_STOP_ITERATION) {
455
456
457
458
        if (!first) {
            print(env, ", ");
        }
        first = false;
459
        mp_obj_print_helper(print, env, next, PRINT_REPR);
460
461
462
463
    }
    print(env, "])");
}

464
STATIC mp_obj_t dict_view_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
465
    // only supported for the 'keys' kind until sets and dicts are refactored
466
    mp_obj_dict_view_t *o = lhs_in;
467
    if (o->kind != MP_DICT_VIEW_KEYS) {
468
        return MP_OBJ_NULL; // op not supported
469
470
    }
    if (op != MP_BINARY_OP_IN) {
471
        return MP_OBJ_NULL; // op not supported
472
    }
473
474
475
    return dict_binary_op(op, o->dict, rhs_in);
}

476
STATIC const mp_obj_type_t dict_view_type = {
477
    { &mp_type_type },
478
    .name = MP_QSTR_dict_view,
479
    .print = dict_view_print,
480
    .binary_op = dict_view_binary_op,
481
482
483
484
485
486
487
488
489
490
491
    .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;
}

492
STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) {
493
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
494
495
496
497
    mp_obj_dict_t *self = self_in;
    return mp_obj_new_dict_view(self, kind);
}

498
STATIC mp_obj_t dict_items(mp_obj_t self_in) {
499
500
    return dict_view(self_in, MP_DICT_VIEW_ITEMS);
}
501
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_items_obj, dict_items);
502

503
STATIC mp_obj_t dict_keys(mp_obj_t self_in) {
504
505
    return dict_view(self_in, MP_DICT_VIEW_KEYS);
}
506
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_keys_obj, dict_keys);
507

508
STATIC mp_obj_t dict_values(mp_obj_t self_in) {
509
510
    return dict_view(self_in, MP_DICT_VIEW_VALUES);
}
511
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
512

John R. Lenton's avatar
John R. Lenton committed
513
/******************************************************************************/
514
/* dict constructors & public C API                                           */
John R. Lenton's avatar
John R. Lenton committed
515

516
517
518
519
520
521
522
523
524
525
526
527
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 },
528
    { MP_OBJ_NEW_QSTR(MP_QSTR___getitem__), (mp_obj_t)&mp_op_getitem_obj },
Paul Sokolovsky's avatar
Paul Sokolovsky committed
529
    { MP_OBJ_NEW_QSTR(MP_QSTR___setitem__), (mp_obj_t)&mp_op_setitem_obj },
Paul Sokolovsky's avatar
Paul Sokolovsky committed
530
    { MP_OBJ_NEW_QSTR(MP_QSTR___delitem__), (mp_obj_t)&mp_op_delitem_obj },
531
532
};

533
534
STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);

535
const mp_obj_type_t mp_type_dict = {
536
    { &mp_type_type },
537
    .name = MP_QSTR_dict,
538
539
    .print = dict_print,
    .make_new = dict_make_new,
540
    .unary_op = dict_unary_op,
541
    .binary_op = dict_binary_op,
542
    .subscr = dict_subscr,
John R. Lenton's avatar
John R. Lenton committed
543
    .getiter = dict_getiter,
544
    .locals_dict = (mp_obj_t)&dict_locals_dict,
545
546
};

547
548
549
550
551
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);
}

552
553
mp_obj_t mp_obj_new_dict(int n_args) {
    mp_obj_dict_t *o = m_new_obj(mp_obj_dict_t);
554
    mp_obj_dict_init(o, n_args);
555
556
    return o;
}
557
558

uint mp_obj_dict_len(mp_obj_t self_in) {
John R. Lenton's avatar
John R. Lenton committed
559
    return ((mp_obj_dict_t *)self_in)->map.used;
560
561
562
}

mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {
563
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
564
    mp_obj_dict_t *self = self_in;
565
    mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
566
567
    return self_in;
}
568

569
570
571
572
573
574
575
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;
}

576
mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) {
577
    assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
578
579
580
    mp_obj_dict_t *self = self_in;
    return &self->map;
}