Changed docs and examples to use i_key* template parameters instead of i_val* for all non-maps.

Renamed c_ASSERT() to c_assert() and added optional message parameter to c_static_assert().

41 files changed, 80 insertions, 80 deletions

diff --git a/misc/benchmarks/various/csort_bench.c b/misc/benchmarks/various/csort_bench.c
index d434693f..f6b7f1db 100644
--- a/misc/benchmarks/various/csort_bench.c
+++ b/misc/benchmarks/various/csort_bench.c
@@ -7,7 +7,7 @@
 #endif
 #define NDEBUG
 #define i_type Ints
-#define i_val int
+#define i_key int
 #define i_more
 #include <stc/cvec.h>
 #include <stc/algo/sort.h>
diff --git a/misc/examples/arc_containers.c b/misc/examples/arc_containers.c
index b05bbea6..524758e7 100644
--- a/misc/examples/arc_containers.c
+++ b/misc/examples/arc_containers.c
@@ -10,18 +10,18 @@
 #include <stc/csmap.h>
 
 #define i_type Arc // (atomic) ref. counted type
-#define i_val Map
-#define i_valdrop(p) (printf("drop Arc:\n"), Map_drop(p))
+#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
 #include <stc/carc.h>
 
 #define i_type Stack
-#define i_valboxed Arc // define i_valboxed for carc/cbox value (not i_val)
+#define i_keyboxed Arc // define i_keyboxed for carc/cbox value (not i_key)
 #include <stc/cvec.h>
 
 #define i_type List
-#define i_valboxed Arc // as above
+#define i_keyboxed Arc // as above
 #include <stc/clist.h>
 
 int main()
diff --git a/misc/examples/arc_demo.c b/misc/examples/arc_demo.c
index 4cda1c8b..547e1737 100644
--- a/misc/examples/arc_demo.c
+++ b/misc/examples/arc_demo.c
@@ -6,18 +6,18 @@ void int_drop(int* x) {
 }
 
 // carc implements its own clone method using reference counting,
-// so 'i_valclone' is not required to be defined (ignored).
+// so 'i_keyclone' is not required to be defined (ignored).
 
 #define i_type Arc          // set type name to be defined (instead of 'carc_int')
-#define i_val int
-#define i_valdrop int_drop  // optional, just to display the elements destroyed
+#define i_key int
+#define i_keydrop int_drop  // optional, just to display the elements destroyed
 #define i_native_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_valboxed Arc      // note: as above.
+#define i_keyboxed Arc      // note: as above.
 #include <stc/cvec.h>       // cvec_Arc (like: std::vector<std::shared_ptr<int>>)
 
 int main()
diff --git a/misc/examples/arcvec_erase.c b/misc/examples/arcvec_erase.c
index 0b9252d9..f409258b 100644
--- a/misc/examples/arcvec_erase.c
+++ b/misc/examples/arcvec_erase.c
@@ -3,13 +3,13 @@
 void show_drop(int* x) { printf("drop: %d\n", *x); }
 
 #define i_type Arc
-#define i_val int
-#define i_valdrop show_drop
+#define i_key int
+#define i_keydrop show_drop
 #define i_native_cmp        // enable sort/search for int type
 #include <stc/carc.h>       // Shared pointer to int
 
 #define i_type Vec
-#define i_valboxed Arc
+#define i_keyboxed Arc
 #include <stc/cvec.h>       // Vec: cvec<Arc>
 
 
diff --git a/misc/examples/astar.c b/misc/examples/astar.c
index 1b3876aa..44cdefee 100644
--- a/misc/examples/astar.c
+++ b/misc/examples/astar.c
@@ -57,11 +57,11 @@ point_key_cmp(const point* a, const point* b)
     return (i == j) ? 0 : (i < j) ? -1 : 1;
 }
 
-#define i_val point
+#define i_key point
 #define i_cmp point_cmp_priority
 #include <stc/cpque.h>
 
-#define i_val point
+#define i_key point
 #define i_opt c_no_cmp
 #include <stc/cdeq.h>
 
diff --git a/misc/examples/box.c b/misc/examples/box.c
index a9131afa..3f55e15d 100644
--- a/misc/examples/box.c
+++ b/misc/examples/box.c
@@ -29,11 +29,11 @@ void Person_drop(Person* p) {
 }
 
 #define i_type PBox
