diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gehashmap.h | 10 | ||||
| -rw-r--r-- | src/geset.h | 107 |
2 files changed, 116 insertions, 1 deletions
diff --git a/src/gehashmap.h b/src/gehashmap.h index 832d047..ccd7a60 100644 --- a/src/gehashmap.h +++ b/src/gehashmap.h @@ -42,7 +42,7 @@ \ /* A structure representing an actual hashmap */ \ typedef struct { \ - size_t __size, /* The number of used buckets */ \ + size_t __size, /* The number of elements in the map */ \ __cap; /* The number of allocated buckets */ \ double __loadf; /* The % of the hashmap that must be * filled before the map grows */ \ @@ -54,6 +54,7 @@ int n##_set(n_t *, k, v); \ bool n##_get(n_t *, k, v *); \ bool n##_has(n_t *, k); \ + size_t n##_size(n_t *); \ int n##_remove(n_t *, k); \ int n##_resize(n_t *, size_t); \ bool n##_key_iseq(k, k); \ @@ -160,6 +161,13 @@ return n##_get(map, key, NULL); \ } \ \ + /* Function to get the number of elements in a hashmap. */ \ + size_t \ + n##_size(n_t *map) \ + { \ + return map->__size; \ + } \ + \ /* Function to remove an element with a given key from a hashmap. If * the key or value were dynamically allocated they will not be freed. * On error -1 is returned, otherwise 0 is returned. diff --git a/src/geset.h b/src/geset.h new file mode 100644 index 0000000..da463f2 --- /dev/null +++ b/src/geset.h @@ -0,0 +1,107 @@ +#ifndef LIBGE_GESET_H +#define LIBGE_GESET_H + +#include <stdbool.h> + +#include <gehashmap.h> + +#define GESET_FOREACH(n, t, e, s) \ + for (size_t __ge_i = 0; __ge_i < (s).__cap; __ge_i++) \ + for (struct __##n##_hashmap_entry *__ge_e = (s).__ents[__ge_i]; \ + __ge_e != NULL; \ + __ge_e = __ge_e->__next) \ + for (bool __ge_c = true; __ge_c; __ge_c = false) \ + for (t e = __ge_e->key; __ge_c; __ge_c = false) + +#define GESET_FOREACH_SAFE(n, t, e, s) \ + for (size_t __ge_i = 0; __ge_i < (s).__cap; __ge_i++) \ + for (struct __##n##_hashmap_entry *__ge_e = (s).__ents[__ge_i], \ + *__ge_t = __ge_e ? __ge_e->__next : NULL; \ + __ge_e != NULL; \ + __ge_e = __ge_t, __ge_t = __ge_e ? __ge_e->__next : NULL) \ + for (bool __ge_c = true; __ge_c; __ge_c = false) \ + for (t e = __ge_e->key; __ge_c; __ge_c = false) + +#define GESET_DEF(t, n) \ + GESET_DEF_API(t, n) \ + GESET_DEF_IMPL(t, n) + +#define GESET_DEF_API(t, n) \ + GESET_DEF_API_HELPER(t, n, n##_t, __##n##_hashmap) +#define GESET_DEF_API_HELPER(t, n, n_t, int_n) \ + GEHASHMAP_DEF_API(t, int, int_n) \ + \ + typedef int_n##_t n_t; \ + \ + int n##_new(n_t *, size_t, double); \ + void n##_free(n_t *); \ + int n##_add(n_t *, t); \ + bool n##_has(n_t *, t); \ + size_t n##_size(n_t *); \ + int n##_remove(n_t *, t); \ + int n##_resize(n_t *, size_t); \ + bool int_n##_key_iseq(t, t); \ + size_t int_n##_key_hash(t); \ + bool n##_elem_iseq(t, t); \ + size_t n##_elem_hash(t); + +#define GESET_DEF_IMPL(t, n) \ + GESET_DEF_IMPL_HELPER(t, n, n##_t, __##n##_hashmap) +#define GESET_DEF_IMPL_HELPER(t, n, n_t, int_n) \ + GEHASHMAP_DEF_IMPL(t, int, int_n) \ + \ + bool \ + int_n##_key_iseq(t a, t b) \ + { \ + return n##_elem_iseq(a, b); \ + } \ + \ + size_t \ + int_n##_key_hash(t e) \ + { \ + return n##_elem_hash(e); \ + } \ + \ + int \ + n##_new(n_t *set, size_t cap, double loadf) \ + { \ + return int_n##_new(set, cap, loadf); \ + } \ + \ + void \ + n##_free(n_t *set) \ + { \ + int_n##_free(set); \ + } \ + \ + int \ + n##_add(n_t *set, t e) \ + { \ + return int_n##_set(set, e, 0); \ + } \ + \ + bool \ + n##_has(n_t *set, t e) \ + { \ + return int_n##_has(set, e); \ + } \ + \ + size_t \ + n##_size(n_t *set) \ + { \ + return int_n##_size(set); \ + } \ + \ + int \ + n##_remove(n_t *set, t e) \ + { \ + return int_n##_remove(set, e); \ + } \ + \ + int \ + n##_resize(n_t *set, size_t ncap) \ + { \ + return int_n##_resize(set, ncap); \ + } + +#endif /* !LIBGE_GESET_H */ |