diff --git a/src/cmc/treemap.h b/src/cmc/treemap.h index 08bd869..ebc1474 100644 --- a/src/cmc/treemap.h +++ b/src/cmc/treemap.h @@ -76,12 +76,6 @@ static const char *cmc_string_fmt_treemap = "struct %s<%s, %s> " \ /* Custom callback functions */ \ struct cmc_callbacks *callbacks; \ - \ - /* Function that returns an iterator to the start of the treemap */ \ - struct SNAME##_iter (*it_start)(struct SNAME *); \ - \ - /* Function that returns an iterator to the end of the treemap */ \ - struct SNAME##_iter (*it_end)(struct SNAME *); \ }; \ \ /* Treemap Node */ \ @@ -208,17 +202,15 @@ static const char *cmc_string_fmt_treemap = "struct %s<%s, %s> " bool PFX##_print(struct SNAME *_map_, FILE *fptr); \ \ /* Iterator Functions */ \ - /* Iterator Allocation and Deallocation */ \ - struct SNAME##_iter *PFX##_iter_new(struct SNAME *target); \ - void PFX##_iter_free(struct SNAME##_iter *iter); \ /* Iterator Initialization */ \ - void PFX##_iter_init(struct SNAME##_iter *iter, struct SNAME *target); \ + struct SNAME##_iter PFX##_iter_start(struct SNAME *target); \ + struct SNAME##_iter PFX##_iter_end(struct SNAME *target); \ /* Iterator State */ \ - bool PFX##_iter_start(struct SNAME##_iter *iter); \ - bool PFX##_iter_end(struct SNAME##_iter *iter); \ + bool PFX##_iter_at_start(struct SNAME##_iter *iter); \ + bool PFX##_iter_at_end(struct SNAME##_iter *iter); \ /* Iterator Movement */ \ - void PFX##_iter_to_start(struct SNAME##_iter *iter); \ - void PFX##_iter_to_end(struct SNAME##_iter *iter); \ + bool PFX##_iter_to_start(struct SNAME##_iter *iter); \ + bool PFX##_iter_to_end(struct SNAME##_iter *iter); \ bool PFX##_iter_next(struct SNAME##_iter *iter); \ bool PFX##_iter_prev(struct SNAME##_iter *iter); \ bool PFX##_iter_advance(struct SNAME##_iter *iter, size_t steps); \ @@ -246,8 +238,6 @@ static const char *cmc_string_fmt_treemap = "struct %s<%s, %s> " static void PFX##_impl_rotate_left(struct SNAME##_node **Z); \ static void PFX##_impl_rebalance(struct SNAME *_map_, \ struct SNAME##_node *node); \ - static struct SNAME##_iter PFX##_impl_it_start(struct SNAME *_map_); \ - static struct SNAME##_iter PFX##_impl_it_end(struct SNAME *_map_); \ \ struct SNAME *PFX##_new(struct SNAME##_fkey *f_key, \ struct SNAME##_fval *f_val) \ @@ -269,8 +259,6 @@ static const char *cmc_string_fmt_treemap = "struct %s<%s, %s> " _map_->f_val = f_val; \ _map_->alloc = alloc; \ _map_->callbacks = NULL; \ - _map_->it_start = PFX##_impl_it_start; \ - _map_->it_end = PFX##_impl_it_end; \ \ return _map_; \ } \ @@ -297,8 +285,6 @@ static const char *cmc_string_fmt_treemap = "struct %s<%s, %s> " _map_->f_val = f_val; \ _map_->alloc = alloc; \ _map_->callbacks = callbacks; \ - _map_->it_start = PFX##_impl_it_start; \ - _map_->it_end = PFX##_impl_it_end; \ \ return _map_; \ } \ @@ -762,11 +748,9 @@ static const char *cmc_string_fmt_treemap = "struct %s<%s, %s> " } \ \ /* TODO turn this into a normal loop */ \ - struct SNAME##_iter iter; \ - PFX##_iter_init(&iter, _map_); \ + struct SNAME##_iter iter = PFX##_iter_start(_map_); \ \ - for (PFX##_iter_to_start(&iter); !PFX##_iter_end(&iter); \ - PFX##_iter_next(&iter)) \ + for (; !PFX##_iter_at_end(&iter); PFX##_iter_next(&iter)) \ { \ K key = PFX##_iter_key(&iter); \ V value = PFX##_iter_value(&iter); \ @@ -795,11 +779,9 @@ static const char *cmc_string_fmt_treemap = "struct %s<%s, %s> " return false; \ \ /* TODO turn this into a normal loop */ \ - struct SNAME##_iter iter; \ - PFX##_iter_init(&iter, _map1_); \ + struct SNAME##_iter iter = PFX##_iter_start(_map1_); \ \ - for (PFX##_iter_to_start(&iter); !PFX##_iter_end(&iter); \ - PFX##_iter_next(&iter)) \ + for (; !PFX##_iter_at_end(&iter); PFX##_iter_next(&iter)) \ { \ struct SNAME##_node *node = \ PFX##_impl_get_node(_map2_, PFX##_iter_key(&iter)); \ @@ -868,58 +850,73 @@ static const char *cmc_string_fmt_treemap = "struct %s<%s, %s> " return true; \ } \ \ - struct SNAME##_iter *PFX##_iter_new(struct SNAME *target) \ + struct SNAME##_iter PFX##_iter_start(struct SNAME *target) \ { \ - struct SNAME##_iter *iter = \ - target->alloc->malloc(sizeof(struct SNAME##_iter)); \ + struct SNAME##_iter iter; \ \ - if (!iter) \ - return NULL; \ + iter.target = target; \ + iter.cursor = target->root; \ + iter.first = NULL; \ + iter.last = NULL; \ + iter.index = 0; \ + iter.start = true; \ + iter.end = PFX##_empty(target); \ \ - PFX##_iter_init(iter, target); \ + if (!PFX##_empty(target)) \ + { \ + while (iter.cursor->left != NULL) \ + iter.cursor = iter.cursor->left; \ + \ + iter.first = iter.cursor; \ + \ + iter.last = target->root; \ + while (iter.last->right != NULL) \ + iter.last = iter.last->right; \ + } \ \ return iter; \ } \ \ - void PFX##_iter_free(struct SNAME##_iter *iter) \ + struct SNAME##_iter PFX##_iter_end(struct SNAME *target) \ { \ - iter->target->alloc->free(iter); \ - } \ + struct SNAME##_iter iter; \ \ - void PFX##_iter_init(struct SNAME##_iter *iter, struct SNAME *target) \ - { \ - memset(iter, 0, sizeof(struct SNAME##_iter)); \ - \ - iter->target = target; \ - iter->start = true; \ - iter->end = PFX##_empty(target); \ - \ - iter->cursor = target->root; \ + iter.target = target; \ + iter.cursor = target->root; \ + iter.first = NULL; \ + iter.last = NULL; \ + iter.index = 0; \ + iter.start = PFX##_empty(target); \ + iter.end = true; \ \ if (!PFX##_empty(target)) \ { \ - while (iter->cursor->left != NULL) \ - iter->cursor = iter->cursor->left; \ + while (iter.cursor->right != NULL) \ + iter.cursor = iter.cursor->right; \ \ - iter->first = iter->cursor; \ + iter.last = iter.cursor; \ \ - iter->last = target->root; \ - while (iter->last->right != NULL) \ - iter->last = iter->last->right; \ + iter.first = target->root; \ + while (iter.first->left != NULL) \ + iter.first = iter.first->left; \ + \ + iter.index = target->count - 1; \ } \ + \ + return iter; \ } \ \ - bool PFX##_iter_start(struct SNAME##_iter *iter) \ + bool PFX##_iter_at_start(struct SNAME##_iter *iter) \ { \ return PFX##_empty(iter->target) || iter->start; \ } \ \ - bool PFX##_iter_end(struct SNAME##_iter *iter) \ + bool PFX##_iter_at_end(struct SNAME##_iter *iter) \ { \ return PFX##_empty(iter->target) || iter->end; \ } \ \ - void PFX##_iter_to_start(struct SNAME##_iter *iter) \ + bool PFX##_iter_to_start(struct SNAME##_iter *iter) \ { \ if (!PFX##_empty(iter->target)) \ { \ @@ -927,10 +924,14 @@ static const char *cmc_string_fmt_treemap = "struct %s<%s, %s> " iter->start = true; \ iter->end = PFX##_empty(iter->target); \ iter->cursor = iter->first; \ + \ + return true; \ } \ + \ + return false; \ } \ \ - void PFX##_iter_to_end(struct SNAME##_iter *iter) \ + bool PFX##_iter_to_end(struct SNAME##_iter *iter) \ { \ if (!PFX##_empty(iter->target)) \ { \ @@ -938,7 +939,11 @@ static const char *cmc_string_fmt_treemap = "struct %s<%s, %s> " iter->start = PFX##_empty(iter->target); \ iter->end = true; \ iter->cursor = iter->last; \ + \ + return true; \ } \ + \ + return false; \ } \ \ bool PFX##_iter_next(struct SNAME##_iter *iter) \ @@ -1036,8 +1041,6 @@ static const char *cmc_string_fmt_treemap = "struct %s<%s, %s> " if (steps == 0 || iter->index + steps >= iter->target->count) \ return false; \ \ - iter->index += steps; \ - \ for (size_t i = 0; i < steps; i++) \ PFX##_iter_next(iter); \ \ @@ -1059,8 +1062,6 @@ static const char *cmc_string_fmt_treemap = "struct %s<%s, %s> " if (steps == 0 || iter->index < steps) \ return false; \ \ - iter->index -= steps; \ - \ for (size_t i = 0; i < steps; i++) \ PFX##_iter_prev(iter); \ \ @@ -1268,25 +1269,6 @@ static const char *cmc_string_fmt_treemap = "struct %s<%s, %s> " \ scan = scan->parent; \ } \ - } \ - \ - static struct SNAME##_iter PFX##_impl_it_start(struct SNAME *_map_) \ - { \ - struct SNAME##_iter iter; \ - \ - PFX##_iter_init(&iter, _map_); \ - \ - return iter; \ - } \ - \ - static struct SNAME##_iter PFX##_impl_it_end(struct SNAME *_map_) \ - { \ - struct SNAME##_iter iter; \ - \ - PFX##_iter_init(&iter, _map_); \ - PFX##_iter_to_end(&iter); \ - \ - return iter; \ } #endif /* CMC_TREEMAP_H */ diff --git a/tests/main/src/treemap.c b/tests/main/src/treemap.c index 6034d58..72c7ad2 100644 --- a/tests/main/src/treemap.c +++ b/tests/main/src/treemap.c @@ -9,8 +9,6 @@ struct treemap struct treemap_fval *f_val; struct cmc_alloc_node *alloc; struct cmc_callbacks *callbacks; - struct treemap_iter (*it_start)(struct treemap *); - struct treemap_iter (*it_end)(struct treemap *); }; struct treemap_node { @@ -74,13 +72,12 @@ struct treemap *tm_copy_of(struct treemap *_map_); _Bool tm_equals(struct treemap *_map1_, struct treemap *_map2_); struct cmc_string tm_to_string(struct treemap *_map_); _Bool tm_print(struct treemap *_map_, FILE *fptr); -struct treemap_iter *tm_iter_new(struct treemap *target); -void tm_iter_free(struct treemap_iter *iter); -void tm_iter_init(struct treemap_iter *iter, struct treemap *target); -_Bool tm_iter_start(struct treemap_iter *iter); -_Bool tm_iter_end(struct treemap_iter *iter); -void tm_iter_to_start(struct treemap_iter *iter); -void tm_iter_to_end(struct treemap_iter *iter); +struct treemap_iter tm_iter_start(struct treemap *target); +struct treemap_iter tm_iter_end(struct treemap *target); +_Bool tm_iter_at_start(struct treemap_iter *iter); +_Bool tm_iter_at_end(struct treemap_iter *iter); +_Bool tm_iter_to_start(struct treemap_iter *iter); +_Bool tm_iter_to_end(struct treemap_iter *iter); _Bool tm_iter_next(struct treemap_iter *iter); _Bool tm_iter_prev(struct treemap_iter *iter); _Bool tm_iter_advance(struct treemap_iter *iter, size_t steps); @@ -98,8 +95,6 @@ static unsigned char tm_impl_hupdate(struct treemap_node *node); static void tm_impl_rotate_right(struct treemap_node **Z); static void tm_impl_rotate_left(struct treemap_node **Z); static void tm_impl_rebalance(struct treemap *_map_, struct treemap_node *node); -static struct treemap_iter tm_impl_it_start(struct treemap *_map_); -static struct treemap_iter tm_impl_it_end(struct treemap *_map_); struct treemap *tm_new(struct treemap_fkey *f_key, struct treemap_fval *f_val) { if (!f_key || !f_val) @@ -115,8 +110,6 @@ struct treemap *tm_new(struct treemap_fkey *f_key, struct treemap_fval *f_val) _map_->f_val = f_val; _map_->alloc = alloc; _map_->callbacks = ((void *)0); - _map_->it_start = tm_impl_it_start; - _map_->it_end = tm_impl_it_end; return _map_; } struct treemap *tm_new_custom(struct treemap_fkey *f_key, @@ -138,8 +131,6 @@ struct treemap *tm_new_custom(struct treemap_fkey *f_key, _map_->f_val = f_val; _map_->alloc = alloc; _map_->callbacks = callbacks; - _map_->it_start = tm_impl_it_start; - _map_->it_end = tm_impl_it_end; return _map_; } void tm_clear(struct treemap *_map_) @@ -504,9 +495,8 @@ struct treemap *tm_copy_of(struct treemap *_map_) _map_->flag = cmc_flags.ERROR; return ((void *)0); } - struct treemap_iter iter; - tm_iter_init(&iter, _map_); - for (tm_iter_to_start(&iter); !tm_iter_end(&iter); tm_iter_next(&iter)) + struct treemap_iter iter = tm_iter_start(_map_); + for (; !tm_iter_at_end(&iter); tm_iter_next(&iter)) { size_t key = tm_iter_key(&iter); size_t value = tm_iter_value(&iter); @@ -526,9 +516,8 @@ _Bool tm_equals(struct treemap *_map1_, struct treemap *_map2_) _map2_->flag = cmc_flags.OK; if (_map1_->count != _map2_->count) return 0; - struct treemap_iter iter; - tm_iter_init(&iter, _map1_); - for (tm_iter_to_start(&iter); !tm_iter_end(&iter); tm_iter_next(&iter)) + struct treemap_iter iter = tm_iter_start(_map1_); + for (; !tm_iter_at_end(&iter); tm_iter_next(&iter)) { struct treemap_node *node = tm_impl_get_node(_map2_, tm_iter_key(&iter)); @@ -581,45 +570,58 @@ _Bool tm_print(struct treemap *_map_, FILE *fptr) } return 1; } -struct treemap_iter *tm_iter_new(struct treemap *target) +struct treemap_iter tm_iter_start(struct treemap *target) { - struct treemap_iter *iter = - target->alloc->malloc(sizeof(struct treemap_iter)); - if (!iter) - return ((void *)0); - tm_iter_init(iter, target); - return iter; -} -void tm_iter_free(struct treemap_iter *iter) -{ - iter->target->alloc->free(iter); -} -void tm_iter_init(struct treemap_iter *iter, struct treemap *target) -{ - memset(iter, 0, sizeof(struct treemap_iter)); - iter->target = target; - iter->start = 1; - iter->end = tm_empty(target); - iter->cursor = target->root; + struct treemap_iter iter; + iter.target = target; + iter.cursor = target->root; + iter.first = ((void *)0); + iter.last = ((void *)0); + iter.index = 0; + iter.start = 1; + iter.end = tm_empty(target); if (!tm_empty(target)) { - while (iter->cursor->left != ((void *)0)) - iter->cursor = iter->cursor->left; - iter->first = iter->cursor; - iter->last = target->root; - while (iter->last->right != ((void *)0)) - iter->last = iter->last->right; + while (iter.cursor->left != ((void *)0)) + iter.cursor = iter.cursor->left; + iter.first = iter.cursor; + iter.last = target->root; + while (iter.last->right != ((void *)0)) + iter.last = iter.last->right; } + return iter; } -_Bool tm_iter_start(struct treemap_iter *iter) +struct treemap_iter tm_iter_end(struct treemap *target) +{ + struct treemap_iter iter; + iter.target = target; + iter.cursor = target->root; + iter.first = ((void *)0); + iter.last = ((void *)0); + iter.index = 0; + iter.start = tm_empty(target); + iter.end = 1; + if (!tm_empty(target)) + { + while (iter.cursor->right != ((void *)0)) + iter.cursor = iter.cursor->right; + iter.last = iter.cursor; + iter.first = target->root; + while (iter.first->left != ((void *)0)) + iter.first = iter.first->left; + iter.index = target->count - 1; + } + return iter; +} +_Bool tm_iter_at_start(struct treemap_iter *iter) { return tm_empty(iter->target) || iter->start; } -_Bool tm_iter_end(struct treemap_iter *iter) +_Bool tm_iter_at_end(struct treemap_iter *iter) { return tm_empty(iter->target) || iter->end; } -void tm_iter_to_start(struct treemap_iter *iter) +_Bool tm_iter_to_start(struct treemap_iter *iter) { if (!tm_empty(iter->target)) { @@ -627,9 +629,11 @@ void tm_iter_to_start(struct treemap_iter *iter) iter->start = 1; iter->end = tm_empty(iter->target); iter->cursor = iter->first; + return 1; } + return 0; } -void tm_iter_to_end(struct treemap_iter *iter) +_Bool tm_iter_to_end(struct treemap_iter *iter) { if (!tm_empty(iter->target)) { @@ -637,7 +641,9 @@ void tm_iter_to_end(struct treemap_iter *iter) iter->start = tm_empty(iter->target); iter->end = 1; iter->cursor = iter->last; + return 1; } + return 0; } _Bool tm_iter_next(struct treemap_iter *iter) { @@ -708,7 +714,6 @@ _Bool tm_iter_advance(struct treemap_iter *iter, size_t steps) } if (steps == 0 || iter->index + steps >= iter->target->count) return 0; - iter->index += steps; for (size_t i = 0; i < steps; i++) tm_iter_next(iter); return 1; @@ -724,7 +729,6 @@ _Bool tm_iter_rewind(struct treemap_iter *iter, size_t steps) } if (steps == 0 || iter->index < steps) return 0; - iter->index -= steps; for (size_t i = 0; i < steps; i++) tm_iter_prev(iter); return 1; @@ -879,16 +883,3 @@ static void tm_impl_rebalance(struct treemap *_map_, struct treemap_node *node) scan = scan->parent; } } -static struct treemap_iter tm_impl_it_start(struct treemap *_map_) -{ - struct treemap_iter iter; - tm_iter_init(&iter, _map_); - return iter; -} -static struct treemap_iter tm_impl_it_end(struct treemap *_map_) -{ - struct treemap_iter iter; - tm_iter_init(&iter, _map_); - tm_iter_to_end(&iter); - return iter; -} diff --git a/tests/main/unt/treemap.c b/tests/main/unt/treemap.c index 167db16..c3e2c5c 100644 --- a/tests/main/unt/treemap.c +++ b/tests/main/unt/treemap.c @@ -214,7 +214,444 @@ CMC_CREATE_UNIT(TreeMap, true, { }); CMC_CREATE_UNIT(TreeMapIter, true, { + CMC_CREATE_TEST(PFX##_iter_start(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_start(map); + + cmc_assert_equals(ptr, map, it.target); + cmc_assert_equals(ptr, NULL, it.cursor); + cmc_assert_equals(ptr, NULL, it.first); + cmc_assert_equals(ptr, NULL, it.last); + cmc_assert_equals(size_t, 0, it.index); + cmc_assert_equals(bool, true, it.start); + cmc_assert_equals(bool, true, it.end); + + cmc_assert(tm_iter_at_start(&it)); + cmc_assert(tm_iter_at_end(&it)); + + cmc_assert(tm_insert(map, 1, 1)); + cmc_assert(tm_insert(map, 2, 2)); + cmc_assert(tm_insert(map, 3, 3)); + + it = tm_iter_start(map); + + cmc_assert_equals(size_t, 0, it.index); + + cmc_assert_equals(size_t, 1, it.cursor->key); + cmc_assert_equals(size_t, 1, it.first->key); + cmc_assert_equals(size_t, 3, it.last->key); + cmc_assert_equals(bool, false, it.end); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_end(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_end(map); + + cmc_assert_equals(ptr, map, it.target); + cmc_assert_equals(ptr, NULL, it.cursor); + cmc_assert_equals(ptr, NULL, it.first); + cmc_assert_equals(ptr, NULL, it.last); + cmc_assert_equals(size_t, 0, it.index); + cmc_assert_equals(bool, true, it.start); + cmc_assert_equals(bool, true, it.end); + + cmc_assert(tm_iter_at_start(&it)); + cmc_assert(tm_iter_at_end(&it)); + + cmc_assert(tm_insert(map, 1, 1)); + cmc_assert(tm_insert(map, 2, 2)); + cmc_assert(tm_insert(map, 3, 3)); + + it = tm_iter_end(map); + + cmc_assert_equals(size_t, map->count - 1, it.index); + + cmc_assert_equals(size_t, 3, it.cursor->key); + cmc_assert_equals(size_t, 1, it.first->key); + cmc_assert_equals(size_t, 3, it.last->key); + cmc_assert_equals(bool, false, it.start); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_at_start(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_start(map); + + // Empty checks + cmc_assert(tm_iter_at_start(&it)); + it = tm_iter_end(map); + cmc_assert(tm_iter_at_start(&it)); + + // Non-empty checks + cmc_assert(tm_insert(map, 1, 1)); + cmc_assert(tm_insert(map, 2, 2)); + it = tm_iter_end(map); + cmc_assert(!tm_iter_at_start(&it)); + it = tm_iter_start(map); + cmc_assert(tm_iter_at_start(&it)); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_at_end(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_start(map); + + // Empty check + cmc_assert(tm_iter_at_end(&it)); + it = tm_iter_end(map); + cmc_assert(tm_iter_at_end(&it)); + + // Non-empty checks + cmc_assert(tm_insert(map, 1, 1)); + cmc_assert(tm_insert(map, 2, 2)); + it = tm_iter_end(map); + cmc_assert(tm_iter_at_end(&it)); + it = tm_iter_start(map); + cmc_assert(!tm_iter_at_end(&it)); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_to_start(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_start(map); + + cmc_assert(!tm_iter_to_start(&it)); + + for (size_t i = 1; i <= 100; i++) + tm_insert(map, i, i); + + cmc_assert_equals(size_t, 100, map->count); + + it = tm_iter_end(map); + + cmc_assert(!tm_iter_at_start(&it)); + cmc_assert(tm_iter_at_end(&it)); + + cmc_assert_equals(size_t, 100, tm_iter_value(&it)); + + cmc_assert(tm_iter_to_start(&it)); + + cmc_assert(tm_iter_at_start(&it)); + cmc_assert(!tm_iter_at_end(&it)); + + cmc_assert_equals(size_t, 1, tm_iter_value(&it)); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_to_end(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_end(map); + + cmc_assert(!tm_iter_to_end(&it)); + + for (size_t i = 1; i <= 100; i++) + tm_insert(map, i, i); + + it = tm_iter_start(map); + + cmc_assert(tm_iter_at_start(&it)); + cmc_assert(!tm_iter_at_end(&it)); + + cmc_assert_equals(size_t, 1, tm_iter_value(&it)); + + cmc_assert(tm_iter_to_end(&it)); + + cmc_assert(!tm_iter_at_start(&it)); + cmc_assert(tm_iter_at_end(&it)); + + cmc_assert_equals(size_t, 100, tm_iter_value(&it)); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_next(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_start(map); + + cmc_assert(!tm_iter_next(&it)); + + for (size_t i = 1; i <= 1000; i++) + tm_insert(map, i, i); + + size_t sum = 0; + for (it = tm_iter_start(map); !tm_iter_at_end(&it); tm_iter_next(&it)) + { + sum += tm_iter_value(&it); + } + + cmc_assert_equals(size_t, 500500, sum); + + sum = 0; + + tm_iter_to_start(&it); + do + { + sum += tm_iter_value(&it); + } while (tm_iter_next(&it)); + + cmc_assert_equals(size_t, 500500, sum); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_prev(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_end(map); + + cmc_assert(!tm_iter_prev(&it)); + + for (size_t i = 1; i <= 1000; i++) + tm_insert(map, i, i); + + size_t sum = 0; + for (it = tm_iter_end(map); !tm_iter_at_start(&it); tm_iter_prev(&it)) + { + sum += tm_iter_value(&it); + } + + cmc_assert_equals(size_t, 500500, sum); + + sum = 0; + + tm_iter_to_end(&it); + do + { + sum += tm_iter_value(&it); + } while (tm_iter_prev(&it)); + + cmc_assert_equals(size_t, 500500, sum); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_advance(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_start(map); + + cmc_assert(!tm_iter_advance(&it, 1)); + + for (size_t i = 0; i <= 1000; i++) + tm_insert(map, i, i); + + it = tm_iter_start(map); + + cmc_assert(!tm_iter_advance(&it, 0)); + cmc_assert(!tm_iter_advance(&it, map->count)); + + size_t sum = 0; + for (it = tm_iter_start(map);;) + { + sum += tm_iter_value(&it); + + if (!tm_iter_advance(&it, 2)) + break; + } + + cmc_assert_equals(size_t, 250500, sum); + + tm_iter_to_start(&it); + cmc_assert(tm_iter_advance(&it, map->count - 1)); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_rewind(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_end(map); + + cmc_assert(!tm_iter_rewind(&it, 1)); + + for (size_t i = 0; i <= 1000; i++) + tm_insert(map, i, i); + + it = tm_iter_end(map); + + cmc_assert(!tm_iter_rewind(&it, 0)); + cmc_assert(!tm_iter_rewind(&it, map->count)); + + size_t sum = 0; + for (it = tm_iter_end(map);;) + { + sum += tm_iter_value(&it); + + if (!tm_iter_rewind(&it, 2)) + break; + } + + cmc_assert_equals(size_t, 250500, sum); + + tm_iter_to_end(&it); + cmc_assert(tm_iter_rewind(&it, map->count - 1)); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_go_to(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_end(map); + cmc_assert(!tm_iter_go_to(&it, 0)); + + it = tm_iter_start(map); + cmc_assert(!tm_iter_go_to(&it, 0)); + + for (size_t i = 0; i <= 1000; i++) + tm_insert(map, i, i); + + it = tm_iter_start(map); + + size_t sum = 0; + for (size_t i = 0; i < 1001; i++) + { + tm_iter_go_to(&it, i); + + sum += tm_iter_value(&it); + } + + cmc_assert_equals(size_t, 500500, sum); + + sum = 0; + for (size_t i = 1001; i > 0; i--) + { + cmc_assert(tm_iter_go_to(&it, i - 1)); + + sum += tm_iter_value(&it); + } + + cmc_assert_equals(size_t, 500500, sum); + + sum = 0; + for (size_t i = 0; i < 1001; i += 100) + { + cmc_assert(tm_iter_go_to(&it, i)); + cmc_assert_equals(size_t, i, tm_iter_index(&it)); + + sum += tm_iter_value(&it); + } + + cmc_assert_equals(size_t, 5500, sum); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_key(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_end(map); + + cmc_assert_equals(size_t, (size_t){ 0 }, tm_iter_key(&it)); + + cmc_assert(tm_insert(map, 10, 10)); + + it = tm_iter_start(map); + + cmc_assert_equals(size_t, 10, tm_iter_key(&it)); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_value(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_end(map); + + cmc_assert_equals(size_t, (size_t){ 0 }, tm_iter_value(&it)); + + cmc_assert(tm_insert(map, 10, 10)); + + it = tm_iter_start(map); + + cmc_assert_equals(size_t, 10, tm_iter_value(&it)); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_rvalue(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + struct treemap_iter it = tm_iter_end(map); + + cmc_assert_equals(ptr, NULL, tm_iter_rvalue(&it)); + + cmc_assert(tm_insert(map, 10, 10)); + + it = tm_iter_start(map); + + cmc_assert_not_equals(ptr, NULL, tm_iter_rvalue(&it)); + cmc_assert_equals(size_t, 10, *tm_iter_rvalue(&it)); + + tm_free(map); + }); + + CMC_CREATE_TEST(PFX##_iter_index(), { + struct treemap *map = tm_new(tm_fkey, tm_fval); + + cmc_assert_not_equals(ptr, NULL, map); + + for (size_t i = 0; i <= 1000; i++) + tm_insert(map, i, i); + + struct treemap_iter it = tm_iter_start(map); + + for (size_t i = 0; i < 1001; i++) + { + cmc_assert_equals(size_t, i, tm_iter_index(&it)); + tm_iter_next(&it); + } + + it = tm_iter_end(map); + for (size_t i = 1001; i > 0; i--) + { + cmc_assert_equals(size_t, i - 1, tm_iter_index(&it)); + tm_iter_prev(&it); + } + + tm_free(map); + }); }); #ifdef CMC_TEST_MAIN