-#define i_valclass Person // "class" binds _cmp, _clone, _drop functions.
+#define i_keyclass Person // "class" binds _cmp, _clone, _drop functions.
 #include <stc/cbox.h>
 
 #define i_type Persons
-#define i_valboxed PBox // "arcbox" informs that PBox is a smart pointer.
+#define i_keyboxed PBox // "arcbox" informs that PBox is a smart pointer.
 #include <stc/csset.h>
 
 int main()
diff --git a/misc/examples/box2.c b/misc/examples/box2.c
index d3762462..5ac706d4 100644
--- a/misc/examples/box2.c
+++ b/misc/examples/box2.c
@@ -14,15 +14,15 @@ typedef struct {
     Point bottom_right;
 } Rectangle;
 
-#define i_val Point
+#define i_key Point
 #include <stc/cbox.h> // cbox_Point
 
-#define i_val Rectangle
+#define i_key Rectangle
 #include <stc/cbox.h> // cbox_Rectangle
 
 // Box in box:
 #define i_type BoxBoxPoint
-#define i_valboxed cbox_Point // NB: use i_valboxed when value is a cbox or carc!
+#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
 
diff --git a/misc/examples/cointerleave.c b/misc/examples/cointerleave.c
index 61562a5f..c3c5926a 100644
--- a/misc/examples/cointerleave.c
+++ b/misc/examples/cointerleave.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stc/calgo.h>
 #define i_type IVec
-#define i_val int
+#define i_key int
 #include <stc/cvec.h>
 
 struct GenValue {
diff --git a/misc/examples/complex.c b/misc/examples/complex.c
index b5ea847a..405afef3 100644
--- a/misc/examples/complex.c
+++ b/misc/examples/complex.c
@@ -9,11 +9,11 @@
 #include <stc/cstr.h>
 
 #define i_type FloatStack
-#define i_val float
+#define i_key float
 #include <stc/cstack.h>
 
 #define i_type StackList
-#define i_valclass FloatStack  // "class" picks up _clone, _drop, _cmp
+#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>
 
diff --git a/misc/examples/convert.c b/misc/examples/convert.c
index 318f09b8..3b9dc3ec 100644
--- a/misc/examples/convert.c
+++ b/misc/examples/convert.c
@@ -6,10 +6,10 @@
 #define i_val_str
 #include <stc/cmap.h>
 
-#define i_val_str
+#define i_key_str
 #include <stc/cvec.h>
 
-#define i_val_str
+#define i_key_str
 #include <stc/clist.h>
 
 int main()
diff --git a/misc/examples/csmap_find.c b/misc/examples/csmap_find.c
index 645828a3..b535e9ad 100644
--- a/misc/examples/csmap_find.c
+++ b/misc/examples/csmap_find.c
@@ -8,7 +8,7 @@
 #define i_tag istr
 #include <stc/csmap.h>
 
-#define i_val csmap_istr_raw
+#define i_key csmap_istr_raw
 #define i_tag istr
 #include <stc/cvec.h>
 
diff --git a/misc/examples/csmap_insert.c b/misc/examples/csmap_insert.c
index 18a88ec3..df638c22 100644
--- a/misc/examples/csmap_insert.c
+++ b/misc/examples/csmap_insert.c
@@ -12,7 +12,7 @@
 #define i_tag istr // Map of int => cstr
 #include <stc/csmap.h>
 
-#define i_val csmap_ii_raw
+#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/demos.c b/misc/examples/demos.c
index b2f50ebf..2e91b20c 100644
--- a/misc/examples/demos.c
+++ b/misc/examples/demos.c
@@ -28,7 +28,7 @@ void stringdemo1()
     cstr_drop(&cs);
 }
 
-#define i_val int64_t
+#define i_key int64_t
 #define i_tag ix
 #include <stc/cvec.h>
 
@@ -52,7 +52,7 @@ void vectordemo1()
     cvec_ix_drop(&bignums);
 }
 
-#define i_val_str
+#define i_key_str
 #include <stc/cvec.h>
 
 void vectordemo2()
@@ -72,7 +72,7 @@ void vectordemo2()
     cvec_str_drop(&names);
 }
 
