objdict.c 21.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.
 */

27
28
29
#include <string.h>
#include <assert.h>

30
31
32
33
34
#include "py/nlr.h"
#include "py/obj.h"
#include "py/runtime0.h"
#include "py/runtime.h"
#include "py/builtin.h"
35
36
37
#include "py/objtype.h"

#define MP_OBJ_IS_DICT_TYPE(o) (MP_OBJ_IS_OBJ(o) && ((mp_obj_base_t*)o)->type->make_new == dict_make_new)
38

39
STATIC mp_obj_t dict_update(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwargs);
John R. Lenton's avatar
John R. Lenton committed
40

41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
// This is a helper function to iterate through a dictionary.  The state of
// the iteration is held in *cur and should be initialised with zero for the
// first call.  Will return NULL when no more elements are available.
STATIC mp_map_elem_t *dict_iter_next(mp_obj_dict_t *dict, mp_uint_t *cur) {
    mp_uint_t max = dict->map.alloc;
    mp_map_t *map = &dict->map;

    for (mp_uint_t i = *cur; i < max; i++) {
        if (MP_MAP_SLOT_IS_FILLED(map, i)) {
            *cur = i + 1;
            return &(map->table[i]);
        }
    }

    return NULL;
}

58
STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
59
    mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
60
    bool first = true;
61
62
63
    if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) {
        kind = PRINT_REPR;
    }
64
    if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict) {
65
        mp_printf(print, "%q(", self->base.type->name);
66
    }
67
    mp_print_str(print, "{");
68
    mp_uint_t cur = 0;
John R. Lenton's avatar
John R. Lenton committed
69
    mp_map_elem_t *next = NULL;
70
    while ((next = dict_iter_next(self, &cur)) != NULL) {
John R. Lenton's avatar
John R. Lenton committed
71
        if (!first) {
72
            mp_print_str(print, ", ");
73
        }
John R. Lenton's avatar
John R. Lenton committed
74
        first = false;
75
76
77
        mp_obj_print_helper(print, next->key, kind);
        mp_print_str(print, ": ");
        mp_obj_print_helper(print, next->value, kind);
78
    }
79
    mp_print_str(print, "}");
80
    if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict) {
81
        mp_print_str(print, ")");
82
    }
83
84
}

85
STATIC mp_obj_t dict_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
86
87
88
    mp_obj_t dict_out = mp_obj_new_dict(0);
    mp_obj_dict_t *dict = MP_OBJ_CAST(dict_out);
    dict->base.type = MP_OBJ_CAST(type_in);
89
    #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
90
    if (MP_OBJ_CAST(type_in) == &mp_type_ordereddict) {
91
92
93
        dict->map.is_ordered = 1;
    }
    #endif
94
    if (n_args > 0 || n_kw > 0) {
95
        mp_obj_t args2[2] = {dict_out, args[0]}; // args[0] is always valid, even if it's not a positional arg
96
97
98
        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
99
    }
100
    return dict_out;
101
102
}

103
STATIC mp_obj_t dict_unary_op(mp_uint_t op, mp_obj_t self_in) {
104
    mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
105
    switch (op) {
106
        case MP_UNARY_OP_BOOL: return mp_obj_new_bool(self->map.used != 0);
107
        case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->map.used);
108
        default: return MP_OBJ_NULL; // op not supported
109
110
111
    }
}

112
STATIC mp_obj_t dict_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
113
    mp_obj_dict_t *o = MP_OBJ_CAST(lhs_in);
