Renamed i_native_cmp => i_cmp_native

Added c_all_of(), c_any_of(), c_none_of() to algo/filter.h

4 files changed, 29 insertions, 10 deletions

diff --git a/include/stc/algo/coroutine.h b/include/stc/algo/coroutine.h
index 3a5382f3..e4c0915c 100644
--- a/include/stc/algo/coroutine.h
+++ b/include/stc/algo/coroutine.h
@@ -178,17 +178,22 @@ typedef struct { intptr_t count; } cco_sem;
 
 #ifdef _WIN32
     #ifdef __cplusplus
-    #define _c_LINKC extern "C" __declspec(dllimport) 
+      #define _c_LINKC extern "C" __declspec(dllimport)
     #else
-    #define _c_LINKC __declspec(dllimport) 
+      #define _c_LINKC __declspec(dllimport) 
+    #endif
+    #if _WIN32_WINNT < _WIN32_WINNT_WIN8 || defined __TINYC__
+      #define _c_getsystime GetSystemTimeAsFileTime
+    #else
+      #define _c_getsystime GetSystemTimePreciseAsFileTime
     #endif
     struct _FILETIME;
-    _c_LINKC void GetSystemTimePreciseAsFileTime(struct _FILETIME*);
+    _c_LINKC void _c_getsystime(struct _FILETIME*);
     _c_LINKC void Sleep(unsigned long);
 
     static inline double cco_time(void) { /* seconds since epoch */
         unsigned long long quad;          /* 64-bit value representing 1/10th usecs since Jan 1 1601, 00:00 UTC */
-        GetSystemTimePreciseAsFileTime((struct _FILETIME*)&quad);
+        _c_getsystime((struct _FILETIME*)&quad);
         return (double)(quad - 116444736000000000ULL)*1e-7;  /* time diff Jan 1 1601-Jan 1 1970 in 1/10th usecs */
     }
 
diff --git a/include/stc/algo/filter.h b/include/stc/algo/filter.h
index 4a227927..1a62c3e1 100644
--- a/include/stc/algo/filter.h
+++ b/include/stc/algo/filter.h
@@ -85,6 +85,21 @@ int main(void)
     if (it.ref == _endref) it.ref = NULL; \
 } while (0)
 
+#define c_all_of(boolptr, it, C, cnt, pred) do { \
+    C##_iter it; \
+    c_find_if_4(it, C, cnt, !(pred)); \
+    *(boolptr) = it.ref == NULL; \
+} while (0)
+#define c_any_of(boolptr, it, C, cnt, pred) do { \
+    C##_iter it; \
+    c_find_if_4(it, C, cnt, pred); \
+    *(boolptr) = it.ref != NULL; \
+} while (0)
+#define c_none_of(boolptr, it, C, cnt, pred) do { \
+    C##_iter it; \
+    c_find_if_4(it, C, cnt, pred); \
+    *(boolptr) = it.ref == NULL; \
+} while (0)
 
 // Use with: clist, cmap, cset, csmap, csset:
 #define c_erase_if(it, C, cnt, pred) do { \
@@ -95,7 +110,6 @@ int main(void)
     } \
 } while (0)
 
-
 // Use with: cstack, cvec, cdeq, cqueue:
 #define c_eraseremove_if(it, C, cnt, pred) do { \
     C* _cnt = &cnt; \
diff --git a/include/stc/priv/template.h b/include/stc/priv/template.h
index 30ed5732..ccdce718 100644
--- a/include/stc/priv/template.h
+++ b/include/stc/priv/template.h
@@ -103,7 +103,7 @@
   #define i_no_emplace
 #endif
 #if c_option(c_native_cmp)
-  #define i_native_cmp
+  #define i_cmp_native
 #endif
 #if c_option(c_no_clone) || defined _i_carc
   #define i_no_clone
@@ -203,10 +203,10 @@
 #endif
 
 #ifndef i_no_cmp
-  #if defined i_cmp || defined i_less || defined i_native_cmp
+  #if defined i_cmp || defined i_less || defined i_cmp_native
     #define _i_has_cmp
   #endif
-  #if defined i_eq || defined i_native_cmp
+  #if defined i_eq || defined i_cmp_native
     #define _i_has_eq
   #endif
   
@@ -228,7 +228,7 @@
   #endif
 #endif
 
-#if !defined i_hash && (!(defined _i_cbox || defined _i_carc) || defined i_native_cmp)
+#if !defined i_hash && (!(defined _i_cbox || defined _i_carc) || defined i_cmp_native)
   #define i_hash c_default_hash
 #endif
 
diff --git a/include/stc/priv/template2.h b/include/stc/priv/template2.h
index def5d01e..351defde 100644
--- a/include/stc/priv/template2.h
+++ b/include/stc/priv/template2.h
@@ -67,7 +67,7 @@
 #undef i_realloc
 #undef i_free
 
-#undef i_native_cmp
+#undef i_cmp_native
 #undef i_no_cmp
 #undef i_no_hash
 #undef i_no_clone