From fa23b267a098b6cb90c55a71cff1ec0db33dc3c7 Mon Sep 17 00:00:00 2001 From: Tyge Løvset <60263450+tylov@users.noreply.github.com> Date: Mon, 11 Jan 2021 22:24:41 +0100 Subject: Update cset_api.md --- docs/cset_api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cset_api.md b/docs/cset_api.md index f8629aa8..faeca52f 100644 --- a/docs/cset_api.md +++ b/docs/cset_api.md @@ -109,7 +109,7 @@ int main () cset_str fifth = cset_str_clone(second); c_foreach (i, cset_str, third) - cset_str_emplace(&fifth, i.ref->ref); + cset_str_emplace(&fifth, i.ref->str); c_foreach (i, cset_str, fourth) cset_str_emplace(&fifth, i.ref->str); -- cgit v1.2.3 From 066e809aa3ccd3f8e68dee3c04d6728a61128630 Mon Sep 17 00:00:00 2001 From: Tyge Løvset <60263450+tylov@users.noreply.github.com> Date: Tue, 12 Jan 2021 11:10:01 +0100 Subject: Update cmap_api.md --- docs/cmap_api.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/cmap_api.md b/docs/cmap_api.md index e45c75c6..b1631443 100644 --- a/docs/cmap_api.md +++ b/docs/cmap_api.md @@ -321,11 +321,10 @@ using_cmap(vk, Viking, int, c_default_del, c_default_clone, int main() { - cmap_vk vikings = cmap_vk_init(); - c_push_items(&vikings, cmap_vk, { - { {"Einar", "Norway"}, 20}, - { {"Olaf", "Denmark"}, 24}, - { {"Harald", "Iceland"}, 12}, + c_init (cmap_vk vikings { + {\{"Einar", "Norway"}, 20}, + {\{"Olaf", "Denmark"}, 24}, + {\{"Harald", "Iceland"}, 12}, }); cmap_vk_put(&vikings, (VikingRaw){"Bjorn", "Sweden"}, 10); -- cgit v1.2.3 From 5f2935c6a9a57e6c7fedf4d6e2509282df5871a8 Mon Sep 17 00:00:00 2001 From: Tyge Løvset <60263450+tylov@users.noreply.github.com> Date: Tue, 12 Jan 2021 11:14:17 +0100 Subject: Update cmap_api.md --- docs/cmap_api.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/docs/cmap_api.md b/docs/cmap_api.md index b1631443..67feafdb 100644 --- a/docs/cmap_api.md +++ b/docs/cmap_api.md @@ -178,8 +178,7 @@ using_cmap_strval(id, int); int main() { uint32_t col = 0xcc7744ff; - cmap_id idnames = cmap_inits; - c_push_items(&idnames, cmap_id, { + c_init (cmap_id, idnames, { {100, "Red"}, {110, "Blue"}, }); @@ -246,13 +245,11 @@ Inverse: demonstrate cmap with mapped POD type Vec3i: cmap: #include typedef struct { int x, y, z; } Vec3i; - using_cmap(iv, int, Vec3i); int main() { cmap_iv vecs = cmap_iv_init(); - cmap_iv_put(&vecs, 1, (Vec3i){100, 0, 0}); cmap_iv_put(&vecs, 2, (Vec3i){ 0, 100, 0}); cmap_iv_put(&vecs, 3, (Vec3i){ 0, 0, 100}); @@ -289,7 +286,6 @@ void viking_del(Viking* vk) { cstr_del(&vk->country); } - // Define Viking raw struct with hash, equals, and convertion functions between Viking and VikingRaw structs: typedef struct VikingRaw { @@ -322,9 +318,9 @@ using_cmap(vk, Viking, int, c_default_del, c_default_clone, int main() { c_init (cmap_vk vikings { - {\{"Einar", "Norway"}, 20}, - {\{"Olaf", "Denmark"}, 24}, - {\{"Harald", "Iceland"}, 12}, + { {"Einar", "Norway"}, 20 }, + { {"Olaf", "Denmark"}, 24 }, + { {"Harald", "Iceland"}, 12 }, }); cmap_vk_put(&vikings, (VikingRaw){"Bjorn", "Sweden"}, 10); -- cgit v1.2.3 From 6b52d059830f53766d756aafd26751eeac67554b Mon Sep 17 00:00:00 2001 From: Tyge Løvset <60263450+tylov@users.noreply.github.com> Date: Tue, 12 Jan 2021 11:16:25 +0100 Subject: Update cmap_api.md --- docs/cmap_api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cmap_api.md b/docs/cmap_api.md index 67feafdb..6129c58e 100644 --- a/docs/cmap_api.md +++ b/docs/cmap_api.md @@ -317,7 +317,7 @@ using_cmap(vk, Viking, int, c_default_del, c_default_clone, int main() { - c_init (cmap_vk vikings { + c_init (cmap_vk, vikings { { {"Einar", "Norway"}, 20 }, { {"Olaf", "Denmark"}, 24 }, { {"Harald", "Iceland"}, 12 }, -- cgit v1.2.3 From f9c6df36d5811545bf9adfc12c82ccbae456a9ac Mon Sep 17 00:00:00 2001 From: Tyge Løvset <60263450+tylov@users.noreply.github.com> Date: Tue, 12 Jan 2021 11:18:43 +0100 Subject: Update cmap_api.md --- docs/cmap_api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cmap_api.md b/docs/cmap_api.md index 6129c58e..8f83fc5d 100644 --- a/docs/cmap_api.md +++ b/docs/cmap_api.md @@ -317,7 +317,7 @@ using_cmap(vk, Viking, int, c_default_del, c_default_clone, int main() { - c_init (cmap_vk, vikings { + c_init (cmap_vk, vikings, { { {"Einar", "Norway"}, 20 }, { {"Olaf", "Denmark"}, 24 }, { {"Harald", "Iceland"}, 12 }, -- cgit v1.2.3