(AUTOMAKE_OPTIONS): Remove.

[bison.git] / src / muscle_tab.c

diff --git a/src/muscle_tab.c b/src/muscle_tab.c
index 47f739512c7301ff95ae1b0cff5ab63d674f85bb..30eb442c2351f8d41e6eea1eac1fa8dcc2f9aaab 100644 (file)
--- a/src/muscle_tab.c
+++ b/src/muscle_tab.c
@@ -1,5 +1,5 @@
 /* Macro table manager for Bison,
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -24,31 +24,31 @@
 #include "muscle_tab.h"
 #include "getargs.h"
 
-struct hash_table muscle_table;
+/* Initial capacity of muscles hash table.  */
+#define HT_INITIAL_CAPACITY 257
 
-static unsigned long
-mhash1 (const void *item)
-{
-  return_STRING_HASH_1 (((const muscle_entry_t *) item)->key);
-}
+struct hash_table *muscle_table = NULL;
 
-static unsigned long
-mhash2 (const void *item)
+static bool
+hash_compare_muscles (void const *x, void const *y)
 {
-  return_STRING_HASH_2 (((const muscle_entry_t *) item)->key);
+  const muscle_entry_t *m1 = x;
+  const muscle_entry_t *m2 = y;
+  return strcmp (m1->key, m2->key) ? FALSE : TRUE;
 }
 
-static int
-mcmp (const void *x, const void *y)
+static unsigned int
+hash_muscle (const void *x, unsigned int tablesize)
 {
-  return strcmp (((const muscle_entry_t*) x)->key,
-                ((const muscle_entry_t *) y)->key);
+  const muscle_entry_t *m = x;
+  return hash_string (m->key, tablesize);
 }
 
 void
 muscle_init (void)
 {
-  hash_init (&muscle_table, MTABSIZE, &mhash1, &mhash2, &mcmp);
+  muscle_table = hash_initialize (HT_INITIAL_CAPACITY, NULL, hash_muscle,
+                                 hash_compare_muscles, NULL);
 
   /* Version and input file.  */
   muscle_insert ("version", VERSION);
@@ -58,40 +58,9 @@ muscle_init (void)
   muscle_insert ("stype", "int");
   muscle_insert ("ltype", "yyltype");
 
-  /* Tables.  */
-  muscle_insert ("rhs", NULL);
-  muscle_insert ("pact", NULL);
-  muscle_insert ("prhs", NULL);
-  muscle_insert ("stos", NULL);
-  muscle_insert ("check", NULL);
-  muscle_insert ("pgoto", NULL);
-  muscle_insert ("table", NULL);
-  muscle_insert ("tname", NULL);
-  muscle_insert ("defact", NULL);
-  muscle_insert ("toknum", NULL);
-  muscle_insert ("defgoto", NULL);
-  muscle_insert ("translate", NULL);
-
-  /* Various macros.  */
-  muscle_insert ("flag", NULL);
-  muscle_insert ("last", NULL);
-  muscle_insert ("pure", NULL);
-  muscle_insert ("nsym", NULL);
-  muscle_insert ("debug", NULL);
-  muscle_insert ("final", NULL);
-  muscle_insert ("maxtok", NULL);
-  muscle_insert ("ntbase", NULL);
-  muscle_insert ("error-verbose", NULL);
-  muscle_insert ("prefix", NULL);
   /* Default #line formatting.  */
   muscle_insert ("linef", "#line %d %s\n");
 
-  /* No parser macros.  */
-  muscle_insert ("nnts", NULL);
-  muscle_insert ("nrules", NULL);
-  muscle_insert ("nstates", NULL);
-  muscle_insert ("ntokens", NULL);
-
   /* Stack parameters.  */
   muscle_insert ("maxdepth", "10000");
   muscle_insert ("initdepth", "200");
@@ -103,16 +72,46 @@ muscle_init (void)
 void
 muscle_insert (const char *key, const char *value)
 {
-  muscle_entry_t *pair = XMALLOC (muscle_entry_t, 1);
-  pair->key = key;
-  pair->value = value;
-  hash_insert (&muscle_table, pair);
+  muscle_entry_t pair = { key, NULL };
+  muscle_entry_t *entry = hash_lookup (muscle_table, &pair);
+
+  if (!entry)
+    {
+      /* First insertion in the hash. */
+      entry = XMALLOC (muscle_entry_t, 1);
+      entry->key = key;
+      hash_insert (muscle_table, entry);
+    }
+  entry->value = value;
 }
 
 const char*
 muscle_find (const char *key)
 {
-  muscle_entry_t pair = { key, 0 };
-  muscle_entry_t *result = hash_find_item (&muscle_table, &pair);
-  return result ? result->value : 0;
+  muscle_entry_t pair = { key, NULL };
+  muscle_entry_t *result = hash_lookup (muscle_table, &pair);
+  return result ? result->value : NULL;
+}
+
+
+/* Output the definition of all the current muscles into a list of
+   m4_defines.  */
+
+static void
+muscle_m4_output (muscle_entry_t *entry, FILE *out)
+{
+  fprintf (out, "m4_define([b4_%s],\n", entry->key);
+  fprintf (out, "          [[%s]])\n\n\n", entry->value);
+}
+
+
+/* Output the definition of all the current muscles into a list of
+   m4_defines.  */
+
+void
+muscles_m4_output (FILE *out)
+{
+  hash_do_for_each (muscle_table,
+                   (Hash_processor) muscle_m4_output,
+                   out);
 }