Use size_t (not unsigned int) for hashes, since the gnulib hash module

[bison.git] / src / symtab.c

diff --git a/src/symtab.c b/src/symtab.c
index 8e384f6622f25f7d310c1d62254e5efec9693625..2a5420519302ce9d1d4b71ae8ed5719485fbdb59 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,5 +1,7 @@
-/* Symbol table manager for Bison,
-   Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Symbol table manager for Bison.
+
+   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004 Free Software
+   Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -46,7 +48,7 @@ location startsymbol_location;
 static symbol *
 symbol_new (uniqstr tag, location loc)
 {
 static symbol *
 symbol_new (uniqstr tag, location loc)
 {

-  symbol *res = XMALLOC (symbol, 1);
+  symbol *res = MALLOC (res, 1);

 
   uniqstr_assert (tag);
   res->tag = tag;
 
   uniqstr_assert (tag);
   res->tag = tag;


@@ -190,23 +192,12 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
 }
 
 
 }
 
 

-/*-----------.
-| Free SYM.  |
-`-----------*/
-
-static void
-symbol_free (symbol *sym)
-{
-  free (sym);
-}
-
-

 /*----------------------------------------------------------.
 | If SYM is not defined, report an error, and consider it a |
 | nonterminal.                                              |
 `----------------------------------------------------------*/
 
 /*----------------------------------------------------------.
 | If SYM is not defined, report an error, and consider it a |
 | nonterminal.                                              |
 `----------------------------------------------------------*/
 

-static bool
+static inline bool

 symbol_check_defined (symbol *sym)
 {
   if (sym->class == unknown_sym)
 symbol_check_defined (symbol *sym)
 {
   if (sym->class == unknown_sym)


@@ -222,10 +213,16 @@ symbol_check_defined (symbol *sym)
   return true;
 }
 
   return true;
 }
 

+static bool
+symbol_check_defined_processor (void *sym, void *null ATTRIBUTE_UNUSED)
+{
+  return symbol_check_defined (sym);
+}
+

 
 /*------------------------------------------------------------------.
 | Declare the new symbol SYM.  Make it an alias of SYMVAL, and type |
 
 /*------------------------------------------------------------------.
 | Declare the new symbol SYM.  Make it an alias of SYMVAL, and type |

-| them with TYPENAME.                                               |
+| SYMVAL with SYM's type.                                           |

 `------------------------------------------------------------------*/
 
 void
 `------------------------------------------------------------------*/
 
 void


@@ -251,6 +248,7 @@ symbol_make_alias (symbol *sym, symbol *symval, location loc)
        abort ();
       sym->number = symval->number =
        (symval->number < sym->number) ? symval->number : sym->number;
        abort ();
       sym->number = symval->number =
        (symval->number < sym->number) ? symval->number : sym->number;

+      symbol_type_set (symval, sym->type_name, loc);

     }
 }
 
     }
 }
 


@@ -260,8 +258,8 @@ symbol_make_alias (symbol *sym, symbol *symval, location loc)
 | associativity.                                           |
 `---------------------------------------------------------*/
 
 | associativity.                                           |
 `---------------------------------------------------------*/
 

-static bool
-symbol_check_alias_consistence (symbol *this)
+static inline bool
+symbol_check_alias_consistency (symbol *this)

 {
   /* Check only those who _are_ the aliases. */
   if (this->alias && this->user_token_number == USER_NUMBER_ALIAS)
 {
   /* Check only those who _are_ the aliases. */
   if (this->alias && this->user_token_number == USER_NUMBER_ALIAS)


@@ -294,13 +292,20 @@ symbol_check_alias_consistence (symbol *this)
   return true;
 }
 
   return true;
 }
 

+static bool
+symbol_check_alias_consistency_processor (void *this,
+                                         void *null ATTRIBUTE_UNUSED)
+{
+  return symbol_check_alias_consistency (this);
+}
+

 
 /*-------------------------------------------------------------------.
 | Assign a symbol number, and write the definition of the token name |
 | into FDEFINES.  Put in SYMBOLS.                                    |
 `-------------------------------------------------------------------*/
 
 
 /*-------------------------------------------------------------------.
 | Assign a symbol number, and write the definition of the token name |
 | into FDEFINES.  Put in SYMBOLS.                                    |
 `-------------------------------------------------------------------*/
 

-static bool
+static inline bool

 symbol_pack (symbol *this)
 {
   if (this->class == nterm_sym)
 symbol_pack (symbol *this)
 {
   if (this->class == nterm_sym)


@@ -337,6 +342,12 @@ symbol_pack (symbol *this)
   return true;
 }
 
   return true;
 }
 

+static bool
+symbol_pack_processor (void *this, void *null ATTRIBUTE_UNUSED)
+{
+  return symbol_pack (this);
+}
+

 
 
 
 
 
 


@@ -344,7 +355,7 @@ symbol_pack (symbol *this)
 | Put THIS in TOKEN_TRANSLATIONS if it is a token.  |
 `--------------------------------------------------*/
 
 | Put THIS in TOKEN_TRANSLATIONS if it is a token.  |
 `--------------------------------------------------*/
 

-static bool
+static inline bool

 symbol_translation (symbol *this)
 {
   /* Non-terminal? */
 symbol_translation (symbol *this)
 {
   /* Non-terminal? */


@@ -364,6 +375,12 @@ symbol_translation (symbol *this)
   return true;
 }
 
   return true;
 }
 

