Changed the c_apply() and c_apply_pair() to one new c_apply() API. Added c_pair(v) for convenience.

1 files changed, 6 insertions, 6 deletions

diff --git a/examples/box.c b/examples/box.c
index 598d0bdc..ae10a89f 100644
--- a/examples/box.c
+++ b/examples/box.c
@@ -28,7 +28,7 @@ void Person_drop(Person* p) {
 #include <stc/cbox.h>

 

 #define i_type Persons

-#define i_val_bind PBox // binds PBox_cmp, ...

+#define i_val_ref PBox // binds PBox_cmp, ...

 #include <stc/cvec.h>

 

 

@@ -37,7 +37,7 @@ int main()
     c_auto (Persons, vec)

     c_auto (PBox, p, q)

     {

-        p = PBox_new(Person_new("Laura", "Palmer"));

+        p = PBox_from(Person_new("Laura", "Palmer"));

 

         q = PBox_clone(p);

         cstr_assign(&q.get->name, "Leland");

@@ -45,11 +45,11 @@ int main()
         printf("orig: %s %s\n", p.get->name.str, p.get->last.str);

         printf("copy: %s %s\n", q.get->name.str, q.get->last.str);

 

-        Persons_push_back(&vec, PBox_new(Person_new("Dale", "Cooper")));

-        Persons_push_back(&vec, PBox_new(Person_new("Audrey", "Home")));

+        Persons_push_back(&vec, PBox_from(Person_new("Dale", "Cooper")));

+        Persons_push_back(&vec, PBox_from(Person_new("Audrey", "Home")));

         

         // NB! Clone p and q to the vector using emplace_back()

-        c_apply(Persons, emplace_back, &vec, {p, q});

+        c_apply(v, Persons_push_back(&vec, PBox_clone(v)), PBox, {p, q});

 

         c_foreach (i, Persons, vec)

             printf("%s %s\n", i.ref->get->name.str, i.ref->get->last.str);

@@ -57,7 +57,7 @@ int main()
         

         // Look-up Audrey! Use a (fake) temporary PBox for lookup.

         c_autovar (Person a = Person_new("Audrey", "Home"), Person_drop(&a)) {

-            const PBox *v = Persons_get(&vec, (PBox){&a});

+            const PBox *v = Persons_get(&vec, a);

             if (v) printf("found: %s %s\n", v->get->name.str, v->get->last.str);

         }

         puts("");