(enum conflict_resolution): Renamed from enum conflict_resolution_e.

[bison.git] / src / symtab.c

diff --git a/src/symtab.c b/src/symtab.c
index ef03b28461d5b842f853e5af19f4f0e2470fbb54..47d7ce22f270b5bea0c970457e0d58ac6533c8fc 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -32,8 +32,8 @@
 
 symbol_t *errtoken = NULL;
 symbol_t *undeftoken = NULL;
-symbol_t *eoftoken = NULL;
-symbol_t *axiom = NULL;
+symbol_t *endtoken = NULL;
+symbol_t *accept = NULL;
 symbol_t *startsymbol = NULL;
 location_t startsymbol_location;
 
@@ -42,11 +42,12 @@ location_t startsymbol_location;
 `---------------------------------*/
 
 static symbol_t *
-symbol_new (const char *tag, location_t location)
+symbol_new (struniq_t tag, location_t location)
 {
   symbol_t *res = XMALLOC (symbol_t, 1);
 
-  res->tag = xstrdup (tag);
+  struniq_assert (tag);
+  res->tag = tag;
   res->location = location;
 
   res->type_name = NULL;
@@ -72,13 +73,14 @@ symbol_new (const char *tag, location_t location)
 `------------------------------------------------------------------*/
 
 void
-symbol_type_set (symbol_t *symbol, char *type_name, location_t location)
+symbol_type_set (symbol_t *symbol, struniq_t type_name, location_t location)
 {
   if (type_name)
     {
       if (symbol->type_name)
        complain_at (location,
                     _("type redeclaration for %s"), symbol->tag);
+      struniq_assert (type_name);
       symbol->type_name = type_name;
     }
 }
@@ -104,7 +106,7 @@ symbol_destructor_set (symbol_t *symbol, char *destructor, location_t location)
 
 
 /*----------------------------------------------------------------.
-| Set the PRITNER associated to SYMBOL.  Do nothing if passed 0.  |
+| Set the PRINTER associated to SYMBOL.  Do nothing if passed 0.  |
 `----------------------------------------------------------------*/
 
 void
@@ -173,7 +175,8 @@ void
 symbol_user_token_number_set (symbol_t *symbol,
                              int user_token_number, location_t location)
 {
-  assert (symbol->class == token_sym);
+  if (symbol->class != token_sym)
+    abort ();
 
   if (symbol->user_token_number != USER_NUMBER_UNDEFINED
       && symbol->user_token_number != user_token_number)
@@ -181,11 +184,11 @@ symbol_user_token_number_set (symbol_t *symbol,
                 symbol->tag);
 
   symbol->user_token_number = user_token_number;
-  /* User defined EOF token? */
+  /* User defined $end token? */
   if (user_token_number == 0)
     {
-      eoftoken = symbol;
-      eoftoken->number = 0;
+      endtoken = symbol;
+      endtoken->number = 0;
       /* It is always mapped to 0, so it was already counted in
         NTOKENS.  */
       --ntokens;
@@ -200,13 +203,7 @@ symbol_user_token_number_set (symbol_t *symbol,
 static void
 symbol_free (symbol_t *this)
 {
-#if 0
-  /* This causes crashes because one string can appear more
-     than once.  */
-  XFREE (this->type_name);
-#endif
-  XFREE (this->tag);
-  XFREE (this);
+  free (this);
 }
 
 
@@ -228,7 +225,7 @@ symbol_check_defined (symbol_t *this)
       this->number = nvars++;
     }
 
-  return TRUE;
+  return true;
 }
 
 
@@ -256,7 +253,8 @@ symbol_make_alias (symbol_t *symbol, symbol_t *symval, location_t loc)
       /* symbol and symval combined are only one symbol */
       nsyms--;
       ntokens--;
-      assert (ntokens == symbol->number || ntokens == symval->number);
+      if (ntokens != symbol->number && ntokens != symval->number)
+       abort ();
       symbol->number = symval->number =
        (symval->number < symbol->number) ? symval->number : symbol->number;
     }
@@ -299,7 +297,7 @@ symbol_check_alias_consistence (symbol_t *this)
            this->assoc = this->alias->assoc;
        }
     }
-  return TRUE;
+  return true;
 }
 
 
