blob: 3e255ec8830b36c46ca8a2432de948411d18bfbe [file] [log] [blame]
Damien George04b91472014-05-03 23:27:38 +01001/*
2 * This file is part of the Micro Python project, http://micropython.org/
3 *
4 * The MIT License (MIT)
5 *
6 * Copyright (c) 2013, 2014 Damien P. George
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a copy
9 * of this software and associated documentation files (the "Software"), to deal
10 * in the Software without restriction, including without limitation the rights
11 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12 * copies of the Software, and to permit persons to whom the Software is
13 * furnished to do so, subject to the following conditions:
14 *
15 * The above copyright notice and this permission notice shall be included in
16 * all copies or substantial portions of the Software.
17 *
18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24 * THE SOFTWARE.
25 */
26
Damiend99b0522013-12-21 18:17:45 +000027#include <string.h>
28#include <assert.h>
29
Damien George51dfcb42015-01-01 20:27:54 +000030#include "py/nlr.h"
31#include "py/obj.h"
32#include "py/runtime0.h"
33#include "py/runtime.h"
34#include "py/builtin.h"
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +020035#include "py/objtype.h"
36
37#define MP_OBJ_IS_DICT_TYPE(o) (MP_OBJ_IS_OBJ(o) && ((mp_obj_base_t*)o)->type->make_new == dict_make_new)
Damiend99b0522013-12-21 18:17:45 +000038
Damien George93965e72014-08-30 13:23:35 +010039STATIC mp_obj_t dict_update(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwargs);
John R. Lentona41fe312014-01-06 17:17:02 +000040
Damien George8a9b9992014-09-17 15:53:03 +010041// This is a helper function to iterate through a dictionary. The state of
42// the iteration is held in *cur and should be initialised with zero for the
43// first call. Will return NULL when no more elements are available.
44STATIC mp_map_elem_t *dict_iter_next(mp_obj_dict_t *dict, mp_uint_t *cur) {
45 mp_uint_t max = dict->map.alloc;
46 mp_map_t *map = &dict->map;
47
48 for (mp_uint_t i = *cur; i < max; i++) {
49 if (MP_MAP_SLOT_IS_FILLED(map, i)) {
50 *cur = i + 1;
51 return &(map->table[i]);
52 }
53 }
54
55 return NULL;
56}
57
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020058STATIC void dict_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
Paul Sokolovsky0090c712015-03-26 12:28:31 +020059 mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
Damiend99b0522013-12-21 18:17:45 +000060 bool first = true;
Damien George612045f2014-09-17 22:56:34 +010061 if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) {
62 kind = PRINT_REPR;
63 }
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +020064 if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict) {
65 print(env, "%s(", qstr_str(self->base.type->name));
66 }
Damiend99b0522013-12-21 18:17:45 +000067 print(env, "{");
Damien George8a9b9992014-09-17 15:53:03 +010068 mp_uint_t cur = 0;
John R. Lentona41fe312014-01-06 17:17:02 +000069 mp_map_elem_t *next = NULL;
Damien George8a9b9992014-09-17 15:53:03 +010070 while ((next = dict_iter_next(self, &cur)) != NULL) {
John R. Lentona41fe312014-01-06 17:17:02 +000071 if (!first) {
72 print(env, ", ");
Damiend99b0522013-12-21 18:17:45 +000073 }
John R. Lentona41fe312014-01-06 17:17:02 +000074 first = false;
Damien George612045f2014-09-17 22:56:34 +010075 mp_obj_print_helper(print, env, next->key, kind);
John R. Lentona41fe312014-01-06 17:17:02 +000076 print(env, ": ");
Damien George612045f2014-09-17 22:56:34 +010077 mp_obj_print_helper(print, env, next->value, kind);
Damiend99b0522013-12-21 18:17:45 +000078 }
79 print(env, "}");
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +020080 if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict) {
81 print(env, ")");
82 }
Damiend99b0522013-12-21 18:17:45 +000083}
84
Damien Georgeecc88e92014-08-30 00:35:11 +010085STATIC 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) {
Paul Sokolovsky0090c712015-03-26 12:28:31 +020086 mp_obj_t dict_out = mp_obj_new_dict(0);
87 mp_obj_dict_t *dict = MP_OBJ_CAST(dict_out);
88 dict->base.type = MP_OBJ_CAST(type_in);
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +020089 #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
Paul Sokolovsky0090c712015-03-26 12:28:31 +020090 if (MP_OBJ_CAST(type_in) == &mp_type_ordereddict) {
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +020091 dict->map.is_ordered = 1;
92 }
93 #endif
Damien Georgebcb6ca42014-06-03 12:53:44 +010094 if (n_args > 0 || n_kw > 0) {
Paul Sokolovsky0090c712015-03-26 12:28:31 +020095 mp_obj_t args2[2] = {dict_out, args[0]}; // args[0] is always valid, even if it's not a positional arg
Damien Georgebcb6ca42014-06-03 12:53:44 +010096 mp_map_t kwargs;
97 mp_map_init_fixed_table(&kwargs, n_kw, args + n_args);
98 dict_update(n_args + 1, args2, &kwargs); // dict_update will check that n_args + 1 == 1 or 2
Damien Georged7aadcf2014-04-04 15:08:00 +010099 }
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200100 return dict_out;
Damien George71c51812014-01-04 20:21:15 +0000101}
102
Damien Georgeecc88e92014-08-30 00:35:11 +0100103STATIC mp_obj_t dict_unary_op(mp_uint_t op, mp_obj_t self_in) {
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200104 mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
Damien George4e8dc8c2014-01-27 23:15:32 +0000105 switch (op) {
Damien Georged17926d2014-03-30 13:35:08 +0100106 case MP_UNARY_OP_BOOL: return MP_BOOL(self->map.used != 0);
Damien Georgebb4c6f32014-07-31 10:49:14 +0100107 case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->map.used);
Damien George6ac5dce2014-05-21 19:42:43 +0100108 default: return MP_OBJ_NULL; // op not supported
Damien George4e8dc8c2014-01-27 23:15:32 +0000109 }
110}
111
Damien Georgeecc88e92014-08-30 00:35:11 +0100112STATIC mp_obj_t dict_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200113 mp_obj_dict_t *o = MP_OBJ_CAST(lhs_in);
Damiend99b0522013-12-21 18:17:45 +0000114 switch (op) {
Damien George729f7b42014-04-17 22:10:53 +0100115 case MP_BINARY_OP_IN: {
John R. Lentonc1bef212014-01-11 12:39:33 +0000116 mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
Damien George9aa2a522014-02-01 23:04:09 +0000117 return MP_BOOL(elem != NULL);
John R. Lentonc1bef212014-01-11 12:39:33 +0000118 }
Paul Sokolovsky7cf057a2014-04-06 21:20:52 +0300119 case MP_BINARY_OP_EQUAL: {
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200120 #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
121 if (MP_UNLIKELY(MP_OBJ_IS_TYPE(lhs_in, &mp_type_ordereddict) && MP_OBJ_IS_TYPE(rhs_in, &mp_type_ordereddict))) {
122 //TODO: implement
123 return MP_OBJ_NULL;
124 } else
125 #endif
Paul Sokolovsky7cf057a2014-04-06 21:20:52 +0300126 if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_dict)) {
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200127 mp_obj_dict_t *rhs = MP_OBJ_CAST(rhs_in);
Paul Sokolovsky7cf057a2014-04-06 21:20:52 +0300128 if (o->map.used != rhs->map.used) {
129 return mp_const_false;
130 }
131
Damien George8a9b9992014-09-17 15:53:03 +0100132 mp_uint_t cur = 0;
133 mp_map_elem_t *next = NULL;
134 while ((next = dict_iter_next(o, &cur)) != NULL) {
135 mp_map_elem_t *elem = mp_map_lookup(&rhs->map, next->key, MP_MAP_LOOKUP);
136 if (elem == NULL || !mp_obj_equal(next->value, elem->value)) {
137 return mp_const_false;
Paul Sokolovsky7cf057a2014-04-06 21:20:52 +0300138 }
139 }
140 return mp_const_true;
Damien Georgee22d76e2014-04-11 10:52:06 +0000141 } else {
142 // dict is not equal to instance of any other type
143 return mp_const_false;
Paul Sokolovsky7cf057a2014-04-06 21:20:52 +0300144 }
145 }
Damiend99b0522013-12-21 18:17:45 +0000146 default:
147 // op not supported
Damien George6ac5dce2014-05-21 19:42:43 +0100148 return MP_OBJ_NULL;
Damiend99b0522013-12-21 18:17:45 +0000149 }
150}
151
Paul Sokolovsky75ce9252014-06-05 20:02:15 +0300152// TODO: Make sure this is inlined in dict_subscr() below.
153mp_obj_t mp_obj_dict_get(mp_obj_t self_in, mp_obj_t index) {
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200154 mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
Paul Sokolovsky75ce9252014-06-05 20:02:15 +0300155 mp_map_elem_t *elem = mp_map_lookup(&self->map, index, MP_MAP_LOOKUP);
156 if (elem == NULL) {
157 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
158 } else {
159 return elem->value;
160 }
161}
162
Damien George729f7b42014-04-17 22:10:53 +0100163STATIC mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
Damien Georgef4c9b332014-04-08 21:32:29 +0100164 if (value == MP_OBJ_NULL) {
Damien George729f7b42014-04-17 22:10:53 +0100165 // delete
Damien Georgef4c9b332014-04-08 21:32:29 +0100166 mp_obj_dict_delete(self_in, index);
Damien George729f7b42014-04-17 22:10:53 +0100167 return mp_const_none;
168 } else if (value == MP_OBJ_SENTINEL) {
169 // load
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200170 mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
Damien George729f7b42014-04-17 22:10:53 +0100171 mp_map_elem_t *elem = mp_map_lookup(&self->map, index, MP_MAP_LOOKUP);
172 if (elem == NULL) {
173 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
174 } else {
175 return elem->value;
176 }
Damien Georgef4c9b332014-04-08 21:32:29 +0100177 } else {
Damien George729f7b42014-04-17 22:10:53 +0100178 // store
Damien Georgef4c9b332014-04-08 21:32:29 +0100179 mp_obj_dict_store(self_in, index, value);
Damien George729f7b42014-04-17 22:10:53 +0100180 return mp_const_none;
Damien Georgef4c9b332014-04-08 21:32:29 +0100181 }
Damien Georgef4c9b332014-04-08 21:32:29 +0100182}
John R. Lentona41fe312014-01-06 17:17:02 +0000183
184/******************************************************************************/
185/* dict iterator */
186
187typedef struct _mp_obj_dict_it_t {
188 mp_obj_base_t base;
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200189 mp_obj_t dict;
Damien George40f3c022014-07-03 13:25:24 +0100190 mp_uint_t cur;
John R. Lentona41fe312014-01-06 17:17:02 +0000191} mp_obj_dict_it_t;
192
Damien George8a9b9992014-09-17 15:53:03 +0100193STATIC mp_obj_t dict_it_iternext(mp_obj_t self_in) {
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200194 mp_obj_dict_it_t *self = MP_OBJ_CAST(self_in);
195 mp_map_elem_t *next = dict_iter_next(MP_OBJ_CAST(self->dict), &self->cur);
John R. Lentona41fe312014-01-06 17:17:02 +0000196
Damien George8a9b9992014-09-17 15:53:03 +0100197 if (next == NULL) {
Damien Georgeea8d06c2014-04-17 23:19:36 +0100198 return MP_OBJ_STOP_ITERATION;
Damien George8a9b9992014-09-17 15:53:03 +0100199 } else {
200 return next->key;
John R. Lentona41fe312014-01-06 17:17:02 +0000201 }
202}
203
Damien George3e1a5c12014-03-29 13:43:38 +0000204STATIC const mp_obj_type_t mp_type_dict_it = {
Damien Georgec5966122014-02-15 16:10:44 +0000205 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +0000206 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +0300207 .getiter = mp_identity,
John R. Lentona41fe312014-01-06 17:17:02 +0000208 .iternext = dict_it_iternext,
John R. Lentona41fe312014-01-06 17:17:02 +0000209};
210
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200211STATIC mp_obj_t dict_getiter(mp_obj_t self_in) {
212 mp_obj_t o_out = m_new_obj(mp_obj_dict_it_t);
213 mp_obj_dict_it_t *o = MP_OBJ_CAST(o_out);
Damien George3e1a5c12014-03-29 13:43:38 +0000214 o->base.type = &mp_type_dict_it;
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200215 o->dict = self_in;
Damien George8a9b9992014-09-17 15:53:03 +0100216 o->cur = 0;
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200217 return o_out;
John R. Lentona41fe312014-01-06 17:17:02 +0000218}
219
John R. Lentona41fe312014-01-06 17:17:02 +0000220/******************************************************************************/
221/* dict methods */
222
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200223STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200224 assert(MP_OBJ_IS_DICT_TYPE(self_in));
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200225 mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
John R. Lenton4ce6cea2014-01-06 17:38:47 +0000226
227 mp_map_clear(&self->map);
228
229 return mp_const_none;
230}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200231STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
John R. Lenton7d21d512014-01-06 17:54:04 +0000232
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200233STATIC mp_obj_t dict_copy(mp_obj_t self_in) {
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200234 assert(MP_OBJ_IS_DICT_TYPE(self_in));
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200235 mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
236 mp_obj_t other_out = mp_obj_new_dict(self->map.alloc);
237 mp_obj_dict_t *other = MP_OBJ_CAST(other_out);
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200238 other->base.type = self->base.type;
John R. Lentond90b19e2014-01-06 18:11:20 +0000239 other->map.used = self->map.used;
Paul Sokolovsky5fedd0c2014-04-06 21:00:58 +0300240 other->map.all_keys_are_qstrs = self->map.all_keys_are_qstrs;
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200241 other->map.is_fixed = 0;
242 other->map.is_ordered = self->map.is_ordered;
John R. Lentond90b19e2014-01-06 18:11:20 +0000243 memcpy(other->map.table, self->map.table, self->map.alloc * sizeof(mp_map_elem_t));
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200244 return other_out;
John R. Lentond90b19e2014-01-06 18:11:20 +0000245}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200246STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy);
John R. Lenton4ce6cea2014-01-06 17:38:47 +0000247
Damien Georgeeae16442014-01-11 19:22:29 +0000248// this is a classmethod
Damien George93965e72014-08-30 13:23:35 +0100249STATIC mp_obj_t dict_fromkeys(mp_uint_t n_args, const mp_obj_t *args) {
Damien Georgeeae16442014-01-11 19:22:29 +0000250 assert(2 <= n_args && n_args <= 3);
Damien Georged17926d2014-03-30 13:35:08 +0100251 mp_obj_t iter = mp_getiter(args[1]);
Damien Georgeeae16442014-01-11 19:22:29 +0000252 mp_obj_t len = mp_obj_len_maybe(iter);
253 mp_obj_t value = mp_const_none;
254 mp_obj_t next = NULL;
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200255 mp_obj_t self_out;
Damien Georgeeae16442014-01-11 19:22:29 +0000256
257 if (n_args > 2) {
258 value = args[2];
259 }
260
261 if (len == MP_OBJ_NULL) {
262 /* object's type doesn't have a __len__ slot */
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200263 self_out = mp_obj_new_dict(0);
Damien Georgeeae16442014-01-11 19:22:29 +0000264 } else {
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200265 self_out = mp_obj_new_dict(MP_OBJ_SMALL_INT_VALUE(len));
Damien Georgeeae16442014-01-11 19:22:29 +0000266 }
267
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200268 mp_obj_dict_t *self = MP_OBJ_CAST(self_out);
Damien Georgeea8d06c2014-04-17 23:19:36 +0100269 while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
Damien Georgeeae16442014-01-11 19:22:29 +0000270 mp_map_lookup(&self->map, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
271 }
272
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200273 return self_out;
Damien Georgeeae16442014-01-11 19:22:29 +0000274}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200275STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_fromkeys_fun_obj, 2, 3, dict_fromkeys);
276STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(dict_fromkeys_obj, (const mp_obj_t)&dict_fromkeys_fun_obj);
Damien Georgeeae16442014-01-11 19:22:29 +0000277
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200278STATIC 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) {
Damien George38a2da62014-01-08 17:33:12 +0000279 mp_map_elem_t *elem = mp_map_lookup(self, key, lookup_kind);
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000280 mp_obj_t value;
Damien George8a9b9992014-09-17 15:53:03 +0100281 if (elem == NULL || elem->value == MP_OBJ_NULL) {
282 if (deflt == MP_OBJ_NULL) {
Damien George38a2da62014-01-08 17:33:12 +0000283 if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
Damien Georgeea13f402014-04-05 18:32:08 +0100284 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000285 } else {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000286 value = mp_const_none;
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000287 }
288 } else {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000289 value = deflt;
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000290 }
Damien George8a9b9992014-09-17 15:53:03 +0100291 if (lookup_kind == MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
292 elem->value = value;
293 }
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000294 } else {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000295 value = elem->value;
Damien George8a9b9992014-09-17 15:53:03 +0100296 if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
297 elem->value = MP_OBJ_NULL; // so that GC can collect the deleted value
298 }
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000299 }
300 return value;
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000301}
302
Damien George93965e72014-08-30 13:23:35 +0100303STATIC mp_obj_t dict_get(mp_uint_t n_args, const mp_obj_t *args) {
John R. Lentoncd088732014-01-06 18:53:16 +0000304 assert(2 <= n_args && n_args <= 3);
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200305 assert(MP_OBJ_IS_DICT_TYPE(args[0]));
John R. Lentoncd088732014-01-06 18:53:16 +0000306
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000307 return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
308 args[1],
Damien George8a9b9992014-09-17 15:53:03 +0100309 n_args == 3 ? args[2] : MP_OBJ_NULL,
Damien George38a2da62014-01-08 17:33:12 +0000310 MP_MAP_LOOKUP);
John R. Lentoncd088732014-01-06 18:53:16 +0000311}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200312STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get);
John R. Lentoncd088732014-01-06 18:53:16 +0000313
Damien George93965e72014-08-30 13:23:35 +0100314STATIC mp_obj_t dict_pop(mp_uint_t n_args, const mp_obj_t *args) {
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000315 assert(2 <= n_args && n_args <= 3);
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200316 assert(MP_OBJ_IS_DICT_TYPE(args[0]));
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000317
318 return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
319 args[1],
Damien George8a9b9992014-09-17 15:53:03 +0100320 n_args == 3 ? args[2] : MP_OBJ_NULL,
Damien George38a2da62014-01-08 17:33:12 +0000321 MP_MAP_LOOKUP_REMOVE_IF_FOUND);
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000322}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200323STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop);
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000324
325
Damien George93965e72014-08-30 13:23:35 +0100326STATIC mp_obj_t dict_setdefault(mp_uint_t n_args, const mp_obj_t *args) {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000327 assert(2 <= n_args && n_args <= 3);
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200328 assert(MP_OBJ_IS_DICT_TYPE(args[0]));
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000329
330 return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
331 args[1],
Damien George8a9b9992014-09-17 15:53:03 +0100332 n_args == 3 ? args[2] : MP_OBJ_NULL,
Damien George38a2da62014-01-08 17:33:12 +0000333 MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000334}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200335STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_setdefault_obj, 2, 3, dict_setdefault);
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000336
John R. Lentonf77dce82014-01-06 20:08:52 +0000337
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200338STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200339 assert(MP_OBJ_IS_DICT_TYPE(self_in));
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200340 mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
Damien George8a9b9992014-09-17 15:53:03 +0100341 mp_uint_t cur = 0;
342 mp_map_elem_t *next = dict_iter_next(self, &cur);
343 if (next == NULL) {
Damien Georgeea13f402014-04-05 18:32:08 +0100344 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "popitem(): dictionary is empty"));
John R. Lentonf77dce82014-01-06 20:08:52 +0000345 }
John R. Lentonf77dce82014-01-06 20:08:52 +0000346 self->map.used--;
347 mp_obj_t items[] = {next->key, next->value};
Damien George8a9b9992014-09-17 15:53:03 +0100348 next->key = MP_OBJ_SENTINEL; // must mark key as sentinel to indicate that it was deleted
349 next->value = MP_OBJ_NULL;
John R. Lentonf77dce82014-01-06 20:08:52 +0000350 mp_obj_t tuple = mp_obj_new_tuple(2, items);
351
352 return tuple;
353}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200354STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_popitem_obj, dict_popitem);
John R. Lentonf77dce82014-01-06 20:08:52 +0000355
Damien George93965e72014-08-30 13:23:35 +0100356STATIC mp_obj_t dict_update(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200357 assert(MP_OBJ_IS_DICT_TYPE(args[0]));
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200358 mp_obj_dict_t *self = MP_OBJ_CAST(args[0]);
Damien Georgebcb6ca42014-06-03 12:53:44 +0100359
360 mp_arg_check_num(n_args, kwargs->used, 1, 2, true);
361
362 if (n_args == 2) {
363 // given a positional argument
364
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200365 if (MP_OBJ_IS_DICT_TYPE(args[1])) {
Damien Georgebcb6ca42014-06-03 12:53:44 +0100366 // update from other dictionary (make sure other is not self)
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200367 if (args[1] != args[0]) {
Damien George8a9b9992014-09-17 15:53:03 +0100368 mp_uint_t cur = 0;
Damien Georgebcb6ca42014-06-03 12:53:44 +0100369 mp_map_elem_t *elem = NULL;
Damien George8a9b9992014-09-17 15:53:03 +0100370 while ((elem = dict_iter_next((mp_obj_dict_t*)args[1], &cur)) != NULL) {
Damien Georgebcb6ca42014-06-03 12:53:44 +0100371 mp_map_lookup(&self->map, elem->key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = elem->value;
372 }
373 }
John R. Lenton88f30432014-01-06 22:58:17 +0000374 } else {
Damien Georgebcb6ca42014-06-03 12:53:44 +0100375 // update from a generic iterable of pairs
376 mp_obj_t iter = mp_getiter(args[1]);
377 mp_obj_t next = NULL;
378 while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
379 mp_obj_t inneriter = mp_getiter(next);
380 mp_obj_t key = mp_iternext(inneriter);
381 mp_obj_t value = mp_iternext(inneriter);
382 mp_obj_t stop = mp_iternext(inneriter);
383 if (key == MP_OBJ_STOP_ITERATION
384 || value == MP_OBJ_STOP_ITERATION
385 || stop != MP_OBJ_STOP_ITERATION) {
386 nlr_raise(mp_obj_new_exception_msg(
387 &mp_type_ValueError,
388 "dictionary update sequence has the wrong length"));
389 } else {
390 mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
391 }
392 }
393 }
394 }
395
396 // update the dict with any keyword args
Damien George40f3c022014-07-03 13:25:24 +0100397 for (mp_uint_t i = 0; i < kwargs->alloc; i++) {
Damien Georgebcb6ca42014-06-03 12:53:44 +0100398 if (MP_MAP_SLOT_IS_FILLED(kwargs, i)) {
399 mp_map_lookup(&self->map, kwargs->table[i].key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = kwargs->table[i].value;
John R. Lenton88f30432014-01-06 22:58:17 +0000400 }
401 }
402
403 return mp_const_none;
404}
Damien Georgebcb6ca42014-06-03 12:53:44 +0100405STATIC MP_DEFINE_CONST_FUN_OBJ_KW(dict_update_obj, 1, dict_update);
John R. Lenton88f30432014-01-06 22:58:17 +0000406
John R. Lentonf77dce82014-01-06 20:08:52 +0000407
John R. Lentona41fe312014-01-06 17:17:02 +0000408/******************************************************************************/
John R. Lenton9ec3a872014-01-10 01:00:20 +0000409/* dict views */
410
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200411STATIC const mp_obj_type_t dict_view_type;
412STATIC const mp_obj_type_t dict_view_it_type;
John R. Lenton9ec3a872014-01-10 01:00:20 +0000413
414typedef enum _mp_dict_view_kind_t {
415 MP_DICT_VIEW_ITEMS,
416 MP_DICT_VIEW_KEYS,
417 MP_DICT_VIEW_VALUES,
418} mp_dict_view_kind_t;
419
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200420STATIC char *mp_dict_view_names[] = {"dict_items", "dict_keys", "dict_values"};
John R. Lenton9ec3a872014-01-10 01:00:20 +0000421
422typedef struct _mp_obj_dict_view_it_t {
423 mp_obj_base_t base;
424 mp_dict_view_kind_t kind;
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200425 mp_obj_t dict;
Damien George40f3c022014-07-03 13:25:24 +0100426 mp_uint_t cur;
John R. Lenton9ec3a872014-01-10 01:00:20 +0000427} mp_obj_dict_view_it_t;
428
429typedef struct _mp_obj_dict_view_t {
430 mp_obj_base_t base;
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200431 mp_obj_t dict;
John R. Lenton9ec3a872014-01-10 01:00:20 +0000432 mp_dict_view_kind_t kind;
433} mp_obj_dict_view_t;
434
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200435STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000436 assert(MP_OBJ_IS_TYPE(self_in, &dict_view_it_type));
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200437 mp_obj_dict_view_it_t *self = MP_OBJ_CAST(self_in);
438 mp_map_elem_t *next = dict_iter_next(MP_OBJ_CAST(self->dict), &self->cur);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000439
Damien George8a9b9992014-09-17 15:53:03 +0100440 if (next == NULL) {
441 return MP_OBJ_STOP_ITERATION;
442 } else {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000443 switch (self->kind) {
Damien Georgeeae16442014-01-11 19:22:29 +0000444 case MP_DICT_VIEW_ITEMS:
Damien Georged2d64f02015-01-14 21:32:42 +0000445 default: {
Damien Georgeeae16442014-01-11 19:22:29 +0000446 mp_obj_t items[] = {next->key, next->value};
447 return mp_obj_new_tuple(2, items);
448 }
449 case MP_DICT_VIEW_KEYS:
450 return next->key;
451 case MP_DICT_VIEW_VALUES:
452 return next->value;
John R. Lenton9ec3a872014-01-10 01:00:20 +0000453 }
John R. Lenton9ec3a872014-01-10 01:00:20 +0000454 }
455}
456
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200457STATIC const mp_obj_type_t dict_view_it_type = {
Damien Georgec5966122014-02-15 16:10:44 +0000458 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +0000459 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +0300460 .getiter = mp_identity,
John R. Lenton9ec3a872014-01-10 01:00:20 +0000461 .iternext = dict_view_it_iternext,
John R. Lenton9ec3a872014-01-10 01:00:20 +0000462};
463
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200464STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000465 assert(MP_OBJ_IS_TYPE(view_in, &dict_view_type));
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200466 mp_obj_dict_view_t *view = MP_OBJ_CAST(view_in);
467 mp_obj_t o_out = m_new_obj(mp_obj_dict_view_it_t);
468 mp_obj_dict_view_it_t *o = MP_OBJ_CAST(o_out);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000469 o->base.type = &dict_view_it_type;
470 o->kind = view->kind;
Damien George8a9b9992014-09-17 15:53:03 +0100471 o->dict = view->dict;
472 o->cur = 0;
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200473 return o_out;
John R. Lenton9ec3a872014-01-10 01:00:20 +0000474}
475
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200476STATIC void dict_view_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
Damien Georgeff8dd3f2015-01-20 12:47:20 +0000477 (void)kind;
John R. Lenton9ec3a872014-01-10 01:00:20 +0000478 assert(MP_OBJ_IS_TYPE(self_in, &dict_view_type));
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200479 mp_obj_dict_view_t *self = MP_OBJ_CAST(self_in);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000480 bool first = true;
481 print(env, mp_dict_view_names[self->kind]);
482 print(env, "([");
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200483 mp_obj_t self_iter = dict_view_getiter(self_in);
484 mp_obj_t next = MP_OBJ_NULL;
Damien Georgeea8d06c2014-04-17 23:19:36 +0100485 while ((next = dict_view_it_iternext(self_iter)) != MP_OBJ_STOP_ITERATION) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000486 if (!first) {
487 print(env, ", ");
488 }
489 first = false;
Paul Sokolovsky76d982e2014-01-13 19:19:16 +0200490 mp_obj_print_helper(print, env, next, PRINT_REPR);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000491 }
492 print(env, "])");
493}
494
Damien Georgeecc88e92014-08-30 00:35:11 +0100495STATIC mp_obj_t dict_view_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
Damien George6ac5dce2014-05-21 19:42:43 +0100496 // only supported for the 'keys' kind until sets and dicts are refactored
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200497 mp_obj_dict_view_t *o = MP_OBJ_CAST(lhs_in);
Damien Georged0a5bf32014-05-10 13:55:11 +0100498 if (o->kind != MP_DICT_VIEW_KEYS) {
Damien George6ac5dce2014-05-21 19:42:43 +0100499 return MP_OBJ_NULL; // op not supported
Damien Georged0a5bf32014-05-10 13:55:11 +0100500 }
501 if (op != MP_BINARY_OP_IN) {
Damien George6ac5dce2014-05-21 19:42:43 +0100502 return MP_OBJ_NULL; // op not supported
Damien Georged0a5bf32014-05-10 13:55:11 +0100503 }
John R. Lentonc1bef212014-01-11 12:39:33 +0000504 return dict_binary_op(op, o->dict, rhs_in);
505}
506
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200507STATIC const mp_obj_type_t dict_view_type = {
Damien Georgec5966122014-02-15 16:10:44 +0000508 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +0000509 .name = MP_QSTR_dict_view,
John R. Lenton9ec3a872014-01-10 01:00:20 +0000510 .print = dict_view_print,
John R. Lentonc1bef212014-01-11 12:39:33 +0000511 .binary_op = dict_view_binary_op,
John R. Lenton9ec3a872014-01-10 01:00:20 +0000512 .getiter = dict_view_getiter,
513};
514
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200515STATIC mp_obj_t mp_obj_new_dict_view(mp_obj_t dict, mp_dict_view_kind_t kind) {
516 mp_obj_t o_out = m_new_obj(mp_obj_dict_view_t);
517 mp_obj_dict_view_t *o = MP_OBJ_CAST(o_out);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000518 o->base.type = &dict_view_type;
519 o->dict = dict;
520 o->kind = kind;
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200521 return o_out;
John R. Lenton9ec3a872014-01-10 01:00:20 +0000522}
523
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200524STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) {
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200525 assert(MP_OBJ_IS_DICT_TYPE(self_in));
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200526 return mp_obj_new_dict_view(self_in, kind);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000527}
528
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200529STATIC mp_obj_t dict_items(mp_obj_t self_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000530 return dict_view(self_in, MP_DICT_VIEW_ITEMS);
531}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200532STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_items_obj, dict_items);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000533
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200534STATIC mp_obj_t dict_keys(mp_obj_t self_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000535 return dict_view(self_in, MP_DICT_VIEW_KEYS);
536}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200537STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_keys_obj, dict_keys);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000538
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200539STATIC mp_obj_t dict_values(mp_obj_t self_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000540 return dict_view(self_in, MP_DICT_VIEW_VALUES);
541}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200542STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000543
John R. Lenton4bee76e2014-01-10 11:25:03 +0000544/******************************************************************************/
Damien Georgeeae16442014-01-11 19:22:29 +0000545/* dict constructors & public C API */
John R. Lentona41fe312014-01-06 17:17:02 +0000546
Damien George9b196cd2014-03-26 21:47:19 +0000547STATIC const mp_map_elem_t dict_locals_dict_table[] = {
548 { MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&dict_clear_obj },
549 { MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&dict_copy_obj },
550 { MP_OBJ_NEW_QSTR(MP_QSTR_fromkeys), (mp_obj_t)&dict_fromkeys_obj },
551 { MP_OBJ_NEW_QSTR(MP_QSTR_get), (mp_obj_t)&dict_get_obj },
552 { MP_OBJ_NEW_QSTR(MP_QSTR_items), (mp_obj_t)&dict_items_obj },
553 { MP_OBJ_NEW_QSTR(MP_QSTR_keys), (mp_obj_t)&dict_keys_obj },
554 { MP_OBJ_NEW_QSTR(MP_QSTR_pop), (mp_obj_t)&dict_pop_obj },
555 { MP_OBJ_NEW_QSTR(MP_QSTR_popitem), (mp_obj_t)&dict_popitem_obj },
556 { MP_OBJ_NEW_QSTR(MP_QSTR_setdefault), (mp_obj_t)&dict_setdefault_obj },
557 { MP_OBJ_NEW_QSTR(MP_QSTR_update), (mp_obj_t)&dict_update_obj },
558 { MP_OBJ_NEW_QSTR(MP_QSTR_values), (mp_obj_t)&dict_values_obj },
Paul Sokolovsky68e7c512014-04-13 11:53:15 +0300559 { MP_OBJ_NEW_QSTR(MP_QSTR___getitem__), (mp_obj_t)&mp_op_getitem_obj },
Paul Sokolovskycd94b382014-04-13 23:41:49 +0300560 { MP_OBJ_NEW_QSTR(MP_QSTR___setitem__), (mp_obj_t)&mp_op_setitem_obj },
Paul Sokolovsky14de1142014-04-13 23:55:59 +0300561 { MP_OBJ_NEW_QSTR(MP_QSTR___delitem__), (mp_obj_t)&mp_op_delitem_obj },
John R. Lentonbaa66542014-01-07 23:18:25 +0000562};
563
Damien George9b196cd2014-03-26 21:47:19 +0000564STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);
565
Damien George3e1a5c12014-03-29 13:43:38 +0000566const mp_obj_type_t mp_type_dict = {
Damien Georgec5966122014-02-15 16:10:44 +0000567 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +0000568 .name = MP_QSTR_dict,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +0200569 .print = dict_print,
570 .make_new = dict_make_new,
Damien George4e8dc8c2014-01-27 23:15:32 +0000571 .unary_op = dict_unary_op,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +0200572 .binary_op = dict_binary_op,
Damien George729f7b42014-04-17 22:10:53 +0100573 .subscr = dict_subscr,
John R. Lentona41fe312014-01-06 17:17:02 +0000574 .getiter = dict_getiter,
Damien George9b196cd2014-03-26 21:47:19 +0000575 .locals_dict = (mp_obj_t)&dict_locals_dict,
Damiend99b0522013-12-21 18:17:45 +0000576};
577
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200578#if MICROPY_PY_COLLECTIONS_ORDEREDDICT
579STATIC const mp_obj_tuple_t ordereddict_base_tuple = {{&mp_type_tuple}, 1, {(mp_obj_t)&mp_type_dict}};
580
581const mp_obj_type_t mp_type_ordereddict = {
582 { &mp_type_type },
583 .name = MP_QSTR_OrderedDict,
584 .print = dict_print,
585 .make_new = dict_make_new,
586 .unary_op = dict_unary_op,
587 .binary_op = dict_binary_op,
588 .subscr = dict_subscr,
589 .getiter = dict_getiter,
590 .bases_tuple = (mp_obj_t)&ordereddict_base_tuple,
591 .locals_dict = (mp_obj_t)&dict_locals_dict,
592};
593#endif
594
Damien George93965e72014-08-30 13:23:35 +0100595void mp_obj_dict_init(mp_obj_dict_t *dict, mp_uint_t n_args) {
Damien George8b0535e2014-04-05 21:53:54 +0100596 dict->base.type = &mp_type_dict;
597 mp_map_init(&dict->map, n_args);
598}
599
Damien George93965e72014-08-30 13:23:35 +0100600mp_obj_t mp_obj_new_dict(mp_uint_t n_args) {
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200601 mp_obj_t o_out = m_new_obj(mp_obj_dict_t);
602 mp_obj_dict_t *o = MP_OBJ_CAST(o_out);
Damien George8b0535e2014-04-05 21:53:54 +0100603 mp_obj_dict_init(o, n_args);
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200604 return o_out;
Damiend99b0522013-12-21 18:17:45 +0000605}
Damiendae7eb72013-12-29 22:32:51 +0000606
Damien George93965e72014-08-30 13:23:35 +0100607mp_uint_t mp_obj_dict_len(mp_obj_t self_in) {
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200608 mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
609 return self->map.used;
Damiendae7eb72013-12-29 22:32:51 +0000610}
611
612mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200613 assert(MP_OBJ_IS_DICT_TYPE(self_in));
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200614 mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
Damien George38a2da62014-01-08 17:33:12 +0000615 mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
Damiendae7eb72013-12-29 22:32:51 +0000616 return self_in;
617}
Damien George062478e2014-01-09 20:57:50 +0000618
Damien George66edc5d2014-04-05 13:25:13 +0100619mp_obj_t mp_obj_dict_delete(mp_obj_t self_in, mp_obj_t key) {
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200620 assert(MP_OBJ_IS_DICT_TYPE(self_in));
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200621 mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
Damien George8a9b9992014-09-17 15:53:03 +0100622 dict_get_helper(&self->map, key, MP_OBJ_NULL, MP_MAP_LOOKUP_REMOVE_IF_FOUND);
Damien George66edc5d2014-04-05 13:25:13 +0100623 return self_in;
624}
625
Damien George062478e2014-01-09 20:57:50 +0000626mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) {
Paul Sokolovsky0ef01d02015-03-18 01:25:04 +0200627 assert(MP_OBJ_IS_DICT_TYPE(self_in));
Paul Sokolovsky0090c712015-03-26 12:28:31 +0200628 mp_obj_dict_t *self = MP_OBJ_CAST(self_in);
Damien George062478e2014-01-09 20:57:50 +0000629 return &self->map;
630}