From ede39bc98a758674485796174ea860515ec281e6 Mon Sep 17 00:00:00 2001
From: Tyge Løvset <tylo@norceresearch.no>
Date: Sun, 26 Mar 2023 22:33:45 +0200
Subject: Remove more c_with, c_auto

---
 include/stc/csmap.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'include/stc/csmap.h')

diff --git a/include/stc/csmap.h b/include/stc/csmap.h
index 0f72ca2d..2b1910e9 100644
--- a/include/stc/csmap.h
+++ b/include/stc/csmap.h
@@ -32,20 +32,20 @@
 #include <stc/csmap.h>
 
 int main(void) {
-    c_with (csmap_sx m = csmap_sx_init(), csmap_sx_drop(&m))
-    {
-        csmap_sx_emplace(&m, "Testing one", 1.234);
-        csmap_sx_emplace(&m, "Testing two", 12.34);
-        csmap_sx_emplace(&m, "Testing three", 123.4);
-
-        csmap_sx_value *v = csmap_sx_get(&m, "Testing five"); // NULL
-        double num = *csmap_sx_at(&m, "Testing one");
-        csmap_sx_emplace_or_assign(&m, "Testing three", 1000.0); // update
-        csmap_sx_erase(&m, "Testing two");
-
-        c_foreach (i, csmap_sx, m)
-            printf("map %s: %g\n", cstr_str(&i.ref->first), i.ref->second);
-    }
+    csmap_sx m = {0};
+    csmap_sx_emplace(&m, "Testing one", 1.234);
+    csmap_sx_emplace(&m, "Testing two", 12.34);
+    csmap_sx_emplace(&m, "Testing three", 123.4);
+
+    csmap_sx_value *v = csmap_sx_get(&m, "Testing five"); // NULL
+    double num = *csmap_sx_at(&m, "Testing one");
+    csmap_sx_emplace_or_assign(&m, "Testing three", 1000.0); // update
+    csmap_sx_erase(&m, "Testing two");
+
+    c_foreach (i, csmap_sx, m)
+        printf("map %s: %g\n", cstr_str(&i.ref->first), i.ref->second);
+
+    csmap_sx_drop(&m);
 }
 */
 #ifdef STC_CSMAP_V1
-- 
cgit v1.2.3


From 97d205f7ba096a9872afbce5e696a8806d7b72d1 Mon Sep 17 00:00:00 2001
From: Tyge Lovset <tylovset@gmail.com>
Date: Wed, 29 Mar 2023 08:45:28 +0200
Subject: Removed i_less_functor, i_cmp_functor, i_eq_functor and
 i_hash_functor: not needed. Simplified cvec_X_eq() and cdeq_X_eq()

---
 docs/cmap_api.md        |  4 +---
 docs/cpque_api.md       |  1 -
 docs/cset_api.md        |  2 --
 docs/csmap_api.md       |  1 -
 docs/csset_api.md       |  1 -
 include/stc/cdeq.h      |  5 ++---
 include/stc/cmap.h      | 14 +++-----------
 include/stc/cpque.h     | 10 +++-------
 include/stc/csmap.h     | 18 +++++++-----------
 include/stc/cvec.h      |  5 ++---
 misc/examples/functor.c |  8 ++++----
 11 files changed, 22 insertions(+), 47 deletions(-)

(limited to 'include/stc/csmap.h')

