/* -*-c-*-
*
- * $Id: sym.h,v 1.6 1999/05/26 21:08:31 mdw Exp $
+ * $Id: sym.h,v 1.9 1999/08/02 16:53:48 mdw Exp $
*
* Symbol table management
*
/*----- Revision history --------------------------------------------------*
*
* $Log: sym.h,v $
+ * Revision 1.9 1999/08/02 16:53:48 mdw
+ * Improve type safety for sym_iter objects.
+ *
+ * Revision 1.8 1999/08/02 14:45:48 mdw
+ * Break low-level hashtable code out from sym.
+ *
+ * Revision 1.7 1999/06/01 09:49:33 mdw
+ * Allow things to be looked up by just their caller-supplied hashes. This
+ * actually needs to be thought through better.
+ *
* Revision 1.6 1999/05/26 21:08:31 mdw
* Rename symbols in line with newer conventions.
*
#include <stddef.h>
+#ifndef BITS_H
+# include "bits.h"
+#endif
+
+#ifndef HASH_H
+# include "hash.h"
+#endif
+
/*----- Type definitions --------------------------------------------------*/
/* --- Symbol table --- *
*/
typedef struct sym_table {
- unsigned long mask; /* Bit mask for hashing purposes */
- size_t c; /* Down counter for growing table */
- struct sym_base **a; /* Array of hash bins */
+ hash_table t;
+ size_t load;
} sym_table;
/* --- A symbol table entry --- *
#define SYM_BUFSZ 16 /* Size of local string buffer */
typedef struct sym_base {
- struct sym_base *next; /* Next symbol in hash bin */
- unsigned long hash; /* Hash value for symbol's name */
+ hash_base b;
union {
char *p; /* Pointer to name string */
char b[SYM_BUFSZ]; /* Buffer containing a short name */
/* --- An iterator block --- */
-typedef struct sym_iter {
- sym_table *t; /* Symbol table being iterated */
- sym_base *n; /* Address of next item to return */
- size_t i; /* Index of next hash bin to use */
-} sym_iter;
+typedef struct { hash_iter i; } sym_iter;
/*----- External functions ------------------------------------------------*/
* may be given, in which case the name may contain arbitrary
* binary data, or it may be given as a negative number, in
* which case the length of the name is calculated as
- * @strlen(n)@.
+ * @strlen(n) + 1@.
*
* The return value is the address of a pointer to a @sym_base@
* block (which may have other things on the end, as above). If
* iterate through a symbol table.
*/
+#define SYM_MKITER(i_, t_) HASH_MKITER(&(i_)->i, &(t_)->t)
+
extern void sym_mkiter(sym_iter */*i*/, sym_table */*t*/);
/* --- @sym_next@ --- *
* returned in any particular order.
*/
+#define SYM_NEXT(i_, p) do { \
+ hash_base *_q; \
+ HASH_NEXT(&(i_)->i, _q); \
+ (p) = (void *)_q; \
+} while (0)
+
extern void *sym_next(sym_iter */*i*/);
/*----- That's all, folks -------------------------------------------------*/