@@ -322,25 +320,27 @@ symbol_pack (symbol_t *this)
         prec and assoc fields and make both the same */
       if (this->number == NUMBER_UNDEFINED)
        {
-         if (this == eoftoken || this->alias == eoftoken)
+         if (this == endtoken || this->alias == endtoken)
            this->number = this->alias->number = 0;
          else
            {
-             assert (this->alias->number != NUMBER_UNDEFINED);
+             if (this->alias->number == NUMBER_UNDEFINED)
+               abort ();
              this->number = this->alias->number;
            }
        }
-      /* Do not do processing below for USER_NUMBER_ALIASs.  */
+      /* Do not do processing below for USER_NUMBER_ALIASes.  */
       if (this->user_token_number == USER_NUMBER_ALIAS)
-       return TRUE;
+       return true;
     }
   else /* this->class == token_sym */
     {
-      assert (this->number != NUMBER_UNDEFINED);
+      if (this->number == NUMBER_UNDEFINED)
+       abort ();
     }
 
   symbols[this->number] = this;
-  return TRUE;
+  return true;
 }
 
 
@@ -367,7 +367,7 @@ symbol_translation (symbol_t *this)
       token_translations[this->user_token_number] = this->number;
     }
 
-  return TRUE;
+  return true;
 }
 
 
@@ -381,15 +381,17 @@ symbol_translation (symbol_t *this)
 static struct hash_table *symbol_table = NULL;
 
 static bool
-hash_compare_symbol_t (const symbol_t *m1, const symbol_t *m2)
+hash_compare_symbol (const symbol_t *m1, const symbol_t *m2)
 {
-  return strcmp (m1->tag, m2->tag) ? FALSE : TRUE;
+  /* Since tags are unique, we can compare the pointers themselves.  */
+  return STRUNIQ_EQ (m1->tag, m2->tag);
 }
 
 static unsigned int
-hash_symbol_t (const symbol_t *m, unsigned int tablesize)
+hash_symbol (const symbol_t *m, unsigned int tablesize)
 {
-  return hash_string (m->tag, tablesize);
+  /* Since tags are unique, we can hash the pointer itself.  */
+  return ((size_t) m->tag) % tablesize;
 }
 
 
@@ -402,8 +404,8 @@ symbols_new (void)
 {
   symbol_table = hash_initialize (HT_INITIAL_CAPACITY,
                                  NULL,
-                                 (Hash_hasher) hash_symbol_t,
-                                 (Hash_comparator) hash_compare_symbol_t,
+                                 (Hash_hasher) hash_symbol,
+                                 (Hash_comparator) hash_compare_symbol,
                                  (Hash_data_freer) symbol_free);
 }
 
@@ -420,8 +422,8 @@ symbol_get (const char *key, location_t location)
   symbol_t *entry;
 
   /* Keep the symbol in a printable form.  */
-  key = quotearg_style (escape_quoting_style, key);
-  (const char *) probe.tag = key;
+  key = struniq_new (quotearg_style (escape_quoting_style, key));
+  *(char const **) &probe.tag = key;
   entry = hash_lookup (symbol_table, &probe);
 
   if (!entry)
@@ -501,7 +503,7 @@ symbols_check_defined (void)
 static void
 symbols_token_translations_init (void)
 {
-  int num_256_available_p = TRUE;
+  bool num_256_available_p = true;
   int i;
 
   /* Find the highest user token number, and whether 256, the POSIX
@@ -515,7 +517,7 @@ symbols_token_translations_init (void)
          if (this->user_token_number > max_user_token_number)
            max_user_token_number = this->user_token_number;
          if (this->user_token_number == 256)
-           num_256_available_p = FALSE;
+           num_256_available_p = false;
        }
     }
 
@@ -540,8 +542,8 @@ symbols_token_translations_init (void)
   token_translations = XCALLOC (symbol_number_t, max_user_token_number + 1);
 
   /* Initialize all entries for literal tokens to 2, the internal
-     token number for $undefined., which represents all invalid
-     inputs.  */
+     token number for $undefined, which represents all invalid inputs.
+     */
   for (i = 0; i < max_user_token_number + 1; i++)
     token_translations[i] = undeftoken->number;
   symbols_do (symbol_translation, NULL);