Damien George | 04b9147 | 2014-05-03 23:27:38 +0100 | [diff] [blame] | 1 | /* |
| 2 | * This file is part of the Micro Python project, http://micropython.org/ |
| 3 | * |
| 4 | * The MIT License (MIT) |
| 5 | * |
| 6 | * Copyright (c) 2013, 2014 Damien P. George |
| 7 | * |
| 8 | * Permission is hereby granted, free of charge, to any person obtaining a copy |
| 9 | * of this software and associated documentation files (the "Software"), to deal |
| 10 | * in the Software without restriction, including without limitation the rights |
| 11 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
| 12 | * copies of the Software, and to permit persons to whom the Software is |
| 13 | * furnished to do so, subject to the following conditions: |
| 14 | * |
| 15 | * The above copyright notice and this permission notice shall be included in |
| 16 | * all copies or substantial portions of the Software. |
| 17 | * |
| 18 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 19 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 20 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| 21 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 22 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| 23 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| 24 | * THE SOFTWARE. |
| 25 | */ |
| 26 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 27 | #include <string.h> |
| 28 | #include <assert.h> |
| 29 | |
Damien George | 51dfcb4 | 2015-01-01 20:27:54 +0000 | [diff] [blame] | 30 | #include "py/nlr.h" |
| 31 | #include "py/obj.h" |
| 32 | #include "py/runtime0.h" |
| 33 | #include "py/runtime.h" |
| 34 | #include "py/builtin.h" |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 35 | #include "py/objtype.h" |
| 36 | |
| 37 | #define MP_OBJ_IS_DICT_TYPE(o) (MP_OBJ_IS_OBJ(o) && ((mp_obj_base_t*)o)->type->make_new == dict_make_new) |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 38 | |
Damien George | 93965e7 | 2014-08-30 13:23:35 +0100 | [diff] [blame] | 39 | STATIC mp_obj_t dict_update(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwargs); |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 40 | |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 41 | // This is a helper function to iterate through a dictionary. The state of |
| 42 | // the iteration is held in *cur and should be initialised with zero for the |
| 43 | // first call. Will return NULL when no more elements are available. |
| 44 | STATIC mp_map_elem_t *dict_iter_next(mp_obj_dict_t *dict, mp_uint_t *cur) { |
| 45 | mp_uint_t max = dict->map.alloc; |
| 46 | mp_map_t *map = &dict->map; |
| 47 | |
| 48 | for (mp_uint_t i = *cur; i < max; i++) { |
| 49 | if (MP_MAP_SLOT_IS_FILLED(map, i)) { |
| 50 | *cur = i + 1; |
| 51 | return &(map->table[i]); |
| 52 | } |
| 53 | } |
| 54 | |
| 55 | return NULL; |
| 56 | } |
| 57 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 58 | 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] | 59 | mp_obj_dict_t *self = self_in; |
| 60 | bool first = true; |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 61 | if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) { |
| 62 | kind = PRINT_REPR; |
| 63 | } |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 64 | if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict) { |
| 65 | print(env, "%s(", qstr_str(self->base.type->name)); |
| 66 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 67 | print(env, "{"); |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 68 | mp_uint_t cur = 0; |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 69 | mp_map_elem_t *next = NULL; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 70 | while ((next = dict_iter_next(self, &cur)) != NULL) { |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 71 | if (!first) { |
| 72 | print(env, ", "); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 73 | } |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 74 | first = false; |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 75 | mp_obj_print_helper(print, env, next->key, kind); |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 76 | print(env, ": "); |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 77 | mp_obj_print_helper(print, env, next->value, kind); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 78 | } |
| 79 | print(env, "}"); |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 80 | if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict) { |
| 81 | print(env, ")"); |
| 82 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 83 | } |
| 84 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 85 | STATIC mp_obj_t dict_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) { |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 86 | mp_obj_dict_t *dict = mp_obj_new_dict(0); |
| 87 | dict->base.type = type_in; |
| 88 | #if MICROPY_PY_COLLECTIONS_ORDEREDDICT |
| 89 | if (type_in == &mp_type_ordereddict) { |
| 90 | dict->map.is_ordered = 1; |
| 91 | } |
| 92 | #endif |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 93 | if (n_args > 0 || n_kw > 0) { |
| 94 | mp_obj_t args2[2] = {dict, args[0]}; // args[0] is always valid, even if it's not a positional arg |
| 95 | mp_map_t kwargs; |
| 96 | mp_map_init_fixed_table(&kwargs, n_kw, args + n_args); |
| 97 | dict_update(n_args + 1, args2, &kwargs); // dict_update will check that n_args + 1 == 1 or 2 |
Damien George | d7aadcf | 2014-04-04 15:08:00 +0100 | [diff] [blame] | 98 | } |
Damien George | d7aadcf | 2014-04-04 15:08:00 +0100 | [diff] [blame] | 99 | return dict; |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 100 | } |
| 101 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 102 | STATIC mp_obj_t dict_unary_op(mp_uint_t op, mp_obj_t self_in) { |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 103 | mp_obj_dict_t *self = self_in; |
| 104 | switch (op) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 105 | case MP_UNARY_OP_BOOL: return MP_BOOL(self->map.used != 0); |
Damien George | bb4c6f3 | 2014-07-31 10:49:14 +0100 | [diff] [blame] | 106 | case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->map.used); |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 107 | default: return MP_OBJ_NULL; // op not supported |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 108 | } |
| 109 | } |
| 110 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 111 | STATIC mp_obj_t dict_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 112 | mp_obj_dict_t *o = lhs_in; |
| 113 | switch (op) { |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 114 | case MP_BINARY_OP_IN: { |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 115 | 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] | 116 | return MP_BOOL(elem != NULL); |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 117 | } |
Paul Sokolovsky | 7cf057a | 2014-04-06 21:20:52 +0300 | [diff] [blame] | 118 | case MP_BINARY_OP_EQUAL: { |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 119 | #if MICROPY_PY_COLLECTIONS_ORDEREDDICT |
| 120 | if (MP_UNLIKELY(MP_OBJ_IS_TYPE(lhs_in, &mp_type_ordereddict) && MP_OBJ_IS_TYPE(rhs_in, &mp_type_ordereddict))) { |
| 121 | //TODO: implement |
| 122 | return MP_OBJ_NULL; |
| 123 | } else |
| 124 | #endif |
Paul Sokolovsky | 7cf057a | 2014-04-06 21:20:52 +0300 | [diff] [blame] | 125 | if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_dict)) { |
| 126 | mp_obj_dict_t *rhs = rhs_in; |
| 127 | if (o->map.used != rhs->map.used) { |
| 128 | return mp_const_false; |
| 129 | } |
| 130 | |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 131 | mp_uint_t cur = 0; |
| 132 | mp_map_elem_t *next = NULL; |
| 133 | while ((next = dict_iter_next(o, &cur)) != NULL) { |
| 134 | mp_map_elem_t *elem = mp_map_lookup(&rhs->map, next->key, MP_MAP_LOOKUP); |
| 135 | if (elem == NULL || !mp_obj_equal(next->value, elem->value)) { |
| 136 | return mp_const_false; |
Paul Sokolovsky | 7cf057a | 2014-04-06 21:20:52 +0300 | [diff] [blame] | 137 | } |
| 138 | } |
| 139 | return mp_const_true; |
Damien George | e22d76e | 2014-04-11 10:52:06 +0000 | [diff] [blame] | 140 | } else { |
| 141 | // dict is not equal to instance of any other type |
| 142 | return mp_const_false; |
Paul Sokolovsky | 7cf057a | 2014-04-06 21:20:52 +0300 | [diff] [blame] | 143 | } |
| 144 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 145 | default: |
| 146 | // op not supported |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 147 | return MP_OBJ_NULL; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 148 | } |
| 149 | } |
| 150 | |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 151 | // TODO: Make sure this is inlined in dict_subscr() below. |
| 152 | mp_obj_t mp_obj_dict_get(mp_obj_t self_in, mp_obj_t index) { |
| 153 | mp_obj_dict_t *self = self_in; |
| 154 | mp_map_elem_t *elem = mp_map_lookup(&self->map, index, MP_MAP_LOOKUP); |
| 155 | if (elem == NULL) { |
| 156 | nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>")); |
| 157 | } else { |
| 158 | return elem->value; |
| 159 | } |
| 160 | } |
| 161 | |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 162 | STATIC mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 163 | if (value == MP_OBJ_NULL) { |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 164 | // delete |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 165 | mp_obj_dict_delete(self_in, index); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 166 | return mp_const_none; |
| 167 | } else if (value == MP_OBJ_SENTINEL) { |
| 168 | // load |
| 169 | mp_obj_dict_t *self = self_in; |
| 170 | mp_map_elem_t *elem = mp_map_lookup(&self->map, index, MP_MAP_LOOKUP); |
| 171 | if (elem == NULL) { |
| 172 | nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>")); |
| 173 | } else { |
| 174 | return elem->value; |
| 175 | } |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 176 | } else { |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 177 | // store |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 178 | mp_obj_dict_store(self_in, index, value); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 179 | return mp_const_none; |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 180 | } |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 181 | } |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 182 | |
| 183 | /******************************************************************************/ |
| 184 | /* dict iterator */ |
| 185 | |
| 186 | typedef struct _mp_obj_dict_it_t { |
| 187 | mp_obj_base_t base; |
| 188 | mp_obj_dict_t *dict; |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 189 | mp_uint_t cur; |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 190 | } mp_obj_dict_it_t; |
| 191 | |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 192 | STATIC mp_obj_t dict_it_iternext(mp_obj_t self_in) { |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 193 | mp_obj_dict_it_t *self = self_in; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 194 | mp_map_elem_t *next = dict_iter_next(self->dict, &self->cur); |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 195 | |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 196 | if (next == NULL) { |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 197 | return MP_OBJ_STOP_ITERATION; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 198 | } else { |
| 199 | return next->key; |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 200 | } |
| 201 | } |
| 202 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 203 | STATIC const mp_obj_type_t mp_type_dict_it = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 204 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 205 | .name = MP_QSTR_iterator, |
Paul Sokolovsky | f7eaf60 | 2014-03-30 22:00:12 +0300 | [diff] [blame] | 206 | .getiter = mp_identity, |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 207 | .iternext = dict_it_iternext, |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 208 | }; |
| 209 | |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 210 | STATIC mp_obj_t dict_getiter(mp_obj_t o_in) { |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 211 | 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] | 212 | o->base.type = &mp_type_dict_it; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 213 | o->dict = o_in; |
| 214 | o->cur = 0; |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 215 | return o; |
| 216 | } |
| 217 | |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 218 | /******************************************************************************/ |
| 219 | /* dict methods */ |
| 220 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 221 | STATIC mp_obj_t dict_clear(mp_obj_t self_in) { |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 222 | assert(MP_OBJ_IS_DICT_TYPE(self_in)); |
John R. Lenton | 4ce6cea | 2014-01-06 17:38:47 +0000 | [diff] [blame] | 223 | mp_obj_dict_t *self = self_in; |
| 224 | |
| 225 | mp_map_clear(&self->map); |
| 226 | |
| 227 | return mp_const_none; |
| 228 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 229 | 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] | 230 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 231 | STATIC mp_obj_t dict_copy(mp_obj_t self_in) { |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 232 | assert(MP_OBJ_IS_DICT_TYPE(self_in)); |
John R. Lenton | d90b19e | 2014-01-06 18:11:20 +0000 | [diff] [blame] | 233 | mp_obj_dict_t *self = self_in; |
| 234 | mp_obj_dict_t *other = mp_obj_new_dict(self->map.alloc); |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 235 | other->base.type = self->base.type; |
John R. Lenton | d90b19e | 2014-01-06 18:11:20 +0000 | [diff] [blame] | 236 | other->map.used = self->map.used; |
Paul Sokolovsky | 5fedd0c | 2014-04-06 21:00:58 +0300 | [diff] [blame] | 237 | other->map.all_keys_are_qstrs = self->map.all_keys_are_qstrs; |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 238 | other->map.is_fixed = 0; |
| 239 | other->map.is_ordered = self->map.is_ordered; |
John R. Lenton | d90b19e | 2014-01-06 18:11:20 +0000 | [diff] [blame] | 240 | memcpy(other->map.table, self->map.table, self->map.alloc * sizeof(mp_map_elem_t)); |
| 241 | return other; |
| 242 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 243 | 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] | 244 | |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 245 | // this is a classmethod |
Damien George | 93965e7 | 2014-08-30 13:23:35 +0100 | [diff] [blame] | 246 | STATIC mp_obj_t dict_fromkeys(mp_uint_t n_args, const mp_obj_t *args) { |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 247 | assert(2 <= n_args && n_args <= 3); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 248 | mp_obj_t iter = mp_getiter(args[1]); |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 249 | mp_obj_t len = mp_obj_len_maybe(iter); |
| 250 | mp_obj_t value = mp_const_none; |
| 251 | mp_obj_t next = NULL; |
| 252 | mp_obj_dict_t *self = NULL; |
| 253 | |
| 254 | if (n_args > 2) { |
| 255 | value = args[2]; |
| 256 | } |
| 257 | |
| 258 | if (len == MP_OBJ_NULL) { |
| 259 | /* object's type doesn't have a __len__ slot */ |
| 260 | self = mp_obj_new_dict(0); |
| 261 | } else { |
| 262 | self = mp_obj_new_dict(MP_OBJ_SMALL_INT_VALUE(len)); |
| 263 | } |
| 264 | |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 265 | while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) { |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 266 | mp_map_lookup(&self->map, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value; |
| 267 | } |
| 268 | |
| 269 | return self; |
| 270 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 271 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_fromkeys_fun_obj, 2, 3, dict_fromkeys); |
| 272 | 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] | 273 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 274 | 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] | 275 | 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] | 276 | mp_obj_t value; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 277 | if (elem == NULL || elem->value == MP_OBJ_NULL) { |
| 278 | if (deflt == MP_OBJ_NULL) { |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 279 | if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) { |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 280 | nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>")); |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 281 | } else { |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 282 | value = mp_const_none; |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 283 | } |
| 284 | } else { |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 285 | value = deflt; |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 286 | } |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 287 | if (lookup_kind == MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) { |
| 288 | elem->value = value; |
| 289 | } |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 290 | } else { |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 291 | value = elem->value; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 292 | if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) { |
| 293 | elem->value = MP_OBJ_NULL; // so that GC can collect the deleted value |
| 294 | } |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 295 | } |
| 296 | return value; |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 297 | } |
| 298 | |
Damien George | 93965e7 | 2014-08-30 13:23:35 +0100 | [diff] [blame] | 299 | STATIC mp_obj_t dict_get(mp_uint_t n_args, const mp_obj_t *args) { |
John R. Lenton | cd08873 | 2014-01-06 18:53:16 +0000 | [diff] [blame] | 300 | assert(2 <= n_args && n_args <= 3); |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 301 | assert(MP_OBJ_IS_DICT_TYPE(args[0])); |
John R. Lenton | cd08873 | 2014-01-06 18:53:16 +0000 | [diff] [blame] | 302 | |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 303 | return dict_get_helper(&((mp_obj_dict_t *)args[0])->map, |
| 304 | args[1], |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 305 | n_args == 3 ? args[2] : MP_OBJ_NULL, |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 306 | MP_MAP_LOOKUP); |
John R. Lenton | cd08873 | 2014-01-06 18:53:16 +0000 | [diff] [blame] | 307 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 308 | 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] | 309 | |
Damien George | 93965e7 | 2014-08-30 13:23:35 +0100 | [diff] [blame] | 310 | STATIC mp_obj_t dict_pop(mp_uint_t n_args, const mp_obj_t *args) { |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 311 | assert(2 <= n_args && n_args <= 3); |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 312 | assert(MP_OBJ_IS_DICT_TYPE(args[0])); |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 313 | |
| 314 | return dict_get_helper(&((mp_obj_dict_t *)args[0])->map, |
| 315 | args[1], |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 316 | n_args == 3 ? args[2] : MP_OBJ_NULL, |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 317 | MP_MAP_LOOKUP_REMOVE_IF_FOUND); |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 318 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 319 | 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] | 320 | |
| 321 | |
Damien George | 93965e7 | 2014-08-30 13:23:35 +0100 | [diff] [blame] | 322 | STATIC mp_obj_t dict_setdefault(mp_uint_t n_args, const mp_obj_t *args) { |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 323 | assert(2 <= n_args && n_args <= 3); |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 324 | assert(MP_OBJ_IS_DICT_TYPE(args[0])); |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 325 | |
| 326 | return dict_get_helper(&((mp_obj_dict_t *)args[0])->map, |
| 327 | args[1], |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 328 | n_args == 3 ? args[2] : MP_OBJ_NULL, |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 329 | MP_MAP_LOOKUP_ADD_IF_NOT_FOUND); |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 330 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 331 | 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] | 332 | |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 333 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 334 | STATIC mp_obj_t dict_popitem(mp_obj_t self_in) { |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 335 | assert(MP_OBJ_IS_DICT_TYPE(self_in)); |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 336 | mp_obj_dict_t *self = self_in; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 337 | mp_uint_t cur = 0; |
| 338 | mp_map_elem_t *next = dict_iter_next(self, &cur); |
| 339 | if (next == NULL) { |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 340 | 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] | 341 | } |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 342 | self->map.used--; |
| 343 | mp_obj_t items[] = {next->key, next->value}; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 344 | next->key = MP_OBJ_SENTINEL; // must mark key as sentinel to indicate that it was deleted |
| 345 | next->value = MP_OBJ_NULL; |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 346 | mp_obj_t tuple = mp_obj_new_tuple(2, items); |
| 347 | |
| 348 | return tuple; |
| 349 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 350 | 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] | 351 | |
Damien George | 93965e7 | 2014-08-30 13:23:35 +0100 | [diff] [blame] | 352 | STATIC mp_obj_t dict_update(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwargs) { |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 353 | assert(MP_OBJ_IS_DICT_TYPE(args[0])); |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 354 | mp_obj_dict_t *self = args[0]; |
| 355 | |
| 356 | mp_arg_check_num(n_args, kwargs->used, 1, 2, true); |
| 357 | |
| 358 | if (n_args == 2) { |
| 359 | // given a positional argument |
| 360 | |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 361 | if (MP_OBJ_IS_DICT_TYPE(args[1])) { |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 362 | // update from other dictionary (make sure other is not self) |
| 363 | if (args[1] != self) { |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 364 | mp_uint_t cur = 0; |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 365 | mp_map_elem_t *elem = NULL; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 366 | while ((elem = dict_iter_next((mp_obj_dict_t*)args[1], &cur)) != NULL) { |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 367 | mp_map_lookup(&self->map, elem->key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = elem->value; |
| 368 | } |
| 369 | } |
John R. Lenton | 88f3043 | 2014-01-06 22:58:17 +0000 | [diff] [blame] | 370 | } else { |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 371 | // update from a generic iterable of pairs |
| 372 | mp_obj_t iter = mp_getiter(args[1]); |
| 373 | mp_obj_t next = NULL; |
| 374 | while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) { |
| 375 | mp_obj_t inneriter = mp_getiter(next); |
| 376 | mp_obj_t key = mp_iternext(inneriter); |
| 377 | mp_obj_t value = mp_iternext(inneriter); |
| 378 | mp_obj_t stop = mp_iternext(inneriter); |
| 379 | if (key == MP_OBJ_STOP_ITERATION |
| 380 | || value == MP_OBJ_STOP_ITERATION |
| 381 | || stop != MP_OBJ_STOP_ITERATION) { |
| 382 | nlr_raise(mp_obj_new_exception_msg( |
| 383 | &mp_type_ValueError, |
| 384 | "dictionary update sequence has the wrong length")); |
| 385 | } else { |
| 386 | mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value; |
| 387 | } |
| 388 | } |
| 389 | } |
| 390 | } |
| 391 | |
| 392 | // update the dict with any keyword args |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 393 | for (mp_uint_t i = 0; i < kwargs->alloc; i++) { |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 394 | if (MP_MAP_SLOT_IS_FILLED(kwargs, i)) { |
| 395 | mp_map_lookup(&self->map, kwargs->table[i].key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = kwargs->table[i].value; |
John R. Lenton | 88f3043 | 2014-01-06 22:58:17 +0000 | [diff] [blame] | 396 | } |
| 397 | } |
| 398 | |
| 399 | return mp_const_none; |
| 400 | } |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 401 | STATIC MP_DEFINE_CONST_FUN_OBJ_KW(dict_update_obj, 1, dict_update); |
John R. Lenton | 88f3043 | 2014-01-06 22:58:17 +0000 | [diff] [blame] | 402 | |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 403 | |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 404 | /******************************************************************************/ |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 405 | /* dict views */ |
| 406 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 407 | STATIC const mp_obj_type_t dict_view_type; |
| 408 | STATIC const mp_obj_type_t dict_view_it_type; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 409 | |
| 410 | typedef enum _mp_dict_view_kind_t { |
| 411 | MP_DICT_VIEW_ITEMS, |
| 412 | MP_DICT_VIEW_KEYS, |
| 413 | MP_DICT_VIEW_VALUES, |
| 414 | } mp_dict_view_kind_t; |
| 415 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 416 | 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] | 417 | |
| 418 | typedef struct _mp_obj_dict_view_it_t { |
| 419 | mp_obj_base_t base; |
| 420 | mp_dict_view_kind_t kind; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 421 | mp_obj_dict_t *dict; |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 422 | mp_uint_t cur; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 423 | } mp_obj_dict_view_it_t; |
| 424 | |
| 425 | typedef struct _mp_obj_dict_view_t { |
| 426 | mp_obj_base_t base; |
| 427 | mp_obj_dict_t *dict; |
| 428 | mp_dict_view_kind_t kind; |
| 429 | } mp_obj_dict_view_t; |
| 430 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 431 | 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] | 432 | assert(MP_OBJ_IS_TYPE(self_in, &dict_view_it_type)); |
| 433 | mp_obj_dict_view_it_t *self = self_in; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 434 | mp_map_elem_t *next = dict_iter_next(self->dict, &self->cur); |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 435 | |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 436 | if (next == NULL) { |
| 437 | return MP_OBJ_STOP_ITERATION; |
| 438 | } else { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 439 | switch (self->kind) { |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 440 | case MP_DICT_VIEW_ITEMS: |
Damien George | d2d64f0 | 2015-01-14 21:32:42 +0000 | [diff] [blame] | 441 | default: { |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 442 | mp_obj_t items[] = {next->key, next->value}; |
| 443 | return mp_obj_new_tuple(2, items); |
| 444 | } |
| 445 | case MP_DICT_VIEW_KEYS: |
| 446 | return next->key; |
| 447 | case MP_DICT_VIEW_VALUES: |
| 448 | return next->value; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 449 | } |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 450 | } |
| 451 | } |
| 452 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 453 | STATIC const mp_obj_type_t dict_view_it_type = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 454 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 455 | .name = MP_QSTR_iterator, |
Paul Sokolovsky | f7eaf60 | 2014-03-30 22:00:12 +0300 | [diff] [blame] | 456 | .getiter = mp_identity, |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 457 | .iternext = dict_view_it_iternext, |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 458 | }; |
| 459 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 460 | 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] | 461 | assert(MP_OBJ_IS_TYPE(view_in, &dict_view_type)); |
| 462 | mp_obj_dict_view_t *view = view_in; |
| 463 | mp_obj_dict_view_it_t *o = m_new_obj(mp_obj_dict_view_it_t); |
| 464 | o->base.type = &dict_view_it_type; |
| 465 | o->kind = view->kind; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 466 | o->dict = view->dict; |
| 467 | o->cur = 0; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 468 | return o; |
| 469 | } |
| 470 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 471 | STATIC void dict_view_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { |
Damien George | ff8dd3f | 2015-01-20 12:47:20 +0000 | [diff] [blame] | 472 | (void)kind; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 473 | assert(MP_OBJ_IS_TYPE(self_in, &dict_view_type)); |
| 474 | mp_obj_dict_view_t *self = self_in; |
| 475 | bool first = true; |
| 476 | print(env, mp_dict_view_names[self->kind]); |
| 477 | print(env, "(["); |
| 478 | mp_obj_t *self_iter = dict_view_getiter(self); |
| 479 | mp_obj_t *next = NULL; |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 480 | while ((next = dict_view_it_iternext(self_iter)) != MP_OBJ_STOP_ITERATION) { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 481 | if (!first) { |
| 482 | print(env, ", "); |
| 483 | } |
| 484 | first = false; |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 485 | mp_obj_print_helper(print, env, next, PRINT_REPR); |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 486 | } |
| 487 | print(env, "])"); |
| 488 | } |
| 489 | |
Damien George | ecc88e9 | 2014-08-30 00:35:11 +0100 | [diff] [blame] | 490 | STATIC mp_obj_t dict_view_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 491 | // only supported for the 'keys' kind until sets and dicts are refactored |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 492 | mp_obj_dict_view_t *o = lhs_in; |
Damien George | d0a5bf3 | 2014-05-10 13:55:11 +0100 | [diff] [blame] | 493 | if (o->kind != MP_DICT_VIEW_KEYS) { |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 494 | return MP_OBJ_NULL; // op not supported |
Damien George | d0a5bf3 | 2014-05-10 13:55:11 +0100 | [diff] [blame] | 495 | } |
| 496 | if (op != MP_BINARY_OP_IN) { |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 497 | return MP_OBJ_NULL; // op not supported |
Damien George | d0a5bf3 | 2014-05-10 13:55:11 +0100 | [diff] [blame] | 498 | } |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 499 | return dict_binary_op(op, o->dict, rhs_in); |
| 500 | } |
| 501 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 502 | STATIC const mp_obj_type_t dict_view_type = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 503 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 504 | .name = MP_QSTR_dict_view, |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 505 | .print = dict_view_print, |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 506 | .binary_op = dict_view_binary_op, |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 507 | .getiter = dict_view_getiter, |
| 508 | }; |
| 509 | |
Damien George | 969a6b3 | 2014-12-10 22:07:04 +0000 | [diff] [blame] | 510 | STATIC mp_obj_t mp_obj_new_dict_view(mp_obj_dict_t *dict, mp_dict_view_kind_t kind) { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 511 | mp_obj_dict_view_t *o = m_new_obj(mp_obj_dict_view_t); |
| 512 | o->base.type = &dict_view_type; |
| 513 | o->dict = dict; |
| 514 | o->kind = kind; |
| 515 | return o; |
| 516 | } |
| 517 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 518 | STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) { |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 519 | assert(MP_OBJ_IS_DICT_TYPE(self_in)); |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 520 | mp_obj_dict_t *self = self_in; |
| 521 | return mp_obj_new_dict_view(self, kind); |
| 522 | } |
| 523 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 524 | STATIC mp_obj_t dict_items(mp_obj_t self_in) { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 525 | return dict_view(self_in, MP_DICT_VIEW_ITEMS); |
| 526 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 527 | 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] | 528 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 529 | STATIC mp_obj_t dict_keys(mp_obj_t self_in) { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 530 | return dict_view(self_in, MP_DICT_VIEW_KEYS); |
| 531 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 532 | 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] | 533 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 534 | STATIC mp_obj_t dict_values(mp_obj_t self_in) { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 535 | return dict_view(self_in, MP_DICT_VIEW_VALUES); |
| 536 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 537 | 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] | 538 | |
John R. Lenton | 4bee76e | 2014-01-10 11:25:03 +0000 | [diff] [blame] | 539 | /******************************************************************************/ |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 540 | /* dict constructors & public C API */ |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 541 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 542 | STATIC const mp_map_elem_t dict_locals_dict_table[] = { |
| 543 | { MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&dict_clear_obj }, |
| 544 | { MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&dict_copy_obj }, |
| 545 | { MP_OBJ_NEW_QSTR(MP_QSTR_fromkeys), (mp_obj_t)&dict_fromkeys_obj }, |
| 546 | { MP_OBJ_NEW_QSTR(MP_QSTR_get), (mp_obj_t)&dict_get_obj }, |
| 547 | { MP_OBJ_NEW_QSTR(MP_QSTR_items), (mp_obj_t)&dict_items_obj }, |
| 548 | { MP_OBJ_NEW_QSTR(MP_QSTR_keys), (mp_obj_t)&dict_keys_obj }, |
| 549 | { MP_OBJ_NEW_QSTR(MP_QSTR_pop), (mp_obj_t)&dict_pop_obj }, |
| 550 | { MP_OBJ_NEW_QSTR(MP_QSTR_popitem), (mp_obj_t)&dict_popitem_obj }, |
| 551 | { MP_OBJ_NEW_QSTR(MP_QSTR_setdefault), (mp_obj_t)&dict_setdefault_obj }, |
| 552 | { MP_OBJ_NEW_QSTR(MP_QSTR_update), (mp_obj_t)&dict_update_obj }, |
| 553 | { MP_OBJ_NEW_QSTR(MP_QSTR_values), (mp_obj_t)&dict_values_obj }, |
Paul Sokolovsky | 68e7c51 | 2014-04-13 11:53:15 +0300 | [diff] [blame] | 554 | { MP_OBJ_NEW_QSTR(MP_QSTR___getitem__), (mp_obj_t)&mp_op_getitem_obj }, |
Paul Sokolovsky | cd94b38 | 2014-04-13 23:41:49 +0300 | [diff] [blame] | 555 | { MP_OBJ_NEW_QSTR(MP_QSTR___setitem__), (mp_obj_t)&mp_op_setitem_obj }, |
Paul Sokolovsky | 14de114 | 2014-04-13 23:55:59 +0300 | [diff] [blame] | 556 | { MP_OBJ_NEW_QSTR(MP_QSTR___delitem__), (mp_obj_t)&mp_op_delitem_obj }, |
John R. Lenton | baa6654 | 2014-01-07 23:18:25 +0000 | [diff] [blame] | 557 | }; |
| 558 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 559 | STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table); |
| 560 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 561 | const mp_obj_type_t mp_type_dict = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 562 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 563 | .name = MP_QSTR_dict, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 564 | .print = dict_print, |
| 565 | .make_new = dict_make_new, |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 566 | .unary_op = dict_unary_op, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 567 | .binary_op = dict_binary_op, |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 568 | .subscr = dict_subscr, |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 569 | .getiter = dict_getiter, |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 570 | .locals_dict = (mp_obj_t)&dict_locals_dict, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 571 | }; |
| 572 | |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 573 | #if MICROPY_PY_COLLECTIONS_ORDEREDDICT |
| 574 | STATIC const mp_obj_tuple_t ordereddict_base_tuple = {{&mp_type_tuple}, 1, {(mp_obj_t)&mp_type_dict}}; |
| 575 | |
| 576 | const mp_obj_type_t mp_type_ordereddict = { |
| 577 | { &mp_type_type }, |
| 578 | .name = MP_QSTR_OrderedDict, |
| 579 | .print = dict_print, |
| 580 | .make_new = dict_make_new, |
| 581 | .unary_op = dict_unary_op, |
| 582 | .binary_op = dict_binary_op, |
| 583 | .subscr = dict_subscr, |
| 584 | .getiter = dict_getiter, |
| 585 | .bases_tuple = (mp_obj_t)&ordereddict_base_tuple, |
| 586 | .locals_dict = (mp_obj_t)&dict_locals_dict, |
| 587 | }; |
| 588 | #endif |
| 589 | |
Damien George | 93965e7 | 2014-08-30 13:23:35 +0100 | [diff] [blame] | 590 | void mp_obj_dict_init(mp_obj_dict_t *dict, mp_uint_t n_args) { |
Damien George | 8b0535e | 2014-04-05 21:53:54 +0100 | [diff] [blame] | 591 | dict->base.type = &mp_type_dict; |
| 592 | mp_map_init(&dict->map, n_args); |
| 593 | } |
| 594 | |
Damien George | 93965e7 | 2014-08-30 13:23:35 +0100 | [diff] [blame] | 595 | mp_obj_t mp_obj_new_dict(mp_uint_t n_args) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 596 | mp_obj_dict_t *o = m_new_obj(mp_obj_dict_t); |
Damien George | 8b0535e | 2014-04-05 21:53:54 +0100 | [diff] [blame] | 597 | mp_obj_dict_init(o, n_args); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 598 | return o; |
| 599 | } |
Damien | dae7eb7 | 2013-12-29 22:32:51 +0000 | [diff] [blame] | 600 | |
Damien George | 93965e7 | 2014-08-30 13:23:35 +0100 | [diff] [blame] | 601 | mp_uint_t mp_obj_dict_len(mp_obj_t self_in) { |
John R. Lenton | cd08873 | 2014-01-06 18:53:16 +0000 | [diff] [blame] | 602 | return ((mp_obj_dict_t *)self_in)->map.used; |
Damien | dae7eb7 | 2013-12-29 22:32:51 +0000 | [diff] [blame] | 603 | } |
| 604 | |
| 605 | mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) { |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 606 | assert(MP_OBJ_IS_DICT_TYPE(self_in)); |
Damien | dae7eb7 | 2013-12-29 22:32:51 +0000 | [diff] [blame] | 607 | mp_obj_dict_t *self = self_in; |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 608 | 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] | 609 | return self_in; |
| 610 | } |
Damien George | 062478e | 2014-01-09 20:57:50 +0000 | [diff] [blame] | 611 | |
Damien George | 66edc5d | 2014-04-05 13:25:13 +0100 | [diff] [blame] | 612 | mp_obj_t mp_obj_dict_delete(mp_obj_t self_in, mp_obj_t key) { |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 613 | assert(MP_OBJ_IS_DICT_TYPE(self_in)); |
Damien George | 66edc5d | 2014-04-05 13:25:13 +0100 | [diff] [blame] | 614 | mp_obj_dict_t *self = self_in; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 615 | dict_get_helper(&self->map, key, MP_OBJ_NULL, MP_MAP_LOOKUP_REMOVE_IF_FOUND); |
Damien George | 66edc5d | 2014-04-05 13:25:13 +0100 | [diff] [blame] | 616 | return self_in; |
| 617 | } |
| 618 | |
Damien George | 062478e | 2014-01-09 20:57:50 +0000 | [diff] [blame] | 619 | mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) { |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 620 | assert(MP_OBJ_IS_DICT_TYPE(self_in)); |
Damien George | 062478e | 2014-01-09 20:57:50 +0000 | [diff] [blame] | 621 | mp_obj_dict_t *self = self_in; |
| 622 | return &self->map; |
| 623 | } |