Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 1 | #include <stdlib.h> |
| 2 | #include <stdint.h> |
| 3 | #include <string.h> |
| 4 | #include <assert.h> |
| 5 | |
| 6 | #include "nlr.h" |
| 7 | #include "misc.h" |
| 8 | #include "mpconfig.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 9 | #include "qstr.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 10 | #include "obj.h" |
| 11 | #include "runtime0.h" |
| 12 | #include "runtime.h" |
| 13 | #include "map.h" |
| 14 | |
| 15 | typedef struct _mp_obj_dict_t { |
| 16 | mp_obj_base_t base; |
| 17 | mp_map_t map; |
| 18 | } mp_obj_dict_t; |
| 19 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 20 | STATIC mp_obj_t mp_obj_new_dict_iterator(mp_obj_dict_t *dict, int cur); |
| 21 | STATIC mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in); |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 22 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 23 | STATIC void dict_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 24 | mp_obj_dict_t *self = self_in; |
| 25 | bool first = true; |
| 26 | print(env, "{"); |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 27 | mp_obj_t *dict_iter = mp_obj_new_dict_iterator(self, 0); |
| 28 | mp_map_elem_t *next = NULL; |
| 29 | while ((next = dict_it_iternext_elem(dict_iter)) != NULL) { |
| 30 | if (!first) { |
| 31 | print(env, ", "); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 32 | } |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 33 | first = false; |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 34 | mp_obj_print_helper(print, env, next->key, PRINT_REPR); |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 35 | print(env, ": "); |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 36 | mp_obj_print_helper(print, env, next->value, PRINT_REPR); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 37 | } |
| 38 | print(env, "}"); |
| 39 | } |
| 40 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 41 | STATIC mp_obj_t dict_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 42 | // TODO create from an iterable! |
| 43 | return rt_build_map(0); |
| 44 | } |
| 45 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 46 | STATIC mp_obj_t dict_unary_op(int op, mp_obj_t self_in) { |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 47 | mp_obj_dict_t *self = self_in; |
| 48 | switch (op) { |
Paul Sokolovsky | c1d9bbc | 2014-01-30 04:37:19 +0200 | [diff] [blame] | 49 | case RT_UNARY_OP_BOOL: return MP_BOOL(self->map.used != 0); |
Damien George | 09a0c64 | 2014-01-30 10:05:33 +0000 | [diff] [blame] | 50 | case RT_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT((machine_int_t)self->map.used); |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 51 | default: return MP_OBJ_NULL; // op not supported for None |
| 52 | } |
| 53 | } |
| 54 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 55 | STATIC mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 56 | mp_obj_dict_t *o = lhs_in; |
| 57 | switch (op) { |
| 58 | case RT_BINARY_OP_SUBSCR: |
| 59 | { |
| 60 | // dict load |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 61 | mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 62 | if (elem == NULL) { |
Damien George | eb7bfcb | 2014-01-04 15:57:35 +0000 | [diff] [blame] | 63 | nlr_jump(mp_obj_new_exception_msg(MP_QSTR_KeyError, "<value>")); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 64 | } else { |
| 65 | return elem->value; |
| 66 | } |
| 67 | } |
Damien George | 9aa2a52 | 2014-02-01 23:04:09 +0000 | [diff] [blame] | 68 | case RT_BINARY_OP_IN: |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 69 | { |
| 70 | mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP); |
Damien George | 9aa2a52 | 2014-02-01 23:04:09 +0000 | [diff] [blame] | 71 | return MP_BOOL(elem != NULL); |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 72 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 73 | default: |
| 74 | // op not supported |
| 75 | return NULL; |
| 76 | } |
| 77 | } |
| 78 | |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 79 | |
| 80 | /******************************************************************************/ |
| 81 | /* dict iterator */ |
| 82 | |
| 83 | typedef struct _mp_obj_dict_it_t { |
| 84 | mp_obj_base_t base; |
| 85 | mp_obj_dict_t *dict; |
| 86 | machine_uint_t cur; |
| 87 | } mp_obj_dict_it_t; |
| 88 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 89 | STATIC mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in) { |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 90 | mp_obj_dict_it_t *self = self_in; |
| 91 | machine_uint_t max = self->dict->map.alloc; |
| 92 | mp_map_elem_t *table = self->dict->map.table; |
| 93 | |
| 94 | for (int i = self->cur; i < max; i++) { |
| 95 | if (table[i].key != NULL) { |
| 96 | self->cur = i + 1; |
| 97 | return &(table[i]); |
| 98 | } |
| 99 | } |
| 100 | |
| 101 | return NULL; |
| 102 | } |
| 103 | |
| 104 | mp_obj_t dict_it_iternext(mp_obj_t self_in) { |
| 105 | mp_map_elem_t *next = dict_it_iternext_elem(self_in); |
| 106 | |
| 107 | if (next != NULL) { |
| 108 | return next->key; |
| 109 | } else { |
| 110 | return mp_const_stop_iteration; |
| 111 | } |
| 112 | } |
| 113 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 114 | STATIC const mp_obj_type_t dict_it_type = { |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 115 | { &mp_const_type }, |
| 116 | "dict_iterator", |
| 117 | .iternext = dict_it_iternext, |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 118 | }; |
| 119 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 120 | STATIC mp_obj_t mp_obj_new_dict_iterator(mp_obj_dict_t *dict, int cur) { |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 121 | mp_obj_dict_it_t *o = m_new_obj(mp_obj_dict_it_t); |
| 122 | o->base.type = &dict_it_type; |
| 123 | o->dict = dict; |
| 124 | o->cur = cur; |
| 125 | return o; |
| 126 | } |
| 127 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 128 | STATIC mp_obj_t dict_getiter(mp_obj_t o_in) { |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 129 | return mp_obj_new_dict_iterator(o_in, 0); |
| 130 | } |
| 131 | |
| 132 | /******************************************************************************/ |
| 133 | /* dict methods */ |
| 134 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 135 | STATIC mp_obj_t dict_clear(mp_obj_t self_in) { |
John R. Lenton | 4ce6cea | 2014-01-06 17:38:47 +0000 | [diff] [blame] | 136 | assert(MP_OBJ_IS_TYPE(self_in, &dict_type)); |
| 137 | mp_obj_dict_t *self = self_in; |
| 138 | |
| 139 | mp_map_clear(&self->map); |
| 140 | |
| 141 | return mp_const_none; |
| 142 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 143 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear); |
John R. Lenton | 7d21d51 | 2014-01-06 17:54:04 +0000 | [diff] [blame] | 144 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 145 | STATIC mp_obj_t dict_copy(mp_obj_t self_in) { |
John R. Lenton | d90b19e | 2014-01-06 18:11:20 +0000 | [diff] [blame] | 146 | assert(MP_OBJ_IS_TYPE(self_in, &dict_type)); |
| 147 | mp_obj_dict_t *self = self_in; |
| 148 | mp_obj_dict_t *other = mp_obj_new_dict(self->map.alloc); |
| 149 | other->map.used = self->map.used; |
| 150 | memcpy(other->map.table, self->map.table, self->map.alloc * sizeof(mp_map_elem_t)); |
| 151 | return other; |
| 152 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 153 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy); |
John R. Lenton | 4ce6cea | 2014-01-06 17:38:47 +0000 | [diff] [blame] | 154 | |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 155 | // this is a classmethod |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 156 | STATIC mp_obj_t dict_fromkeys(uint n_args, const mp_obj_t *args) { |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 157 | assert(2 <= n_args && n_args <= 3); |
| 158 | mp_obj_t iter = rt_getiter(args[1]); |
| 159 | mp_obj_t len = mp_obj_len_maybe(iter); |
| 160 | mp_obj_t value = mp_const_none; |
| 161 | mp_obj_t next = NULL; |
| 162 | mp_obj_dict_t *self = NULL; |
| 163 | |
| 164 | if (n_args > 2) { |
| 165 | value = args[2]; |
| 166 | } |
| 167 | |
| 168 | if (len == MP_OBJ_NULL) { |
| 169 | /* object's type doesn't have a __len__ slot */ |
| 170 | self = mp_obj_new_dict(0); |
| 171 | } else { |
| 172 | self = mp_obj_new_dict(MP_OBJ_SMALL_INT_VALUE(len)); |
| 173 | } |
| 174 | |
| 175 | while ((next = rt_iternext(iter)) != mp_const_stop_iteration) { |
| 176 | mp_map_lookup(&self->map, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value; |
| 177 | } |
| 178 | |
| 179 | return self; |
| 180 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 181 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_fromkeys_fun_obj, 2, 3, dict_fromkeys); |
| 182 | STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(dict_fromkeys_obj, (const mp_obj_t)&dict_fromkeys_fun_obj); |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 183 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 184 | 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) { |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 185 | mp_map_elem_t *elem = mp_map_lookup(self, key, lookup_kind); |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 186 | mp_obj_t value; |
| 187 | if (elem == NULL || elem->value == NULL) { |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 188 | if (deflt == NULL) { |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 189 | if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) { |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 190 | nlr_jump(mp_obj_new_exception_msg(MP_QSTR_KeyError, "<value>")); |
| 191 | } else { |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 192 | value = mp_const_none; |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 193 | } |
| 194 | } else { |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 195 | value = deflt; |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 196 | } |
| 197 | } else { |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 198 | value = elem->value; |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 199 | if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) { |
| 200 | // catch the leak (from mp_map_lookup) |
John R. Lenton | 88f3043 | 2014-01-06 22:58:17 +0000 | [diff] [blame] | 201 | m_free(elem, sizeof(mp_map_elem_t)); |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 202 | } |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 203 | } |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 204 | if (lookup_kind == MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) { |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 205 | elem->value = value; |
| 206 | } |
| 207 | return value; |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 208 | } |
| 209 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 210 | STATIC mp_obj_t dict_get(uint n_args, const mp_obj_t *args) { |
John R. Lenton | cd08873 | 2014-01-06 18:53:16 +0000 | [diff] [blame] | 211 | assert(2 <= n_args && n_args <= 3); |
| 212 | assert(MP_OBJ_IS_TYPE(args[0], &dict_type)); |
| 213 | |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 214 | return dict_get_helper(&((mp_obj_dict_t *)args[0])->map, |
| 215 | args[1], |
| 216 | n_args == 3 ? args[2] : NULL, |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 217 | MP_MAP_LOOKUP); |
John R. Lenton | cd08873 | 2014-01-06 18:53:16 +0000 | [diff] [blame] | 218 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 219 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get); |
John R. Lenton | cd08873 | 2014-01-06 18:53:16 +0000 | [diff] [blame] | 220 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 221 | STATIC mp_obj_t dict_pop(uint n_args, const mp_obj_t *args) { |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 222 | assert(2 <= n_args && n_args <= 3); |
| 223 | assert(MP_OBJ_IS_TYPE(args[0], &dict_type)); |
| 224 | |
| 225 | return dict_get_helper(&((mp_obj_dict_t *)args[0])->map, |
| 226 | args[1], |
| 227 | n_args == 3 ? args[2] : NULL, |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 228 | MP_MAP_LOOKUP_REMOVE_IF_FOUND); |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 229 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 230 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop); |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 231 | |
| 232 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 233 | STATIC mp_obj_t dict_setdefault(uint n_args, const mp_obj_t *args) { |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 234 | assert(2 <= n_args && n_args <= 3); |
| 235 | assert(MP_OBJ_IS_TYPE(args[0], &dict_type)); |
| 236 | |
| 237 | return dict_get_helper(&((mp_obj_dict_t *)args[0])->map, |
| 238 | args[1], |
| 239 | n_args == 3 ? args[2] : NULL, |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 240 | MP_MAP_LOOKUP_ADD_IF_NOT_FOUND); |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 241 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 242 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_setdefault_obj, 2, 3, dict_setdefault); |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 243 | |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 244 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 245 | STATIC mp_obj_t dict_popitem(mp_obj_t self_in) { |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 246 | assert(MP_OBJ_IS_TYPE(self_in, &dict_type)); |
| 247 | mp_obj_dict_t *self = self_in; |
| 248 | if (self->map.used == 0) { |
| 249 | nlr_jump(mp_obj_new_exception_msg(MP_QSTR_KeyError, "popitem(): dictionary is empty")); |
| 250 | } |
| 251 | mp_obj_dict_it_t *iter = mp_obj_new_dict_iterator(self, 0); |
| 252 | |
| 253 | mp_map_elem_t *next = dict_it_iternext_elem(iter); |
| 254 | self->map.used--; |
| 255 | mp_obj_t items[] = {next->key, next->value}; |
| 256 | next->key = NULL; |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 257 | next->value = NULL; |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 258 | mp_obj_t tuple = mp_obj_new_tuple(2, items); |
| 259 | |
| 260 | return tuple; |
| 261 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 262 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_popitem_obj, dict_popitem); |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 263 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 264 | STATIC mp_obj_t dict_update(mp_obj_t self_in, mp_obj_t iterable) { |
John R. Lenton | 88f3043 | 2014-01-06 22:58:17 +0000 | [diff] [blame] | 265 | assert(MP_OBJ_IS_TYPE(self_in, &dict_type)); |
| 266 | mp_obj_dict_t *self = self_in; |
| 267 | /* TODO: check for the "keys" method */ |
| 268 | mp_obj_t iter = rt_getiter(iterable); |
| 269 | mp_obj_t next = NULL; |
| 270 | while ((next = rt_iternext(iter)) != mp_const_stop_iteration) { |
| 271 | mp_obj_t inneriter = rt_getiter(next); |
| 272 | mp_obj_t key = rt_iternext(inneriter); |
| 273 | mp_obj_t value = rt_iternext(inneriter); |
| 274 | mp_obj_t stop = rt_iternext(inneriter); |
| 275 | if (key == mp_const_stop_iteration |
| 276 | || value == mp_const_stop_iteration |
| 277 | || stop != mp_const_stop_iteration) { |
| 278 | nlr_jump(mp_obj_new_exception_msg( |
| 279 | MP_QSTR_ValueError, |
| 280 | "dictionary update sequence has the wrong length")); |
| 281 | } else { |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 282 | mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value; |
John R. Lenton | 88f3043 | 2014-01-06 22:58:17 +0000 | [diff] [blame] | 283 | } |
| 284 | } |
| 285 | |
| 286 | return mp_const_none; |
| 287 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 288 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(dict_update_obj, dict_update); |
John R. Lenton | 88f3043 | 2014-01-06 22:58:17 +0000 | [diff] [blame] | 289 | |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 290 | |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 291 | /******************************************************************************/ |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 292 | /* dict views */ |
| 293 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 294 | STATIC const mp_obj_type_t dict_view_type; |
| 295 | STATIC const mp_obj_type_t dict_view_it_type; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 296 | |
| 297 | typedef enum _mp_dict_view_kind_t { |
| 298 | MP_DICT_VIEW_ITEMS, |
| 299 | MP_DICT_VIEW_KEYS, |
| 300 | MP_DICT_VIEW_VALUES, |
| 301 | } mp_dict_view_kind_t; |
| 302 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 303 | STATIC char *mp_dict_view_names[] = {"dict_items", "dict_keys", "dict_values"}; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 304 | |
| 305 | typedef struct _mp_obj_dict_view_it_t { |
| 306 | mp_obj_base_t base; |
| 307 | mp_dict_view_kind_t kind; |
| 308 | mp_obj_dict_it_t *iter; |
| 309 | machine_uint_t cur; |
| 310 | } mp_obj_dict_view_it_t; |
| 311 | |
| 312 | typedef struct _mp_obj_dict_view_t { |
| 313 | mp_obj_base_t base; |
| 314 | mp_obj_dict_t *dict; |
| 315 | mp_dict_view_kind_t kind; |
| 316 | } mp_obj_dict_view_t; |
| 317 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 318 | STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 319 | assert(MP_OBJ_IS_TYPE(self_in, &dict_view_it_type)); |
| 320 | mp_obj_dict_view_it_t *self = self_in; |
| 321 | mp_map_elem_t *next = dict_it_iternext_elem(self->iter); |
| 322 | |
| 323 | if (next != NULL) { |
| 324 | switch (self->kind) { |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 325 | case MP_DICT_VIEW_ITEMS: |
| 326 | { |
| 327 | mp_obj_t items[] = {next->key, next->value}; |
| 328 | return mp_obj_new_tuple(2, items); |
| 329 | } |
| 330 | case MP_DICT_VIEW_KEYS: |
| 331 | return next->key; |
| 332 | case MP_DICT_VIEW_VALUES: |
| 333 | return next->value; |
| 334 | default: |
| 335 | assert(0); /* can't happen */ |
| 336 | return mp_const_none; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 337 | } |
| 338 | } else { |
| 339 | return mp_const_stop_iteration; |
| 340 | } |
| 341 | } |
| 342 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 343 | STATIC const mp_obj_type_t dict_view_it_type = { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 344 | { &mp_const_type }, |
| 345 | "dict_view_iterator", |
| 346 | .iternext = dict_view_it_iternext, |
| 347 | .methods = NULL, /* set operations still to come */ |
| 348 | }; |
| 349 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 350 | STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in) { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 351 | assert(MP_OBJ_IS_TYPE(view_in, &dict_view_type)); |
| 352 | mp_obj_dict_view_t *view = view_in; |
| 353 | mp_obj_dict_view_it_t *o = m_new_obj(mp_obj_dict_view_it_t); |
| 354 | o->base.type = &dict_view_it_type; |
| 355 | o->kind = view->kind; |
| 356 | o->iter = mp_obj_new_dict_iterator(view->dict, 0); |
| 357 | return o; |
| 358 | } |
| 359 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 360 | STATIC 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. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 361 | assert(MP_OBJ_IS_TYPE(self_in, &dict_view_type)); |
| 362 | mp_obj_dict_view_t *self = self_in; |
| 363 | bool first = true; |
| 364 | print(env, mp_dict_view_names[self->kind]); |
| 365 | print(env, "(["); |
| 366 | mp_obj_t *self_iter = dict_view_getiter(self); |
| 367 | mp_obj_t *next = NULL; |
| 368 | while ((next = dict_view_it_iternext(self_iter)) != mp_const_stop_iteration) { |
| 369 | if (!first) { |
| 370 | print(env, ", "); |
| 371 | } |
| 372 | first = false; |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 373 | mp_obj_print_helper(print, env, next, PRINT_REPR); |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 374 | } |
| 375 | print(env, "])"); |
| 376 | } |
| 377 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 378 | STATIC mp_obj_t dict_view_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 379 | /* only supported for the 'keys' kind until sets and dicts are refactored */ |
| 380 | mp_obj_dict_view_t *o = lhs_in; |
| 381 | if (o->kind != MP_DICT_VIEW_KEYS) return NULL; |
Damien George | 9aa2a52 | 2014-02-01 23:04:09 +0000 | [diff] [blame] | 382 | if (op != RT_BINARY_OP_IN) return NULL; |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 383 | return dict_binary_op(op, o->dict, rhs_in); |
| 384 | } |
| 385 | |
| 386 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 387 | STATIC const mp_obj_type_t dict_view_type = { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 388 | { &mp_const_type }, |
| 389 | "dict_view", |
| 390 | .print = dict_view_print, |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 391 | .binary_op = dict_view_binary_op, |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 392 | .getiter = dict_view_getiter, |
| 393 | }; |
| 394 | |
| 395 | mp_obj_t mp_obj_new_dict_view(mp_obj_dict_t *dict, mp_dict_view_kind_t kind) { |
| 396 | mp_obj_dict_view_t *o = m_new_obj(mp_obj_dict_view_t); |
| 397 | o->base.type = &dict_view_type; |
| 398 | o->dict = dict; |
| 399 | o->kind = kind; |
| 400 | return o; |
| 401 | } |
| 402 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 403 | STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 404 | assert(MP_OBJ_IS_TYPE(self_in, &dict_type)); |
| 405 | mp_obj_dict_t *self = self_in; |
| 406 | return mp_obj_new_dict_view(self, kind); |
| 407 | } |
| 408 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 409 | STATIC mp_obj_t dict_items(mp_obj_t self_in) { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 410 | return dict_view(self_in, MP_DICT_VIEW_ITEMS); |
| 411 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 412 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_items_obj, dict_items); |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 413 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 414 | STATIC mp_obj_t dict_keys(mp_obj_t self_in) { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 415 | return dict_view(self_in, MP_DICT_VIEW_KEYS); |
| 416 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 417 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_keys_obj, dict_keys); |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 418 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 419 | STATIC mp_obj_t dict_values(mp_obj_t self_in) { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 420 | return dict_view(self_in, MP_DICT_VIEW_VALUES); |
| 421 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 422 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values); |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 423 | |
John R. Lenton | 4bee76e | 2014-01-10 11:25:03 +0000 | [diff] [blame] | 424 | /******************************************************************************/ |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 425 | /* dict constructors & public C API */ |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 426 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame^] | 427 | STATIC const mp_method_t dict_type_methods[] = { |
John R. Lenton | baa6654 | 2014-01-07 23:18:25 +0000 | [diff] [blame] | 428 | { "clear", &dict_clear_obj }, |
| 429 | { "copy", &dict_copy_obj }, |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 430 | { "fromkeys", &dict_fromkeys_obj }, |
John R. Lenton | baa6654 | 2014-01-07 23:18:25 +0000 | [diff] [blame] | 431 | { "get", &dict_get_obj }, |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 432 | { "items", &dict_items_obj }, |
| 433 | { "keys", &dict_keys_obj }, |
John R. Lenton | baa6654 | 2014-01-07 23:18:25 +0000 | [diff] [blame] | 434 | { "pop", &dict_pop_obj }, |
| 435 | { "popitem", &dict_popitem_obj }, |
| 436 | { "setdefault", &dict_setdefault_obj }, |
| 437 | { "update", &dict_update_obj }, |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 438 | { "values", &dict_values_obj }, |
John R. Lenton | baa6654 | 2014-01-07 23:18:25 +0000 | [diff] [blame] | 439 | { NULL, NULL }, // end-of-list sentinel |
| 440 | }; |
| 441 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 442 | const mp_obj_type_t dict_type = { |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 443 | { &mp_const_type }, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 444 | "dict", |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 445 | .print = dict_print, |
| 446 | .make_new = dict_make_new, |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 447 | .unary_op = dict_unary_op, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 448 | .binary_op = dict_binary_op, |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 449 | .getiter = dict_getiter, |
John R. Lenton | baa6654 | 2014-01-07 23:18:25 +0000 | [diff] [blame] | 450 | .methods = dict_type_methods, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 451 | }; |
| 452 | |
| 453 | mp_obj_t mp_obj_new_dict(int n_args) { |
| 454 | mp_obj_dict_t *o = m_new_obj(mp_obj_dict_t); |
| 455 | o->base.type = &dict_type; |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 456 | mp_map_init(&o->map, n_args); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 457 | return o; |
| 458 | } |
Damien | dae7eb7 | 2013-12-29 22:32:51 +0000 | [diff] [blame] | 459 | |
| 460 | uint mp_obj_dict_len(mp_obj_t self_in) { |
John R. Lenton | cd08873 | 2014-01-06 18:53:16 +0000 | [diff] [blame] | 461 | return ((mp_obj_dict_t *)self_in)->map.used; |
Damien | dae7eb7 | 2013-12-29 22:32:51 +0000 | [diff] [blame] | 462 | } |
| 463 | |
| 464 | mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) { |
| 465 | assert(MP_OBJ_IS_TYPE(self_in, &dict_type)); |
| 466 | mp_obj_dict_t *self = self_in; |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 467 | mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value; |
Damien | dae7eb7 | 2013-12-29 22:32:51 +0000 | [diff] [blame] | 468 | return self_in; |
| 469 | } |
Damien George | 062478e | 2014-01-09 20:57:50 +0000 | [diff] [blame] | 470 | |
| 471 | mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) { |
| 472 | assert(MP_OBJ_IS_TYPE(self_in, &dict_type)); |
| 473 | mp_obj_dict_t *self = self_in; |
| 474 | return &self->map; |
| 475 | } |