Updating hashmultiset iterator API
This commit is contained in:
Leonardo committed
1 parent
fdfb81d08c
commit
2cacbc5348
4 files changed
+624
-229
No files matched your search
+101
-128
@@ -96,12 +96,6 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
\
|
||||
/* Custom callback functions */ \
|
||||
struct cmc_callbacks *callbacks; \
|
||||
\
|
||||
/* Returns an iterator to the start of the hashmultiset */ \
|
||||
struct SNAME##_iter (*it_start)(struct SNAME *); \
|
||||
\
|
||||
/* Returns an iterator to the end of the hashmultiset */ \
|
||||
struct SNAME##_iter (*it_end)(struct SNAME *); \
|
||||
}; \
|
||||
\
|
||||
struct SNAME##_entry \
|
||||
@@ -221,17 +215,15 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
bool PFX##_is_disjointset(struct SNAME *_set1_, struct SNAME *_set2_); \
|
||||
\
|
||||
/* 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); \
|
||||
@@ -254,8 +246,6 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
static struct SNAME##_entry *PFX##_impl_get_entry(struct SNAME *_set_, \
|
||||
V value); \
|
||||
static size_t PFX##_impl_calculate_size(size_t required); \
|
||||
static struct SNAME##_iter PFX##_impl_it_start(struct SNAME *_set_); \
|
||||
static struct SNAME##_iter PFX##_impl_it_end(struct SNAME *_set_); \
|
||||
\
|
||||
struct SNAME *PFX##_new(size_t capacity, double load, \
|
||||
struct SNAME##_fval *f_val) \
|
||||
@@ -296,8 +286,6 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
_set_->f_val = f_val; \
|
||||
_set_->alloc = alloc; \
|
||||
_set_->callbacks = NULL; \
|
||||
_set_->it_start = PFX##_impl_it_start; \
|
||||
_set_->it_end = PFX##_impl_it_end; \
|
||||
\
|
||||
return _set_; \
|
||||
} \
|
||||
@@ -343,8 +331,6 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
_set_->f_val = f_val; \
|
||||
_set_->alloc = alloc; \
|
||||
_set_->callbacks = callbacks; \
|
||||
_set_->it_start = PFX##_impl_it_start; \
|
||||
_set_->it_end = PFX##_impl_it_end; \
|
||||
\
|
||||
return _set_; \
|
||||
} \
|
||||
@@ -588,11 +574,10 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
} \
|
||||
\
|
||||
V max_val; \
|
||||
struct SNAME##_iter iter; \
|
||||
struct SNAME##_iter iter = PFX##_iter_start(_set_); \
|
||||
\
|
||||
/* TODO transform this into a normal loop */ \
|
||||
for (PFX##_iter_init(&iter, _set_); !PFX##_iter_end(&iter); \
|
||||
PFX##_iter_next(&iter)) \
|
||||
for (; !PFX##_iter_at_end(&iter); PFX##_iter_next(&iter)) \
|
||||
{ \
|
||||
V result = PFX##_iter_value(&iter); \
|
||||
size_t index = PFX##_iter_index(&iter); \
|
||||
@@ -623,11 +608,10 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
} \
|
||||
\
|
||||
V min_val; \
|
||||
struct SNAME##_iter iter; \
|
||||
struct SNAME##_iter iter = PFX##_iter_start(_set_); \
|
||||
\
|
||||
/* TODO transform this into a normal loop */ \
|
||||
for (PFX##_iter_init(&iter, _set_); !PFX##_iter_end(&iter); \
|
||||
PFX##_iter_next(&iter)) \
|
||||
for (; !PFX##_iter_at_end(&iter); PFX##_iter_next(&iter)) \
|
||||
{ \
|
||||
V result = PFX##_iter_value(&iter); \
|
||||
size_t index = PFX##_iter_index(&iter); \
|
||||
@@ -748,11 +732,10 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
return false; \
|
||||
} \
|
||||
\
|
||||
struct SNAME##_iter iter; \
|
||||
struct SNAME##_iter iter = PFX##_iter_start(_set_); \
|
||||
\
|
||||
/* TODO transform this into a normal loop */ \
|
||||
for (PFX##_iter_init(&iter, _set_); !PFX##_iter_end(&iter); \
|
||||
PFX##_iter_next(&iter)) \
|
||||
for (; !PFX##_iter_at_end(&iter); PFX##_iter_next(&iter)) \
|
||||
{ \
|
||||
PFX##_insert_many(_new_set_, PFX##_iter_value(&iter), \
|
||||
PFX##_iter_multiplicity(&iter)); \
|
||||
@@ -848,11 +831,9 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
if (_set1_->count == 0) \
|
||||
return true; \
|
||||
\
|
||||
struct SNAME##_iter iter; \
|
||||
PFX##_iter_init(&iter, _set1_); \
|
||||
struct SNAME##_iter iter = PFX##_iter_start(_set1_); \
|
||||
\
|
||||
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##_entry *entry = \
|
||||
PFX##_impl_get_entry(_set2_, PFX##_iter_value(&iter)); \
|
||||
@@ -906,12 +887,10 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
if (!_set_r_) \
|
||||
return NULL; \
|
||||
\
|
||||
struct SNAME##_iter iter1, iter2; \
|
||||
PFX##_iter_init(&iter1, _set1_); \
|
||||
PFX##_iter_init(&iter2, _set2_); \
|
||||
struct SNAME##_iter iter1 = PFX##_iter_start(_set1_); \
|
||||
struct SNAME##_iter iter2 = PFX##_iter_start(_set2_); \
|
||||
\
|
||||
for (PFX##_iter_to_start(&iter1); !PFX##_iter_end(&iter1); \
|
||||
PFX##_iter_next(&iter1)) \
|
||||
for (; !PFX##_iter_at_end(&iter1); PFX##_iter_next(&iter1)) \
|
||||
{ \
|
||||
V value = PFX##_iter_value(&iter1); \
|
||||
\
|
||||
@@ -922,8 +901,7 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
PFX##_update(_set_r_, value, max_); \
|
||||
} \
|
||||
\
|
||||
for (PFX##_iter_to_start(&iter2); !PFX##_iter_end(&iter2); \
|
||||
PFX##_iter_next(&iter2)) \
|
||||
for (; !PFX##_iter_at_end(&iter2); PFX##_iter_next(&iter2)) \
|
||||
{ \
|
||||
V value = PFX##_iter_value(&iter2); \
|
||||
\
|
||||
@@ -954,11 +932,9 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
_set1_->count < _set2_->count ? _set1_ : _set2_; \
|
||||
struct SNAME *_set_B_ = _set_A_ == _set1_ ? _set2_ : _set1_; \
|
||||
\
|
||||
struct SNAME##_iter iter; \
|
||||
PFX##_iter_init(&iter, _set_A_); \
|
||||
struct SNAME##_iter iter = PFX##_iter_start(_set_A_); \
|
||||
\
|
||||
for (PFX##_iter_to_start(&iter); !PFX##_iter_end(&iter); \
|
||||
PFX##_iter_next(&iter)) \
|
||||
for (; !PFX##_iter_at_end(&iter); PFX##_iter_next(&iter)) \
|
||||
{ \
|
||||
V value = PFX##_iter_value(&iter); \
|
||||
\
|
||||
@@ -984,11 +960,9 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
if (!_set_r_) \
|
||||
return NULL; \
|
||||
\
|
||||
struct SNAME##_iter iter; \
|
||||
PFX##_iter_init(&iter, _set1_); \
|
||||
struct SNAME##_iter iter = PFX##_iter_start(_set1_); \
|
||||
\
|
||||
for (PFX##_iter_to_start(&iter); !PFX##_iter_end(&iter); \
|
||||
PFX##_iter_next(&iter)) \
|
||||
for (; !PFX##_iter_at_end(&iter); PFX##_iter_next(&iter)) \
|
||||
{ \
|
||||
V value = PFX##_iter_value(&iter); \
|
||||
\
|
||||
@@ -1014,19 +988,16 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
if (!_set_r_) \
|
||||
return NULL; \
|
||||
\
|
||||
struct SNAME##_iter iter1, iter2; \
|
||||
PFX##_iter_init(&iter1, _set1_); \
|
||||
PFX##_iter_init(&iter2, _set2_); \
|
||||
struct SNAME##_iter iter1 = PFX##_iter_start(_set1_); \
|
||||
struct SNAME##_iter iter2 = PFX##_iter_start(_set2_); \
|
||||
\
|
||||
for (PFX##_iter_to_start(&iter1); !PFX##_iter_end(&iter1); \
|
||||
PFX##_iter_next(&iter1)) \
|
||||
for (; !PFX##_iter_at_end(&iter1); PFX##_iter_next(&iter1)) \
|
||||
{ \
|
||||
PFX##_insert_many(_set_r_, PFX##_iter_value(&iter1), \
|
||||
PFX##_iter_multiplicity(&iter1)); \
|
||||
} \
|
||||
\
|
||||
for (PFX##_iter_to_start(&iter2); !PFX##_iter_end(&iter2); \
|
||||
PFX##_iter_next(&iter2)) \
|
||||
for (; !PFX##_iter_at_end(&iter2); PFX##_iter_next(&iter2)) \
|
||||
{ \
|
||||
PFX##_insert_many(_set_r_, PFX##_iter_value(&iter2), \
|
||||
PFX##_iter_multiplicity(&iter2)); \
|
||||
@@ -1047,14 +1018,10 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
\
|
||||
if (!_set_r_) \
|
||||
return NULL; \
|
||||
struct SNAME##_iter iter1 = PFX##_iter_start(_set1_); \
|
||||
struct SNAME##_iter iter2 = PFX##_iter_start(_set2_); \
|
||||
\
|
||||
struct SNAME##_iter iter1, iter2; \
|
||||
\
|
||||
PFX##_iter_init(&iter1, _set1_); \
|
||||
PFX##_iter_init(&iter2, _set2_); \
|
||||
\
|
||||
for (PFX##_iter_to_start(&iter1); !PFX##_iter_end(&iter1); \
|
||||
PFX##_iter_next(&iter1)) \
|
||||
for (; !PFX##_iter_at_end(&iter1); PFX##_iter_next(&iter1)) \
|
||||
{ \
|
||||
V value = PFX##_iter_value(&iter1); \
|
||||
\
|
||||
@@ -1070,8 +1037,7 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
} \
|
||||
} \
|
||||
\
|
||||
for (PFX##_iter_to_start(&iter2); !PFX##_iter_end(&iter2); \
|
||||
PFX##_iter_next(&iter2)) \
|
||||
for (; !PFX##_iter_at_end(&iter2); PFX##_iter_next(&iter2)) \
|
||||
{ \
|
||||
V value = PFX##_iter_value(&iter2); \
|
||||
\
|
||||
@@ -1100,12 +1066,9 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
if (PFX##_empty(_set1_)) \
|
||||
return true; \
|
||||
\
|
||||
struct SNAME##_iter iter; \
|
||||
struct SNAME##_iter iter = PFX##_iter_start(_set1_); \
|
||||
\
|
||||
PFX##_iter_init(&iter, _set1_); \
|
||||
\
|
||||
for (PFX##_iter_to_start(&iter); !PFX##_iter_end(&iter); \
|
||||
PFX##_iter_next(&iter)) \
|
||||
for (; !PFX##_iter_at_end(&iter); PFX##_iter_next(&iter)) \
|
||||
{ \
|
||||
V value = PFX##_iter_value(&iter); \
|
||||
\
|
||||
@@ -1137,12 +1100,9 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
return false; \
|
||||
} \
|
||||
\
|
||||
struct SNAME##_iter iter; \
|
||||
struct SNAME##_iter iter = PFX##_iter_start(_set1_); \
|
||||
\
|
||||
PFX##_iter_init(&iter, _set1_); \
|
||||
\
|
||||
for (PFX##_iter_to_start(&iter); !PFX##_iter_end(&iter); \
|
||||
PFX##_iter_next(&iter)) \
|
||||
for (; !PFX##_iter_at_end(&iter); PFX##_iter_next(&iter)) \
|
||||
{ \
|
||||
V value = PFX##_iter_value(&iter); \
|
||||
\
|
||||
@@ -1166,12 +1126,9 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
if (PFX##_empty(_set1_)) \
|
||||
return true; \
|
||||
\
|
||||
struct SNAME##_iter iter; \
|
||||
struct SNAME##_iter iter = PFX##_iter_start(_set1_); \
|
||||
\
|
||||
PFX##_iter_init(&iter, _set1_); \
|
||||
\
|
||||
for (PFX##_iter_to_start(&iter); !PFX##_iter_end(&iter); \
|
||||
PFX##_iter_next(&iter)) \
|
||||
for (; !PFX##_iter_at_end(&iter); PFX##_iter_next(&iter)) \
|
||||
{ \
|
||||
V value = PFX##_iter_value(&iter); \
|
||||
\
|
||||
@@ -1182,31 +1139,17 @@ static const char *cmc_string_fmt_hashmultiset = "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); \
|
||||
\
|
||||
return iter; \
|
||||
} \
|
||||
\
|
||||
void PFX##_iter_free(struct SNAME##_iter *iter) \
|
||||
{ \
|
||||
iter->target->alloc->free(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.target = target; \
|
||||
iter.cursor = 0; \
|
||||
iter.index = 0; \
|
||||
iter.first = 0; \
|
||||
iter.last = 0; \
|
||||
iter.start = true; \
|
||||
iter.end = PFX##_empty(target); \
|
||||
\
|
||||
if (!PFX##_empty(target)) \
|
||||
{ \
|
||||
@@ -1214,35 +1157,76 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
{ \
|
||||
if (target->buffer[i].state == CMC_ES_FILLED) \
|
||||
{ \
|
||||
iter->first = i; \
|
||||
iter.first = i; \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
iter->cursor = iter->first; \
|
||||
iter.cursor = iter.first; \
|
||||
\
|
||||
for (size_t i = target->capacity; i > 0; i--) \
|
||||
{ \
|
||||
if (target->buffer[i - 1].state == CMC_ES_FILLED) \
|
||||
{ \
|
||||
iter->last = i - 1; \
|
||||
iter.last = i - 1; \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
return iter; \
|
||||
} \
|
||||
\
|
||||
bool PFX##_iter_start(struct SNAME##_iter *iter) \
|
||||
struct SNAME##_iter PFX##_iter_end(struct SNAME *target) \
|
||||
{ \
|
||||
struct SNAME##_iter iter; \
|
||||
\
|
||||
iter.target = target; \
|
||||
iter.cursor = 0; \
|
||||
iter.index = 0; \
|
||||
iter.first = 0; \
|
||||
iter.last = 0; \
|
||||
iter.start = PFX##_empty(target); \
|
||||
iter.end = true; \
|
||||
\
|
||||
if (!PFX##_empty(target)) \
|
||||
{ \
|
||||
for (size_t i = 0; i < target->capacity; i++) \
|
||||
{ \
|
||||
if (target->buffer[i].state == CMC_ES_FILLED) \
|
||||
{ \
|
||||
iter.first = i; \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
for (size_t i = target->capacity; i > 0; i--) \
|
||||
{ \
|
||||
if (target->buffer[i - 1].state == CMC_ES_FILLED) \
|
||||
{ \
|
||||
iter.last = i - 1; \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
iter.cursor = iter.last; \
|
||||
iter.index = target->count - 1; \
|
||||
} \
|
||||
\
|
||||
return 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)) \
|
||||
{ \
|
||||
@@ -1250,10 +1234,14 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
iter->index = 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)) \
|
||||
{ \
|
||||
@@ -1261,7 +1249,11 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
iter->index = iter->target->count - 1; \
|
||||
iter->start = PFX##_empty(iter->target); \
|
||||
iter->end = true; \
|
||||
\
|
||||
return true; \
|
||||
} \
|
||||
\
|
||||
return false; \
|
||||
} \
|
||||
\
|
||||
bool PFX##_iter_next(struct SNAME##_iter *iter) \
|
||||
@@ -1521,25 +1513,6 @@ static const char *cmc_string_fmt_hashmultiset = "struct %s<%s> "
|
||||
i++; \
|
||||
\
|
||||
return cmc_hashtable_primes[i]; \
|
||||
} \
|
||||
\
|
||||
static struct SNAME##_iter PFX##_impl_it_start(struct SNAME *_set_) \
|
||||
{ \
|
||||
struct SNAME##_iter iter; \
|
||||
\
|
||||
PFX##_iter_init(&iter, _set_); \
|
||||
\
|
||||
return iter; \
|
||||
} \
|
||||
\
|
||||
static struct SNAME##_iter PFX##_impl_it_end(struct SNAME *_set_) \
|
||||
{ \
|
||||
struct SNAME##_iter iter; \
|
||||
\
|
||||
PFX##_iter_init(&iter, _set_); \
|
||||
PFX##_iter_to_end(&iter); \
|
||||
\
|
||||
return iter; \
|
||||
}
|
||||
|
||||
#endif /* CMC_HASHMULTISET_H */
|
||||
Reference in new issue
Block a user