1 files changed, 14 insertions, 19 deletions

diff --git a/misc/examples/printspan.c b/misc/examples/printspan.c
index 7459ac77..cd3c5f4f 100644
--- a/misc/examples/printspan.c
+++ b/misc/examples/printspan.c
@@ -1,17 +1,16 @@
 // printspan.c
 
 #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 int
-#include <stc/cdeq.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) {
@@ -21,29 +20,26 @@ void printMe(intspan container) {
     puts("");
 }
 
-int main()
+int main(void)
 {
-    intspan sp1 = cspan_make(intspan, {1, 2});
+    intspan sp1 = cspan_init(intspan, {1, 2});
     printMe( sp1 );
 
-    printMe( c_make(intspan, {1, 2, 3}) );
+    printMe( c_init(intspan, {1, 2, 3}) );
 
     int arr[] = {1, 2, 3, 4, 5, 6};
     intspan sp2 = cspan_from_array(arr);
-    printMe( (intspan)cspan_subspan(&sp2, 1, 4) );
+    printMe( c_LITERAL(intspan)cspan_subspan(&sp2, 1, 4) );
 
-    cvec_int vec = c_make(cvec_int, {1, 2, 3, 4, 5});
-    printMe( (intspan)cspan_from(&vec) );
+    cvec_int vec = c_init(cvec_int, {1, 2, 3, 4, 5});
+    printMe( c_LITERAL(intspan)cspan_from(&vec) );
 
     printMe( sp2 );
 
-    cstack_int stk = c_make(cstack_int, {1, 2, 3, 4, 5, 6, 7});
-    printMe( (intspan)cspan_from(&stk) );
-
-    cdeq_int deq = c_make(cdeq_int, {1, 2, 3, 4, 5, 6, 7, 8});
-    printMe( (intspan)cspan_from(&deq) );
+    cstack_int stk = c_init(cstack_int, {1, 2, 3, 4, 5, 6, 7});
+    printMe( c_LITERAL(intspan)cspan_from(&stk) );
 
-    csset_str set = c_make(csset_str, {"5", "7", "4", "3", "8", "2", "1", "9", "6"});
+    csset_str set = c_init(csset_str, {"5", "7", "4", "3", "8", "2", "1", "9", "6"});
     printf("%d:", (int)csset_str_size(&set));
     c_foreach (e, csset_str, set)
         printf(" %s", cstr_str(e.ref));
@@ -52,6 +48,5 @@ int main()
     // cleanup
     cvec_int_drop(&vec);
     cstack_int_drop(&stk);
-    cdeq_int_drop(&deq);
     csset_str_drop(&set);
 }