114
    switch (op) {
115
        case MP_BINARY_OP_IN: {
116
            mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
117
            return mp_obj_new_bool(elem != NULL);
118
        }
119
        case MP_BINARY_OP_EQUAL: {
120
121
122
123
124
125
            #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
            if (MP_UNLIKELY(MP_OBJ_IS_TYPE(lhs_in, &mp_type_ordereddict) && MP_OBJ_IS_TYPE(rhs_in, &mp_type_ordereddict))) {
                //TODO: implement
                return MP_OBJ_NULL;
            } else
            #endif
126
            if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_dict)) {
127
                mp_obj_dict_t *rhs = MP_OBJ_CAST(rhs_in);
128
129
130
131
                if (o->map.used != rhs->map.used) {
                    return mp_const_false;
                }

132
133
134
135
136
137
                mp_uint_t cur = 0;
                mp_map_elem_t *next = NULL;
                while ((next = dict_iter_next(o, &cur)) != NULL) {
                    mp_map_elem_t *elem = mp_map_lookup(&rhs->map, next->key, MP_MAP_LOOKUP);
                    if (elem == NULL || !mp_obj_equal(next->value, elem->value)) {
                        return mp_const_false;
138
139
140
                    }
                }
                return mp_const_true;
141
142
143
            } else {
                // dict is not equal to instance of any other type
                return mp_const_false;
144
145
            }
        }
146
147
        default:
            // op not supported
148
            return MP_OBJ_NULL;
149
150
151
    }
}

152
153
// TODO: Make sure this is inlined in dict_subscr() below.
mp_obj_t mp_obj_dict_get(mp_obj_t self_in, mp_obj_t index) {
154
    mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
155
156
157
158
159
160
161
162
    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;
    }
}

163
STATIC mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
164
    if (value == MP_OBJ_NULL) {
165
        // delete
166
        mp_obj_dict_delete(self_in, index);
167
168
169
        return mp_const_none;
    } else if (value == MP_OBJ_SENTINEL) {
        // load
170
        mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
171
172
173
174
175
176
        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;
        }
177
    } else {
178
        // store
179
        mp_obj_dict_store(self_in, index, value);
180
        return mp_const_none;
181
182
    }
}
John R. Lenton's avatar
John R. Lenton committed
183
184
185
186
187
188

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

typedef struct _mp_obj_dict_it_t {
    mp_obj_base_t base;
189
    mp_obj_t dict;
190
    mp_uint_t cur;
John R. Lenton's avatar
John R. Lenton committed
191
192
} mp_obj_dict_it_t;

193
STATIC mp_obj_t dict_it_iternext(mp_obj_t self_in) {
194
195
    mp_obj_dict_it_t *self = MP_OBJ_CAST(self_in);
    mp_map_elem_t *next = dict_iter_next(MP_OBJ_CAST(self->dict), &self->cur);
John R. Lenton's avatar
John R. Lenton committed
196

197
    if (next == NULL) {
198
        return MP_OBJ_STOP_ITERATION;
199
200
    } else {
        return next->key;
John R. Lenton's avatar
John R. Lenton committed
201
202
203
    }
}

204
STATIC const mp_obj_type_t mp_type_dict_it = {
205
    { &mp_type_type },
206
    .name = MP_QSTR_iterator,
207
    .getiter = mp_identity,
John R. Lenton's avatar
John R. Lenton committed
208
209
210
    .iternext = dict_it_iternext,
};

211
212
213
STATIC mp_obj_t dict_getiter(mp_obj_t self_in) {
    mp_obj_t o_out = m_new_obj(mp_obj_dict_it_t);
    mp_obj_dict_it_t *o = MP_OBJ_CAST(o_out);
214
    o->base.type = &mp_type_dict_it;
215
    o->dict = self_in;
216
    o->cur = 0;
217
    return o_out;
John R. Lenton's avatar
John R. Lenton committed
218
219
220
221
222
}

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

223
STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
224
    assert(MP_OBJ_IS_DICT_TYPE(self_in));
225
    mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
John R. Lenton's avatar
John R. Lenton committed
226
227
228
229
230

    mp_map_clear(&self->map);

    return mp_const_none;
}
231
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
232

