First commit for Version 3 of STC. Main changes are consistent rename of '_del' to '_drop' and '_compare' to '_cmp'.

Also i_key_ref (earlier i_key_sptr) and i_val_ref replaced by more general i_key_bind/i_val_bind.

9 files changed, 29 insertions, 28 deletions

diff --git a/benchmarks/picobench/picobench_cmap.cpp b/benchmarks/picobench/picobench_cmap.cpp
index 330c5e51..a045cb7c 100644
--- a/benchmarks/picobench/picobench_cmap.cpp
+++ b/benchmarks/picobench/picobench_cmap.cpp
@@ -91,7 +91,7 @@ static void ins_and_erase_cmap_i(picobench::state& s)
     c_forrange (s.iterations())

         cmap_i_erase(&map, stc64_random());

     s.set_result(cmap_i_size(map));

-    cmap_i_del(&map);

+    cmap_i_drop(&map);

 }

 

 static void ins_and_erase_cmap_x(picobench::state& s)

@@ -111,7 +111,7 @@ static void ins_and_erase_cmap_x(picobench::state& s)
     c_forrange (s.iterations())

         cmap_x_erase(&map, stc64_random());

     s.set_result(cmap_x_size(map));

-    cmap_x_del(&map);

+    cmap_x_drop(&map);

 }

 

 #define P samples(S1).iterations({N1/4})

@@ -153,7 +153,7 @@ static void ins_and_access_cmap_i(picobench::state& s)
     c_forrange (N1)

         result += ++cmap_i_emplace(&map, stc64_random() & mask, 0).ref->second;

     s.set_result(result);

-    cmap_i_del(&map);

+    cmap_i_drop(&map);

 }

 

 #define P samples(S1).iterations({N1, N1, N1, N1}).args({18, 23, 25, 31})

@@ -212,8 +212,8 @@ static void ins_and_access_cmap_s(picobench::state& s)
         result += cmap_str_erase(&map, str.str);

     }

     s.set_result(result + cmap_str_size(map));

-    cstr_del(&str);

-    cmap_str_del(&map);

+    cstr_drop(&str);

+    cmap_str_drop(&map);

 }

 

 #define P samples(S1).iterations({N1/5, N1/5, N1/5, N1/10, N1/40}).args({13, 7, 8, 100, 1000})

@@ -285,7 +285,7 @@ static void iterate_cmap_x(picobench::state& s)
             result += i.ref->second;

     }

     s.set_result(result);

-    cmap_x_del(&map);

+    cmap_x_drop(&map);

 }

 

 

diff --git a/benchmarks/picobench/picobench_csmap.cpp b/benchmarks/picobench/picobench_csmap.cpp
index 7a0addad..90681cd5 100644
--- a/benchmarks/picobench/picobench_csmap.cpp
+++ b/benchmarks/picobench/picobench_csmap.cpp
@@ -52,7 +52,7 @@ static void ctor_and_ins_one_csmap_i(picobench::state& s)
         csmap_i map = csmap_i_init();

         csmap_i_emplace(&map, n, 0);

         result += csmap_i_size(map);

-        csmap_i_del(&map);

+        csmap_i_drop(&map);

     }

     s.set_result(result);

 }

@@ -86,7 +86,7 @@ static void insert_csmap_i(picobench::state& s)
     c_forrange (n, s.iterations())

         csmap_i_emplace(&map, stc64_random() & 0xfffffff, n);

     s.set_result(csmap_i_size(map));

-    csmap_i_del(&map);

+    csmap_i_drop(&map);

 }

 

 #define P samples(S1).iterations({N1})

@@ -142,7 +142,7 @@ static void ins_and_erase_csmap_i(picobench::state& s)
     c_forrange (s.iterations())

         csmap_i_erase(&map, stc64_random() & mask);

     s.set_result(result);

-    csmap_i_del(&map);

+    csmap_i_drop(&map);

 }

 

 #define P samples(S1).iterations({N1/2, N1/2, N1/2, N1/2}).args({18, 23, 25, 31})

@@ -183,7 +183,7 @@ static void ins_and_access_csmap_i(picobench::state& s)
         if (val) csmap_i_erase(&map, val->first);

     }

     s.set_result(result + csmap_i_size(map));

-    csmap_i_del(&map);

+    csmap_i_drop(&map);

 }

 

 #define P samples(S1).iterations({N1, N1, N1, N1}).args({18, 23, 25, 31})