+static bool
+symbol_translation_processor (void *this, void *null ATTRIBUTE_UNUSED)
+{
+  return symbol_translation (this);
+}
+

 
 /*----------------------.
 | A symbol hash table.  |
 
 /*----------------------.
 | A symbol hash table.  |


@@ -374,18 +391,30 @@ symbol_translation (symbol *this)
 
 static struct hash_table *symbol_table = NULL;
 
 
 static struct hash_table *symbol_table = NULL;
 

-static bool
+static inline bool

 hash_compare_symbol (const symbol *m1, const symbol *m2)
 {
   /* Since tags are unique, we can compare the pointers themselves.  */
   return UNIQSTR_EQ (m1->tag, m2->tag);
 }
 
 hash_compare_symbol (const symbol *m1, const symbol *m2)
 {
   /* Since tags are unique, we can compare the pointers themselves.  */
   return UNIQSTR_EQ (m1->tag, m2->tag);
 }
 

-static unsigned int
-hash_symbol (const symbol *m, unsigned int tablesize)
+static bool
+hash_symbol_comparator (void const *m1, void const *m2)
+{
+  return hash_compare_symbol (m1, m2);
+}
+
+static inline size_t
+hash_symbol (const symbol *m, size_t tablesize)

 {
   /* Since tags are unique, we can hash the pointer itself.  */
 {
   /* Since tags are unique, we can hash the pointer itself.  */

-  return ((size_t) m->tag) % tablesize;
+  return ((uintptr_t) m->tag) % tablesize;
+}
+
+static size_t
+hash_symbol_hasher (void const *m, size_t tablesize)
+{
+  return hash_symbol (m, tablesize);

 }
 
 
 }
 
 


@@ -398,9 +427,9 @@ symbols_new (void)
 {
   symbol_table = hash_initialize (HT_INITIAL_CAPACITY,
                                  NULL,
 {
   symbol_table = hash_initialize (HT_INITIAL_CAPACITY,
                                  NULL,

-                                 (Hash_hasher) hash_symbol,
-                                 (Hash_comparator) hash_compare_symbol,
-                                 (Hash_data_freer) symbol_free);
+                                 hash_symbol_hasher,
+                                 hash_symbol_comparator,
+                                 free);

 }
 
 
 }
 
 


@@ -417,7 +446,7 @@ symbol_get (const char *key, location loc)
 
   /* Keep the symbol in a printable form.  */
   key = uniqstr_new (quotearg_style (escape_quoting_style, key));
 
   /* Keep the symbol in a printable form.  */
   key = uniqstr_new (quotearg_style (escape_quoting_style, key));

-  *(char const **) &probe.tag = key;
+  probe.tag = key;

   entry = hash_lookup (symbol_table, &probe);
 
   if (!entry)
   entry = hash_lookup (symbol_table, &probe);
 
   if (!entry)


@@ -469,12 +498,10 @@ symbols_free (void)
 | terminals.                                                     |
 `---------------------------------------------------------------*/
 
 | terminals.                                                     |
 `---------------------------------------------------------------*/
 

-void
-symbols_do (symbol_processor processor, void *processor_data)
+static void
+symbols_do (Hash_processor processor, void *processor_data)

 {
 {

-  hash_do_for_each (symbol_table,
-                   (Hash_processor) processor,
-                   processor_data);
+  hash_do_for_each (symbol_table, processor, processor_data);

 }
 
 
 }
 
 


@@ -486,7 +513,7 @@ symbols_do (symbol_processor processor, void *processor_data)
 void
 symbols_check_defined (void)
 {
 void
 symbols_check_defined (void)
 {

-  symbols_do (symbol_check_defined, NULL);
+  symbols_do (symbol_check_defined_processor, NULL);

 }
 
 /*------------------------------------------------------------------.
 }
 
 /*------------------------------------------------------------------.


@@ -533,14 +560,14 @@ symbols_token_translations_init (void)
        max_user_token_number = this->user_token_number;
     }
 
        max_user_token_number = this->user_token_number;
     }
 

-  token_translations = XCALLOC (symbol_number, max_user_token_number + 1);
+  CALLOC (token_translations, max_user_token_number + 1);

 
   /* Initialize all entries for literal tokens to 2, the internal
      token number for $undefined, which represents all invalid inputs.
      */
   for (i = 0; i < max_user_token_number + 1; i++)
     token_translations[i] = undeftoken->number;
 
   /* Initialize all entries for literal tokens to 2, the internal
      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);
+  symbols_do (symbol_translation_processor, NULL);

 }
 
 
 }
 
 


@@ -552,10 +579,10 @@ symbols_token_translations_init (void)
 void
 symbols_pack (void)
 {
 void
 symbols_pack (void)
 {

-  symbols = XCALLOC (symbol *, nsyms);
+  CALLOC (symbols, nsyms);

 
 

-  symbols_do (symbol_check_alias_consistence, NULL);
-  symbols_do (symbol_pack, NULL);
+  symbols_do (symbol_check_alias_consistency_processor, NULL);
+  symbols_do (symbol_pack_processor, NULL);

 
   symbols_token_translations_init ();
 
 
   symbols_token_translations_init ();