admin/C-Macro-Collections
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated list iterator API

Browse Source
This commit is contained in:
Leonardo committed 2020-05-10 21:58:10 -03:00
1 parent 9cd3bf3b31
commit 66c829701d
3 files changed
+516 -111
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/cmc/list.h
+38 -63
View File
@@ -95,12 +95,6 @@ static const char *cmc_string_fmt_list = "struct %s<%s> "
/* Value function table */ \
struct SNAME##_fval *f_val; \
\
/* Function that returns an iterator to the start of the list */ \
struct SNAME##_iter (*it_start)(struct SNAME *); \
\
/* Function that returns an iterator to the end of the list */ \
struct SNAME##_iter (*it_end)(struct SNAME *); \
\
/* Custom allocation functions */ \
struct cmc_alloc_node *alloc; \
\
@@ -194,17 +188,15 @@ static const char *cmc_string_fmt_list = "struct %s<%s> "
bool PFX##_print(struct SNAME *_list_, 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); \
@@ -221,8 +213,7 @@ static const char *cmc_string_fmt_list = "struct %s<%s> "
#define CMC_GENERATE_LIST_SOURCE(PFX, SNAME, V) \
\
/* Implementation Detail Functions */ \
static struct SNAME##_iter PFX##_impl_it_start(struct SNAME *_list_); \
static struct SNAME##_iter PFX##_impl_it_end(struct SNAME *_list_); \
/* None */ \
\
struct SNAME *PFX##_new(size_t capacity, struct SNAME##_fval *f_val) \
{ \
@@ -250,8 +241,6 @@ static const char *cmc_string_fmt_list = "struct %s<%s> "
_list_->f_val = f_val; \
_list_->alloc = alloc; \
_list_->callbacks = NULL; \
_list_->it_start = PFX##_impl_it_start; \
_list_->it_end = PFX##_impl_it_end; \
\
return _list_; \
} \
@@ -288,8 +277,6 @@ static const char *cmc_string_fmt_list = "struct %s<%s> "
_list_->f_val = f_val; \
_list_->alloc = alloc; \
_list_->callbacks = callbacks; \
_list_->it_start = PFX##_impl_it_start; \
_list_->it_end = PFX##_impl_it_end; \
\
return _list_; \
} \
@@ -894,61 +881,69 @@ static const char *cmc_string_fmt_list = "struct %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; \
\
PFX##_iter_init(iter, target); \
iter.target = target; \
iter.cursor = 0; \
iter.start = true; \
iter.end = PFX##_empty(target); \
\
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; \
\
iter.target = target; \
iter.cursor = 0; \
iter.start = PFX##_empty(target); \
iter.end = true; \
\
if (!PFX##_empty(target)) \
iter.cursor = target->count - 1; \
\
return iter; \
} \
\
void PFX##_iter_init(struct SNAME##_iter *iter, struct SNAME *target) \
{ \
iter->target = target; \
iter->cursor = 0; \
iter->start = true; \
iter->end = PFX##_empty(target); \
} \
\
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)) \
{ \
iter->cursor = 0; \
iter->start = true; \
iter->end = PFX##_empty(iter->target); \
\
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)) \
{ \
iter->start = PFX##_empty(iter->target); \
iter->cursor = \
PFX##_empty(iter->target) ? 0 : iter->target->count - 1; \
iter->cursor = iter->target->count - 1; \
iter->end = true; \
\
return true; \
} \
\
return false; \
} \
\
bool PFX##_iter_next(struct SNAME##_iter *iter) \
@@ -1065,26 +1060,6 @@ static const char *cmc_string_fmt_list = "struct %s<%s> "
size_t PFX##_iter_index(struct SNAME##_iter *iter) \
{ \
return iter->cursor; \
} \
\
static struct SNAME##_iter PFX##_impl_it_start(struct SNAME *_list_) \
{ \
struct SNAME##_iter iter; \
\
PFX##_iter_init(&iter, _list_); \
PFX##_iter_to_start(&iter); \
\
return iter; \
} \
\
static struct SNAME##_iter PFX##_impl_it_end(struct SNAME *_list_) \
{ \
struct SNAME##_iter iter; \
\
PFX##_iter_init(&iter, _list_); \
PFX##_iter_to_end(&iter); \
\
return iter; \
}
#endif /* CMC_LIST_H */
tests/main/src/list.c
+30 -48
View File
@@ -7,8 +7,6 @@ struct list
size_t count;
int flag;
struct list_fval *f_val;
struct list_iter (*it_start)(struct list *);
struct list_iter (*it_end)(struct list *);
struct cmc_alloc_node *alloc;
struct cmc_callbacks *callbacks;
};
@@ -65,13 +63,12 @@ struct list *l_copy_of(struct list *_list_);
_Bool l_equals(struct list *_list1_, struct list *_list2_);
struct cmc_string l_to_string(struct list *_list_);
_Bool l_print(struct list *_list_, FILE *fptr);
struct list_iter *l_iter_new(struct list *target);
void l_iter_free(struct list_iter *iter);
void l_iter_init(struct list_iter *iter, struct list *target);
_Bool l_iter_start(struct list_iter *iter);
_Bool l_iter_end(struct list_iter *iter);
void l_iter_to_start(struct list_iter *iter);
void l_iter_to_end(struct list_iter *iter);
struct list_iter l_iter_start(struct list *target);
struct list_iter l_iter_end(struct list *target);
_Bool l_iter_at_start(struct list_iter *iter);
_Bool l_iter_at_end(struct list_iter *iter);
_Bool l_iter_to_start(struct list_iter *iter);
_Bool l_iter_to_end(struct list_iter *iter);
_Bool l_iter_next(struct list_iter *iter);
_Bool l_iter_prev(struct list_iter *iter);
_Bool l_iter_advance(struct list_iter *iter, size_t steps);
@@ -80,8 +77,6 @@ _Bool l_iter_go_to(struct list_iter *iter, size_t index);
size_t l_iter_value(struct list_iter *iter);
size_t *l_iter_rvalue(struct list_iter *iter);
size_t l_iter_index(struct list_iter *iter);
static struct list_iter l_impl_it_start(struct list *_list_);
static struct list_iter l_impl_it_end(struct list *_list_);
struct list *l_new(size_t capacity, struct list_fval *f_val)
{
struct cmc_alloc_node *alloc = &cmc_alloc_node_default;
@@ -102,8 +97,6 @@ struct list *l_new(size_t capacity, struct list_fval *f_val)
_list_->f_val = f_val;
_list_->alloc = alloc;
_list_->callbacks = ((void *)0);
_list_->it_start = l_impl_it_start;
_list_->it_end = l_impl_it_end;
return _list_;
}
struct list *l_new_custom(size_t capacity, struct list_fval *f_val,
@@ -131,8 +124,6 @@ struct list *l_new_custom(size_t capacity, struct list_fval *f_val,
_list_->f_val = f_val;
_list_->alloc = alloc;
_list_->callbacks = callbacks;
_list_->it_start = l_impl_it_start;
_list_->it_end = l_impl_it_end;
return _list_;
}
void l_clear(struct list *_list_)
@@ -590,50 +581,55 @@ _Bool l_print(struct list *_list_, FILE *fptr)
}
return 1;
}
struct list_iter *l_iter_new(struct list *target)
struct list_iter l_iter_start(struct list *target)
{
struct list_iter *iter = target->alloc->malloc(sizeof(struct list_iter));
if (!iter)
return ((void *)0);
l_iter_init(iter, target);
struct list_iter iter;
iter.target = target;
iter.cursor = 0;
iter.start = 1;
iter.end = l_empty(target);
return iter;
}
void l_iter_free(struct list_iter *iter)
struct list_iter l_iter_end(struct list *target)
{
iter->target->alloc->free(iter);
struct list_iter iter;
iter.target = target;
iter.cursor = 0;
iter.start = l_empty(target);
iter.end = 1;
if (!l_empty(target))
iter.cursor = target->count - 1;
return iter;
}
void l_iter_init(struct list_iter *iter, struct list *target)
{
iter->target = target;
iter->cursor = 0;
iter->start = 1;
iter->end = l_empty(target);
}
_Bool l_iter_start(struct list_iter *iter)
_Bool l_iter_at_start(struct list_iter *iter)
{
return l_empty(iter->target) || iter->start;
}
_Bool l_iter_end(struct list_iter *iter)
_Bool l_iter_at_end(struct list_iter *iter)
{
return l_empty(iter->target) || iter->end;
}
void l_iter_to_start(struct list_iter *iter)
_Bool l_iter_to_start(struct list_iter *iter)
{
if (!l_empty(iter->target))
{
iter->cursor = 0;
iter->start = 1;
iter->end = l_empty(iter->target);
return 1;
}
return 0;
}
void l_iter_to_end(struct list_iter *iter)
_Bool l_iter_to_end(struct list_iter *iter)
{
if (!l_empty(iter->target))
{
iter->start = l_empty(iter->target);
iter->cursor = l_empty(iter->target) ? 0 : iter->target->count - 1;
iter->cursor = iter->target->count - 1;
iter->end = 1;
return 1;
}
return 0;
}
_Bool l_iter_next(struct list_iter *iter)
{
@@ -717,17 +713,3 @@ size_t l_iter_index(struct list_iter *iter)
{
return iter->cursor;
}
static struct list_iter l_impl_it_start(struct list *_list_)
{
struct list_iter iter;
l_iter_init(&iter, _list_);
l_iter_to_start(&iter);
return iter;
}
static struct list_iter l_impl_it_end(struct list *_list_)
{
struct list_iter iter;
l_iter_init(&iter, _list_);
l_iter_to_end(&iter);
return iter;
}
tests/main/unt/list.c
+448
View File
@@ -614,7 +614,455 @@ CMC_CREATE_UNIT(List, true, {
})
CMC_CREATE_UNIT(ListIter, true, {
CMC_CREATE_TEST(PFX##_iter_start(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
struct list_iter it = l_iter_start(l);
cmc_assert_equals(ptr, l, it.target);
cmc_assert_equals(size_t, 0, it.cursor);
cmc_assert_equals(bool, true, it.start);
cmc_assert_equals(bool, true, it.end);
cmc_assert(l_iter_at_start(&it));
cmc_assert(l_iter_at_end(&it));
cmc_assert(l_push_front(l, 1));
cmc_assert(l_push_front(l, 2));
it = l_iter_start(l);
cmc_assert_equals(size_t, 0, it.cursor);
cmc_assert_equals(bool, false, it.end);
l_free(l);
});
CMC_CREATE_TEST(PFX##_iter_end(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
struct list_iter it = l_iter_end(l);
cmc_assert_equals(ptr, l, it.target);
cmc_assert_equals(size_t, 0, it.cursor);
cmc_assert_equals(bool, true, it.start);
cmc_assert_equals(bool, true, it.end);
cmc_assert(l_iter_at_start(&it));
cmc_assert(l_iter_at_end(&it));
cmc_assert(l_push_back(l, 1));
cmc_assert(l_push_back(l, 2));
cmc_assert(l_push_back(l, 3));
it = l_iter_end(l);
cmc_assert_equals(size_t, l->count - 1, it.cursor);
cmc_assert_equals(bool, false, it.start);
l_free(l);
});
CMC_CREATE_TEST(PFX##_iter_at_start(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
struct list_iter it = l_iter_start(l);
// Empty checks
cmc_assert(l_iter_at_start(&it));
it = l_iter_end(l);
cmc_assert(l_iter_at_start(&it));
// Non-empty checks
cmc_assert(l_push_back(l, 1));
it = l_iter_end(l);
cmc_assert(!l_iter_at_start(&it));
it = l_iter_start(l);
cmc_assert(l_iter_at_start(&it));
l_clear(l);
cmc_assert(l_push_front(l, 1));
it = l_iter_end(l);
cmc_assert(!l_iter_at_start(&it));
it = l_iter_start(l);
cmc_assert(l_iter_at_start(&it));
l_free(l);
});
CMC_CREATE_TEST(PFX##_iter_at_end(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
struct list_iter it = l_iter_start(l);
// Empty check
cmc_assert(l_iter_at_end(&it));
it = l_iter_end(l);
cmc_assert(l_iter_at_end(&it));
// Non-empty checks
cmc_assert(l_push_back(l, 1));
it = l_iter_end(l);
cmc_assert(l_iter_at_end(&it));
it = l_iter_start(l);
cmc_assert(!l_iter_at_end(&it));
l_clear(l);
cmc_assert(l_push_front(l, 1));
it = l_iter_end(l);
cmc_assert(l_iter_at_end(&it));
it = l_iter_start(l);
cmc_assert(!l_iter_at_end(&it));
l_free(l);
});
CMC_CREATE_TEST(PFX##_iter_to_start(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
struct list_iter it = l_iter_start(l);
cmc_assert(!l_iter_to_start(&it));
for (size_t i = 1; i <= 100; i++)
{
if (i % 2 == 0)
l_push_back(l, i);
else
l_push_front(l, i);
}
cmc_assert_equals(size_t, 100, l->count);
it = l_iter_end(l);
cmc_assert(!l_iter_at_start(&it));
cmc_assert(l_iter_at_end(&it));
cmc_assert_equals(size_t, 100, l_iter_value(&it));
cmc_assert(l_iter_to_start(&it));
cmc_assert(l_iter_at_start(&it));
cmc_assert(!l_iter_at_end(&it));
cmc_assert_equals(size_t, 99, l_iter_value(&it));
l_free(l);
});
CMC_CREATE_TEST(PFX##_iter_to_end(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
struct list_iter it = l_iter_end(l);
cmc_assert(!l_iter_to_end(&it));
for (size_t i = 1; i <= 100; i++)
{
if (i % 2 == 0)
l_push_back(l, i);
else
l_push_front(l, i);
}
it = l_iter_start(l);
cmc_assert(l_iter_at_start(&it));
cmc_assert(!l_iter_at_end(&it));
cmc_assert_equals(size_t, 99, l_iter_value(&it));
cmc_assert(l_iter_to_end(&it));
cmc_assert(!l_iter_at_start(&it));
cmc_assert(l_iter_at_end(&it));
cmc_assert_equals(size_t, 100, l_iter_value(&it));
l_free(l);
});
CMC_CREATE_TEST(PFX##_iter_next(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
struct list_iter it = l_iter_start(l);
cmc_assert(!l_iter_next(&it));
for (size_t i = 1; i <= 1000; i++)
{
if (i % 2 == 0)
l_push_back(l, i);
else
l_push_front(l, i);
}
size_t sum = 0;
for (it = l_iter_start(l); !l_iter_at_end(&it); l_iter_next(&it))
{
sum += l_iter_value(&it);
}
cmc_assert_equals(size_t, 500500, sum);
sum = 0;
l_iter_to_start(&it);
do
{
sum += l_iter_value(&it);
} while (l_iter_next(&it));
cmc_assert_equals(size_t, 500500, sum);
l_free(l);
});
CMC_CREATE_TEST(PFX##_iter_prev(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
struct list_iter it = l_iter_end(l);
cmc_assert(!l_iter_prev(&it));
for (size_t i = 1; i <= 1000; i++)
{
if (i % 2 == 0)
l_push_back(l, i);
else
l_push_front(l, i);
}
size_t sum = 0;
for (it = l_iter_end(l); !l_iter_at_start(&it); l_iter_prev(&it))
{
sum += l_iter_value(&it);
}
cmc_assert_equals(size_t, 500500, sum);
sum = 0;
l_iter_to_end(&it);
do
{
sum += l_iter_value(&it);
} while (l_iter_prev(&it));
cmc_assert_equals(size_t, 500500, sum);
l_free(l);
});
CMC_CREATE_TEST(PFX##_iter_advance(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
struct list_iter it = l_iter_start(l);
cmc_assert(!l_iter_advance(&it, 1));
for (size_t i = 0; i <= 1000; i++)
{
if (i % 2 == 0)
l_push_back(l, i); // will sum all even numbers
else
l_push_back(l, 0);
}
it = l_iter_start(l);
cmc_assert(!l_iter_advance(&it, 0));
cmc_assert(!l_iter_advance(&it, l->count));
size_t sum = 0;
for (it = l_iter_start(l);;)
{
sum += l_iter_value(&it);
if (!l_iter_advance(&it, 2))
break;
}
cmc_assert_equals(size_t, 250500, sum);
l_iter_to_start(&it);
cmc_assert(l_iter_advance(&it, l->count - 1));
l_free(l);
});
CMC_CREATE_TEST(PFX##_iter_rewind(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
struct list_iter it = l_iter_end(l);
cmc_assert(!l_iter_rewind(&it, 1));
for (size_t i = 0; i <= 1000; i++)
{
if (i % 2 == 0)
l_push_front(l, i); // will sum all even numbers
else
l_push_front(l, 0);
}
it = l_iter_end(l);
cmc_assert(!l_iter_rewind(&it, 0));
cmc_assert(!l_iter_rewind(&it, l->count));
size_t sum = 0;
for (it = l_iter_end(l);;)
{
sum += l_iter_value(&it);
if (!l_iter_rewind(&it, 2))
break;
}
cmc_assert_equals(size_t, 250500, sum);
l_iter_to_end(&it);
cmc_assert(l_iter_rewind(&it, l->count - 1));
l_free(l);
});
CMC_CREATE_TEST(PFX##_iter_go_to(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
struct list_iter it = l_iter_end(l);
cmc_assert(!l_iter_go_to(&it, 0));
it = l_iter_start(l);
cmc_assert(!l_iter_go_to(&it, 0));
for (size_t i = 0; i <= 1000; i++)
l_push_back(l, i);
it = l_iter_start(l);
size_t sum = 0;
for (size_t i = 0; i < 1001; i++)
{
l_iter_go_to(&it, i);
sum += l_iter_value(&it);
}
cmc_assert_equals(size_t, 500500, sum);
sum = 0;
for (size_t i = 1001; i > 0; i--)
{
cmc_assert(l_iter_go_to(&it, i - 1));
sum += l_iter_value(&it);
}
cmc_assert_equals(size_t, 500500, sum);
sum = 0;
for (size_t i = 0; i < 1001; i += 100)
{
cmc_assert(l_iter_go_to(&it, i));
cmc_assert_equals(size_t, i, l_iter_index(&it));
sum += l_iter_value(&it);
}
cmc_assert_equals(size_t, 5500, sum);
l_free(l);
});
CMC_CREATE_TEST(PFX##_iter_value(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
struct list_iter it = l_iter_end(l);
cmc_assert_equals(size_t, (size_t){ 0 }, l_iter_value(&it));
cmc_assert(l_push_back(l, 10));
it = l_iter_start(l);
cmc_assert_equals(size_t, 10, l_iter_value(&it));
l_free(l);
});
CMC_CREATE_TEST(PFX##_iter_rvalue(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
struct list_iter it = l_iter_end(l);
cmc_assert_equals(ptr, NULL, l_iter_rvalue(&it));
cmc_assert(l_push_back(l, 10));
it = l_iter_start(l);
cmc_assert_not_equals(ptr, NULL, l_iter_rvalue(&it));
cmc_assert_equals(size_t, 10, *l_iter_rvalue(&it));
l_free(l);
});
CMC_CREATE_TEST(PFX##_iter_index(), {
struct list *l = l_new(100, l_fval);
cmc_assert_not_equals(ptr, NULL, l);
for (size_t i = 0; i <= 1000; i++)
l_push_back(l, i);
struct list_iter it = l_iter_start(l);
for (size_t i = 0; i < 1001; i++)
{
cmc_assert_equals(size_t, i, l_iter_index(&it));
l_iter_next(&it);
}
it = l_iter_end(l);
for (size_t i = 1001; i > 0; i--)
{
cmc_assert_equals(size_t, i - 1, l_iter_index(&it));
l_iter_prev(&it);
}
l_free(l);
});
});
#ifdef CMC_TEST_MAIN