blob: 1bebf086478620bf0eb9dccd08a5ae729c26febd [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"
Paul Sokolovskybe019ce2014-04-11 07:01:15 +030010#include "objtuple.h"
Damiend99b0522013-12-21 18:17:45 +000011#include "runtime0.h"
12#include "runtime.h"
Paul Sokolovsky68e7c512014-04-13 11:53:15 +030013#include "builtin.h"
Damiend99b0522013-12-21 18:17:45 +000014
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020015STATIC mp_obj_t mp_obj_new_dict_iterator(mp_obj_dict_t *dict, int cur);
16STATIC mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in);
Paul Sokolovskyea85a122014-04-06 20:08:56 +030017STATIC mp_obj_t dict_copy(mp_obj_t self_in);
John R. Lentona41fe312014-01-06 17:17:02 +000018
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020019STATIC 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 +000020 mp_obj_dict_t *self = self_in;
21 bool first = true;
22 print(env, "{");
John R. Lentona41fe312014-01-06 17:17:02 +000023 mp_obj_t *dict_iter = mp_obj_new_dict_iterator(self, 0);
24 mp_map_elem_t *next = NULL;
25 while ((next = dict_it_iternext_elem(dict_iter)) != NULL) {
26 if (!first) {
27 print(env, ", ");
Damiend99b0522013-12-21 18:17:45 +000028 }
John R. Lentona41fe312014-01-06 17:17:02 +000029 first = false;
Paul Sokolovsky76d982e2014-01-13 19:19:16 +020030 mp_obj_print_helper(print, env, next->key, PRINT_REPR);
John R. Lentona41fe312014-01-06 17:17:02 +000031 print(env, ": ");
Paul Sokolovsky76d982e2014-01-13 19:19:16 +020032 mp_obj_print_helper(print, env, next->value, PRINT_REPR);
Damiend99b0522013-12-21 18:17:45 +000033 }
34 print(env, "}");
35}
36
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020037STATIC 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 +010038 mp_obj_t dict;
39 switch (n_args) {
40 case 0:
41 dict = mp_obj_new_dict(0);
42 break;
43
Paul Sokolovskybe019ce2014-04-11 07:01:15 +030044 case 1: {
Paul Sokolovskyea85a122014-04-06 20:08:56 +030045 if (MP_OBJ_IS_TYPE(args[0], &mp_type_dict)) {
46 return dict_copy(args[0]);
47 }
48 // TODO create dict from an arbitrary mapping!
Paul Sokolovskybe019ce2014-04-11 07:01:15 +030049
50 // Make dict from iterable of pairs
51 mp_obj_t iterable = mp_getiter(args[0]);
52 mp_obj_t dict = mp_obj_new_dict(0);
53 // TODO: support arbitrary seq as a pair
Damien George686afc52014-04-11 09:13:30 +010054 mp_obj_t item;
Paul Sokolovskybe019ce2014-04-11 07:01:15 +030055 while ((item = mp_iternext(iterable)) != MP_OBJ_NULL) {
Damien George686afc52014-04-11 09:13:30 +010056 mp_obj_t *sub_items;
57 mp_obj_get_array_fixed_n(item, 2, &sub_items);
58 mp_obj_dict_store(dict, sub_items[0], sub_items[1]);
Paul Sokolovskybe019ce2014-04-11 07:01:15 +030059 }
60 return dict;
61 }
Damien Georged7aadcf2014-04-04 15:08:00 +010062
63 default:
Damien Georgeea13f402014-04-05 18:32:08 +010064 nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "dict takes at most 1 argument"));
Damien Georged7aadcf2014-04-04 15:08:00 +010065 }
66
67 // add to the new dict any keyword args
68 for (const mp_obj_t *a = args + n_args; n_kw > 0; n_kw--, a += 2) {
69 mp_obj_dict_store(dict, a[0], a[1]);
70 }
71
72 return dict;
Damien George71c51812014-01-04 20:21:15 +000073}
74
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020075STATIC mp_obj_t dict_unary_op(int op, mp_obj_t self_in) {
Damien George4e8dc8c2014-01-27 23:15:32 +000076 mp_obj_dict_t *self = self_in;
77 switch (op) {
Damien Georged17926d2014-03-30 13:35:08 +010078 case MP_UNARY_OP_BOOL: return MP_BOOL(self->map.used != 0);
79 case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT((machine_int_t)self->map.used);
Damien George4e8dc8c2014-01-27 23:15:32 +000080 default: return MP_OBJ_NULL; // op not supported for None
81 }
82}
83
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +020084STATIC mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
Damiend99b0522013-12-21 18:17:45 +000085 mp_obj_dict_t *o = lhs_in;
86 switch (op) {
Damien Georged17926d2014-03-30 13:35:08 +010087 case MP_BINARY_OP_SUBSCR:
Damiend99b0522013-12-21 18:17:45 +000088 {
89 // dict load
Damien George38a2da62014-01-08 17:33:12 +000090 mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
Damiend99b0522013-12-21 18:17:45 +000091 if (elem == NULL) {
Damien Georgeea13f402014-04-05 18:32:08 +010092 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
Damiend99b0522013-12-21 18:17:45 +000093 } else {
94 return elem->value;
95 }
96 }
Damien Georged17926d2014-03-30 13:35:08 +010097 case MP_BINARY_OP_IN:
John R. Lentonc1bef212014-01-11 12:39:33 +000098 {
99 mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
Damien George9aa2a522014-02-01 23:04:09 +0000100 return MP_BOOL(elem != NULL);
John R. Lentonc1bef212014-01-11 12:39:33 +0000101 }
Paul Sokolovsky7cf057a2014-04-06 21:20:52 +0300102 case MP_BINARY_OP_EQUAL: {
Paul Sokolovsky7cf057a2014-04-06 21:20:52 +0300103 if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_dict)) {
104 mp_obj_dict_t *rhs = rhs_in;
105 if (o->map.used != rhs->map.used) {
106 return mp_const_false;
107 }
108
109 machine_uint_t size = o->map.alloc;
110 mp_map_t *map = &o->map;
111
112 for (machine_uint_t i = 0; i < size; i++) {
113 if (MP_MAP_SLOT_IS_FILLED(map, i)) {
114 mp_map_elem_t *elem = mp_map_lookup(&rhs->map, map->table[i].key, MP_MAP_LOOKUP);
115 if (elem == NULL || !mp_obj_equal(map->table[i].value, elem->value)) {
116 return mp_const_false;
117 }
118 }
119 }
120 return mp_const_true;
Damien Georgee22d76e2014-04-11 10:52:06 +0000121 } else {
122 // dict is not equal to instance of any other type
123 return mp_const_false;
Paul Sokolovsky7cf057a2014-04-06 21:20:52 +0300124 }
125 }
Damiend99b0522013-12-21 18:17:45 +0000126 default:
127 // op not supported
128 return NULL;
129 }
130}
131
Damien Georgef4c9b332014-04-08 21:32:29 +0100132STATIC bool dict_store_item(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
133 if (value == MP_OBJ_NULL) {
134 mp_obj_dict_delete(self_in, index);
135 } else {
136 mp_obj_dict_store(self_in, index, value);
137 }
138 return true;
139}
John R. Lentona41fe312014-01-06 17:17:02 +0000140
141/******************************************************************************/
142/* dict iterator */
143
144typedef struct _mp_obj_dict_it_t {
145 mp_obj_base_t base;
146 mp_obj_dict_t *dict;
147 machine_uint_t cur;
148} mp_obj_dict_it_t;
149
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200150STATIC mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in) {
John R. Lentona41fe312014-01-06 17:17:02 +0000151 mp_obj_dict_it_t *self = self_in;
152 machine_uint_t max = self->dict->map.alloc;
Damien George8b0535e2014-04-05 21:53:54 +0100153 mp_map_t *map = &self->dict->map;
John R. Lentona41fe312014-01-06 17:17:02 +0000154
155 for (int i = self->cur; i < max; i++) {
Damien George8b0535e2014-04-05 21:53:54 +0100156 if (MP_MAP_SLOT_IS_FILLED(map, i)) {
John R. Lentona41fe312014-01-06 17:17:02 +0000157 self->cur = i + 1;
Damien George8b0535e2014-04-05 21:53:54 +0100158 return &(map->table[i]);
John R. Lentona41fe312014-01-06 17:17:02 +0000159 }
160 }
161
162 return NULL;
163}
164
165mp_obj_t dict_it_iternext(mp_obj_t self_in) {
166 mp_map_elem_t *next = dict_it_iternext_elem(self_in);
167
168 if (next != NULL) {
169 return next->key;
170 } else {
Damien George66eaf842014-03-26 19:27:58 +0000171 return MP_OBJ_NULL;
John R. Lentona41fe312014-01-06 17:17:02 +0000172 }
173}
174
Damien George3e1a5c12014-03-29 13:43:38 +0000175STATIC const mp_obj_type_t mp_type_dict_it = {
Damien Georgec5966122014-02-15 16:10:44 +0000176 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +0000177 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +0300178 .getiter = mp_identity,
John R. Lentona41fe312014-01-06 17:17:02 +0000179 .iternext = dict_it_iternext,
John R. Lentona41fe312014-01-06 17:17:02 +0000180};
181
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200182STATIC mp_obj_t mp_obj_new_dict_iterator(mp_obj_dict_t *dict, int cur) {
John R. Lentona41fe312014-01-06 17:17:02 +0000183 mp_obj_dict_it_t *o = m_new_obj(mp_obj_dict_it_t);
Damien George3e1a5c12014-03-29 13:43:38 +0000184 o->base.type = &mp_type_dict_it;
John R. Lentona41fe312014-01-06 17:17:02 +0000185 o->dict = dict;
186 o->cur = cur;
187 return o;
188}
189
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200190STATIC mp_obj_t dict_getiter(mp_obj_t o_in) {
John R. Lentona41fe312014-01-06 17:17:02 +0000191 return mp_obj_new_dict_iterator(o_in, 0);
192}
193
194/******************************************************************************/
195/* dict methods */
196
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200197STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
Damien George3e1a5c12014-03-29 13:43:38 +0000198 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton4ce6cea2014-01-06 17:38:47 +0000199 mp_obj_dict_t *self = self_in;
200
201 mp_map_clear(&self->map);
202
203 return mp_const_none;
204}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200205STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
John R. Lenton7d21d512014-01-06 17:54:04 +0000206
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200207STATIC mp_obj_t dict_copy(mp_obj_t self_in) {
Damien George3e1a5c12014-03-29 13:43:38 +0000208 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lentond90b19e2014-01-06 18:11:20 +0000209 mp_obj_dict_t *self = self_in;
210 mp_obj_dict_t *other = mp_obj_new_dict(self->map.alloc);
211 other->map.used = self->map.used;
Paul Sokolovsky5fedd0c2014-04-06 21:00:58 +0300212 other->map.all_keys_are_qstrs = self->map.all_keys_are_qstrs;
213 other->map.table_is_fixed_array = 0;
John R. Lentond90b19e2014-01-06 18:11:20 +0000214 memcpy(other->map.table, self->map.table, self->map.alloc * sizeof(mp_map_elem_t));
215 return other;
216}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200217STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy);
John R. Lenton4ce6cea2014-01-06 17:38:47 +0000218
Damien Georgeeae16442014-01-11 19:22:29 +0000219// this is a classmethod
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200220STATIC mp_obj_t dict_fromkeys(uint n_args, const mp_obj_t *args) {
Damien Georgeeae16442014-01-11 19:22:29 +0000221 assert(2 <= n_args && n_args <= 3);
Damien Georged17926d2014-03-30 13:35:08 +0100222 mp_obj_t iter = mp_getiter(args[1]);
Damien Georgeeae16442014-01-11 19:22:29 +0000223 mp_obj_t len = mp_obj_len_maybe(iter);
224 mp_obj_t value = mp_const_none;
225 mp_obj_t next = NULL;
226 mp_obj_dict_t *self = NULL;
227
228 if (n_args > 2) {
229 value = args[2];
230 }
231
232 if (len == MP_OBJ_NULL) {
233 /* object's type doesn't have a __len__ slot */
234 self = mp_obj_new_dict(0);
235 } else {
236 self = mp_obj_new_dict(MP_OBJ_SMALL_INT_VALUE(len));
237 }
238
Damien Georged17926d2014-03-30 13:35:08 +0100239 while ((next = mp_iternext(iter)) != MP_OBJ_NULL) {
Damien Georgeeae16442014-01-11 19:22:29 +0000240 mp_map_lookup(&self->map, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
241 }
242
243 return self;
244}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200245STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_fromkeys_fun_obj, 2, 3, dict_fromkeys);
246STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(dict_fromkeys_obj, (const mp_obj_t)&dict_fromkeys_fun_obj);
Damien Georgeeae16442014-01-11 19:22:29 +0000247
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200248STATIC 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 +0000249 mp_map_elem_t *elem = mp_map_lookup(self, key, lookup_kind);
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000250 mp_obj_t value;
251 if (elem == NULL || elem->value == NULL) {
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000252 if (deflt == NULL) {
Damien George38a2da62014-01-08 17:33:12 +0000253 if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
Damien Georgeea13f402014-04-05 18:32:08 +0100254 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000255 } else {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000256 value = mp_const_none;
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000257 }
258 } else {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000259 value = deflt;
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000260 }
261 } else {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000262 value = elem->value;
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000263 }
Damien George38a2da62014-01-08 17:33:12 +0000264 if (lookup_kind == MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000265 elem->value = value;
266 }
267 return value;
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000268}
269
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200270STATIC mp_obj_t dict_get(uint n_args, const mp_obj_t *args) {
John R. Lentoncd088732014-01-06 18:53:16 +0000271 assert(2 <= n_args && n_args <= 3);
Damien George3e1a5c12014-03-29 13:43:38 +0000272 assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
John R. Lentoncd088732014-01-06 18:53:16 +0000273
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000274 return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
275 args[1],
276 n_args == 3 ? args[2] : NULL,
Damien George38a2da62014-01-08 17:33:12 +0000277 MP_MAP_LOOKUP);
John R. Lentoncd088732014-01-06 18:53:16 +0000278}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200279STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get);
John R. Lentoncd088732014-01-06 18:53:16 +0000280
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200281STATIC mp_obj_t dict_pop(uint n_args, const mp_obj_t *args) {
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000282 assert(2 <= n_args && n_args <= 3);
Damien George3e1a5c12014-03-29 13:43:38 +0000283 assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000284
285 return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
286 args[1],
287 n_args == 3 ? args[2] : NULL,
Damien George38a2da62014-01-08 17:33:12 +0000288 MP_MAP_LOOKUP_REMOVE_IF_FOUND);
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000289}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200290STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop);
John R. Lenton0fcbaa42014-01-06 19:48:34 +0000291
292
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200293STATIC mp_obj_t dict_setdefault(uint n_args, const mp_obj_t *args) {
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000294 assert(2 <= n_args && n_args <= 3);
Damien George3e1a5c12014-03-29 13:43:38 +0000295 assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000296
297 return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
298 args[1],
299 n_args == 3 ? args[2] : NULL,
Damien George38a2da62014-01-08 17:33:12 +0000300 MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000301}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200302STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_setdefault_obj, 2, 3, dict_setdefault);
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000303
John R. Lentonf77dce82014-01-06 20:08:52 +0000304
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200305STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
Damien George3e1a5c12014-03-29 13:43:38 +0000306 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lentonf77dce82014-01-06 20:08:52 +0000307 mp_obj_dict_t *self = self_in;
308 if (self->map.used == 0) {
Damien Georgeea13f402014-04-05 18:32:08 +0100309 nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "popitem(): dictionary is empty"));
John R. Lentonf77dce82014-01-06 20:08:52 +0000310 }
311 mp_obj_dict_it_t *iter = mp_obj_new_dict_iterator(self, 0);
312
313 mp_map_elem_t *next = dict_it_iternext_elem(iter);
314 self->map.used--;
315 mp_obj_t items[] = {next->key, next->value};
316 next->key = NULL;
John R. Lentonbe8fe5b2014-01-06 20:25:51 +0000317 next->value = NULL;
John R. Lentonf77dce82014-01-06 20:08:52 +0000318 mp_obj_t tuple = mp_obj_new_tuple(2, items);
319
320 return tuple;
321}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200322STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_popitem_obj, dict_popitem);
John R. Lentonf77dce82014-01-06 20:08:52 +0000323
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200324STATIC mp_obj_t dict_update(mp_obj_t self_in, mp_obj_t iterable) {
Damien George3e1a5c12014-03-29 13:43:38 +0000325 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton88f30432014-01-06 22:58:17 +0000326 mp_obj_dict_t *self = self_in;
327 /* TODO: check for the "keys" method */
Damien Georged17926d2014-03-30 13:35:08 +0100328 mp_obj_t iter = mp_getiter(iterable);
John R. Lenton88f30432014-01-06 22:58:17 +0000329 mp_obj_t next = NULL;
Damien Georged17926d2014-03-30 13:35:08 +0100330 while ((next = mp_iternext(iter)) != MP_OBJ_NULL) {
331 mp_obj_t inneriter = mp_getiter(next);
332 mp_obj_t key = mp_iternext(inneriter);
333 mp_obj_t value = mp_iternext(inneriter);
334 mp_obj_t stop = mp_iternext(inneriter);
Damien George66eaf842014-03-26 19:27:58 +0000335 if (key == MP_OBJ_NULL
336 || value == MP_OBJ_NULL
337 || stop != MP_OBJ_NULL) {
Damien Georgeea13f402014-04-05 18:32:08 +0100338 nlr_raise(mp_obj_new_exception_msg(
Damien Georgec5966122014-02-15 16:10:44 +0000339 &mp_type_ValueError,
John R. Lenton88f30432014-01-06 22:58:17 +0000340 "dictionary update sequence has the wrong length"));
341 } else {
Damien George38a2da62014-01-08 17:33:12 +0000342 mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
John R. Lenton88f30432014-01-06 22:58:17 +0000343 }
344 }
345
346 return mp_const_none;
347}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200348STATIC MP_DEFINE_CONST_FUN_OBJ_2(dict_update_obj, dict_update);
John R. Lenton88f30432014-01-06 22:58:17 +0000349
John R. Lentonf77dce82014-01-06 20:08:52 +0000350
John R. Lentona41fe312014-01-06 17:17:02 +0000351/******************************************************************************/
John R. Lenton9ec3a872014-01-10 01:00:20 +0000352/* dict views */
353
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200354STATIC const mp_obj_type_t dict_view_type;
355STATIC const mp_obj_type_t dict_view_it_type;
John R. Lenton9ec3a872014-01-10 01:00:20 +0000356
357typedef enum _mp_dict_view_kind_t {
358 MP_DICT_VIEW_ITEMS,
359 MP_DICT_VIEW_KEYS,
360 MP_DICT_VIEW_VALUES,
361} mp_dict_view_kind_t;
362
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200363STATIC char *mp_dict_view_names[] = {"dict_items", "dict_keys", "dict_values"};
John R. Lenton9ec3a872014-01-10 01:00:20 +0000364
365typedef struct _mp_obj_dict_view_it_t {
366 mp_obj_base_t base;
367 mp_dict_view_kind_t kind;
368 mp_obj_dict_it_t *iter;
369 machine_uint_t cur;
370} mp_obj_dict_view_it_t;
371
372typedef struct _mp_obj_dict_view_t {
373 mp_obj_base_t base;
374 mp_obj_dict_t *dict;
375 mp_dict_view_kind_t kind;
376} mp_obj_dict_view_t;
377
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200378STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000379 assert(MP_OBJ_IS_TYPE(self_in, &dict_view_it_type));
380 mp_obj_dict_view_it_t *self = self_in;
381 mp_map_elem_t *next = dict_it_iternext_elem(self->iter);
382
383 if (next != NULL) {
384 switch (self->kind) {
Damien Georgeeae16442014-01-11 19:22:29 +0000385 case MP_DICT_VIEW_ITEMS:
386 {
387 mp_obj_t items[] = {next->key, next->value};
388 return mp_obj_new_tuple(2, items);
389 }
390 case MP_DICT_VIEW_KEYS:
391 return next->key;
392 case MP_DICT_VIEW_VALUES:
393 return next->value;
394 default:
395 assert(0); /* can't happen */
396 return mp_const_none;
John R. Lenton9ec3a872014-01-10 01:00:20 +0000397 }
398 } else {
Damien George66eaf842014-03-26 19:27:58 +0000399 return MP_OBJ_NULL;
John R. Lenton9ec3a872014-01-10 01:00:20 +0000400 }
401}
402
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200403STATIC const mp_obj_type_t dict_view_it_type = {
Damien Georgec5966122014-02-15 16:10:44 +0000404 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +0000405 .name = MP_QSTR_iterator,
Paul Sokolovskyf7eaf602014-03-30 22:00:12 +0300406 .getiter = mp_identity,
John R. Lenton9ec3a872014-01-10 01:00:20 +0000407 .iternext = dict_view_it_iternext,
John R. Lenton9ec3a872014-01-10 01:00:20 +0000408};
409
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200410STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000411 assert(MP_OBJ_IS_TYPE(view_in, &dict_view_type));
412 mp_obj_dict_view_t *view = view_in;
413 mp_obj_dict_view_it_t *o = m_new_obj(mp_obj_dict_view_it_t);
414 o->base.type = &dict_view_it_type;
415 o->kind = view->kind;
416 o->iter = mp_obj_new_dict_iterator(view->dict, 0);
417 return o;
418}
419
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200420STATIC 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 +0000421 assert(MP_OBJ_IS_TYPE(self_in, &dict_view_type));
422 mp_obj_dict_view_t *self = self_in;
423 bool first = true;
424 print(env, mp_dict_view_names[self->kind]);
425 print(env, "([");
426 mp_obj_t *self_iter = dict_view_getiter(self);
427 mp_obj_t *next = NULL;
Damien George66eaf842014-03-26 19:27:58 +0000428 while ((next = dict_view_it_iternext(self_iter)) != MP_OBJ_NULL) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000429 if (!first) {
430 print(env, ", ");
431 }
432 first = false;
Paul Sokolovsky76d982e2014-01-13 19:19:16 +0200433 mp_obj_print_helper(print, env, next, PRINT_REPR);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000434 }
435 print(env, "])");
436}
437
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200438STATIC 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 +0000439 /* only supported for the 'keys' kind until sets and dicts are refactored */
440 mp_obj_dict_view_t *o = lhs_in;
441 if (o->kind != MP_DICT_VIEW_KEYS) return NULL;
Damien Georged17926d2014-03-30 13:35:08 +0100442 if (op != MP_BINARY_OP_IN) return NULL;
John R. Lentonc1bef212014-01-11 12:39:33 +0000443 return dict_binary_op(op, o->dict, rhs_in);
444}
445
446
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200447STATIC const mp_obj_type_t dict_view_type = {
Damien Georgec5966122014-02-15 16:10:44 +0000448 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +0000449 .name = MP_QSTR_dict_view,
John R. Lenton9ec3a872014-01-10 01:00:20 +0000450 .print = dict_view_print,
John R. Lentonc1bef212014-01-11 12:39:33 +0000451 .binary_op = dict_view_binary_op,
John R. Lenton9ec3a872014-01-10 01:00:20 +0000452 .getiter = dict_view_getiter,
453};
454
455mp_obj_t mp_obj_new_dict_view(mp_obj_dict_t *dict, mp_dict_view_kind_t kind) {
456 mp_obj_dict_view_t *o = m_new_obj(mp_obj_dict_view_t);
457 o->base.type = &dict_view_type;
458 o->dict = dict;
459 o->kind = kind;
460 return o;
461}
462
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200463STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) {
Damien George3e1a5c12014-03-29 13:43:38 +0000464 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
John R. Lenton9ec3a872014-01-10 01:00:20 +0000465 mp_obj_dict_t *self = self_in;
466 return mp_obj_new_dict_view(self, kind);
467}
468
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200469STATIC mp_obj_t dict_items(mp_obj_t self_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000470 return dict_view(self_in, MP_DICT_VIEW_ITEMS);
471}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200472STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_items_obj, dict_items);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000473
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200474STATIC mp_obj_t dict_keys(mp_obj_t self_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000475 return dict_view(self_in, MP_DICT_VIEW_KEYS);
476}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200477STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_keys_obj, dict_keys);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000478
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200479STATIC mp_obj_t dict_values(mp_obj_t self_in) {
John R. Lenton9ec3a872014-01-10 01:00:20 +0000480 return dict_view(self_in, MP_DICT_VIEW_VALUES);
481}
Paul Sokolovskyd5df6cd2014-02-12 18:15:40 +0200482STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
John R. Lenton9ec3a872014-01-10 01:00:20 +0000483
John R. Lenton4bee76e2014-01-10 11:25:03 +0000484/******************************************************************************/
Damien Georgeeae16442014-01-11 19:22:29 +0000485/* dict constructors & public C API */
John R. Lentona41fe312014-01-06 17:17:02 +0000486
Damien George9b196cd2014-03-26 21:47:19 +0000487STATIC const mp_map_elem_t dict_locals_dict_table[] = {
488 { MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&dict_clear_obj },
489 { MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&dict_copy_obj },
490 { MP_OBJ_NEW_QSTR(MP_QSTR_fromkeys), (mp_obj_t)&dict_fromkeys_obj },
491 { MP_OBJ_NEW_QSTR(MP_QSTR_get), (mp_obj_t)&dict_get_obj },
492 { MP_OBJ_NEW_QSTR(MP_QSTR_items), (mp_obj_t)&dict_items_obj },
493 { MP_OBJ_NEW_QSTR(MP_QSTR_keys), (mp_obj_t)&dict_keys_obj },
494 { MP_OBJ_NEW_QSTR(MP_QSTR_pop), (mp_obj_t)&dict_pop_obj },
495 { MP_OBJ_NEW_QSTR(MP_QSTR_popitem), (mp_obj_t)&dict_popitem_obj },
496 { MP_OBJ_NEW_QSTR(MP_QSTR_setdefault), (mp_obj_t)&dict_setdefault_obj },
497 { MP_OBJ_NEW_QSTR(MP_QSTR_update), (mp_obj_t)&dict_update_obj },
498 { MP_OBJ_NEW_QSTR(MP_QSTR_values), (mp_obj_t)&dict_values_obj },
Paul Sokolovsky68e7c512014-04-13 11:53:15 +0300499 { MP_OBJ_NEW_QSTR(MP_QSTR___getitem__), (mp_obj_t)&mp_op_getitem_obj },
Paul Sokolovskycd94b382014-04-13 23:41:49 +0300500 { MP_OBJ_NEW_QSTR(MP_QSTR___setitem__), (mp_obj_t)&mp_op_setitem_obj },
John R. Lentonbaa66542014-01-07 23:18:25 +0000501};
502
Damien George9b196cd2014-03-26 21:47:19 +0000503STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);
504
Damien George3e1a5c12014-03-29 13:43:38 +0000505const mp_obj_type_t mp_type_dict = {
Damien Georgec5966122014-02-15 16:10:44 +0000506 { &mp_type_type },
Damien Georgea71c83a2014-02-15 11:34:50 +0000507 .name = MP_QSTR_dict,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +0200508 .print = dict_print,
509 .make_new = dict_make_new,
Damien George4e8dc8c2014-01-27 23:15:32 +0000510 .unary_op = dict_unary_op,
Paul Sokolovsky860ffb02014-01-05 22:34:09 +0200511 .binary_op = dict_binary_op,
Damien Georgef4c9b332014-04-08 21:32:29 +0100512 .store_item = dict_store_item,
John R. Lentona41fe312014-01-06 17:17:02 +0000513 .getiter = dict_getiter,
Damien George9b196cd2014-03-26 21:47:19 +0000514 .locals_dict = (mp_obj_t)&dict_locals_dict,
Damiend99b0522013-12-21 18:17:45 +0000515};
516
Damien George8b0535e2014-04-05 21:53:54 +0100517void mp_obj_dict_init(mp_obj_dict_t *dict, int n_args) {
518 dict->base.type = &mp_type_dict;
519 mp_map_init(&dict->map, n_args);
520}
521
Damiend99b0522013-12-21 18:17:45 +0000522mp_obj_t mp_obj_new_dict(int n_args) {
523 mp_obj_dict_t *o = m_new_obj(mp_obj_dict_t);
Damien George8b0535e2014-04-05 21:53:54 +0100524 mp_obj_dict_init(o, n_args);
Damiend99b0522013-12-21 18:17:45 +0000525 return o;
526}
Damiendae7eb72013-12-29 22:32:51 +0000527
528uint mp_obj_dict_len(mp_obj_t self_in) {
John R. Lentoncd088732014-01-06 18:53:16 +0000529 return ((mp_obj_dict_t *)self_in)->map.used;
Damiendae7eb72013-12-29 22:32:51 +0000530}
531
532mp_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 +0000533 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
Damiendae7eb72013-12-29 22:32:51 +0000534 mp_obj_dict_t *self = self_in;
Damien George38a2da62014-01-08 17:33:12 +0000535 mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
Damiendae7eb72013-12-29 22:32:51 +0000536 return self_in;
537}
Damien George062478e2014-01-09 20:57:50 +0000538
Damien George66edc5d2014-04-05 13:25:13 +0100539mp_obj_t mp_obj_dict_delete(mp_obj_t self_in, mp_obj_t key) {
540 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
541 mp_obj_dict_t *self = self_in;
542 dict_get_helper(&self->map, key, NULL, MP_MAP_LOOKUP_REMOVE_IF_FOUND);
543 return self_in;
544}
545
Damien George062478e2014-01-09 20:57:50 +0000546mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) {
Damien George3e1a5c12014-03-29 13:43:38 +0000547 assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
Damien George062478e2014-01-09 20:57:50 +0000548 mp_obj_dict_t *self = self_in;
549 return &self->map;
550}