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