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 |
Paul Sokolovsky | 016d9a4 | 2019-05-14 15:51:57 +0300 | [diff] [blame] | 7 | * Copyright (c) 2014-2017 Paul Sokolovsky |
Damien George | 04b9147 | 2014-05-03 23:27:38 +0100 | [diff] [blame] | 8 | * |
| 9 | * Permission is hereby granted, free of charge, to any person obtaining a copy |
| 10 | * of this software and associated documentation files (the "Software"), to deal |
| 11 | * in the Software without restriction, including without limitation the rights |
| 12 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
| 13 | * copies of the Software, and to permit persons to whom the Software is |
| 14 | * furnished to do so, subject to the following conditions: |
| 15 | * |
| 16 | * The above copyright notice and this permission notice shall be included in |
| 17 | * all copies or substantial portions of the Software. |
| 18 | * |
| 19 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 20 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 21 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| 22 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 23 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| 24 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| 25 | * THE SOFTWARE. |
| 26 | */ |
| 27 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 28 | #include <string.h> |
| 29 | #include <assert.h> |
| 30 | |
Damien George | 51dfcb4 | 2015-01-01 20:27:54 +0000 | [diff] [blame] | 31 | #include "py/runtime.h" |
| 32 | #include "py/builtin.h" |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 33 | #include "py/objtype.h" |
Eric Poulsen | 01054f2 | 2019-07-16 14:29:22 -0700 | [diff] [blame] | 34 | #include "py/objstr.h" |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 35 | |
Jim Mussared | 880875b | 2020-10-09 17:10:29 +1100 | [diff] [blame] | 36 | const mp_obj_dict_t mp_const_empty_dict_obj = { |
| 37 | .base = { .type = &mp_type_dict }, |
| 38 | .map = { |
| 39 | .all_keys_are_qstrs = 0, |
| 40 | .is_fixed = 1, |
| 41 | .is_ordered = 1, |
| 42 | .used = 0, |
| 43 | .alloc = 0, |
| 44 | .table = NULL, |
| 45 | } |
| 46 | }; |
| 47 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 48 | 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] | 49 | |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 50 | // This is a helper function to iterate through a dictionary. The state of |
| 51 | // the iteration is held in *cur and should be initialised with zero for the |
| 52 | // first call. Will return NULL when no more elements are available. |
Damien George | 1ea2f7a | 2017-02-16 16:15:04 +1100 | [diff] [blame] | 53 | STATIC mp_map_elem_t *dict_iter_next(mp_obj_dict_t *dict, size_t *cur) { |
| 54 | size_t max = dict->map.alloc; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 55 | mp_map_t *map = &dict->map; |
| 56 | |
Jim Mussared | 57fce3b | 2020-04-23 01:10:30 +1000 | [diff] [blame] | 57 | size_t i = *cur; |
| 58 | for (; i < max; i++) { |
Damien George | 054dd33 | 2019-01-30 21:57:29 +1100 | [diff] [blame] | 59 | if (mp_map_slot_is_filled(map, i)) { |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 60 | *cur = i + 1; |
| 61 | return &(map->table[i]); |
| 62 | } |
| 63 | } |
| 64 | |
Jim Mussared | 57fce3b | 2020-04-23 01:10:30 +1000 | [diff] [blame] | 65 | assert(map->used == 0 || i == max); |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 66 | return NULL; |
| 67 | } |
| 68 | |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 69 | 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] | 70 | mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 71 | bool first = true; |
Damien George | 612045f | 2014-09-17 22:56:34 +0100 | [diff] [blame] | 72 | if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) { |
| 73 | kind = PRINT_REPR; |
| 74 | } |
Andrew Leech | 1e87f11 | 2019-11-11 15:44:04 +1100 | [diff] [blame] | 75 | if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict && kind != PRINT_JSON) { |
Damien George | 044c473 | 2015-04-11 13:03:37 +0100 | [diff] [blame] | 76 | mp_printf(print, "%q(", self->base.type->name); |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 77 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 78 | mp_print_str(print, "{"); |
Damien George | 1ea2f7a | 2017-02-16 16:15:04 +1100 | [diff] [blame] | 79 | size_t cur = 0; |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 80 | mp_map_elem_t *next = NULL; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 81 | while ((next = dict_iter_next(self, &cur)) != NULL) { |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 82 | if (!first) { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 83 | mp_print_str(print, ", "); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 84 | } |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 85 | first = false; |
Eric Poulsen | 01054f2 | 2019-07-16 14:29:22 -0700 | [diff] [blame] | 86 | bool add_quote = MICROPY_PY_UJSON && kind == PRINT_JSON && !mp_obj_is_str_or_bytes(next->key); |
| 87 | if (add_quote) { |
| 88 | mp_print_str(print, "\""); |
| 89 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 90 | mp_obj_print_helper(print, next->key, kind); |
Eric Poulsen | 01054f2 | 2019-07-16 14:29:22 -0700 | [diff] [blame] | 91 | if (add_quote) { |
| 92 | mp_print_str(print, "\""); |
| 93 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 94 | mp_print_str(print, ": "); |
| 95 | mp_obj_print_helper(print, next->value, kind); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 96 | } |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 97 | mp_print_str(print, "}"); |
Andrew Leech | 1e87f11 | 2019-11-11 15:44:04 +1100 | [diff] [blame] | 98 | if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict && kind != PRINT_JSON) { |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 99 | mp_print_str(print, ")"); |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 100 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 101 | } |
| 102 | |
Damien George | 456a3ab | 2020-06-21 17:10:20 +1000 | [diff] [blame] | 103 | mp_obj_t mp_obj_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] | 104 | mp_obj_t dict_out = mp_obj_new_dict(0); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 105 | mp_obj_dict_t *dict = MP_OBJ_TO_PTR(dict_out); |
Damien George | 5b3f0b7 | 2016-01-03 15:55:55 +0000 | [diff] [blame] | 106 | dict->base.type = type; |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 107 | #if MICROPY_PY_COLLECTIONS_ORDEREDDICT |
Damien George | 5b3f0b7 | 2016-01-03 15:55:55 +0000 | [diff] [blame] | 108 | if (type == &mp_type_ordereddict) { |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 109 | dict->map.is_ordered = 1; |
| 110 | } |
| 111 | #endif |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 112 | if (n_args > 0 || n_kw > 0) { |
Paul Sokolovsky | 0090c71 | 2015-03-26 12:28:31 +0200 | [diff] [blame] | 113 | 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] | 114 | mp_map_t kwargs; |
| 115 | mp_map_init_fixed_table(&kwargs, n_kw, args + n_args); |
| 116 | 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] | 117 | } |
Paul Sokolovsky | 0090c71 | 2015-03-26 12:28:31 +0200 | [diff] [blame] | 118 | return dict_out; |
Damien George | 71c5181 | 2014-01-04 20:21:15 +0000 | [diff] [blame] | 119 | } |
| 120 | |
Damien George | 58321dd | 2017-08-29 13:04:01 +1000 | [diff] [blame] | 121 | 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] | 122 | mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in); |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 123 | switch (op) { |
Damien George | 69661f3 | 2020-02-27 15:36:53 +1100 | [diff] [blame] | 124 | case MP_UNARY_OP_BOOL: |
| 125 | return mp_obj_new_bool(self->map.used != 0); |
| 126 | case MP_UNARY_OP_LEN: |
| 127 | return MP_OBJ_NEW_SMALL_INT(self->map.used); |
Paul Sokolovsky | bfc2092 | 2017-08-11 09:42:39 +0300 | [diff] [blame] | 128 | #if MICROPY_PY_SYS_GETSIZEOF |
| 129 | case MP_UNARY_OP_SIZEOF: { |
| 130 | size_t sz = sizeof(*self) + sizeof(*self->map.table) * self->map.alloc; |
| 131 | return MP_OBJ_NEW_SMALL_INT(sz); |
| 132 | } |
| 133 | #endif |
Damien George | 69661f3 | 2020-02-27 15:36:53 +1100 | [diff] [blame] | 134 | default: |
| 135 | return MP_OBJ_NULL; // op not supported |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 136 | } |
| 137 | } |
| 138 | |
Damien George | 58321dd | 2017-08-29 13:04:01 +1000 | [diff] [blame] | 139 | 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] | 140 | mp_obj_dict_t *o = MP_OBJ_TO_PTR(lhs_in); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 141 | switch (op) { |
Damien George | 5e34a11 | 2017-11-24 13:04:24 +1100 | [diff] [blame] | 142 | case MP_BINARY_OP_CONTAINS: { |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 143 | 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] | 144 | return mp_obj_new_bool(elem != NULL); |
John R. Lenton | c1bef21 | 2014-01-11 12:39:33 +0000 | [diff] [blame] | 145 | } |
Paul Sokolovsky | 7cf057a | 2014-04-06 21:20:52 +0300 | [diff] [blame] | 146 | case MP_BINARY_OP_EQUAL: { |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 147 | #if MICROPY_PY_COLLECTIONS_ORDEREDDICT |
Damien George | eee1e88 | 2019-01-30 18:49:52 +1100 | [diff] [blame] | 148 | 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] | 149 | // Iterate through both dictionaries simultaneously and compare keys and values. |
| 150 | mp_obj_dict_t *rhs = MP_OBJ_TO_PTR(rhs_in); |
Damien George | 1ea2f7a | 2017-02-16 16:15:04 +1100 | [diff] [blame] | 151 | size_t c1 = 0, c2 = 0; |
Mark Anthony Palomer | 3131053 | 2016-06-05 18:48:25 -0700 | [diff] [blame] | 152 | mp_map_elem_t *e1 = dict_iter_next(o, &c1), *e2 = dict_iter_next(rhs, &c2); |
| 153 | for (; e1 != NULL && e2 != NULL; e1 = dict_iter_next(o, &c1), e2 = dict_iter_next(rhs, &c2)) { |
| 154 | if (!mp_obj_equal(e1->key, e2->key) || !mp_obj_equal(e1->value, e2->value)) { |
| 155 | return mp_const_false; |
| 156 | } |
| 157 | } |
| 158 | return e1 == NULL && e2 == NULL ? mp_const_true : mp_const_false; |
Damien George | a1b18b3 | 2020-02-20 00:17:13 +1100 | [diff] [blame] | 159 | } |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 160 | #endif |
Damien George | a1b18b3 | 2020-02-20 00:17:13 +1100 | [diff] [blame] | 161 | |
Damien George | eee1e88 | 2019-01-30 18:49:52 +1100 | [diff] [blame] | 162 | if (mp_obj_is_type(rhs_in, &mp_type_dict)) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 163 | mp_obj_dict_t *rhs = MP_OBJ_TO_PTR(rhs_in); |
Paul Sokolovsky | 7cf057a | 2014-04-06 21:20:52 +0300 | [diff] [blame] | 164 | if (o->map.used != rhs->map.used) { |
| 165 | return mp_const_false; |
| 166 | } |
| 167 | |
Damien George | 1ea2f7a | 2017-02-16 16:15:04 +1100 | [diff] [blame] | 168 | size_t cur = 0; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 169 | mp_map_elem_t *next = NULL; |
| 170 | while ((next = dict_iter_next(o, &cur)) != NULL) { |
| 171 | mp_map_elem_t *elem = mp_map_lookup(&rhs->map, next->key, MP_MAP_LOOKUP); |
| 172 | if (elem == NULL || !mp_obj_equal(next->value, elem->value)) { |
| 173 | return mp_const_false; |
Paul Sokolovsky | 7cf057a | 2014-04-06 21:20:52 +0300 | [diff] [blame] | 174 | } |
| 175 | } |
| 176 | return mp_const_true; |
Damien George | e22d76e | 2014-04-11 10:52:06 +0000 | [diff] [blame] | 177 | } else { |
| 178 | // dict is not equal to instance of any other type |
| 179 | return mp_const_false; |
Paul Sokolovsky | 7cf057a | 2014-04-06 21:20:52 +0300 | [diff] [blame] | 180 | } |
| 181 | } |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 182 | default: |
| 183 | // op not supported |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 184 | return MP_OBJ_NULL; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 185 | } |
| 186 | } |
| 187 | |
Damien George | 814f17a | 2018-09-27 15:14:12 +1000 | [diff] [blame] | 188 | // Note: Make sure this is inlined in load part of dict_subscr() below. |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 189 | 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] | 190 | mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in); |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 191 | mp_map_elem_t *elem = mp_map_lookup(&self->map, index, MP_MAP_LOOKUP); |
| 192 | if (elem == NULL) { |
Damien George | 2750a7b | 2016-10-17 12:00:19 +1100 | [diff] [blame] | 193 | nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, index)); |
Paul Sokolovsky | 75ce925 | 2014-06-05 20:02:15 +0300 | [diff] [blame] | 194 | } else { |
| 195 | return elem->value; |
| 196 | } |
| 197 | } |
| 198 | |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 199 | 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] | 200 | if (value == MP_OBJ_NULL) { |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 201 | // delete |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 202 | mp_obj_dict_delete(self_in, index); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 203 | return mp_const_none; |
| 204 | } else if (value == MP_OBJ_SENTINEL) { |
| 205 | // load |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 206 | mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 207 | mp_map_elem_t *elem = mp_map_lookup(&self->map, index, MP_MAP_LOOKUP); |
| 208 | if (elem == NULL) { |
Damien George | 2750a7b | 2016-10-17 12:00:19 +1100 | [diff] [blame] | 209 | nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, index)); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 210 | } else { |
| 211 | return elem->value; |
| 212 | } |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 213 | } else { |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 214 | // store |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 215 | mp_obj_dict_store(self_in, index, value); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 216 | return mp_const_none; |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 217 | } |
Damien George | f4c9b33 | 2014-04-08 21:32:29 +0100 | [diff] [blame] | 218 | } |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 219 | |
| 220 | /******************************************************************************/ |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 221 | /* dict methods */ |
| 222 | |
Mike Wadsten | a3e01d3 | 2018-02-18 21:51:04 -0600 | [diff] [blame] | 223 | STATIC void mp_ensure_not_fixed(const mp_obj_dict_t *dict) { |
| 224 | if (dict->map.is_fixed) { |
| 225 | mp_raise_TypeError(NULL); |
| 226 | } |
| 227 | } |
| 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) { |
Damien George | 456a3ab | 2020-06-21 17:10:20 +1000 | [diff] [blame] | 230 | mp_check_self(mp_obj_is_dict_or_ordereddict(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); |
Mike Wadsten | a3e01d3 | 2018-02-18 21:51:04 -0600 | [diff] [blame] | 232 | mp_ensure_not_fixed(self); |
John R. Lenton | 4ce6cea | 2014-01-06 17:38:47 +0000 | [diff] [blame] | 233 | |
| 234 | mp_map_clear(&self->map); |
| 235 | |
| 236 | return mp_const_none; |
| 237 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 238 | 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] | 239 | |
Andrew Leech | 28370c0 | 2020-06-10 10:45:24 +1000 | [diff] [blame] | 240 | mp_obj_t mp_obj_dict_copy(mp_obj_t self_in) { |
Damien George | 456a3ab | 2020-06-21 17:10:20 +1000 | [diff] [blame] | 241 | mp_check_self(mp_obj_is_dict_or_ordereddict(self_in)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 242 | mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in); |
Paul Sokolovsky | 0090c71 | 2015-03-26 12:28:31 +0200 | [diff] [blame] | 243 | mp_obj_t other_out = mp_obj_new_dict(self->map.alloc); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 244 | mp_obj_dict_t *other = MP_OBJ_TO_PTR(other_out); |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 245 | other->base.type = self->base.type; |
John R. Lenton | d90b19e | 2014-01-06 18:11:20 +0000 | [diff] [blame] | 246 | other->map.used = self->map.used; |
Paul Sokolovsky | 5fedd0c | 2014-04-06 21:00:58 +0300 | [diff] [blame] | 247 | other->map.all_keys_are_qstrs = self->map.all_keys_are_qstrs; |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 248 | other->map.is_fixed = 0; |
| 249 | other->map.is_ordered = self->map.is_ordered; |
John R. Lenton | d90b19e | 2014-01-06 18:11:20 +0000 | [diff] [blame] | 250 | 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] | 251 | return other_out; |
John R. Lenton | d90b19e | 2014-01-06 18:11:20 +0000 | [diff] [blame] | 252 | } |
Andrew Leech | 28370c0 | 2020-06-10 10:45:24 +1000 | [diff] [blame] | 253 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, mp_obj_dict_copy); |
John R. Lenton | 4ce6cea | 2014-01-06 17:38:47 +0000 | [diff] [blame] | 254 | |
Paul Sokolovsky | fbb8335 | 2018-08-06 01:25:41 +0300 | [diff] [blame] | 255 | #if MICROPY_PY_BUILTINS_DICT_FROMKEYS |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 256 | // this is a classmethod |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 257 | 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] | 258 | mp_obj_t iter = mp_getiter(args[1], NULL); |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 259 | mp_obj_t value = mp_const_none; |
Damien George | 83229d3 | 2015-11-20 14:09:20 +0000 | [diff] [blame] | 260 | mp_obj_t next = MP_OBJ_NULL; |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 261 | |
| 262 | if (n_args > 2) { |
| 263 | value = args[2]; |
| 264 | } |
| 265 | |
Damien George | a3edeb9 | 2016-10-17 11:58:57 +1100 | [diff] [blame] | 266 | // optimisation to allocate result based on len of argument |
| 267 | mp_obj_t self_out; |
| 268 | mp_obj_t len = mp_obj_len_maybe(args[1]); |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 269 | if (len == MP_OBJ_NULL) { |
| 270 | /* object's type doesn't have a __len__ slot */ |
Paul Sokolovsky | 0090c71 | 2015-03-26 12:28:31 +0200 | [diff] [blame] | 271 | self_out = mp_obj_new_dict(0); |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 272 | } else { |
Paul Sokolovsky | 0090c71 | 2015-03-26 12:28:31 +0200 | [diff] [blame] | 273 | self_out = mp_obj_new_dict(MP_OBJ_SMALL_INT_VALUE(len)); |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 274 | } |
| 275 | |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 276 | mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_out); |
Damien George | ea8d06c | 2014-04-17 23:19:36 +0100 | [diff] [blame] | 277 | while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) { |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 278 | mp_map_lookup(&self->map, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value; |
| 279 | } |
| 280 | |
Paul Sokolovsky | 0090c71 | 2015-03-26 12:28:31 +0200 | [diff] [blame] | 281 | return self_out; |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 282 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 283 | 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] | 284 | STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(dict_fromkeys_obj, MP_ROM_PTR(&dict_fromkeys_fun_obj)); |
Paul Sokolovsky | fbb8335 | 2018-08-06 01:25:41 +0300 | [diff] [blame] | 285 | #endif |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 286 | |
Damien George | 8b84b8a | 2017-07-04 23:24:59 +1000 | [diff] [blame] | 287 | STATIC mp_obj_t dict_get_helper(size_t n_args, const mp_obj_t *args, mp_map_lookup_kind_t lookup_kind) { |
Damien George | 456a3ab | 2020-06-21 17:10:20 +1000 | [diff] [blame] | 288 | mp_check_self(mp_obj_is_dict_or_ordereddict(args[0])); |
Damien George | 8b84b8a | 2017-07-04 23:24:59 +1000 | [diff] [blame] | 289 | mp_obj_dict_t *self = MP_OBJ_TO_PTR(args[0]); |
Mike Wadsten | a3e01d3 | 2018-02-18 21:51:04 -0600 | [diff] [blame] | 290 | if (lookup_kind != MP_MAP_LOOKUP) { |
| 291 | mp_ensure_not_fixed(self); |
| 292 | } |
Damien George | 8b84b8a | 2017-07-04 23:24:59 +1000 | [diff] [blame] | 293 | 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] | 294 | mp_obj_t value; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 295 | if (elem == NULL || elem->value == MP_OBJ_NULL) { |
Damien George | 8b84b8a | 2017-07-04 23:24:59 +1000 | [diff] [blame] | 296 | if (n_args == 2) { |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 297 | if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) { |
Damien George | 8b84b8a | 2017-07-04 23:24:59 +1000 | [diff] [blame] | 298 | 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] | 299 | } else { |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 300 | value = mp_const_none; |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 301 | } |
| 302 | } else { |
Damien George | 8b84b8a | 2017-07-04 23:24:59 +1000 | [diff] [blame] | 303 | value = args[2]; |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 304 | } |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 305 | if (lookup_kind == MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) { |
| 306 | elem->value = value; |
| 307 | } |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 308 | } else { |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 309 | value = elem->value; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 310 | if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) { |
| 311 | elem->value = MP_OBJ_NULL; // so that GC can collect the deleted value |
| 312 | } |
John R. Lenton | be8fe5b | 2014-01-06 20:25:51 +0000 | [diff] [blame] | 313 | } |
| 314 | return value; |
John R. Lenton | 0fcbaa4 | 2014-01-06 19:48:34 +0000 | [diff] [blame] | 315 | } |
| 316 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 317 | 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] | 318 | return dict_get_helper(n_args, args, MP_MAP_LOOKUP); |
John R. Lenton | cd08873 | 2014-01-06 18:53:16 +0000 | [diff] [blame] | 319 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 320 | 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] | 321 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 322 | 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] | 323 | 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] | 324 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 325 | 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] | 326 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 327 | 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] | 328 | 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] | 329 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 330 | 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] | 331 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 332 | STATIC mp_obj_t dict_popitem(mp_obj_t self_in) { |
Damien George | 456a3ab | 2020-06-21 17:10:20 +1000 | [diff] [blame] | 333 | mp_check_self(mp_obj_is_dict_or_ordereddict(self_in)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 334 | mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in); |
Mike Wadsten | a3e01d3 | 2018-02-18 21:51:04 -0600 | [diff] [blame] | 335 | mp_ensure_not_fixed(self); |
Jim Mussared | 57fce3b | 2020-04-23 01:10:30 +1000 | [diff] [blame] | 336 | if (self->map.used == 0) { |
Jim Mussared | def76fe | 2020-03-02 22:35:22 +1100 | [diff] [blame] | 337 | mp_raise_msg(&mp_type_KeyError, MP_ERROR_TEXT("popitem(): dictionary is empty")); |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 338 | } |
Jim Mussared | 57fce3b | 2020-04-23 01:10:30 +1000 | [diff] [blame] | 339 | size_t cur = 0; |
| 340 | #if MICROPY_PY_COLLECTIONS_ORDEREDDICT |
| 341 | if (self->map.is_ordered) { |
| 342 | cur = self->map.used - 1; |
| 343 | } |
| 344 | #endif |
| 345 | mp_map_elem_t *next = dict_iter_next(self, &cur); |
| 346 | assert(next); |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 347 | self->map.used--; |
| 348 | mp_obj_t items[] = {next->key, next->value}; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 349 | next->key = MP_OBJ_SENTINEL; // must mark key as sentinel to indicate that it was deleted |
| 350 | next->value = MP_OBJ_NULL; |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 351 | mp_obj_t tuple = mp_obj_new_tuple(2, items); |
| 352 | |
| 353 | return tuple; |
| 354 | } |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 355 | 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] | 356 | |
Damien George | 4b72b3a | 2016-01-03 14:21:40 +0000 | [diff] [blame] | 357 | STATIC mp_obj_t dict_update(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) { |
Damien George | 456a3ab | 2020-06-21 17:10:20 +1000 | [diff] [blame] | 358 | mp_check_self(mp_obj_is_dict_or_ordereddict(args[0])); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 359 | mp_obj_dict_t *self = MP_OBJ_TO_PTR(args[0]); |
Mike Wadsten | a3e01d3 | 2018-02-18 21:51:04 -0600 | [diff] [blame] | 360 | mp_ensure_not_fixed(self); |
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 | |
Damien George | 456a3ab | 2020-06-21 17:10:20 +1000 | [diff] [blame] | 367 | if (mp_obj_is_dict_or_ordereddict(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 | 1ea2f7a | 2017-02-16 16:15:04 +1100 | [diff] [blame] | 370 | size_t cur = 0; |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 371 | mp_map_elem_t *elem = NULL; |
Damien George | 69661f3 | 2020-02-27 15:36:53 +1100 | [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 |
Damien George | e6003f4 | 2017-02-13 15:44:31 +1100 | [diff] [blame] | 378 | mp_obj_t iter = mp_getiter(args[1], NULL); |
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) { |
Damien George | e6003f4 | 2017-02-13 15:44:31 +1100 | [diff] [blame] | 381 | mp_obj_t inneriter = mp_getiter(next, NULL); |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 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) { |
Jim Mussared | def76fe | 2020-03-02 22:35:22 +1100 | [diff] [blame] | 388 | mp_raise_ValueError(MP_ERROR_TEXT("dict update sequence has wrong length")); |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 389 | } else { |
| 390 | mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value; |
| 391 | } |
| 392 | } |
| 393 | } |
| 394 | } |
| 395 | |
| 396 | // update the dict with any keyword args |
Damien George | 1ea2f7a | 2017-02-16 16:15:04 +1100 | [diff] [blame] | 397 | for (size_t i = 0; i < kwargs->alloc; i++) { |
Damien George | 054dd33 | 2019-01-30 21:57:29 +1100 | [diff] [blame] | 398 | if (mp_map_slot_is_filled(kwargs, i)) { |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 399 | 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] | 400 | } |
| 401 | } |
| 402 | |
| 403 | return mp_const_none; |
| 404 | } |
Damien George | bcb6ca4 | 2014-06-03 12:53:44 +0100 | [diff] [blame] | 405 | 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] | 406 | |
John R. Lenton | f77dce8 | 2014-01-06 20:08:52 +0000 | [diff] [blame] | 407 | |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 408 | /******************************************************************************/ |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 409 | /* dict views */ |
| 410 | |
Damien George | 9fef1c0 | 2021-03-26 13:48:34 +1100 | [diff] [blame^] | 411 | STATIC const mp_obj_type_t mp_type_dict_view; |
| 412 | STATIC const mp_obj_type_t mp_type_dict_view_it; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 413 | |
| 414 | typedef enum _mp_dict_view_kind_t { |
| 415 | MP_DICT_VIEW_ITEMS, |
| 416 | MP_DICT_VIEW_KEYS, |
| 417 | MP_DICT_VIEW_VALUES, |
| 418 | } mp_dict_view_kind_t; |
| 419 | |
Damien George | 3ff16ff | 2016-05-20 12:38:15 +0100 | [diff] [blame] | 420 | 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] | 421 | |
| 422 | typedef struct _mp_obj_dict_view_it_t { |
| 423 | mp_obj_base_t base; |
| 424 | mp_dict_view_kind_t kind; |
Paul Sokolovsky | 0090c71 | 2015-03-26 12:28:31 +0200 | [diff] [blame] | 425 | mp_obj_t dict; |
Damien George | 1ea2f7a | 2017-02-16 16:15:04 +1100 | [diff] [blame] | 426 | size_t cur; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 427 | } mp_obj_dict_view_it_t; |
| 428 | |
| 429 | typedef struct _mp_obj_dict_view_t { |
| 430 | mp_obj_base_t base; |
Paul Sokolovsky | 0090c71 | 2015-03-26 12:28:31 +0200 | [diff] [blame] | 431 | mp_obj_t dict; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 432 | mp_dict_view_kind_t kind; |
| 433 | } mp_obj_dict_view_t; |
| 434 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 435 | STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) { |
Damien George | 9fef1c0 | 2021-03-26 13:48:34 +1100 | [diff] [blame^] | 436 | mp_check_self(mp_obj_is_type(self_in, &mp_type_dict_view_it)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 437 | mp_obj_dict_view_it_t *self = MP_OBJ_TO_PTR(self_in); |
| 438 | 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] | 439 | |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 440 | if (next == NULL) { |
| 441 | return MP_OBJ_STOP_ITERATION; |
| 442 | } else { |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 443 | switch (self->kind) { |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 444 | case MP_DICT_VIEW_ITEMS: |
Damien George | d2d64f0 | 2015-01-14 21:32:42 +0000 | [diff] [blame] | 445 | default: { |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 446 | mp_obj_t items[] = {next->key, next->value}; |
| 447 | return mp_obj_new_tuple(2, items); |
| 448 | } |
| 449 | case MP_DICT_VIEW_KEYS: |
| 450 | return next->key; |
| 451 | case MP_DICT_VIEW_VALUES: |
| 452 | return next->value; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 453 | } |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 454 | } |
| 455 | } |
| 456 | |
Damien George | 9fef1c0 | 2021-03-26 13:48:34 +1100 | [diff] [blame^] | 457 | STATIC const mp_obj_type_t mp_type_dict_view_it = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 458 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 459 | .name = MP_QSTR_iterator, |
Damien George | ae8d867 | 2016-01-09 23:14:54 +0000 | [diff] [blame] | 460 | .getiter = mp_identity_getiter, |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 461 | .iternext = dict_view_it_iternext, |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 462 | }; |
| 463 | |
Damien George | ae8d867 | 2016-01-09 23:14:54 +0000 | [diff] [blame] | 464 | STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in, mp_obj_iter_buf_t *iter_buf) { |
| 465 | assert(sizeof(mp_obj_dict_view_it_t) <= sizeof(mp_obj_iter_buf_t)); |
Damien George | 9fef1c0 | 2021-03-26 13:48:34 +1100 | [diff] [blame^] | 466 | mp_check_self(mp_obj_is_type(view_in, &mp_type_dict_view)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 467 | mp_obj_dict_view_t *view = MP_OBJ_TO_PTR(view_in); |
Damien George | 69661f3 | 2020-02-27 15:36:53 +1100 | [diff] [blame] | 468 | mp_obj_dict_view_it_t *o = (mp_obj_dict_view_it_t *)iter_buf; |
Damien George | 9fef1c0 | 2021-03-26 13:48:34 +1100 | [diff] [blame^] | 469 | o->base.type = &mp_type_dict_view_it; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 470 | o->kind = view->kind; |
Damien George | 8a9b999 | 2014-09-17 15:53:03 +0100 | [diff] [blame] | 471 | o->dict = view->dict; |
| 472 | o->cur = 0; |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 473 | return MP_OBJ_FROM_PTR(o); |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 474 | } |
| 475 | |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 476 | 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] | 477 | (void)kind; |
Damien George | 9fef1c0 | 2021-03-26 13:48:34 +1100 | [diff] [blame^] | 478 | mp_check_self(mp_obj_is_type(self_in, &mp_type_dict_view)); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 479 | 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] | 480 | bool first = true; |
Damien George | 7f9d1d6 | 2015-04-09 23:56:15 +0100 | [diff] [blame] | 481 | mp_print_str(print, mp_dict_view_names[self->kind]); |
| 482 | mp_print_str(print, "(["); |
Damien George | ae8d867 | 2016-01-09 23:14:54 +0000 | [diff] [blame] | 483 | mp_obj_iter_buf_t iter_buf; |
| 484 | mp_obj_t self_iter = dict_view_getiter(self_in, &iter_buf); |
Paul Sokolovsky | 0090c71 | 2015-03-26 12:28:31 +0200 | [diff] [blame] | 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 | 58321dd | 2017-08-29 13:04:01 +1000 | [diff] [blame] | 496 | 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] | 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 | } |
Damien George | 5e34a11 | 2017-11-24 13:04:24 +1100 | [diff] [blame] | 502 | if (op != MP_BINARY_OP_CONTAINS) { |
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 | |
Damien George | 9fef1c0 | 2021-03-26 13:48:34 +1100 | [diff] [blame^] | 508 | STATIC const mp_obj_type_t mp_type_dict_view = { |
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); |
Damien George | 9fef1c0 | 2021-03-26 13:48:34 +1100 | [diff] [blame^] | 518 | o->base.type = &mp_type_dict_view; |
John R. Lenton | 9ec3a87 | 2014-01-10 01:00:20 +0000 | [diff] [blame] | 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) { |
Damien George | 456a3ab | 2020-06-21 17:10:20 +1000 | [diff] [blame] | 525 | mp_check_self(mp_obj_is_dict_or_ordereddict(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 | 2161d6b | 2017-11-27 23:40:31 +1100 | [diff] [blame] | 545 | /* dict iterator */ |
| 546 | |
| 547 | STATIC mp_obj_t dict_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) { |
| 548 | assert(sizeof(mp_obj_dict_view_it_t) <= sizeof(mp_obj_iter_buf_t)); |
Damien George | 456a3ab | 2020-06-21 17:10:20 +1000 | [diff] [blame] | 549 | mp_check_self(mp_obj_is_dict_or_ordereddict(self_in)); |
Damien George | 69661f3 | 2020-02-27 15:36:53 +1100 | [diff] [blame] | 550 | mp_obj_dict_view_it_t *o = (mp_obj_dict_view_it_t *)iter_buf; |
Damien George | 9fef1c0 | 2021-03-26 13:48:34 +1100 | [diff] [blame^] | 551 | o->base.type = &mp_type_dict_view_it; |
Damien George | 2161d6b | 2017-11-27 23:40:31 +1100 | [diff] [blame] | 552 | o->kind = MP_DICT_VIEW_KEYS; |
| 553 | o->dict = self_in; |
| 554 | o->cur = 0; |
| 555 | return MP_OBJ_FROM_PTR(o); |
| 556 | } |
| 557 | |
| 558 | /******************************************************************************/ |
Damien George | eae1644 | 2014-01-11 19:22:29 +0000 | [diff] [blame] | 559 | /* dict constructors & public C API */ |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 560 | |
Damien George | cbf7674 | 2015-11-27 13:38:15 +0000 | [diff] [blame] | 561 | STATIC const mp_rom_map_elem_t dict_locals_dict_table[] = { |
| 562 | { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&dict_clear_obj) }, |
| 563 | { MP_ROM_QSTR(MP_QSTR_copy), MP_ROM_PTR(&dict_copy_obj) }, |
Paul Sokolovsky | fbb8335 | 2018-08-06 01:25:41 +0300 | [diff] [blame] | 564 | #if MICROPY_PY_BUILTINS_DICT_FROMKEYS |
Damien George | cbf7674 | 2015-11-27 13:38:15 +0000 | [diff] [blame] | 565 | { MP_ROM_QSTR(MP_QSTR_fromkeys), MP_ROM_PTR(&dict_fromkeys_obj) }, |
Paul Sokolovsky | fbb8335 | 2018-08-06 01:25:41 +0300 | [diff] [blame] | 566 | #endif |
Damien George | cbf7674 | 2015-11-27 13:38:15 +0000 | [diff] [blame] | 567 | { MP_ROM_QSTR(MP_QSTR_get), MP_ROM_PTR(&dict_get_obj) }, |
| 568 | { MP_ROM_QSTR(MP_QSTR_items), MP_ROM_PTR(&dict_items_obj) }, |
| 569 | { MP_ROM_QSTR(MP_QSTR_keys), MP_ROM_PTR(&dict_keys_obj) }, |
| 570 | { MP_ROM_QSTR(MP_QSTR_pop), MP_ROM_PTR(&dict_pop_obj) }, |
| 571 | { MP_ROM_QSTR(MP_QSTR_popitem), MP_ROM_PTR(&dict_popitem_obj) }, |
| 572 | { MP_ROM_QSTR(MP_QSTR_setdefault), MP_ROM_PTR(&dict_setdefault_obj) }, |
| 573 | { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&dict_update_obj) }, |
| 574 | { MP_ROM_QSTR(MP_QSTR_values), MP_ROM_PTR(&dict_values_obj) }, |
| 575 | { MP_ROM_QSTR(MP_QSTR___getitem__), MP_ROM_PTR(&mp_op_getitem_obj) }, |
| 576 | { MP_ROM_QSTR(MP_QSTR___setitem__), MP_ROM_PTR(&mp_op_setitem_obj) }, |
| 577 | { 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] | 578 | }; |
| 579 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 580 | STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table); |
| 581 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 582 | const mp_obj_type_t mp_type_dict = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 583 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 584 | .name = MP_QSTR_dict, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 585 | .print = dict_print, |
Damien George | 456a3ab | 2020-06-21 17:10:20 +1000 | [diff] [blame] | 586 | .make_new = mp_obj_dict_make_new, |
Damien George | 4e8dc8c | 2014-01-27 23:15:32 +0000 | [diff] [blame] | 587 | .unary_op = dict_unary_op, |
Paul Sokolovsky | 860ffb0 | 2014-01-05 22:34:09 +0200 | [diff] [blame] | 588 | .binary_op = dict_binary_op, |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 589 | .subscr = dict_subscr, |
John R. Lenton | a41fe31 | 2014-01-06 17:17:02 +0000 | [diff] [blame] | 590 | .getiter = dict_getiter, |
Damien George | 69661f3 | 2020-02-27 15:36:53 +1100 | [diff] [blame] | 591 | .locals_dict = (mp_obj_dict_t *)&dict_locals_dict, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 592 | }; |
| 593 | |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 594 | #if MICROPY_PY_COLLECTIONS_ORDEREDDICT |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 595 | const mp_obj_type_t mp_type_ordereddict = { |
| 596 | { &mp_type_type }, |
| 597 | .name = MP_QSTR_OrderedDict, |
| 598 | .print = dict_print, |
Damien George | 456a3ab | 2020-06-21 17:10:20 +1000 | [diff] [blame] | 599 | .make_new = mp_obj_dict_make_new, |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 600 | .unary_op = dict_unary_op, |
| 601 | .binary_op = dict_binary_op, |
| 602 | .subscr = dict_subscr, |
| 603 | .getiter = dict_getiter, |
Damien George | 816413e | 2017-04-06 12:09:01 +1000 | [diff] [blame] | 604 | .parent = &mp_type_dict, |
Damien George | 69661f3 | 2020-02-27 15:36:53 +1100 | [diff] [blame] | 605 | .locals_dict = (mp_obj_dict_t *)&dict_locals_dict, |
Paul Sokolovsky | 0ef01d0 | 2015-03-18 01:25:04 +0200 | [diff] [blame] | 606 | }; |
| 607 | #endif |
| 608 | |
Damien George | 1ea2f7a | 2017-02-16 16:15:04 +1100 | [diff] [blame] | 609 | 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] | 610 | dict->base.type = &mp_type_dict; |
| 611 | mp_map_init(&dict->map, n_args); |
| 612 | } |
| 613 | |
Damien George | 1ea2f7a | 2017-02-16 16:15:04 +1100 | [diff] [blame] | 614 | mp_obj_t mp_obj_new_dict(size_t n_args) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 615 | mp_obj_dict_t *o = m_new_obj(mp_obj_dict_t); |
Damien George | 8b0535e | 2014-04-05 21:53:54 +0100 | [diff] [blame] | 616 | mp_obj_dict_init(o, n_args); |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 617 | return MP_OBJ_FROM_PTR(o); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 618 | } |
Damien | dae7eb7 | 2013-12-29 22:32:51 +0000 | [diff] [blame] | 619 | |
Damien George | 1ea2f7a | 2017-02-16 16:15:04 +1100 | [diff] [blame] | 620 | size_t mp_obj_dict_len(mp_obj_t self_in) { |
Damien George | 999cedb | 2015-11-27 17:01:44 +0000 | [diff] [blame] | 621 | mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in); |
Paul Sokolovsky | 0090c71 | 2015-03-26 12:28:31 +0200 | [diff] [blame] | 622 | return self->map.used; |
Damien | dae7eb7 | 2013-12-29 22:32:51 +0000 | [diff] [blame] | 623 | } |
| 624 | |
| 625 | mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) { |
Damien George | 456a3ab | 2020-06-21 17:10:20 +1000 | [diff] [blame] | 626 | mp_check_self(mp_obj_is_dict_or_ordereddict(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); |
Mike Wadsten | a3e01d3 | 2018-02-18 21:51:04 -0600 | [diff] [blame] | 628 | mp_ensure_not_fixed(self); |
Damien George | 38a2da6 | 2014-01-08 17:33:12 +0000 | [diff] [blame] | 629 | 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] | 630 | return self_in; |
| 631 | } |
Damien George | 062478e | 2014-01-09 20:57:50 +0000 | [diff] [blame] | 632 | |
Damien George | 66edc5d | 2014-04-05 13:25:13 +0100 | [diff] [blame] | 633 | 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] | 634 | mp_obj_t args[2] = {self_in, key}; |
| 635 | dict_get_helper(2, args, MP_MAP_LOOKUP_REMOVE_IF_FOUND); |
Damien George | 66edc5d | 2014-04-05 13:25:13 +0100 | [diff] [blame] | 636 | return self_in; |
| 637 | } |