mirror of
https://github.com/neovim/neovim.git
synced 2025-10-07 18:36:30 +00:00
refactor(map): avoid duplicated khash_t types for values
This reduces the total number of khash_t instantiations from 22 to 8. Make the khash internal functions take the size of values as a runtime parameter. This is abstracted with typesafe Map containers which are still specialized for both key, value type. Introduce `Set(key)` type for when there is no value. Refactor shada.c to use Map/Set instead of khash directly. This requires `map_ref` operation to be more flexible. Return pointers to both key and value, plus an indicator for new_item. As a bonus, `map_key` is now redundant. Instead of Map(cstr_t, FileMarks), use a pointer map as the FileMarks struct is humongous. Make `event_strings` actually work like an intern pool instead of wtf it was doing before.
This commit is contained in:
@@ -359,7 +359,7 @@ uint64_t marktree_del_itr(MarkTree *b, MarkTreeIter *itr, bool rev)
|
||||
}
|
||||
|
||||
b->n_keys--;
|
||||
pmap_del(uint64_t)(b->id2node, id);
|
||||
pmap_del(uint64_t)(b->id2node, id, NULL);
|
||||
|
||||
// 5.
|
||||
bool itr_dirty = false;
|
||||
@@ -549,8 +549,8 @@ void marktree_clear(MarkTree *b)
|
||||
b->root = NULL;
|
||||
}
|
||||
if (b->id2node->table.keys) {
|
||||
pmap_destroy(uint64_t)(b->id2node);
|
||||
pmap_init(uint64_t, b->id2node);
|
||||
map_destroy(uint64_t, b->id2node);
|
||||
*b->id2node = (PMap(uint64_t)) MAP_INIT;
|
||||
}
|
||||
b->n_keys = 0;
|
||||
b->n_nodes = 0;
|
||||
|
Reference in New Issue
Block a user