-#define i_val int
+#define i_key int
 #define i_tag ix
 #define i_native_cmp
 #include <stc/clist.h>
diff --git a/misc/examples/forfilter.c b/misc/examples/forfilter.c
index 7e3c4c9c..f3c008b3 100644
--- a/misc/examples/forfilter.c
+++ b/misc/examples/forfilter.c
@@ -7,7 +7,7 @@
 #include <stc/algo/crange.h>
 
 #define i_type IVec
-#define i_val int
+#define i_key int
 #include <stc/cstack.h>
 
 // filters and transforms:
@@ -83,7 +83,7 @@ fn main() {
 }
 */
 #define i_type SVec
-#define i_valclass csview
+#define i_keyclass csview
 #include <stc/cstack.h>
 
 void demo3(void)
diff --git a/misc/examples/forloops.c b/misc/examples/forloops.c
index 337cfaa1..99b12871 100644
--- a/misc/examples/forloops.c
+++ b/misc/examples/forloops.c
@@ -2,7 +2,7 @@
 #include <stc/algo/filter.h>

 

 #define i_type IVec

-#define i_val int

+#define i_key int

 #include <stc/cstack.h>

 

 #define i_type IMap

diff --git a/misc/examples/functor.c b/misc/examples/functor.c
index a233a874..ea409a56 100644
--- a/misc/examples/functor.c
+++ b/misc/examples/functor.c
@@ -6,7 +6,7 @@
 
 #define i_type IPQue
 #define i_base cpque
-#define i_val int
+#define i_key int
 #define i_extend bool(*less)(const int*, const int*);
 #define i_less(x, y) c_extend()->less(x, y)
 // Note: i_less: c_extend() accessible for cpque types
diff --git a/misc/examples/inits.c b/misc/examples/inits.c
index a3a6c4d2..53a49f1f 100644
--- a/misc/examples/inits.c
+++ b/misc/examples/inits.c
@@ -18,17 +18,17 @@ inline static int ipair_cmp(const ipair_t* a, const ipair_t* b) {
 }
 
 
-#define i_val ipair_t
+#define i_key ipair_t
 #define i_cmp ipair_cmp
 #define i_tag ip
 #include <stc/cvec.h>
 
-#define i_val ipair_t
+#define i_key ipair_t
 #define i_cmp ipair_cmp
 #define i_tag ip
 #include <stc/clist.h>
 
-#define i_val float
+#define i_key float
 #define i_tag f
 #include <stc/cpque.h>
 
diff --git a/misc/examples/intrusive.c b/misc/examples/intrusive.c
index e3939f4e..1e3f7b83 100644
--- a/misc/examples/intrusive.c
+++ b/misc/examples/intrusive.c
@@ -3,7 +3,7 @@
 #include <stdio.h> 
 
 #define i_type List
-#define i_val int
+#define i_key int
 #define i_native_cmp
 #include <stc/clist.h>
 
diff --git a/misc/examples/list.c b/misc/examples/list.c
index 08fe837f..a0045db9 100644
--- a/misc/examples/list.c
+++ b/misc/examples/list.c
@@ -4,7 +4,7 @@
 #include <stc/crand.h>
 
 #define i_type DList
-#define i_val double
+#define i_key double
 #define i_native_cmp
 #include <stc/clist.h>
 
diff --git a/misc/examples/list_erase.c b/misc/examples/list_erase.c
index 17adf11f..357dd75b 100644
--- a/misc/examples/list_erase.c
+++ b/misc/examples/list_erase.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 
 #define i_type IList
-#define i_val int
+#define i_key int
 #include <stc/clist.h>
 
 int main ()
diff --git a/misc/examples/list_splice.c b/misc/examples/list_splice.c
index e457694d..25c2a42d 100644
--- a/misc/examples/list_splice.c
+++ b/misc/examples/list_splice.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#define i_val int
+#define i_key int
 #define i_tag i
 #include <stc/clist.h>
 
diff --git a/misc/examples/lower_bound.c b/misc/examples/lower_bound.c
index 5b395e45..ee32f49b 100644
--- a/misc/examples/lower_bound.c
+++ b/misc/examples/lower_bound.c
@@ -1,10 +1,10 @@
 #include <stdio.h>
 
-#define i_val int
+#define i_key int
 #define i_native_cmp
 #include <stc/cvec.h>
 
