X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/17ee7397a87c4c4ccd45f956e0b88b824a3689f9..927b425baae16fc1d50e092b78b944e281b521f6:/src/symtab.c diff --git a/src/symtab.c b/src/symtab.c index 8e384f66..ef59c6ee 100644 --- 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, 2005, 2006 Free + Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -15,10 +17,10 @@ You should have received a copy of the GNU General Public License along with Bison; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ +#include #include "system.h" #include @@ -46,7 +48,7 @@ location startsymbol_location; static symbol * symbol_new (uniqstr tag, location loc) { - symbol *res = XMALLOC (symbol, 1); + symbol *res = xmalloc (sizeof *res); uniqstr_assert (tag); res->tag = tag; @@ -63,12 +65,53 @@ symbol_new (uniqstr tag, location loc) res->alias = NULL; res->class = unknown_sym; + res->declared = false; + if (nsyms == SYMBOL_NUMBER_MAXIMUM) + fatal (_("too many symbols in input grammar (limit is %d)"), + SYMBOL_NUMBER_MAXIMUM); nsyms++; return res; } +/*-----------------. +| Print a symbol. | +`-----------------*/ + +#define SYMBOL_ATTR_PRINT(Attr) \ + if (s->Attr) \ + fprintf (f, " %s { %s }", #Attr, s->Attr) + +void +symbol_print (symbol *s, FILE *f) +{ + if (s) + { + fprintf (f, "\"%s\"", s->tag); + SYMBOL_ATTR_PRINT (type_name); + SYMBOL_ATTR_PRINT (destructor); + SYMBOL_ATTR_PRINT (printer); + } + else + fprintf (f, ""); +} + +#undef SYMBOL_ATTR_PRINT + +/*------------------------------------------------------------------. +| Complain that S's WHAT is redeclared at SECOND, and was first set | +| at FIRST. | +`------------------------------------------------------------------*/ + +static void +redeclaration (symbol* s, const char *what, location first, location second) +{ + complain_at (second, _("%s redeclaration for %s"), what, s->tag); + complain_at (first, _("first declaration")); +} + + /*-----------------------------------------------------------------. | Set the TYPE_NAME associated with SYM. Does nothing if passed 0 | | as TYPE_NAME. | @@ -80,9 +123,10 @@ symbol_type_set (symbol *sym, uniqstr type_name, location loc) if (type_name) { if (sym->type_name) - complain_at (loc, _("type redeclaration for %s"), sym->tag); + redeclaration (sym, "%type", sym->type_location, loc); uniqstr_assert (type_name); sym->type_name = type_name; + sym->type_location = loc; } } @@ -92,13 +136,12 @@ symbol_type_set (symbol *sym, uniqstr type_name, location loc) `------------------------------------------------------------------*/ void -symbol_destructor_set (symbol *sym, char *destructor, location loc) +symbol_destructor_set (symbol *sym, const char *destructor, location loc) { if (destructor) { if (sym->destructor) - complain_at (loc, _("%s redeclaration for %s"), - "%destructor", sym->tag); + redeclaration (sym, "%destructor", sym->destructor_location, loc); sym->destructor = destructor; sym->destructor_location = loc; } @@ -110,13 +153,12 @@ symbol_destructor_set (symbol *sym, char *destructor, location loc) `---------------------------------------------------------------*/ void -symbol_printer_set (symbol *sym, char *printer, location loc) +symbol_printer_set (symbol *sym, const char *printer, location loc) { if (printer) { if (sym->printer) - complain_at (loc, _("%s redeclaration for %s"), - "%printer", sym->tag); + redeclaration (sym, "%printer", sym->destructor_location, loc); sym->printer = printer; sym->printer_location = loc; } @@ -134,13 +176,14 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc) if (a != undef_assoc) { if (sym->prec != 0) - complain_at (loc, _("redefining precedence of %s"), sym->tag); + redeclaration (sym, assoc_to_string (a), sym->prec_location, loc); sym->prec = prec; sym->assoc = a; + sym->prec_location = loc; } /* Only terminals have a precedence. */ - symbol_class_set (sym, token_sym, loc); + symbol_class_set (sym, token_sym, loc, false); } @@ -149,10 +192,13 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc) `------------------------------------*/ void -symbol_class_set (symbol *sym, symbol_class class, location loc) +symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring) { if (sym->class != unknown_sym && sym->class != class) - complain_at (loc, _("symbol %s redefined"), sym->tag); + { + complain_at (loc, _("symbol %s redefined"), sym->tag); + sym->declared = false; + } if (class == nterm_sym && sym->class != nterm_sym) sym->number = nvars++; @@ -160,6 +206,13 @@ symbol_class_set (symbol *sym, symbol_class class, location loc) sym->number = ntokens++; sym->class = class; + + if (declaring) + { + if (sym->declared) + warn_at (loc, _("symbol %s redeclared"), sym->tag); + sym->declared = true; + } } @@ -170,8 +223,7 @@ symbol_class_set (symbol *sym, symbol_class class, location loc) void symbol_user_token_number_set (symbol *sym, int user_token_number, location loc) { - if (sym->class != token_sym) - abort (); + assert (sym->class == token_sym); if (sym->user_token_number != USER_NUMBER_UNDEFINED && sym->user_token_number != user_token_number) @@ -190,23 +242,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. | `----------------------------------------------------------*/ -static bool +static inline bool symbol_check_defined (symbol *sym) { if (sym->class == unknown_sym) @@ -222,10 +263,16 @@ symbol_check_defined (symbol *sym) 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 | -| them with TYPENAME. | +| SYMVAL with SYM's type. | `------------------------------------------------------------------*/ void @@ -233,10 +280,10 @@ symbol_make_alias (symbol *sym, symbol *symval, location loc) { if (symval->alias) warn_at (loc, _("symbol `%s' used more than once as a literal string"), - symval->tag); + symval->tag); else if (sym->alias) warn_at (loc, _("symbol `%s' given more than one literal string"), - sym->tag); + sym->tag); else { symval->class = token_sym; @@ -247,10 +294,10 @@ symbol_make_alias (symbol *sym, symbol *symval, location loc) /* sym and symval combined are only one symbol. */ nsyms--; ntokens--; - if (ntokens != sym->number && ntokens != symval->number) - abort (); + assert (ntokens == sym->number || ntokens == symval->number); sym->number = symval->number = (symval->number < sym->number) ? symval->number : sym->number; + symbol_type_set (symval, sym->type_name, loc); } } @@ -260,37 +307,59 @@ symbol_make_alias (symbol *sym, symbol *symval, location loc) | associativity. | `---------------------------------------------------------*/ -static bool -symbol_check_alias_consistence (symbol *this) +static inline void +symbol_check_alias_consistency (symbol *this) { - /* Check only those who _are_ the aliases. */ - if (this->alias && this->user_token_number == USER_NUMBER_ALIAS) + symbol *alias = this; + symbol *orig = this->alias; + + /* Check only those that _are_ the aliases. */ + if (!(this->alias && this->user_token_number == USER_NUMBER_ALIAS)) + return; + + if (orig->type_name != alias->type_name) { - if (this->prec != this->alias->prec) - { - if (this->prec != 0 && this->alias->prec != 0) - complain_at (this->alias->location, - _("conflicting precedences for %s and %s"), - this->tag, this->alias->tag); - if (this->prec != 0) - this->alias->prec = this->prec; - else - this->prec = this->alias->prec; - } + if (orig->type_name) + symbol_type_set (alias, orig->type_name, orig->type_location); + else + symbol_type_set (orig, alias->type_name, alias->type_location); + } - if (this->assoc != this->alias->assoc) - { - if (this->assoc != undef_assoc && this->alias->assoc != undef_assoc) - complain_at (this->alias->location, - _("conflicting associativities for %s (%s) and %s (%s)"), - this->tag, assoc_to_string (this->assoc), - this->alias->tag, assoc_to_string (this->alias->assoc)); - if (this->assoc != undef_assoc) - this->alias->assoc = this->assoc; - else - this->assoc = this->alias->assoc; - } + + if (orig->destructor || alias->destructor) + { + if (orig->destructor) + symbol_destructor_set (alias, orig->destructor, + orig->destructor_location); + else + symbol_destructor_set (orig, alias->destructor, + alias->destructor_location); + } + + if (orig->printer || alias->printer) + { + if (orig->printer) + symbol_printer_set (alias, orig->printer, orig->printer_location); + else + symbol_printer_set (orig, alias->printer, alias->printer_location); } + + if (alias->prec || orig->prec) + { + if (orig->prec) + symbol_precedence_set (alias, orig->prec, orig->assoc, + orig->prec_location); + else + symbol_precedence_set (orig, alias->prec, alias->assoc, + alias->prec_location); + } +} + +static bool +symbol_check_alias_consistency_processor (void *this, + void *null ATTRIBUTE_UNUSED) +{ + symbol_check_alias_consistency (this); return true; } @@ -300,7 +369,7 @@ symbol_check_alias_consistence (symbol *this) | into FDEFINES. Put in SYMBOLS. | `-------------------------------------------------------------------*/ -static bool +static inline bool symbol_pack (symbol *this) { if (this->class == nterm_sym) @@ -318,8 +387,7 @@ symbol_pack (symbol *this) this->number = this->alias->number = 0; else { - if (this->alias->number == NUMBER_UNDEFINED) - abort (); + assert (this->alias->number != NUMBER_UNDEFINED); this->number = this->alias->number; } } @@ -328,15 +396,18 @@ symbol_pack (symbol *this) return true; } else /* this->class == token_sym */ - { - if (this->number == NUMBER_UNDEFINED) - abort (); - } + assert (this->number != NUMBER_UNDEFINED); symbols[this->number] = this; return true; } +static bool +symbol_pack_processor (void *this, void *null ATTRIBUTE_UNUSED) +{ + return symbol_pack (this); +} + @@ -344,7 +415,7 @@ symbol_pack (symbol *this) | Put THIS in TOKEN_TRANSLATIONS if it is a token. | `--------------------------------------------------*/ -static bool +static inline bool symbol_translation (symbol *this) { /* Non-terminal? */ @@ -364,6 +435,12 @@ symbol_translation (symbol *this) return true; } +static bool +symbol_translation_processor (void *this, void *null ATTRIBUTE_UNUSED) +{ + return symbol_translation (this); +} + /*----------------------. | A symbol hash table. | @@ -374,18 +451,30 @@ symbol_translation (symbol *this) 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); } -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. */ - 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 +487,9 @@ symbols_new (void) { 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); } @@ -415,9 +504,8 @@ symbol_get (const char *key, location loc) symbol probe; symbol *entry; - /* Keep the symbol in a printable form. */ - key = uniqstr_new (quotearg_style (escape_quoting_style, key)); - *(char const **) &probe.tag = key; + key = uniqstr_new (key); + probe.tag = key; entry = hash_lookup (symbol_table, &probe); if (!entry) @@ -469,12 +557,10 @@ symbols_free (void) | 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 +572,7 @@ symbols_do (symbol_processor processor, void *processor_data) void symbols_check_defined (void) { - symbols_do (symbol_check_defined, NULL); + symbols_do (symbol_check_defined_processor, NULL); } /*------------------------------------------------------------------. @@ -533,14 +619,15 @@ symbols_token_translations_init (void) max_user_token_number = this->user_token_number; } - token_translations = XCALLOC (symbol_number, max_user_token_number + 1); + token_translations = xnmalloc (max_user_token_number + 1, + sizeof *token_translations); /* 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 +639,10 @@ symbols_token_translations_init (void) void symbols_pack (void) { - symbols = XCALLOC (symbol *, nsyms); + symbols = xcalloc (nsyms, sizeof *symbols); - 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 ();