X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fhash.h;h=9d7dca9d64303459d391ef9dff559c432fe7b5a7;hb=3e66793381d0eaee26bd980c9a5479129fa44386;hp=048d2f24b3b1a2f326d877348ee1dcf5c5f46a22;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp-builds.git

diff --git a/src/hash.h b/src/hash.h
index 048d2f24..9d7dca9d 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -20,76 +20,63 @@
 #if !hash_h
 #define hash_h 1
 
-/* Hash table (opaque). */
-struct hsh_table
-  {
-    int n;			/* Number of filled entries. */
-    int m;			/* Number of entries. */
-    int *mp;			/* Pointer into hsh_prime_tab[]. */
-    void **table;		/* Hash table proper. */
+#include <stddef.h>
 
-    void *param;
-    int (*compare) (const void *, const void *, void *param);
-    unsigned (*hash) (const void *, void *param);
-    void (*free) (void *, void *param);
-  };
+typedef int hsh_compare_func (const void *, const void *, void *aux);
+typedef unsigned hsh_hash_func (const void *, void *aux);
+typedef void hsh_free_func (void *, void *aux);
 
 /* Hash table iterator (opaque). */
 struct hsh_iterator
   {
-    int init;			/* Initialized? */
-    int next;			/* Index of next entry. */
+    size_t next;		/* Index of next entry. */
   };
 
-#define hsh_iterator_init(ITERATOR) (ITERATOR).init = 0
-
-/* Prime numbers and hash functions. */
-int *hsh_next_prime (int) __attribute__ ((const));
-int hashpjw_d (const char *s1, const char *s2);
-
-#if __GNUC__>=2 && __OPTIMIZE__
-extern inline int
-hashpjw (const char *s)
-{
-  return hashpjw_d (s, &s[strlen (s)]);
-}
-#else
-int hashpjw (const char *s);
-#endif
+/* Hash functions. */
+unsigned hsh_hash_bytes (const void *, size_t);
+unsigned hsh_hash_string (const char *);
+unsigned hsh_hash_int (int);
+unsigned hsh_hash_double (double);
 
 /* Hash tables. */
-struct hsh_table *hsh_create (int m,
-			      int (*compare) (const void *, const void *,
-					      void *param),
-			      unsigned (*hash) (const void *, void *param),
-			      void (*free) (void *, void *param),
-			      void *param);
+struct hsh_table *hsh_create (int m, hsh_compare_func *,
+                              hsh_hash_func *, hsh_free_func *,
+			      void *aux);
 void hsh_clear (struct hsh_table *);
 void hsh_destroy (struct hsh_table *);
-void hsh_rehash (struct hsh_table *);
-void **hsh_sort (struct hsh_table *,
-		 int (*compare) (const void *, const void *, void *param));
-#if GLOBAL_DEBUGGING
-void hsh_dump (struct hsh_table *);
-#endif
+void **hsh_sort (struct hsh_table *);
+void **hsh_data (struct hsh_table *);
+void **hsh_sort_copy (struct hsh_table *);
+void **hsh_data_copy (struct hsh_table *);
 
-/* Hash entries. */
+/* Search and insertion. */
 void **hsh_probe (struct hsh_table *, const void *);
+void *hsh_insert (struct hsh_table *, void *);
+void *hsh_replace (struct hsh_table *, void *);
 void *hsh_find (struct hsh_table *, const void *);
-void *hsh_foreach (struct hsh_table *, struct hsh_iterator *);
+int hsh_delete (struct hsh_table *, const void *);
 
+/* Iteration. */
+void *hsh_first (struct hsh_table *, struct hsh_iterator *);
+void *hsh_next (struct hsh_table *, struct hsh_iterator *);
+
+/* Search and insertion with assertion. */
 #if GLOBAL_DEBUGGING
-void force_hsh_insert (struct hsh_table *, void *);
-void *force_hsh_find (struct hsh_table *, const void *);
+void hsh_force_insert (struct hsh_table *, void *);
+void *hsh_force_find (struct hsh_table *, const void *);
+void hsh_force_delete (struct hsh_table *, const void *);
 #else
-#define force_hsh_insert(A, B)			\
-	do *hsh_probe (A, B) = B; while (0)
-#define force_hsh_find(A, B)			\
-	hsh_find (A, B)
+#define hsh_force_insert(A, B)  ((void) (*hsh_probe (A, B) = B))
+#define hsh_force_find(A, B)    (hsh_find (A, B))
+#define hsh_force_delete(A, B)  ((void) hsh_delete (A, B))
 #endif
 
-/* Returns number of used elements in hash table H. */
-#define hsh_count(H) 				\
-	((H)->n)
+/* Number of entries in hash table H. */
+size_t hsh_count (struct hsh_table *);
+
+/* Debugging. */
+#if GLOBAL_DEBUGGING
+void hsh_dump (struct hsh_table *);
+#endif
 
 #endif /* hash_h */