Add dict/set clear methods

cjdrake · May 23, 2015 · 77e0007 · 77e0007
1 parent 0e02845
commit 77e0007
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 0 deletions.
diff --git a/extension/boolexpr/boolexpr.h b/extension/boolexpr/boolexpr.h
@@ -423,6 +423,8 @@ struct BoolExpr * BoolExprDict_Search(struct BoolExprDict *, struct BoolExpr *ke
 
 bool BoolExprDict_Contains(struct BoolExprDict *, struct BoolExpr *key);
 
+void BoolExprDict_Clear(struct BoolExprDict *);
+
 
 /*
 ** Return a new set of Boolean expressions.
@@ -439,6 +441,8 @@ bool BoolExprSet_Contains(struct BoolExprSet *, struct BoolExpr *key);
 
 bool BoolExprSet_Equal(struct BoolExprSet *, struct BoolExprSet *);
 
+void BoolExprSet_Clear(struct BoolExprSet *);
+
 
 #ifdef __cplusplus
 }

diff --git a/extension/boolexpr/dict.c b/extension/boolexpr/dict.c
@@ -264,3 +264,17 @@ BoolExprDict_Contains(struct BoolExprDict *dict, struct BoolExpr *key)
     return _list_search(dict->items[index], key) != (struct BoolExpr *) NULL;
 }
 
+
+void
+BoolExprDict_Clear(struct BoolExprDict *dict)
+{
+    for (size_t i = 0; i < _primes[dict->pridx]; ++i) {
+        if (dict->items[i] != (struct BoolExprDictItem *) NULL) {
+            _list_del(dict->items[i]);
+            dict->items[i] = (struct BoolExprDictItem *) NULL;
+        }
+    }
+
+    dict->length = 0;
+}
+
diff --git a/extension/boolexpr/set.c b/extension/boolexpr/set.c
@@ -266,3 +266,17 @@ BoolExprSet_Equal(struct BoolExprSet *self, struct BoolExprSet *other)
     return true;
 }
 
+
+void
+BoolExprSet_Clear(struct BoolExprSet *set)
+{
+    for (size_t i = 0; i < _primes[set->pridx]; ++i) {
+        if (set->items[i] != (struct BoolExprSetItem *) NULL) {
+            _list_del(set->items[i]);
+            set->items[i] = (struct BoolExprSetItem *) NULL;
+        }
+    }
+
+    set->length = 0;
+}
+
diff --git a/extension/boolexpr/test/test_dict.cpp b/extension/boolexpr/test/test_dict.cpp
@@ -116,3 +116,20 @@ TEST_F(BoolExprDictTest, Removal)
     BoolExprDict_Del(dict);
 }
 
+
+TEST_F(BoolExprDictTest, Clear)
+{
+    BoolExprDict *dict = BoolExprDict_New();
+    int length = 0;
+
+    for (int i = 0; i < 32; ++i) {
+        BoolExprDict_Insert(dict, xns[i], xs[i]);
+        EXPECT_EQ(dict->length, ++length);
+    }
+
+    BoolExprDict_Clear(dict);
+    EXPECT_EQ(dict->length, 0);
+
+    BoolExprDict_Del(dict);
+}
+
diff --git a/extension/boolexpr/test/test_set.cpp b/extension/boolexpr/test/test_set.cpp
@@ -151,3 +151,21 @@ TEST_F(BoolExprSetTest, Equality)
     BoolExprSet_Del(c);
     BoolExprSet_Del(d);
 }
+
+
+TEST_F(BoolExprSetTest, Clear)
+{
+    BoolExprSet *a = BoolExprSet_New();
+
+    BoolExprSet_Insert(a, xns[0]);
+    BoolExprSet_Insert(a, xs[1]);
+    BoolExprSet_Insert(a, xns[2]);
+    BoolExprSet_Insert(a, xs[3]);
+
+    ASSERT_EQ(a->length, 4);
+    BoolExprSet_Clear(a);
+    ASSERT_EQ(a->length, 0);
+
+    BoolExprSet_Del(a);
+}
+