renamed __init to _inits

3 files changed, 13 insertions, 13 deletions

diff --git a/stc/clist.h b/stc/clist.h
index 55034815..22074a61 100644
--- a/stc/clist.h
+++ b/stc/clist.h
@@ -35,7 +35,7 @@
     using_clist(ix, int64_t);

 

     int main() {

-        clist_ix list = clist__init;

+        clist_ix list = clist_inits;

         crand_rng32_t pcg = crand_rng32_init(12345);

         int n;

         for (int i=0; i<1000000; ++i) // one million

@@ -85,7 +85,7 @@
         int _state; \

     } clist_##X##_iter_t

 

-#define clist__init         {NULL}

+#define clist_inits         {NULL}

 #define clist_empty(list)   ((list).last == NULL)

 

 #define c_emplace_after(self, ctype, pos, ...) do { \

@@ -108,7 +108,7 @@ STC_API size_t _clist_size(const clist_void* self);
     typedef clist_##X##_rawvalue_t clist_##X##_input_t; \

 \

     STC_INLINE clist_##X \

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

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

     STC_INLINE bool \

     clist_##X##_empty(clist_##X ls) {return clist_empty(ls);} \

     STC_INLINE size_t \

diff --git a/stc/cmap.h b/stc/cmap.h
index e0158539..4197b169 100644
--- a/stc/cmap.h
+++ b/stc/cmap.h
@@ -30,14 +30,14 @@ using_cset(sx, int);       // Set of int
 using_cmap(mx, int, char); // Map of int -> char

 

 int main(void) {

-    cset_sx s = cset__init;

+    cset_sx s = cset_inits;

     cset_sx_insert(&s, 5);

     cset_sx_insert(&s, 8);

     c_foreach (i, cset_sx, s)

         printf("set %d\n", i.val->second);

     cset_sx_del(&s);

 

-    cmap_mx m = cmap__init;

+    cmap_mx m = cmap_inits;

     cmap_mx_put(&m, 5, 'a');

     cmap_mx_put(&m, 8, 'b');

     cmap_mx_put(&m, 12, 'c');

@@ -54,10 +54,10 @@ int main(void) {
 #include <stdlib.h>

 #include <string.h>

 

-#define cmap__init                    {NULL, NULL, 0, 0, 0.85f, 0.15f}

+#define cmap_inits                    {NULL, NULL, 0, 0, 0.85f, 0.15f}

 #define cmap_empty(m)                 ((m).size == 0)

 #define cmap_size(m)                  ((size_t) (m).size)

-#define cset__init                    cmap__init

+#define cset_inits                    cmap_inits

 #define cset_empty(s)                 cmap_empty(s)

 #define cset_size(s)                  cmap_size(s)

 

@@ -206,7 +206,7 @@ typedef struct {size_t idx; uint32_t hx;} cmap_bucket_t, cset_bucket_t;
     } ctype##_##X##_iter_t; \

 \

     STC_INLINE ctype##_##X \

-    ctype##_##X##_init(void) {ctype##_##X m = cmap__init; return m;} \

+    ctype##_##X##_init(void) {ctype##_##X m = cmap_inits; return m;} \

     STC_INLINE bool \

     ctype##_##X##_empty(ctype##_##X m) {return m.size == 0;} \

     STC_INLINE size_t \

@@ -322,7 +322,7 @@ typedef struct {size_t idx; uint32_t hx;} cmap_bucket_t, cset_bucket_t;
                               keyDestroy, RawKey, keyToRaw, keyFromRaw, RawVal, valueFromRaw) \

     STC_DEF ctype##_##X \

     ctype##_##X##_with_capacity(size_t cap) { \

-        ctype##_##X h = ctype##__init; \

+        ctype##_##X h = ctype##_inits; \

         ctype##_##X##_reserve(&h, cap); \

         return h; \

     } \

diff --git a/stc/cvec.h b/stc/cvec.h
index a63e7e10..bc629973 100644
--- a/stc/cvec.h
+++ b/stc/cvec.h
@@ -27,7 +27,7 @@
 #include <stdlib.h>

 #include <string.h>

 

-#define cvec__init         {NULL}

+#define cvec_inits         {NULL}

 #define cvec_size(v)       _cvec_safe_size((v).data)

 #define cvec_capacity(v)   _cvec_safe_capacity((v).data)

 #define cvec_empty(v)      (cvec_size(v) == 0)

@@ -55,7 +55,7 @@
     } cvec_##X; \

 \

     STC_INLINE cvec_##X \

-    cvec_##X##_init(void) {cvec_##X v = cvec__init; return v;} \

+    cvec_##X##_init(void) {cvec_##X v = cvec_inits; return v;} \

     STC_INLINE bool \

     cvec_##X##_empty(cvec_##X v) {return cvec_empty(v);} \

     STC_INLINE size_t \

@@ -77,13 +77,13 @@
 \

     STC_INLINE cvec_##X \

     cvec_##X##_with_size(size_t size, Value null_val) { \

-        cvec_##X x = cvec__init; \

+        cvec_##X x = cvec_inits; \

         cvec_##X##_resize(&x, size, null_val); \

         return x; \

     } \

     STC_INLINE cvec_##X \

     cvec_##X##_with_capacity(size_t size) { \

-        cvec_##X x = cvec__init; \

+        cvec_##X x = cvec_inits; \

         cvec_##X##_reserve(&x, size); \

         return x; \

     } \