Changed iterator API in cset and clist. From i.get->value to *i.get

4 files changed, 14 insertions, 14 deletions

diff --git a/examples/demos.c b/examples/demos.c
index 634e4dde..f39b439f 100644
--- a/examples/demos.c
+++ b/examples/demos.c
@@ -84,19 +84,19 @@ void listdemo1()
     for (int i = 100; i < 110; ++i)

         clist_ix_push_back(&nums2, i);

     c_foreach (i, clist_ix, nums)

-        printf("value: %d\n", i.get->value);

+        printf("value: %d\n", *i.get);

     /* merge/append nums2 to nums */

     clist_ix_splice_front(&nums, &nums2);

     c_foreach (i, clist_ix, nums)

-        printf("spliced: %d\n", i.get->value);

+        printf("spliced: %d\n", *i.get);

 

-    clist_ix_find(&nums, 100).get->value *= 10;

+    *clist_ix_find(&nums, 100).get *= 10;

     clist_ix_sort(&nums);                     // Sort the array

     clist_ix_remove(&nums, 105);

     clist_ix_pop_front(&nums);

     clist_ix_push_front(&nums, -99);

     c_foreach (i, clist_ix, nums)

-        printf("sorted: %d\n", i.get->value);

+        printf("sorted: %d\n", *i.get);

     clist_ix_destroy(&nums);

 }

 

@@ -110,7 +110,7 @@ void setdemo1()
     cset_i_insert(&nums, 11);

 

     c_foreach (i, cset_i, nums)

-        printf("set: %d\n", i.get->value);

+        printf("set: %d\n", *i.get);

     cset_i_destroy(&nums);

 }

 

diff --git a/examples/inits.c b/examples/inits.c
index 4d07cb02..7cad8f4e 100644
--- a/examples/inits.c
+++ b/examples/inits.c
@@ -109,7 +109,7 @@ int main(void) {
     clist_ip_sort(&pairs2);

 

     c_foreach (i, clist_ip, pairs2)

-        printf("(%d %d) ", i.get->value.x, i.get->value.y);

+        printf("(%d %d) ", i.get->x, i.get->y);

     puts("");

     clist_ip_destroy(&pairs2);

 }
\ No newline at end of file
diff --git a/examples/list.c b/examples/list.c
index 55e6c419..4a131fac 100644
--- a/examples/list.c
+++ b/examples/list.c
@@ -9,24 +9,24 @@ int main() {
     clist_fx list = clist_ini;

     crand_rng64_t eng = crand_rng64_init(time(NULL));

     crand_uniform_f64_t dist = crand_uniform_f64_init(0.0f, n);

-    

+

     for (int i = 0; i < 100000; ++i)

         clist_fx_push_back(&list, crand_uniform_f64(&eng, &dist));

     k = 0; c_foreach (i, clist_fx, list)

-        if (++k <= 10) printf("%8d: %10f\n", k, i.get->value); else break;

+        if (++k <= 10) printf("%8d: %10f\n", k, *i.get); else break;

 

     clist_fx_sort(&list); // mergesort O(n*log n)

     puts("sorted");

 

     k = 0; c_foreach (i, clist_fx, list)

-        if (++k <= 10) printf("%8d: %10f\n", k, i.get->value); else break;

+        if (++k <= 10) printf("%8d: %10f\n", k, *i.get); else break;

     puts("");

 

     clist_fx_clear(&list);

     c_push_items(&list, clist_fx, {10, 20, 30, 40, 30, 50});

-    c_foreach (i, clist_fx, list) printf(" %g", i.get->value);

+    c_foreach (i, clist_fx, list) printf(" %g", *i.get);

     puts("");

- 

+

     int removed = clist_fx_remove(&list, 30);

     clist_fx_insert_after(&list, clist_fx_before_begin(&list), 5); // same as push_front()

     clist_fx_push_back(&list, 500);

@@ -34,11 +34,11 @@ int main() {
     clist_fx_iter_t it = clist_fx_before_begin(&list);

     printf("Full: ");

     c_foreach (i, clist_fx, list)

-        printf(" %g", i.get->value);

+        printf(" %g", *i.get);

     for (int i=0; i<4; ++i) clist_fx_next(&it);

     printf("\nSubs: ");

     c_foreach (i, clist_fx, it, clist_fx_end(&list))

-        printf(" %g", i.get->value);

+        printf(" %g", *i.get);

     puts("");

     clist_fx_destroy(&list);

 }
\ No newline at end of file
diff --git a/examples/words.c b/examples/words.c
index 70a4878f..0f799ea2 100644
--- a/examples/words.c
+++ b/examples/words.c
@@ -18,7 +18,7 @@ int main1()
     });
     clist_str_push_back(&lwords, cstr_from("%f", 123897.0 / 23.0));
     c_foreach (w, clist_str, lwords)
-        printf("%s\n", w.get->value.str);
+        printf("%s\n", w.get->str);
     puts("");
 
     cvec_str words = cvec_ini;