233
STATIC mp_obj_t dict_copy(mp_obj_t self_in) {
234
    assert(MP_OBJ_IS_DICT_TYPE(self_in));
235
236
237
    mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
    mp_obj_t other_out = mp_obj_new_dict(self->map.alloc);
    mp_obj_dict_t *other = MP_OBJ_CAST(other_out);
238
    other->base.type = self->base.type;
John R. Lenton's avatar
John R. Lenton committed
239
    other->map.used = self->map.used;
240
    other->map.all_keys_are_qstrs = self->map.all_keys_are_qstrs;
241
242
    other->map.is_fixed = 0;
    other->map.is_ordered = self->map.is_ordered;
John R. Lenton's avatar
John R. Lenton committed
243
    memcpy(other->map.table, self->map.table, self->map.alloc * sizeof(mp_map_elem_t));
244
    return other_out;
John R. Lenton's avatar
John R. Lenton committed
245
}
246
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy);
John R. Lenton's avatar
John R. Lenton committed
247

248
// this is a classmethod
249
STATIC mp_obj_t dict_fromkeys(mp_uint_t n_args, const mp_obj_t *args) {
250
    assert(2 <= n_args && n_args <= 3);
Damien George's avatar
Damien George committed
251
    mp_obj_t iter = mp_getiter(args[1]);
252
253
254
    mp_obj_t len = mp_obj_len_maybe(iter);
    mp_obj_t value = mp_const_none;
    mp_obj_t next = NULL;
255
    mp_obj_t self_out;
256
257
258
259
260
261
262

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

    if (len == MP_OBJ_NULL) {
        /* object's type doesn't have a __len__ slot */
263
        self_out = mp_obj_new_dict(0);
264
    } else {
265
        self_out = mp_obj_new_dict(MP_OBJ_SMALL_INT_VALUE(len));
266
267
    }

268
    mp_obj_dict_t *self = MP_OBJ_CAST(self_out);
269
    while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
270
271
272
        mp_map_lookup(&self->map, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
    }

273
    return self_out;
274
}
275
276
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);
277

278
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) {
279
    mp_map_elem_t *elem = mp_map_lookup(self, key, lookup_kind);
John R. Lenton's avatar
John R. Lenton committed
280
    mp_obj_t value;
281
282
    if (elem == NULL || elem->value == MP_OBJ_NULL) {
        if (deflt == MP_OBJ_NULL) {
283
            if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
284
                nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
John R. Lenton's avatar
John R. Lenton committed
285
            } else {
John R. Lenton's avatar
John R. Lenton committed
286
                value = mp_const_none;
John R. Lenton's avatar
John R. Lenton committed
287
288
            }
        } else {
John R. Lenton's avatar
John R. Lenton committed
289
            value = deflt;
John R. Lenton's avatar
John R. Lenton committed
290
        }
291
292
293
        if (lookup_kind == MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
            elem->value = value;
        }
John R. Lenton's avatar
John R. Lenton committed
294
    } else {
John R. Lenton's avatar
John R. Lenton committed
295
        value = elem->value;
296
297
298
        if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
            elem->value = MP_OBJ_NULL; // so that GC can collect the deleted value
        }
John R. Lenton's avatar
John R. Lenton committed
299
300
    }
    return value;
John R. Lenton's avatar
John R. Lenton committed
301
302
}

303
STATIC mp_obj_t dict_get(mp_uint_t n_args, const mp_obj_t *args) {
John R. Lenton's avatar
John R. Lenton committed
304
    assert(2 <= n_args && n_args <= 3);
305
    assert(MP_OBJ_IS_DICT_TYPE(args[0]));
John R. Lenton's avatar
John R. Lenton committed
306

John R. Lenton's avatar
John R. Lenton committed
307
308
    return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
                           args[1],
309
                           n_args == 3 ? args[2] : MP_OBJ_NULL,
310
                           MP_MAP_LOOKUP);
John R. Lenton's avatar
John R. Lenton committed
311
}
312
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get);
John R. Lenton's avatar
John R. Lenton committed
313

