Experimental: Renamed c_autovar => c_with, c_autoscope => c_scope, c_autodefer => c_defer. May or may not be reverted before V4.0 release.

13 files changed, 25 insertions, 25 deletions

diff --git a/examples/arc_demo.c b/examples/arc_demo.c
index 85e3886f..688fe72f 100644
--- a/examples/arc_demo.c
+++ b/examples/arc_demo.c
@@ -47,7 +47,7 @@ int main()
         printf("\nset:");
         c_foreach (i, csset_Arc, set) printf(" %d", *i.ref->get);
 
-        c_autovar (Arc p = Arc_clone(vec.data[0]), Arc_drop(&p)) {
+        c_with (Arc p = Arc_clone(vec.data[0]), Arc_drop(&p)) {
             printf("\n%d is now owned by %ld objects\n", *p.get, *p.use_count);
         }
 
diff --git a/examples/astar.c b/examples/astar.c
index cb498b11..4d9f2469 100644
--- a/examples/astar.c
+++ b/examples/astar.c
@@ -131,7 +131,7 @@ astar(cstr* maze, int width)
 int
 main(void)
 {
-    c_autovar (cstr maze = cstr_new(
+    c_with (cstr maze = cstr_new(
         "#########################################################################\n"
         "#   #               #               #           #                   #   #\n"
         "#   #   #########   #   #####   #########   #####   #####   #####   # ! #\n"
@@ -157,7 +157,7 @@ main(void)
         "#########################################################################\n"), cstr_drop(&maze))
     {
         int width = cstr_find(&maze, "\n") + 1;
-        c_autovar (cdeq_point path = astar(&maze, width), cdeq_point_drop(&path))
+        c_with (cdeq_point path = astar(&maze, width), cdeq_point_drop(&path))
         {
             c_foreach (it, cdeq_point, path) cstr_data(&maze)[point_index(it.ref)] = 'x';
             printf("%s", cstr_str(&maze));
diff --git a/examples/bits.c b/examples/bits.c
index 8cce573e..c6e70517 100644
--- a/examples/bits.c
+++ b/examples/bits.c
@@ -3,7 +3,7 @@
 
 int main() 
 {
-    c_autovar (cbits set = cbits_with_size(23, true), cbits_drop(&set)) {
+    c_with (cbits set = cbits_with_size(23, true), cbits_drop(&set)) {
         printf("count %" PRIuMAX ", %" PRIuMAX "\n", cbits_count(&set), cbits_size(&set));
         cbits s1 = cbits_from("1110100110111");
         char buf[256];
@@ -36,7 +36,7 @@ int main()
             printf("%d", cbits_test(&set, i));
         puts("");
 
-        c_autovar (cbits s2 = cbits_clone(set), cbits_drop(&s2)) {
+        c_with (cbits s2 = cbits_clone(set), cbits_drop(&s2)) {
             cbits_flip_all(&s2);
             cbits_set(&s2, 16);
             cbits_set(&s2, 17);
diff --git a/examples/box.c b/examples/box.c
index c7e649bf..b12f1f71 100644
--- a/examples/box.c
+++ b/examples/box.c
@@ -59,7 +59,7 @@ int main()
         puts("");
 
         // Look-up Audrey! Create a temporary Person for lookup.
-        c_autovar (Person a = Person_new("Audrey", "Home"), Person_drop(&a)) {
+        c_with (Person a = Person_new("Audrey", "Home"), Person_drop(&a)) {
             const PBox *v = Persons_get(&vec, a); // lookup
             if (v) printf("found: %s %s\n", cstr_str(&v->get->name), cstr_str(&v->get->last));
         }
diff --git a/examples/cstr_match.c b/examples/cstr_match.c
index 317ff986..614af490 100644
--- a/examples/cstr_match.c
+++ b/examples/cstr_match.c
@@ -4,7 +4,7 @@
 
 int main()
 {
-    c_autovar (cstr ss = cstr_new("The quick brown fox jumps over the lazy dog.JPG"), cstr_drop(&ss)) {
+    c_with (cstr ss = cstr_new("The quick brown fox jumps over the lazy dog.JPG"), cstr_drop(&ss)) {
         size_t pos = cstr_find_at(&ss, 0, "brown");
         printf("%" PRIuMAX " [%s]\n", pos, pos == cstr_npos ? "<NULL>" : cstr_str(&ss) + pos);
         printf("equals: %d\n", cstr_equals(&ss, "The quick brown fox jumps over the lazy dog.JPG"));
diff --git a/examples/demos.c b/examples/demos.c
index cd715d46..331ef04f 100644
--- a/examples/demos.c
+++ b/examples/demos.c
@@ -3,7 +3,7 @@
 void stringdemo1()
 {
     printf("\nSTRINGDEMO1\n");
-    c_autovar (cstr cs = cstr_new("one-nine-three-seven-five"), cstr_drop(&cs))
+    c_with (cstr cs = cstr_new("one-nine-three-seven-five"), cstr_drop(&cs))
     {
         printf("%s.\n", cstr_str(&cs));
 
@@ -35,7 +35,7 @@ void stringdemo1()
 void vectordemo1()
 {
     printf("\nVECTORDEMO1\n");
-    c_autovar (cvec_ix bignums = cvec_ix_with_capacity(100), cvec_ix_drop(&bignums))
+    c_with (cvec_ix bignums = cvec_ix_with_capacity(100), cvec_ix_drop(&bignums))
     {
         cvec_ix_reserve(&bignums, 100);
         for (size_t i = 10; i <= 100; i += 10)
@@ -192,8 +192,8 @@ void mapdemo3()
 void arraydemo1()
 {
     printf("\nARRAYDEMO1\n");
-    c_autovar (carr3_f arr3 = carr3_f_with_size(30, 20, 10, 0.0f), 
-                             carr3_f_drop(&arr3))
+    c_with (carr3_f arr3 = carr3_f_with_size(30, 20, 10, 0.0f), 
+                           carr3_f_drop(&arr3))
     {
         arr3.data[5][4][3] = 10.2f;
         float **arr2 = arr3.data[5];
diff --git a/examples/new_arr.c b/examples/new_arr.c
index 17a96062..598e5323 100644
--- a/examples/new_arr.c
+++ b/examples/new_arr.c
@@ -13,8 +13,8 @@ int main()
 {
     int w = 7, h = 5, d = 3;
 
-    c_autovar (carr2_int volume = carr2_int_new_uninit(w, h),
-                                  carr2_int_drop(&volume))
+    c_with (carr2_int volume = carr2_int_new_uninit(w, h),
+                               carr2_int_drop(&volume))
     {
         int *dat = carr2_int_data(&volume);
         for (size_t i = 0; i < carr2_int_size(&volume); ++i)
@@ -30,8 +30,8 @@ int main()
         puts("\n");
     }
 
-    c_autovar (carr3_int volume = carr3_int_new_uninit(w, h, d),
-                                  carr3_int_drop(&volume))
+    c_with (carr3_int volume = carr3_int_new_uninit(w, h, d),
+                               carr3_int_drop(&volume))
     {
         int *dat = carr3_int_data(&volume);
         for (size_t i = 0; i < carr3_int_size(&volume); ++i)
@@ -48,8 +48,8 @@ int main()
         puts("");
     }
 
-    c_autovar (carr2_str text2d = carr2_str_with_size(h, d, cstr_init()),
-                                  carr2_str_drop(&text2d))
+    c_with (carr2_str text2d = carr2_str_with_size(h, d, cstr_init()),
+                               carr2_str_drop(&text2d))
     {
         cstr_assign(&text2d.data[2][1], "hello");
         cstr_assign(&text2d.data[4][0], "world");
diff --git a/examples/person_arc.c b/examples/person_arc.c
index 272a3f72..bddf7bd6 100644
--- a/examples/person_arc.c
+++ b/examples/person_arc.c
@@ -62,7 +62,7 @@ int main()
         puts("");
 
         // Look-up Audrey!
-        c_autovar (Person a = Person_new("Audrey", "Home"), Person_drop(&a)) {
+        c_with (Person a = Person_new("Audrey", "Home"), Person_drop(&a)) {
             const PSPtr *v = Persons_get(&vec, a);
             if (v) printf("found: %s %s\n", cstr_str(&v->get->name), cstr_str(&v->get->last));
         }
diff --git a/examples/prime.c b/examples/prime.c
index 85a66ee5..7af66f33 100644
--- a/examples/prime.c
+++ b/examples/prime.c
@@ -27,7 +27,7 @@ int main(void)
     printf("computing prime numbers up to %" PRIuMAX "\n", n);
 
     clock_t t1 = clock();
-    c_autovar (cbits primes = sieveOfEratosthenes(n + 1), cbits_drop(&primes)) {
+    c_with (cbits primes = sieveOfEratosthenes(n + 1), cbits_drop(&primes)) {
         puts("done");
         size_t np = cbits_count(&primes);
         clock_t t2 = clock();
diff --git a/examples/read.c b/examples/read.c
index 26fc46dd..5a9a30d5 100644
--- a/examples/read.c
+++ b/examples/read.c
@@ -6,8 +6,8 @@
 cvec_str read_file(const char* name)
 {
     cvec_str vec = cvec_str_init();
-    c_autovar (FILE* f = fopen(name, "r"), fclose(f))
-        c_autovar (cstr line = cstr_init(), cstr_drop(&line))
+    c_with (FILE* f = fopen(name, "r"), fclose(f))
+        c_with (cstr line = cstr_null, cstr_drop(&line))
             while (cstr_getline(&line, f))
                 cvec_str_push(&vec, cstr_clone(line));
     return vec;
@@ -16,7 +16,7 @@ cvec_str read_file(const char* name)
 int main()
 {
     int n = 0;
-    c_autovar (cvec_str vec = read_file(__FILE__), cvec_str_drop(&vec))
+    c_with (cvec_str vec = read_file(__FILE__), cvec_str_drop(&vec))
         c_foreach (i, cvec_str, vec)
             printf("%5d: %s\n", ++n, cstr_str(i.ref));
 
diff --git a/examples/regex_replace.c b/examples/regex_replace.c
index ccc90dba..2ccbfc3c 100644
--- a/examples/regex_replace.c
+++ b/examples/regex_replace.c
@@ -34,7 +34,7 @@ int main()
         printf("brack: %s\n", cstr_str(&str));
 
         /* Shows how to compile RE separately */
-        c_autovar (cregex re = cregex_from(pattern, 0), cregex_drop(&re)) {
+        c_with (cregex re = cregex_from(pattern, 0), cregex_drop(&re)) {
             if (cregex_captures(&re) == 0)
                   c_breakauto;
             /* European date format. */
diff --git a/examples/replace.c b/examples/replace.c
index 13b6eaaf..c22c71ff 100644
--- a/examples/replace.c
+++ b/examples/replace.c
@@ -11,7 +11,7 @@ int main ()
     // Ustring positions:                                      0123456789*123456789*12345
     cstr s = cstr_from(base);                              // "this is a test string."
     cstr m = cstr_clone(s);
-    c_autodefer (cstr_drop(&s), cstr_drop(&m)) {
+    c_defer (cstr_drop(&s), cstr_drop(&m)) {
         cstr_append(&m, cstr_str(&m));
         cstr_append(&m, cstr_str(&m));
         printf("%s\n", cstr_str(&m));
diff --git a/examples/splitstr.c b/examples/splitstr.c
index 68c36291..c483fbe0 100644
--- a/examples/splitstr.c
+++ b/examples/splitstr.c
@@ -33,7 +33,7 @@ int main()
     print_split(c_sv("This has no matching separator"), c_sv("xx"));
     puts("");
 
-    c_autovar (cstack_str s = string_split(c_sv("Split,this,,string,now,"), c_sv(",")), cstack_str_drop(&s))
+    c_with (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));
 }