/* -*-c-*-
*
- * $Id: sym.c,v 1.4 1999/05/06 19:51:35 mdw Exp $
+ * $Id: sym.c,v 1.6 1999/05/26 21:08:31 mdw Exp $
*
* Symbol table management
*
/*----- Revision history --------------------------------------------------*
*
* $Log: sym.c,v $
+ * Revision 1.6 1999/05/26 21:08:31 mdw
+ * Rename symbols in line with newer conventions.
+ *
+ * Revision 1.5 1999/05/13 22:48:37 mdw
+ * Twiddle the extension threshold. Change `-ise' to `-ize' throughout.
+ *
* Revision 1.4 1999/05/06 19:51:35 mdw
* Reformatted the LGPL notice a little bit.
*
* and the limit %$l$% satisfy the relation %$n < bl$%; if a new item is
* added to the table and this relation is found to be false, the table is
* doubled in size.
- *
- * The current function gives %$l = {3n \over 4}$%, which appears to be
- * reasonable on the face of things.
*/
-#define SYM_LIMIT(n) (((n) * 3) >> 2) /* Load factor for growing table */
+#define SYM_LIMIT(n) ((n) * 4) /* Load factor for growing table */
/*----- Main code ---------------------------------------------------------*/
-/* --- @sym_createTable@ --- *
+/* --- @sym_create@ --- *
*
- * Arguments: @sym_table *t@ = symbol table to initialise
+ * Arguments: @sym_table *t@ = symbol table to initialize
*
* Returns: ---
*
- * Use: Initialises the given symbol table. Raises @EXC_NOMEM@ if
+ * Use: Initializes the given symbol table. Raises @EXC_NOMEM@ if
* there isn't enough memory.
*/
-void sym_createTable(sym_table *t)
+void sym_create(sym_table *t)
{
size_t i;
TRACK_POP;
}
-/* --- @sym_destroyTable@ --- *
+/* --- @sym_destroy@ --- *
*
* Arguments: @sym_table *t@ = pointer to symbol table in question
*
* occupy.
*/
-void sym_destroyTable(sym_table *t)
+void sym_destroy(sym_table *t)
{
size_t i;
sym_base *p, *q;
if (f) *f = 0; /* Failed to find the block */
if (!sz) return (0); /* Return zero if not creating */
- /* --- Create a new symbol block and initialise it --- */
+ /* --- Create a new symbol block and initialize it --- */
{
TRACK_CTX("new symbol creation");
t->c++;
}
-/* --- @sym_createIter@ --- *
+/* --- @sym_mkiter@ --- *
*
* Arguments: @sym_iter *i@ = pointer to an iterator object
* @sym_table *t@ = pointer to a symbol table object
* iterate through a symbol table.
*/
-void sym_createIter(sym_iter *i, sym_table *t)
+void sym_mkiter(sym_iter *i, sym_table *t)
{
i->t = t;
i->i = 0;
sym_table tbl;
int entries;
- /* --- Initialise for reading the file --- */
+ /* --- Initialize for reading the file --- */
sz = BUFSIZ;
buff = xmalloc(sz + 1);
flag[i] = 0;
entries = 0;
- sym_createTable(&tbl);
+ sym_create(&tbl);
for (;;) {
i = (unsigned)rand() % sz;
ntbl = xmalloc(sz * sizeof(sym_word *));
memcpy(ntbl, flag, sz * sizeof(sym_word *));
- sym_createIter(&it, &tbl);
+ sym_mkiter(&it, &tbl);
while ((w = sym_next(&it)) != 0) {
if (ntbl[w->i] == 0)