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