-#define i_val int
+#define i_key int
 #include <stc/csset.h>
 
 int main()
diff --git a/misc/examples/mmap.c b/misc/examples/mmap.c
index 63312e04..fd00499c 100644
--- a/misc/examples/mmap.c
+++ b/misc/examples/mmap.c
@@ -4,7 +4,7 @@
 // Multimap entries
 #define i_implement
 #include <stc/cstr.h>
-#define i_val_str
+#define i_key_str
 #include <stc/clist.h>
 
 // Map of int => clist_str.
diff --git a/misc/examples/multimap.c b/misc/examples/multimap.c
index dc4a1ee0..a89b251b 100644
--- a/misc/examples/multimap.c
+++ b/misc/examples/multimap.c
@@ -40,7 +40,7 @@ OlympicLoc OlympicLoc_clone(OlympicLoc loc);
 void OlympicLoc_drop(OlympicLoc* self);
 
 // Create a clist<OlympicLoc>, can be sorted by year.
-#define i_valclass OlympicLoc // binds _cmp, _clone and _drop.
+#define i_keyclass OlympicLoc // binds _cmp, _clone and _drop.
 #define i_tag OL
 #include <stc/clist.h>
 
diff --git a/misc/examples/music_arc.c b/misc/examples/music_arc.c
index 4efc35c8..49008523 100644
--- a/misc/examples/music_arc.c
+++ b/misc/examples/music_arc.c
@@ -22,13 +22,13 @@ void Song_drop(Song* s) {
 
 // Define the shared pointer:
 #define i_type SongArc
-#define i_valclass Song
+#define i_keyclass Song
 #define i_no_hash          // no hash fn for Song, fallback hash pointer to Song.
 #include <stc/carc.h>
 
 // ... and a vector of them
 #define i_type SongVec
-#define i_valboxed SongArc // use i_valboxed on carc / cbox (instead of i_val)
+#define i_keyboxed SongArc // use i_keyboxed on carc / cbox (instead of i_key)
 #include <stc/cvec.h>
 
 void example3()
diff --git a/misc/examples/new_list.c b/misc/examples/new_list.c
index 5ffdaca2..ee250b2b 100644
--- a/misc/examples/new_list.c
+++ b/misc/examples/new_list.c
@@ -9,7 +9,7 @@ typedef struct {
     clist_pnt pntlist;
 } MyStruct;
 
-#define i_val int
+#define i_key int
 #define i_tag i32
 #define i_is_forward
 #include <stc/clist.h>
@@ -20,20 +20,20 @@ int point_cmp(const Point* a, const Point* b) {
     return c ? c : a->y - b->y;
 }
 
-#define i_val Point
+#define i_key Point
 #define i_cmp point_cmp
 #define i_is_forward
 #define i_tag pnt
 #include <stc/clist.h>
 
-#define i_val float
+#define i_key float
 #define i_native_cmp               // use < and == operators for comparison 
 #include <stc/clist.h>
 
 void MyStruct_drop(MyStruct* s);
 #define i_type MyList
-#define i_val MyStruct
-#define i_valdrop MyStruct_drop   // define drop function
+#define i_key MyStruct
+#define i_keydrop MyStruct_drop   // define drop function
 #define i_no_clone                // must explicitely exclude or define cloning support because of drop.
 #include <stc/clist.h>
 
diff --git a/misc/examples/new_pque.c b/misc/examples/new_pque.c
index dc2ecf12..3df39e0e 100644
--- a/misc/examples/new_pque.c
+++ b/misc/examples/new_pque.c
@@ -3,7 +3,7 @@
 typedef struct Point { int x, y; } Point;
 
 #define i_type PointQ
-#define i_val Point
+#define i_key Point
 #define i_less(a, b) a->x < b->x || (a->x == b->x && a->y < b->y)
 #include <stc/cpque.h>
 
diff --git a/misc/examples/new_queue.c b/misc/examples/new_queue.c
index b784bc18..104871bf 100644
--- a/misc/examples/new_queue.c
+++ b/misc/examples/new_queue.c
@@ -10,14 +10,14 @@ int point_cmp(const Point* a, const Point* b) {
     int c = c_default_cmp(&a->x, &b->x);
     return c ? c : c_default_cmp(&a->y, &b->y);
 }
-#define i_val Point
+#define i_key Point
 #define i_cmp point_cmp
 #define i_is_forward
 #define i_tag pnt
 #include <stc/cqueue.h>
 
 #define i_type IQ
-#define i_val int
+#define i_key int
 #include <stc/cqueue.h>
 
 int main() {
diff --git a/misc/examples/new_sptr.c b/misc/examples/new_sptr.c
index 2eff41a5..7fef5d1f 100644
--- a/misc/examples/new_sptr.c
+++ b/misc/examples/new_sptr.c
@@ -9,21 +9,21 @@ int Person_cmp(const Person* a, const Person* b);
 uint64_t Person_hash(const Person* p);
 
 #define i_type PersonArc
-#define i_valclass Person // "class" assume _clone, _drop, _cmp, _hash is defined.
+#define i_keyclass Person // "class" assume _clone, _drop, _cmp, _hash is defined.
 #include <stc/carc.h>
 
 #define i_type IPtr
-#define i_val int
-#define i_valdrop(x) printf("drop: %d\n", *x)
+#define i_key int
+#define i_keydrop(x) printf("drop: %d\n", *x)
 #define i_native_cmp
 #include <stc/carc.h>
 
 #define i_type IPStack
-#define i_valboxed IPtr
+#define i_keyboxed IPtr
 #include <stc/cstack.h>
 
 #define i_type PASet
-#define i_valboxed PersonArc
+#define i_keyboxed PersonArc
 #include <stc/cset.h>
 
 
diff --git a/misc/examples/new_vec.c b/misc/examples/new_vec.c
index 6329b185..6d928cfc 100644
--- a/misc/examples/new_vec.c
+++ b/misc/examples/new_vec.c
@@ -9,14 +9,14 @@ typedef struct MyStruct {
     cvec_pnt pntvec;
 } MyStruct;
 
-#define i_val int
+#define i_key int
 #define i_tag i32
 #define i_is_forward
 #include <stc/cvec.h>
 
 typedef struct Point { int x, y; } Point;
 
-#define i_val Point
+#define i_key Point
 #define i_tag pnt
 #define i_less(a, b) a->x < b->x || (a->x == b->x && a->y < b->y)
 #define i_eq(a, b) a->x == b->x && a->y == b->y
diff --git a/misc/examples/person_arc.c b/misc/examples/person_arc.c
index 3614c02d..c78b541c 100644
--- a/misc/examples/person_arc.c
+++ b/misc/examples/person_arc.c
@@ -31,12 +31,12 @@ void Person_drop(Person* p) {
 }
 
 #define i_type PSPtr
-#define i_valclass Person // ensure Person_drop
+#define i_keyclass Person // ensure Person_drop
 #define i_cmp Person_cmp   // specify object cmp, instead of ptr cmp for arc.
 #include <stc/carc.h>
 
 #define i_type Persons
-#define i_valboxed PSPtr // binds PSPtr_cmp, PSPtr_drop...
+#define i_keyboxed PSPtr // binds PSPtr_cmp, PSPtr_drop...
 #include <stc/cvec.h>
 
 
diff --git a/misc/examples/printspan.c b/misc/examples/printspan.c
index 7564bd88..5084536a 100644
--- a/misc/examples/printspan.c
+++ b/misc/examples/printspan.c
@@ -3,14 +3,14 @@
 #include <stdio.h>
 #define i_implement
 #include <stc/cstr.h>
-#define i_val int
+#define i_key int
 #include <stc/cvec.h>
-#define i_val int
+#define i_key int
 #include <stc/cstack.h>
-#define i_val_str
+#define i_key_str
 #include <stc/csset.h>
-#include <stc/cspan.h>
 
+#include <stc/cspan.h>
 using_cspan(intspan, int, 1);
 
 void printMe(intspan container) {
diff --git a/misc/examples/priority.c b/misc/examples/priority.c
index 95dd3183..148e8fc5 100644
--- a/misc/examples/priority.c
+++ b/misc/examples/priority.c
@@ -3,7 +3,7 @@
 #include <time.h>
 #include <stc/crand.h>
 
-#define i_val int64_t
+#define i_key int64_t
 #define i_cmp -c_default_cmp  // min-heap (increasing values)
 #define i_tag i
 #include <stc/cpque.h>
diff --git a/misc/examples/queue.c b/misc/examples/queue.c
index 83c18d09..3154f115 100644
--- a/misc/examples/queue.c
+++ b/misc/examples/queue.c
@@ -1,7 +1,7 @@
 #include <stc/crand.h>
 #include <stdio.h>
 
-#define i_val int
+#define i_key int
 #define i_tag i
 #include <stc/cqueue.h>
 
diff --git a/misc/examples/rawptr_elements.c b/misc/examples/rawptr_elements.c
index 8dd52aee..9c394d8e 100644
--- a/misc/examples/rawptr_elements.c
+++ b/misc/examples/rawptr_elements.c
@@ -16,7 +16,7 @@
 
 // Alternatively, using cbox:
 #define i_type IBox
-#define i_val long
+#define i_key long
 #include <stc/cbox.h> // unique_ptr<long> alike.
 
 // cmap of cstr => IBox
diff --git a/misc/examples/read.c b/misc/examples/read.c
index 3c1cadf6..c25cd740 100644
--- a/misc/examples/read.c
+++ b/misc/examples/read.c
@@ -1,7 +1,7 @@
 #define i_implement
 #include <stc/cstr.h>
 #include <stc/algo/raii.h>
-#define i_val_str
+#define i_key_str
 #include <stc/cvec.h>
 #include <errno.h>
 
diff --git a/misc/examples/regex_match.c b/misc/examples/regex_match.c
index 310e0797..88d3747b 100644
--- a/misc/examples/regex_match.c
+++ b/misc/examples/regex_match.c
@@ -3,7 +3,7 @@
 #define i_implement
 #include <stc/csview.h>
 
-#define i_val float
+#define i_key float
 #include <stc/cstack.h>
 
 int main()
diff --git a/misc/examples/scheduler.c b/misc/examples/scheduler.c
index c1168850..d812ff42 100644
--- a/misc/examples/scheduler.c
+++ b/misc/examples/scheduler.c
@@ -9,7 +9,7 @@ struct Task {
 };
 
 #define i_type Scheduler
-#define i_val struct Task
+#define i_key struct Task
 #include <stc/cqueue.h>
 
 static bool schedule(Scheduler* sched)
diff --git a/misc/examples/shape.c b/misc/examples/shape.c
index 1d9fe5c5..bd4bdd5a 100644
--- a/misc/examples/shape.c
+++ b/misc/examples/shape.c
@@ -76,7 +76,7 @@ struct ShapeAPI Triangle_api = {
 // ============================================================
 
 #define i_type PointVec 
-#define i_val Point
+#define i_key Point
 #include <stc/cstack.h>
 
 typedef struct {
@@ -122,8 +122,8 @@ struct ShapeAPI Polygon_api = {
 // ============================================================
 
 #define i_type Shapes
-#define i_val Shape*
-#define i_valdrop(x) Shape_delete(*x)
+#define i_key Shape*
+#define i_keydrop(x) Shape_delete(*x)
 #define i_no_clone
 #include <stc/cstack.h>
 
diff --git a/misc/examples/stack.c b/misc/examples/stack.c
index c817e1ae..96bab24b 100644
--- a/misc/examples/stack.c
+++ b/misc/examples/stack.c
@@ -3,11 +3,11 @@
 
 #define i_tag i
 #define i_capacity 100
-#define i_val int
+#define i_key int
 #include <stc/cstack.h>
 
 #define i_tag c
-#define i_val char
+#define i_key char
 #include <stc/cstack.h>
 
 int main() {
diff --git a/misc/tests/cspan_test.c b/misc/tests/cspan_test.c
index 6834dce1..aa055ea6 100644
--- a/misc/tests/cspan_test.c
+++ b/misc/tests/cspan_test.c
@@ -44,7 +44,7 @@ CTEST(cspan, slice) {
     ASSERT_EQ(45, sum2);
 }
 
-#define i_val int
+#define i_key int
 #include <stc/cstack.h>
 
 CTEST(cspan, slice2) {
@@ -75,7 +75,7 @@ CTEST(cspan, slice2) {
 
 
 #define i_type Tiles
-#define i_val intspan3
+#define i_key intspan3
 #include <stc/cstack.h>
 
 CTEST_FIXTURE(cspan_cube) {