diff options
Diffstat (limited to 'set.h')
| -rw-r--r-- | set.h | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -14,8 +14,9 @@ typedef struct Set Set; Set *set_new(hash_func_t hash_func, compare_func_t compare_func); -Set* set_copy(Set *s); void set_free(Set* s); +Set* set_copy(Set *s); +int set_ensure_allocated(Set **s, hash_func_t hash_func, compare_func_t compare_func); int set_put(Set *s, void *value); int set_replace(Set *s, void *value); @@ -27,18 +28,19 @@ int set_merge(Set *s, Set *other); unsigned set_size(Set *s); bool set_isempty(Set *s); -void *set_iterate(Set *s, void **state); -void *set_iterate_backwards(Set *s, void **state); +void *set_iterate(Set *s, Iterator *i); +void *set_iterate_backwards(Set *s, Iterator *i); +void *set_iterate_skip(Set *s, void *value, Iterator *i); void set_clear(Set *s); void *set_steal_first(Set *s); void* set_first(Set *s); void* set_last(Set *s); -#define SET_FOREACH(e, s, state) \ - for ((state) = NULL, (e) = set_iterate((s), &(state)); (e); (e) = set_iterate((s), &(state))) +#define SET_FOREACH(e, s, i) \ + for ((i) = ITERATOR_FIRST, (e) = set_iterate((s), &(i)); (e); (e) = set_iterate((s), &(i))) -#define SET_FOREACH_BACKWARDS(e, s, state) \ - for ((state) = NULL, (e) = set_iterate_backwards((s), &(state)); (e); (e) = set_iterate_backwards((s), &(state))) +#define SET_FOREACH_BACKWARDS(e, s, i) \ + for ((i) = ITERATOR_LAST, (e) = set_iterate_backwards((s), &(i)); (e); (e) = set_iterate_backwards((s), &(i))) #endif |