From fe30df42ee433a17636b02bc2df45337e96f1ced Mon Sep 17 00:00:00 2001
From: Tyge Løvset <60263450+tylo-work@users.noreply.github.com>
Date: Wed, 4 Mar 2020 22:24:31 +0100
Subject: Refactoring, cleanup.

---
 cmap_test.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'cmap_test.c')

diff --git a/cmap_test.c b/cmap_test.c
index 8d33a6ac..0bcbaefa 100644
--- a/cmap_test.c
+++ b/cmap_test.c
@@ -5,7 +5,7 @@
 #include "cstring.h"
 
 
-declare_CVector(cs, CString, cstring_destroy);
+declare_CVector(s, CString, cstring_destroy);
 declare_CMap_STR(ss, CString, cstring_destroy);
 declare_CMap_STR(si, int);
 declare_CMap(id, uint64_t, double);
@@ -49,7 +49,7 @@ int main()
 {
     int i = 0;
 
-    CMap(si) words = cmap_INIT;
+    CMap(si) words = cmap_initializer;
     printf("read words\n");
     read_words(&words);
 
@@ -63,36 +63,38 @@ int main()
     printf("words size: %d, capacity %d\n", cmap_size(words), cmap_capacity(words));
     cmap_si_clear(&words);
 
-    CVector(cs) strv = cvector_INIT;
+    CVector(s) strv = cvector_initializer;
     CString hello = cstring_make("Hello");
     cstring_assign(&hello, "Awesome");
 
-    cvector_cs_push(&strv, cstring_make("E1"));
-    cvector_cs_push(&strv, cstring_make("E2"));
-    cvector_cs_push(&strv, cstring_make("E3"));
-    CVectorIter(cs) it1; cforeach (it1, cvector_cs, strv) {
-        printf("  %s\n", it1.item->str);
+    cvector_s_push(&strv, cstring_make("E0"));
+    cvector_s_push(&strv, cstring_make("E1"));
+    cvector_s_push(&strv, cstring_make("E2"));
+    printf("  element %d: %s\n", 1, strv.data[1].str);
+    
+    CVectorIter(s) ii; cforeach (ii, cvector_s, strv) {
+        printf("  %s\n", ii.item->str);
     }
     
     for (i = 0; i < cvector_size(strv); ++i) {
         printf("  %s\n", strv.data[i].str);
     }
-    cvector_cs_destroy(&strv);
+    cvector_s_destroy(&strv);
 
-    CMap(ss) smap = cmap_INIT;
+    CMap(ss) smap = cmap_initializer;
     cmap_ss_put(&smap, "KEY1", cstring_make("VAL1"));
     cmap_ss_put(&smap, "KEY2", cstring_make("VAL2"));
-    cmap_ss_put(&smap, "hello", cstring_makeCopy(hello));
+    cmap_ss_put(&smap, "hello", cstring_clone(hello));
     
     cstring_destroy(&hello);
     
-    CMapIter(ss) it2 = cmap_ss_begin(smap), end2 = cmap_ss_end(smap);
-    for (; it2.item != end2.item; it2 = cmap_ss_next(it2)) {
-        printf("  %s: %s\n", it2.item->key.str, it2.item->value.str);
+    CMapIter(ss) kk = cmap_ss_begin(smap), end2 = cmap_ss_end(smap);
+    for (; kk.item != end2.item; kk = cmap_ss_next(kk)) {
+        printf("  %s: %s\n", kk.item->key.str, kk.item->value.str);
     }
     cmap_ss_destroy(&smap);
 
-    CMap(id) mymap = cmap_INIT;
+    CMap(id) mymap = cmap_initializer;
     for (i = 0; i < 600000; ++i)
         cmap_id_put(&mymap, i*i, i);
         
-- 
cgit v1.2.3