fix bug in previous patch to this file

[ghc-hetmet.git] / ghc / rts / Hash.h

diff --git a/ghc/rts/Hash.h b/ghc/rts/Hash.h
index ac0df5c..ad55953 100644 (file)
--- a/ghc/rts/Hash.h
+++ b/ghc/rts/Hash.h
@@ -1,5 +1,4 @@
 /*-----------------------------------------------------------------------------
- * $Id: Hash.h,v 1.1 1999/01/27 12:11:26 simonm Exp $
  *
  * (c) The GHC Team, 1999
  *
@@ -7,10 +6,35 @@
  *
  * -------------------------------------------------------------------------- */
 
+#ifndef HASH_H
+#define HASH_H
+
 typedef struct hashtable HashTable; /* abstract */
 
+/* Hash table access where the keys are StgWords */
+HashTable * allocHashTable    ( void );
 void *      lookupHashTable ( HashTable *table, StgWord key );
 void        insertHashTable ( HashTable *table, StgWord key, void *data );
 void *      removeHashTable ( HashTable *table, StgWord key, void *data );
-void        freeHashTable   ( HashTable *table, void (*freeDataFun)(void *) );
-HashTable * allocHashTable  ( void );
+
+/* Hash table access where the keys are C strings (the strings are
+ * assumed to be allocated by the caller, and mustn't be deallocated
+ * until the corresponding hash table entry has been removed).
+ */
+HashTable * allocStrHashTable ( void );
+
+#define lookupStrHashTable(table, key)  \
+   (lookupHashTable(table, (StgWord)key))
+
+#define insertStrHashTable(table, key, data)  \
+   (insertHashTable(table, (StgWord)key, data))
+
+#define removeStrHashTable(table, key, data) \
+   (removeHashTable(table, (StgWord)key, data))
+
+/* Freeing hash tables 
+ */
+void freeHashTable ( HashTable *table, void (*freeDataFun)(void *) );
+
+#endif /* HASH_H */
+