Deprecated c_no_compare(). Define i_cmp_none instead when you have/want no element comparison for cvec, cdeq, clist, csptr. Will give compile time error if functions depending on comparisons are used.

6 files changed, 56 insertions, 30 deletions

diff --git a/include/stc/ccommon.h b/include/stc/ccommon.h
index acf09dde..7d0eceeb 100644
--- a/include/stc/ccommon.h
+++ b/include/stc/ccommon.h
@@ -98,7 +98,7 @@
 

 #define c_default_compare(x, y) c_less_compare(c_default_less, x, y)

 #define c_default_less(x, y)    (*(x) < *(y))

-#define c_no_compare(x, y)      (assert(!"c_no_compare() called"), (x)==(y))

+#define c_no_compare(x, y)      (assert(!"c_no_compare() called"), (x)==(y)) // [deprecated]

 #define c_less_compare(less, x, y) (less(y, x) - less(x, y))

 

 #define c_default_equalto(x, y)  (*(x) == *(y))

diff --git a/include/stc/cdeq.h b/include/stc/cdeq.h
index c9eb0627..6475b431 100644
--- a/include/stc/cdeq.h
+++ b/include/stc/cdeq.h
@@ -170,6 +170,8 @@ _cx_memb(_erase_range)(_cx_self* self, _cx_iter it1, _cx_iter it2) {
     return _cx_memb(_erase_range_p)(self, it1.ref, it2.ref);

 }

 

+#ifndef i_cmp_none

