diff --git a/examples/book_store/main.c b/examples/book_store/main.c index 58f8e3c..5d1232f 100644 --- a/examples/book_store/main.c +++ b/examples/book_store/main.c @@ -55,17 +55,17 @@ int main(int argc, char const *argv[]) q_dequeue(shelf); } - q_enqueue(shelf, var); + q_enqueue(shelf, value); - map_insert(library, var->isbn, var->name); - set_insert(counter, var->name); + map_insert(library, value->isbn, value->name); + set_insert(counter, value->name); }) printf("Library Size: %d\n", map_count(library)); printf("Unique book titles: %d\n\n", set_count(counter)); printf("Showcase Books:\n"); FOR_EACH(q, queue, book *, shelf, { - printf("[ %d : %-45s ]\n", var->isbn, var->name); + printf("[ %d : %-45s ]\n", value->isbn, value->name); }) printf("\n"); @@ -119,7 +119,7 @@ int main(int argc, char const *argv[]) }) FOR_EACH(il, intlist, int, search_list, { - printf("[ %d ]\n", var); + printf("[ %d ]\n", value); }) il_free(search_list); @@ -128,8 +128,8 @@ int main(int argc, char const *argv[]) // Free all memory used by struct book FOR_EACH(l, list, book *, books, { - free(var->name); - free(var); + free(value->name); + free(value); }) l_free(books); diff --git a/examples/for_each.c b/examples/for_each.c index 3ee7f62..d48972f 100644 --- a/examples/for_each.c +++ b/examples/for_each.c @@ -55,61 +55,61 @@ int main(int argc, char const *argv[]) ts_insert(ts, 25); // All FOR_EACH macros contains three available variables: - // - var : the elements that changes with each iteration + // - value : the elements that changes with each iteration // - index : iteration index (first iteration is 0 and last is count - 1) // - iter : iterator struct FOR_EACH(l, list, int, l, { if (index == 0) - printf("[ %d, ", var); + printf("[ %d, ", value); else if (index == iter.target->count - 1) - printf("%d ]\n", var); + printf("%d ]\n", value); else - printf("%d, ", var); + printf("%d, ", value); }) FOR_EACH(s, stack, int, s, { if (index == 0) - printf("[ %d, ", var); + printf("[ %d, ", value); else if (index == iter.target->count - 1) - printf("%d ]\n", var); + printf("%d ]\n", value); else - printf("%d, ", var); + printf("%d, ", value); }) FOR_EACH(q, queue, int, q, { if (index == 0) - printf("[ %d, ", var); + printf("[ %d, ", value); else if (index == iter.target->count - 1) - printf("%d ]\n", var); + printf("%d ]\n", value); else - printf("%d, ", var); + printf("%d, ", value); }) FOR_EACH(d, deque, int, d, { if (index == 0) - printf("[ %d, ", var); + printf("[ %d, ", value); else if (index == iter.target->count - 1) - printf("%d ]\n", var); + printf("%d ]\n", value); else - printf("%d, ", var); + printf("%d, ", value); }) FOR_EACH(ll, llist, int, ll, { if (index == 0) - printf("[ %d, ", var); + printf("[ %d, ", value); else if (index == iter.target->count - 1) - printf("%d ]\n", var); + printf("%d ]\n", value); else - printf("%d, ", var); + printf("%d, ", value); }) FOR_EACH(ts, tset, int, ts, { if (index == 0) - printf("[ %d, ", var); + printf("[ %d, ", value); else if (index == iter.target->count - 1) - printf("%d ]\n", var); + printf("%d ]\n", value); else - printf("%d, ", var); + printf("%d, ", value); }) l_free(l); diff --git a/examples/separate_header_source/main.c b/examples/separate_header_source/main.c index f528ad2..b37a69a 100644 --- a/examples/separate_header_source/main.c +++ b/examples/separate_header_source/main.c @@ -185,8 +185,8 @@ int main(void) int sum = 0; FOR_EACH(il, int_list, int, integers, { - printf("%d, ", var); - sum += var; + printf("%d, ", value); + sum += value; }) printf("\n\nSUM: %d\n", sum); @@ -256,7 +256,7 @@ int main(void) int sum3 = 0; FOR_EACH(dq, deque, int, d, { - sum3 += var; + sum3 += value; }) printf("Deque sum: %d\n", sum3); diff --git a/src/foreach.h b/src/foreach.h index cb06e02..fa2fc69 100644 --- a/src/foreach.h +++ b/src/foreach.h @@ -14,31 +14,31 @@ #include #include -#define FOR_EACH(PFX, SNAME, V, TARGET, BODY) \ - do \ - { \ - size_t index; \ - V var; \ - SNAME##_iter iter; \ - PFX##_iter_new(&iter, TARGET); \ - while (PFX##_iter_next(&iter, &var, &index)) \ - { \ - BODY; \ - } \ +#define FOR_EACH(PFX, SNAME, V, TARGET, BODY) \ + do \ + { \ + size_t index; \ + V value; \ + SNAME##_iter iter; \ + PFX##_iter_new(&iter, TARGET); \ + while (PFX##_iter_next(&iter, &value, &index)) \ + { \ + BODY; \ + } \ } while (0); -#define FOR_EACH_REV(PFX, SNAME, V, TARGET, BODY) \ - do \ - { \ - size_t index; \ - V var; \ - SNAME##_iter iter; \ - PFX##_iter_new(&iter, TARGET); \ - PFX##_iter_toend(&iter); \ - while (PFX##_iter_prev(&iter, &var, &index)) \ - { \ - BODY; \ - } \ +#define FOR_EACH_REV(PFX, SNAME, V, TARGET, BODY) \ + do \ + { \ + size_t index; \ + V value; \ + SNAME##_iter iter; \ + PFX##_iter_new(&iter, TARGET); \ + PFX##_iter_toend(&iter); \ + while (PFX##_iter_prev(&iter, &value, &index)) \ + { \ + BODY; \ + } \ } while (0); #define FOR_EACH_MAP(PFX, SNAME, K, V, TARGET, BODY) \ diff --git a/tests/foreach.c b/tests/foreach.c index 47fc63d..9a1e999 100644 --- a/tests/foreach.c +++ b/tests/foreach.c @@ -52,31 +52,31 @@ int main(int argc, char const *argv[]) int sum0 = 0, sum1 = 0, sum2 = 0, sum3 = 0, sum4 = 0, sum5 = 0, sum6 = 0, sum7 = 0, sum8 = 0; FOR_EACH(l, list, int, l, { - sum0 += var; + sum0 += value; }) FOR_EACH(s, stack, int, s, { - sum1 += var; + sum1 += value; }) FOR_EACH(q, queue, int, q, { - sum2 += var; + sum2 += value; }) FOR_EACH(d, deque, int, d, { - sum3 += var; + sum3 += value; }) FOR_EACH(ll, linked, int, ll, { - sum4 += var; + sum4 += value; }) FOR_EACH(h, heap, int, h, { - sum5 += var; + sum5 += value; }) FOR_EACH(ts, tset, int, ts, { - sum6 += var; + sum6 += value; }) FOR_EACH_MAP(tm, tmap, int, int, tm, { @@ -106,31 +106,31 @@ int main(int argc, char const *argv[]) sum0 = 0, sum1 = 0, sum2 = 0, sum3 = 0, sum4 = 0, sum5 = 0, sum6 = 0, sum7 = 0, sum8 = 0; FOR_EACH_REV(l, list, int, l, { - sum0 += var; + sum0 += value; }) FOR_EACH_REV(s, stack, int, s, { - sum1 += var; + sum1 += value; }) FOR_EACH_REV(q, queue, int, q, { - sum2 += var; + sum2 += value; }) FOR_EACH_REV(d, deque, int, d, { - sum3 += var; + sum3 += value; }) FOR_EACH_REV(ll, linked, int, ll, { - sum4 += var; + sum4 += value; }) FOR_EACH_REV(h, heap, int, h, { - sum5 += var; + sum5 += value; }) FOR_EACH_REV(ts, tset, int, ts, { - sum6 += var; + sum6 += value; }) FOR_EACH_MAP_REV(tm, tmap, int, int, tm, {