From 047044ba50d73d81ed6ed1c77324c9bf873876cb Mon Sep 17 00:00:00 2001 From: Tyge Løvset Date: Thu, 22 Sep 2022 18:39:17 +0200 Subject: Renamed .idx => .index in c_forfilter() macro --- examples/forfilter.c | 17 +++++++++++------ examples/list.c | 8 ++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/examples/forfilter.c b/examples/forfilter.c index e588e315..c7d3fae0 100644 --- a/examples/forfilter.c +++ b/examples/forfilter.c @@ -19,12 +19,17 @@ void demo1(void) c_forfilter (i, IVec, vec, *i.ref != 80) printf(" %d", *i.ref); - puts(""); - c_forfilter (i, IVec, vec, i.idx >= 3 // drop(3) - && i.idx != 5 - && *i.ref != 7, - i.taken < 5) // take(5) + + #define flt_drop(i, n) (i.index >= (n)) + #define flt_remove(i, x) (*i.ref != (x)) + #define flt_take(i, n) (i.taken < (n)) + #define flt_even(i) ((*i.ref & 1) == 0) + + c_forfilter (i, IVec, vec, flt_drop(i, 3) + && flt_even(i) + && flt_remove(i, 80) + , flt_take(i, 5)) printf(" %d", *i.ref); puts(""); } @@ -93,7 +98,7 @@ void demo4(void) cstr_push(&out, i.ref); //cstr_append_sv(&out, i.it.u8.chr); - printf("%s", cstr_str(&out)); + printf("%s\n", cstr_str(&out)); } diff --git a/examples/list.c b/examples/list.c index 9ed9ec76..d5f3996c 100644 --- a/examples/list.c +++ b/examples/list.c @@ -25,15 +25,15 @@ int main() { sum += *i.ref; printf("sum %f\n\n", sum); - c_forloop (i, clist_fx, list, i.idx < 10) - printf("%8d: %10f\n", (int)i.idx, *i.ref); + c_forloop (i, clist_fx, list, i.index < 10) + printf("%8d: %10f\n", (int)i.index, *i.ref); puts("sort"); clist_fx_sort(&list); // mergesort O(n*log n) puts("sorted"); - c_forloop (i, clist_fx, list, i.idx < 10) - printf("%8d: %10f\n", (int)i.idx, *i.ref); + c_forloop (i, clist_fx, list, i.index < 10) + printf("%8d: %10f\n", (int)i.index, *i.ref); puts(""); clist_fx_clear(&list); -- cgit v1.2.3