2013-12-21 18:17:45 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include "nlr.h"
|
|
|
|
#include "misc.h"
|
|
|
|
#include "mpconfig.h"
|
2014-01-04 15:57:35 +00:00
|
|
|
#include "mpqstr.h"
|
2013-12-21 18:17:45 +00:00
|
|
|
#include "obj.h"
|
|
|
|
#include "runtime0.h"
|
|
|
|
#include "runtime.h"
|
|
|
|
#include "map.h"
|
|
|
|
|
|
|
|
typedef struct _mp_obj_dict_t {
|
|
|
|
mp_obj_base_t base;
|
|
|
|
mp_map_t map;
|
|
|
|
} mp_obj_dict_t;
|
|
|
|
|
2014-01-06 17:17:02 +00: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-01-04 20:21:15 +00:00
|
|
|
static void dict_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in) {
|
2013-12-21 18:17:45 +00:00
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
bool first = true;
|
|
|
|
print(env, "{");
|
2014-01-06 17:17:02 +00:00
|
|
|
mp_obj_t *dict_iter = mp_obj_new_dict_iterator(self, 0);
|
|
|
|
mp_map_elem_t *next = NULL;
|
|
|
|
while ((next = dict_it_iternext_elem(dict_iter)) != NULL) {
|
|
|
|
if (!first) {
|
|
|
|
print(env, ", ");
|
2013-12-21 18:17:45 +00:00
|
|
|
}
|
2014-01-06 17:17:02 +00:00
|
|
|
first = false;
|
|
|
|
mp_obj_print_helper(print, env, next->key);
|
|
|
|
print(env, ": ");
|
|
|
|
mp_obj_print_helper(print, env, next->value);
|
2013-12-21 18:17:45 +00:00
|
|
|
}
|
|
|
|
print(env, "}");
|
|
|
|
}
|
|
|
|
|
2014-01-04 20:21:15 +00:00
|
|
|
// args are reverse in the array
|
|
|
|
static mp_obj_t dict_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) {
|
|
|
|
// TODO create from an iterable!
|
|
|
|
return rt_build_map(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
|
2013-12-21 18:17:45 +00:00
|
|
|
mp_obj_dict_t *o = lhs_in;
|
|
|
|
switch (op) {
|
|
|
|
case RT_BINARY_OP_SUBSCR:
|
|
|
|
{
|
|
|
|
// dict load
|
2014-01-08 17:33:12 +00:00
|
|
|
mp_map_elem_t *elem = mp_map_lookup(&o->map, rhs_in, MP_MAP_LOOKUP);
|
2013-12-21 18:17:45 +00:00
|
|
|
if (elem == NULL) {
|
2014-01-04 15:57:35 +00:00
|
|
|
nlr_jump(mp_obj_new_exception_msg(MP_QSTR_KeyError, "<value>"));
|
2013-12-21 18:17:45 +00:00
|
|
|
} else {
|
|
|
|
return elem->value;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
// op not supported
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-06 17:17:02 +00: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;
|
|
|
|
|
|
|
|
static mp_map_elem_t *dict_it_iternext_elem(mp_obj_t self_in) {
|
|
|
|
mp_obj_dict_it_t *self = self_in;
|
|
|
|
machine_uint_t max = self->dict->map.alloc;
|
|
|
|
mp_map_elem_t *table = self->dict->map.table;
|
|
|
|
|
|
|
|
for (int i = self->cur; i < max; i++) {
|
|
|
|
if (table[i].key != NULL) {
|
|
|
|
self->cur = i + 1;
|
|
|
|
return &(table[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t dict_it_iternext(mp_obj_t self_in) {
|
|
|
|
mp_map_elem_t *next = dict_it_iternext_elem(self_in);
|
|
|
|
|
|
|
|
if (next != NULL) {
|
|
|
|
return next->key;
|
|
|
|
} else {
|
|
|
|
return mp_const_stop_iteration;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static const mp_obj_type_t dict_it_type = {
|
|
|
|
{ &mp_const_type },
|
|
|
|
"dict_iterator",
|
|
|
|
.iternext = dict_it_iternext,
|
|
|
|
};
|
|
|
|
|
|
|
|
static mp_obj_t mp_obj_new_dict_iterator(mp_obj_dict_t *dict, int cur) {
|
|
|
|
mp_obj_dict_it_t *o = m_new_obj(mp_obj_dict_it_t);
|
|
|
|
o->base.type = &dict_it_type;
|
|
|
|
o->dict = dict;
|
|
|
|
o->cur = cur;
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
|
|
|
static mp_obj_t dict_getiter(mp_obj_t o_in) {
|
|
|
|
return mp_obj_new_dict_iterator(o_in, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
/* dict methods */
|
|
|
|
|
2014-01-06 17:38:47 +00:00
|
|
|
static mp_obj_t dict_clear(mp_obj_t self_in) {
|
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &dict_type));
|
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
|
|
|
|
mp_map_clear(&self->map);
|
|
|
|
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
2014-01-06 17:54:04 +00:00
|
|
|
static MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
|
|
|
|
|
2014-01-06 18:11:20 +00:00
|
|
|
static mp_obj_t dict_copy(mp_obj_t self_in) {
|
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &dict_type));
|
|
|
|
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;
|
|
|
|
memcpy(other->map.table, self->map.table, self->map.alloc * sizeof(mp_map_elem_t));
|
|
|
|
return other;
|
|
|
|
}
|
|
|
|
static MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy);
|
2014-01-06 17:38:47 +00:00
|
|
|
|
2014-01-08 17:33:12 +00: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) {
|
|
|
|
mp_map_elem_t *elem = mp_map_lookup(self, key, lookup_kind);
|
2014-01-06 20:25:51 +00:00
|
|
|
mp_obj_t value;
|
|
|
|
if (elem == NULL || elem->value == NULL) {
|
2014-01-06 19:48:34 +00:00
|
|
|
if (deflt == NULL) {
|
2014-01-08 17:33:12 +00:00
|
|
|
if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
|
2014-01-06 19:48:34 +00:00
|
|
|
nlr_jump(mp_obj_new_exception_msg(MP_QSTR_KeyError, "<value>"));
|
|
|
|
} else {
|
2014-01-06 20:25:51 +00:00
|
|
|
value = mp_const_none;
|
2014-01-06 19:48:34 +00:00
|
|
|
}
|
|
|
|
} else {
|
2014-01-06 20:25:51 +00:00
|
|
|
value = deflt;
|
2014-01-06 19:48:34 +00:00
|
|
|
}
|
|
|
|
} else {
|
2014-01-06 20:25:51 +00:00
|
|
|
value = elem->value;
|
2014-01-08 17:33:12 +00:00
|
|
|
if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
|
|
|
|
// catch the leak (from mp_map_lookup)
|
2014-01-06 22:58:17 +00:00
|
|
|
m_free(elem, sizeof(mp_map_elem_t));
|
2014-01-06 19:48:34 +00:00
|
|
|
}
|
|
|
|
}
|
2014-01-08 17:33:12 +00:00
|
|
|
if (lookup_kind == MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
|
2014-01-06 20:25:51 +00:00
|
|
|
elem->value = value;
|
|
|
|
}
|
|
|
|
return value;
|
2014-01-06 19:48:34 +00:00
|
|
|
}
|
|
|
|
|
2014-01-06 18:53:16 +00:00
|
|
|
static mp_obj_t dict_get(int n_args, const mp_obj_t *args) {
|
|
|
|
assert(2 <= n_args && n_args <= 3);
|
|
|
|
assert(MP_OBJ_IS_TYPE(args[0], &dict_type));
|
|
|
|
|
2014-01-06 19:48:34 +00:00
|
|
|
return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
|
|
|
|
args[1],
|
|
|
|
n_args == 3 ? args[2] : NULL,
|
2014-01-08 17:33:12 +00:00
|
|
|
MP_MAP_LOOKUP);
|
2014-01-06 18:53:16 +00:00
|
|
|
}
|
|
|
|
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get);
|
|
|
|
|
2014-01-06 19:48:34 +00:00
|
|
|
static mp_obj_t dict_pop(int n_args, const mp_obj_t *args) {
|
|
|
|
assert(2 <= n_args && n_args <= 3);
|
|
|
|
assert(MP_OBJ_IS_TYPE(args[0], &dict_type));
|
|
|
|
|
|
|
|
return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
|
|
|
|
args[1],
|
|
|
|
n_args == 3 ? args[2] : NULL,
|
2014-01-08 17:33:12 +00:00
|
|
|
MP_MAP_LOOKUP_REMOVE_IF_FOUND);
|
2014-01-06 19:48:34 +00:00
|
|
|
}
|
|
|
|
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop);
|
|
|
|
|
|
|
|
|
2014-01-06 20:25:51 +00:00
|
|
|
static mp_obj_t dict_setdefault(int n_args, const mp_obj_t *args) {
|
|
|
|
assert(2 <= n_args && n_args <= 3);
|
|
|
|
assert(MP_OBJ_IS_TYPE(args[0], &dict_type));
|
|
|
|
|
|
|
|
return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
|
|
|
|
args[1],
|
|
|
|
n_args == 3 ? args[2] : NULL,
|
2014-01-08 17:33:12 +00:00
|
|
|
MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
|
2014-01-06 20:25:51 +00:00
|
|
|
}
|
|
|
|
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_setdefault_obj, 2, 3, dict_setdefault);
|
|
|
|
|
2014-01-06 20:08:52 +00:00
|
|
|
|
|
|
|
static mp_obj_t dict_popitem(mp_obj_t self_in) {
|
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &dict_type));
|
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
if (self->map.used == 0) {
|
|
|
|
nlr_jump(mp_obj_new_exception_msg(MP_QSTR_KeyError, "popitem(): dictionary is empty"));
|
|
|
|
}
|
|
|
|
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 20:25:51 +00:00
|
|
|
next->value = NULL;
|
2014-01-06 20:08:52 +00:00
|
|
|
mp_obj_t tuple = mp_obj_new_tuple(2, items);
|
|
|
|
|
|
|
|
return tuple;
|
|
|
|
}
|
|
|
|
static MP_DEFINE_CONST_FUN_OBJ_1(dict_popitem_obj, dict_popitem);
|
|
|
|
|
2014-01-06 22:58:17 +00:00
|
|
|
static mp_obj_t dict_update(mp_obj_t self_in, mp_obj_t iterable) {
|
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &dict_type));
|
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
/* TODO: check for the "keys" method */
|
|
|
|
mp_obj_t iter = rt_getiter(iterable);
|
|
|
|
mp_obj_t next = NULL;
|
|
|
|
while ((next = rt_iternext(iter)) != mp_const_stop_iteration) {
|
|
|
|
mp_obj_t inneriter = rt_getiter(next);
|
|
|
|
mp_obj_t key = rt_iternext(inneriter);
|
|
|
|
mp_obj_t value = rt_iternext(inneriter);
|
|
|
|
mp_obj_t stop = rt_iternext(inneriter);
|
|
|
|
if (key == mp_const_stop_iteration
|
|
|
|
|| value == mp_const_stop_iteration
|
|
|
|
|| stop != mp_const_stop_iteration) {
|
|
|
|
nlr_jump(mp_obj_new_exception_msg(
|
|
|
|
MP_QSTR_ValueError,
|
|
|
|
"dictionary update sequence has the wrong length"));
|
|
|
|
} else {
|
2014-01-08 17:33:12 +00:00
|
|
|
mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
|
2014-01-06 22:58:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
|
|
|
static MP_DEFINE_CONST_FUN_OBJ_2(dict_update_obj, dict_update);
|
|
|
|
|
2014-01-06 20:08:52 +00:00
|
|
|
|
2014-01-06 17:17:02 +00:00
|
|
|
/******************************************************************************/
|
|
|
|
/* dict constructors & etc */
|
|
|
|
|
2014-01-07 23:18:25 +00:00
|
|
|
static const mp_method_t dict_type_methods[] = {
|
|
|
|
{ "clear", &dict_clear_obj },
|
|
|
|
{ "copy", &dict_copy_obj },
|
|
|
|
{ "get", &dict_get_obj },
|
|
|
|
{ "pop", &dict_pop_obj },
|
|
|
|
{ "popitem", &dict_popitem_obj },
|
|
|
|
{ "setdefault", &dict_setdefault_obj },
|
|
|
|
{ "update", &dict_update_obj },
|
|
|
|
{ NULL, NULL }, // end-of-list sentinel
|
|
|
|
};
|
|
|
|
|
2013-12-21 18:17:45 +00:00
|
|
|
const mp_obj_type_t dict_type = {
|
|
|
|
{ &mp_const_type },
|
|
|
|
"dict",
|
2014-01-05 20:34:09 +00:00
|
|
|
.print = dict_print,
|
|
|
|
.make_new = dict_make_new,
|
|
|
|
.binary_op = dict_binary_op,
|
2014-01-06 17:17:02 +00:00
|
|
|
.getiter = dict_getiter,
|
2014-01-07 23:18:25 +00:00
|
|
|
.methods = dict_type_methods,
|
2013-12-21 18:17:45 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
mp_obj_t mp_obj_new_dict(int n_args) {
|
|
|
|
mp_obj_dict_t *o = m_new_obj(mp_obj_dict_t);
|
|
|
|
o->base.type = &dict_type;
|
2014-01-08 17:33:12 +00:00
|
|
|
mp_map_init(&o->map, n_args);
|
2013-12-21 18:17:45 +00:00
|
|
|
return o;
|
|
|
|
}
|
2013-12-29 22:32:51 +00:00
|
|
|
|
|
|
|
uint mp_obj_dict_len(mp_obj_t self_in) {
|
2014-01-06 18:53:16 +00:00
|
|
|
return ((mp_obj_dict_t *)self_in)->map.used;
|
2013-12-29 22:32:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {
|
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &dict_type));
|
|
|
|
mp_obj_dict_t *self = self_in;
|
2014-01-08 17:33:12 +00:00
|
|
|
mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
|
2013-12-29 22:32:51 +00:00
|
|
|
return self_in;
|
|
|
|
}
|
2014-01-09 20:57:50 +00:00
|
|
|
|
|
|
|
mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) {
|
|
|
|
assert(MP_OBJ_IS_TYPE(self_in, &dict_type));
|
|
|
|
mp_obj_dict_t *self = self_in;
|
|
|
|
return &self->map;
|
|
|
|
}
|