From 4bee76ebca8d0507da6a957cf9e1eaf29fdcc7b1 Mon Sep 17 00:00:00 2001 From: "John R. Lenton" Date: Fri, 10 Jan 2014 11:25:03 +0000 Subject: [PATCH] Added dict.fromkeys. Are we done with dict and #99 yet? I do think we are. --- py/builtin.c | 21 ++--------- py/obj.c | 24 ++++++++++++ py/obj.h | 1 + py/objdict.c | 57 ++++++++++++++++++++++++++++- tests/basics/tests/dict_fromkeys.py | 10 +++++ 5 files changed, 95 insertions(+), 18 deletions(-) create mode 100644 tests/basics/tests/dict_fromkeys.py diff --git a/py/builtin.c b/py/builtin.c index 50e9c02df5..078f4b49c3 100644 --- a/py/builtin.c +++ b/py/builtin.c @@ -166,25 +166,12 @@ static mp_obj_t mp_builtin_iter(mp_obj_t o_in) { MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_iter_obj, mp_builtin_iter); mp_obj_t mp_builtin_len(mp_obj_t o_in) { - mp_small_int_t len = 0; - if (MP_OBJ_IS_TYPE(o_in, &str_type)) { - len = strlen(qstr_str(mp_obj_str_get(o_in))); - } else if (MP_OBJ_IS_TYPE(o_in, &tuple_type)) { - uint seq_len; - mp_obj_t *seq_items; - mp_obj_tuple_get(o_in, &seq_len, &seq_items); - len = seq_len; - } else if (MP_OBJ_IS_TYPE(o_in, &list_type)) { - uint seq_len; - mp_obj_t *seq_items; - mp_obj_list_get(o_in, &seq_len, &seq_items); - len = seq_len; - } else if (MP_OBJ_IS_TYPE(o_in, &dict_type)) { - len = mp_obj_dict_len(o_in); - } else { + mp_obj_t len = mp_obj_len_maybe(o_in); + if (len == NULL) { nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "object of type '%s' has no len()", mp_obj_get_type_str(o_in))); + } else { + return len; } - return MP_OBJ_NEW_SMALL_INT(len); } mp_obj_t mp_builtin_max(int n_args, const mp_obj_t *args) { diff --git a/py/obj.c b/py/obj.c index 3e4164d5d2..0558c38a7e 100644 --- a/py/obj.c +++ b/py/obj.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include "nlr.h" @@ -227,3 +228,26 @@ uint mp_get_index(const mp_obj_type_t *type, machine_uint_t len, mp_obj_t index) nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "%s indices must be integers, not %s", type->name, mp_obj_get_type_str(index))); } } + +// may return NULL +mp_obj_t mp_obj_len_maybe(mp_obj_t o_in) { + mp_small_int_t len = 0; + if (MP_OBJ_IS_TYPE(o_in, &str_type)) { + len = strlen(qstr_str(mp_obj_str_get(o_in))); + } else if (MP_OBJ_IS_TYPE(o_in, &tuple_type)) { + uint seq_len; + mp_obj_t *seq_items; + mp_obj_tuple_get(o_in, &seq_len, &seq_items); + len = seq_len; + } else if (MP_OBJ_IS_TYPE(o_in, &list_type)) { + uint seq_len; + mp_obj_t *seq_items; + mp_obj_list_get(o_in, &seq_len, &seq_items); + len = seq_len; + } else if (MP_OBJ_IS_TYPE(o_in, &dict_type)) { + len = mp_obj_dict_len(o_in); + } else { + return NULL; + } + return MP_OBJ_NEW_SMALL_INT(len); +} diff --git a/py/obj.h b/py/obj.h index 48080a0ec0..d897d906d9 100644 --- a/py/obj.h +++ b/py/obj.h @@ -234,6 +234,7 @@ void mp_obj_get_complex(mp_obj_t self_in, mp_float_t *real, mp_float_t *imag); qstr mp_obj_get_qstr(mp_obj_t arg); mp_obj_t *mp_obj_get_array_fixed_n(mp_obj_t o, machine_int_t n); uint mp_get_index(const mp_obj_type_t *type, machine_uint_t len, mp_obj_t index); +mp_obj_t mp_obj_len_maybe(mp_obj_t o_in); /* may return NULL */ // none extern const mp_obj_type_t none_type; diff --git a/py/objdict.c b/py/objdict.c index 6acee3fa78..8902e1020c 100644 --- a/py/objdict.c +++ b/py/objdict.c @@ -376,6 +376,61 @@ static mp_obj_t dict_values(mp_obj_t self_in) { } static MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values); + +/******************************************************************************/ +/* dict metaclass */ + +static mp_obj_t dict_fromkeys(int n_args, const mp_obj_t *args) { + assert(2 <= n_args && n_args <= 3); + mp_obj_t iter = rt_getiter(args[1]); + 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 == 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)); + } + + while ((next = rt_iternext(iter)) != mp_const_stop_iteration) { + mp_map_lookup(&self->map, next, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value; + } + + return self; +} +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_fromkeys_obj, 2, 3, dict_fromkeys); + +static const mp_method_t dict_class_methods[] = { + { "fromkeys", &dict_fromkeys_obj }, + { NULL, NULL }, // end-of-list sentinel +}; + +/* this should be unnecessary when inheritance works */ +static void dict_class_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in) { + print(env, ""); +} + +/* this should be unnecessary when inheritance works */ +static mp_obj_t dict_class_call_n(mp_obj_t self_in, int n_args, const mp_obj_t *args) { + return rt_build_map(0); +} + +static const mp_obj_type_t dict_class = { + { &mp_const_type }, + "dict_class", + .print = dict_class_print, + .methods = dict_class_methods, + .call_n = dict_class_call_n, +}; + + /******************************************************************************/ /* dict constructors & etc */ @@ -394,7 +449,7 @@ static const mp_method_t dict_type_methods[] = { }; const mp_obj_type_t dict_type = { - { &mp_const_type }, + { &dict_class }, "dict", .print = dict_print, .make_new = dict_make_new, diff --git a/tests/basics/tests/dict_fromkeys.py b/tests/basics/tests/dict_fromkeys.py new file mode 100644 index 0000000000..d03f6ae9d2 --- /dev/null +++ b/tests/basics/tests/dict_fromkeys.py @@ -0,0 +1,10 @@ +d = dict.fromkeys([1, 2, 3, 4]) +l = list(d.keys()) +l.sort() +print(l) + +d = dict.fromkeys([1, 2, 3, 4], 42) +l = list(d.values()) +l.sort() +print(l) +