diff options
author | bfredl <bjorn.linse@gmail.com> | 2023-05-14 18:45:56 +0200 |
---|---|---|
committer | bfredl <bjorn.linse@gmail.com> | 2023-05-17 12:26:21 +0200 |
commit | e2fdd53d8c015913e8be4ff708fc3488558c8906 (patch) | |
tree | 2858a7eb734b605225296c0019aa8048e24e425d /src/nvim/api/extmark.c | |
parent | 33687f5e87a0f048f7bc02d4658e58ef8cc0fd49 (diff) | |
download | rneovim-e2fdd53d8c015913e8be4ff708fc3488558c8906.tar.gz rneovim-e2fdd53d8c015913e8be4ff708fc3488558c8906.tar.bz2 rneovim-e2fdd53d8c015913e8be4ff708fc3488558c8906.zip |
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.
Diffstat (limited to 'src/nvim/api/extmark.c')
-rw-r--r-- | src/nvim/api/extmark.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nvim/api/extmark.c b/src/nvim/api/extmark.c index 87232a8a93..d6f0288f94 100644 --- a/src/nvim/api/extmark.c +++ b/src/nvim/api/extmark.c @@ -33,12 +33,10 @@ void api_extmark_free_all_mem(void) { String name; - handle_T id; - map_foreach(&namespace_ids, name, id, { - (void)id; + map_foreach_key(&namespace_ids, name, { xfree(name.data); }) - map_destroy(String, handle_T)(&namespace_ids); + map_destroy(String, &namespace_ids); } /// Creates a new namespace or gets an existing one. \*namespace\* @@ -77,7 +75,7 @@ Dictionary nvim_get_namespaces(void) String name; handle_T id; - map_foreach(&namespace_ids, name, id, { + map_foreach(handle_T, &namespace_ids, name, id, { PUT(retval, name.data, INTEGER_OBJ(id)); }) @@ -88,7 +86,7 @@ const char *describe_ns(NS ns_id) { String name; handle_T id; - map_foreach(&namespace_ids, name, id, { + map_foreach(handle_T, &namespace_ids, name, id, { if ((NS)id == ns_id && name.size) { return name.data; } |