+

 STC_INLINE _cx_iter

 _cx_memb(_find)(const _cx_self* self, i_valraw raw) {

     return _cx_memb(_find_in)(_cx_memb(_begin)(self), _cx_memb(_end)(self), raw);

@@ -196,6 +198,7 @@ STC_INLINE void
 _cx_memb(_sort)(_cx_self* self) {

     _cx_memb(_sort_range)(_cx_memb(_begin)(self), _cx_memb(_end)(self), _cx_memb(_value_compare));

 }

+#endif // !i_cmp_none

 #endif // i_queue

 

 /* -------------------------- IMPLEMENTATION ------------------------- */

@@ -353,6 +356,7 @@ _cx_memb(_erase_range_p)(_cx_self* self, _cx_value* p1, _cx_value* p2) {
     return c_make(_cx_iter){p1};

 }

 

+#ifndef i_cmp_none

 STC_DEF _cx_iter

 _cx_memb(_find_in)(_cx_iter i1, _cx_iter i2, i_valraw raw) {

     for (; i1.ref != i2.ref; ++i1.ref) {

@@ -368,7 +372,7 @@ _cx_memb(_value_compare)(const _cx_value* x, const _cx_value* y) {
     i_valraw ry = i_valto(y);

     return i_cmp(&rx, &ry);

 }

-

+#endif // !i_cmp_none

 #endif // i_queue

 #endif // IMPLEMENTATION

 #include "template.h"

diff --git a/include/stc/clist.h b/include/stc/clist.h
index 247086a1..8a019b65 100644
--- a/include/stc/clist.h
+++ b/include/stc/clist.h
@@ -98,11 +98,13 @@ STC_API _cx_value*      _cx_memb(_push_front)(_cx_self* self, i_val value);
 STC_API _cx_iter        _cx_memb(_insert)(_cx_self* self, _cx_iter it, i_val value);

 STC_API _cx_iter        _cx_memb(_erase_at)(_cx_self* self, _cx_iter it);

 STC_API _cx_iter        _cx_memb(_erase_range)(_cx_self* self, _cx_iter it1, _cx_iter it2);

+#ifndef i_cmp_none

 STC_API size_t          _cx_memb(_remove)(_cx_self* self, i_valraw val);

+STC_API _cx_iter        _cx_memb(_find_in)(_cx_iter it1, _cx_iter it2, i_valraw val);

+#endif

 STC_API _cx_iter        _cx_memb(_splice)(_cx_self* self, _cx_iter it, _cx_self* other);

 STC_API _cx_self        _cx_memb(_split_off)(_cx_self* self, _cx_iter it1, _cx_iter it2);

 STC_API void            _cx_memb(_sort)(_cx_self* self);

-STC_API _cx_iter        _cx_memb(_find_in)(_cx_iter it1, _cx_iter it2, i_valraw val);

 STC_API _cx_node*       _cx_memb(_erase_after_)(_cx_self* self, _cx_node* node);

 

 STC_INLINE _cx_self     _cx_memb(_init)(void) { return c_make(_cx_self){NULL}; }

@@ -161,6 +163,7 @@ _cx_memb(_splice_range)(_cx_self* self, _cx_iter it,
     return _cx_memb(_splice)(self, it, &tmp);

 }

 

+#ifndef i_cmp_none

 STC_INLINE _cx_iter

 _cx_memb(_find)(const _cx_self* self, i_valraw val) {

     return _cx_memb(_find_in)(_cx_memb(_begin)(self), _cx_memb(_end)(self), val);

@@ -175,6 +178,7 @@ STC_INLINE _cx_value*
 _cx_memb(_get_mut)(_cx_self* self, i_valraw val) {

     return _cx_memb(_find_in)(_cx_memb(_begin)(self), _cx_memb(_end)(self), val).ref;

 }

+#endif

 

 // -------------------------- IMPLEMENTATION -------------------------

 

@@ -235,15 +239,6 @@ _cx_memb(_erase_range)(_cx_self* self, _cx_iter it1, _cx_iter it2) {
     return it2;

 }

 

-STC_DEF _cx_iter

-_cx_memb(_find_in)(_cx_iter it1, _cx_iter it2, i_valraw val) {

-    c_foreach (it, _cx_self, it1, it2) {

-        i_valraw r = i_valto(it.ref);

-        if (i_cmp(&r, &val) == 0) return it;

-    }

-    it2.ref = NULL; return it2;

-}

-

 STC_DEF _cx_node*

 _cx_memb(_erase_after_)(_cx_self* self, _cx_node* node) {

     _cx_node* del = node->next, *next = del->next;

@@ -254,21 +249,6 @@ _cx_memb(_erase_after_)(_cx_self* self, _cx_node* node) {
     return node;

 }

 

-STC_DEF size_t

-_cx_memb(_remove)(_cx_self* self, i_valraw val) {

-    size_t n = 0;

-    _cx_node* prev = self->last, *node;

-    while (prev) {

-        node = prev->next;

-        i_valraw r = i_valto(&node->value);

-        if (i_cmp(&r, &val) == 0)

-            prev = _cx_memb(_erase_after_)(self, prev), ++n;

-        else

-            prev = (node == self->last ? NULL : node);

-    }

-    return n;

-}

-

 STC_DEF _cx_iter

 _cx_memb(_splice)(_cx_self* self, _cx_iter it, _cx_self* other) {

     if (!self->last)

@@ -295,6 +275,32 @@ _cx_memb(_split_off)(_cx_self* self, _cx_iter it1, _cx_iter it2) {
     return cx;

 }

 

+#ifndef i_cmp_none

+

+STC_DEF _cx_iter

+_cx_memb(_find_in)(_cx_iter it1, _cx_iter it2, i_valraw val) {

+    c_foreach (it, _cx_self, it1, it2) {

+        i_valraw r = i_valto(it.ref);

+        if (i_cmp(&r, &val) == 0) return it;

+    }

+    it2.ref = NULL; return it2;

+}

+

+STC_DEF size_t

+_cx_memb(_remove)(_cx_self* self, i_valraw val) {

+    size_t n = 0;

+    _cx_node* prev = self->last, *node;

+    while (prev) {

+        node = prev->next;

+        i_valraw r = i_valto(&node->value);

+        if (i_cmp(&r, &val) == 0)

+            prev = _cx_memb(_erase_after_)(self, prev), ++n;

+        else

+            prev = (node == self->last ? NULL : node);

+    }

+    return n;

+}

+

 STC_DEF int

 _cx_memb(_sort_cmp_)(const clist_VOID_node* x, const clist_VOID_node* y) {

     i_valraw a = i_valto(&((const _cx_node *) x)->value);

@@ -310,6 +316,7 @@ _cx_memb(_sort)(_cx_self* self) {
     if (self->last)

         self->last = (_cx_node *) _clist_mergesort((clist_VOID_node *) self->last->next, _cx_memb(_sort_cmp_));

 }

+#endif // !i_cmp_none

 

 #endif // TEMPLATE IMPLEMENTATION

 

@@ -324,6 +331,7 @@ _clist_count(const clist_VOID* self) {
     return n;

 }

 

+#ifndef i_cmp_none

 // Singly linked list Mergesort implementation by Simon Tatham. O(n*log n).

 // https://www.chiark.greenend.org.uk/~sgtatham/algorithms/listsort.html

 STC_DEF clist_VOID_node *

@@ -373,6 +381,7 @@ _clist_mergesort(clist_VOID_node *list, int (*cmp)(const clist_VOID_node*, const
         insize *= 2;

     }

 }

+#endif // !i_cmp_none

 #endif // NON-TEMPLATE IMPLEMENTATION

 #include "template.h"

 #define CLIST_H_INCLUDED

diff --git a/include/stc/csptr.h b/include/stc/csptr.h
index 6bcd8a56..7415c20a 100644
--- a/include/stc/csptr.h
+++ b/include/stc/csptr.h
@@ -167,11 +167,16 @@ _cx_memb(_take)(_cx_self* self, _cx_self ptr) {
     *self = ptr;

 }

 

+#ifndef i_cmp_none

 STC_INLINE int

 _cx_memb(_compare)(const _cx_self* x, const _cx_self* y) {

+#ifdef i_cmp_default

+    return c_default_compare(&x->get, &y->get);

+#else

     return i_cmp(x->get, y->get);

+#endif

 }

-

+#endif

 #undef cx_csptr_rep

 #undef cx_increment

 #undef cx_decrement

diff --git a/include/stc/cvec.h b/include/stc/cvec.h
index 5b58dca7..5e9a9877 100644
--- a/include/stc/cvec.h
+++ b/include/stc/cvec.h
@@ -84,9 +84,11 @@ STC_API void            _cx_memb(_del)(_cx_self* self);
 STC_API void            _cx_memb(_clear)(_cx_self* self);

 STC_API bool            _cx_memb(_reserve)(_cx_self* self, const size_t cap);

 STC_API bool            _cx_memb(_resize)(_cx_self* self, const size_t size, i_val fill_val);

+#ifndef i_cmp_none

 STC_API int             _cx_memb(_value_compare)(const _cx_value* x, const _cx_value* y);

 STC_API _cx_iter        _cx_memb(_find_in)(_cx_iter it1, _cx_iter it2, i_valraw raw);

 STC_API _cx_iter        _cx_memb(_bsearch_in)(_cx_iter it1, _cx_iter it2, i_valraw raw);

+#endif

 STC_API _cx_value*      _cx_memb(_push_back)(_cx_self* self, i_val value);

 STC_API _cx_iter        _cx_memb(_erase_range_p)(_cx_self* self, _cx_value* p1, _cx_value* p2);

 STC_API _cx_iter        _cx_memb(_insert_range_p)(_cx_self* self, _cx_value* pos,

@@ -192,6 +194,8 @@ _cx_memb(_at)(const _cx_self* self, const size_t idx) {
     return self->data + idx;

 }

 

+#ifndef i_cmp_none

+

 STC_INLINE _cx_iter

 _cx_memb(_find)(const _cx_self* self, i_valraw raw) {

     return _cx_memb(_find_in)(_cx_memb(_begin)(self), _cx_memb(_end)(self), raw);

@@ -221,7 +225,7 @@ STC_INLINE void
 _cx_memb(_sort)(_cx_self* self) {

     _cx_memb(_sort_range)(_cx_memb(_begin)(self), _cx_memb(_end)(self), _cx_memb(_value_compare));

 }

-

+#endif // !i_cmp_none

 /* -------------------------- IMPLEMENTATION ------------------------- */

 #if !defined(STC_HEADER) || defined(STC_IMPLEMENTATION) || defined(i_imp)

 

@@ -339,6 +343,7 @@ _cx_memb(_erase_range_p)(_cx_self* self, _cx_value* p1, _cx_value* p2) {
     return c_make(_cx_iter){.ref = p1};

 }

 

+#ifndef i_cmp_none

 STC_DEF _cx_iter

 _cx_memb(_find_in)(_cx_iter i1, _cx_iter i2, i_valraw raw) {

     for (; i1.ref != i2.ref; ++i1.ref) {

@@ -367,7 +372,7 @@ _cx_memb(_value_compare)(const _cx_value* x, const _cx_value* y) {
     i_valraw ry = i_valto(y);

     return i_cmp(&rx, &ry);

 }

-

+#endif // !i_cmp_none

 #endif

 #include "template.h"

 #define CVEC_H_INCLUDED

diff --git a/include/stc/template.h b/include/stc/template.h
index 19ff97f2..ff1ea3fc 100644
--- a/include/stc/template.h
+++ b/include/stc/template.h
@@ -162,6 +162,7 @@
 #endif

 #ifndef i_cmp

   #define i_cmp c_default_compare

+  #define i_cmp_default

 #endif

 

 #else // -------------------------------------------------------

@@ -171,6 +172,8 @@
 #undef i_imp

 #undef i_fwd

 #undef i_cmp

+#undef i_cmp_none

+#undef i_cmp_default

 #undef i_del

 #undef i_equ

 #undef i_hash