2014-05-03 16:27:38 -06:00
|
|
|
/*
|
|
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
|
|
*
|
|
|
|
* The MIT License (MIT)
|
|
|
|
*
|
|
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2014-03-16 01:14:26 -06:00
|
|
|
#include <stdbool.h>
|
2013-12-21 11:17:45 -07:00
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
2014-05-02 08:47:01 -06:00
|
|
|
#include "mpconfig.h"
|
2013-12-21 11:17:45 -07:00
|
|
|
#include "nlr.h"
|
|
|
|
#include "misc.h"
|
2014-01-21 14:40:13 -07:00
|
|
|
#include "qstr.h"
|
2013-12-21 11:17:45 -07:00
|
|
|
#include "obj.h"
|
2014-04-10 22:01:15 -06:00
|
|
|
#include "objtuple.h"
|
2013-12-21 11:17:45 -07:00
|
|
|
#include "runtime0.h"
|
|
|
|
#include "runtime.h"
|
2014-04-13 02:53:15 -06:00
|
|
|
#include "builtin.h"
|
2013-12-21 11:17:45 -07:00
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t mp_obj_new_dict_iterator(mp_obj_dict_t *dict, int cur);
|
|
|
|
STATIC mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in);
|
2014-04-06 11:08:56 -06:00
|
|
|
STATIC mp_obj_t dict_copy(mp_obj_t self_in);
|
2014-01-06 10:17:02 -07:00
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC void dict_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
|
2013-12-21 11:17:45 -07:00
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
bool first = true;
|
|
|
|
print(env, "{");
|
2014-01-06 10:17:02 -07:00
|
|
|
mp_obj_t *dict_iter = mp_obj_new_dict_iterator(self, 0);
|
|
|
|
mp_map_elem_t *next = NULL;
|
2014-04-17 16:19:36 -06:00
|
|
|
while ((next = dict_it_iternext_elem(dict_iter)) != MP_OBJ_STOP_ITERATION) {
|
2014-01-06 10:17:02 -07:00
|
|
|
if (!first) {
|
|
|
|
print(env, ", ");
|
2013-12-21 11:17:45 -07:00
|
|
|
}
|
2014-01-06 10:17:02 -07:00
|
|
|
first = false;
|
2014-01-13 10:19:16 -07:00
|
|
|
mp_obj_print_helper(print, env, next->key, PRINT_REPR);
|
2014-01-06 10:17:02 -07:00
|
|
|
print(env, ": ");
|
2014-01-13 10:19:16 -07:00
|
|
|
mp_obj_print_helper(print, env, next->value, PRINT_REPR);
|
2013-12-21 11:17:45 -07:00
|
|
|
}
|
|
|
|
print(env, "}");
|
|
|
|
}
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
|
2014-04-04 08:08:00 -06:00
|
|
|
mp_obj_t dict;
|
|
|
|
switch (n_args) {
|
|
|
|
case 0:
|
|
|
|
dict = mp_obj_new_dict(0);
|
|
|
|
break;
|
|
|
|
|
2014-04-10 22:01:15 -06:00
|
|
|
case 1: {
|
2014-04-06 11:08:56 -06:00
|
|
|
if (MP_OBJ_IS_TYPE(args[0], &mp_type_dict)) {
|
|
|
|
return dict_copy(args[0]);
|
|
|
|
}
|
|
|
|
// TODO create dict from an arbitrary mapping!
|
2014-04-10 22:01:15 -06:00
|
|
|
|
|
|
|
// Make dict from iterable of pairs
|
|
|
|
mp_obj_t iterable = mp_getiter(args[0]);
|
|
|
|
mp_obj_t dict = mp_obj_new_dict(0);
|
|
|
|
// TODO: support arbitrary seq as a pair
|
2014-04-11 02:13:30 -06:00
|
|
|
mp_obj_t item;
|
2014-04-17 16:19:36 -06:00
|
|
|
while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
|
2014-04-11 02:13:30 -06:00
|
|
|
mp_obj_t *sub_items;
|
|
|
|
mp_obj_get_array_fixed_n(item, 2, &sub_items);
|
|
|
|
mp_obj_dict_store(dict, sub_items[0], sub_items[1]);
|
2014-04-10 22:01:15 -06:00
|
|
|
}
|
|
|
|
return dict;
|
|
|
|
}
|
2014-04-04 08:08:00 -06:00
|
|
|
|
|
|
|
default:
|
2014-04-05 11:32:08 -06:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "dict takes at most 1 argument"));
|
2014-04-04 08:08:00 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
// add to the new dict any keyword args
|
|
|
|
for (const mp_obj_t *a = args + n_args; n_kw > 0; n_kw--, a += 2) {
|
|
|
|
mp_obj_dict_store(dict, a[0], a[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
return dict;
|
2014-01-04 13:21:15 -07:00
|
|
|
}
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_unary_op(int op, mp_obj_t self_in) {
|
2014-01-27 16:15:32 -07:00
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
switch (op) {
|
2014-03-30 06:35:08 -06:00
|
|
|
case MP_UNARY_OP_BOOL: return MP_BOOL(self->map.used != 0);
|
|
|
|
case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT((machine_int_t)self->map.used);
|
2014-05-21 12:42:43 -06:00
|
|
|
default: return MP_OBJ_NULL; // op not supported
|
2014-01-27 16:15:32 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
|
2013-12-21 11:17:45 -07:00
|
|
|
mp_obj_dict_t *o = lhs_in;
|
|
|
|
switch (op) {
|
2014-04-17 15:10:53 -06:00
|
|
|
case MP_BINARY_OP_IN: {
|
2014-01-11 05:39:33 -07:00
|
|
|
mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
|
2014-02-01 16:04:09 -07:00
|
|
|
return MP_BOOL(elem != NULL);
|
2014-01-11 05:39:33 -07:00
|
|
|
}
|
2014-04-06 12:20:52 -06:00
|
|
|
case MP_BINARY_OP_EQUAL: {
|
|
|
|
if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_dict)) {
|
|
|
|
mp_obj_dict_t *rhs = rhs_in;
|
|
|
|
if (o->map.used != rhs->map.used) {
|
|
|
|
return mp_const_false;
|
|
|
|
}
|
|
|
|
|
|
|
|
machine_uint_t size = o->map.alloc;
|
|
|
|
mp_map_t *map = &o->map;
|
|
|
|
|
|
|
|
for (machine_uint_t i = 0; i < size; i++) {
|
|
|
|
if (MP_MAP_SLOT_IS_FILLED(map, i)) {
|
|
|
|
mp_map_elem_t *elem = mp_map_lookup(&rhs->map, map->table[i].key, MP_MAP_LOOKUP);
|
|
|
|
if (elem == NULL || !mp_obj_equal(map->table[i].value, elem->value)) {
|
|
|
|
return mp_const_false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return mp_const_true;
|
2014-04-11 04:52:06 -06:00
|
|
|
} else {
|
|
|
|
// dict is not equal to instance of any other type
|
|
|
|
return mp_const_false;
|
2014-04-06 12:20:52 -06:00
|
|
|
}
|
|
|
|
}
|
2013-12-21 11:17:45 -07:00
|
|
|
default:
|
|
|
|
// op not supported
|
2014-05-21 12:42:43 -06:00
|
|
|
return MP_OBJ_NULL;
|
2013-12-21 11:17:45 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-17 15:10:53 -06:00
|
|
|
STATIC mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
|
2014-04-08 14:32:29 -06:00
|
|
|
if (value == MP_OBJ_NULL) {
|
2014-04-17 15:10:53 -06:00
|
|
|
// delete
|
2014-04-08 14:32:29 -06:00
|
|
|
mp_obj_dict_delete(self_in, index);
|
2014-04-17 15:10:53 -06:00
|
|
|
return mp_const_none;
|
|
|
|
} else if (value == MP_OBJ_SENTINEL) {
|
|
|
|
// load
|
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
mp_map_elem_t *elem = mp_map_lookup(&self->map, index, MP_MAP_LOOKUP);
|
|
|
|
if (elem == NULL) {
|
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
|
|
|
|
} else {
|
|
|
|
return elem->value;
|
|
|
|
}
|
2014-04-08 14:32:29 -06:00
|
|
|
} else {
|
2014-04-17 15:10:53 -06:00
|
|
|
// store
|
2014-04-08 14:32:29 -06:00
|
|
|
mp_obj_dict_store(self_in, index, value);
|
2014-04-17 15:10:53 -06:00
|
|
|
return mp_const_none;
|
2014-04-08 14:32:29 -06:00
|
|
|
}
|
|
|
|
}
|
2014-01-06 10:17:02 -07:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
/* dict iterator */
|
|
|
|
|
|
|
|
typedef struct _mp_obj_dict_it_t {
|
|
|
|
mp_obj_base_t base;
|
|
|
|
mp_obj_dict_t *dict;
|
|
|
|
machine_uint_t cur;
|
|
|
|
} mp_obj_dict_it_t;
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in) {
|
2014-01-06 10:17:02 -07:00
|
|
|
mp_obj_dict_it_t *self = self_in;
|
|
|
|
machine_uint_t max = self->dict->map.alloc;
|
2014-04-05 14:53:54 -06:00
|
|
|
mp_map_t *map = &self->dict->map;
|
2014-01-06 10:17:02 -07:00
|
|
|
|
|
|
|
for (int i = self->cur; i < max; i++) {
|
2014-04-05 14:53:54 -06:00
|
|
|
if (MP_MAP_SLOT_IS_FILLED(map, i)) {
|
2014-01-06 10:17:02 -07:00
|
|
|
self->cur = i + 1;
|
2014-04-05 14:53:54 -06:00
|
|
|
return &(map->table[i]);
|
2014-01-06 10:17:02 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-17 16:19:36 -06:00
|
|
|
return MP_OBJ_STOP_ITERATION;
|
2014-01-06 10:17:02 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t dict_it_iternext(mp_obj_t self_in) {
|
|
|
|
mp_map_elem_t *next = dict_it_iternext_elem(self_in);
|
|
|
|
|
2014-04-17 16:19:36 -06:00
|
|
|
if (next != MP_OBJ_STOP_ITERATION) {
|
2014-01-06 10:17:02 -07:00
|
|
|
return next->key;
|
|
|
|
} else {
|
2014-04-17 16:19:36 -06:00
|
|
|
return MP_OBJ_STOP_ITERATION;
|
2014-01-06 10:17:02 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-29 07:43:38 -06:00
|
|
|
STATIC const mp_obj_type_t mp_type_dict_it = {
|
2014-02-15 09:10:44 -07:00
|
|
|
{ &mp_type_type },
|
2014-02-15 04:34:50 -07:00
|
|
|
.name = MP_QSTR_iterator,
|
2014-03-30 13:00:12 -06:00
|
|
|
.getiter = mp_identity,
|
2014-01-06 10:17:02 -07:00
|
|
|
.iternext = dict_it_iternext,
|
|
|
|
};
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t mp_obj_new_dict_iterator(mp_obj_dict_t *dict, int cur) {
|
2014-01-06 10:17:02 -07:00
|
|
|
mp_obj_dict_it_t *o = m_new_obj(mp_obj_dict_it_t);
|
2014-03-29 07:43:38 -06:00
|
|
|
o->base.type = &mp_type_dict_it;
|
2014-01-06 10:17:02 -07:00
|
|
|
o->dict = dict;
|
|
|
|
o->cur = cur;
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_getiter(mp_obj_t o_in) {
|
2014-01-06 10:17:02 -07:00
|
|
|
return mp_obj_new_dict_iterator(o_in, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
/* dict methods */
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
|
2014-03-29 07:43:38 -06:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
|
2014-01-06 10:38:47 -07:00
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
|
|
|
|
mp_map_clear(&self->map);
|
|
|
|
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
|
2014-01-06 10:54:04 -07:00
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_copy(mp_obj_t self_in) {
|
2014-03-29 07:43:38 -06:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
|
2014-01-06 11:11:20 -07:00
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
mp_obj_dict_t *other = mp_obj_new_dict(self->map.alloc);
|
|
|
|
other->map.used = self->map.used;
|
2014-04-06 12:00:58 -06:00
|
|
|
other->map.all_keys_are_qstrs = self->map.all_keys_are_qstrs;
|
|
|
|
other->map.table_is_fixed_array = 0;
|
2014-01-06 11:11:20 -07:00
|
|
|
memcpy(other->map.table, self->map.table, self->map.alloc * sizeof(mp_map_elem_t));
|
|
|
|
return other;
|
|
|
|
}
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy);
|
2014-01-06 10:38:47 -07:00
|
|
|
|
2014-01-11 12:22:29 -07:00
|
|
|
// this is a classmethod
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_fromkeys(uint n_args, const mp_obj_t *args) {
|
2014-01-11 12:22:29 -07:00
|
|
|
assert(2 <= n_args && n_args <= 3);
|
2014-03-30 06:35:08 -06:00
|
|
|
mp_obj_t iter = mp_getiter(args[1]);
|
2014-01-11 12:22:29 -07:00
|
|
|
mp_obj_t len = mp_obj_len_maybe(iter);
|
|
|
|
mp_obj_t value = mp_const_none;
|
|
|
|
mp_obj_t next = NULL;
|
|
|
|
mp_obj_dict_t *self = NULL;
|
|
|
|
|
|
|
|
if (n_args > 2) {
|
|
|
|
value = args[2];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (len == MP_OBJ_NULL) {
|
|
|
|
/* object's type doesn't have a __len__ slot */
|
|
|
|
self = mp_obj_new_dict(0);
|
|
|
|
} else {
|
|
|
|
self = mp_obj_new_dict(MP_OBJ_SMALL_INT_VALUE(len));
|
|
|
|
}
|
|
|
|
|
2014-04-17 16:19:36 -06:00
|
|
|
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
|
2014-01-11 12:22:29 -07:00
|
|
|
mp_map_lookup(&self->map, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
|
|
|
|
}
|
|
|
|
|
|
|
|
return self;
|
|
|
|
}
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_fromkeys_fun_obj, 2, 3, dict_fromkeys);
|
|
|
|
STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(dict_fromkeys_obj, (const mp_obj_t)&dict_fromkeys_fun_obj);
|
2014-01-11 12:22:29 -07:00
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
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) {
|
2014-01-08 10:33:12 -07:00
|
|
|
mp_map_elem_t *elem = mp_map_lookup(self, key, lookup_kind);
|
2014-01-06 13:25:51 -07:00
|
|
|
mp_obj_t value;
|
|
|
|
if (elem == NULL || elem->value == NULL) {
|
2014-01-06 12:48:34 -07:00
|
|
|
if (deflt == NULL) {
|
2014-01-08 10:33:12 -07:00
|
|
|
if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
|
2014-04-05 11:32:08 -06:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "<value>"));
|
2014-01-06 12:48:34 -07:00
|
|
|
} else {
|
2014-01-06 13:25:51 -07:00
|
|
|
value = mp_const_none;
|
2014-01-06 12:48:34 -07:00
|
|
|
}
|
|
|
|
} else {
|
2014-01-06 13:25:51 -07:00
|
|
|
value = deflt;
|
2014-01-06 12:48:34 -07:00
|
|
|
}
|
|
|
|
} else {
|
2014-01-06 13:25:51 -07:00
|
|
|
value = elem->value;
|
2014-01-06 12:48:34 -07:00
|
|
|
}
|
2014-01-08 10:33:12 -07:00
|
|
|
if (lookup_kind == MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
|
2014-01-06 13:25:51 -07:00
|
|
|
elem->value = value;
|
|
|
|
}
|
|
|
|
return value;
|
2014-01-06 12:48:34 -07:00
|
|
|
}
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_get(uint n_args, const mp_obj_t *args) {
|
2014-01-06 11:53:16 -07:00
|
|
|
assert(2 <= n_args && n_args <= 3);
|
2014-03-29 07:43:38 -06:00
|
|
|
assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
|
2014-01-06 11:53:16 -07:00
|
|
|
|
2014-01-06 12:48:34 -07:00
|
|
|
return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
|
|
|
|
args[1],
|
|
|
|
n_args == 3 ? args[2] : NULL,
|
2014-01-08 10:33:12 -07:00
|
|
|
MP_MAP_LOOKUP);
|
2014-01-06 11:53:16 -07:00
|
|
|
}
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get);
|
2014-01-06 11:53:16 -07:00
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_pop(uint n_args, const mp_obj_t *args) {
|
2014-01-06 12:48:34 -07:00
|
|
|
assert(2 <= n_args && n_args <= 3);
|
2014-03-29 07:43:38 -06:00
|
|
|
assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
|
2014-01-06 12:48:34 -07:00
|
|
|
|
|
|
|
return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
|
|
|
|
args[1],
|
|
|
|
n_args == 3 ? args[2] : NULL,
|
2014-01-08 10:33:12 -07:00
|
|
|
MP_MAP_LOOKUP_REMOVE_IF_FOUND);
|
2014-01-06 12:48:34 -07:00
|
|
|
}
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop);
|
2014-01-06 12:48:34 -07:00
|
|
|
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_setdefault(uint n_args, const mp_obj_t *args) {
|
2014-01-06 13:25:51 -07:00
|
|
|
assert(2 <= n_args && n_args <= 3);
|
2014-03-29 07:43:38 -06:00
|
|
|
assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
|
2014-01-06 13:25:51 -07:00
|
|
|
|
|
|
|
return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
|
|
|
|
args[1],
|
|
|
|
n_args == 3 ? args[2] : NULL,
|
2014-01-08 10:33:12 -07:00
|
|
|
MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
|
2014-01-06 13:25:51 -07:00
|
|
|
}
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_setdefault_obj, 2, 3, dict_setdefault);
|
2014-01-06 13:25:51 -07:00
|
|
|
|
2014-01-06 13:08:52 -07:00
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
|
2014-03-29 07:43:38 -06:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
|
2014-01-06 13:08:52 -07:00
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
if (self->map.used == 0) {
|
2014-04-05 11:32:08 -06:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "popitem(): dictionary is empty"));
|
2014-01-06 13:08:52 -07:00
|
|
|
}
|
|
|
|
mp_obj_dict_it_t *iter = mp_obj_new_dict_iterator(self, 0);
|
|
|
|
|
|
|
|
mp_map_elem_t *next = dict_it_iternext_elem(iter);
|
|
|
|
self->map.used--;
|
|
|
|
mp_obj_t items[] = {next->key, next->value};
|
|
|
|
next->key = NULL;
|
2014-01-06 13:25:51 -07:00
|
|
|
next->value = NULL;
|
2014-01-06 13:08:52 -07:00
|
|
|
mp_obj_t tuple = mp_obj_new_tuple(2, items);
|
|
|
|
|
|
|
|
return tuple;
|
|
|
|
}
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_popitem_obj, dict_popitem);
|
2014-01-06 13:08:52 -07:00
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_update(mp_obj_t self_in, mp_obj_t iterable) {
|
2014-03-29 07:43:38 -06:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
|
2014-01-06 15:58:17 -07:00
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
/* TODO: check for the "keys" method */
|
2014-03-30 06:35:08 -06:00
|
|
|
mp_obj_t iter = mp_getiter(iterable);
|
2014-01-06 15:58:17 -07:00
|
|
|
mp_obj_t next = NULL;
|
2014-04-17 16:19:36 -06:00
|
|
|
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
|
2014-03-30 06:35:08 -06:00
|
|
|
mp_obj_t inneriter = mp_getiter(next);
|
|
|
|
mp_obj_t key = mp_iternext(inneriter);
|
|
|
|
mp_obj_t value = mp_iternext(inneriter);
|
|
|
|
mp_obj_t stop = mp_iternext(inneriter);
|
2014-04-17 16:19:36 -06:00
|
|
|
if (key == MP_OBJ_STOP_ITERATION
|
|
|
|
|| value == MP_OBJ_STOP_ITERATION
|
|
|
|
|| stop != MP_OBJ_STOP_ITERATION) {
|
2014-04-05 11:32:08 -06:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(
|
2014-02-15 09:10:44 -07:00
|
|
|
&mp_type_ValueError,
|
2014-01-06 15:58:17 -07:00
|
|
|
"dictionary update sequence has the wrong length"));
|
|
|
|
} else {
|
2014-01-08 10:33:12 -07:00
|
|
|
mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
|
2014-01-06 15:58:17 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(dict_update_obj, dict_update);
|
2014-01-06 15:58:17 -07:00
|
|
|
|
2014-01-06 13:08:52 -07:00
|
|
|
|
2014-01-09 18:00:20 -07:00
|
|
|
/******************************************************************************/
|
|
|
|
/* dict views */
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC const mp_obj_type_t dict_view_type;
|
|
|
|
STATIC const mp_obj_type_t dict_view_it_type;
|
2014-01-09 18:00:20 -07:00
|
|
|
|
|
|
|
typedef enum _mp_dict_view_kind_t {
|
|
|
|
MP_DICT_VIEW_ITEMS,
|
|
|
|
MP_DICT_VIEW_KEYS,
|
|
|
|
MP_DICT_VIEW_VALUES,
|
|
|
|
} mp_dict_view_kind_t;
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC char *mp_dict_view_names[] = {"dict_items", "dict_keys", "dict_values"};
|
2014-01-09 18:00:20 -07:00
|
|
|
|
|
|
|
typedef struct _mp_obj_dict_view_it_t {
|
|
|
|
mp_obj_base_t base;
|
|
|
|
mp_dict_view_kind_t kind;
|
|
|
|
mp_obj_dict_it_t *iter;
|
|
|
|
machine_uint_t cur;
|
|
|
|
} mp_obj_dict_view_it_t;
|
|
|
|
|
|
|
|
typedef struct _mp_obj_dict_view_t {
|
|
|
|
mp_obj_base_t base;
|
|
|
|
mp_obj_dict_t *dict;
|
|
|
|
mp_dict_view_kind_t kind;
|
|
|
|
} mp_obj_dict_view_t;
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
|
2014-01-09 18:00:20 -07:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &dict_view_it_type));
|
|
|
|
mp_obj_dict_view_it_t *self = self_in;
|
|
|
|
mp_map_elem_t *next = dict_it_iternext_elem(self->iter);
|
|
|
|
|
2014-04-17 16:19:36 -06:00
|
|
|
if (next != MP_OBJ_STOP_ITERATION) {
|
2014-01-09 18:00:20 -07:00
|
|
|
switch (self->kind) {
|
2014-01-11 12:22:29 -07:00
|
|
|
case MP_DICT_VIEW_ITEMS:
|
|
|
|
{
|
|
|
|
mp_obj_t items[] = {next->key, next->value};
|
|
|
|
return mp_obj_new_tuple(2, items);
|
|
|
|
}
|
|
|
|
case MP_DICT_VIEW_KEYS:
|
|
|
|
return next->key;
|
|
|
|
case MP_DICT_VIEW_VALUES:
|
|
|
|
return next->value;
|
|
|
|
default:
|
|
|
|
assert(0); /* can't happen */
|
|
|
|
return mp_const_none;
|
2014-01-09 18:00:20 -07:00
|
|
|
}
|
|
|
|
} else {
|
2014-04-17 16:19:36 -06:00
|
|
|
return MP_OBJ_STOP_ITERATION;
|
2014-01-09 18:00:20 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC const mp_obj_type_t dict_view_it_type = {
|
2014-02-15 09:10:44 -07:00
|
|
|
{ &mp_type_type },
|
2014-02-15 04:34:50 -07:00
|
|
|
.name = MP_QSTR_iterator,
|
2014-03-30 13:00:12 -06:00
|
|
|
.getiter = mp_identity,
|
2014-01-09 18:00:20 -07:00
|
|
|
.iternext = dict_view_it_iternext,
|
|
|
|
};
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in) {
|
2014-01-09 18:00:20 -07:00
|
|
|
assert(MP_OBJ_IS_TYPE(view_in, &dict_view_type));
|
|
|
|
mp_obj_dict_view_t *view = view_in;
|
|
|
|
mp_obj_dict_view_it_t *o = m_new_obj(mp_obj_dict_view_it_t);
|
|
|
|
o->base.type = &dict_view_it_type;
|
|
|
|
o->kind = view->kind;
|
|
|
|
o->iter = mp_obj_new_dict_iterator(view->dict, 0);
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC void dict_view_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
|
2014-01-09 18:00:20 -07:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &dict_view_type));
|
|
|
|
mp_obj_dict_view_t *self = self_in;
|
|
|
|
bool first = true;
|
|
|
|
print(env, mp_dict_view_names[self->kind]);
|
|
|
|
print(env, "([");
|
|
|
|
mp_obj_t *self_iter = dict_view_getiter(self);
|
|
|
|
mp_obj_t *next = NULL;
|
2014-04-17 16:19:36 -06:00
|
|
|
while ((next = dict_view_it_iternext(self_iter)) != MP_OBJ_STOP_ITERATION) {
|
2014-01-09 18:00:20 -07:00
|
|
|
if (!first) {
|
|
|
|
print(env, ", ");
|
|
|
|
}
|
|
|
|
first = false;
|
2014-01-13 10:19:16 -07:00
|
|
|
mp_obj_print_helper(print, env, next, PRINT_REPR);
|
2014-01-09 18:00:20 -07:00
|
|
|
}
|
|
|
|
print(env, "])");
|
|
|
|
}
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_view_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
|
2014-05-21 12:42:43 -06:00
|
|
|
// only supported for the 'keys' kind until sets and dicts are refactored
|
2014-01-11 05:39:33 -07:00
|
|
|
mp_obj_dict_view_t *o = lhs_in;
|
2014-05-10 06:55:11 -06:00
|
|
|
if (o->kind != MP_DICT_VIEW_KEYS) {
|
2014-05-21 12:42:43 -06:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-05-10 06:55:11 -06:00
|
|
|
}
|
|
|
|
if (op != MP_BINARY_OP_IN) {
|
2014-05-21 12:42:43 -06:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-05-10 06:55:11 -06:00
|
|
|
}
|
2014-01-11 05:39:33 -07:00
|
|
|
return dict_binary_op(op, o->dict, rhs_in);
|
|
|
|
}
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC const mp_obj_type_t dict_view_type = {
|
2014-02-15 09:10:44 -07:00
|
|
|
{ &mp_type_type },
|
2014-02-15 04:34:50 -07:00
|
|
|
.name = MP_QSTR_dict_view,
|
2014-01-09 18:00:20 -07:00
|
|
|
.print = dict_view_print,
|
2014-01-11 05:39:33 -07:00
|
|
|
.binary_op = dict_view_binary_op,
|
2014-01-09 18:00:20 -07:00
|
|
|
.getiter = dict_view_getiter,
|
|
|
|
};
|
|
|
|
|
|
|
|
mp_obj_t mp_obj_new_dict_view(mp_obj_dict_t *dict, mp_dict_view_kind_t kind) {
|
|
|
|
mp_obj_dict_view_t *o = m_new_obj(mp_obj_dict_view_t);
|
|
|
|
o->base.type = &dict_view_type;
|
|
|
|
o->dict = dict;
|
|
|
|
o->kind = kind;
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) {
|
2014-03-29 07:43:38 -06:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
|
2014-01-09 18:00:20 -07:00
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
return mp_obj_new_dict_view(self, kind);
|
|
|
|
}
|
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_items(mp_obj_t self_in) {
|
2014-01-09 18:00:20 -07:00
|
|
|
return dict_view(self_in, MP_DICT_VIEW_ITEMS);
|
|
|
|
}
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_items_obj, dict_items);
|
2014-01-09 18:00:20 -07:00
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_keys(mp_obj_t self_in) {
|
2014-01-09 18:00:20 -07:00
|
|
|
return dict_view(self_in, MP_DICT_VIEW_KEYS);
|
|
|
|
}
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_keys_obj, dict_keys);
|
2014-01-09 18:00:20 -07:00
|
|
|
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC mp_obj_t dict_values(mp_obj_t self_in) {
|
2014-01-09 18:00:20 -07:00
|
|
|
return dict_view(self_in, MP_DICT_VIEW_VALUES);
|
|
|
|
}
|
2014-02-12 09:15:40 -07:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
|
2014-01-09 18:00:20 -07:00
|
|
|
|
2014-01-06 10:17:02 -07:00
|
|
|
/******************************************************************************/
|
2014-01-11 12:22:29 -07:00
|
|
|
/* dict constructors & public C API */
|
2014-01-06 10:17:02 -07:00
|
|
|
|
2014-03-26 15:47:19 -06:00
|
|
|
STATIC const mp_map_elem_t dict_locals_dict_table[] = {
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&dict_clear_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&dict_copy_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_fromkeys), (mp_obj_t)&dict_fromkeys_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_get), (mp_obj_t)&dict_get_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_items), (mp_obj_t)&dict_items_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_keys), (mp_obj_t)&dict_keys_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_pop), (mp_obj_t)&dict_pop_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_popitem), (mp_obj_t)&dict_popitem_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_setdefault), (mp_obj_t)&dict_setdefault_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_update), (mp_obj_t)&dict_update_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_values), (mp_obj_t)&dict_values_obj },
|
2014-04-13 02:53:15 -06:00
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR___getitem__), (mp_obj_t)&mp_op_getitem_obj },
|
2014-04-13 14:41:49 -06:00
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR___setitem__), (mp_obj_t)&mp_op_setitem_obj },
|
2014-04-13 14:55:59 -06:00
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR___delitem__), (mp_obj_t)&mp_op_delitem_obj },
|
2014-01-07 16:18:25 -07:00
|
|
|
};
|
|
|
|
|
2014-03-26 15:47:19 -06:00
|
|
|
STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);
|
|
|
|
|
2014-03-29 07:43:38 -06:00
|
|
|
const mp_obj_type_t mp_type_dict = {
|
2014-02-15 09:10:44 -07:00
|
|
|
{ &mp_type_type },
|
2014-02-15 04:34:50 -07:00
|
|
|
.name = MP_QSTR_dict,
|
2014-01-05 13:34:09 -07:00
|
|
|
.print = dict_print,
|
|
|
|
.make_new = dict_make_new,
|
2014-01-27 16:15:32 -07:00
|
|
|
.unary_op = dict_unary_op,
|
2014-01-05 13:34:09 -07:00
|
|
|
.binary_op = dict_binary_op,
|
2014-04-17 15:10:53 -06:00
|
|
|
.subscr = dict_subscr,
|
2014-01-06 10:17:02 -07:00
|
|
|
.getiter = dict_getiter,
|
2014-03-26 15:47:19 -06:00
|
|
|
.locals_dict = (mp_obj_t)&dict_locals_dict,
|
2013-12-21 11:17:45 -07:00
|
|
|
};
|
|
|
|
|
2014-04-05 14:53:54 -06:00
|
|
|
void mp_obj_dict_init(mp_obj_dict_t *dict, int n_args) {
|
|
|
|
dict->base.type = &mp_type_dict;
|
|
|
|
mp_map_init(&dict->map, n_args);
|
|
|
|
}
|
|
|
|
|
2013-12-21 11:17:45 -07:00
|
|
|
mp_obj_t mp_obj_new_dict(int n_args) {
|
|
|
|
mp_obj_dict_t *o = m_new_obj(mp_obj_dict_t);
|
2014-04-05 14:53:54 -06:00
|
|
|
mp_obj_dict_init(o, n_args);
|
2013-12-21 11:17:45 -07:00
|
|
|
return o;
|
|
|
|
}
|
2013-12-29 15:32:51 -07:00
|
|
|
|
|
|
|
uint mp_obj_dict_len(mp_obj_t self_in) {
|
2014-01-06 11:53:16 -07:00
|
|
|
return ((mp_obj_dict_t *)self_in)->map.used;
|
2013-12-29 15:32:51 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {
|
2014-03-29 07:43:38 -06:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
|
2013-12-29 15:32:51 -07:00
|
|
|
mp_obj_dict_t *self = self_in;
|
2014-01-08 10:33:12 -07:00
|
|
|
mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
|
2013-12-29 15:32:51 -07:00
|
|
|
return self_in;
|
|
|
|
}
|
2014-01-09 13:57:50 -07:00
|
|
|
|
2014-04-05 06:25:13 -06:00
|
|
|
mp_obj_t mp_obj_dict_delete(mp_obj_t self_in, mp_obj_t key) {
|
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
|
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
dict_get_helper(&self->map, key, NULL, MP_MAP_LOOKUP_REMOVE_IF_FOUND);
|
|
|
|
return self_in;
|
|
|
|
}
|
|
|
|
|
2014-01-09 13:57:50 -07:00
|
|
|
mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) {
|
2014-03-29 07:43:38 -06:00
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
|
2014-01-09 13:57:50 -07:00
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
return &self->map;
|
|
|
|
}
|