GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-20 18:29:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

a more reasonable API to iterate over a map

Browse Source
This commit is contained in:
krangelov
2019-08-30 08:12:15 +02:00
parent 394d033d19
commit 72cfc1f48a
2 changed files with 16 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/runtime/c/gu/map.c
View File

@@ -321,47 +321,26 @@ gu_map_iter(GuMap* map, GuMapItor* itor, GuExn* err)
}
}
typedef struct {
GuEnum en;
GuMap* ht;
size_t i;
GuMapKeyValue x;
} GuMapEnum;
static void
gu_map_enum_next(GuEnum* self, void* to, GuPool* pool)
GU_API bool
gu_map_next(GuMap* map, size_t i, const void** pkey, void** pvalue)
{
*((GuMapKeyValue**) to) = NULL;
size_t i;
GuMapEnum* en = (GuMapEnum*) self;
for (i = en->i; i < en->ht->data.n_entries; i++) {
if (gu_map_entry_is_free(en->ht, &en->ht->data, i)) {
while (i < map->data.n_entries) {
if (gu_map_entry_is_free(map, &map->data, i)) {
i++;
continue;
}
en->x.key = &en->ht->data.keys[i * en->ht->key_size];
en->x.value = &en->ht->data.values[i * en->ht->cell_size];
if (en->ht->hasher == gu_addr_hasher) {
en->x.key = *(const void* const*) en->x.key;
} else if (en->ht->hasher == gu_string_hasher) {
en->x.key = *(GuString*) en->x.key;
}
*((GuMapKeyValue**) to) = &en->x;
break;
*pkey = &map->data.keys[i * map->key_size];
*pvalue = &map->data.values[i * map->cell_size];
if (map->hasher == gu_addr_hasher) {
*pkey = *(const void* const*) *pkey;
} else if (map->hasher == gu_string_hasher) {
*pkey = *(GuString*) *pkey;
}
return true;
}
en->i = i+1;
}
GU_API GuEnum*
gu_map_enum(GuMap* ht, GuPool* pool)
{
GuMapEnum* en = gu_new(GuMapEnum, pool);
en->en.next = gu_map_enum_next;
en->ht = ht;
en->i = 0;
return &en->en;
return false;
}
GU_API size_t

9
src/runtime/c/gu/map.h
View File

@@ -74,13 +74,8 @@ gu_map_delete(GuMap* ht, const void* key);
GU_API_DECL void
gu_map_iter(GuMap* ht, GuMapItor* itor, GuExn* err);
typedef struct {
const void* key;
void* value;
} GuMapKeyValue;
GU_API_DECL GuEnum*
gu_map_enum(GuMap* ht, GuPool* pool);
GU_API bool
gu_map_next(GuMap* ht, size_t i, const void** pkey, void** pvalue);
typedef GuMap GuIntMap;