314
STATIC mp_obj_t dict_pop(mp_uint_t n_args, const mp_obj_t *args) {
John R. Lenton's avatar
John R. Lenton committed
315
    assert(2 <= n_args && n_args <= 3);
316
    assert(MP_OBJ_IS_DICT_TYPE(args[0]));
John R. Lenton's avatar
John R. Lenton committed
317
318
319

    return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
                           args[1],
320
                           n_args == 3 ? args[2] : MP_OBJ_NULL,
321
                           MP_MAP_LOOKUP_REMOVE_IF_FOUND);
John R. Lenton's avatar
John R. Lenton committed
322
}
323
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop);
John R. Lenton's avatar
John R. Lenton committed
324
325


326
STATIC mp_obj_t dict_setdefault(mp_uint_t n_args, const mp_obj_t *args) {
John R. Lenton's avatar
John R. Lenton committed
327
    assert(2 <= n_args && n_args <= 3);
328
    assert(MP_OBJ_IS_DICT_TYPE(args[0]));
John R. Lenton's avatar
John R. Lenton committed
329
330
331

    return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
                           args[1],
332
                           n_args == 3 ? args[2] : MP_OBJ_NULL,
333
                           MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
John R. Lenton's avatar
John R. Lenton committed
334
}
335
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_setdefault_obj, 2, 3, dict_setdefault);
John R. Lenton's avatar
John R. Lenton committed
336

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

338
STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
339
    assert(MP_OBJ_IS_DICT_TYPE(self_in));
340
    mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
341
342
343
    mp_uint_t cur = 0;
    mp_map_elem_t *next = dict_iter_next(self, &cur);
    if (next == NULL) {
344
        nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "popitem(): dictionary is empty"));
John R. Lenton's avatar
John R. Lenton committed
345
346
347
    }
    self->map.used--;
    mp_obj_t items[] = {next->key, next->value};
348
349
    next->key = MP_OBJ_SENTINEL; // must mark key as sentinel to indicate that it was deleted
    next->value = MP_OBJ_NULL;
John R. Lenton's avatar
John R. Lenton committed
350
351
352
353
    mp_obj_t tuple = mp_obj_new_tuple(2, items);

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

356
STATIC mp_obj_t dict_update(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
357
    assert(MP_OBJ_IS_DICT_TYPE(args[0]));
358
    mp_obj_dict_t *self = MP_OBJ_CAST(args[0]);
359
360
361
362
363
364

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

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

365
        if (MP_OBJ_IS_DICT_TYPE(args[1])) {
366
            // update from other dictionary (make sure other is not self)
367
            if (args[1] != args[0]) {
368
                mp_uint_t cur = 0;
369
                mp_map_elem_t *elem = NULL;
370
                while ((elem = dict_iter_next((mp_obj_dict_t*)args[1], &cur)) != NULL) {
371
372
373
                    mp_map_lookup(&self->map, elem->key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = elem->value;
                }
            }
374
        } else {
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
            // 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
397
    for (mp_uint_t i = 0; i < kwargs->alloc; i++) {
398
399
        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;
400
401
402
403
404
        }
    }

    return mp_const_none;
}
405
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(dict_update_obj, 1, dict_update);
406

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

408
409
410
/******************************************************************************/
/* dict views                                                                 */

411
412
STATIC const mp_obj_type_t dict_view_type;
STATIC const mp_obj_type_t dict_view_it_type;
413
414
415
416
417
418
419

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

420
STATIC char *mp_dict_view_names[] = {"dict_items", "dict_keys", "dict_values"};
421
422
423
424

typedef struct _mp_obj_dict_view_it_t {
    mp_obj_base_t base;
    mp_dict_view_kind_t kind;
425
    mp_obj_t dict;
426
    mp_uint_t cur;
427
428
429
430
} mp_obj_dict_view_it_t;

typedef struct _mp_obj_dict_view_t {
    mp_obj_base_t base;
431
    mp_obj_t dict;
432
433
434
    mp_dict_view_kind_t kind;
} mp_obj_dict_view_t;

435
STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
436
    assert(MP_OBJ_IS_TYPE(self_in, &dict_view_it_type));
437
438
    mp_obj_dict_view_it_t *self = MP_OBJ_CAST(self_in);
    mp_map_elem_t *next = dict_iter_next(MP_OBJ_CAST(self->dict), &self->cur);
439

440
441
442
    if (next == NULL) {
        return MP_OBJ_STOP_ITERATION;
    } else {
443
        switch (self->kind) {
444
            case MP_DICT_VIEW_ITEMS:
445
            default: {
446
447
448
449
450
451
452
                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;
453
454
455
456
        }
    }
}

457
STATIC const mp_obj_type_t dict_view_it_type = {
458
    { &mp_type_type },
459
    .name = MP_QSTR_iterator,
460
    .getiter = mp_identity,
461
462
463
    .iternext = dict_view_it_iternext,
};

464
STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in) {
465
    assert(MP_OBJ_IS_TYPE(view_in, &dict_view_type));
466
467
468
    mp_obj_dict_view_t *view = MP_OBJ_CAST(view_in);
    mp_obj_t o_out = m_new_obj(mp_obj_dict_view_it_t);
    mp_obj_dict_view_it_t *o = MP_OBJ_CAST(o_out);
469
470
    o->base.type = &dict_view_it_type;
    o->kind = view->kind;
471
472
    o->dict = view->dict;
    o->cur = 0;
473
    return o_out;
474
475
}

