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