Merge branch 'master' into modified

1 files changed, 55 insertions, 58 deletions

diff --git a/misc/examples/csmap_erase.c b/misc/examples/csmap_erase.c
index a3bd250b..697e6c09 100644
--- a/misc/examples/csmap_erase.c
+++ b/misc/examples/csmap_erase.c
@@ -17,68 +17,65 @@ void printmap(mymap m)
 
 int main()
 {
-    c_auto (mymap, m1)
-    {
-        // Fill in some data to test with, one at a time
-        mymap_insert(&m1, 1, cstr_lit("A"));
-        mymap_insert(&m1, 2, cstr_lit("B"));
-        mymap_insert(&m1, 3, cstr_lit("C"));
-        mymap_insert(&m1, 4, cstr_lit("D"));
-        mymap_insert(&m1, 5, cstr_lit("E"));
+    mymap m1 = {0};
 
-        puts("Starting data of map m1 is:");
-        printmap(m1);
-        // The 1st member function removes an element at a given position
-        mymap_erase_at(&m1, mymap_advance(mymap_begin(&m1), 1));
-        puts("After the 2nd element is deleted, the map m1 is:");
-        printmap(m1);
-    }
+    // Fill in some data to test with, one at a time
+    mymap_insert(&m1, 1, cstr_lit("A"));
+    mymap_insert(&m1, 2, cstr_lit("B"));
+    mymap_insert(&m1, 3, cstr_lit("C"));
+    mymap_insert(&m1, 4, cstr_lit("D"));
+    mymap_insert(&m1, 5, cstr_lit("E"));
 
-    c_auto (mymap, m2)
-    {
-        // Fill in some data to test with, one at a time
-        m2 = c_make(mymap, {
-            {10, "Bob"},
-            {11, "Rob"},
-            {12, "Robert"},
-            {13, "Bert"},
-            {14, "Bobby"},
-        });
+    puts("Starting data of map m1 is:");
+    printmap(m1);
+    // The 1st member function removes an element at a given position
+    mymap_erase_at(&m1, mymap_advance(mymap_begin(&m1), 1));
+    puts("After the 2nd element is deleted, the map m1 is:");
+    printmap(m1);
 
-        puts("Starting data of map m2 is:");
-        printmap(m2);
-        mymap_iter it1 = mymap_advance(mymap_begin(&m2), 1);
-        mymap_iter it2 = mymap_find(&m2, mymap_back(&m2)->first);
+    // Fill in some data to test with
+    mymap m2 = c_make(mymap, {
+        {10, "Bob"},
+        {11, "Rob"},
+        {12, "Robert"},
+        {13, "Bert"},
+        {14, "Bobby"},
+    });
 
-        puts("to remove:");
-        c_foreach (i, mymap, it1, it2)
-            printf(" [%d, %s]", i.ref->first, cstr_str(&i.ref->second));
-        puts("");
-        // The 2nd member function removes elements
-        // in the range [First, Last)
-        mymap_erase_range(&m2, it1, it2);
-        puts("After the middle elements are deleted, the map m2 is:");
-        printmap(m2);
-    }
+    puts("Starting data of map m2 is:");
+    printmap(m2);
+    mymap_iter it1 = mymap_advance(mymap_begin(&m2), 1);
+    mymap_iter it2 = mymap_find(&m2, mymap_back(&m2)->first);
 
-    c_auto (mymap, m3)
-    {
-        // Fill in some data to test with, one at a time, using emplace
-        mymap_emplace(&m3, 1, "red");
-        mymap_emplace(&m3, 2, "yellow");
-        mymap_emplace(&m3, 3, "blue");
-        mymap_emplace(&m3, 4, "green");
-        mymap_emplace(&m3, 5, "orange");
-        mymap_emplace(&m3, 6, "purple");
-        mymap_emplace(&m3, 7, "pink");
+    puts("to remove:");
+    c_foreach (i, mymap, it1, it2)
+        printf(" [%d, %s]", i.ref->first, cstr_str(&i.ref->second));
+    puts("");
+    // The 2nd member function removes elements
+    // in the range [First, Last)
+    mymap_erase_range(&m2, it1, it2);
+    puts("After the middle elements are deleted, the map m2 is:");
+    printmap(m2);
 
-        puts("Starting data of map m3 is:");
-        printmap(m3);
-        // The 3rd member function removes elements with a given Key
-        int count = mymap_erase(&m3, 2);
-        // The 3rd member function also returns the number of elements removed
-        printf("The number of elements removed from m3 is: %d\n", count);
-        puts("After the element with a key of 2 is deleted, the map m3 is:");
-        printmap(m3);
-    }
+    mymap m3 = {0};
+
+    // Fill in some data to test with, one at a time, using emplace
+    mymap_emplace(&m3, 1, "red");
+    mymap_emplace(&m3, 2, "yellow");
+    mymap_emplace(&m3, 3, "blue");
+    mymap_emplace(&m3, 4, "green");
+    mymap_emplace(&m3, 5, "orange");
+    mymap_emplace(&m3, 6, "purple");
+    mymap_emplace(&m3, 7, "pink");
+
+    puts("Starting data of map m3 is:");
+    printmap(m3);
+    // The 3rd member function removes elements with a given Key
+    int count = mymap_erase(&m3, 2);
+    // The 3rd member function also returns the number of elements removed
+    printf("The number of elements removed from m3 is: %d\n", count);
+    puts("After the element with a key of 2 is deleted, the map m3 is:");
+    printmap(m3);
+    
+    c_drop(mymap, &m1, &m2, &m3);
 }