Update template.h - also renamed i_cmp_native => i_use_cmp

17 files changed, 20 insertions, 17 deletions

diff --git a/misc/examples/linkedlists/intrusive.c b/misc/examples/linkedlists/intrusive.c
index c7402d09..edb072c7 100644
--- a/misc/examples/linkedlists/intrusive.c
+++ b/misc/examples/linkedlists/intrusive.c
@@ -4,7 +4,7 @@
 
 #define i_type List
 #define i_key int
-#define i_cmp_native
+#define i_use_cmp
 #include <stc/clist.h>
 
 void printList(List list) {
diff --git a/misc/examples/linkedlists/list.c b/misc/examples/linkedlists/list.c
index 518cc09b..e83dc6b2 100644
--- a/misc/examples/linkedlists/list.c
+++ b/misc/examples/linkedlists/list.c
@@ -5,7 +5,7 @@
 
 #define i_type DList
 #define i_key double
-#define i_cmp_native
+#define i_use_cmp
 #include <stc/clist.h>
 
 int main(void) {
diff --git a/misc/examples/linkedlists/new_list.c b/misc/examples/linkedlists/new_list.c
index 2112bf1f..7518929a 100644
--- a/misc/examples/linkedlists/new_list.c
+++ b/misc/examples/linkedlists/new_list.c
@@ -27,7 +27,7 @@ int point_cmp(const Point* a, const Point* b) {
 #include <stc/clist.h>
 
 #define i_key float
-#define i_cmp_native               // use < and == operators for comparison 
+#define i_use_cmp               // use < and == operators for comparison 
 #include <stc/clist.h>
 
 void MyStruct_drop(MyStruct* s);
diff --git a/misc/examples/mixed/astar.c b/misc/examples/mixed/astar.c
index 590b7952..d15a9ed7 100644
--- a/misc/examples/mixed/astar.c
+++ b/misc/examples/mixed/astar.c
@@ -61,7 +61,6 @@ point_key_cmp(const point* a, const point* b)
 #include <stc/cpque.h>
 
 #define i_key point
-#define i_opt c_no_cmp
 #include <stc/cdeq.h>
 
 #define i_key point
diff --git a/misc/examples/mixed/complex.c b/misc/examples/mixed/complex.c
index 4eb1574b..9fcbc417 100644
--- a/misc/examples/mixed/complex.c
+++ b/misc/examples/mixed/complex.c
@@ -14,7 +14,6 @@
 
 #define i_type StackList
 #define i_keyclass FloatStack  // "class" picks up _clone, _drop, _cmp
-#define i_opt c_no_cmp         // exclude FloatStack_cmp(): not defined
 #include <stc/clist.h>
 
 #define i_type ListMap
diff --git a/misc/examples/mixed/demos.c b/misc/examples/mixed/demos.c
index 7f5091fd..43c9a7ae 100644
--- a/misc/examples/mixed/demos.c
+++ b/misc/examples/mixed/demos.c
@@ -53,6 +53,7 @@ void vectordemo1(void)
 }
 
 #define i_key_str
+#define i_use_cmp
 #include <stc/cvec.h>
 
 void vectordemo2(void)
@@ -74,7 +75,7 @@ void vectordemo2(void)
 
 #define i_key int
 #define i_tag ix
-#define i_cmp_native
+#define i_use_cmp
 #include <stc/clist.h>
 
 void listdemo1(void)
diff --git a/misc/examples/smartpointers/arc_containers.c b/misc/examples/smartpointers/arc_containers.c
index 6209005d..c2bff56f 100644
--- a/misc/examples/smartpointers/arc_containers.c
+++ b/misc/examples/smartpointers/arc_containers.c
@@ -12,11 +12,11 @@
 #define i_key Map
 #define i_keydrop(p) (printf("drop Arc:\n"), Map_drop(p))
 // no need for atomic ref. count in single thread:
-#define i_opt c_no_atomic
+#define i_opt c_no_atomic|c_no_cmp
 #include <stc/carc.h>
 
 #define i_type Stack
-#define i_keyboxed Arc // define i_keyboxed for carc/cbox value (not i_key)
+#define i_keyboxed Arc // use i_keyboxed for carc/cbox key
 #include <stc/cvec.h>
 
 #define i_type List
diff --git a/misc/examples/smartpointers/arc_demo.c b/misc/examples/smartpointers/arc_demo.c
index 929a48a1..a66d84b0 100644
--- a/misc/examples/smartpointers/arc_demo.c
+++ b/misc/examples/smartpointers/arc_demo.c
@@ -11,13 +11,14 @@ void int_drop(int* x) {
 #define i_type Arc          // set type name to be defined (instead of 'carc_int')
 #define i_key int
 #define i_keydrop int_drop  // optional, just to display the elements destroyed
-#define i_cmp_native        // use int comparison (x < y, x == y).
+#define i_use_cmp           // use int comparison (x < y, x == y).
 #include <stc/carc.h>       // Arc
 
 #define i_keyboxed Arc      // note: use i_keyboxed instead of i_key for carc/cbox elements
 #include <stc/csset.h>      // csset_Arc (like: std::set<std::shared_ptr<int>>)
 
 #define i_keyboxed Arc      // note: as above.
+#define i_use_cmp
 #include <stc/cvec.h>       // cvec_Arc (like: std::vector<std::shared_ptr<int>>)
 
 int main(void)
diff --git a/misc/examples/smartpointers/arcvec_erase.c b/misc/examples/smartpointers/arcvec_erase.c
index 9d757533..0526b6a0 100644
--- a/misc/examples/smartpointers/arcvec_erase.c
+++ b/misc/examples/smartpointers/arcvec_erase.c
@@ -5,11 +5,12 @@ void show_drop(int* x) { printf("drop: %d\n", *x); }
 #define i_type Arc
 #define i_key int
 #define i_keydrop show_drop
-#define i_cmp_native        // enable sort/search for int type
+#define i_use_cmp           // enable sort/search for int type
 #include <stc/carc.h>       // Shared pointer to int
 
 #define i_type Vec
 #define i_keyboxed Arc
+#define i_use_cmp
 #include <stc/cvec.h>       // Vec: cvec<Arc>
 
 
diff --git a/misc/examples/smartpointers/box.c b/misc/examples/smartpointers/box.c
index 94d126c0..5c8018d4 100644
--- a/misc/examples/smartpointers/box.c
+++ b/misc/examples/smartpointers/box.c
@@ -30,6 +30,7 @@ void Person_drop(Person* p) {
 
 #define i_type PBox
 #define i_keyclass Person // "class" binds _cmp, _clone, _drop functions.
+#define i_use_cmp
 #include <stc/cbox.h>
 
 #define i_type Persons
diff --git a/misc/examples/smartpointers/box2.c b/misc/examples/smartpointers/box2.c
index eaab1c47..9b782c74 100644
--- a/misc/examples/smartpointers/box2.c
+++ b/misc/examples/smartpointers/box2.c
@@ -22,7 +22,6 @@ typedef struct {
 // Box in box:
 #define i_type BoxBoxPoint
 #define i_keyboxed cbox_Point // NB: use i_keyboxed when value is a cbox or carc!
-#define i_no_cmp
 #include <stc/cbox.h> // BoxBoxPoint
 
 Point origin(void) {
diff --git a/misc/examples/smartpointers/music_arc.c b/misc/examples/smartpointers/music_arc.c
index 13d368c3..e9ebbbfe 100644
--- a/misc/examples/smartpointers/music_arc.c
+++ b/misc/examples/smartpointers/music_arc.c
@@ -23,7 +23,7 @@ void Song_drop(Song* s) {
 // Define the shared pointer:
 #define i_type SongArc
 #define i_keyclass Song
-#define i_no_hash          // no hash fn for Song, fallback hash pointer to Song.
+#define i_opt c_use_cmp|c_no_hash
 #include <stc/carc.h>
 
 // ... and a vector of them
@@ -64,4 +64,4 @@ void example3(void)
 int main(void)
 {
     example3();
-}
+}
\ No newline at end of file
diff --git a/misc/examples/smartpointers/new_sptr.c b/misc/examples/smartpointers/new_sptr.c
index 3c6fa16c..50e28ae2 100644
--- a/misc/examples/smartpointers/new_sptr.c
+++ b/misc/examples/smartpointers/new_sptr.c
@@ -10,12 +10,13 @@ uint64_t Person_hash(const Person* p);
 
 #define i_type PersonArc
 #define i_keyclass Person // "class" assume _clone, _drop, _cmp, _hash is defined.
+#define i_use_cmp
 #include <stc/carc.h>
 
 #define i_type IPtr
 #define i_key int
 #define i_keydrop(x) printf("drop: %d\n", *x)
-#define i_cmp_native
+#define i_use_cmp
 #include <stc/carc.h>
 
 #define i_type IPStack
diff --git a/misc/examples/smartpointers/person_arc.c b/misc/examples/smartpointers/person_arc.c
index 38c883a7..11040cd2 100644
--- a/misc/examples/smartpointers/person_arc.c
+++ b/misc/examples/smartpointers/person_arc.c
@@ -31,11 +31,12 @@ void Person_drop(Person* p) {
 
 #define i_type PSPtr
 #define i_keyclass Person // ensure Person_drop
-#define i_cmp Person_cmp   // specify object cmp, instead of ptr cmp for arc.
+#define i_use_cmp
 #include <stc/carc.h>
 
 #define i_type Persons
 #define i_keyboxed PSPtr // binds PSPtr_cmp, PSPtr_drop...
+#define i_use_cmp
 #include <stc/cvec.h>
 
 
diff --git a/misc/examples/sortedmaps/csmap_insert.c b/misc/examples/sortedmaps/csmap_insert.c
index c9f02891..04b8ddc6 100644
--- a/misc/examples/sortedmaps/csmap_insert.c
+++ b/misc/examples/sortedmaps/csmap_insert.c
@@ -13,7 +13,6 @@
 #include <stc/csmap.h>
 
 #define i_key csmap_ii_raw
-#define i_opt c_no_cmp
 #define i_tag ii
 #include <stc/cvec.h>
 
diff --git a/misc/examples/sortedmaps/multimap.c b/misc/examples/sortedmaps/multimap.c
index 1068a5dc..a4490f91 100644
--- a/misc/examples/sortedmaps/multimap.c
+++ b/misc/examples/sortedmaps/multimap.c
@@ -41,6 +41,7 @@ void OlympicLoc_drop(OlympicLoc* self);
 
 // Create a clist<OlympicLoc>, can be sorted by year.
 #define i_keyclass OlympicLoc // binds _cmp, _clone and _drop.
+#define i_use_cmp
 #define i_tag OL
 #include <stc/clist.h>
 
diff --git a/misc/examples/vectors/lower_bound.c b/misc/examples/vectors/lower_bound.c
index bea828f2..09cf2008 100644
--- a/misc/examples/vectors/lower_bound.c
+++ b/misc/examples/vectors/lower_bound.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #define i_key int
-#define i_cmp_native
+#define i_use_cmp
 #include <stc/cvec.h>
 
 #define i_key int