csview: csview_token(sv, sep, &start): now start > sv.size on last token. Removed usage of c_ARGsv() macro in examples => printf formatting ".*s". csview fully inlined.

7 files changed, 25 insertions, 25 deletions

diff --git a/examples/cstr_match.c b/examples/cstr_match.c
index 9c4fa2d3..6927ed80 100644
--- a/examples/cstr_match.c
+++ b/examples/cstr_match.c
@@ -17,7 +17,7 @@ int main()
         csview ch1 = cstr_u8_chr(&s1, 7);
         csview ch2 = cstr_u8_chr(&s1, 10);
         printf("%s\nsize: %" PRIuMAX ", %" PRIuMAX "\n", cstr_str(&s1), cstr_u8_size(s1), cstr_size(s1));
-        printf("ch1: %" c_PRIsv "\n", c_ARGsv(ch1));
-        printf("ch2: %" c_PRIsv "\n", c_ARGsv(ch2));
+        printf("ch1: %.*s\n", c_ARGsv(ch1));
+        printf("ch2: %.*s\n", c_ARGsv(ch2));
     }
 }
diff --git a/examples/regex2.c b/examples/regex2.c
index 307579d4..cc9464c3 100644
--- a/examples/regex2.c
+++ b/examples/regex2.c
@@ -24,7 +24,7 @@ int main()
             {
                 c_forrange (j, cregex_captures(&re))
                 {
-                    printf("  submatch %" PRIuMAX ": %" c_PRIsv "\n", j, c_ARGsv(m[j]));
+                    printf("  submatch %" PRIuMAX ": %.*s\n", j, c_ARGsv(m[j]));
                 }
                 puts("");
             }
diff --git a/examples/regex_match.c b/examples/regex_match.c
index cb0fdd11..72039fde 100644
--- a/examples/regex_match.c
+++ b/examples/regex_match.c
@@ -22,7 +22,7 @@ int main()
         }
 
         while (cregex_find(s, &re, m, cre_m_next) == 1) {
-            printf("%" c_PRIsv " ; ", c_ARGsv(m[0]));
+            printf("%.*s ; ", c_ARGsv(m[0]));
         }
         puts("");
 
@@ -30,7 +30,7 @@ int main()
         printf("groups: %d\n", res);
         if ((res = cregex_find("hello@wørld", &re, m, 0)) == 1) {
             c_forrange (i, res)
-                printf("match: [%" c_PRIsv "]\n", c_ARGsv(m[i]));
+                printf("match: [%.*s]\n", c_ARGsv(m[i]));
         } else
             printf("err: %d\n", res);
     }
diff --git a/examples/splitstr.c b/examples/splitstr.c
index 942d4eec..68c36291 100644
--- a/examples/splitstr.c
+++ b/examples/splitstr.c
@@ -1,27 +1,29 @@
-#include <stc/cstr.h>
+#include <stdio.h>
 #include <stc/csview.h>
-#define i_val_str
-#include <stc/cvec.h>
 
-void print_split(csview str, csview sep)
+void print_split(csview input, csview sep)
 {
     size_t pos = 0;
-    while (pos != str.size) {
-        csview tok = csview_token(str, sep, &pos);
+    while (pos <= input.size) {
+        csview tok = csview_token(input, sep, &pos);
         // print non-null-terminated csview
-        printf("[%" c_PRIsv "]\n", c_ARGsv(tok));
+        printf("[%.*s]\n", c_ARGsv(tok));
     }
 }
 
-cvec_str string_split(csview str, csview sep)
+#include <stc/cstr.h>
+#define i_val_str
+#include <stc/cstack.h>
+
+cstack_str string_split(csview input, csview sep)
 {
-    cvec_str vec = cvec_str_init();
+    cstack_str out = cstack_str_init();
     size_t pos = 0;
-    while (pos != str.size) {
-        csview tok = csview_token(str, sep, &pos);
-        cvec_str_push_back(&vec, cstr_from_sv(tok));
+    while (pos <= input.size) {
+        csview tok = csview_token(input, sep, &pos);
+        cstack_str_push(&out, cstr_from_sv(tok));
     }
-    return vec;
+    return out;
 }
 
 int main()
@@ -31,7 +33,7 @@ int main()
     print_split(c_sv("This has no matching separator"), c_sv("xx"));
     puts("");
 
-    c_autovar (cvec_str v = string_split(c_sv("Split,this,,string,now,"), c_sv(",")), cvec_str_drop(&v))
-        c_foreach (i, cvec_str, v)
+    c_autovar (cstack_str s = string_split(c_sv("Split,this,,string,now,"), c_sv(",")), cstack_str_drop(&s))
+        c_foreach (i, cstack_str, s)
             printf("[%s]\n", cstr_str(i.ref));
 }
diff --git a/examples/sso_substr.c b/examples/sso_substr.c
index 4c49a942..b47512ea 100644
--- a/examples/sso_substr.c
+++ b/examples/sso_substr.c
@@ -9,8 +9,7 @@ int main ()
     size_t pos = cstr_find(str, "live");                   // position of "live"
     csview sv2 = cstr_substr_ex(&str, pos, 4);             // "live"
     csview sv3 = cstr_slice_ex(&str, -8, -1);              // "details"
-    printf("%" c_PRIsv ", %" c_PRIsv ", %" c_PRIsv "\n", 
-           c_ARGsv(sv1), c_ARGsv(sv2), c_ARGsv(sv3));
+    printf("%.*s, %.*s, %.*s\n", c_ARGsv(sv1), c_ARGsv(sv2), c_ARGsv(sv3));
 
     cstr_assign(&str, "apples are green or red");
     cstr s2 = cstr_from_sv(cstr_substr_ex(&str, -3, 3));   // "red"
diff --git a/examples/sview_split.c b/examples/sview_split.c
index 2c7ce395..155cdc28 100644
--- a/examples/sview_split.c
+++ b/examples/sview_split.c
@@ -11,8 +11,7 @@ int  main()
     const csview month = csview_token(date, c_sv("/"), &pos);
     const csview day = csview_token(date, c_sv("/"), &pos);
 
-    printf("%" c_PRIsv ", %" c_PRIsv ", %" c_PRIsv "\n", 
-           c_ARGsv(year), c_ARGsv(month), c_ARGsv(day));
+    printf("%.*s, %.*s, %.*s\n", c_ARGsv(year), c_ARGsv(month), c_ARGsv(day));
 
     c_auto (cstr, y, m, d) {
         y = cstr_from_sv(year), m = cstr_from_sv(month), d = cstr_from_sv(day);
diff --git a/examples/utf8replace_c.c b/examples/utf8replace_c.c
index 86d8bd69..792654b6 100644
--- a/examples/utf8replace_c.c
+++ b/examples/utf8replace_c.c
@@ -16,7 +16,7 @@ int main() {
         printf("%s\n", cstr_str(&hello));
 
         c_foreach (c, cstr, hello)
-            printf("%" c_PRIsv ",", c_ARGsv(c.chr));
+            printf("%.*s,", c_ARGsv(c.chr));
         puts("");
     }
 }