X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/df09ef2e8fc03de1bc17e9687fddd5f2ed86662c..3508ce361ba6e5c62c592d0caf039d316ed7f84f:/src/symtab.c?ds=sidebyside diff --git a/src/symtab.c b/src/symtab.c index 3bc01871..e3c450f4 100644 --- a/src/symtab.c +++ b/src/symtab.c @@ -1,7 +1,7 @@ /* Symbol table manager for Bison. - Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004 Free Software - Foundation, Inc. + Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2006 Free + Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -17,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 @@ -41,6 +41,15 @@ symbol *accept = NULL; symbol *startsymbol = NULL; location startsymbol_location; +/*-----------------------------------. +| Default %destructor and %printer. | +`-----------------------------------*/ + +static const char *default_destructor = NULL; +static location default_destructor_location; +static const char *default_printer = NULL; +static location default_printer_location; + /*---------------------------------. | Create a new symbol, named TAG. | `---------------------------------*/ @@ -48,7 +57,7 @@ location startsymbol_location; static symbol * symbol_new (uniqstr tag, location loc) { - symbol *res = MALLOC (res, 1); + symbol *res = xmalloc (sizeof *res); uniqstr_assert (tag); res->tag = tag; @@ -65,12 +74,40 @@ 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. | @@ -80,7 +117,7 @@ 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")); + complain_at (first, _("previous declaration")); } @@ -108,7 +145,7 @@ 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) { @@ -119,23 +156,80 @@ symbol_destructor_set (symbol *sym, char *destructor, location loc) } } +/*---------------------------------------. +| Get the computed %destructor for SYM. | +`---------------------------------------*/ + +const char * +symbol_destructor_get (symbol *sym) +{ + /* Per-symbol %destructor. */ + if (sym->destructor != NULL) + return sym->destructor; + + /* Apply the default %destructor only to user-defined symbols. */ + if (sym->tag[0] == '$' || sym == errtoken) + return NULL; + return default_destructor; +} + +/*---------------------------------------------------------------. +| Get the grammar location of the %destructor computed for SYM. | +`---------------------------------------------------------------*/ + +location +symbol_destructor_location_get (symbol *sym) +{ + if (sym->destructor != NULL) + return sym->destructor_location; + return default_destructor_location; +} /*---------------------------------------------------------------. | Set the PRINTER associated with SYM. Do nothing if passed 0. | `---------------------------------------------------------------*/ 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) - redeclaration (sym, "%printer", sym->destructor_location, loc); + redeclaration (sym, "%printer", sym->printer_location, loc); sym->printer = printer; sym->printer_location = loc; } } +/*------------------------------------. +| Get the computed %printer for SYM. | +`------------------------------------*/ + +const char * +symbol_printer_get (symbol *sym) +{ + /* Per-symbol %printer. */ + if (sym->printer != NULL) + return sym->printer; + + /* Apply the default %printer only to user-defined symbols. */ + if (sym->tag[0] == '$' || sym == errtoken) + return NULL; + return default_printer; +} + +/*------------------------------------------------------------. +| Get the grammar location of the %printer computed for SYM. | +`------------------------------------------------------------*/ + +location +symbol_printer_location_get (symbol *sym) +{ + if (sym->printer != NULL) + return sym->printer_location; + return default_printer_location; +} + /*-----------------------------------------------------------------. | Set the PRECEDENCE associated with SYM. Does nothing if invoked | @@ -155,7 +249,7 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc) } /* Only terminals have a precedence. */ - symbol_class_set (sym, token_sym, loc); + symbol_class_set (sym, token_sym, loc, false); } @@ -164,10 +258,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++; @@ -175,6 +272,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; + } } @@ -185,14 +289,19 @@ 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 (); + int *user_token_numberp; - if (sym->user_token_number != USER_NUMBER_UNDEFINED - && sym->user_token_number != user_token_number) + assert (sym->class == token_sym); + + if (sym->user_token_number != USER_NUMBER_ALIAS) + user_token_numberp = &sym->user_token_number; + else + user_token_numberp = &sym->alias->user_token_number; + if (*user_token_numberp != USER_NUMBER_UNDEFINED + && *user_token_numberp != user_token_number) complain_at (loc, _("redefining user token number of %s"), sym->tag); - sym->user_token_number = user_token_number; + *user_token_numberp = user_token_number; /* User defined $end token? */ if (user_token_number == 0) { @@ -254,13 +363,8 @@ symbol_make_alias (symbol *sym, symbol *symval, location loc) sym->user_token_number = USER_NUMBER_ALIAS; symval->alias = sym; sym->alias = symval; - /* sym and symval combined are only one symbol. */ - nsyms--; - ntokens--; - if (ntokens != sym->number && ntokens != symval->number) - abort (); - sym->number = symval->number = - (symval->number < sym->number) ? symval->number : sym->number; + symval->number = sym->number; + symbol_type_set (symval, sym->type_name, loc); } } @@ -280,7 +384,7 @@ symbol_check_alias_consistency (symbol *this) if (!(this->alias && this->user_token_number == USER_NUMBER_ALIAS)) return; - if (orig->type_name || alias->type_name) + if (orig->type_name != alias->type_name) { if (orig->type_name) symbol_type_set (alias, orig->type_name, orig->type_location); @@ -350,8 +454,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; } } @@ -360,10 +463,7 @@ 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; @@ -466,13 +566,11 @@ symbols_new (void) `----------------------------------------------------------------*/ symbol * -symbol_get (const char *key, location loc) +symbol_from_uniqstr (const uniqstr key, location loc) { symbol probe; symbol *entry; - /* Keep the symbol in a printable form. */ - key = uniqstr_new (quotearg_style (escape_quoting_style, key)); probe.tag = key; entry = hash_lookup (symbol_table, &probe); @@ -486,6 +584,18 @@ symbol_get (const char *key, location loc) } +/*----------------------------------------------------------------. +| Find the symbol named KEY, and return it. If it does not exist | +| yet, create it. | +`----------------------------------------------------------------*/ + +symbol * +symbol_get (const char *key, location loc) +{ + return symbol_from_uniqstr (uniqstr_new (key), loc); +} + + /*------------------------------------------------------------------. | Generate a dummy nonterminal, whose name cannot conflict with the | | user's names. | @@ -507,6 +617,11 @@ dummy_symbol_get (location loc) return sym; } +bool +symbol_is_dummy (const symbol *sym) +{ + return sym->tag[0] == '@'; +} /*-------------------. | Free the symbols. | @@ -587,7 +702,8 @@ symbols_token_translations_init (void) max_user_token_number = this->user_token_number; } - CALLOC (token_translations, 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. @@ -606,11 +722,35 @@ symbols_token_translations_init (void) void symbols_pack (void) { - CALLOC (symbols, nsyms); - symbols_do (symbol_check_alias_consistency_processor, NULL); + + symbols = xcalloc (nsyms, sizeof *symbols); symbols_do (symbol_pack_processor, NULL); + /* Aliases leave empty slots in symbols, so remove them. */ + { + int writei; + int readi; + int nsyms_old = nsyms; + for (writei = 0, readi = 0; readi < nsyms_old; readi += 1) + { + if (symbols[readi] == NULL) + { + nsyms -= 1; + ntokens -= 1; + } + else + { + symbols[writei] = symbols[readi]; + symbols[writei]->number = writei; + if (symbols[writei]->alias) + symbols[writei]->alias->number = writei; + writei += 1; + } + } + } + symbols = xnrealloc (symbols, nsyms, sizeof *symbols); + symbols_token_translations_init (); if (startsymbol->class == unknown_sym) @@ -622,3 +762,32 @@ symbols_pack (void) _("the start symbol %s is a token"), startsymbol->tag); } + + +/*-----------------------------------. +| Set default %destructor/%printer. | +`-----------------------------------*/ + +void +default_destructor_set (const char *destructor, location loc) +{ + if (default_destructor != NULL) + { + complain_at (loc, _("redeclaration for default %%destructor")); + complain_at (default_destructor_location, _("previous declaration")); + } + default_destructor = destructor; + default_destructor_location = loc; +} + +void +default_printer_set (const char *printer, location loc) +{ + if (default_printer != NULL) + { + complain_at (loc, _("redeclaration for default %%printer")); + complain_at (default_printer_location, _("previous declaration")); + } + default_printer = printer; + default_printer_location = loc; +}