summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-11-26 21:17:16 +0200
committerDamien George <damien.p.george@gmail.com>2014-11-27 17:37:07 +0000
commite5dbe1e28340a9d1a7b651b35d8de449c46fcf23 (patch)
tree5214b5ad2f6d335873486892105d7a7a33b72d4e
parent317cf18486a4791b0322aadcb07c32c6e0a7d0d9 (diff)
downloadmicropython-e5dbe1e28340a9d1a7b651b35d8de449c46fcf23.tar.gz
micropython-e5dbe1e28340a9d1a7b651b35d8de449c46fcf23.zip
map: Add empty fixed map.
Useful when need to call kw-receiving functions without any keywords from C, etc.
-rw-r--r--py/map.c10
-rw-r--r--py/obj.h2
2 files changed, 12 insertions, 0 deletions
diff --git a/py/map.c b/py/map.c
index fb0c5a0795..a06325862e 100644
--- a/py/map.c
+++ b/py/map.c
@@ -34,6 +34,16 @@
#include "obj.h"
#include "runtime0.h"
+// Fixed empty map. Useful when need to call kw-receiving functions
+// without any keywords from C, etc.
+const mp_map_t mp_const_empty_map = {
+ .all_keys_are_qstrs = 0,
+ .table_is_fixed_array = 1,
+ .used = 0,
+ .alloc = 0,
+ .table = NULL,
+};
+
// approximatelly doubling primes; made with Mathematica command: Table[Prime[Floor[(1.7)^n]], {n, 3, 24}]
// prefixed with zero for the empty case.
STATIC uint32_t doubling_primes[] = {0, 7, 19, 43, 89, 179, 347, 647, 1229, 2297, 4243, 7829, 14347, 26017, 47149, 84947, 152443, 273253, 488399, 869927, 1547173, 2745121, 4861607};
diff --git a/py/obj.h b/py/obj.h
index 09f277a198..8a8a1eb211 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -148,6 +148,8 @@ typedef enum _mp_map_lookup_kind_t {
MP_MAP_LOOKUP_REMOVE_IF_FOUND, // 2
} mp_map_lookup_kind_t;
+extern const mp_map_t mp_const_empty_map;
+
static inline bool MP_MAP_SLOT_IS_FILLED(const mp_map_t *map, mp_uint_t pos) { return ((map)->table[pos].key != MP_OBJ_NULL && (map)->table[pos].key != MP_OBJ_SENTINEL); }
void mp_map_init(mp_map_t *map, mp_uint_t n);