Finish last commit. Most safe function macros are now preferred lowercase, whereas flow control macros (c_FOREACH, ..) are preferred uppercase.

3 files changed, 10 insertions, 10 deletions

diff --git a/include/stc/algo/crange.h b/include/stc/algo/crange.h
index 63242a54..5e1610d9 100644
--- a/include/stc/algo/crange.h
+++ b/include/stc/algo/crange.h
@@ -36,7 +36,7 @@ int main()
     int a = 100, b = INT32_MAX;
     c_FORFILTER (i, crange, crange_literal(a, b, 8)
                   , i.index > 10
-                  , c_FLT_TAKE(i, 3))
+                  , c_flt_take(i, 3))
         printf(" %lld", *i.ref);
     puts("");
 }
diff --git a/include/stc/algo/csort.h b/include/stc/algo/csort.h
index 2cd7b548..9c9bcd5b 100644
--- a/include/stc/algo/csort.h
+++ b/include/stc/algo/csort.h
@@ -84,13 +84,13 @@ static inline void c_PASTE(cqsort_, i_tag)(i_val arr[], intptr_t lo, intptr_t hi
             while (i_less((&arr[i]), (&pivot))) ++i;
             while (i_less((&pivot), (&arr[j]))) --j;
             if (i <= j) {
-                c_SWAP(i_val, arr+i, arr+j);
+                c_swap(i_val, arr+i, arr+j);
                 ++i; --j;
             }
         }
         if (j - lo > hi - i) {
-            c_SWAP(intptr_t, &lo, &i);
-            c_SWAP(intptr_t, &hi, &j);
+            c_swap(intptr_t, &lo, &i);
+            c_swap(intptr_t, &hi, &j);
         }
 
         if (j - lo > 64) c_PASTE(cqsort_, i_tag)(arr, lo, j);
diff --git a/include/stc/algo/filter.h b/include/stc/algo/filter.h
index e941be2e..0f850f41 100644
--- a/include/stc/algo/filter.h
+++ b/include/stc/algo/filter.h
@@ -37,9 +37,9 @@ int main()
         puts("");
         
         c_FORFILTER (i, cstack_int, stk
-                    , c_FLT_SKIPWHILE(i, *i.ref < 3)
+                    , c_flt_skipwhile(i, *i.ref < 3)
                     && (*i.ref & 1) == 0 // even only
-                    , c_FLT_TAKE(i, 2)) // break after 2
+                    , c_flt_take(i, 2)) // break after 2
             printf(" %d", *i.ref);
         puts("");
     }
@@ -54,10 +54,10 @@ int main()
   #define c_NFILTERS 14 /* 22, 30, .. */
 #endif
 
-#define c_FLT_TAKE(i, n) (++(i).s1[(i).s1top++] <= (n))
-#define c_FLT_SKIP(i, n) (++(i).s1[(i).s1top++] > (n))
-#define c_FLT_SKIPWHILE(i, pred) ((i).s2[(i).s2top++] |= !(pred))
-#define c_FLT_TAKEWHILE(i, pred) !c_FLT_SKIPWHILE(i, pred)
+#define c_flt_take(i, n) (++(i).s1[(i).s1top++] <= (n))
+#define c_flt_skip(i, n) (++(i).s1[(i).s1top++] > (n))
+#define c_flt_skipwhile(i, pred) ((i).s2[(i).s2top++] |= !(pred))
+#define c_flt_takewhile(i, pred) !c_flt_skipwhile(i, pred)
 
 #define c_FORFILTER(...) c_MACRO_OVERLOAD(c_FORFILTER, __VA_ARGS__)