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