Renamed c_flt_n() => c_flt_getcount(), and c_flt_count() => c_flt_counter().

4 files changed, 18 insertions, 18 deletions

diff --git a/docs/ccommon_api.md b/docs/ccommon_api.md
index 164abafe..6a0b4ee7 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 count      |
-| `c_flt_n(it)`                     | Return n items passed 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_counter(it)`               | Increment current and return count         |
+| `c_flt_getcount(it)`              | Number of items passed skip*/take*/counter |
 ```c
 // Example:
 #include <stc/algo/crange.h>
@@ -110,9 +110,9 @@ int main() {
     crange R = crange_make(1001, INT32_MAX, 2);
 
     c_forfilter (i, crange, R,
-                    isPrime(*i.ref)          &&
-                    c_flt_skip(i, 24)        &&
-                    c_flt_count(i) % 15 == 1 &&
+                    isPrime(*i.ref)            &&
+                    c_flt_skip(i, 24)          &&
+                    c_flt_counter(i) % 15 == 1 &&
                     c_flt_take(i, 10)
     ){
         printf(" %lld", *i.ref);
@@ -121,7 +121,7 @@ int main() {
 }
 // out: 1171 1283 1409 1493 1607 1721 1847 1973 2081 2203
 ```
-Note that `c_flt_take()` and `c_flt_takewhile()`breaks the loop on false.
+Note that `c_flt_take()` and `c_flt_takewhile()` breaks the loop on false.
 
 ## Generators
 
diff --git a/include/stc/algo/filter.h b/include/stc/algo/filter.h
index d0687561..e133577c 100644
--- a/include/stc/algo/filter.h
+++ b/include/stc/algo/filter.h
@@ -51,12 +51,12 @@ int main()
 
 // c_forfilter:
 
-#define c_flt_skip(i, n) (c_flt_count(i) > (n))
+#define c_flt_skip(i, n) (c_flt_counter(i) > (n))
 #define c_flt_skipwhile(i, pred) ((i).b.s2[(i).b.s2top++] |= !(pred))
 #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_n(i) (i).b.s1[(i).b.s1top - 1]
+#define c_flt_counter(i) ++(i).b.s1[(i).b.s1top++]
+#define c_flt_getcount(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 620c2037..363d7fec 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_n(i), *i.ref);
+        printf("%8d: %10f\n", c_flt_getcount(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_n(i), *i.ref);
+        printf("%8d: %10f\n", c_flt_getcount(i), *i.ref);
     puts("");
 
     DList_drop(&list);
diff --git a/misc/examples/prime.c b/misc/examples/prime.c
index d78f3ad3..a576a85c 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_n(i) % 10 == 0) puts("");
+        if (c_flt_getcount(i) % 10 == 0) puts("");
     }
 
     cbits_drop(&primes);