Renamed forward_CONTAINER(...) => declare_CONTAINER(...),

and     c_is_fwd => c_declared, for the i_opt option define.

6 files changed, 18 insertions, 18 deletions

diff --git a/examples/new_deq.c b/examples/new_deq.c
index dd6f04c0..9da5c90d 100644
--- a/examples/new_deq.c
+++ b/examples/new_deq.c
@@ -1,8 +1,8 @@
 #include <stc/cstr.h>
 #include <stc/forward.h>
 
-forward_cdeq(cdeq_i32, int);
-forward_cdeq(cdeq_pnt, struct Point);
+declare_cdeq(cdeq_i32, int);
+declare_cdeq(cdeq_pnt, struct Point);
 
 struct MyStruct {
     cdeq_i32 intvec;
@@ -11,7 +11,7 @@ struct MyStruct {
 
 
 #define i_val int
-#define i_opt c_is_fwd
+#define i_opt c_declared
 #define i_tag i32
 #include <stc/cdeq.h>
 
@@ -23,7 +23,7 @@ int point_cmp(const Point* a, const Point* b) {
 
 #define i_val Point
 #define i_cmp point_cmp
-#define i_opt c_is_fwd
+#define i_opt c_declared
 #define i_tag pnt
 #include <stc/cdeq.h>
 
diff --git a/examples/new_list.c b/examples/new_list.c
index 87260931..816e7271 100644
--- a/examples/new_list.c
+++ b/examples/new_list.c
@@ -1,7 +1,7 @@
 #include <stc/cstr.h>
 
-forward_clist(clist_i32, int);
-forward_clist(clist_pnt, struct Point);
+declare_clist(clist_i32, int);
+declare_clist(clist_pnt, struct Point);
 
 struct MyStruct {
     clist_i32 intlst;
@@ -9,7 +9,7 @@ struct MyStruct {
 } typedef MyStruct;
 
 #define i_val int
-#define i_opt c_is_fwd
+#define i_opt c_declared
 #define i_tag i32
 #define i_extern // define _clist_mergesort() 
 #include <stc/clist.h>
@@ -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_fwd
+#define i_opt c_declared
 #define i_tag pnt
 #include <stc/clist.h>
 
diff --git a/examples/new_map.c b/examples/new_map.c
index 24909a7c..214df821 100644
--- a/examples/new_map.c
+++ b/examples/new_map.c
@@ -1,7 +1,7 @@
 #include <stc/cstr.h>
 #include <stc/forward.h>
 
-forward_cmap(cmap_pnt, struct Point, int);
+declare_cmap(cmap_pnt, struct Point, int);
 
 struct MyStruct {
     cmap_pnt pntmap;
@@ -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_fwd
+#define i_opt c_declared
 #define i_tag pnt
 #include <stc/cmap.h>
 
diff --git a/examples/new_queue.c b/examples/new_queue.c
index 46ae836e..d7b6d0aa 100644
--- a/examples/new_queue.c
+++ b/examples/new_queue.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <time.h>
 
-forward_cqueue(cqueue_pnt, struct Point);
+declare_cqueue(cqueue_pnt, struct Point);
 
 struct Point { int x, y; } typedef Point;
 int point_cmp(const Point* a, const Point* b) {
@@ -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_fwd
+#define i_opt c_declared
 #define i_tag pnt
 #include <stc/cqueue.h>
 
diff --git a/examples/new_smap.c b/examples/new_smap.c
index 35c56b7c..ca136a0f 100644
--- a/examples/new_smap.c
+++ b/examples/new_smap.c
@@ -1,7 +1,7 @@
 #include <stc/cstr.h>
 #include <stc/forward.h>
 
-forward_csmap(PMap, struct Point, int);
+declare_csmap(PMap, struct Point, int);
 
 // Use forward declared PMap in struct
 struct MyStruct {
@@ -25,7 +25,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_fwd
+#define i_opt c_declared
 #include <stc/csmap.h>
 
 // cstr => cstr map
diff --git a/examples/new_vec.c b/examples/new_vec.c
index 6e6be95a..9be8cbdb 100644
--- a/examples/new_vec.c
+++ b/examples/new_vec.c
@@ -1,8 +1,8 @@
 #include <stc/cstr.h>
 #include <stc/forward.h>
 
-forward_cvec(cvec_i32, int);
-forward_cvec(cvec_pnt, struct Point);
+declare_cvec(cvec_i32, int);
+declare_cvec(cvec_pnt, struct Point);
 
 struct MyStruct {
     cvec_i32 intvec;
@@ -10,7 +10,7 @@ struct MyStruct {
 } typedef MyStruct;
 
 #define i_val int
-#define i_opt c_is_fwd
+#define i_opt c_declared
 #define i_tag i32
 #include <stc/cvec.h>
 
@@ -23,7 +23,7 @@ int point_cmp(const Point* a, const Point* b) {
 #define i_val Point
 //#define i_cmp point_cmp
 #define i_less(a, b) a->x < b->x || (a->x == b->x && a->y < b->y)
-#define i_opt c_is_fwd
+#define i_opt c_declared
 #define i_tag pnt
 #include <stc/cvec.h>