476
STATIC void dict_view_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
477
    (void)kind;
478
    assert(MP_OBJ_IS_TYPE(self_in, &dict_view_type));
479
    mp_obj_dict_view_t *self = MP_OBJ_CAST(self_in);
480
    bool first = true;
481
482
    mp_print_str(print, mp_dict_view_names[self->kind]);
    mp_print_str(print, "([");
483
484
    mp_obj_t self_iter = dict_view_getiter(self_in);
    mp_obj_t next = MP_OBJ_NULL;
485
    while ((next = dict_view_it_iternext(self_iter)) != MP_OBJ_STOP_ITERATION) {
486
        if (!first) {
487
            mp_print_str(print, ", ");
488
489
        }
        first = false;
490
        mp_obj_print_helper(print, next, PRINT_REPR);
491
    }
492
    mp_print_str(print, "])");
493
494
}

495
STATIC mp_obj_t dict_view_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
496
    // only supported for the 'keys' kind until sets and dicts are refactored
497
    mp_obj_dict_view_t *o = MP_OBJ_CAST(lhs_in);
498
    if (o->kind != MP_DICT_VIEW_KEYS) {
499
        return MP_OBJ_NULL; // op not supported
500
501
    }
    if (op != MP_BINARY_OP_IN) {
502
        return MP_OBJ_NULL; // op not supported
503
    }
504
505
506
    return dict_binary_op(op, o->dict, rhs_in);
}

507
STATIC const mp_obj_type_t dict_view_type = {
508
    { &mp_type_type },
509
    .name = MP_QSTR_dict_view,
510
    .print = dict_view_print,
511
    .binary_op = dict_view_binary_op,
512
513
514
    .getiter = dict_view_getiter,
};

515
516
517
STATIC mp_obj_t mp_obj_new_dict_view(mp_obj_t dict, mp_dict_view_kind_t kind) {
    mp_obj_t o_out = m_new_obj(mp_obj_dict_view_t);
    mp_obj_dict_view_t *o = MP_OBJ_CAST(o_out);
518
519
520
    o->base.type = &dict_view_type;
    o->dict = dict;
    o->kind = kind;
521
    return o_out;
522
523
}

524
STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) {
525
    assert(MP_OBJ_IS_DICT_TYPE(self_in));
526
    return mp_obj_new_dict_view(self_in, kind);
527
528
}

529
STATIC mp_obj_t dict_items(mp_obj_t self_in) {
530
531
    return dict_view(self_in, MP_DICT_VIEW_ITEMS);
}
532
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_items_obj, dict_items);
533