@@ -243,8 +243,8 @@ static void ins_and_access_csmap_s(picobench::state& s)
         }*/

     }

     s.set_result(result + csmap_str_size(map));

-    cstr_del(&str);

-    csmap_str_del(&map);

+    cstr_drop(&str);

+    csmap_str_drop(&map);

 }

 

 #define P samples(S1).iterations({N1/5, N1/5, N1/5, N1/10, N1/40}).args({13, 7, 8, 100, 1000})

@@ -309,7 +309,7 @@ static void iterate_csmap_x(picobench::state& s)
             result += i.ref->second;

     }

     s.set_result(result);

-    csmap_x_del(&map);

+    csmap_x_drop(&map);

 }

 

 

diff --git a/benchmarks/plotbench/cdeq_benchmark.cpp b/benchmarks/plotbench/cdeq_benchmark.cpp
index 6db167b0..f57da6b2 100644
--- a/benchmarks/plotbench/cdeq_benchmark.cpp
+++ b/benchmarks/plotbench/cdeq_benchmark.cpp
@@ -81,7 +81,7 @@ Sample test_stc_deque() {
         c_forrange (cdeq_x_size(con)/2) { cdeq_x_pop_front(&con); cdeq_x_pop_back(&con); }

         s.test[ERASE].t2 = clock();

         s.test[ERASE].sum = cdeq_x_size(con);

-        cdeq_x_del(&con);

+        cdeq_x_drop(&con);

      }{

         stc64_srandom(seed);

         container con = cdeq_x_init();

@@ -98,7 +98,7 @@ Sample test_stc_deque() {
         s.test[ITER].t2 = clock();

         s.test[ITER].sum = sum;

         s.test[DESTRUCT].t1 = clock();

-        cdeq_x_del(&con);

+        cdeq_x_drop(&con);

      }

      s.test[DESTRUCT].t2 = clock();

      s.test[DESTRUCT].sum = 0;

diff --git a/benchmarks/plotbench/clist_benchmark.cpp b/benchmarks/plotbench/clist_benchmark.cpp
index 676d31e7..eaa18201 100644
--- a/benchmarks/plotbench/clist_benchmark.cpp
+++ b/benchmarks/plotbench/clist_benchmark.cpp
@@ -78,7 +78,7 @@ Sample test_stc_forward_list() {
         c_forrange (N) clist_x_pop_front(&con);

         s.test[ERASE].t2 = clock();

         s.test[ERASE].sum = 0;

-        clist_x_del(&con);

+        clist_x_drop(&con);

      }{

         stc64_srandom(seed);

         container con = clist_x_init();

@@ -95,7 +95,7 @@ Sample test_stc_forward_list() {
         s.test[ITER].t2 = clock();

         s.test[ITER].sum = sum;

         s.test[DESTRUCT].t1 = clock();

-        clist_x_del(&con);

+        clist_x_drop(&con);

      }

      s.test[DESTRUCT].t2 = clock();

      s.test[DESTRUCT].sum = 0;

diff --git a/benchmarks/plotbench/cmap_benchmark.cpp b/benchmarks/plotbench/cmap_benchmark.cpp
index 4c9c6c16..16aec8c0 100644
--- a/benchmarks/plotbench/cmap_benchmark.cpp
+++ b/benchmarks/plotbench/cmap_benchmark.cpp
@@ -82,7 +82,7 @@ Sample test_stc_unordered_map() {
         c_forrange (N) cmap_x_erase(&con, stc64_random() & mask1);

         s.test[ERASE].t2 = clock();

         s.test[ERASE].sum = cmap_x_size(con);

-        cmap_x_del(&con);

+        cmap_x_drop(&con);

      }{

         container con = cmap_x_init();

         stc64_srandom(seed);

@@ -103,7 +103,7 @@ Sample test_stc_unordered_map() {
         s.test[ITER].t2 = clock();

         s.test[ITER].sum = sum;

         s.test[DESTRUCT].t1 = clock();

-        cmap_x_del(&con);

+        cmap_x_drop(&con);

      }

      s.test[DESTRUCT].t2 = clock();

      s.test[DESTRUCT].sum = 0;

diff --git a/benchmarks/plotbench/cpque_benchmark.cpp b/benchmarks/plotbench/cpque_benchmark.cpp
index 19a9c701..33e55719 100644
--- a/benchmarks/plotbench/cpque_benchmark.cpp
+++ b/benchmarks/plotbench/cpque_benchmark.cpp
@@ -3,7 +3,7 @@
 #include <stc/crandom.h>

 

 #define i_val float

-#define i_cmp -c_default_compare

+#define i_cmp -c_default_cmp

 #define i_tag f

 #include <stc/cpque.h>

 

@@ -14,11 +14,12 @@ int main()
     int N = 10000000, M = 10;

 

     cpque_f pq = cpque_f_init();

+    cpque_f_resize(&pq, N, 0.0f);

 

     rng = stc64_init(seed);

     clock_t start = clock();

-    c_forrange (i, int, N)

-        cpque_f_push_back(&pq, (float) stc64_randf(&rng)*100000);

+    c_forrange (i, N)

+        pq.data[i] = (float) stc64_randf(&rng)*100000;

 

     cpque_f_make_heap(&pq);

     printf("Built priority queue: %f secs\n", (clock() - start) / (float) CLOCKS_PER_SEC);

@@ -44,5 +45,5 @@ int main()
     }

     puts("");

 

-    cpque_f_del(&pq);

+    cpque_f_drop(&pq);

 }

diff --git a/benchmarks/plotbench/csmap_benchmark.cpp b/benchmarks/plotbench/csmap_benchmark.cpp
index 47762791..4d1621e3 100644
--- a/benchmarks/plotbench/csmap_benchmark.cpp
+++ b/benchmarks/plotbench/csmap_benchmark.cpp
@@ -82,7 +82,7 @@ Sample test_stc_map() {
         c_forrange (N) csmap_x_erase(&con, stc64_random() & mask1);

         s.test[ERASE].t2 = clock();

         s.test[ERASE].sum = csmap_x_size(con);

-        csmap_x_del(&con);

+        csmap_x_drop(&con);

      }{

         container con = csmap_x_init();

         stc64_srandom(seed);

@@ -103,7 +103,7 @@ Sample test_stc_map() {
         s.test[ITER].t2 = clock();

         s.test[ITER].sum = sum;

         s.test[DESTRUCT].t1 = clock();

-        csmap_x_del(&con);

+        csmap_x_drop(&con);

      }

      s.test[DESTRUCT].t2 = clock();

      s.test[DESTRUCT].sum = 0;

diff --git a/benchmarks/plotbench/cvec_benchmark.cpp b/benchmarks/plotbench/cvec_benchmark.cpp
index c4648e34..21e7a229 100644
--- a/benchmarks/plotbench/cvec_benchmark.cpp
+++ b/benchmarks/plotbench/cvec_benchmark.cpp
@@ -77,7 +77,7 @@ Sample test_stc_vector() {
         c_forrange (N) { cvec_x_pop_back(&con); }

         s.test[ERASE].t2 = clock();

         s.test[ERASE].sum = cvec_x_size(con);

-        cvec_x_del(&con);

+        cvec_x_drop(&con);

      }{

         stc64_srandom(seed);

         container con = cvec_x_init();

@@ -94,7 +94,7 @@ Sample test_stc_vector() {
         s.test[ITER].t2 = clock();

         s.test[ITER].sum = sum;

         s.test[DESTRUCT].t1 = clock();

-        cvec_x_del(&con);

+        cvec_x_drop(&con);

      }

      s.test[DESTRUCT].t2 = clock();

      s.test[DESTRUCT].sum = 0;

diff --git a/benchmarks/shootout_hashmaps.cpp b/benchmarks/shootout_hashmaps.cpp
index 40e0e579..6439c548 100644
--- a/benchmarks/shootout_hashmaps.cpp
+++ b/benchmarks/shootout_hashmaps.cpp
@@ -47,7 +47,7 @@ size_t seed;
 #define CMAP_SIZE(X)              cmap_##X##_size(map)
 #define CMAP_BUCKETS(X)           cmap_##X##_bucket_count(map)
 #define CMAP_CLEAR(X)             cmap_##X##_clear(&map)
-#define CMAP_DTOR(X)              cmap_##X##_del(&map)
+#define CMAP_DTOR(X)              cmap_##X##_drop(&map)
 
 #define KMAP_SETUP(X, Key, Value) khash_t(X)* map = kh_init(X); khiter_t ki; int ret
 #define KMAP_PUT(X, key, val)     (*(ki = kh_put(X, map, key, &ret), map->vals[ki] = val, map->vals+ki))