diff options
Diffstat (limited to 'py/map.c')
| -rw-r--r-- | py/map.c | 35 |
1 files changed, 18 insertions, 17 deletions
@@ -24,6 +24,7 @@ * THE SOFTWARE. */ +#include <stdint.h> #include <stdlib.h> #include <assert.h> @@ -35,10 +36,10 @@ // approximatelly doubling primes; made with Mathematica command: Table[Prime[Floor[(1.7)^n]], {n, 3, 24}] // prefixed with zero for the empty case. -STATIC int 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}; +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}; -STATIC int get_doubling_prime_greater_or_equal_to(int x) { - for (int i = 0; i < sizeof(doubling_primes) / sizeof(int); i++) { +STATIC mp_uint_t get_doubling_prime_greater_or_equal_to(mp_uint_t x) { + for (int i = 0; i < MP_ARRAY_SIZE(doubling_primes); i++) { if (doubling_primes[i] >= x) { return doubling_primes[i]; } @@ -51,7 +52,7 @@ STATIC int get_doubling_prime_greater_or_equal_to(int x) { /******************************************************************************/ /* map */ -void mp_map_init(mp_map_t *map, int n) { +void mp_map_init(mp_map_t *map, mp_uint_t n) { if (n == 0) { map->alloc = 0; map->table = NULL; @@ -64,7 +65,7 @@ void mp_map_init(mp_map_t *map, int n) { map->table_is_fixed_array = 0; } -void mp_map_init_fixed_table(mp_map_t *map, int n, const mp_obj_t *table) { +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; @@ -72,7 +73,7 @@ void mp_map_init_fixed_table(mp_map_t *map, int n, const mp_obj_t *table) { map->table = (mp_map_elem_t*)table; } -mp_map_t *mp_map_new(int n) { +mp_map_t *mp_map_new(mp_uint_t n) { mp_map_t *map = m_new(mp_map_t, 1); mp_map_init(map, n); return map; @@ -103,13 +104,13 @@ void mp_map_clear(mp_map_t *map) { } STATIC void mp_map_rehash(mp_map_t *map) { - int old_alloc = map->alloc; + mp_uint_t old_alloc = map->alloc; mp_map_elem_t *old_table = map->table; map->alloc = get_doubling_prime_greater_or_equal_to(map->alloc + 1); map->used = 0; map->all_keys_are_qstrs = 1; map->table = m_new0(mp_map_elem_t, map->alloc); - for (int i = 0; i < old_alloc; i++) { + for (mp_uint_t i = 0; i < old_alloc; i++) { if (old_table[i].key != MP_OBJ_NULL && old_table[i].key != MP_OBJ_SENTINEL) { mp_map_lookup(map, old_table[i].key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = old_table[i].value; } @@ -168,8 +169,8 @@ mp_map_elem_t* mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t } mp_uint_t hash = mp_obj_hash(index); - uint pos = hash % map->alloc; - uint start_pos = pos; + mp_uint_t pos = hash % map->alloc; + mp_uint_t start_pos = pos; mp_map_elem_t *avail_slot = NULL; for (;;) { mp_map_elem_t *slot = &map->table[pos]; @@ -242,19 +243,19 @@ mp_map_elem_t* mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t /******************************************************************************/ /* set */ -void mp_set_init(mp_set_t *set, int n) { +void mp_set_init(mp_set_t *set, mp_uint_t n) { set->alloc = n; set->used = 0; set->table = m_new0(mp_obj_t, set->alloc); } STATIC void mp_set_rehash(mp_set_t *set) { - int old_alloc = set->alloc; + mp_uint_t old_alloc = set->alloc; mp_obj_t *old_table = set->table; set->alloc = get_doubling_prime_greater_or_equal_to(set->alloc + 1); set->used = 0; set->table = m_new0(mp_obj_t, set->alloc); - for (int i = 0; i < old_alloc; i++) { + for (mp_uint_t i = 0; i < old_alloc; i++) { if (old_table[i] != MP_OBJ_NULL && old_table[i] != MP_OBJ_SENTINEL) { mp_set_lookup(set, old_table[i], MP_MAP_LOOKUP_ADD_IF_NOT_FOUND); } @@ -271,8 +272,8 @@ mp_obj_t mp_set_lookup(mp_set_t *set, mp_obj_t index, mp_map_lookup_kind_t looku } } mp_uint_t hash = mp_obj_hash(index); - uint pos = hash % set->alloc; - uint start_pos = pos; + mp_uint_t pos = hash % set->alloc; + mp_uint_t start_pos = pos; mp_obj_t *avail_slot = NULL; for (;;) { mp_obj_t elem = set->table[pos]; @@ -333,7 +334,7 @@ mp_obj_t mp_set_lookup(mp_set_t *set, mp_obj_t index, mp_map_lookup_kind_t looku } mp_obj_t mp_set_remove_first(mp_set_t *set) { - for (uint pos = 0; pos < set->alloc; pos++) { + for (mp_uint_t pos = 0; pos < set->alloc; pos++) { if (MP_SET_SLOT_IS_FILLED(set, pos)) { mp_obj_t elem = set->table[pos]; // delete element @@ -359,7 +360,7 @@ void mp_set_clear(mp_set_t *set) { #if DEBUG_PRINT void mp_map_dump(mp_map_t *map) { - for (int i = 0; i < map->alloc; i++) { + for (mp_uint_t i = 0; i < map->alloc; i++) { if (map->table[i].key != NULL) { mp_obj_print(map->table[i].key, PRINT_REPR); } else { |