Simplified: Removed CONTAINER_input_t type, replaced with CONTAINER_rawvalue_t

16 files changed, 37 insertions, 49 deletions

diff --git a/docs/cdeq_api.md b/docs/cdeq_api.md
index 5ba9b356..701b5dc8 100644
--- a/docs/cdeq_api.md
+++ b/docs/cdeq_api.md
@@ -30,7 +30,6 @@ using_cdeq(str, cstr_t, cstr_compare_raw, cstr_del, cstr_from, cstr_to_raw, cons
 |:---------------------|:------------------------------------|:-----------------------|
 | `cdeq_X`             | `struct { cdeq_X_value_t* data; }`  | The cdeq type          |
 | `cdeq_X_value_t`     | `Value`                             | The cdeq value type    |
-| `cdeq_X_input_t`     | `cdeq_X_value_t`                    | The input type         |
 | `cdeq_X_rawvalue_t`  | `RawValue`                          | The raw value type     |
 | `cdeq_X_iter_t`      | `struct { cdeq_X_value_t* ref; }`   | The iterator type      |
 
diff --git a/docs/clist_api.md b/docs/clist_api.md
index 7badccbb..f0f85d1b 100644
--- a/docs/clist_api.md
+++ b/docs/clist_api.md
@@ -30,7 +30,6 @@ using_clist(str, cstr_t, cstr_compare_raw, cstr_del, cstr_from, cstr_to_raw, con
 |:----------------------|:------------------------------------|:--------------------------|
 | `clist_X`             | `struct { clist_X_node_t* last; }`  | The clist type            |
 | `clist_X_value_t`     | `Value`                             | The clist element type    |
-| `clist_X_input_t`     | `clist_X_value_t`                   | clist input type          |
 | `clist_X_rawvalue_t`  | `RawValue`                          | clist raw value type      |
 | `clist_X_iter_t`      | `struct { clist_value_t *ref; ... }`| clist iterator            |
 
@@ -62,7 +61,7 @@ size_t              clist_X_size(clist_X list); // note: O(n)
 clist_X_value_t*    clist_X_front(clist_X* self);
 clist_X_value_t*    clist_X_back(clist_X* self);
 
-void                clist_X_push_n(clist_X *self, const clist_X_input_t arr[], size_t size);
+void                clist_X_push_n(clist_X *self, const clist_X_rawvalue_t arr[], size_t size);
 void                clist_X_emplace_back(clist_X* self, RawValue ref);
 void                clist_X_push_back(clist_X* self, Value value);
 
diff --git a/docs/cmap_api.md b/docs/cmap_api.md
index 04395f3b..d3b85439 100644
--- a/docs/cmap_api.md
+++ b/docs/cmap_api.md
@@ -55,11 +55,11 @@ using_cmap(str, cstr_t, cstr_t, cstr_del,
 |:---------------------|:------------------------------------------------|:------------------------------|
 | `cmap_X`             | `struct { ... }`                                | The cmap type                 |
 | `cmap_X_rawkey_t`    | `RawKey`                                        | The raw key type              |
-| `cmap_X_rawval_t`    | `RawMapped`                                     | The raw mapped type           |
+| `cmap_X_rawmapped_t  | `RawMapped`                                     | The raw mapped type           |
 | `cmap_X_key_t`       | `Key`                                           | The key type                  |
 | `cmap_X_mapped_t`    | `Mapped`                                        | The mapped type               |
 | `cmap_X_value_t`     | `struct { Key first; Mapped second; }`          | The value type                |
-| `cmap_X_input_t`     | `struct { RawKey first; RawMapped second; }`    | RawKey + RawVal type          |
+| `cmap_X_rawvalue_t`  | `struct { RawKey first; RawMapped second; }`    | RawKey + RawVal type          |
 | `cmap_X_result_t`    | `struct { cmap_X_value_t first; bool second; }` | Result of insert/put/emplace  |
 | `cmap_X_iter_t`      | `struct { cmap_X_value_t *ref; ... }`           | Iterator type                 |
 
@@ -96,7 +96,7 @@ size_t              cmap_X_size(cmap_X m);
 size_t              cmap_X_bucket_count(cmap_X m);
 size_t              cmap_X_capacity(cmap_X m);
 
-void                cmap_X_push_n(cmap_X* self, const cmap_X_input_t arr[], size_t size);
+void                cmap_X_push_n(cmap_X* self, const cmap_X_rawvalue_t arr[], size_t size);
 
 cmap_X_result_t     cmap_X_emplace(cmap_X* self, RawKey rkey, RawMapped rmapped);
 cmap_X_result_t     cmap_X_insert(cmap_X* self, cmap_X_input_t rval);
diff --git a/docs/cpque_api.md b/docs/cpque_api.md
index ab9e8117..9ac48ec7 100644
--- a/docs/cpque_api.md
+++ b/docs/cpque_api.md
@@ -21,7 +21,6 @@ Declaring `using_cpque(my, cvec_my, >);`, `X` should be replaced by `my` in the
 |:---------------------|:--------------------------------------|:------------------------|
 | `cpque_X`            | `struct {cpque_X_value_t* data; ...}` | The cpque type          |
 | `cpque_X_value_t`    | Depends on underlying container type  | The cpque element type  |
-| `cpque_X_input_t`    |                   "                   | cpque input type        |
 | `cpque_X_rawvalue_t` |                   "                   | cpque raw value type    |
 
 ## Header file
diff --git a/docs/cqueue_api.md b/docs/cqueue_api.md
index 721b2069..f5fe3f21 100644
--- a/docs/cqueue_api.md
+++ b/docs/cqueue_api.md
@@ -20,7 +20,6 @@ will affect the names of all cqueue types and methods. E.g. declaring `using_cqu
 |:----------------------|:---------------------------------------|:-------------------------|
 | `cqueue_X`            | Depends on underlying container type   | The cqueue type          |
 | `cqueue_X_value_t`    |                   "                    | The cqueue element type  |
-| `cqueue_X_input_t`    |                   "                    | cqueue input type        |
 | `cqueue_X_rawvalue_t` |                   "                    | cqueue raw value type    |
 | `cqueue_X_iter_t`     |                   "                    | cqueue iterator          |
 
@@ -44,7 +43,7 @@ bool                    cqueue_X_empty(cqueue_X q);
 cqueue_X_value_t*       cqueue_X_front(cqueue_X* self);
 cqueue_X_value_t*       cqueue_X_back(cqueue_X* self);
 
-void                    cqueue_X_push_n(cqueue_X *self, const cqueue_X_input_t arr[], size_t size);
+void                    cqueue_X_push_n(cqueue_X *self, const cqueue_X_rawvalue_t arr[], size_t size);
 void                    cqueue_X_emplace(cqueue_X* self, cqueue_X_rawvalue_t raw);
 void                    cqueue_X_push(cqueue_X* self, cqueue_X_value_t value);
 void                    cqueue_X_pop(cqueue_X* self);
diff --git a/docs/cset_api.md b/docs/cset_api.md
index 70ca0d8c..31698a87 100644
--- a/docs/cset_api.md
+++ b/docs/cset_api.md
@@ -27,10 +27,10 @@ be replaced by `my` in all of the following documentation.
 |:---------------------|:--------------------------------------|:-------------------------|

 | `cset_X`             | `struct { ... }`                      | The cset type            |

 | `cset_X_rawkey_t`    | `RawKey`                              | The raw key type         |

+| `cset_X_rawvalue_t`  | `cset_X_rawkey_t`                     | The raw key type         |

 | `cset_X_key_t`       | `Key`                                 | The key type             |

-| `cset_X_value_t`     | `Key`                                 | The value type           |

+| `cset_X_value_t`     | `cset_X_key_t`                        | The value type           |

 | `cset_X_result_t`    | `struct { Key first; bool second; }`  | Result of insert/emplace |

-| `cset_X_input_t`     | `cset_X_rawkey_t`                     | The input type (rawkey)  |

 | `cset_X_iter_t`      | `struct { cset_X_value_t *ref; ... }` | Iterator type            |

 

 ## Constants and macros

@@ -65,7 +65,7 @@ size_t              cset_X_size(cset_X m);
 size_t              cset_X_bucket_count(cset_X m);

 size_t              cset_X_capacity(cset_X m);

 

-void                cset_X_push_n(cset_X* self, const cset_X_input_t in[], size_t size);

+void                cset_X_push_n(cset_X* self, const RawKey arr[], size_t size);

 

 cset_X_result_t     cset_X_emplace(cset_X* self, RawKey rkey);

 cset_X_result_t     cset_X_insert(cset_X* self, RawKey rkey);

diff --git a/docs/cstack_api.md b/docs/cstack_api.md
index 6da14d1e..1bf3fb7f 100644
--- a/docs/cstack_api.md
+++ b/docs/cstack_api.md
@@ -20,7 +20,6 @@ affect the names of all cstack types and methods. E.g. declaring `using_cstack(m
 |:----------------------|:---------------------------------------|:----------------------------|
 | `cstack_X`            | Depends on underlying container type   | The cstack type             |
 | `cstack_X_value_t`    |                   "                    | The cstack element type     |
-| `cstack_X_input_t`    |                   "                    | cstack input type           |
 | `cstack_X_rawvalue_t` |                   "                    | cstack raw value type       |
 | `cstack_X_iter_t`     |                   "                    | cstack iterator             |
 
@@ -43,7 +42,7 @@ size_t                  cstack_X_size(cstack_X st);
 bool                    cstack_X_empty(cstack_X st);
 cstack_X_value_t*       cstack_X_top(cstack_X* self);
 
-void                    cstack_X_push_n(cstack_X *self, const cstack_X_input_t arr[], size_t size);
+void                    cstack_X_push_n(cstack_X *self, const cstack_X_rawvalue_t arr[], size_t size);
 void                    cstack_X_emplace(cstack_X* self, cstack_X_rawvalue_t raw);
 void                    cstack_X_push(cstack_X* self, cstack_X_value_t value);
 void                    cstack_X_pop(cstack_X* self);
diff --git a/docs/cvec_api.md b/docs/cvec_api.md
index 2a79f3d7..9377f08c 100644
--- a/docs/cvec_api.md
+++ b/docs/cvec_api.md
@@ -30,7 +30,6 @@ using_cvec(str, cstr_t, cstr_compare_raw, cstr_del, cstr_from, cstr_to_raw, cons
 |:---------------------|:------------------------------------|:-----------------------|
 | `cvec_X`             | `struct { cvec_X_value_t* data; }`  | The cvec type          |
 | `cvec_X_value_t`     | `Value`                             | The cvec value type    |
-| `cvec_X_input_t`     | `cvec_X_value_t`                    | The input type         |
 | `cvec_X_rawvalue_t`  | `RawValue`                          | The raw value type     |
 | `cvec_X_iter_t`      | `struct { cvec_X_value_t* ref; }`   | The iterator type      |
 
@@ -71,7 +70,7 @@ cvec_X_value_t*     cvec_X_at(cvec_X* self, size_t idx);
 cvec_X_value_t*     cvec_X_front(cvec_X* self);
 cvec_X_value_t*     cvec_X_back(cvec_X* self);
 
-void                cvec_X_push_n(cvec_X *self, const cvec_X_input_t arr[], size_t size);
+void                cvec_X_push_n(cvec_X *self, const cvec_X_rawvalue_t arr[], size_t size);
 void                cvec_X_emplace_back(cvec_X* self, RawValue raw);
 void                cvec_X_push_back(cvec_X* self, Value value);
 void                cvec_X_pop_back(cvec_X* self);
diff --git a/stc/ccommon.h b/stc/ccommon.h
index aae3cdd2..856ffaf5 100644
--- a/stc/ccommon.h
+++ b/stc/ccommon.h
@@ -116,7 +116,7 @@
          b; b != __b ? c_free(b) : (void)0, b = NULL)

 

 #define c_push_items(self, ctype, ...) do { \

-    const ctype##_input_t __arr[] = __VA_ARGS__; \

+    const ctype##_rawvalue_t __arr[] = __VA_ARGS__; \

     ctype##_push_n(self, __arr, sizeof __arr/sizeof *__arr); \

 } while (0)

 

diff --git a/stc/cdeq.h b/stc/cdeq.h
index 4655cd0b..811b6b6c 100644
--- a/stc/cdeq.h
+++ b/stc/cdeq.h
@@ -42,7 +42,6 @@
 #define typedefs_cdeq(X, Value, RawValue) \

     typedef Value cdeq_##X##_value_t; \

     typedef RawValue cdeq_##X##_rawvalue_t; \

-    typedef cdeq_##X##_rawvalue_t cdeq_##X##_input_t; \

     typedef struct { cdeq_##X##_value_t *ref; } cdeq_##X##_iter_t; \

     typedef struct { \

         cdeq_##X##_value_t *base, *data; \

@@ -96,7 +95,7 @@
     } \

 \

     STC_API void \

-    cdeq_##X##_push_n(cdeq_##X *self, const cdeq_##X##_input_t arr[], size_t n); \

+    cdeq_##X##_push_n(cdeq_##X *self, const cdeq_##X##_rawvalue_t arr[], size_t n); \

     STC_API void \

     cdeq_##X##_push_back(cdeq_##X* self, Value value); \

     STC_INLINE void \

@@ -210,7 +209,7 @@
 #define _c_implement_cdeq_7(X, Value, valueCompareRaw, valueDestroy, valueFromRaw, valueToRaw, RawValue) \

 \

     STC_DEF void \

-    cdeq_##X##_push_n(cdeq_##X *self, const cdeq_##X##_input_t arr[], size_t n) { \

+    cdeq_##X##_push_n(cdeq_##X *self, const cdeq_##X##_rawvalue_t arr[], size_t n) { \

         _cdeq_##X##_expand(self, n, false); \

         cdeq_##X##_value_t* p = self->data + cdeq_##X##_size(*self); \

         for (size_t i=0; i < n; ++i) *p++ = valueFromRaw(arr[i]); \

diff --git a/stc/clist.h b/stc/clist.h
index e2374213..7a3a6397 100644
--- a/stc/clist.h
+++ b/stc/clist.h
@@ -88,7 +88,7 @@
 #define c_emplace_after(self, ctype, pos, ...) do { \

     ctype* __self = self; \

     ctype##_iter_t __pos = pos; \

-    const ctype##_input_t __arr[] = __VA_ARGS__; \

+    const ctype##_rawvalue_t __arr[] = __VA_ARGS__; \

     for (size_t __i=0; __i<sizeof __arr/sizeof *__arr; ++__i) \

         __pos = ctype##_emplace_after(__self, __pos, __arr[__i]); \

 } while (0)

@@ -102,7 +102,6 @@ STC_API size_t _clist_size(const clist_void* self);
 \

     using_clist_types(X, Value); \

     typedef RawValue clist_##X##_rawvalue_t; \

-    typedef clist_##X##_rawvalue_t clist_##X##_input_t; \

 \

     STC_INLINE clist_##X \

     clist_##X##_init(void) {clist_##X x = clist_inits; return x;} \

@@ -123,7 +122,7 @@ STC_API size_t _clist_size(const clist_void* self);
     clist_##X##_clear(clist_##X* self) {clist_##X##_del(self);} \

 \

     STC_API void \

-    clist_##X##_push_n(clist_##X *self, const clist_##X##_input_t in[], size_t size); \

+    clist_##X##_push_n(clist_##X *self, const clist_##X##_rawvalue_t arr[], size_t size); \

     STC_API void \

     clist_##X##_push_back(clist_##X* self, Value value); \

     STC_INLINE void \

@@ -237,8 +236,8 @@ STC_API size_t _clist_size(const clist_void* self);
         if (!self->last) self->last = entry; \

     } \

     STC_DEF void \

-    clist_##X##_push_n(clist_##X *self, const clist_##X##_input_t in[], size_t size) { \

-        for (size_t i=0; i<size; ++i) clist_##X##_push_back(self, valueFromRaw(in[i])); \

+    clist_##X##_push_n(clist_##X *self, const clist_##X##_rawvalue_t arr[], size_t size) { \

+        for (size_t i=0; i<size; ++i) clist_##X##_push_back(self, valueFromRaw(arr[i])); \

     } \

 \

     STC_DEF clist_##X##_iter_t \

diff --git a/stc/cmap.h b/stc/cmap.h
index 8e4775ca..1707fbf2 100644
--- a/stc/cmap.h
+++ b/stc/cmap.h
@@ -158,7 +158,7 @@ typedef struct {size_t idx; uint32_t hx;} cmap_bucket_t, cset_bucket_t;
     typedef Key ctype##_##X##_key_t; \

     typedef Mapped ctype##_##X##_mapped_t; \

     typedef RawKey ctype##_##X##_rawkey_t; \

-    typedef RawMapped ctype##_##X##_rawval_t; \

+    typedef RawMapped ctype##_##X##_rawmapped_t; \

 \

     typedef CSET_ONLY_##ctype( ctype##_##X##_key_t ) \

             CMAP_ONLY_##ctype( struct {ctype##_##X##_key_t first; \

@@ -172,8 +172,8 @@ typedef struct {size_t idx; uint32_t hx;} cmap_bucket_t, cset_bucket_t;
     } \

     typedef CSET_ONLY_##ctype( ctype##_##X##_rawkey_t ) \

             CMAP_ONLY_##ctype( struct {ctype##_##X##_rawkey_t first; \

-                                       ctype##_##X##_rawval_t second;} ) \

-    ctype##_##X##_input_t; \

+                                       ctype##_##X##_rawmapped_t second;} ) \

+    ctype##_##X##_rawvalue_t; \

 \

     typedef struct { \

         ctype##_##X##_value_t *first; \

@@ -222,7 +222,7 @@ typedef struct {size_t idx; uint32_t hx;} cmap_bucket_t, cset_bucket_t;
     STC_API void \

     ctype##_##X##_reserve(ctype##_##X* self, size_t size); \

     STC_API void \

-    ctype##_##X##_push_n(ctype##_##X* self, const ctype##_##X##_input_t arr[], size_t size); \

+    ctype##_##X##_push_n(ctype##_##X* self, const ctype##_##X##_rawvalue_t arr[], size_t size); \

     STC_API void \

     ctype##_##X##_del(ctype##_##X* self); \

     STC_API void \

@@ -244,9 +244,9 @@ typedef struct {size_t idx; uint32_t hx;} cmap_bucket_t, cset_bucket_t;
         return res; \

     } \

     STC_INLINE ctype##_##X##_result_t \

-    ctype##_##X##_insert(ctype##_##X* self, ctype##_##X##_input_t in) { \

-        return CSET_ONLY_##ctype(ctype##_##X##_insert_key_(self, in)) \

-               CMAP_ONLY_##ctype(ctype##_##X##_emplace(self, in.first, in.second)); \

+    ctype##_##X##_insert(ctype##_##X* self, ctype##_##X##_rawvalue_t arr) { \

+        return CSET_ONLY_##ctype(ctype##_##X##_insert_key_(self, arr)) \

+               CMAP_ONLY_##ctype(ctype##_##X##_emplace(self, arr.first, arr.second)); \

     } \

 \

     CMAP_ONLY_##ctype( \

@@ -326,7 +326,7 @@ typedef struct {size_t idx; uint32_t hx;} cmap_bucket_t, cset_bucket_t;
         return h; \

     } \

     STC_DEF void \

-    ctype##_##X##_push_n(ctype##_##X* self, const ctype##_##X##_input_t arr[], size_t n) { \

+    ctype##_##X##_push_n(ctype##_##X* self, const ctype##_##X##_rawvalue_t arr[], size_t n) { \

         for (size_t i=0; i<n; ++i) CMAP_ONLY_##ctype(ctype##_##X##_put(self, arr[i].first, arr[i].second)) \

                                    CSET_ONLY_##ctype(ctype##_##X##_insert(self, arr[i])) ; \

     } \

diff --git a/stc/cpque.h b/stc/cpque.h
index da2ad690..d2df1de5 100644
--- a/stc/cpque.h
+++ b/stc/cpque.h
@@ -50,11 +50,10 @@
 #include "cvec.h"

 

 #define using_cpque(X, ctype, cmpOpr) /* cmpOpr: < or > */ \

-\

     typedef ctype##_t cpque_##X; \

     typedef ctype##_value_t cpque_##X##_value_t; \

     typedef ctype##_rawvalue_t cpque_##X##_rawvalue_t; \

-    typedef ctype##_input_t cpque_##X##_input_t; \

+\

     STC_INLINE cpque_##X \

     cpque_##X##_init(void) {return ctype##_init();} \

     STC_INLINE cpque_##X \

@@ -82,7 +81,7 @@
         cpque_##X##_push(self, ctype##_value_from_raw(raw)); \

     } \

     STC_API void \

-    cpque_##X##_push_n(cpque_##X *self, const cpque_##X##_input_t in[], size_t size); \

+    cpque_##X##_push_n(cpque_##X *self, const cpque_##X##_rawvalue_t arr[], size_t size); \

 \

     implement_cpque(X, ctype, cmpOpr)

 

@@ -130,9 +129,9 @@
         if (c != n) arr[c] = value; \

     } \

     STC_API void \

-    cpque_##X##_push_n(cpque_##X *self, const cpque_##X##_input_t in[], size_t size) { \

+    cpque_##X##_push_n(cpque_##X *self, const cpque_##X##_rawvalue_t arr[], size_t size) { \

         ctype##_reserve(self, cpque_##X##_size(*self) + size); \

-        for (size_t i=0; i<size; ++i) cpque_##X##_push(self, in[i]); \

+        for (size_t i=0; i<size; ++i) cpque_##X##_push(self, arr[i]); \

     } \

 \

     typedef cpque_##X cpque_##X##_t

diff --git a/stc/cqueue.h b/stc/cqueue.h
index 0d349a26..0481797e 100644
--- a/stc/cqueue.h
+++ b/stc/cqueue.h
@@ -57,11 +57,10 @@
 #include "clist.h"

 

 #define using_cqueue(X, ctype) \

-\

     typedef ctype##_t cqueue_##X; \

     typedef ctype##_value_t cqueue_##X##_value_t; \

     typedef ctype##_rawvalue_t cqueue_##X##_rawvalue_t; \

-    typedef ctype##_input_t cqueue_##X##_input_t; \

+\

     STC_INLINE cqueue_##X \

     cqueue_##X##_init(void) {return ctype##_init();} \

     STC_INLINE cqueue_##X \

@@ -89,8 +88,8 @@
         ctype##_emplace_back(self, raw); \

     } \

     STC_INLINE void \

-    cqueue_##X##_push_n(cqueue_##X *self, const cqueue_##X##_input_t in[], size_t size) { \

-        ctype##_push_n(self, in, size); \

+    cqueue_##X##_push_n(cqueue_##X *self, const cqueue_##X##_rawvalue_t arr[], size_t size) { \

+        ctype##_push_n(self, arr, size); \

     } \

     typedef ctype##_iter_t cqueue_##X##_iter_t; \

     STC_INLINE cqueue_##X##_iter_t \

diff --git a/stc/cstack.h b/stc/cstack.h
index 7bf9cfe3..276a577d 100644
--- a/stc/cstack.h
+++ b/stc/cstack.h
@@ -46,11 +46,10 @@
 #include "cvec.h"

 

 #define using_cstack(X, ctype) \

-\

     typedef ctype##_t cstack_##X; \

     typedef ctype##_value_t cstack_##X##_value_t; \

     typedef ctype##_rawvalue_t cstack_##X##_rawvalue_t; \

-    typedef ctype##_input_t cstack_##X##_input_t; \

+\

     STC_INLINE cstack_##X \

     cstack_##X##_init(void) {return ctype##_init();} \

     STC_INLINE cstack_##X \

@@ -76,8 +75,8 @@
         ctype##_emplace_back(self, raw); \

     } \

     STC_INLINE void \

-    cstack_##X##_push_n(cstack_##X *self, const cstack_##X##_input_t in[], size_t size) { \

-        ctype##_push_n(self, in, size); \

+    cstack_##X##_push_n(cstack_##X *self, const cstack_##X##_rawvalue_t arr[], size_t size) { \

+        ctype##_push_n(self, arr, size); \

     } \

     typedef ctype##_iter_t cstack_##X##_iter_t; \

     STC_INLINE cstack_##X##_iter_t \

diff --git a/stc/cvec.h b/stc/cvec.h
index 50c158f8..c66372d1 100644
--- a/stc/cvec.h
+++ b/stc/cvec.h
@@ -42,7 +42,6 @@
 #define typedefs_cvec(X, Value, RawValue) \

     typedef Value cvec_##X##_value_t; \

     typedef RawValue cvec_##X##_rawvalue_t; \

-    typedef cvec_##X##_rawvalue_t cvec_##X##_input_t; \

     typedef struct { cvec_##X##_value_t *ref; } cvec_##X##_iter_t; \

     typedef struct { \

         cvec_##X##_value_t* data; \

@@ -97,7 +96,7 @@
         cvec_##X##_del(self); *self = x; \

     } \

     STC_API void \

-    cvec_##X##_push_n(cvec_##X *self, const cvec_##X##_input_t arr[], size_t size); \

+    cvec_##X##_push_n(cvec_##X *self, const cvec_##X##_rawvalue_t arr[], size_t size); \

     STC_API void \

     cvec_##X##_push_back(cvec_##X* self, Value value); \

     STC_INLINE void \

@@ -199,7 +198,7 @@
 #define _c_implement_cvec_7(X, Value, valueCompareRaw, valueDestroy, valueFromRaw, valueToRaw, RawValue) \

 \

     STC_DEF void \

-    cvec_##X##_push_n(cvec_##X *self, const cvec_##X##_input_t arr[], size_t n) { \

+    cvec_##X##_push_n(cvec_##X *self, const cvec_##X##_rawvalue_t arr[], size_t n) { \

         cvec_##X##_reserve(self, cvec_##X##_size(*self) + n); \

         cvec_##X##_value_t* p = self->data + _cvec_size(self); \

         for (size_t i=0; i < n; ++i) *p++ = valueFromRaw(arr[i]); \