Updates, and prepare for the big unsigned ==> signed transformation.

2 files changed, 19 insertions, 18 deletions

diff --git a/misc/examples/multidim.c b/misc/examples/multidim.c
index b7ee46fb..3bc1feec 100644
--- a/misc/examples/multidim.c
+++ b/misc/examples/multidim.c
@@ -9,7 +9,7 @@ using_cspan3(ispan, int);
 int main()
 {
     cstack_int v = {0};
-    c_FORLIST (i, unsigned, {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24})
+    c_FORLIST (i, int, {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24})
         cstack_int_push(&v, *i.ref);
 
     // View data as contiguous memory representing 24 ints
@@ -19,9 +19,9 @@ int main()
     ispan3 ms3 = cspan_md(v.data, 2, 3, 4);
 
     puts("ms3:");
-    for (unsigned i=0; i != ms3.dim[0]; i++) {
-        for (unsigned j=0; j != ms3.dim[1]; j++) {
-            for (unsigned k=0; k != ms3.dim[2]; k++) {
+    for (int i=0; i != ms3.dim[0]; i++) {
+        for (int j=0; j != ms3.dim[1]; j++) {
+            for (int k=0; k != ms3.dim[2]; k++) {
                 printf(" %2d", *cspan_at(&ms3, i, j, k));
             }
             puts("");
@@ -32,9 +32,9 @@ int main()
     ispan3 ss3 = ms3;
     cspan_slice(&ss3, {0}, {1,3}, {1,3});
 
-    for (unsigned i=0; i != ss3.dim[0]; i++) {
-        for (unsigned j=0; j != ss3.dim[1]; j++) {
-            for (unsigned k=0; k != ss3.dim[2]; k++) {
+    for (int i=0; i != ss3.dim[0]; i++) {
+        for (int j=0; j != ss3.dim[1]; j++) {
+            for (int k=0; k != ss3.dim[2]; k++) {
                 printf(" %2d", *cspan_at(&ss3, i, j, k));
             }
             puts("");
@@ -50,12 +50,12 @@ int main()
     ispan2 ms2 = cspan_submd3(&ms3, 0);
 
     // write data using 2D view
-    for (unsigned i=0; i != ms2.dim[0]; i++)
-        for (unsigned j=0; j != ms2.dim[1]; j++)
+    for (int i=0; i != ms2.dim[0]; i++)
+        for (int j=0; j != ms2.dim[1]; j++)
             *cspan_at(&ms2, i, j) = i*1000 + j;
 
     puts("\nview data as 1D view:");
-    for (unsigned i=0; i != cspan_size(&ms1); i++)
+    for (int i=0; i != cspan_size(&ms1); i++)
         printf(" %d", *cspan_at(&ms1, i));
     puts("");
 
diff --git a/misc/examples/new_map.c b/misc/examples/new_map.c
index 72705eb2..9cee987d 100644
--- a/misc/examples/new_map.c
+++ b/misc/examples/new_map.c
@@ -48,24 +48,25 @@ int main()
     c_AUTO (cset_str, sset)
     {
         cmap_int_insert(&map, 123, 321);
+        cmap_int_insert(&map, 456, 654);
+        cmap_int_insert(&map, 789, 987);
 
-        c_FORLIST (i, cmap_pnt_raw, {{{42, 14}, 1}, {{32, 94}, 2}, {{62, 81}, 3}})
-            cmap_pnt_insert(&pmap, c_PAIR(i.ref));
+        pmap = c_make(cmap_pnt, {{{42, 14}, 1}, {{32, 94}, 2}, {{62, 81}, 3}});
 
         c_FOREACH (i, cmap_pnt, pmap)
             printf(" (%d, %d: %d)", i.ref->first.x, i.ref->first.y, i.ref->second);
         puts("");
 
-        c_FORLIST (i, cmap_str_raw, {
+        smap = c_make(cmap_str, {
             {"Hello, friend", "long time no see"},
-            {"So long, friend", "see you around"},
-        }) cmap_str_emplace(&smap, c_PAIR(i.ref));
+            {"So long", "see you around"},
+        });
 
-        c_FORLIST (i, const char*, {
+        sset = c_make(cset_str, {
             "Hello, friend",
             "Nice to see you again",
-            "So long, friend",
-        }) cset_str_emplace(&sset, *i.ref);
+            "So long",
+        });
 
         c_FOREACH (i, cset_str, sset)
             printf(" %s\n", cstr_str(i.ref));