534
STATIC mp_obj_t dict_keys(mp_obj_t self_in) {
535
536
    return dict_view(self_in, MP_DICT_VIEW_KEYS);
}
537
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_keys_obj, dict_keys);
538

539
STATIC mp_obj_t dict_values(mp_obj_t self_in) {
540
541
    return dict_view(self_in, MP_DICT_VIEW_VALUES);
}
542
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
543

John R. Lenton's avatar
John R. Lenton committed
544
/******************************************************************************/
545
/* dict constructors & public C API                                           */
John R. Lenton's avatar
John R. Lenton committed
546

547
548
549
550
551
552
553
554
555
556
557
558
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 },
559
    { MP_OBJ_NEW_QSTR(MP_QSTR___getitem__), (mp_obj_t)&mp_op_getitem_obj },
Paul Sokolovsky's avatar
Paul Sokolovsky committed
560
    { MP_OBJ_NEW_QSTR(MP_QSTR___setitem__), (mp_obj_t)&mp_op_setitem_obj },
Paul Sokolovsky's avatar
Paul Sokolovsky committed
561
    { MP_OBJ_NEW_QSTR(MP_QSTR___delitem__), (mp_obj_t)&mp_op_delitem_obj },
562
563
};

564
565
STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);

566
const mp_obj_type_t mp_type_dict = {
567
    { &mp_type_type },
568
    .name = MP_QSTR_dict,
569
570
    .print = dict_print,
    .make_new = dict_make_new,
571
    .unary_op = dict_unary_op,
572
    .binary_op = dict_binary_op,
573
    .subscr = dict_subscr,
John R. Lenton's avatar
John R. Lenton committed
574
    .getiter = dict_getiter,
575
    .locals_dict = (mp_obj_t)&dict_locals_dict,
576
577
};

578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
#if MICROPY_PY_COLLECTIONS_ORDEREDDICT
STATIC const mp_obj_tuple_t ordereddict_base_tuple = {{&mp_type_tuple}, 1, {(mp_obj_t)&mp_type_dict}};

const mp_obj_type_t mp_type_ordereddict = {
    { &mp_type_type },
    .name = MP_QSTR_OrderedDict,
    .print = dict_print,
    .make_new = dict_make_new,
    .unary_op = dict_unary_op,
    .binary_op = dict_binary_op,
    .subscr = dict_subscr,
    .getiter = dict_getiter,
    .bases_tuple = (mp_obj_t)&ordereddict_base_tuple,
    .locals_dict = (mp_obj_t)&dict_locals_dict,
};
#endif

595
void mp_obj_dict_init(mp_obj_dict_t *dict, mp_uint_t n_args) {
596
597
598
599
    dict->base.type = &mp_type_dict;
    mp_map_init(&dict->map, n_args);
}

600
mp_obj_t mp_obj_new_dict(mp_uint_t n_args) {
601
602
    mp_obj_t o_out = m_new_obj(mp_obj_dict_t);
    mp_obj_dict_t *o = MP_OBJ_CAST(o_out);
603
    mp_obj_dict_init(o, n_args);
604
    return o_out;
605
}
606

607
mp_uint_t mp_obj_dict_len(mp_obj_t self_in) {
608
609
    mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
    return self->map.used;
610
611
612
}

mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {
613
    assert(MP_OBJ_IS_DICT_TYPE(self_in));
614
    mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
615
    mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
616
617
    return self_in;
}
618

619
mp_obj_t mp_obj_dict_delete(mp_obj_t self_in, mp_obj_t key) {
620
    assert(MP_OBJ_IS_DICT_TYPE(self_in));
621
    mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
622
    dict_get_helper(&self->map, key, MP_OBJ_NULL, MP_MAP_LOOKUP_REMOVE_IF_FOUND);
623
624
625
    return self_in;
}

626
mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) {
627
    assert(MP_OBJ_IS_DICT_TYPE(self_in));
628
    mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
629
630
    return &self->map;
}