diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/convert.c | 2 | ||||
| -rw-r--r-- | examples/csmap_erase.c | 2 | ||||
| -rw-r--r-- | examples/csmap_find.c | 6 | ||||
| -rw-r--r-- | examples/csmap_insert.c | 4 | ||||
| -rw-r--r-- | examples/inits.c | 2 | ||||
| -rw-r--r-- | examples/new_map.c | 4 | ||||
| -rw-r--r-- | examples/phonebook.c | 2 | ||||
| -rw-r--r-- | examples/sidebyside.cpp | 2 | ||||
| -rw-r--r-- | examples/sptr_to_maps.c | 6 | ||||
| -rw-r--r-- | examples/vikings.c | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/examples/convert.c b/examples/convert.c index 034657db..8258e1b6 100644 --- a/examples/convert.c +++ b/examples/convert.c @@ -16,7 +16,7 @@ int main() c_auto (cvec_str, keys, values) c_auto (clist_str, list) { - c_apply(v, cmap_str_emplace(&map, c_pair(v)), cmap_str_rawvalue, { + c_apply(v, cmap_str_emplace(&map, c_pair(v)), cmap_str_raw, { {"green", "#00ff00"}, {"blue", "#0000ff"}, {"yellow", "#ffff00"}, diff --git a/examples/csmap_erase.c b/examples/csmap_erase.c index 7b179bef..68a0378b 100644 --- a/examples/csmap_erase.c +++ b/examples/csmap_erase.c @@ -37,7 +37,7 @@ int main() c_auto (mymap, m2) { // Fill in some data to test with, one at a time, using c_apply() - c_apply(v, mymap_emplace(&m2, c_pair(v)), mymap_rawvalue, { + c_apply(v, mymap_emplace(&m2, c_pair(v)), mymap_raw, { {10, "Bob"}, {11, "Rob"}, {12, "Robert"}, diff --git a/examples/csmap_find.c b/examples/csmap_find.c index c70e0523..078c7a11 100644 --- a/examples/csmap_find.c +++ b/examples/csmap_find.c @@ -7,12 +7,12 @@ #define i_tag istr #include <stc/csmap.h> -#define i_val csmap_istr_rawvalue +#define i_val csmap_istr_raw #define i_opt c_no_cmp #define i_tag istr #include <stc/cvec.h> -void print_elem(csmap_istr_rawvalue p) { +void print_elem(csmap_istr_raw p) { printf("(%d, %s) ", p.first, p.second); } @@ -45,7 +45,7 @@ int main() c_auto (csmap_istr, m1) c_auto (cvec_istr, v) { - c_apply(v, csmap_istr_emplace(&m1, c_pair(v)), csmap_istr_rawvalue, + c_apply(v, csmap_istr_emplace(&m1, c_pair(v)), csmap_istr_raw, {{40, "Zr"}, {45, "Rh"}}); puts("The starting map m1 is (key, value):"); print_collection_csmap_istr(m1); diff --git a/examples/csmap_insert.c b/examples/csmap_insert.c index 1b89915e..5f5813a8 100644 --- a/examples/csmap_insert.c +++ b/examples/csmap_insert.c @@ -14,7 +14,7 @@ #define i_tag istr // Map of int => cstr
#include <stc/csmap.h>
-#define i_val csmap_ii_rawvalue
+#define i_val csmap_ii_raw
#define i_opt c_no_cmp
#define i_tag ii
#include <stc/cvec.h>
@@ -99,7 +99,7 @@ int main() c_auto (csmap_ii, m4) {
// Insert the elements from an initializer_list
- c_apply(v, csmap_ii_insert(&m4, c_pair(v)), csmap_ii_rawvalue,
+ c_apply(v, csmap_ii_insert(&m4, c_pair(v)), csmap_ii_raw,
{ { 4, 44 }, { 2, 22 }, { 3, 33 }, { 1, 11 }, { 5, 55 } });
puts("After initializer_list insertion, m4 contains:");
print_ii(m4);
diff --git a/examples/inits.c b/examples/inits.c index 3f62b9fc..4fdc17d5 100644 --- a/examples/inits.c +++ b/examples/inits.c @@ -67,7 +67,7 @@ int main(void) // CMAP CNT
c_auto (cmap_cnt, countries) {
- c_apply(v, cmap_cnt_emplace(&countries, c_pair(v)), cmap_cnt_rawvalue, {
+ c_apply(v, cmap_cnt_emplace(&countries, c_pair(v)), cmap_cnt_raw, {
{"Norway", 100},
{"Denmark", 50},
{"Iceland", 10},
diff --git a/examples/new_map.c b/examples/new_map.c index 1c27d5bf..f641a0eb 100644 --- a/examples/new_map.c +++ b/examples/new_map.c @@ -48,14 +48,14 @@ int main() {
cmap_int_insert(&map, 123, 321);
- c_apply(v, cmap_pnt_insert(&pmap, c_pair(v)), cmap_pnt_rawvalue, {
+ c_apply(v, cmap_pnt_insert(&pmap, c_pair(v)), cmap_pnt_raw, {
{{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_apply(v, cmap_str_emplace(&smap, c_pair(v)), cmap_str_rawvalue, {
+ c_apply(v, cmap_str_emplace(&smap, c_pair(v)), cmap_str_raw, {
{"Hello, friend", "long time no see"},
{"So long, friend", "see you around"},
});
diff --git a/examples/phonebook.c b/examples/phonebook.c index 064de93f..ccc10eaf 100644 --- a/examples/phonebook.c +++ b/examples/phonebook.c @@ -50,7 +50,7 @@ int main(int argc, char **argv) bool erased;
c_auto (cmap_str, phone_book) {
- c_apply(v, cmap_str_emplace(&phone_book, c_pair(v)), cmap_str_rawvalue, {
+ c_apply(v, cmap_str_emplace(&phone_book, c_pair(v)), cmap_str_raw, {
{"Lilia Friedman", "(892) 670-4739"},
{"Tariq Beltran", "(489) 600-7575"},
{"Laiba Juarez", "(303) 885-5692"},
diff --git a/examples/sidebyside.cpp b/examples/sidebyside.cpp index cf4b2f70..85fea774 100644 --- a/examples/sidebyside.cpp +++ b/examples/sidebyside.cpp @@ -19,7 +19,7 @@ int main() { }
c_auto (cmap_str, food)
{
- c_apply(v, cmap_str_emplace(&food, c_pair(v)), cmap_str_rawvalue,
+ c_apply(v, cmap_str_emplace(&food, c_pair(v)), cmap_str_raw,
{{"burger", 5}, {"pizza", 12}, {"steak", 15}});
c_foreach (i, cmap_str, food)
printf("%s, %d\n", i.ref->first.str, i.ref->second);
diff --git a/examples/sptr_to_maps.c b/examples/sptr_to_maps.c index 6b4dd359..64866ba3 100644 --- a/examples/sptr_to_maps.c +++ b/examples/sptr_to_maps.c @@ -30,17 +30,17 @@ int main() // POPULATE stack with shared pointers to Maps:
Map *map;
map = Stack_push(&stack, Arc_from(Map_init()))->get;
- c_apply(v, Map_emplace(map, c_pair(v)), Map_rawvalue, {
+ c_apply(v, Map_emplace(map, c_pair(v)), Map_raw, {
{"Joey", 1990}, {"Mary", 1995}, {"Joanna", 1992}
});
map = Stack_push(&stack, Arc_from(Map_init()))->get;
- c_apply(v, Map_emplace(map, c_pair(v)), Map_rawvalue, {
+ c_apply(v, Map_emplace(map, c_pair(v)), Map_raw, {
{"Rosanna", 2001}, {"Brad", 1999}, {"Jack", 1980}
});
// POPULATE list:
map = List_push_back(&list, Arc_from(Map_init()))->get;
- c_apply(v, Map_emplace(map, c_pair(v)), Map_rawvalue, {
+ c_apply(v, Map_emplace(map, c_pair(v)), Map_raw, {
{"Steve", 1979}, {"Rick", 1974}, {"Tracy", 2003}
});
diff --git a/examples/vikings.c b/examples/vikings.c index 9900e9b6..5acafb3f 100644 --- a/examples/vikings.c +++ b/examples/vikings.c @@ -49,7 +49,7 @@ static inline RViking Viking_toraw(const Viking* vk) { int main() { c_auto (Vikings, vikings) { - c_apply(v, Vikings_emplace(&vikings, c_pair(v)), Vikings_rawvalue, { + c_apply(v, Vikings_emplace(&vikings, c_pair(v)), Vikings_raw, { {{"Einar", "Norway"}, 20}, {{"Olaf", "Denmark"}, 24}, {{"Harald", "Iceland"}, 12}, |