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