1 files changed, 66 insertions, 63 deletions

diff --git a/misc/examples/forfilter.c b/misc/examples/forfilter.c
index cd6d59cc..fdf8be6f 100644
--- a/misc/examples/forfilter.c
+++ b/misc/examples/forfilter.c
@@ -21,30 +21,28 @@
 
 void demo1(void)
 {
-    c_auto (IVec, vec) {
-        c_forlist (i, int, {0, 1, 2, 3, 4, 5, 80, 6, 7, 80, 8, 9, 80,
-                            10, 11, 12, 13, 14, 15, 80, 16, 17})
-            IVec_push(&vec, *i.ref);
-
-        puts("demo1:");
-        c_forfilter (i, IVec, vec, flt_skipValue(i, 80))
-            printf(" %d", *i.ref);
-        puts("");
-
-        int res, sum = 0;
-        c_forfilter (i, IVec, vec,
-                        c_flt_skipwhile(i, *i.ref != 80) &&
-                        c_flt_skip(i, 1)                 &&
-                        c_flt_skipwhile(i, *i.ref != 80) &&
-                        flt_isEven(i)                    &&
-                        flt_skipValue(i, 80)             &&
-                        c_flt_take(i, 5) // short-circuit
-        ){
-            sum += res = flt_square(i);
-            printf(" %d", res);
-        }
-        printf("\n sum: %d\n", sum);
+    IVec vec = c_make(IVec, {0, 1, 2, 3, 4, 5, 80, 6, 7, 80, 8, 9, 80,
+                             10, 11, 12, 13, 14, 15, 80, 16, 17});
+
+    c_forfilter (i, IVec, vec, flt_skipValue(i, 80))
+        printf(" %d", *i.ref);
+    puts("");
+
+    int res, sum = 0;
+    c_forfilter (i, IVec, vec,
+                    c_flt_skipwhile(i, *i.ref != 80) &&
+                    c_flt_skip(i, 1)                 &&
+                    c_flt_skipwhile(i, *i.ref != 80) &&
+                    flt_isEven(i)                    &&
+                    flt_skipValue(i, 80)             &&
+                    c_flt_take(i, 5) // short-circuit
+    ){
+        sum += res = flt_square(i);
+        printf(" %d", res);
     }
+
+    printf("\n sum: %d\n", sum);
+    IVec_drop(&vec);
 }
 
 
@@ -62,18 +60,19 @@ fn main() {
 
 void demo2(void)
 {
-    c_auto (IVec, vector) {
-        puts("demo2:");
-        crange R = crange_make(INT64_MAX);
-        c_forfilter (x, crange, R,
-                        c_flt_skipwhile(x, *x.ref != 11) &&
-                        *x.ref % 2 != 0                  &&
-                        c_flt_take(x, 5))
-            IVec_push(&vector, (int)(*x.ref * *x.ref));
-        c_foreach (x, IVec, vector)
-            printf(" %d", *x.ref);
-        puts("");
-    }
+    IVec vector = {0};
+
+    c_forfilter (x, crange, crange_obj(INT64_MAX),
+                    c_flt_skipwhile(x, *x.ref != 11) &&
+                    *x.ref % 2 != 0                  &&
+                    c_flt_take(x, 5))
+        IVec_push(&vector, (int)(*x.ref * *x.ref));
+
+    c_foreach (x, IVec, vector)
+        printf(" %d", *x.ref);
+    puts("");
+
+    IVec_drop(&vector);
 }
 
 /* Rust:
@@ -91,42 +90,45 @@ fn main() {
 */
 void demo3(void)
 {
-    c_auto (SVec, words, words_containing_i) {
-        const char* sentence = "This is a sentence in C99.";
-        c_fortoken (w, sentence, " ")
-            SVec_push(&words, *w.ref);
-
-        c_forfilter (w, SVec, words, 
-                        csview_contains(*w.ref, "i"))
-            SVec_push(&words_containing_i, *w.ref);
-
-        puts("demo3:");
-        c_foreach (w, SVec, words_containing_i)
-            printf(" %.*s", c_SV(*w.ref));
-        puts("");
-    }
+    const char* sentence = "This is a sentence in C99.";
+    SVec words = {0}; 
+    c_fortoken (w, sentence, " ") // split words
+        SVec_push(&words, *w.ref);
+
+    SVec words_containing_i = {0};
+    c_forfilter (w, SVec, words, 
+                    csview_contains(*w.ref, "i"))
+        SVec_push(&words_containing_i, *w.ref);
+
+    c_foreach (w, SVec, words_containing_i)
+        printf(" %.*s", c_SV(*w.ref));
+    puts("");
+
+    c_drop(SVec, &words, &words_containing_i);
 }
 
 void demo4(void)
 {
+    // Keep only uppercase letters and convert them to lowercase:
     csview s = c_sv("ab123cReAghNGnΩoEp"); // Ω = multi-byte
-    c_auto (cstr, out) {
-        c_forfilter (i, csview, s, utf8_isupper(utf8_peek(i.ref))) {
-            char chr[4];
-            utf8_encode(chr, utf8_tolower(utf8_peek(i.ref)));
-            cstr_push(&out, chr);
-        }
-        puts("demo4:");
-        printf(" %s\n", cstr_str(&out));
+    cstr out = {0};
+
+    c_forfilter (i, csview, s, utf8_isupper(utf8_peek(i.ref))) {
+        char chr[4];
+        utf8_encode(chr, utf8_tolower(utf8_peek(i.ref)));
+        cstr_push(&out, chr);
     }
+
+    printf(" %s\n", cstr_str(&out));
+    cstr_drop(&out);
 }
 
 void demo5(void)
 {
     #define flt_even(i) ((*i.ref & 1) == 0)
     #define flt_mid_decade(i) ((*i.ref % 10) != 0)
-    puts("demo5:");
     crange R = crange_make(1963, INT32_MAX);
+
     c_forfilter (i, crange, R,
                     c_flt_skip(i,15)                      &&
                     c_flt_skipwhile(i, flt_mid_decade(i)) &&
@@ -134,14 +136,15 @@ void demo5(void)
                     flt_even(i)                           &&
                     c_flt_take(i,5))
         printf(" %lld", *i.ref);
+
     puts("");
 }
 
 int main(void)
 {
-    demo1();
-    demo2();
-    demo3();
-    demo4();
-    demo5();
+    puts("demo1"); demo1();
+    puts("demo2"); demo2();
+    puts("demo3"); demo3();
+    puts("demo4"); demo4();
+    puts("demo5"); demo5();
 }