blob: 5a314aed801c6bd03a0dfda1c2bb8190f2723221 [file] [log] [blame]
xbeefe34222014-03-16 00:14:26 -07001#include <stdbool.h>
Damiend99b0522013-12-21 18:17:45 +00002#include <string.h>
3#include <assert.h>
4
5#include "nlr.h"
6#include "misc.h"
7#include "mpconfig.h"
Damien George55baff42014-01-21 21:40:13 +00008#include "qstr.h"
Damiend99b0522013-12-21 18:17:45 +00009#include "obj.h"
10#include "runtime0.h"
11#include "runtime.h"
Damiend99b0522013-12-21 18:17:45 +000012
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020013STATIC mp_obj_t mp_obj_new_dict_iterator(mp_obj_dict_t *dict, int cur);
14STATIC mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in);
John R. Lentona41fe312014-01-06 17:17:02 +000015
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020016STATIC void dict_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
Damiend99b0522013-12-21 18:17:45 +000017 mp_obj_dict_t *self = self_in;
18 bool first = true;
19 print(env, "{");
John R. Lentona41fe312014-01-06 17:17:02 +000020 mp_obj_t *dict_iter = mp_obj_new_dict_iterator(self, 0);
21 mp_map_elem_t *next = NULL;
22 while ((next = dict_it_iternext_elem(dict_iter)) != NULL) {
23 if (!first) {
24 print(env, ", ");
Damiend99b0522013-12-21 18:17:45 +000025 }
John R. Lentona41fe312014-01-06 17:17:02 +000026 first = false;
Paul Sokolovsky76d982e2014-01-13 19:19:16 +020027 mp_obj_print_helper(print, env, next->key, PRINT_REPR);
John R. Lentona41fe312014-01-06 17:17:02 +000028 print(env, ": ");
Paul Sokolovsky76d982e2014-01-13 19:19:16 +020029 mp_obj_print_helper(print, env, next->value, PRINT_REPR);
Damiend99b0522013-12-21 18:17:45 +000030 }
31 print(env, "}");
32}
33
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020034STATIC mp_obj_t dict_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
Damien Georged7aadcf2014-04-04 15:08:00 +010035 mp_obj_t dict;
36 switch (n_args) {
37 case 0:
38 dict = mp_obj_new_dict(0);
39 break;
40
41 case 1:
42 // TODO create dict from an iterable!
43 assert(false);
44
45 default:
Damien Georgeea13f402014-04-05 18:32:08 +010046 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "dict takes at most 1 argument"));
Damien Georged7aadcf2014-04-04 15:08:00 +010047 }
48
49 // add to the new dict any keyword args
50 for (const mp_obj_t *a = args + n_args; n_kw > 0; n_kw--, a += 2) {
51 mp_obj_dict_store(dict, a[0], a[1]);
52 }
53
54 return dict;
Damien George71c51812014-01-04 20:21:15 +000055}
56
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020057STATIC mp_obj_t dict_unary_op(int op, mp_obj_t self_in) {
Damien George4e8dc8c2014-01-27 23:15:32 +000058 mp_obj_dict_t *self = self_in;
59 switch (op) {
Damien Georged17926d2014-03-30 13:35:08 +010060 case MP_UNARY_OP_BOOL: return MP_BOOL(self->map.used != 0);
61 case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT((machine_int_t)self->map.used);
Damien George4e8dc8c2014-01-27 23:15:32 +000062 default: return MP_OBJ_NULL; // op not supported for None
63 }
64}
65
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020066STATIC mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
Damiend99b0522013-12-21 18:17:45 +000067 mp_obj_dict_t *o = lhs_in;
68 switch (op) {
Damien Georged17926d2014-03-30 13:35:08 +010069 case MP_BINARY_OP_SUBSCR:
Damiend99b0522013-12-21 18:17:45 +000070 {
71 // dict load
Damien George38a2da62014-01-08 17:33:12 +000072 mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
Damiend99b0522013-12-21 18:17:45 +000073 if (elem == NULL) {
Damien Georgeea13f402014-04-05 18:32:08 +010074 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
Damiend99b0522013-12-21 18:17:45 +000075 } else {
76 return elem->value;
77 }
78 }
Damien Georged17926d2014-03-30 13:35:08 +010079 case MP_BINARY_OP_IN:
John R. Lentonc1bef212014-01-11 12:39:33 +000080 {
81 mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
Damien George9aa2a522014-02-01 23:04:09 +000082 return MP_BOOL(elem != NULL);
John R. Lentonc1bef212014-01-11 12:39:33 +000083 }
Damiend99b0522013-12-21 18:17:45 +000084 default:
85 // op not supported
86 return NULL;
87 }
88}
89
John R. Lentona41fe312014-01-06 17:17:02 +000090
91/******************************************************************************/
92/* dict iterator */
93
94typedef struct _mp_obj_dict_it_t {
95 mp_obj_base_t base;
96 mp_obj_dict_t *dict;
97 machine_uint_t cur;
98} mp_obj_dict_it_t;
99
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200100STATIC mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in) {
John R. Lentona41fe312014-01-06 17:17:02 +0000101 mp_obj_dict_it_t *self = self_in;
102 machine_uint_t max = self->dict->map.alloc;
Damien George8b0535e2014-04-05 21:53:54 +0100103 mp_map_t *map = &self->dict->map;
John R. Lentona41fe312014-01-06 17:17:02 +0000104
105 for (int i = self->cur; i < max; i++) {
Damien George8b0535e2014-04-05 21:53:54 +0100106 if (MP_MAP_SLOT_IS_FILLED(map, i)) {
John R. Lentona41fe312014-01-06 17:17:02 +0000107 self->cur = i + 1;
Damien George8b0535e2014-04-05 21:53:54 +0100108 return &(map->table[i]);
John R. Lentona41fe312014-01-06 17:17:02 +0000109 }
110 }
111
112 return NULL;
113}
114
115mp_obj_t dict_it_iternext(mp_obj_t self_in) {
116 mp_map_elem_t *next = dict_it_iternext_elem(self_in);
117
118 if (next != NULL) {
119 return next->key;
120 } else {
Damien George66eaf842014-03-26 19:27:58 +0000121 return MP_OBJ_NULL;
John R. Lentona41fe312014-01-06 17:17:02 +0000122 }
123}
124
Damien George3e1a5c12014-03-29 13:43:38 +0000125STATIC const mp_obj_type_t mp_type_dict_it = {
Damien Georgec5966122014-02-15 16:10:44 +0000126 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +0000127 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +0300128 .getiter = mp_identity,
John R. Lentona41fe312014-01-06 17:17:02 +0000129 .iternext = dict_it_iternext,
John R. Lentona41fe312014-01-06 17:17:02 +0000130};
131
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200132STATIC mp_obj_t mp_obj_new_dict_iterator(mp_obj_dict_t *dict, int cur) {
John R. Lentona41fe312014-01-06 17:17:02 +0000133 mp_obj_dict_it_t *o = m_new_obj(mp_obj_dict_it_t);
Damien George3e1a5c12014-03-29 13:43:38 +0000134 o->base.type = &mp_type_dict_it;
John R. Lentona41fe312014-01-06 17:17:02 +0000135 o->dict = dict;
136 o->cur = cur;
137 return o;
138}
139
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200140STATIC mp_obj_t dict_getiter(mp_obj_t o_in) {
John R. Lentona41fe312014-01-06 17:17:02 +0000141 return mp_obj_new_dict_iterator(o_in, 0);
142}
143
144/******************************************************************************/
145/* dict methods */
146
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200147STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
Damien George3e1a5c12014-03-29 13:43:38 +0000148 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton4ce6cea2014-01-06 17:38:47 +0000149 mp_obj_dict_t *self = self_in;
150
151 mp_map_clear(&self->map);
152
153 return mp_const_none;
154}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200155STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
John R. Lenton7d21d512014-01-06 17:54:04 +0000156
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200157STATIC mp_obj_t dict_copy(mp_obj_t self_in) {
Damien George3e1a5c12014-03-29 13:43:38 +0000158 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lentond90b19e2014-01-06 18:11:20 +0000159 mp_obj_dict_t *self = self_in;
160 mp_obj_dict_t *other = mp_obj_new_dict(self->map.alloc);
161 other->map.used = self->map.used;
162 memcpy(other->map.table, self->map.table, self->map.alloc * sizeof(mp_map_elem_t));
163 return other;
164}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200165STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy);
John R. Lenton4ce6cea2014-01-06 17:38:47 +0000166
Damien Georgeeae16442014-01-11 19:22:29 +0000167// this is a classmethod
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200168STATIC mp_obj_t dict_fromkeys(uint n_args, const mp_obj_t *args) {
Damien Georgeeae16442014-01-11 19:22:29 +0000169 assert(2 <= n_args && n_args <= 3);
Damien Georged17926d2014-03-30 13:35:08 +0100170 mp_obj_t iter = mp_getiter(args[1]);
Damien Georgeeae16442014-01-11 19:22:29 +0000171 mp_obj_t len = mp_obj_len_maybe(iter);
172 mp_obj_t value = mp_const_none;
173 mp_obj_t next = NULL;
174 mp_obj_dict_t *self = NULL;
175
176 if (n_args > 2) {
177 value = args[2];
178 }
179
180 if (len == MP_OBJ_NULL) {
181 /* object's type doesn't have a __len__ slot */
182 self = mp_obj_new_dict(0);
183 } else {
184 self = mp_obj_new_dict(MP_OBJ_SMALL_INT_VALUE(len));
185 }
186
Damien Georged17926d2014-03-30 13:35:08 +0100187 while ((next = mp_iternext(iter)) != MP_OBJ_NULL) {
Damien Georgeeae16442014-01-11 19:22:29 +0000188 mp_map_lookup(&self->map, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
189 }
190
191 return self;
192}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200193STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_fromkeys_fun_obj, 2, 3, dict_fromkeys);
194STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(dict_fromkeys_obj, (const mp_obj_t)&dict_fromkeys_fun_obj);
Damien Georgeeae16442014-01-11 19:22:29 +0000195
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200196STATIC 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 +0000197 mp_map_elem_t *elem = mp_map_lookup(self, key, lookup_kind);
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000198 mp_obj_t value;
199 if (elem == NULL || elem->value == NULL) {
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000200 if (deflt == NULL) {
Damien George38a2da62014-01-08 17:33:12 +0000201 if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
Damien Georgeea13f402014-04-05 18:32:08 +0100202 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000203 } else {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000204 value = mp_const_none;
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000205 }
206 } else {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000207 value = deflt;
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000208 }
209 } else {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000210 value = elem->value;
Damien George38a2da62014-01-08 17:33:12 +0000211 if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
212 // catch the leak (from mp_map_lookup)
John R. Lenton88f30432014-01-06 22:58:17 +0000213 m_free(elem, sizeof(mp_map_elem_t));
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000214 }
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000215 }
Damien George38a2da62014-01-08 17:33:12 +0000216 if (lookup_kind == MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000217 elem->value = value;
218 }
219 return value;
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000220}
221
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200222STATIC mp_obj_t dict_get(uint n_args, const mp_obj_t *args) {
John R. Lentoncd088732014-01-06 18:53:16 +0000223 assert(2 <= n_args && n_args <= 3);
Damien George3e1a5c12014-03-29 13:43:38 +0000224 assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
John R. Lentoncd088732014-01-06 18:53:16 +0000225
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000226 return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
227 args[1],
228 n_args == 3 ? args[2] : NULL,
Damien George38a2da62014-01-08 17:33:12 +0000229 MP_MAP_LOOKUP);
John R. Lentoncd088732014-01-06 18:53:16 +0000230}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200231STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get);
John R. Lentoncd088732014-01-06 18:53:16 +0000232
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200233STATIC mp_obj_t dict_pop(uint n_args, const mp_obj_t *args) {
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000234 assert(2 <= n_args && n_args <= 3);
Damien George3e1a5c12014-03-29 13:43:38 +0000235 assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000236
237 return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
238 args[1],
239 n_args == 3 ? args[2] : NULL,
Damien George38a2da62014-01-08 17:33:12 +0000240 MP_MAP_LOOKUP_REMOVE_IF_FOUND);
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000241}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200242STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop);
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000243
244
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200245STATIC mp_obj_t dict_setdefault(uint n_args, const mp_obj_t *args) {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000246 assert(2 <= n_args && n_args <= 3);
Damien George3e1a5c12014-03-29 13:43:38 +0000247 assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000248
249 return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
250 args[1],
251 n_args == 3 ? args[2] : NULL,
Damien George38a2da62014-01-08 17:33:12 +0000252 MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000253}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200254STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_setdefault_obj, 2, 3, dict_setdefault);
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000255
John R. Lentonf77dce82014-01-06 20:08:52 +0000256
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200257STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
Damien George3e1a5c12014-03-29 13:43:38 +0000258 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lentonf77dce82014-01-06 20:08:52 +0000259 mp_obj_dict_t *self = self_in;
260 if (self->map.used == 0) {
Damien Georgeea13f402014-04-05 18:32:08 +0100261 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "popitem(): dictionary is empty"));
John R. Lentonf77dce82014-01-06 20:08:52 +0000262 }
263 mp_obj_dict_it_t *iter = mp_obj_new_dict_iterator(self, 0);
264
265 mp_map_elem_t *next = dict_it_iternext_elem(iter);
266 self->map.used--;
267 mp_obj_t items[] = {next->key, next->value};
268 next->key = NULL;
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000269 next->value = NULL;
John R. Lentonf77dce82014-01-06 20:08:52 +0000270 mp_obj_t tuple = mp_obj_new_tuple(2, items);
271
272 return tuple;
273}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200274STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_popitem_obj, dict_popitem);
John R. Lentonf77dce82014-01-06 20:08:52 +0000275
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200276STATIC mp_obj_t dict_update(mp_obj_t self_in, mp_obj_t iterable) {
Damien George3e1a5c12014-03-29 13:43:38 +0000277 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton88f30432014-01-06 22:58:17 +0000278 mp_obj_dict_t *self = self_in;
279 /* TODO: check for the "keys" method */
Damien Georged17926d2014-03-30 13:35:08 +0100280 mp_obj_t iter = mp_getiter(iterable);
John R. Lenton88f30432014-01-06 22:58:17 +0000281 mp_obj_t next = NULL;
Damien Georged17926d2014-03-30 13:35:08 +0100282 while ((next = mp_iternext(iter)) != MP_OBJ_NULL) {
283 mp_obj_t inneriter = mp_getiter(next);
284 mp_obj_t key = mp_iternext(inneriter);
285 mp_obj_t value = mp_iternext(inneriter);
286 mp_obj_t stop = mp_iternext(inneriter);
Damien George66eaf842014-03-26 19:27:58 +0000287 if (key == MP_OBJ_NULL
288 || value == MP_OBJ_NULL
289 || stop != MP_OBJ_NULL) {
Damien Georgeea13f402014-04-05 18:32:08 +0100290 nlr_raise(mp_obj_new_exception_msg(
Damien Georgec5966122014-02-15 16:10:44 +0000291 &mp_type_ValueError,
John R. Lenton88f30432014-01-06 22:58:17 +0000292 "dictionary update sequence has the wrong length"));
293 } else {
Damien George38a2da62014-01-08 17:33:12 +0000294 mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
John R. Lenton88f30432014-01-06 22:58:17 +0000295 }
296 }
297
298 return mp_const_none;
299}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200300STATIC MP_DEFINE_CONST_FUN_OBJ_2(dict_update_obj, dict_update);
John R. Lenton88f30432014-01-06 22:58:17 +0000301
John R. Lentonf77dce82014-01-06 20:08:52 +0000302
John R. Lentona41fe312014-01-06 17:17:02 +0000303/******************************************************************************/
John R. Lenton9ec3a872014-01-10 01:00:20 +0000304/* dict views */
305
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200306STATIC const mp_obj_type_t dict_view_type;
307STATIC const mp_obj_type_t dict_view_it_type;
John R. Lenton9ec3a872014-01-10 01:00:20 +0000308
309typedef enum _mp_dict_view_kind_t {
310 MP_DICT_VIEW_ITEMS,
311 MP_DICT_VIEW_KEYS,
312 MP_DICT_VIEW_VALUES,
313} mp_dict_view_kind_t;
314
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200315STATIC char *mp_dict_view_names[] = {"dict_items", "dict_keys", "dict_values"};
John R. Lenton9ec3a872014-01-10 01:00:20 +0000316
317typedef struct _mp_obj_dict_view_it_t {
318 mp_obj_base_t base;
319 mp_dict_view_kind_t kind;
320 mp_obj_dict_it_t *iter;
321 machine_uint_t cur;
322} mp_obj_dict_view_it_t;
323
324typedef struct _mp_obj_dict_view_t {
325 mp_obj_base_t base;
326 mp_obj_dict_t *dict;
327 mp_dict_view_kind_t kind;
328} mp_obj_dict_view_t;
329
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200330STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000331 assert(MP_OBJ_IS_TYPE(self_in, &dict_view_it_type));
332 mp_obj_dict_view_it_t *self = self_in;
333 mp_map_elem_t *next = dict_it_iternext_elem(self->iter);
334
335 if (next != NULL) {
336 switch (self->kind) {
Damien Georgeeae16442014-01-11 19:22:29 +0000337 case MP_DICT_VIEW_ITEMS:
338 {
339 mp_obj_t items[] = {next->key, next->value};
340 return mp_obj_new_tuple(2, items);
341 }
342 case MP_DICT_VIEW_KEYS:
343 return next->key;
344 case MP_DICT_VIEW_VALUES:
345 return next->value;
346 default:
347 assert(0); /* can't happen */
348 return mp_const_none;
John R. Lenton9ec3a872014-01-10 01:00:20 +0000349 }
350 } else {
Damien George66eaf842014-03-26 19:27:58 +0000351 return MP_OBJ_NULL;
John R. Lenton9ec3a872014-01-10 01:00:20 +0000352 }
353}
354
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200355STATIC const mp_obj_type_t dict_view_it_type = {
Damien Georgec5966122014-02-15 16:10:44 +0000356 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +0000357 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +0300358 .getiter = mp_identity,
John R. Lenton9ec3a872014-01-10 01:00:20 +0000359 .iternext = dict_view_it_iternext,
John R. Lenton9ec3a872014-01-10 01:00:20 +0000360};
361
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200362STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000363 assert(MP_OBJ_IS_TYPE(view_in, &dict_view_type));
364 mp_obj_dict_view_t *view = view_in;
365 mp_obj_dict_view_it_t *o = m_new_obj(mp_obj_dict_view_it_t);
366 o->base.type = &dict_view_it_type;
367 o->kind = view->kind;
368 o->iter = mp_obj_new_dict_iterator(view->dict, 0);
369 return o;
370}
371
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200372STATIC void dict_view_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000373 assert(MP_OBJ_IS_TYPE(self_in, &dict_view_type));
374 mp_obj_dict_view_t *self = self_in;
375 bool first = true;
376 print(env, mp_dict_view_names[self->kind]);
377 print(env, "([");
378 mp_obj_t *self_iter = dict_view_getiter(self);
379 mp_obj_t *next = NULL;
Damien George66eaf842014-03-26 19:27:58 +0000380 while ((next = dict_view_it_iternext(self_iter)) != MP_OBJ_NULL) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000381 if (!first) {
382 print(env, ", ");
383 }
384 first = false;
Paul Sokolovsky76d982e2014-01-13 19:19:16 +0200385 mp_obj_print_helper(print, env, next, PRINT_REPR);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000386 }
387 print(env, "])");
388}
389
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200390STATIC mp_obj_t dict_view_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
John R. Lentonc1bef212014-01-11 12:39:33 +0000391 /* only supported for the 'keys' kind until sets and dicts are refactored */
392 mp_obj_dict_view_t *o = lhs_in;
393 if (o->kind != MP_DICT_VIEW_KEYS) return NULL;
Damien Georged17926d2014-03-30 13:35:08 +0100394 if (op != MP_BINARY_OP_IN) return NULL;
John R. Lentonc1bef212014-01-11 12:39:33 +0000395 return dict_binary_op(op, o->dict, rhs_in);
396}
397
398
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200399STATIC const mp_obj_type_t dict_view_type = {
Damien Georgec5966122014-02-15 16:10:44 +0000400 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +0000401 .name = MP_QSTR_dict_view,
John R. Lenton9ec3a872014-01-10 01:00:20 +0000402 .print = dict_view_print,
John R. Lentonc1bef212014-01-11 12:39:33 +0000403 .binary_op = dict_view_binary_op,
John R. Lenton9ec3a872014-01-10 01:00:20 +0000404 .getiter = dict_view_getiter,
405};
406
407mp_obj_t mp_obj_new_dict_view(mp_obj_dict_t *dict, mp_dict_view_kind_t kind) {
408 mp_obj_dict_view_t *o = m_new_obj(mp_obj_dict_view_t);
409 o->base.type = &dict_view_type;
410 o->dict = dict;
411 o->kind = kind;
412 return o;
413}
414
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200415STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) {
Damien George3e1a5c12014-03-29 13:43:38 +0000416 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton9ec3a872014-01-10 01:00:20 +0000417 mp_obj_dict_t *self = self_in;
418 return mp_obj_new_dict_view(self, kind);
419}
420
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200421STATIC mp_obj_t dict_items(mp_obj_t self_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000422 return dict_view(self_in, MP_DICT_VIEW_ITEMS);
423}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200424STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_items_obj, dict_items);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000425
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200426STATIC mp_obj_t dict_keys(mp_obj_t self_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000427 return dict_view(self_in, MP_DICT_VIEW_KEYS);
428}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200429STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_keys_obj, dict_keys);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000430
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200431STATIC mp_obj_t dict_values(mp_obj_t self_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000432 return dict_view(self_in, MP_DICT_VIEW_VALUES);
433}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200434STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000435
John R. Lenton4bee76e2014-01-10 11:25:03 +0000436/******************************************************************************/
Damien Georgeeae16442014-01-11 19:22:29 +0000437/* dict constructors & public C API */
John R. Lentona41fe312014-01-06 17:17:02 +0000438
Damien George9b196cd2014-03-26 21:47:19 +0000439STATIC const mp_map_elem_t dict_locals_dict_table[] = {
440 { MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&dict_clear_obj },
441 { MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&dict_copy_obj },
442 { MP_OBJ_NEW_QSTR(MP_QSTR_fromkeys), (mp_obj_t)&dict_fromkeys_obj },
443 { MP_OBJ_NEW_QSTR(MP_QSTR_get), (mp_obj_t)&dict_get_obj },
444 { MP_OBJ_NEW_QSTR(MP_QSTR_items), (mp_obj_t)&dict_items_obj },
445 { MP_OBJ_NEW_QSTR(MP_QSTR_keys), (mp_obj_t)&dict_keys_obj },
446 { MP_OBJ_NEW_QSTR(MP_QSTR_pop), (mp_obj_t)&dict_pop_obj },
447 { MP_OBJ_NEW_QSTR(MP_QSTR_popitem), (mp_obj_t)&dict_popitem_obj },
448 { MP_OBJ_NEW_QSTR(MP_QSTR_setdefault), (mp_obj_t)&dict_setdefault_obj },
449 { MP_OBJ_NEW_QSTR(MP_QSTR_update), (mp_obj_t)&dict_update_obj },
450 { MP_OBJ_NEW_QSTR(MP_QSTR_values), (mp_obj_t)&dict_values_obj },
John R. Lentonbaa66542014-01-07 23:18:25 +0000451};
452
Damien George9b196cd2014-03-26 21:47:19 +0000453STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);
454
Damien George3e1a5c12014-03-29 13:43:38 +0000455const mp_obj_type_t mp_type_dict = {
Damien Georgec5966122014-02-15 16:10:44 +0000456 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +0000457 .name = MP_QSTR_dict,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +0200458 .print = dict_print,
459 .make_new = dict_make_new,
Damien George4e8dc8c2014-01-27 23:15:32 +0000460 .unary_op = dict_unary_op,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +0200461 .binary_op = dict_binary_op,
John R. Lentona41fe312014-01-06 17:17:02 +0000462 .getiter = dict_getiter,
Damien George9b196cd2014-03-26 21:47:19 +0000463 .locals_dict = (mp_obj_t)&dict_locals_dict,
Damiend99b0522013-12-21 18:17:45 +0000464};
465
Damien George8b0535e2014-04-05 21:53:54 +0100466void mp_obj_dict_init(mp_obj_dict_t *dict, int n_args) {
467 dict->base.type = &mp_type_dict;
468 mp_map_init(&dict->map, n_args);
469}
470
Damiend99b0522013-12-21 18:17:45 +0000471mp_obj_t mp_obj_new_dict(int n_args) {
472 mp_obj_dict_t *o = m_new_obj(mp_obj_dict_t);
Damien George8b0535e2014-04-05 21:53:54 +0100473 mp_obj_dict_init(o, n_args);
Damiend99b0522013-12-21 18:17:45 +0000474 return o;
475}
Damiendae7eb72013-12-29 22:32:51 +0000476
477uint mp_obj_dict_len(mp_obj_t self_in) {
John R. Lentoncd088732014-01-06 18:53:16 +0000478 return ((mp_obj_dict_t *)self_in)->map.used;
Damiendae7eb72013-12-29 22:32:51 +0000479}
480
481mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {
Damien George3e1a5c12014-03-29 13:43:38 +0000482 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
Damiendae7eb72013-12-29 22:32:51 +0000483 mp_obj_dict_t *self = self_in;
Damien George38a2da62014-01-08 17:33:12 +0000484 mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
Damiendae7eb72013-12-29 22:32:51 +0000485 return self_in;
486}
Damien George062478e2014-01-09 20:57:50 +0000487
Damien George66edc5d2014-04-05 13:25:13 +0100488mp_obj_t mp_obj_dict_delete(mp_obj_t self_in, mp_obj_t key) {
489 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
490 mp_obj_dict_t *self = self_in;
491 dict_get_helper(&self->map, key, NULL, MP_MAP_LOOKUP_REMOVE_IF_FOUND);
492 return self_in;
493}
494
Damien George062478e2014-01-09 20:57:50 +0000495mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) {
Damien George3e1a5c12014-03-29 13:43:38 +0000496 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
Damien George062478e2014-01-09 20:57:50 +0000497 mp_obj_dict_t *self = self_in;
498 return &self->map;
499}