diff --git a/py/map.c b/py/map.c
index cbd89acc0d397318d864518490a0fbb5728a6cf4..a0db4ab11e25da72778566c615d15b806cb52ed7 100644
--- a/py/map.c
+++ b/py/map.c
@@ -26,6 +26,7 @@
#include <stdint.h>
#include <stdlib.h>
+#include <string.h>
#include <assert.h>
#include "py/mpconfig.h"
@@ -36,7 +37,8 @@
// without any keywords from C, etc.
const mp_map_t mp_const_empty_map = {
.all_keys_are_qstrs = 0,
- .table_is_fixed_array = 1,
+ .is_fixed = 1,
+ .is_ordered = 1,
.used = 0,
.alloc = 0,
.table = NULL,
@@ -70,14 +72,16 @@ void mp_map_init(mp_map_t *map, mp_uint_t n) {
}
map->used = 0;
map->all_keys_are_qstrs = 1;
- map->table_is_fixed_array = 0;
+ map->is_fixed = 0;
+ map->is_ordered = 0;
}
void mp_map_init_fixed_table(mp_map_t *map, mp_uint_t n, const mp_obj_t *table) {
map->alloc = n;
map->used = n;
map->all_keys_are_qstrs = 1;
- map->table_is_fixed_array = 1;
+ map->is_fixed = 1;
+ map->is_ordered = 1;
map->table = (mp_map_elem_t*)table;
}
@@ -89,7 +93,7 @@ mp_map_t *mp_map_new(mp_uint_t n) {
// Differentiate from mp_map_clear() - semantics is different
void mp_map_deinit(mp_map_t *map) {
- if (!map->table_is_fixed_array) {
+ if (!map->is_fixed) {
m_del(mp_map_elem_t, map->table, map->alloc);
}
map->used = map->alloc = 0;
@@ -101,13 +105,13 @@ void mp_map_free(mp_map_t *map) {
}
void mp_map_clear(mp_map_t *map) {
- if (!map->table_is_fixed_array) {
+ if (!map->is_fixed) {
m_del(mp_map_elem_t, map->table, map->alloc);
}
map->alloc = 0;
map->used = 0;
map->all_keys_are_qstrs = 1;
- map->table_is_fixed_array = 0;
+ map->is_fixed = 0;
map->table = NULL;
}
@@ -153,20 +157,40 @@ mp_map_elem_t* mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t
}
}
- // if the map is a fixed array then we must do a brute force linear search
- if (map->table_is_fixed_array) {
- if (lookup_kind != MP_MAP_LOOKUP) {
+ // if the map is an ordered array then we must do a brute force linear search
+ if (map->is_ordered) {
+ if (map->is_fixed && lookup_kind != MP_MAP_LOOKUP) {
+ // can't add/remove from a fixed array
return NULL;
}
for (mp_map_elem_t *elem = &map->table[0], *top = &map->table[map->used]; elem < top; elem++) {
if (elem->key == index || (!compare_only_ptrs && mp_obj_equal(elem->key, index))) {
+ if (MP_UNLIKELY(lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND)) {
+ elem->key = MP_OBJ_SENTINEL;
+ // keep elem->value so that caller can access it if needed
+ }
return elem;
}
}
- return NULL;
+ if (MP_LIKELY(lookup_kind != MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)) {
+ return NULL;
+ }
+ // TODO shrink array down over any previously-freed slots
+ if (map->used == map->alloc) {
+ // TODO: Alloc policy
+ map->alloc += 4;
+ map->table = m_renew(mp_map_elem_t, map->table, map->used, map->alloc);
+ mp_seq_clear(map->table, map->used, map->alloc, sizeof(*map->table));
+ }
+ mp_map_elem_t *elem = map->table + map->used++;
+ elem->key = index;
+ if (!MP_OBJ_IS_QSTR(index)) {
+ map->all_keys_are_qstrs = 0;
+ }
+ return elem;
}
- // map is a hash table (not a fixed array), so do a hash lookup
+ // map is a hash table (not an ordered array), so do a hash lookup
if (map->alloc == 0) {
if (lookup_kind & MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
diff --git a/py/modcollections.c b/py/modcollections.c
index 9fcbe879f25caa1bce7c065ea5103a31bf16b186..d740b041b44c182bc6f570d964c6e12510bb9ab8 100644
--- a/py/modcollections.c
+++ b/py/modcollections.c
@@ -31,6 +31,9 @@
STATIC const mp_map_elem_t mp_module_collections_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR__collections) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_namedtuple), (mp_obj_t)&mp_namedtuple_obj },
+ #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
+ { MP_OBJ_NEW_QSTR(MP_QSTR_OrderedDict), (mp_obj_t)&mp_type_ordereddict },
+ #endif
};
STATIC MP_DEFINE_CONST_DICT(mp_module_collections_globals, mp_module_collections_globals_table);
diff --git a/py/mpconfig.h b/py/mpconfig.h
index aac3ade0874865723b5a1d6a054a65a7570bed65..e8f7cc8909ad6bc6af6a4c47a7fd268574617c0c 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -444,6 +444,11 @@ typedef double mp_float_t;
#define MICROPY_PY_COLLECTIONS (1)
#endif
+// Whether to provide "collections.OrderedDict" type
+#ifndef MICROPY_PY_COLLECTIONS_ORDEREDDICT
+#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0)
+#endif
+
// Whether to provide "math" module
#ifndef MICROPY_PY_MATH
#define MICROPY_PY_MATH (1)
diff --git a/py/obj.h b/py/obj.h
index c58b72f08a45234153a880e3f52354ca62833fe7..3e2cd2a16fff130d6bd96f0d307b2da5a9d6e43f 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -109,7 +109,8 @@ typedef struct _mp_obj_base_t mp_obj_base_t;
#define MP_DEFINE_CONST_MAP(map_name, table_name) \
const mp_map_t map_name = { \
.all_keys_are_qstrs = 1, \
- .table_is_fixed_array = 1, \
+ .is_fixed = 1, \
+ .is_ordered = 1, \
.used = MP_ARRAY_SIZE(table_name), \
.alloc = MP_ARRAY_SIZE(table_name), \
.table = (mp_map_elem_t*)table_name, \
@@ -120,7 +121,8 @@ typedef struct _mp_obj_base_t mp_obj_base_t;
.base = {&mp_type_dict}, \
.map = { \
.all_keys_are_qstrs = 1, \
- .table_is_fixed_array = 1, \
+ .is_fixed = 1, \
+ .is_ordered = 1, \
.used = MP_ARRAY_SIZE(table_name), \
.alloc = MP_ARRAY_SIZE(table_name), \
.table = (mp_map_elem_t*)table_name, \
@@ -150,8 +152,9 @@ typedef struct _mp_map_elem_t {
typedef struct _mp_map_t {
mp_uint_t all_keys_are_qstrs : 1;
- mp_uint_t table_is_fixed_array : 1;
- mp_uint_t used : (8 * sizeof(mp_uint_t) - 2);
+ mp_uint_t is_fixed : 1; // a fixed array that can't be modified; must also be ordered
+ mp_uint_t is_ordered : 1; // an ordered array
+ mp_uint_t used : (8 * sizeof(mp_uint_t) - 3);
mp_uint_t alloc;
mp_map_elem_t *table;
} mp_map_t;
@@ -327,6 +330,7 @@ extern const mp_obj_type_t mp_type_map; // map (the python builtin, not the dict
extern const mp_obj_type_t mp_type_enumerate;
extern const mp_obj_type_t mp_type_filter;
extern const mp_obj_type_t mp_type_dict;
+extern const mp_obj_type_t mp_type_ordereddict;
extern const mp_obj_type_t mp_type_range;
extern const mp_obj_type_t mp_type_set;
extern const mp_obj_type_t mp_type_frozenset;
diff --git a/py/objdict.c b/py/objdict.c
index e97f30e7a229631774fabfedc1ad891b022c2669..09a5b321227807a09287b4f9a4a32b3ba5c800d3 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -32,6 +32,9 @@
#include "py/runtime0.h"
#include "py/runtime.h"
#include "py/builtin.h"
+#include "py/objtype.h"
+
+#define MP_OBJ_IS_DICT_TYPE(o) (MP_OBJ_IS_OBJ(o) && ((mp_obj_base_t*)o)->type->make_new == dict_make_new)
STATIC mp_obj_t dict_update(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwargs);
@@ -58,6 +61,9 @@ STATIC void dict_print(void (*print)(void *env, const char *fmt, ...), void *env
if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) {
kind = PRINT_REPR;
}
+ if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict) {
+ print(env, "%s(", qstr_str(self->base.type->name));
+ }
print(env, "{");
mp_uint_t cur = 0;
mp_map_elem_t *next = NULL;
@@ -71,11 +77,19 @@ STATIC void dict_print(void (*print)(void *env, const char *fmt, ...), void *env
mp_obj_print_helper(print, env, next->value, kind);
}
print(env, "}");
+ if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict) {
+ print(env, ")");
+ }
}
STATIC mp_obj_t dict_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
- (void)type_in;
- mp_obj_t dict = mp_obj_new_dict(0);
+ mp_obj_dict_t *dict = mp_obj_new_dict(0);
+ dict->base.type = type_in;
+ #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
+ if (type_in == &mp_type_ordereddict) {
+ dict->map.is_ordered = 1;
+ }
+ #endif
if (n_args > 0 || n_kw > 0) {
mp_obj_t args2[2] = {dict, args[0]}; // args[0] is always valid, even if it's not a positional arg
mp_map_t kwargs;
@@ -102,6 +116,12 @@ STATIC mp_obj_t dict_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
return MP_BOOL(elem != NULL);
}
case MP_BINARY_OP_EQUAL: {
+ #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
+ if (MP_UNLIKELY(MP_OBJ_IS_TYPE(lhs_in, &mp_type_ordereddict) && MP_OBJ_IS_TYPE(rhs_in, &mp_type_ordereddict))) {
+ //TODO: implement
+ return MP_OBJ_NULL;
+ } else
+ #endif
if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_dict)) {
mp_obj_dict_t *rhs = rhs_in;
if (o->map.used != rhs->map.used) {
@@ -199,7 +219,7 @@ STATIC mp_obj_t dict_getiter(mp_obj_t o_in) {
/* dict methods */
STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
- assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
+ assert(MP_OBJ_IS_DICT_TYPE(self_in));
mp_obj_dict_t *self = self_in;
mp_map_clear(&self->map);
@@ -209,12 +229,14 @@ STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
STATIC mp_obj_t dict_copy(mp_obj_t self_in) {
- assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
+ assert(MP_OBJ_IS_DICT_TYPE(self_in));
mp_obj_dict_t *self = self_in;
mp_obj_dict_t *other = mp_obj_new_dict(self->map.alloc);
+ other->base.type = self->base.type;
other->map.used = self->map.used;
other->map.all_keys_are_qstrs = self->map.all_keys_are_qstrs;
- other->map.table_is_fixed_array = 0;
+ other->map.is_fixed = 0;
+ other->map.is_ordered = self->map.is_ordered;
memcpy(other->map.table, self->map.table, self->map.alloc * sizeof(mp_map_elem_t));
return other;
}
@@ -276,7 +298,7 @@ STATIC mp_obj_t dict_get_helper(mp_map_t *self, mp_obj_t key, mp_obj_t deflt, mp
STATIC mp_obj_t dict_get(mp_uint_t n_args, const mp_obj_t *args) {
assert(2 <= n_args && n_args <= 3);
- assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
+ assert(MP_OBJ_IS_DICT_TYPE(args[0]));
return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
args[1],
@@ -287,7 +309,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_get_obj, 2, 3, dict_get);
STATIC mp_obj_t dict_pop(mp_uint_t n_args, const mp_obj_t *args) {
assert(2 <= n_args && n_args <= 3);
- assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
+ assert(MP_OBJ_IS_DICT_TYPE(args[0]));
return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
args[1],
@@ -299,7 +321,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_pop_obj, 2, 3, dict_pop);
STATIC mp_obj_t dict_setdefault(mp_uint_t n_args, const mp_obj_t *args) {
assert(2 <= n_args && n_args <= 3);
- assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
+ assert(MP_OBJ_IS_DICT_TYPE(args[0]));
return dict_get_helper(&((mp_obj_dict_t *)args[0])->map,
args[1],
@@ -310,7 +332,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_setdefault_obj, 2, 3, dict_setde
STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
- assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
+ assert(MP_OBJ_IS_DICT_TYPE(self_in));
mp_obj_dict_t *self = self_in;
mp_uint_t cur = 0;
mp_map_elem_t *next = dict_iter_next(self, &cur);
@@ -328,7 +350,7 @@ STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_popitem_obj, dict_popitem);
STATIC mp_obj_t dict_update(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
- assert(MP_OBJ_IS_TYPE(args[0], &mp_type_dict));
+ assert(MP_OBJ_IS_DICT_TYPE(args[0]));
mp_obj_dict_t *self = args[0];
mp_arg_check_num(n_args, kwargs->used, 1, 2, true);
@@ -336,7 +358,7 @@ STATIC mp_obj_t dict_update(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw
if (n_args == 2) {
// given a positional argument
- if (MP_OBJ_IS_TYPE(args[1], &mp_type_dict)) {
+ if (MP_OBJ_IS_DICT_TYPE(args[1])) {
// update from other dictionary (make sure other is not self)
if (args[1] != self) {
mp_uint_t cur = 0;
@@ -494,7 +516,7 @@ STATIC mp_obj_t mp_obj_new_dict_view(mp_obj_dict_t *dict, mp_dict_view_kind_t ki
}
STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) {
- assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
+ assert(MP_OBJ_IS_DICT_TYPE(self_in));
mp_obj_dict_t *self = self_in;
return mp_obj_new_dict_view(self, kind);
}
@@ -548,6 +570,23 @@ const mp_obj_type_t mp_type_dict = {
.locals_dict = (mp_obj_t)&dict_locals_dict,
};
+#if MICROPY_PY_COLLECTIONS_ORDEREDDICT
+STATIC const mp_obj_tuple_t ordereddict_base_tuple = {{&mp_type_tuple}, 1, {(mp_obj_t)&mp_type_dict}};
+
+const mp_obj_type_t mp_type_ordereddict = {
+ { &mp_type_type },
+ .name = MP_QSTR_OrderedDict,
+ .print = dict_print,
+ .make_new = dict_make_new,
+ .unary_op = dict_unary_op,
+ .binary_op = dict_binary_op,
+ .subscr = dict_subscr,
+ .getiter = dict_getiter,
+ .bases_tuple = (mp_obj_t)&ordereddict_base_tuple,
+ .locals_dict = (mp_obj_t)&dict_locals_dict,
+};
+#endif
+
void mp_obj_dict_init(mp_obj_dict_t *dict, mp_uint_t n_args) {
dict->base.type = &mp_type_dict;
mp_map_init(&dict->map, n_args);
@@ -564,21 +603,21 @@ mp_uint_t mp_obj_dict_len(mp_obj_t self_in) {
}
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, &mp_type_dict));
+ assert(MP_OBJ_IS_DICT_TYPE(self_in));
mp_obj_dict_t *self = self_in;
mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
return self_in;
}
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));
+ assert(MP_OBJ_IS_DICT_TYPE(self_in));
mp_obj_dict_t *self = self_in;
dict_get_helper(&self->map, key, MP_OBJ_NULL, MP_MAP_LOOKUP_REMOVE_IF_FOUND);
return self_in;
}
mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in) {
- assert(MP_OBJ_IS_TYPE(self_in, &mp_type_dict));
+ assert(MP_OBJ_IS_DICT_TYPE(self_in));
mp_obj_dict_t *self = self_in;
return &self->map;
}
diff --git a/py/objmodule.c b/py/objmodule.c
index 0e806a70542206ea968b47901369445259fbcc11..02292ff785761e1d195a19946640eeecc7cc6f94 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -62,7 +62,7 @@ STATIC void module_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
STATIC bool module_store_attr(mp_obj_t self_in, qstr attr, mp_obj_t value) {
mp_obj_module_t *self = self_in;
mp_obj_dict_t *dict = self->globals;
- if (dict->map.table_is_fixed_array) {
+ if (dict->map.is_fixed) {
#if MICROPY_CAN_OVERRIDE_BUILTINS
if (dict == &mp_module_builtins_globals) {
if (MP_STATE_VM(mp_module_builtins_override_dict) == NULL) {
diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index 63112e6c70a7cb1dfede1ca0fbb2364208615bd8..dc1f082da3ab0df1d30d5de9a929ebca0ce50793 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -148,6 +148,10 @@ Q(object)
Q(NoneType)
+#if MICROPY_PY_COLLECTIONS_ORDEREDDICT
+Q(OrderedDict)
+#endif
+
Q(abs)
Q(all)
Q(any)
diff --git a/stmhal/mpconfigport.h b/stmhal/mpconfigport.h
index c1420da5c03721427d9bb2f1bc9fe8e603259640..1d3378739d4945bd2e189ff21cc945bb76076bbe 100644
--- a/stmhal/mpconfigport.h
+++ b/stmhal/mpconfigport.h
@@ -63,6 +63,7 @@
#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
#define MICROPY_PY_SYS_EXIT (1)
#define MICROPY_PY_SYS_STDFILES (1)
+#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
#define MICROPY_PY_CMATH (1)
#define MICROPY_PY_IO (1)
diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h
index c8ba26897ba258e50c310abcd97e3496bf2bfb77..a7ebf21ed33bdca0da05b30057d95ef63974c684 100644
--- a/unix/mpconfigport.h
+++ b/unix/mpconfigport.h
@@ -68,6 +68,7 @@
#define MICROPY_PY_SYS_PLATFORM "linux"
#define MICROPY_PY_SYS_MAXSIZE (1)
#define MICROPY_PY_SYS_STDFILES (1)
+#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
#define MICROPY_PY_CMATH (1)
#define MICROPY_PY_IO_FILEIO (1)