diff options
| -rw-r--r-- | docs/ccommon_api.md | 16 | ||||
| -rw-r--r-- | include/stc/algo/filter.h | 2 | ||||
| -rw-r--r-- | misc/examples/list.c | 4 | ||||
| -rw-r--r-- | misc/examples/prime.c | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/docs/ccommon_api.md b/docs/ccommon_api.md index 46966fd9..164abafe 100644 --- a/docs/ccommon_api.md +++ b/docs/ccommon_api.md @@ -85,14 +85,14 @@ Iterate containers with stop-criteria and chained range filtering. | `c_forfilter (it, ctype, container, filter)` | Filter out items in chain with && | | `c_forfilter_it (it, ctype, startit, filter)` | Filter from startit position | -| Built-in filter | Description | -|:----------------------------------|:-------------------------------------| -| `c_flt_skip(it, numItems)` | Skip numItems (inc count) | -| `c_flt_take(it, numItems)` | Take numItems (inc count) | -| `c_flt_skipwhile(it, predicate)` | Skip items until predicate is false | -| `c_flt_takewhile(it, predicate)` | Take items until predicate is false | -| `c_flt_count(it)` | Increment current and return value | -| `c_flt_last(it)` | Get value of last count/skip*/take* | +| Built-in filter | Description | +|:----------------------------------|:----------------------------------------| +| `c_flt_skip(it, numItems)` | Skip numItems (inc count) | +| `c_flt_take(it, numItems)` | Take numItems (inc count) | +| `c_flt_skipwhile(it, predicate)` | Skip items until predicate is false | +| `c_flt_takewhile(it, predicate)` | Take items until predicate is false | +| `c_flt_count(it)` | Increment current and return count | +| `c_flt_n(it)` | Return n items passed count/skip*/take* | ```c // Example: #include <stc/algo/crange.h> diff --git a/include/stc/algo/filter.h b/include/stc/algo/filter.h index 111d3273..d0687561 100644 --- a/include/stc/algo/filter.h +++ b/include/stc/algo/filter.h @@ -56,7 +56,7 @@ int main() #define c_flt_take(i, n) _flt_take(&(i).b, n) #define c_flt_takewhile(i, pred) _flt_takewhile(&(i).b, pred) #define c_flt_count(i) ++(i).b.s1[(i).b.s1top++] -#define c_flt_last(i) (i).b.s1[(i).b.s1top - 1] +#define c_flt_n(i) (i).b.s1[(i).b.s1top - 1] #define c_forfilter(i, C, cnt, filter) \ c_forfilter_it(i, C, C##_begin(&cnt), filter) diff --git a/misc/examples/list.c b/misc/examples/list.c index eb81067d..620c2037 100644 --- a/misc/examples/list.c +++ b/misc/examples/list.c @@ -23,14 +23,14 @@ int main() { printf("sum %f\n\n", sum); c_forfilter (i, DList, list, c_flt_take(i, 10)) - printf("%8d: %10f\n", c_flt_last(i), *i.ref); + printf("%8d: %10f\n", c_flt_n(i), *i.ref); puts("sort"); DList_sort(&list); // qsort O(n*log n) puts("sorted"); c_forfilter (i, DList, list, c_flt_take(i, 10)) - printf("%8d: %10f\n", c_flt_last(i), *i.ref); + printf("%8d: %10f\n", c_flt_n(i), *i.ref); puts(""); DList_drop(&list); diff --git a/misc/examples/prime.c b/misc/examples/prime.c index 34d64f10..d78f3ad3 100644 --- a/misc/examples/prime.c +++ b/misc/examples/prime.c @@ -47,7 +47,7 @@ int main(void) c_flt_take(i, 50) ){ printf("%lld ", *i.ref); - if (c_flt_last(i) % 10 == 0) puts(""); + if (c_flt_n(i) % 10 == 0) puts(""); } cbits_drop(&primes); |