diff --git a/docs/cmap_api.md b/docs/cmap_api.md
index 71e00265..8749bd09 100644
--- a/docs/cmap_api.md
+++ b/docs/cmap_api.md
@@ -36,9 +36,7 @@ See the c++ class [std::unordered_map](https://en.cppreference.com/w/cpp/contain
 #define i_valto     // convertion func i_val* => i_valraw
 
 #define i_tag       // alternative typename: cmap_{i_tag}. i_tag defaults to i_val
-#define i_hash_functor // advanced, see examples/functor.c for similar usage.
-#define i_eq_functor // advanced, see examples/functor.c for similar usage.
-#define i_ssize      // internal; default int32_t. If defined, table expand 2x (else 1.5x)
+#define i_ssize     // internal; default int32_t. If defined, table expand 2x (else 1.5x)
 #include <stc/cmap.h>
 ```
 `X` should be replaced by the value of `i_tag` in all of the following documentation.
diff --git a/docs/cpque_api.md b/docs/cpque_api.md
index 134a920f..1396dc1f 100644
--- a/docs/cpque_api.md
+++ b/docs/cpque_api.md
@@ -18,7 +18,6 @@ See the c++ class [std::priority_queue](https://en.cppreference.com/w/cpp/contai
 #define i_valfrom   // convertion func i_valraw => i_val
 #define i_valto     // convertion func i_val* => i_valraw.
 
-#define i_less_functor // takes self as first argument. See examples/functor.c for usage.
 #define i_tag       // alternative typename: cpque_{i_tag}. i_tag defaults to i_val
 #include <stc/cpque.h>
 ```
diff --git a/docs/cset_api.md b/docs/cset_api.md
index a0af357f..db9fb802 100644
--- a/docs/cset_api.md
+++ b/docs/cset_api.md
@@ -19,8 +19,6 @@ A **cset** is an associative container that contains a set of unique objects of
 #define i_keyto     // convertion func i_key* => i_keyraw - defaults to plain copy
 
 #define i_tag       // alternative typename: cmap_{i_tag}. i_tag defaults to i_val
-#define i_hash_functor // advanced, see examples/functor.c for similar usage.
-#define i_eq_functor // advanced, see examples/functor.c for similar usage.
 #define i_ssize      // default int32_t. If defined, table expand 2x (else 1.5x)
 #include <stc/cset.h>
 ```
diff --git a/docs/csmap_api.md b/docs/csmap_api.md
index da0e6915..0eff8c26 100644
--- a/docs/csmap_api.md
+++ b/docs/csmap_api.md
@@ -33,7 +33,6 @@ See the c++ class [std::map](https://en.cppreference.com/w/cpp/container/map) fo
 #define i_valto     // convertion func i_val* => i_valraw
 
 #define i_tag       // alternative typename: csmap_{i_tag}. i_tag defaults to i_val
-#define i_cmp_functor // advanced, see examples/functor.c for similar usage.
 #define i_ssize     // internal size rep. defaults to int32_t
 #include <stc/csmap.h>
 ```
diff --git a/docs/csset_api.md b/docs/csset_api.md
index 0989fd9b..1869327c 100644
--- a/docs/csset_api.md
+++ b/docs/csset_api.md
@@ -18,7 +18,6 @@ See the c++ class [std::set](https://en.cppreference.com/w/cpp/container/set) fo
 #define i_keyfrom   // convertion func i_keyraw => i_key - defaults to plain copy
 #define i_keyto     // convertion func i_key* => i_keyraw - defaults to plain copy
 
-#define i_cmp_functor // advanced, see examples/functor.c for similar usage.
 #define i_tag       // alternative typename: csset_{i_tag}. i_tag defaults to i_val
 #define i_ssize     // defaults to int32_t
 #include <stc/csset.h>
diff --git a/include/stc/cdeq.h b/include/stc/cdeq.h
index c4f84a1b..09c0a7f8 100644
--- a/include/stc/cdeq.h
+++ b/include/stc/cdeq.h
@@ -198,9 +198,8 @@ _cx_memb(_get_mut)(_cx_self* self, _cx_raw raw)
 STC_INLINE bool
 _cx_memb(_eq)(const _cx_self* x, const _cx_self* y) {
     if (x->_len != y->_len) return false;
-    _cx_iter i = _cx_memb(_begin)(x), j = _cx_memb(_begin)(y);
-    for (; i.ref; _cx_memb(_next)(&i), _cx_memb(_next)(&j)) {
-        const _cx_raw _rx = i_keyto(i.ref), _ry = i_keyto(j.ref);
+    for (intptr_t i = 0; i < x->_len; ++i) {
+        const _cx_raw _rx = i_keyto(x->data+i), _ry = i_keyto(y->data+i);
         if (!(i_eq((&_rx), (&_ry)))) return false;
     }
     return true;
diff --git a/include/stc/cmap.h b/include/stc/cmap.h
index 402038cb..c840523f 100644
--- a/include/stc/cmap.h
+++ b/include/stc/cmap.h
@@ -82,12 +82,6 @@ typedef struct { int64_t idx; uint8_t hx; } chash_bucket_t;
   #define _i_size i_ssize
 #endif
 #include "priv/template.h"
-#ifndef i_hash_functor
-  #define i_hash_functor(self, x) i_hash(x)
-#endif
-#ifndef i_eq_functor
-  #define i_eq_functor(self, x, y) i_eq(x, y)
-#endif
 #if !c_option(c_is_forward)
   _cx_deftypes(_c_chash_types, _cx_self, i_key, i_val, i_ssize, _i_MAP_ONLY, _i_SET_ONLY);
 #endif
@@ -371,14 +365,14 @@ STC_DEF void _cx_memb(_clear)(_cx_self* self) {
 
 STC_DEF chash_bucket_t
 _cx_memb(_bucket_)(const _cx_self* self, const _cx_rawkey* rkeyptr) {
-    const uint64_t _hash = i_hash_functor(self, rkeyptr);
+    const uint64_t _hash = i_hash(rkeyptr);
     int64_t _cap = self->bucket_count;
     chash_bucket_t b = {c_PASTE(fastrange_,_i_expandby)(_hash, (uint64_t)_cap), (uint8_t)(_hash | 0x80)};
     const uint8_t* _hx = self->_hashx;
     while (_hx[b.idx]) {
         if (_hx[b.idx] == b.hx) {
             const _cx_rawkey _raw = i_keyto(_i_keyref(self->table + b.idx));
-            if (i_eq_functor(self, (&_raw), rkeyptr))
+            if (i_eq((&_raw), rkeyptr))
                 break;
         }
         if (++b.idx == _cap)
@@ -469,7 +463,7 @@ _cx_memb(_erase_entry)(_cx_self* self, _cx_value* _val) {
         if (! _hashx[j])
             break;
         const _cx_rawkey _raw = i_keyto(_i_keyref(_slot + j));
-        k = (i_ssize)c_PASTE(fastrange_,_i_expandby)(i_hash_functor(self, (&_raw)), (uint64_t)_cap);
+        k = (i_ssize)c_PASTE(fastrange_,_i_expandby)(i_hash((&_raw)), (uint64_t)_cap);
         if ((j < i) ^ (k <= i) ^ (k > j)) /* is k outside (i, j]? */
             _slot[i] = _slot[j], _hashx[i] = _hashx[j], i = j;
     }
@@ -479,8 +473,6 @@ _cx_memb(_erase_entry)(_cx_self* self, _cx_value* _val) {
 
 #endif // i_implement
 #undef i_max_load_factor
-#undef i_hash_functor
-#undef i_eq_functor
 #undef _i_size
 #undef _i_isset
 #undef _i_ismap
diff --git a/include/stc/cpque.h b/include/stc/cpque.h
index 4955f2e0..00eaa49e 100644
--- a/include/stc/cpque.h
+++ b/include/stc/cpque.h
@@ -32,9 +32,6 @@
 #endif
 
 #include "priv/template.h"
-#ifndef i_less_functor
-  #define i_less_functor(self, x, y) i_less(x, y)
-#endif
 #if !c_option(c_is_forward)
   _cx_deftypes(_c_cpque_types, _cx_self, i_key);
 #endif
@@ -120,8 +117,8 @@ STC_DEF void
 _cx_memb(_sift_down_)(_cx_self* self, const intptr_t idx, const intptr_t n) {
     _cx_value t, *arr = self->data - 1;
     for (intptr_t r = idx, c = idx*2; c <= n; c *= 2) {
-        c += i_less_functor(self, (&arr[c]), (&arr[c + (c < n)]));
-        if (!(i_less_functor(self, (&arr[r]), (&arr[c])))) return;
+        c += i_less((&arr[c]), (&arr[c + (c < n)]));
+        if (!(i_less((&arr[r]), (&arr[c])))) return;
         t = arr[r], arr[r] = arr[c], arr[r = c] = t;
     }
 }
@@ -156,12 +153,11 @@ _cx_memb(_push)(_cx_self* self, _cx_value value) {
         _cx_memb(_reserve)(self, self->_len*3/2 + 4);
     _cx_value *arr = self->data - 1; /* base 1 */
     intptr_t c = ++self->_len;
-    for (; c > 1 && (i_less_functor(self, (&arr[c/2]), (&value))); c /= 2)
+    for (; c > 1 && (i_less((&arr[c/2]), (&value))); c /= 2)
         arr[c] = arr[c/2];
     arr[c] = value;
 }
 
 #endif
 #define CPQUE_H_INCLUDED
-#undef i_less_functor
 #include "priv/template.h"
diff --git a/include/stc/csmap.h b/include/stc/csmap.h
index 2b1910e9..50593ba3 100644
--- a/include/stc/csmap.h
+++ b/include/stc/csmap.h
@@ -80,9 +80,6 @@ int main(void) {
   #define _i_size i_ssize
 #endif
 #include "priv/template.h"
-#ifndef i_cmp_functor
-  #define i_cmp_functor(self, x, y) i_cmp(x, y)
-#endif
 #if !c_option(c_is_forward)
   _cx_deftypes(_c_aatree_types, _cx_self, i_key, i_val, i_ssize, _i_MAP_ONLY, _i_SET_ONLY);
 #endif
@@ -222,12 +219,12 @@ _cx_memb(_advance)(_cx_iter it, size_t n) {
 }
 
 STC_INLINE bool
-_cx_memb(_eq)(const _cx_self* m1, const _cx_self* m2) {
-    if (_cx_memb(_size)(m1) != _cx_memb(_size)(m2)) return false;
-    _cx_iter i = _cx_memb(_begin)(m1), j = _cx_memb(_begin)(m2);
+_cx_memb(_eq)(const _cx_self* self, const _cx_self* other) {
+    if (_cx_memb(_size)(self) != _cx_memb(_size)(other)) return false;
+    _cx_iter i = _cx_memb(_begin)(self), j = _cx_memb(_begin)(other);
     for (; i.ref; _cx_memb(_next)(&i), _cx_memb(_next)(&j)) {
         const _cx_rawkey _rx = i_keyto(_i_keyref(i.ref)), _ry = i_keyto(_i_keyref(j.ref));
-        if ((i_cmp_functor(m1, (&_rx), (&_ry))) != 0) return false;
+        if (!(i_eq((&_rx), (&_ry)))) return false;
     }
     return true;
 }
@@ -357,7 +354,7 @@ _cx_memb(_find_it)(const _cx_self* self, _cx_rawkey rkey, _cx_iter* out) {
     out->_top = 0;
     while (tn) {
         int c; const _cx_rawkey _raw = i_keyto(_i_keyref(&d[tn].value));
-        if ((c = i_cmp_functor(self, (&_raw), (&rkey))) < 0)
+        if ((c = i_cmp((&_raw), (&rkey))) < 0)
             tn = d[tn].link[1];
         else if (c > 0)
             { out->_st[out->_top++] = tn; tn = d[tn].link[0]; }
@@ -425,7 +422,7 @@ _cx_memb(_insert_entry_i_)(_cx_self* self, i_ssize tn, const _cx_rawkey* rkey, _
     while (tx) {
         up[top++] = tx;
         const _cx_rawkey _raw = i_keyto(_i_keyref(&d[tx].value));
-        if (!(c = i_cmp_functor(self, (&_raw), rkey)))
+        if (!(c = i_cmp((&_raw), rkey)))
             { _res->ref = &d[tx].value; return tn; }
         dir = (c < 0);
         tx = d[tx].link[dir];
@@ -464,7 +461,7 @@ _cx_memb(_erase_r_)(_cx_self *self, i_ssize tn, const _cx_rawkey* rkey, int *era
     if (tn == 0)
         return 0;
     _cx_rawkey raw = i_keyto(_i_keyref(&d[tn].value));
-    i_ssize tx; int c = i_cmp_functor(self, (&raw), rkey);
+    i_ssize tx; int c = i_cmp((&raw), rkey);
     if (c != 0)
         d[tn].link[c < 0] = _cx_memb(_erase_r_)(self, d[tn].link[c < 0], rkey, erased);
     else {
@@ -594,7 +591,6 @@ _cx_memb(_drop)(_cx_self* self) {
 }
 
 #endif // i_implement
-#undef i_cmp_functor
 #undef _i_size
 #undef _i_isset
 #undef _i_ismap
diff --git a/include/stc/cvec.h b/include/stc/cvec.h
index 91cdb25c..8f35e5fc 100644
--- a/include/stc/cvec.h
+++ b/include/stc/cvec.h
@@ -236,9 +236,8 @@ _cx_memb(_get_mut)(const _cx_self* self, _cx_raw raw)
 STC_INLINE bool
 _cx_memb(_eq)(const _cx_self* x, const _cx_self* y) {
     if (x->_len != y->_len) return false;
-    _cx_iter i = _cx_memb(_begin)(x), j = _cx_memb(_begin)(y);
-    for (; i.ref; _cx_memb(_next)(&i), _cx_memb(_next)(&j)) {
-        const _cx_raw _rx = i_keyto(i.ref), _ry = i_keyto(j.ref);
+    for (intptr_t i = 0; i < x->_len; ++i) {
+        const _cx_raw _rx = i_keyto(x->data+i), _ry = i_keyto(y->data+i);
         if (!(i_eq((&_rx), (&_ry)))) return false;
     }
     return true;
diff --git a/misc/examples/functor.c b/misc/examples/functor.c
index f37e41d5..f8074c3a 100644
--- a/misc/examples/functor.c
+++ b/misc/examples/functor.c
@@ -1,9 +1,9 @@
 // Implements c++ example: https://en.cppreference.com/w/cpp/container/priority_queue
 // Example of per-instance less-function on a single priority queue type
 //
-// Note: i_less_functor: available for cpque types only
-//       i_cmp_functor: available for csmap and csset types only
-//       i_hash_functor/i_eq_functor: available for cmap and cset types only
+// Note: i_less: has self for cpque types only
+//       i_cmp: has self for csmap and csset types only
+//       i_hash/i_eq: has self for cmap and cset types only
 
 #include <stdio.h>
 #include <stdbool.h>
@@ -23,7 +23,7 @@ struct {
 #define i_type ipque
 #define i_val int
 #define i_opt c_is_forward // needed to avoid re-type-define container type
-#define i_less_functor(self, x, y) c_container_of(self, IPQueue, Q)->less(x, y)
+#define i_less(x, y) c_container_of(self, IPQueue, Q)->less(x, y)
 #include <stc/cpque.h>
 
 void print_queue(const char* name, IPQueue q) {
-- 
cgit v1.2.3


From 5693ae9ae0d1a18627ba540e0240da010b282296 Mon Sep 17 00:00:00 2001
From: Tyge Lovset <tylovset@gmail.com>
Date: Fri, 31 Mar 2023 22:08:07 +0200
Subject: Added stc/extend.h: A generalized way to type-safely extend a
 container with new members which can be accessed from the template
 parameters. See examples/functor.c

---
 README.md                   |  2 +-
 include/stc/carc.h          | 18 ++++++-------
 include/stc/cbox.h          | 18 ++++++-------
 include/stc/cdeq.h          | 10 +++----
 include/stc/clist.h         |  6 ++---
 include/stc/cmap.h          | 10 +++----
 include/stc/cpque.h         |  2 +-
 include/stc/csmap.h         |  2 +-
 include/stc/cstack.h        |  2 +-
 include/stc/cvec.h          | 12 ++++-----
 include/stc/extend.h        | 65 +++++++++++++++++++++++++++++++++++++++++++++
 include/stc/priv/template.h |  4 +++
 misc/examples/functor.c     | 47 +++++++++++++-------------------
 misc/examples/new_list.c    |  4 +--
 misc/examples/new_map.c     |  2 +-
 misc/examples/new_queue.c   |  2 +-
 misc/examples/new_smap.c    |  2 +-
 misc/examples/new_vec.c     |  4 +--
 18 files changed, 135 insertions(+), 77 deletions(-)
 create mode 100644 include/stc/extend.h

(limited to 'include/stc/csmap.h')

diff --git a/README.md b/README.md
index b5f9ceb7..3f985b7a 100644
--- a/README.md
+++ b/README.md
@@ -518,7 +518,7 @@ typedef struct Dataset {
 
 ...
 // Implementation
-#define i_opt c_is_forward                  // flag that the container was forward declared.
+#define i_is_forward                  // flag that the container was forward declared.
 #define i_val struct Point
 #define i_tag pnt
 #include <stc/cstack.h>
diff --git a/include/stc/carc.h b/include/stc/carc.h
index 02bbaf52..5d38d2e7 100644
--- a/include/stc/carc.h
+++ b/include/stc/carc.h
@@ -90,7 +90,7 @@ typedef i_keyraw _cx_raw;
   #define _i_atomic_inc(v)          (void)(++*(v))
   #define _i_atomic_dec_and_test(v) !(--*(v))
 #endif
-#if !c_option(c_is_forward)
+#ifndef i_is_forward
 _cx_deftypes(_c_carc_types, _cx_self, i_key);
 #endif
 struct _cx_memb(_rep_) { catomic_long counter; i_key value; };
@@ -177,8 +177,8 @@ STC_INLINE void _cx_memb(_assign)(_cx_self* self, _cx_self ptr) {
 STC_INLINE int _cx_memb(_raw_cmp)(const _cx_raw* rx, const _cx_raw* ry)
     { return i_cmp(rx, ry); }
 
-STC_INLINE int _cx_memb(_cmp)(const _cx_self* x, const _cx_self* y) {
-    _cx_raw rx = i_keyto(x->get), ry = i_keyto(y->get);
+STC_INLINE int _cx_memb(_cmp)(const _cx_self* self, const _cx_self* other) {
+    _cx_raw rx = i_keyto(self->get), ry = i_keyto(other->get);
     return i_cmp((&rx), (&ry));
 }
 #endif
@@ -187,24 +187,24 @@ STC_INLINE int _cx_memb(_cmp)(const _cx_self* x, const _cx_self* y) {
 STC_INLINE bool _cx_memb(_raw_eq)(const _cx_raw* rx, const _cx_raw* ry)
     { return i_eq(rx, ry); }
 
-STC_INLINE bool _cx_memb(_eq)(const _cx_self* x, const _cx_self* y) {
-    _cx_raw rx = i_keyto(x->get), ry = i_keyto(y->get);
+STC_INLINE bool _cx_memb(_eq)(const _cx_self* self, const _cx_self* other) {
+    _cx_raw rx = i_keyto(self->get), ry = i_keyto(other->get);
     return i_eq((&rx), (&ry));
 }
 #elif !defined i_no_cmp
 STC_INLINE bool _cx_memb(_raw_eq)(const _cx_raw* rx, const _cx_raw* ry)
     { return i_cmp(rx, ry) == 0; }
 
-STC_INLINE bool _cx_memb(_eq)(const _cx_self* x, const _cx_self* y)
-    { return _cx_memb(_cmp)(x, y) == 0; }
+STC_INLINE bool _cx_memb(_eq)(const _cx_self* self, const _cx_self* other)
+    { return _cx_memb(_cmp)(self, other) == 0; }
 #endif
 
 #ifndef i_no_hash
 STC_INLINE uint64_t _cx_memb(_raw_hash)(const _cx_raw* rx)
     { return i_hash(rx); }
 
-STC_INLINE uint64_t _cx_memb(_hash)(const _cx_self* x)
-    { _cx_raw rx = i_keyto(x->get); return i_hash((&rx)); }
+STC_INLINE uint64_t _cx_memb(_hash)(const _cx_self* self)
+    { _cx_raw rx = i_keyto(self->get); return i_hash((&rx)); }
 #endif
 
 #undef _i_eq
diff --git a/include/stc/cbox.h b/include/stc/cbox.h
index 641fcbfc..6cc86c6f 100644
--- a/include/stc/cbox.h
+++ b/include/stc/cbox.h
@@ -76,7 +76,7 @@ int main() {
 #include "priv/template.h"
 typedef i_keyraw _cx_raw;
 
-#if !c_option(c_is_forward)
+#ifndef i_is_forward
 _cx_deftypes(_c_cbox_types, _cx_self, i_key);
 #endif
 
@@ -163,8 +163,8 @@ STC_INLINE void _cx_memb(_assign)(_cx_self* self, _cx_self* moved) {
 STC_INLINE int _cx_memb(_raw_cmp)(const _cx_raw* rx, const _cx_raw* ry)
     { return i_cmp(rx, ry); }
 
-STC_INLINE int _cx_memb(_cmp)(const _cx_self* x, const _cx_self* y) {
-    _cx_raw rx = i_keyto(x->get), ry = i_keyto(y->get);
+STC_INLINE int _cx_memb(_cmp)(const _cx_self* self, const _cx_self* other) {
+    _cx_raw rx = i_keyto(self->get), ry = i_keyto(other->get);
     return i_cmp((&rx), (&ry));
 }
 #endif
@@ -173,24 +173,24 @@ STC_INLINE int _cx_memb(_cmp)(const _cx_self* x, const _cx_self* y) {
 STC_INLINE bool _cx_memb(_raw_eq)(const _cx_raw* rx, const _cx_raw* ry)
     { return i_eq(rx, ry); }
 
-STC_INLINE bool _cx_memb(_eq)(const _cx_self* x, const _cx_self* y) {
-    _cx_raw rx = i_keyto(x->get), ry = i_keyto(y->get);
+STC_INLINE bool _cx_memb(_eq)(const _cx_self* self, const _cx_self* other) {
+    _cx_raw rx = i_keyto(self->get), ry = i_keyto(other->get);
     return i_eq((&rx), (&ry));
 }
 #elif !defined i_no_cmp
 STC_INLINE bool _cx_memb(_raw_eq)(const _cx_raw* rx, const _cx_raw* ry)
     { return i_cmp(rx, ry) == 0; }
 
-STC_INLINE bool _cx_memb(_eq)(const _cx_self* x, const _cx_self* y)
-    { return _cx_memb(_cmp)(x, y) == 0; }
+STC_INLINE bool _cx_memb(_eq)(const _cx_self* self, const _cx_self* other)
+    { return _cx_memb(_cmp)(self, other) == 0; }
 #endif
 
 #ifndef i_no_hash
 STC_INLINE uint64_t _cx_memb(_raw_hash)(const _cx_raw* rx)
     { return i_hash(rx); }
 
-STC_INLINE uint64_t _cx_memb(_hash)(const _cx_self* x)
-    { _cx_raw rx = i_keyto(x->get); return i_hash((&rx)); }
+STC_INLINE uint64_t _cx_memb(_hash)(const _cx_self* self)
+    { _cx_raw rx = i_keyto(self->get); return i_hash((&rx)); }
 #endif
 
 #undef _i_eq
diff --git a/include/stc/cdeq.h b/include/stc/cdeq.h
index 09c0a7f8..a032722b 100644
--- a/include/stc/cdeq.h
+++ b/include/stc/cdeq.h
@@ -36,7 +36,7 @@
 #endif
 #include "priv/template.h"
 
-#if !c_option(c_is_forward)
+#ifndef i_is_forward
 _cx_deftypes(_c_cdeq_types, _cx_self, i_key);
 #endif
 typedef i_keyraw _cx_raw;
@@ -196,10 +196,10 @@ _cx_memb(_get_mut)(_cx_self* self, _cx_raw raw)
     { return (_cx_value *) _cx_memb(_get)(self, raw); }
 
 STC_INLINE bool
-_cx_memb(_eq)(const _cx_self* x, const _cx_self* y) {
-    if (x->_len != y->_len) return false;
-    for (intptr_t i = 0; i < x->_len; ++i) {
-        const _cx_raw _rx = i_keyto(x->data+i), _ry = i_keyto(y->data+i);
+_cx_memb(_eq)(const _cx_self* self, const _cx_self* other) {
+    if (self->_len != other->_len) return false;
+    for (intptr_t i = 0; i < self->_len; ++i) {
+        const _cx_raw _rx = i_keyto(self->data+i), _ry = i_keyto(other->data+i);
         if (!(i_eq((&_rx), (&_ry)))) return false;
     }
     return true;
diff --git a/include/stc/clist.h b/include/stc/clist.h
index fa26fd65..ca02ae3c 100644
--- a/include/stc/clist.h
+++ b/include/stc/clist.h
@@ -82,7 +82,7 @@
 #endif
 #include "priv/template.h"
 
-#if !c_option(c_is_forward)
+#ifndef i_is_forward
   _cx_deftypes(_c_clist_types, _cx_self, i_key);
 #endif
 _cx_deftypes(_c_clist_complete_types, _cx_self, dummy);
@@ -204,8 +204,8 @@ _cx_memb(_get_mut)(_cx_self* self, _cx_raw val) {
     return _cx_memb(_find_in)(_cx_memb(_begin)(self), _cx_memb(_end)(self), val).ref;
 }
 
-STC_INLINE bool _cx_memb(_eq)(const _cx_self* x, const _cx_self* y) {
-    _cx_iter i = _cx_memb(_begin)(x), j = _cx_memb(_begin)(y);
+STC_INLINE bool _cx_memb(_eq)(const _cx_self* self, const _cx_self* other) {
+    _cx_iter i = _cx_memb(_begin)(self), j = _cx_memb(_begin)(other);
     for (; i.ref && j.ref; _cx_memb(_next)(&i), _cx_memb(_next)(&j)) {
         const _cx_raw _rx = i_keyto(i.ref), _ry = i_keyto(j.ref);
         if (!(i_eq((&_rx), (&_ry)))) return false;
diff --git a/include/stc/cmap.h b/include/stc/cmap.h
index c840523f..437a5982 100644
--- a/include/stc/cmap.h
+++ b/include/stc/cmap.h
@@ -82,7 +82,7 @@ typedef struct { int64_t idx; uint8_t hx; } chash_bucket_t;
   #define _i_size i_ssize
 #endif
 #include "priv/template.h"
-#if !c_option(c_is_forward)
+#ifndef i_is_forward
   _cx_deftypes(_c_chash_types, _cx_self, i_key, i_val, i_ssize, _i_MAP_ONLY, _i_SET_ONLY);
 #endif
 
@@ -277,11 +277,11 @@ _cx_memb(_erase_at)(_cx_self* self, _cx_iter it) {
 }
 
 STC_INLINE bool
-_cx_memb(_eq)(const _cx_self* m1, const _cx_self* m2) {
-    if (_cx_memb(_size)(m1) != _cx_memb(_size)(m2)) return false;
-    for (_cx_iter i = _cx_memb(_begin)(m1); i.ref; _cx_memb(_next)(&i)) {
+_cx_memb(_eq)(const _cx_self* self, const _cx_self* other) {
+    if (_cx_memb(_size)(self) != _cx_memb(_size)(other)) return false;
+    for (_cx_iter i = _cx_memb(_begin)(self); i.ref; _cx_memb(_next)(&i)) {
         const _cx_rawkey _raw = i_keyto(_i_keyref(i.ref));
-        if (!_cx_memb(_contains)(m2, _raw)) return false;
+        if (!_cx_memb(_contains)(other, _raw)) return false;
     }
     return true;
 }
diff --git a/include/stc/cpque.h b/include/stc/cpque.h
index 00eaa49e..f3ca7081 100644
--- a/include/stc/cpque.h
+++ b/include/stc/cpque.h
@@ -32,7 +32,7 @@
 #endif
 
 #include "priv/template.h"
-#if !c_option(c_is_forward)
+#ifndef i_is_forward
   _cx_deftypes(_c_cpque_types, _cx_self, i_key);
 #endif
 typedef i_keyraw _cx_raw;
diff --git a/include/stc/csmap.h b/include/stc/csmap.h
index 50593ba3..d0a877c4 100644
--- a/include/stc/csmap.h
+++ b/include/stc/csmap.h
@@ -80,7 +80,7 @@ int main(void) {
   #define _i_size i_ssize
 #endif
 #include "priv/template.h"
-#if !c_option(c_is_forward)
+#ifndef i_is_forward
   _cx_deftypes(_c_aatree_types, _cx_self, i_key, i_val, i_ssize, _i_MAP_ONLY, _i_SET_ONLY);
 #endif
 
diff --git a/include/stc/cstack.h b/include/stc/cstack.h
index f0c930e5..0f855dc9 100644
--- a/include/stc/cstack.h
+++ b/include/stc/cstack.h
@@ -33,7 +33,7 @@
 #endif
 #include "priv/template.h"
 
-#if !c_option(c_is_forward)
+#ifndef i_is_forward
 #ifdef i_capacity
   #define i_no_clone
   _cx_deftypes(_c_cstack_fixed, _cx_self, i_key, i_capacity);
diff --git a/include/stc/cvec.h b/include/stc/cvec.h
index 8f35e5fc..4fe5ddab 100644
--- a/include/stc/cvec.h
+++ b/include/stc/cvec.h
@@ -39,7 +39,7 @@ struct MyStruct {
 #include <stc/cvec.h>
 
 #define i_key int
-#define i_opt c_is_forward // forward declared
+#define i_is_forward // forward declared
 #define i_tag i32
 #include <stc/cvec.h>
 
@@ -73,7 +73,7 @@ int main() {
 #endif
 #include "priv/template.h"
 
-#if !c_option(c_is_forward)
+#ifndef i_is_forward
    _cx_deftypes(_c_cvec_types, _cx_self, i_key);
 #endif
 typedef i_keyraw _cx_raw;
@@ -234,10 +234,10 @@ _cx_memb(_get_mut)(const _cx_self* self, _cx_raw raw)
     { return (_cx_value*) _cx_memb(_get)(self, raw); }
 
 STC_INLINE bool
-_cx_memb(_eq)(const _cx_self* x, const _cx_self* y) {
-    if (x->_len != y->_len) return false;
-    for (intptr_t i = 0; i < x->_len; ++i) {
-        const _cx_raw _rx = i_keyto(x->data+i), _ry = i_keyto(y->data+i);
+_cx_memb(_eq)(const _cx_self* self, const _cx_self* other) {
+    if (self->_len != other->_len) return false;
+    for (intptr_t i = 0; i < self->_len; ++i) {
+        const _cx_raw _rx = i_keyto(self->data+i), _ry = i_keyto(other->data+i);
         if (!(i_eq((&_rx), (&_ry)))) return false;
     }
     return true;
diff --git a/include/stc/extend.h b/include/stc/extend.h
new file mode 100644
index 00000000..a3efe02d
--- /dev/null
+++ b/include/stc/extend.h
@@ -0,0 +1,65 @@
+/* MIT License
+ *
+ * Copyright (c) 2023 Tyge Løvset
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include <stc/ccommon.h>
+#include <stc/forward.h>
+
+#ifdef i_key_str
+  #define _i_key cstr
+#elif defined i_keyclass
+  #define _i_key i_keyclass
+#elif defined i_keyboxed
+  #define _i_key i_keyboxed
+#elif defined i_key
+  #define _i_key i_key
+#endif
+
+#ifdef i_val_str
+  #define _i_val cstr
+#elif defined i_valclass
+  #define _i_val i_valclass
+#elif defined i_valboxed
+  #define _i_val i_valboxed
+#elif defined i_val
+  #define _i_val i_val
+#endif
+
+#ifdef _i_key
+  c_PASTE(forward_, i_con)(i_type, _i_key, _i_val);
+#else
+  c_PASTE(forward_, i_con)(i_type, _i_val);
+#endif
+
+typedef struct {
+    i_ext;
+    i_type get;
+} c_PASTE(i_type, Ext);
+
+#define c_getcon(cptr) c_container_of(cptr, _cx_memb(Ext), get)
+
+#define i_is_forward
+#define _i_inc <stc/i_con.h>
+#include _i_inc
+#undef _i_inc
+#undef _i_key
+#undef _i_val
+#undef i_con
\ No newline at end of file
diff --git a/include/stc/priv/template.h b/include/stc/priv/template.h
index e352f488..d9e38dba 100644
--- a/include/stc/priv/template.h
+++ b/include/stc/priv/template.h
@@ -96,6 +96,9 @@
   #endif
 #endif
 
+#if c_option(c_is_forward)
+  #define i_is_forward
+#endif
 #if c_option(c_no_cmp)
   #define i_no_cmp
 #endif
@@ -341,6 +344,7 @@
 #undef i_no_hash
 #undef i_no_clone
 #undef i_no_emplace
+#undef i_is_forward
 
 #undef _i_prefix
 #undef _i_expandby
diff --git a/misc/examples/functor.c b/misc/examples/functor.c
index f8074c3a..45158cd1 100644
--- a/misc/examples/functor.c
+++ b/misc/examples/functor.c
@@ -6,35 +6,24 @@
 //       i_hash/i_eq: has self for cmap and cset types only
 
 #include <stdio.h>
-#include <stdbool.h>
-#include <stc/forward.h>
-#include <stc/algo/crange.h>
-#include <stc/cstr.h>
 
-// predeclare
-forward_cpque(ipque, int);
-
-struct {
-    ipque Q;
-    bool (*less)(const int*, const int*);
-} typedef IPQueue;
-
-
-#define i_type ipque
+#define i_type IPQue
 #define i_val int
-#define i_opt c_is_forward // needed to avoid re-type-define container type
-#define i_less(x, y) c_container_of(self, IPQueue, Q)->less(x, y)
-#include <stc/cpque.h>
+#define i_ext bool (*less)(const int*, const int*)
+#define i_less(x, y) c_getcon(self)->less(x, y)
+#define i_con cpque
+#include <stc/extend.h>
 
-void print_queue(const char* name, IPQueue q) {
+void print_queue(const char* name, IPQueExt q) {
     // NB: make a clone because there is no way to traverse
     // priority_queue's content without erasing the queue.
-    IPQueue copy = {ipque_clone(q.Q), q.less};
+    IPQueExt copy = {q.less, IPQue_clone(q.get)};
     
-    for (printf("%s: \t", name); !ipque_empty(&copy.Q); ipque_pop(&copy.Q))
-        printf("%d ", *ipque_top(&copy.Q));
+    for (printf("%s: \t", name); !IPQue_empty(&copy.get); IPQue_pop(&copy.get))
+        printf("%d ", *IPQue_top(&copy.get));
     puts("");
-    ipque_drop(&copy.Q);
+
+    IPQue_drop(&copy.get);
 }
 
 static bool int_less(const int* x, const int* y) { return *x < *y; }
@@ -49,21 +38,21 @@ int main()
         printf("%d ", data[i]);
     puts("");
 
-    IPQueue q1 = {ipque_init(), int_less};       // Max priority queue
-    IPQueue minq1 = {ipque_init(), int_greater}; // Min priority queue
-    IPQueue q5 = {ipque_init(), int_lambda};     // Using lambda to compare elements.
+    IPQueExt q1 = {int_less};       // Max priority queue
+    IPQueExt minq1 = {int_greater}; // Min priority queue
+    IPQueExt q5 = {int_lambda};     // Using lambda to compare elements.
 
     c_forrange (i, n)
-        ipque_push(&q1.Q, data[i]);
+        IPQue_push(&q1.get, data[i]);
     print_queue("q1", q1);
 
     c_forrange (i, n)
-        ipque_push(&minq1.Q, data[i]);
+        IPQue_push(&minq1.get, data[i]);
     print_queue("minq1", minq1);
 
     c_forrange (i, n)
-        ipque_push(&q5.Q, data[i]);
+        IPQue_push(&q5.get, data[i]);
     print_queue("q5", q5);
 
-    c_drop(ipque, &q1.Q, &minq1.Q, &q5.Q);
+    c_drop(IPQue, &q1.get, &minq1.get, &q5.get);
 }
diff --git a/misc/examples/new_list.c b/misc/examples/new_list.c
index eae4b8f5..8b291d34 100644
--- a/misc/examples/new_list.c
+++ b/misc/examples/new_list.c
@@ -11,7 +11,7 @@ typedef struct {
 
 #define i_val int
 #define i_tag i32
-#define i_opt c_is_forward
+#define i_is_forward
 #include <stc/clist.h>
 
 typedef struct Point { int x, y; } Point;
@@ -22,7 +22,7 @@ int point_cmp(const Point* a, const Point* b) {
 
 #define i_val Point
 #define i_cmp point_cmp
-#define i_opt c_is_forward
+#define i_is_forward
 #define i_tag pnt
 #include <stc/clist.h>
 
diff --git a/misc/examples/new_map.c b/misc/examples/new_map.c
index 4b02c46a..3a4f934d 100644
--- a/misc/examples/new_map.c
+++ b/misc/examples/new_map.c
@@ -26,7 +26,7 @@ int point_cmp(const Point* a, const Point* b) {
 #define i_val int
 #define i_cmp point_cmp
 #define i_hash c_default_hash
-#define i_opt c_is_forward
+#define i_is_forward
 #define i_tag pnt
 #include <stc/cmap.h>
 
diff --git a/misc/examples/new_queue.c b/misc/examples/new_queue.c
index 044e44cb..916f4dbc 100644
--- a/misc/examples/new_queue.c
+++ b/misc/examples/new_queue.c
@@ -12,7 +12,7 @@ int point_cmp(const Point* a, const Point* b) {
 }
 #define i_val Point
 #define i_cmp point_cmp
-#define i_opt c_is_forward
+#define i_is_forward
 #define i_tag pnt
 #include <stc/cqueue.h>
 
diff --git a/misc/examples/new_smap.c b/misc/examples/new_smap.c
index d85d5c75..d8245b8b 100644
--- a/misc/examples/new_smap.c
+++ b/misc/examples/new_smap.c
@@ -20,7 +20,7 @@ int point_cmp(const Point* a, const Point* b) {
 #define i_key Point
 #define i_val int
 #define i_cmp point_cmp
-#define i_opt c_is_forward
+#define i_is_forward
 #include <stc/csmap.h>
 
 // cstr => cstr map
diff --git a/misc/examples/new_vec.c b/misc/examples/new_vec.c
index 988b78d9..df443b7f 100644
--- a/misc/examples/new_vec.c
+++ b/misc/examples/new_vec.c
@@ -10,7 +10,7 @@ struct MyStruct {
 } typedef MyStruct;
 
 #define i_val int
-#define i_opt c_is_forward
+#define i_is_forward
 #define i_tag i32
 #include <stc/cvec.h>
 
@@ -18,7 +18,7 @@ typedef struct Point { int x, y; } Point;
 
 #define i_val Point
 #define i_less(a, b) a->x < b->x || (a->x == b->x && a->y < b->y)
-#define i_opt c_is_forward
+#define i_is_forward
 #define i_tag pnt
 #include <stc/cvec.h>
 
-- 
cgit v1.2.3


From a3dc31d5393d051ad4dacb314452d3c6ec8a74b7 Mon Sep 17 00:00:00 2001
From: Tyge Løvset <tylo@norceresearch.no>
Date: Mon, 3 Apr 2023 12:43:50 +0200
Subject: Split priv/template.h in two files to make mksingle.sh work.

---
 include/stc/algo/csort.h      |  6 ++--
 include/stc/carc.h            |  2 +-
 include/stc/cbox.h            |  2 +-
 include/stc/cdeq.h            |  2 +-
 include/stc/clist.h           |  2 +-
 include/stc/cmap.h            |  2 +-
 include/stc/cpque.h           |  2 +-
 include/stc/csmap.h           |  6 +---
 include/stc/cstack.h          |  2 +-
 include/stc/cvec.h            |  2 +-
 include/stc/priv/altnames.h   |  3 --
 include/stc/priv/template.h   | 64 ++---------------------------------
 include/stc/priv/untemplate.h | 78 +++++++++++++++++++++++++++++++++++++++++++
 misc/examples/forfilter.c     | 16 ++++-----
 14 files changed, 99 insertions(+), 90 deletions(-)
 create mode 100644 include/stc/priv/untemplate.h

(limited to 'include/stc/csmap.h')

diff --git a/include/stc/algo/csort.h b/include/stc/algo/csort.h
index c452064f..02ac4e34 100644
--- a/include/stc/algo/csort.h
+++ b/include/stc/algo/csort.h
@@ -20,8 +20,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include <stc/ccommon.h>
-#include <stc/priv/template.h>
+#include "../ccommon.h"
+#include "../priv/template.h"
 
 /* Generic Quicksort in C, performs as fast as c++ std::sort().
 template params:
@@ -86,4 +86,4 @@ static inline void c_PASTE(cqsort_, i_tag)(i_val arr[], intptr_t lo, intptr_t hi
 static inline void c_PASTE(csort_, i_tag)(i_val arr[], intptr_t n)
     { c_PASTE(cqsort_, i_tag)(arr, 0, n - 1); }
 
-#include <stc/priv/template.h>
+#include "../priv/untemplate.h"
diff --git a/include/stc/carc.h b/include/stc/carc.h
index 5d38d2e7..16d3a2d4 100644
--- a/include/stc/carc.h
+++ b/include/stc/carc.h
@@ -210,4 +210,4 @@ STC_INLINE uint64_t _cx_memb(_hash)(const _cx_self* self)
 #undef _i_eq
 #undef _i_atomic_inc
 #undef _i_atomic_dec_and_test
-#include "priv/template.h"
+#include "priv/untemplate.h"
diff --git a/include/stc/cbox.h b/include/stc/cbox.h
index 6cc86c6f..4d2cb1f1 100644
--- a/include/stc/cbox.h
+++ b/include/stc/cbox.h
@@ -194,4 +194,4 @@ STC_INLINE uint64_t _cx_memb(_hash)(const _cx_self* self)
 #endif
 
 #undef _i_eq
-#include "priv/template.h"
+#include "priv/untemplate.h"
diff --git a/include/stc/cdeq.h b/include/stc/cdeq.h
index a032722b..ef1700f5 100644
--- a/include/stc/cdeq.h
+++ b/include/stc/cdeq.h
@@ -442,5 +442,5 @@ _cx_memb(_value_cmp)(const _cx_value* x, const _cx_value* y) {
 #endif // !c_no_cmp
 #endif // !_i_queue
 #endif // IMPLEMENTATION
-#include "priv/template.h"
 #define CDEQ_H_INCLUDED
+#include "priv/untemplate.h"
diff --git a/include/stc/clist.h b/include/stc/clist.h
index ca02ae3c..6e6b6d45 100644
--- a/include/stc/clist.h
+++ b/include/stc/clist.h
@@ -404,4 +404,4 @@ STC_DEF bool _cx_memb(_sort_with)(_cx_self* self, int(*cmp)(const _cx_value*, co
 #endif // !c_no_cmp
 #endif // i_implement
 #define CLIST_H_INCLUDED
-#include "priv/template.h"
+#include "priv/untemplate.h"
diff --git a/include/stc/cmap.h b/include/stc/cmap.h
index 437a5982..1976738d 100644
--- a/include/stc/cmap.h
+++ b/include/stc/cmap.h
@@ -481,4 +481,4 @@ _cx_memb(_erase_entry)(_cx_self* self, _cx_value* _val) {
 #undef _i_MAP_ONLY
 #undef _i_SET_ONLY
 #define CMAP_H_INCLUDED
-#include "priv/template.h"
+#include "priv/untemplate.h"
diff --git a/include/stc/cpque.h b/include/stc/cpque.h
index f3ca7081..023c9d27 100644
--- a/include/stc/cpque.h
+++ b/include/stc/cpque.h
@@ -160,4 +160,4 @@ _cx_memb(_push)(_cx_self* self, _cx_value value) {
 
 #endif
 #define CPQUE_H_INCLUDED
-#include "priv/template.h"
+#include "priv/untemplate.h"
diff --git a/include/stc/csmap.h b/include/stc/csmap.h
index d0a877c4..716c1bfe 100644
--- a/include/stc/csmap.h
+++ b/include/stc/csmap.h
@@ -48,9 +48,6 @@ int main(void) {
     csmap_sx_drop(&m);
 }
 */
-#ifdef STC_CSMAP_V1
-#include "alt/csmap.h"
-#else
 #include "ccommon.h"
 
 #ifndef CSMAP_H_INCLUDED
@@ -598,5 +595,4 @@ _cx_memb(_drop)(_cx_self* self) {
 #undef _i_MAP_ONLY
 #undef _i_SET_ONLY
 #define CSMAP_H_INCLUDED
-#include "priv/template.h"
-#endif // !STC_CSMAP_V1
+#include "priv/untemplate.h"
diff --git a/include/stc/cstack.h b/include/stc/cstack.h
index 0f855dc9..1fc3f377 100644
--- a/include/stc/cstack.h
+++ b/include/stc/cstack.h
@@ -189,4 +189,4 @@ STC_INLINE void _cx_memb(_next)(_cx_iter* it)
 STC_INLINE _cx_iter _cx_memb(_advance)(_cx_iter it, size_t n)
     { if ((it.ref += n) >= it.end) it.ref = NULL ; return it; }
 
-#include "priv/template.h"
+#include "priv/untemplate.h"
diff --git a/include/stc/cvec.h b/include/stc/cvec.h
index 4fe5ddab..e257f85a 100644
--- a/include/stc/cvec.h
+++ b/include/stc/cvec.h
@@ -438,4 +438,4 @@ STC_DEF int _cx_memb(_value_cmp)(const _cx_value* x, const _cx_value* y) {
 #endif // !c_no_cmp
 #endif // i_implement
 #define CVEC_H_INCLUDED
-#include "priv/template.h"
+#include "priv/untemplate.h"
diff --git a/include/stc/priv/altnames.h b/include/stc/priv/altnames.h
index 8fa326f1..723b6a66 100644
--- a/include/stc/priv/altnames.h
+++ b/include/stc/priv/altnames.h
@@ -32,6 +32,3 @@
 #define c_WITH c_with
 #define c_SCOPE c_scope
 #define c_DEFER c_defer
-#define c_NEW c_new
-#define c_ARRAYLEN c_arraylen
-#define c_ARGSV c_SV // [deprecated]
diff --git a/include/stc/priv/template.h b/include/stc/priv/template.h
index 5ea0cf4f..250a3dda 100644
--- a/include/stc/priv/template.h
+++ b/include/stc/priv/template.h
@@ -20,7 +20,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef _i_template
+#ifdef _i_template
+  #error template.h already included
+#endif
 #define _i_template
 
 #ifndef STC_TEMPLATE_H_INCLUDED
@@ -290,63 +292,3 @@
 #ifndef _i_has_from
   #define i_no_emplace
 #endif
-
-#else // ============================================================
-
-#undef i_type
-#undef i_tag
-#undef i_imp
-#undef i_opt
-#undef i_less
-#undef i_cmp
-#undef i_eq
-#undef i_hash
-#undef i_rawclass
-#undef i_capacity
-#undef i_ssize
-
-#undef i_val
-#undef i_val_str
-#undef i_val_ssv
-#undef i_valboxed
-#undef i_valclass
-#undef i_valraw
-#undef i_valclone
-#undef i_valfrom
-#undef i_valto
-#undef i_valdrop
-
-#undef i_key
-#undef i_key_str
-#undef i_key_ssv
-#undef i_keyboxed
-#undef i_keyclass
-#undef i_keyraw
-#undef i_keyclone
-#undef i_keyfrom
-#undef i_keyto
-#undef i_keydrop
-
-#undef i_header
-#undef i_implement
-#undef i_static
-#undef i_extern
-
-#undef i_allocator
-#undef i_malloc
-#undef i_calloc
-#undef i_realloc
-#undef i_free
-
-#undef i_no_cmp
-#undef i_no_hash
-#undef i_no_clone
-#undef i_no_emplace
-#undef i_is_forward
-
-#undef _i_prefix
-#undef _i_expandby
-#undef _i_has_from
-#undef _i_has_eq
-#undef _i_template
-#endif
diff --git a/include/stc/priv/untemplate.h b/include/stc/priv/untemplate.h
new file mode 100644
index 00000000..27c6a890
--- /dev/null
+++ b/include/stc/priv/untemplate.h
@@ -0,0 +1,78 @@
+/* MIT License
+ *
+ * Copyright (c) 2023 Tyge Løvset
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#undef i_type
+#undef i_tag
+#undef i_imp
+#undef i_opt
+#undef i_less
+#undef i_cmp
+#undef i_eq
+#undef i_hash
+#undef i_rawclass
+#undef i_capacity
+#undef i_ssize
+
+#undef i_val
+#undef i_val_str
+#undef i_val_ssv
+#undef i_valboxed
+#undef i_valclass
+#undef i_valraw
+#undef i_valclone
+#undef i_valfrom
+#undef i_valto
+#undef i_valdrop
+
+#undef i_key
+#undef i_key_str
+#undef i_key_ssv
+#undef i_keyboxed
+#undef i_keyclass
+#undef i_keyraw
+#undef i_keyclone
+#undef i_keyfrom
+#undef i_keyto
+#undef i_keydrop
+
+#undef i_header
+#undef i_implement
+#undef i_static
+#undef i_extern
+
+#undef i_allocator
+#undef i_malloc
+#undef i_calloc
+#undef i_realloc
+#undef i_free
+
+#undef i_no_cmp
+#undef i_no_hash
+#undef i_no_clone
+#undef i_no_emplace
+#undef i_is_forward
+
+#undef _i_prefix
+#undef _i_expandby
+#undef _i_has_from
+#undef _i_has_eq
+#undef _i_template
diff --git a/misc/examples/forfilter.c b/misc/examples/forfilter.c
index 0d72bd1b..daea68b9 100644
--- a/misc/examples/forfilter.c
+++ b/misc/examples/forfilter.c
@@ -9,10 +9,6 @@
 #define i_val int
 #include <stc/cstack.h>
 
-#define i_type SVec
-#define i_valclass csview
-#include <stc/cstack.h>
-
 // filters and transforms:
 #define flt_skipValue(i, x) (*i.ref != (x))
 #define flt_isEven(i) ((*i.ref & 1) == 0)
@@ -55,11 +51,9 @@ fn main() {
     println!("{:?}", vector);     // Print result
 }
 */
-
 void demo2(void)
 {
     IVec vector = {0};
-
     c_forfilter (x, crange, crange_object(INT64_MAX),
         c_flt_skipwhile(x, *x.ref != 11) &&
         (*x.ref % 2) != 0                &&
@@ -67,11 +61,9 @@ void demo2(void)
     ){
         IVec_push(&vector, (int)(*x.ref * *x.ref));
     }
+    c_foreach (x, IVec, vector) printf(" %d", *x.ref);
 
-    c_foreach (x, IVec, vector)
-        printf(" %d", *x.ref);
     puts("");
-
     IVec_drop(&vector);
 }
 
@@ -88,6 +80,10 @@ fn main() {
     println!("{:?}", words_containing_i);
 }
 */
+#define i_type SVec
+#define i_valclass csview
+#include <stc/cstack.h>
+
 void demo3(void)
 {
     const char* sentence = "This is a sentence in C99.";
@@ -102,8 +98,8 @@ void demo3(void)
 
     c_foreach (w, SVec, words_containing_i)
         printf(" %.*s", c_SV(*w.ref));
-    puts("");
 
+    puts("");
     c_drop(SVec, &words, &words_containing_i);
 }
 
-- 
cgit v1.2.3


From 2ad41420a973a3f1bd1ca47ab0f61b8f59ab9e66 Mon Sep 17 00:00:00 2001
From: Tyge Løvset <tylo@norceresearch.no>
Date: Wed, 5 Apr 2023 14:44:31 +0200
Subject: Internal: renamed untemplate.h to template2.h

---
 include/c11/print.h           | 31 +++++++++--------
 include/stc/algo/csort.h      |  2 +-
 include/stc/carc.h            |  2 +-
 include/stc/cbox.h            |  2 +-
 include/stc/cdeq.h            |  2 +-
 include/stc/clist.h           |  2 +-
 include/stc/cmap.h            |  2 +-
 include/stc/cpque.h           |  2 +-
 include/stc/csmap.h           |  2 +-
 include/stc/cstack.h          |  2 +-
 include/stc/cvec.h            |  2 +-
 include/stc/priv/template2.h  | 78 +++++++++++++++++++++++++++++++++++++++++++
 include/stc/priv/untemplate.h | 78 -------------------------------------------
 misc/examples/triples.c       | 10 +++---
 14 files changed, 110 insertions(+), 107 deletions(-)
 create mode 100644 include/stc/priv/template2.h
 delete mode 100644 include/stc/priv/untemplate.h

(limited to 'include/stc/csmap.h')

diff --git a/include/c11/print.h b/include/c11/print.h
index 1302d9cc..7c155875 100644
--- a/include/c11/print.h
+++ b/include/c11/print.h
@@ -1,7 +1,10 @@
 #ifndef FMT_H_INCLUDED
 #define FMT_H_INCLUDED
 /* 
-VER 2.0: NEW API:
+VER 2.1: NEW API:
+void        print(fmt, ...);
+void        println(fmt, ...);
+void        printd(dest, fmt, ...);
 
 void        fmt_print(fmt, ...);
 void        fmt_println(fmt, ...);
@@ -40,21 +43,21 @@ int main() {
     unsigned char r = 123, g = 214, b = 90, w = 110;
     char buffer[64];
 
-    fmt_print("Color: ({} {} {}), {}\n", r, g, b, flag);
-    fmt_println("Wide: {}, {}", wstr, L"wide world");
-    fmt_println("{:10} {:10} {:10.2f}", 42ull, 43, pi);
-    fmt_println("{:>10} {:>10} {:>10}", z, z, w);
-    fmt_printd(stdout, "{:10} {:10} {:10}\n", "Hello", "Mad", "World");
-    fmt_printd(stderr, "100%: {:<20} {:.*} {}\n", string, 4, pi, x);
-    fmt_printd(buffer, "Precision: {} {:.10} {}", string, pi, x);
-    fmt_println("{}", buffer);
-    fmt_println("Vector: ({}, {}, {})", 3.2, 3.3, pi);
+    print("Color: ({} {} {}), {}\n", r, g, b, flag);
+    println("Wide: {}, {}", wstr, L"wide world");
+    println("{:10} {:10} {:10.2f}", 42ull, 43, pi);
+    println("{:>10} {:>10} {:>10}", z, z, w);
+    printd(stdout, "{:10} {:10} {:10}\n", "Hello", "Mad", "World");
+    printd(stderr, "100%: {:<20} {:.*} {}\n", string, 4, pi, x);
+    printd(buffer, "Precision: {} {:.10} {}", string, pi, x);
+    println("{}", buffer);
+    println("Vector: ({}, {}, {})", 3.2, 3.3, pi);
 
     fmt_buffer out[1] = {{.stream=1}};
-    fmt_printd(out, "{} {}", "Pi is:", pi);
-    fmt_print("{}, len={}, cap={}\n", out->data, out->len, out->cap);
-    fmt_printd(out, "{} {}", ", Pi squared is:", pi*pi);
-    fmt_print("{}, len={}, cap={}\n", out->data, out->len, out->cap);
+    printd(out, "{} {}", "Pi is:", pi);
+    print("{}, len={}, cap={}\n", out->data, out->len, out->cap);
+    printd(out, "{} {}", ", Pi squared is:", pi*pi);
+    print("{}, len={}, cap={}\n", out->data, out->len, out->cap);
     fmt_destroy(out);
 }
 */
diff --git a/include/stc/algo/csort.h b/include/stc/algo/csort.h
index 02ac4e34..53fe9fcc 100644
--- a/include/stc/algo/csort.h
+++ b/include/stc/algo/csort.h
@@ -86,4 +86,4 @@ static inline void c_PASTE(cqsort_, i_tag)(i_val arr[], intptr_t lo, intptr_t hi
 static inline void c_PASTE(csort_, i_tag)(i_val arr[], intptr_t n)
     { c_PASTE(cqsort_, i_tag)(arr, 0, n - 1); }
 
-#include "../priv/untemplate.h"
+#include "../priv/template2.h"
diff --git a/include/stc/carc.h b/include/stc/carc.h
index 16d3a2d4..8ef80b12 100644
--- a/include/stc/carc.h
+++ b/include/stc/carc.h
@@ -210,4 +210,4 @@ STC_INLINE uint64_t _cx_memb(_hash)(const _cx_self* self)
 #undef _i_eq
 #undef _i_atomic_inc
 #undef _i_atomic_dec_and_test
-#include "priv/untemplate.h"
+#include "priv/template2.h"
diff --git a/include/stc/cbox.h b/include/stc/cbox.h
index 4d2cb1f1..ca88fc66 100644
--- a/include/stc/cbox.h
+++ b/include/stc/cbox.h
@@ -194,4 +194,4 @@ STC_INLINE uint64_t _cx_memb(_hash)(const _cx_self* self)
 #endif
 
 #undef _i_eq
-#include "priv/untemplate.h"
+#include "priv/template2.h"
diff --git a/include/stc/cdeq.h b/include/stc/cdeq.h
index ef1700f5..ff6e744f 100644
--- a/include/stc/cdeq.h
+++ b/include/stc/cdeq.h
@@ -443,4 +443,4 @@ _cx_memb(_value_cmp)(const _cx_value* x, const _cx_value* y) {
 #endif // !_i_queue
 #endif // IMPLEMENTATION
 #define CDEQ_H_INCLUDED
-#include "priv/untemplate.h"
+#include "priv/template2.h"
diff --git a/include/stc/clist.h b/include/stc/clist.h
index 6e6b6d45..f7fb4152 100644
--- a/include/stc/clist.h
+++ b/include/stc/clist.h
@@ -404,4 +404,4 @@ STC_DEF bool _cx_memb(_sort_with)(_cx_self* self, int(*cmp)(const _cx_value*, co
 #endif // !c_no_cmp
 #endif // i_implement
 #define CLIST_H_INCLUDED
-#include "priv/untemplate.h"
+#include "priv/template2.h"
diff --git a/include/stc/cmap.h b/include/stc/cmap.h
index 1976738d..9a503367 100644
--- a/include/stc/cmap.h
+++ b/include/stc/cmap.h
@@ -481,4 +481,4 @@ _cx_memb(_erase_entry)(_cx_self* self, _cx_value* _val) {
 #undef _i_MAP_ONLY
 #undef _i_SET_ONLY
 #define CMAP_H_INCLUDED
-#include "priv/untemplate.h"
+#include "priv/template2.h"
diff --git a/include/stc/cpque.h b/include/stc/cpque.h
index 023c9d27..b95b5020 100644
--- a/include/stc/cpque.h
+++ b/include/stc/cpque.h
@@ -160,4 +160,4 @@ _cx_memb(_push)(_cx_self* self, _cx_value value) {
 
 #endif
 #define CPQUE_H_INCLUDED
-#include "priv/untemplate.h"
+#include "priv/template2.h"
diff --git a/include/stc/csmap.h b/include/stc/csmap.h
index 716c1bfe..22607196 100644
--- a/include/stc/csmap.h
+++ b/include/stc/csmap.h
@@ -595,4 +595,4 @@ _cx_memb(_drop)(_cx_self* self) {
 #undef _i_MAP_ONLY
 #undef _i_SET_ONLY
 #define CSMAP_H_INCLUDED
-#include "priv/untemplate.h"
+#include "priv/template2.h"
diff --git a/include/stc/cstack.h b/include/stc/cstack.h
index 1fc3f377..c2792358 100644
--- a/include/stc/cstack.h
+++ b/include/stc/cstack.h
@@ -189,4 +189,4 @@ STC_INLINE void _cx_memb(_next)(_cx_iter* it)
 STC_INLINE _cx_iter _cx_memb(_advance)(_cx_iter it, size_t n)
     { if ((it.ref += n) >= it.end) it.ref = NULL ; return it; }
 
-#include "priv/untemplate.h"
+#include "priv/template2.h"
diff --git a/include/stc/cvec.h b/include/stc/cvec.h
index e257f85a..a1aa74b2 100644
--- a/include/stc/cvec.h
+++ b/include/stc/cvec.h
@@ -438,4 +438,4 @@ STC_DEF int _cx_memb(_value_cmp)(const _cx_value* x, const _cx_value* y) {
 #endif // !c_no_cmp
 #endif // i_implement
 #define CVEC_H_INCLUDED
-#include "priv/untemplate.h"
+#include "priv/template2.h"
diff --git a/include/stc/priv/template2.h b/include/stc/priv/template2.h
new file mode 100644
index 00000000..27c6a890
--- /dev/null
+++ b/include/stc/priv/template2.h
@@ -0,0 +1,78 @@
+/* MIT License
+ *
+ * Copyright (c) 2023 Tyge Løvset
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#undef i_type
+#undef i_tag
+#undef i_imp
+#undef i_opt
+#undef i_less
+#undef i_cmp
+#undef i_eq
+#undef i_hash
+#undef i_rawclass
+#undef i_capacity
+#undef i_ssize
+
+#undef i_val
+#undef i_val_str
+#undef i_val_ssv
+#undef i_valboxed
+#undef i_valclass
+#undef i_valraw
+#undef i_valclone
+#undef i_valfrom
+#undef i_valto
+#undef i_valdrop
+
+#undef i_key
+#undef i_key_str
+#undef i_key_ssv
+#undef i_keyboxed
+#undef i_keyclass
+#undef i_keyraw
+#undef i_keyclone
+#undef i_keyfrom
+#undef i_keyto
+#undef i_keydrop
+
+#undef i_header
+#undef i_implement
+#undef i_static
+#undef i_extern
+
+#undef i_allocator
+#undef i_malloc
+#undef i_calloc
+#undef i_realloc
+#undef i_free
+
+#undef i_no_cmp
+#undef i_no_hash
+#undef i_no_clone
+#undef i_no_emplace
+#undef i_is_forward
+
+#undef _i_prefix
+#undef _i_expandby
+#undef _i_has_from
+#undef _i_has_eq
+#undef _i_template
diff --git a/include/stc/priv/untemplate.h b/include/stc/priv/untemplate.h
deleted file mode 100644
index 27c6a890..00000000
--- a/include/stc/priv/untemplate.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* MIT License
- *
- * Copyright (c) 2023 Tyge Løvset
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#undef i_type
-#undef i_tag
-#undef i_imp
-#undef i_opt
-#undef i_less
-#undef i_cmp
-#undef i_eq
-#undef i_hash
-#undef i_rawclass
-#undef i_capacity
-#undef i_ssize
-
-#undef i_val
-#undef i_val_str
-#undef i_val_ssv
-#undef i_valboxed
-#undef i_valclass
-#undef i_valraw
-#undef i_valclone
-#undef i_valfrom
-#undef i_valto
-#undef i_valdrop
-
-#undef i_key
-#undef i_key_str
-#undef i_key_ssv
-#undef i_keyboxed
-#undef i_keyclass
-#undef i_keyraw
-#undef i_keyclone
-#undef i_keyfrom
-#undef i_keyto
-#undef i_keydrop
-
-#undef i_header
-#undef i_implement
-#undef i_static
-#undef i_extern
-
-#undef i_allocator
-#undef i_malloc
-#undef i_calloc
-#undef i_realloc
-#undef i_free
-
-#undef i_no_cmp
-#undef i_no_hash
-#undef i_no_clone
-#undef i_no_emplace
-#undef i_is_forward
-
-#undef _i_prefix
-#undef _i_expandby
-#undef _i_has_from
-#undef _i_has_eq
-#undef _i_template
diff --git a/misc/examples/triples.c b/misc/examples/triples.c
index aac7967a..520bf012 100644
--- a/misc/examples/triples.c
+++ b/misc/examples/triples.c
@@ -4,12 +4,12 @@
 #include <stdio.h>
 
 void triples_vanilla(int n) {
-    for (int i = 5, c = 1;; ++c) {
+    for (int c = 5; n; ++c) {
         for (int a = 1; a < c; ++a) {
             for (int b = a + 1; b < c; ++b) {
                 if ((int64_t)a*a + (int64_t)b*b == (int64_t)c*c) {
-                    if (i++ == n) goto done;
                     printf("{%d, %d, %d}\n", a, b, c);
+                    if (--n == 0) goto done;
                 }
             }
         }
@@ -25,12 +25,12 @@ struct triples {
 
 bool triples_next(struct triples* I) {
     cco_begin(I);
-        for (I->c = 5;; ++I->c) {
+        for (I->c = 5; I->n; ++I->c) {
             for (I->a = 1; I->a < I->c; ++I->a) {
                 for (I->b = I->a + 1; I->b < I->c; ++I->b) {
                     if ((int64_t)I->a*I->a + (int64_t)I->b*I->b == (int64_t)I->c*I->c) {
-                        if (I->n-- == 0) cco_return;
                         cco_yield(true);
+                        if (--I->n == 0) cco_return;
                     }
                 }
             }
@@ -61,7 +61,7 @@ int main()
     while (triples_next(&t)) {
         if (gcd(t.a, t.b) > 1)
             continue;
-        if (t.c < 1000)
+        if (t.c < 100)
             printf("%d: {%d, %d, %d}\n", ++n, t.a, t.b, t.c);
         else
             cco_stop(&t);
-- 
cgit v1.2.3