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