Cleanup hash table code

cjdrake · May 30, 2015 · a12a508 · a12a508
1 parent 4c836c2
commit a12a508
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 96 deletions.
diff --git a/extension/boolexpr/Makefile b/extension/boolexpr/Makefile
@@ -41,7 +41,7 @@ all: bld/test/run bld/cover/run bld/lib/libboolexpr.a
 # Source Code
 #===============================================================================
 
-BOOLEXPR_HDRS := boolexpr.h
+BOOLEXPR_HDRS := boolexpr.h dict.h set.h primes-inl.c
 
 BOOLEXPR_SRCS := \
     argset.c \

diff --git a/extension/boolexpr/boolexpr.h b/extension/boolexpr/boolexpr.h
@@ -173,13 +173,6 @@ struct BoolExprVector {
 };
 
 
-struct BoolExprDictItem {
-    struct BoolExpr *key;
-    struct BoolExpr *val;
-    struct BoolExprDictItem *tail;
-};
-
-
 struct BoolExprDict {
     size_t _pridx;
 
@@ -188,12 +181,6 @@ struct BoolExprDict {
 };
 
 
-struct BoolExprSetItem {
-    struct BoolExpr *key;
-    struct BoolExprSetItem *tail;
-};
-
-
 struct BoolExprSet {
     size_t _pridx;
 

diff --git a/extension/boolexpr/dict.c b/extension/boolexpr/dict.c
@@ -7,50 +7,11 @@
 #include <stddef.h>
 #include <stdlib.h>
 
+#include "dict.h"
 #include "boolexpr.h"
 
 
-#define MAX_LOAD 1.5
-
-
-/*
-** From: http://planetmath.org/goodhashtableprimes
-*/
-
-#define MIN_IDX 4
-#define MAX_IDX 30
-
-static size_t _primes[] = {
-    0, 0, 0, 0,
-
-    /* (2^4,  2^5)  */ 23,
-    /* (2^5,  2^6)  */ 53,
-    /* (2^6,  2^7)  */ 97,
-    /* (2^7,  2^8)  */ 193,
-    /* (2^8,  2^9)  */ 389,
-    /* (2^9,  2^10) */ 769,
-    /* (2^10, 2^11) */ 1543,
-    /* (2^11, 2^12) */ 3079,
-    /* (2^12, 2^13) */ 6151,
-    /* (2^13, 2^14) */ 12289,
-    /* (2^14, 2^15) */ 24593,
-    /* (2^15, 2^16) */ 49157,
-    /* (2^16, 2^17) */ 98317,
-    /* (2^17, 2^18) */ 196613,
-    /* (2^18, 2^19) */ 393241,
-    /* (2^19, 2^20) */ 786433,
-    /* (2^20, 2^21) */ 1572869,
-    /* (2^21, 2^22) */ 3145739,
-    /* (2^22, 2^23) */ 6291469,
-    /* (2^23, 2^24) */ 12582917,
-    /* (2^24, 2^25) */ 25165843,
-    /* (2^25, 2^26) */ 50331653,
-    /* (2^26, 2^27) */ 100663319,
-    /* (2^27, 2^28) */ 201326611,
-    /* (2^28, 2^29) */ 402653189,
-    /* (2^29, 2^30) */ 805306457,
-    /* (2^30, 2^31) */ 1610612741,
-};
+#include "primes-inl.c"
 
 
 static size_t

diff --git a/extension/boolexpr/dict.h b/extension/boolexpr/dict.h
@@ -0,0 +1,26 @@
+/*
+** Filename: dict.h
+*/
+
+
+#ifndef DICT_H
+#define DICT_H
+
+
+/* Maximum load allowed before enlargement */
+#define MAX_LOAD 1.5
+
+/* Min/Max indices in the primes table */
+#define MIN_IDX 4
+#define MAX_IDX 30
+
+
+struct BoolExprDictItem {
+    struct BoolExpr *key;
+    struct BoolExpr *val;
+    struct BoolExprDictItem *tail;
+};
+
+
+#endif /* DICT_H */
+
diff --git a/extension/boolexpr/primes-inl.c b/extension/boolexpr/primes-inl.c
@@ -0,0 +1,41 @@
+/*
+** Filename: primes-inl.c
+*/
+
+static size_t _primes[] = {
+    /* (2^0,  2^1)  */ 2,
+    /* (2^1,  2^2)  */ 3,
+    /* (2^2,  2^3)  */ 7,
+    /* (2^3,  2^4)  */ 13,
+    /* (2^4,  2^5)  */ 23,
+
+    /* From: http://planetmath.org/goodhashtableprimes */
+
+    /* (2^5,  2^6)  */ 53,
+    /* (2^6,  2^7)  */ 97,
+    /* (2^7,  2^8)  */ 193,
+    /* (2^8,  2^9)  */ 389,
+    /* (2^9,  2^10) */ 769,
+    /* (2^10, 2^11) */ 1543,
+    /* (2^11, 2^12) */ 3079,
+    /* (2^12, 2^13) */ 6151,
+    /* (2^13, 2^14) */ 12289,
+    /* (2^14, 2^15) */ 24593,
+    /* (2^15, 2^16) */ 49157,
+    /* (2^16, 2^17) */ 98317,
+    /* (2^17, 2^18) */ 196613,
+    /* (2^18, 2^19) */ 393241,
+    /* (2^19, 2^20) */ 786433,
+    /* (2^20, 2^21) */ 1572869,
+    /* (2^21, 2^22) */ 3145739,
+    /* (2^22, 2^23) */ 6291469,
+    /* (2^23, 2^24) */ 12582917,
+    /* (2^24, 2^25) */ 25165843,
+    /* (2^25, 2^26) */ 50331653,
+    /* (2^26, 2^27) */ 100663319,
+    /* (2^27, 2^28) */ 201326611,
+    /* (2^28, 2^29) */ 402653189,
+    /* (2^29, 2^30) */ 805306457,
+    /* (2^30, 2^31) */ 1610612741,
+};
+
diff --git a/extension/boolexpr/set.c b/extension/boolexpr/set.c
@@ -7,50 +7,11 @@
 #include <stddef.h>
 #include <stdlib.h>
 
+#include "set.h"
 #include "boolexpr.h"
 
 
-#define MAX_LOAD 1.5
-
-
-/*
-** From: http://planetmath.org/goodhashtableprimes
-*/
-
-#define MIN_IDX 4
-#define MAX_IDX 30
-
-static size_t _primes[] = {
-    0, 0, 0, 0,
-
-    /* (2^4,  2^5)  */ 23,
-    /* (2^5,  2^6)  */ 53,
-    /* (2^6,  2^7)  */ 97,
-    /* (2^7,  2^8)  */ 193,
-    /* (2^8,  2^9)  */ 389,
-    /* (2^9,  2^10) */ 769,
-    /* (2^10, 2^11) */ 1543,
-    /* (2^11, 2^12) */ 3079,
-    /* (2^12, 2^13) */ 6151,
-    /* (2^13, 2^14) */ 12289,
-    /* (2^14, 2^15) */ 24593,
-    /* (2^15, 2^16) */ 49157,
-    /* (2^16, 2^17) */ 98317,
-    /* (2^17, 2^18) */ 196613,
-    /* (2^18, 2^19) */ 393241,
-    /* (2^19, 2^20) */ 786433,
-    /* (2^20, 2^21) */ 1572869,
-    /* (2^21, 2^22) */ 3145739,
-    /* (2^22, 2^23) */ 6291469,
-    /* (2^23, 2^24) */ 12582917,
-    /* (2^24, 2^25) */ 25165843,
-    /* (2^25, 2^26) */ 50331653,
-    /* (2^26, 2^27) */ 100663319,
-    /* (2^27, 2^28) */ 201326611,
-    /* (2^28, 2^29) */ 402653189,
-    /* (2^29, 2^30) */ 805306457,
-    /* (2^30, 2^31) */ 1610612741,
-};
+#include "primes-inl.c"
 
 
 static size_t

diff --git a/extension/boolexpr/set.h b/extension/boolexpr/set.h
@@ -0,0 +1,25 @@
+/*
+** Filename: set.h
+*/
+
+
+#ifndef SET_H
+#define SET_H
+
+
+/* Maximum load allowed before enlargement */
+#define MAX_LOAD 1.5
+
+/* Min/Max indices in the primes table */
+#define MIN_IDX 4
+#define MAX_IDX 30
+
+
+struct BoolExprSetItem {
+    struct BoolExpr *key;
+    struct BoolExprSetItem *tail;
+};
+
+
+#endif /* SET_H */
+