Reverted forward declaration from c_declare_X back to c_forward_X, and the flag "i_opt c_declared" to "i_opt c_is_forward". Sorry about this, but hopefully not a widely used feature for most yet.

14 files changed, 31 insertions, 31 deletions

diff --git a/include/stc/alt/csmap.h b/include/stc/alt/csmap.h
index 85ecc8c7..4cf7c2d7 100644
--- a/include/stc/alt/csmap.h
+++ b/include/stc/alt/csmap.h
@@ -72,7 +72,7 @@ int main(void) {
 #endif
 #include <stc/template.h>
 
-#if !c_option(c_declared)
+#if !c_option(c_is_forward)
 _cx_deftypes(_c_aatree_types, _cx_self, i_key, i_val, i_size, _i_MAP_ONLY, _i_SET_ONLY);
 #endif
 
diff --git a/include/stc/carc.h b/include/stc/carc.h
index 9b52b0c4..69a5660e 100644
--- a/include/stc/carc.h
+++ b/include/stc/carc.h
@@ -94,7 +94,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_declared)
+#if !c_option(c_is_forward)
 _cx_deftypes(_c_carc_types, _cx_self, i_key);
 #endif
 _cx_carc_rep { catomic_long counter; i_key value; };
diff --git a/include/stc/carr2.h b/include/stc/carr2.h
index fa46fd44..e96d3c6a 100644
--- a/include/stc/carr2.h
+++ b/include/stc/carr2.h
@@ -57,7 +57,7 @@ int main() {
 #define _i_prefix carr2_
 #endif
 #include "template.h"
-#if !c_option(c_declared)
+#if !c_option(c_is_forward)
 _cx_deftypes(_c_carr2_types, _cx_self, i_key);
 #endif
 
diff --git a/include/stc/carr3.h b/include/stc/carr3.h
index 7287da68..3fe9e8ae 100644
--- a/include/stc/carr3.h
+++ b/include/stc/carr3.h
@@ -59,7 +59,7 @@ int main() {
 #endif
 #include "template.h"
 
-#if !c_option(c_declared)
+#if !c_option(c_is_forward)
 _cx_deftypes(_c_carr3_types, _cx_self, i_key);
 #endif
 
diff --git a/include/stc/cbox.h b/include/stc/cbox.h
index 7b0e6742..cf9e1b5a 100644
--- a/include/stc/cbox.h
+++ b/include/stc/cbox.h
@@ -79,7 +79,7 @@ int main() {
 #include "template.h"
 typedef i_keyraw _cx_raw;
 
-#if !c_option(c_declared)
+#if !c_option(c_is_forward)
 _cx_deftypes(_c_cbox_types, _cx_self, i_key);
 #endif
 
diff --git a/include/stc/ccommon.h b/include/stc/ccommon.h
index f9aff743..935d10d9 100644
--- a/include/stc/ccommon.h
+++ b/include/stc/ccommon.h
@@ -101,7 +101,7 @@
 #define c_default_drop(vp)      ((void) (vp))
 
 #define c_option(flag)          ((i_opt) & (flag))
-#define c_declared              (1<<0)
+#define c_is_forward              (1<<0)
 #define c_no_atomic             (1<<1)
 #define c_no_clone              (1<<2)
 #define c_no_cmp                (1<<3)
diff --git a/include/stc/cdeq.h b/include/stc/cdeq.h
index bd1a9a0f..d1102e32 100644
--- a/include/stc/cdeq.h
+++ b/include/stc/cdeq.h
@@ -38,7 +38,7 @@ struct cdeq_rep { size_t size, cap; unsigned base[1]; };
 #endif
 #include "template.h"
 
-#if !c_option(c_declared)
+#if !c_option(c_is_forward)
 _cx_deftypes(_c_cdeq_types, _cx_self, i_key);
 #endif
 typedef i_keyraw _cx_raw;
diff --git a/include/stc/clist.h b/include/stc/clist.h
index b23a25ca..b5f9c233 100644
--- a/include/stc/clist.h
+++ b/include/stc/clist.h
@@ -85,7 +85,7 @@ _c_clist_complete_types(clist_VOID, dummy);
 #endif
 #include "template.h"
 
-#if !c_option(c_declared)
+#if !c_option(c_is_forward)
   _cx_deftypes(_c_clist_types, _cx_self, i_key);
 #endif
 _cx_deftypes(_c_clist_complete_types, _cx_self, dummy);
diff --git a/include/stc/cmap.h b/include/stc/cmap.h
index 3683b357..45b1d81d 100644
--- a/include/stc/cmap.h
+++ b/include/stc/cmap.h
@@ -80,7 +80,7 @@ typedef struct      { size_t idx; uint8_t hx; } chash_bucket_t;
 #ifndef i_eq_functor
   #define i_eq_functor(self, x, y) i_eq(x, y)
 #endif
-#if !c_option(c_declared)
+#if !c_option(c_is_forward)
   _cx_deftypes(_c_chash_types, _cx_self, i_key, i_val, i_size, _i_MAP_ONLY, _i_SET_ONLY);
 #endif
 
diff --git a/include/stc/cpque.h b/include/stc/cpque.h
index fbeafcc3..ba83474b 100644
--- a/include/stc/cpque.h
+++ b/include/stc/cpque.h
@@ -35,7 +35,7 @@
 #ifndef i_less_functor
   #define i_less_functor(self, x, y) i_less(x, y)
 #endif
-#if !c_option(c_declared)
+#if !c_option(c_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 aced3f2a..afab01e8 100644
--- a/include/stc/csmap.h
+++ b/include/stc/csmap.h
@@ -77,7 +77,7 @@ int main(void) {
 #ifndef i_cmp_functor
   #define i_cmp_functor(self, x, y) i_cmp(x, y)
 #endif
-#if !c_option(c_declared)
+#if !c_option(c_is_forward)
   _cx_deftypes(_c_aatree_types, _cx_self, i_key, i_val, i_size, _i_MAP_ONLY, _i_SET_ONLY);
 #endif
 
diff --git a/include/stc/cstack.h b/include/stc/cstack.h
index 011a7884..7e46da86 100644
--- a/include/stc/cstack.h
+++ b/include/stc/cstack.h
@@ -33,7 +33,7 @@
 #endif
 #include "template.h"
 
-#if !c_option(c_declared)
+#if !c_option(c_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 30965df3..2f49ec34 100644
--- a/include/stc/cvec.h
+++ b/include/stc/cvec.h
@@ -25,7 +25,7 @@
 #include <stc/cstr.h>
 #include <stc/forward.h>
 
-declare_cvec(cvec_i32, int);
+forward_cvec(cvec_i32, int);
 
 struct MyStruct {
     cvec_i32 int_vec;
@@ -39,7 +39,7 @@ struct MyStruct {
 #include <stc/cvec.h>
 
 #define i_key int
-#define i_opt c_declared // forward declared
+#define i_opt c_is_forward // forward declared
 #define i_tag i32
 #include <stc/cvec.h>
 
@@ -75,7 +75,7 @@ struct cvec_rep { size_t size, cap; unsigned data[1]; };
 #endif
 #include "template.h"
 
-#if !c_option(c_declared)
+#if !c_option(c_is_forward)
    _cx_deftypes(_c_cvec_types, _cx_self, i_key);
 #endif
 typedef i_keyraw _cx_raw;
diff --git a/include/stc/forward.h b/include/stc/forward.h
index ef287fe4..ffec50de 100644
--- a/include/stc/forward.h
+++ b/include/stc/forward.h
@@ -25,22 +25,22 @@
 
 #include <stddef.h>
 
-#define declare_carc(CX, VAL) _c_carc_types(CX, VAL)
-#define declare_carr2(CX, VAL) _c_carr2_types(CX, VAL)
-#define declare_carr3(CX, VAL) _c_carr3_types(CX, VAL)
-#define declare_cbox(CX, VAL) _c_cbox_types(CX, VAL)
-#define declare_cdeq(CX, VAL) _c_cdeq_types(CX, VAL)
-#define declare_clist(CX, VAL) _c_clist_types(CX, VAL)
-#define declare_cmap(CX, KEY, VAL) _c_chash_types(CX, KEY, VAL, uint32_t, c_true, c_false)
-#define declare_cmap_huge(CX, KEY, VAL) _c_chash_types(CX, KEY, VAL, size_t, c_true, c_false)
-#define declare_cset(CX, KEY) _c_chash_types(CX, cset, KEY, KEY, uint32_t, c_false, c_true)
-#define declare_cset_huge(CX, KEY) _c_chash_types(CX, cset, KEY, KEY, size_t, c_false, c_true)
-#define declare_csmap(CX, KEY, VAL) _c_aatree_types(CX, KEY, VAL, uint32_t, c_true, c_false)
-#define declare_csset(CX, KEY) _c_aatree_types(CX, KEY, KEY, uint32_t, c_false, c_true)
-#define declare_cstack(CX, VAL) _c_cstack_types(CX, VAL)
-#define declare_cpque(CX, VAL) _c_cpque_types(CX, VAL)
-#define declare_cqueue(CX, VAL) _c_cdeq_types(CX, VAL)
-#define declare_cvec(CX, VAL) _c_cvec_types(CX, VAL)
+#define forward_carc(CX, VAL) _c_carc_types(CX, VAL)
+#define forward_carr2(CX, VAL) _c_carr2_types(CX, VAL)
+#define forward_carr3(CX, VAL) _c_carr3_types(CX, VAL)
+#define forward_cbox(CX, VAL) _c_cbox_types(CX, VAL)
+#define forward_cdeq(CX, VAL) _c_cdeq_types(CX, VAL)
+#define forward_clist(CX, VAL) _c_clist_types(CX, VAL)
+#define forward_cmap(CX, KEY, VAL) _c_chash_types(CX, KEY, VAL, uint32_t, c_true, c_false)
+#define forward_cmap_huge(CX, KEY, VAL) _c_chash_types(CX, KEY, VAL, size_t, c_true, c_false)
+#define forward_cset(CX, KEY) _c_chash_types(CX, cset, KEY, KEY, uint32_t, c_false, c_true)
+#define forward_cset_huge(CX, KEY) _c_chash_types(CX, cset, KEY, KEY, size_t, c_false, c_true)
+#define forward_csmap(CX, KEY, VAL) _c_aatree_types(CX, KEY, VAL, uint32_t, c_true, c_false)
+#define forward_csset(CX, KEY) _c_aatree_types(CX, KEY, KEY, uint32_t, c_false, c_true)
+#define forward_cstack(CX, VAL) _c_cstack_types(CX, VAL)
+#define forward_cpque(CX, VAL) _c_cpque_types(CX, VAL)
+#define forward_cqueue(CX, VAL) _c_cdeq_types(CX, VAL)
+#define forward_cvec(CX, VAL) _c_cvec_types(CX, VAL)
 
 typedef const char csview_value;
 typedef struct { csview_value* str; size_t size; } csview;