Changeset 7799d1d6f07fd24cc0cf0b784340f994374fc5b1

Timestamp:

04/23/08 11:39:11 (9 months ago)

Author:

David Balmain <dbalmain@…>

Parents:

b39568e8202274e6aed953a924659cef1f971d55

Children:

8f9e905705f715e2dc4745a098e9a1819271873a

git-committer:

David Balmain <dbalmain@gmail.com> / 2008-04-23T11:39:11Z+1000

Message:

Added hs_new_ptr which corresponds to h_new_ptr

hs_new_ptr creates a HashSet? which is great for storing interned strings. It
just uses the address as the hash so no string hash function is called.

Location:

c

Files:

• include/hashset.h (modified) (3 diffs)
• include/internal.h (modified) (1 diff)
• src/hashset.c (modified) (1 diff)
• test/test_hashset.c (modified) (3 diffs)

c/include/hashset.h

@@ -34 +34 @@
 
 /**
- * Create a new FrtHashSet. The function will allocate a FrtHashSet Struct setting
- * the functions used to hash the objects it will contain and the eq function.
- * This should be used for non-string types.
+ * Create a new FrtHashSet. The function will allocate a FrtHashSet Struct
+ * setting the functions used to hash the objects it will contain and the eq
+ * function. This should be used for non-string types.
  *
  * @param hash function to hash objects added to the FrtHashSet
@@ -49 +49 @@
 
 /**
- * Create a new FrtHashSet specifically for strings. This will create a FrtHashSet
- * as if you used frt_hs_new with the standard string hash and eq functions.
+ * Create a new FrtHashSet specifically for strings. This will create a
+ * FrtHashSet as if you used frt_hs_new with the standard string hash and eq
+ * functions.
  *
  * @param free_elem function used to free elements as added to the FrtHashSet
@@ -57 +58 @@
  */
 extern FrtHashSet *frt_hs_new_str(frt_free_ft free_func);
+
+/**
+ * Create a new FrtHashSet specifically for pointers. Note that the only way
+ * two pointers will be considered equal is if they have the same address. So
+ * you can add the string "key" twice if it is stored at two different
+ * addresses.
+ *
+ * @param free_elem function used to free elements as added to the FrtHashSet
+ *   when the FrtHashSet if destroyed or duplicate elements are added to the Set
+ * @return a newly allocated FrtHashSet structure
+ */
+extern FrtHashSet *frt_hs_new_ptr(frt_free_ft free_func);
 
 /**

c/include/internal.h

@@ -546 +546 @@
 #define hs_merge                                frt_hs_merge
 #define hs_new                                  frt_hs_new
+#define hs_new_ptr                              frt_hs_new_ptr
 #define hs_new_str                              frt_hs_new_str
 #define hs_orig                                 frt_hs_orig

c/src/hashset.c

@@ -29 +29 @@
     HashSet *hs = hs_alloc(free_func);
     hs->ht = h_new_str((free_ft) NULL, NULL);
+    return hs;
+}
+
+HashSet *hs_new_ptr(free_ft free_func)
+{
+    HashSet *hs = hs_alloc(free_func);
+    hs->ht = h_new_ptr(NULL);
     return hs;
 }

c/test/test_hashset.c

@@ -1 +1 @@
 #include "hashset.h"
+#include "intern.h"
 #include "test.h"
 
@@ -55 +56 @@
     Aiequal(0, hs->size);
 
+    hs_destroy(hs);
+}
+
+static void test_hs_ptr(TestCase *tc, void *data)
+{
+    HashSet *hs = hs_new_ptr(NULL);
+    const char *word1 = intern("one");
+    const char *word2 = intern("two");
+    char *word_one = estrdup("one");
+    (void)data; /* suppress unused argument warning */
+
+    Aiequal(0, hs->size);
+
+    Aiequal(HASH_KEY_DOES_NOT_EXIST, hs_add(hs, (void *)word1));
+    Aiequal(1, hs->size);
+    Aiequal(HASH_KEY_SAME, hs_exists(hs, word1));
+    Aiequal(HASH_KEY_DOES_NOT_EXIST, hs_exists(hs, "one"));
+    Aiequal(HASH_KEY_SAME, hs_add(hs, (void *)word1));
+    Aiequal(1, hs->size);
+
+    Aiequal(HASH_KEY_DOES_NOT_EXIST, hs_add(hs, (void *)word2));
+    Aiequal(2, hs->size);
+    Aiequal(HASH_KEY_SAME, hs_exists(hs, word2));
+    Aiequal(HASH_KEY_DOES_NOT_EXIST, hs_exists(hs, "two"));
+    Aiequal(HASH_KEY_SAME, hs_add(hs, (void *)word2));
+    Aiequal(2, hs->size);
+
+    Aiequal(HASH_KEY_DOES_NOT_EXIST, hs_add(hs, (void *)word_one));
+    Aiequal(3, hs->size);
+    Aiequal(HASH_KEY_SAME, hs_exists(hs, word_one));
+    Aiequal(HASH_KEY_DOES_NOT_EXIST, hs_exists(hs, "one"));
+    Aiequal(HASH_KEY_SAME, hs_add(hs, (void *)word_one));
+    Aiequal(3, hs->size);
+
+    free(word_one);
     hs_destroy(hs);
 }
@@ -244 +280 @@
 
     tst_run_test(suite, test_hs, NULL);
+    tst_run_test(suite, test_hs_ptr, NULL);
     tst_run_test(suite, test_hs_add_safe, NULL);
     tst_run_test(suite, test_hs_merge, NULL);