py/map: Add board option MICROPY_PY_MAP_ORDERED to make all dicts/maps ordered.

pi-anl · pi-anl · commit 80e1681f9636 · 2020-04-30T12:40:25.000+10:00
diff --git a/py/map.c b/py/map.c
@@ -87,15 +87,19 @@ void mp_map_init(mp_map_t *map, size_t n) {
     map->used = 0;
     map->all_keys_are_qstrs = 1;
     map->is_fixed = 0;
+    #if !MICROPY_PY_MAP_ORDERED
     map->is_ordered = 0;
+    #endif
 }
 
 void mp_map_init_fixed_table(mp_map_t *map, size_t n, const mp_obj_t *table) {
     map->alloc = n;
     map->used = n;
     map->all_keys_are_qstrs = 1;
     map->is_fixed = 1;
+    #if !MICROPY_PY_MAP_ORDERED
     map->is_ordered = 1;
+    #endif
     map->table = (mp_map_elem_t *)table;
 }
 
@@ -118,6 +122,7 @@ void mp_map_clear(mp_map_t *map) {
     map->table = NULL;
 }
 
+#if !MICROPY_PY_MAP_ORDERED
 STATIC void mp_map_rehash(mp_map_t *map) {
     size_t old_alloc = map->alloc;
     size_t new_alloc = get_hash_alloc_greater_or_equal_to(map->alloc + 1);
@@ -136,6 +141,7 @@ STATIC void mp_map_rehash(mp_map_t *map) {
     }
     m_del(mp_map_elem_t, old_table, old_alloc);
 }
+#endif
 
 // MP_MAP_LOOKUP behaviour:
 //  - returns NULL if not found, else the slot it was found in with key,value non-null
@@ -167,7 +173,9 @@ mp_map_elem_t *mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t
     }
 
     // if the map is an ordered array then we must do a brute force linear search
+    #if !MICROPY_PY_MAP_ORDERED
     if (map->is_ordered) {
+    #endif
         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 MICROPY_PY_COLLECTIONS_ORDEREDDICT
@@ -205,6 +213,8 @@ mp_map_elem_t *mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t
         #else
         return NULL;
         #endif
+
+    #if !MICROPY_PY_MAP_ORDERED
     }
 
     // map is a hash table (not an ordered array), so do a hash lookup
@@ -294,6 +304,7 @@ mp_map_elem_t *mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t
             }
         }
     }
+    #endif // !MICROPY_PY_MAP_ORDERED
 }
 
 /******************************************************************************/

Original file line number	Diff line number	Diff line change
`@@ -87,15 +87,19 @@ void mp_map_init(mp_map_t *map, size_t n) {`
`87`	`87`	`map->used = 0;`
`88`	`88`	`map->all_keys_are_qstrs = 1;`
`89`	`89`	`map->is_fixed = 0;`
	`90`	`+ #if !MICROPY_PY_MAP_ORDERED`
`90`	`91`	`map->is_ordered = 0;`
	`92`	`+ #endif`
`91`	`93`	`}`
`92`	`94`
`93`	`95`	`void mp_map_init_fixed_table(mp_map_t map, size_t n, const mp_obj_t table) {`
`94`	`96`	`map->alloc = n;`
`95`	`97`	`map->used = n;`
`96`	`98`	`map->all_keys_are_qstrs = 1;`
`97`	`99`	`map->is_fixed = 1;`
	`100`	`+ #if !MICROPY_PY_MAP_ORDERED`
`98`	`101`	`map->is_ordered = 1;`
	`102`	`+ #endif`
`99`	`103`	`map->table = (mp_map_elem_t *)table;`
`100`	`104`	`}`
`101`	`105`
`@@ -118,6 +122,7 @@ void mp_map_clear(mp_map_t *map) {`
`118`	`122`	`map->table = NULL;`
`119`	`123`	`}`
`120`	`124`
	`125`	`+#if !MICROPY_PY_MAP_ORDERED`
`121`	`126`	`STATIC void mp_map_rehash(mp_map_t *map) {`
`122`	`127`	`size_t old_alloc = map->alloc;`
`123`	`128`	`size_t new_alloc = get_hash_alloc_greater_or_equal_to(map->alloc + 1);`
`@@ -136,6 +141,7 @@ STATIC void mp_map_rehash(mp_map_t *map) {`
`136`	`141`	`}`
`137`	`142`	`m_del(mp_map_elem_t, old_table, old_alloc);`
`138`	`143`	`}`
	`144`	`+#endif`
`139`	`145`
`140`	`146`	`// MP_MAP_LOOKUP behaviour:`
`141`	`147`	`// - returns NULL if not found, else the slot it was found in with key,value non-null`
`@@ -167,7 +173,9 @@ mp_map_elem_t mp_map_lookup(mp_map_t map, mp_obj_t index, mp_map_lookup_kind_t`
`167`	`173`	`}`
`168`	`174`
`169`	`175`	`// if the map is an ordered array then we must do a brute force linear search`
	`176`	`+ #if !MICROPY_PY_MAP_ORDERED`
`170`	`177`	`if (map->is_ordered) {`
	`178`	`+ #endif`
`171`	`179`	`for (mp_map_elem_t elem = &map->table[0], top = &map->table[map->used]; elem < top; elem++) {`
`172`	`180`	`if (elem->key == index \|\| (!compare_only_ptrs && mp_obj_equal(elem->key, index))) {`
`173`	`181`	`#if MICROPY_PY_COLLECTIONS_ORDEREDDICT`
`@@ -205,6 +213,8 @@ mp_map_elem_t mp_map_lookup(mp_map_t map, mp_obj_t index, mp_map_lookup_kind_t`
`205`	`213`	`#else`
`206`	`214`	`return NULL;`
`207`	`215`	`#endif`
	`216`	`+`
	`217`	`+ #if !MICROPY_PY_MAP_ORDERED`
`208`	`218`	`}`
`209`	`219`
`210`	`220`	`// map is a hash table (not an ordered array), so do a hash lookup`
`@@ -294,6 +304,7 @@ mp_map_elem_t mp_map_lookup(mp_map_t map, mp_obj_t index, mp_map_lookup_kind_t`
`294`	`304`	`}`
`295`	`305`	`}`
`296`	`306`	`}`
	`307`	`+ #endif // !MICROPY_PY_MAP_ORDERED`
`297`	`308`	`}`
`298`	`309`
`299`	`310`	`/******************************************************************************/`