X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b0f4c4eaa1da1437b18d5d8e250d666133225d8a..ccdc1577ef7fb32a5e30cb655337e7cd42b98987:/src/symtab.c?ds=sidebyside diff --git a/src/symtab.c b/src/symtab.c index b2ffc216..1d0ed91f 100644 --- a/src/symtab.c +++ b/src/symtab.c @@ -1,35 +1,40 @@ /* Symbol table manager for Bison. - Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2006 Free - Software Foundation, Inc. + Copyright (C) 1984, 1989, 2000-2002, 2004-2012 Free Software + Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. - Bison is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Bison is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #include #include "system.h" #include -#include #include "complain.h" #include "gram.h" #include "symtab.h" +/*-------------------------------------------------------------------. +| Symbols sorted by tag. Allocated by the first invocation of | +| symbols_do, after which no more symbols should be created. | +`-------------------------------------------------------------------*/ + +static symbol **symbols_sorted = NULL; +static symbol **semantic_types_sorted = NULL; + /*------------------------. | Distinguished symbols. | `------------------------*/ @@ -45,15 +50,16 @@ location startsymbol_location; | Default %destructor's and %printer's. | `---------------------------------------*/ -static const char *default_tagged_destructor = NULL; -static location default_tagged_destructor_location; -static const char *default_tagless_destructor = NULL; -static location default_tagless_destructor_location; - -static const char *default_tagged_printer = NULL; -static location default_tagged_printer_location; -static const char *default_tagless_printer = NULL; -static location default_tagless_printer_location; +static code_props default_tagged_code_props[CODE_PROPS_SIZE] = + { + CODE_PROPS_NONE_INIT, + CODE_PROPS_NONE_INIT, + }; +static code_props default_tagless_code_props[CODE_PROPS_SIZE] = + { + CODE_PROPS_NONE_INIT, + CODE_PROPS_NONE_INIT, + }; /*---------------------------------. | Create a new symbol, named TAG. | @@ -65,12 +71,19 @@ symbol_new (uniqstr tag, location loc) symbol *res = xmalloc (sizeof *res); uniqstr_assert (tag); + + /* If the tag is not a string (starts with a double quote), check + that it is valid for Yacc. */ + if (tag[0] != '\"' && tag[0] != '\'' && strchr (tag, '-')) + complain_at (loc, Wyacc, + _("POSIX Yacc forbids dashes in symbol names: %s"), tag); + res->tag = tag; res->location = loc; res->type_name = NULL; - res->destructor = NULL; - res->printer = NULL; + for (int i = 0; i < CODE_PROPS_SIZE; ++i) + code_props_none_init (&res->props[i]); res->number = NUMBER_UNDEFINED; res->prec = 0; @@ -79,28 +92,43 @@ symbol_new (uniqstr tag, location loc) res->alias = NULL; res->class = unknown_sym; - res->declared = false; + res->status = undeclared; if (nsyms == SYMBOL_NUMBER_MAXIMUM) - fatal (_("too many symbols in input grammar (limit is %d)"), - SYMBOL_NUMBER_MAXIMUM); + complain (fatal, _("too many symbols in input grammar (limit is %d)"), + SYMBOL_NUMBER_MAXIMUM); nsyms++; return res; } +char const * +code_props_type_string (code_props_type kind) +{ + switch (kind) + { + case destructor: + return "%destructor"; + case printer: + return "%printer"; + } + assert (0); +} + /*----------------------------------------. | Create a new semantic type, named TAG. | `----------------------------------------*/ static semantic_type * -semantic_type_new (uniqstr tag) +semantic_type_new (uniqstr tag, const location *loc) { semantic_type *res = xmalloc (sizeof *res); uniqstr_assert (tag); res->tag = tag; - res->destructor = NULL; - res->printer = NULL; + if (loc) + res->location = *loc; + for (int i = 0; i < CODE_PROPS_SIZE; ++i) + code_props_none_init (&res->props[i]); return res; } @@ -110,10 +138,14 @@ semantic_type_new (uniqstr tag) | Print a symbol. | `-----------------*/ -#define SYMBOL_ATTR_PRINT(Attr) \ - if (s->Attr) \ +#define SYMBOL_ATTR_PRINT(Attr) \ + if (s->Attr) \ fprintf (f, " %s { %s }", #Attr, s->Attr) +#define SYMBOL_CODE_PRINT(Attr) \ + if (s->props[Attr].code) \ + fprintf (f, " %s { %s }", #Attr, s->props[Attr].code) + void symbol_print (symbol *s, FILE *f) { @@ -121,14 +153,50 @@ symbol_print (symbol *s, FILE *f) { fprintf (f, "\"%s\"", s->tag); SYMBOL_ATTR_PRINT (type_name); - SYMBOL_ATTR_PRINT (destructor); - SYMBOL_ATTR_PRINT (printer); + SYMBOL_CODE_PRINT (destructor); + SYMBOL_CODE_PRINT (printer); } else fprintf (f, ""); } #undef SYMBOL_ATTR_PRINT +#undef SYMBOL_CODE_PRINT + + +/*----------------------------------. +| Whether S is a valid identifier. | +`----------------------------------*/ + +static bool +is_identifier (uniqstr s) +{ + static char const alphanum[26 + 26 + 1 + 10] = + "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "_" + "0123456789"; + if (!s || ! memchr (alphanum, *s, sizeof alphanum - 10)) + return false; + for (++s; *s; ++s) + if (! memchr (alphanum, *s, sizeof alphanum)) + return false; + return true; +} + + +/*-----------------------------------------------. +| Get the identifier associated to this symbol. | +`-----------------------------------------------*/ +uniqstr +symbol_id_get (symbol const *sym) +{ + aver (sym->user_token_number != USER_NUMBER_HAS_STRING_ALIAS); + if (sym->alias) + sym = sym->alias; + return is_identifier (sym->tag) ? sym->tag : 0; +} + /*------------------------------------------------------------------. | Complain that S's WHAT is redeclared at SECOND, and was first set | @@ -139,19 +207,20 @@ static void symbol_redeclaration (symbol *s, const char *what, location first, location second) { - complain_at (second, _("%s redeclaration for %s"), what, s->tag); - complain_at (first, _("previous declaration")); + complain_at (second, complaint, _("%s redeclaration for %s"), what, s->tag); + complain_at (first, complaint, _("previous declaration")); } static void semantic_type_redeclaration (semantic_type *s, const char *what, location first, location second) { - complain_at (second, _("%s redeclaration for <%s>"), what, s->tag); - complain_at (first, _("previous declaration")); + complain_at (second, complaint, _("%s redeclaration for <%s>"), what, s->tag); + complain_at (first, complaint, _("previous declaration")); } + /*-----------------------------------------------------------------. | Set the TYPE_NAME associated with SYM. Does nothing if passed 0 | | as TYPE_NAME. | @@ -163,178 +232,74 @@ symbol_type_set (symbol *sym, uniqstr type_name, location loc) if (type_name) { if (sym->type_name) - symbol_redeclaration (sym, "%type", sym->type_location, loc); + symbol_redeclaration (sym, "%type", sym->type_location, loc); uniqstr_assert (type_name); sym->type_name = type_name; sym->type_location = loc; } } - -/*------------------------------------------------------------------. -| Set the DESTRUCTOR associated with SYM. Do nothing if passed 0. | -`------------------------------------------------------------------*/ +/*--------------------------------------------------------. +| Set the DESTRUCTOR or PRINTER associated with the SYM. | +`--------------------------------------------------------*/ void -symbol_destructor_set (symbol *sym, const char *destructor, location loc) +symbol_code_props_set (symbol *sym, code_props_type kind, + code_props const *code) { - if (destructor) - { - if (sym->destructor) - symbol_redeclaration (sym, "%destructor", sym->destructor_location, - loc); - sym->destructor = destructor; - sym->destructor_location = loc; - } + if (sym->props[kind].code) + symbol_redeclaration (sym, code_props_type_string (kind), + sym->props[kind].location, + code->location); + sym->props[kind] = *code; } -/*-------------------------------------------------------------------. -| Set the DESTRUCTOR associated with TYPE. Do nothing if passed 0. | -`-------------------------------------------------------------------*/ +/*-----------------------------------------------------. +| Set the DESTRUCTOR or PRINTER associated with TYPE. | +`-----------------------------------------------------*/ void -semantic_type_destructor_set (semantic_type *type, const char *destructor, - location loc) +semantic_type_code_props_set (semantic_type *type, + code_props_type kind, + code_props const *code) { - if (destructor) - { - if (type->destructor) - semantic_type_redeclaration (type, "%destructor", - type->destructor_location, loc); - type->destructor = destructor; - type->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; - - /* Per-type %destructor. */ - if (sym->type_name) - { - semantic_type *type = semantic_type_get (sym->type_name); - if (type->destructor) - return type->destructor; - } - - /* Apply default %destructor's only to user-defined symbols. */ - if (sym->tag[0] == '$' || sym == errtoken) - return NULL; - - if (sym->type_name) - return default_tagged_destructor; - return default_tagless_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; - if (sym->type_name) - { - semantic_type *type = semantic_type_get (sym->type_name); - if (type->destructor) - return type->destructor_location; - return default_tagged_destructor_location; - } - return default_tagless_destructor_location; -} - -/*---------------------------------------------------------------. -| Set the PRINTER associated with SYM. Do nothing if passed 0. | -`---------------------------------------------------------------*/ - -void -symbol_printer_set (symbol *sym, const char *printer, location loc) -{ - if (printer) - { - if (sym->printer) - symbol_redeclaration (sym, "%printer", sym->printer_location, loc); - sym->printer = printer; - sym->printer_location = loc; - } -} - -/*----------------------------------------------------------------. -| Set the PRINTER associated with TYPE. Do nothing if passed 0. | -`----------------------------------------------------------------*/ - -void -semantic_type_printer_set (semantic_type *type, const char *printer, - location loc) -{ - if (printer) - { - if (type->printer) - semantic_type_redeclaration (type, "%printer", type->printer_location, - loc); - type->printer = printer; - type->printer_location = loc; - } + if (type->props[kind].code) + semantic_type_redeclaration (type, code_props_type_string (kind), + type->props[kind].location, + code->location); + type->props[kind] = *code; } -/*------------------------------------. -| Get the computed %printer for SYM. | -`------------------------------------*/ +/*---------------------------------------------------. +| Get the computed %destructor or %printer for SYM. | +`---------------------------------------------------*/ -const char * -symbol_printer_get (symbol *sym) +code_props const * +symbol_code_props_get (symbol const *sym, + code_props_type kind) { - /* Per-symbol %printer. */ - if (sym->printer != NULL) - return sym->printer; + /* Per-symbol code props. */ + if (sym->props[kind].code) + return &sym->props[kind]; - /* Per-type %printer. */ + /* Per-type code props. */ if (sym->type_name) { - semantic_type *type = semantic_type_get (sym->type_name); - if (type->printer) - return type->printer; + code_props const *code = + &semantic_type_get (sym->type_name, NULL)->props[kind]; + if (code->code) + return code; } - /* Apply the default %printer only to user-defined symbols. */ + /* Apply default code props's only to user-defined symbols. */ if (sym->tag[0] == '$' || sym == errtoken) - return NULL; - - if (sym->type_name) - return default_tagged_printer; - return default_tagless_printer; -} - -/*------------------------------------------------------------. -| Get the grammar location of the %printer computed for SYM. | -`------------------------------------------------------------*/ + return &code_props_none; -location -symbol_printer_location_get (symbol *sym) -{ - if (sym->printer != NULL) - return sym->printer_location; if (sym->type_name) - { - semantic_type *type = semantic_type_get (sym->type_name); - if (type->printer) - return type->printer_location; - return default_tagged_printer_location; - } - return default_tagless_printer_location; + return &default_tagged_code_props[kind]; + return &default_tagless_code_props[kind]; } - /*-----------------------------------------------------------------. | Set the PRECEDENCE associated with SYM. Does nothing if invoked | | with UNDEF_ASSOC as ASSOC. | @@ -346,7 +311,7 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc) if (a != undef_assoc) { if (sym->prec != 0) - symbol_redeclaration (sym, assoc_to_string (a), sym->prec_location, + symbol_redeclaration (sym, assoc_to_string (a), sym->prec_location, loc); sym->prec = prec; sym->assoc = a; @@ -365,10 +330,12 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc) void symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring) { + bool warned = false; if (sym->class != unknown_sym && sym->class != class) { - complain_at (loc, _("symbol %s redefined"), sym->tag); - sym->declared = false; + complain_at (loc, complaint, _("symbol %s redefined"), sym->tag); + // Don't report both "redefined" and "redeclared". + warned = true; } if (class == nterm_sym && sym->class != nterm_sym) @@ -380,9 +347,9 @@ symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring) if (declaring) { - if (sym->declared) - warn_at (loc, _("symbol %s redeclared"), sym->tag); - sym->declared = true; + if (sym->status == declared && !warned) + complain_at (loc, Wother, _("symbol %s redeclared"), sym->tag); + sym->status = declared; } } @@ -396,25 +363,25 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc) { int *user_token_numberp; - aver (sym->class == token_sym); - - if (sym->user_token_number != USER_NUMBER_ALIAS) + if (sym->user_token_number != USER_NUMBER_HAS_STRING_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); + complain_at (loc, complaint, _("redefining user token number of %s"), + sym->tag); *user_token_numberp = user_token_number; /* User defined $end token? */ if (user_token_number == 0) { endtoken = sym; - endtoken->number = 0; /* It is always mapped to 0, so it was already counted in - NTOKENS. */ - --ntokens; + NTOKENS. */ + if (endtoken->number != NUMBER_UNDEFINED) + --ntokens; + endtoken->number = 0; } } @@ -429,14 +396,68 @@ symbol_check_defined (symbol *sym) { if (sym->class == unknown_sym) { - complain_at - (sym->location, - _("symbol %s is used, but is not defined as a token and has no rules"), - sym->tag); + switch (sym->status) + { + case used: + complain_at (sym->location, Wother, + _("symbol %s is used, but is not defined as a token" + " and has no rules"), + sym->tag); + break; + case undeclared: + case needed: + complain_at (sym->location, complaint, + _("symbol %s is used, but is not defined as a token" + " and has no rules"), + sym->tag); + break; + case declared: + /* If declared, then sym->class != unknown_sym. */ + assert (0); + } + sym->class = nterm_sym; sym->number = nvars++; } + for (int i = 0; i < 2; ++i) + if (sym->props[i].kind == CODE_PROPS_NONE && sym->type_name) + { + semantic_type *sem_type = semantic_type_get (sym->type_name, NULL); + if (sem_type + && sem_type->props[i].kind != CODE_PROPS_NONE) + sem_type->props[i].is_used = true; + } + + /* Set the semantic type status associated to the current symbol to + 'declared' so that we could check semantic types unnecessary uses. */ + if (sym->type_name) + { + semantic_type *sem_type = semantic_type_get (sym->type_name, NULL); + if (sem_type) + sem_type->status = declared; + } + + return true; +} + +static inline bool +semantic_type_check_defined (semantic_type *sem_type) +{ + if (sem_type->status == declared) + { + for (int i = 0; i < 2; ++i) + if (sem_type->props[i].kind != CODE_PROPS_NONE + && ! sem_type->props[i].is_used) + complain_at (sem_type->location, Wother, + _("useless %s for type <%s>"), + code_props_type_string (i), sem_type->tag); + } + else + complain_at (sem_type->location, Wother, + _("type <%s> is used, but is not associated to any symbol"), + sem_type->tag); + return true; } @@ -446,30 +467,32 @@ symbol_check_defined_processor (void *sym, void *null ATTRIBUTE_UNUSED) return symbol_check_defined (sym); } +static bool +semantic_type_check_defined_processor (void *sem_type, + void *null ATTRIBUTE_UNUSED) +{ + return semantic_type_check_defined (sem_type); +} -/*------------------------------------------------------------------. -| Declare the new symbol SYM. Make it an alias of SYMVAL, and type | -| SYMVAL with SYM's type. | -`------------------------------------------------------------------*/ void -symbol_make_alias (symbol *sym, symbol *symval, location loc) +symbol_make_alias (symbol *sym, symbol *str, location loc) { - if (symval->alias) - warn_at (loc, _("symbol `%s' used more than once as a literal string"), - symval->tag); + if (str->alias) + complain_at (loc, Wother, + _("symbol %s used more than once as a literal string"), str->tag); else if (sym->alias) - warn_at (loc, _("symbol `%s' given more than one literal string"), - sym->tag); + complain_at (loc, Wother, + _("symbol %s given more than one literal string"), sym->tag); else { - symval->class = token_sym; - symval->user_token_number = sym->user_token_number; - sym->user_token_number = USER_NUMBER_ALIAS; - symval->alias = sym; - sym->alias = symval; - symval->number = sym->number; - symbol_type_set (symval, sym->type_name, loc); + str->class = token_sym; + str->user_token_number = sym->user_token_number; + sym->user_token_number = USER_NUMBER_HAS_STRING_ALIAS; + str->alias = sym; + sym->alias = str; + str->number = sym->number; + symbol_type_set (str, sym->type_name, loc); } } @@ -482,54 +505,43 @@ symbol_make_alias (symbol *sym, symbol *symval, location loc) static inline void symbol_check_alias_consistency (symbol *this) { - symbol *alias = this; - symbol *orig = this->alias; + symbol *sym = this; + symbol *str = this->alias; - /* Check only those that _are_ the aliases. */ - if (!(this->alias && this->user_token_number == USER_NUMBER_ALIAS)) + /* Check only the symbol in the symbol-string pair. */ + if (!(this->alias + && this->user_token_number == USER_NUMBER_HAS_STRING_ALIAS)) return; - if (orig->type_name != alias->type_name) + if (str->type_name != sym->type_name) { - if (orig->type_name) - symbol_type_set (alias, orig->type_name, orig->type_location); + if (str->type_name) + symbol_type_set (sym, str->type_name, str->type_location); else - symbol_type_set (orig, alias->type_name, alias->type_location); + symbol_type_set (str, sym->type_name, sym->type_location); } - 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); - } + for (int i = 0; i < CODE_PROPS_SIZE; ++i) + if (str->props[i].code) + symbol_code_props_set (sym, i, &str->props[i]); + else if (sym->props[i].code) + symbol_code_props_set (str, i, &sym->props[i]); - if (orig->printer || alias->printer) + if (sym->prec || str->prec) { - if (orig->printer) - symbol_printer_set (alias, orig->printer, orig->printer_location); + if (str->prec) + symbol_precedence_set (sym, str->prec, str->assoc, + str->prec_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); + symbol_precedence_set (str, sym->prec, sym->assoc, + sym->prec_location); } } static bool symbol_check_alias_consistency_processor (void *this, - void *null ATTRIBUTE_UNUSED) + void *null ATTRIBUTE_UNUSED) { symbol_check_alias_consistency (this); return true; @@ -544,31 +556,11 @@ symbol_check_alias_consistency_processor (void *this, static inline bool symbol_pack (symbol *this) { + aver (this->number != NUMBER_UNDEFINED); if (this->class == nterm_sym) - { - this->number += ntokens; - } - else if (this->alias) - { - /* This symbol and its alias are a single token defn. - Allocate a tokno, and assign to both check agreement of - prec and assoc fields and make both the same */ - if (this->number == NUMBER_UNDEFINED) - { - if (this == endtoken || this->alias == endtoken) - this->number = this->alias->number = 0; - else - { - aver (this->alias->number != NUMBER_UNDEFINED); - this->number = this->alias->number; - } - } - /* Do not do processing below for USER_NUMBER_ALIASes. */ - if (this->user_token_number == USER_NUMBER_ALIAS) - return true; - } - else /* this->class == token_sym */ - aver (this->number != NUMBER_UNDEFINED); + this->number += ntokens; + else if (this->user_token_number == USER_NUMBER_HAS_STRING_ALIAS) + return true; symbols[this->number] = this; return true; @@ -581,7 +573,26 @@ symbol_pack_processor (void *this, void *null ATTRIBUTE_UNUSED) } +static void +user_token_number_redeclaration (int num, symbol *first, symbol *second) +{ + /* User token numbers are not assigned during the parsing, but in a + second step, via a traversal of the symbol table sorted on tag. + However, error messages make more sense if we keep the first + declaration first. */ + if (location_cmp (first->location, second->location) > 0) + { + symbol* tmp = first; + first = second; + second = tmp; + } + complain_at (second->location, complaint, + _("user token number %d redeclaration for %s"), + num, second->tag); + complain_at (first->location, complaint, _("previous declaration for %s"), + first->tag); +} /*--------------------------------------------------. | Put THIS in TOKEN_TRANSLATIONS if it is a token. | @@ -592,18 +603,18 @@ symbol_translation (symbol *this) { /* Non-terminal? */ if (this->class == token_sym - && this->user_token_number != USER_NUMBER_ALIAS) + && this->user_token_number != USER_NUMBER_HAS_STRING_ALIAS) { /* A token which translation has already been set? */ if (token_translations[this->user_token_number] != undeftoken->number) - complain_at (this->location, - _("tokens %s and %s both assigned number %d"), - symbols[token_translations[this->user_token_number]]->tag, - this->tag, this->user_token_number); - + user_token_number_redeclaration + (this->user_token_number, + symbols[token_translations[this->user_token_number]], + this); + token_translations[this->user_token_number] = this->number; } - + return true; } @@ -684,15 +695,15 @@ void symbols_new (void) { symbol_table = hash_initialize (HT_INITIAL_CAPACITY, - NULL, - hash_symbol_hasher, - hash_symbol_comparator, - free); + NULL, + hash_symbol_hasher, + hash_symbol_comparator, + free); semantic_type_table = hash_initialize (HT_INITIAL_CAPACITY, - NULL, - hash_semantic_type_hasher, - hash_semantic_type_comparator, - free); + NULL, + hash_semantic_type_hasher, + hash_semantic_type_comparator, + free); } @@ -713,8 +724,10 @@ symbol_from_uniqstr (const uniqstr key, location loc) if (!entry) { /* First insertion in the hash. */ + aver (!symbols_sorted); entry = symbol_new (key, loc); - hash_insert (symbol_table, entry); + if (!hash_insert (symbol_table, entry)) + xalloc_die (); } return entry; } @@ -726,7 +739,7 @@ symbol_from_uniqstr (const uniqstr key, location loc) `-----------------------------------------------------------------------*/ semantic_type * -semantic_type_from_uniqstr (const uniqstr key) +semantic_type_from_uniqstr (const uniqstr key, const location *loc) { semantic_type probe; semantic_type *entry; @@ -737,8 +750,9 @@ semantic_type_from_uniqstr (const uniqstr key) if (!entry) { /* First insertion in the hash. */ - entry = semantic_type_new (key); - hash_insert (semantic_type_table, entry); + entry = semantic_type_new (key, loc); + if (!hash_insert (semantic_type_table, entry)) + xalloc_die (); } return entry; } @@ -762,9 +776,9 @@ symbol_get (const char *key, location loc) `-----------------------------------------------------------------------*/ semantic_type * -semantic_type_get (const char *key) +semantic_type_get (const char *key, const location *loc) { - return semantic_type_from_uniqstr (uniqstr_new (key)); + return semantic_type_from_uniqstr (uniqstr_new (key), loc); } @@ -805,6 +819,7 @@ symbols_free (void) hash_free (symbol_table); hash_free (semantic_type_table); free (symbols); + free (symbols_sorted); } @@ -813,12 +828,35 @@ symbols_free (void) | terminals. | `---------------------------------------------------------------*/ -static void -symbols_do (Hash_processor processor, void *processor_data) +static int +symbols_cmp (symbol const *a, symbol const *b) +{ + return strcmp (a->tag, b->tag); +} + +static int +symbols_cmp_qsort (void const *a, void const *b) { - hash_do_for_each (symbol_table, processor, processor_data); + return symbols_cmp (*(symbol * const *)a, *(symbol * const *)b); } +static void +symbols_do (Hash_processor processor, void *processor_data, + struct hash_table *table, symbol **sorted) +{ + size_t count = hash_get_n_entries (table); + if (!sorted) + { + sorted = xnmalloc (count, sizeof *sorted); + hash_get_entries (table, (void**)sorted, count); + qsort (sorted, count, sizeof *sorted, symbols_cmp_qsort); + } + { + size_t i; + for (i = 0; i < count; ++i) + processor (sorted[i], processor_data); + } +} /*--------------------------------------------------------------. | Check that all the symbols are defined. Report any undefined | @@ -828,7 +866,10 @@ symbols_do (Hash_processor processor, void *processor_data) void symbols_check_defined (void) { - symbols_do (symbol_check_defined_processor, NULL); + symbols_do (symbol_check_defined_processor, NULL, + symbol_table, symbols_sorted); + symbols_do (semantic_type_check_defined_processor, NULL, + semantic_type_table, semantic_types_sorted); } /*------------------------------------------------------------------. @@ -849,12 +890,12 @@ symbols_token_translations_init (void) { symbol *this = symbols[i]; if (this->user_token_number != USER_NUMBER_UNDEFINED) - { - 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; - } + { + 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; + } } /* If 256 is not used, assign it to error, to follow POSIX. */ @@ -870,20 +911,20 @@ symbols_token_translations_init (void) { symbol *this = symbols[i]; if (this->user_token_number == USER_NUMBER_UNDEFINED) - this->user_token_number = ++max_user_token_number; + this->user_token_number = ++max_user_token_number; if (this->user_token_number > max_user_token_number) - max_user_token_number = this->user_token_number; + max_user_token_number = this->user_token_number; } token_translations = xnmalloc (max_user_token_number + 1, - sizeof *token_translations); + sizeof *token_translations); - /* Initialize all entries for literal tokens to 2, the internal - token number for $undefined, which represents all invalid inputs. - */ + /* Initialize all entries for literal tokens to 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_processor, NULL); + symbols_do (symbol_translation_processor, NULL, + symbol_table, symbols_sorted); } @@ -895,10 +936,11 @@ symbols_token_translations_init (void) void symbols_pack (void) { - symbols_do (symbol_check_alias_consistency_processor, NULL); + symbols_do (symbol_check_alias_consistency_processor, NULL, + symbol_table, symbols_sorted); symbols = xcalloc (nsyms, sizeof *symbols); - symbols_do (symbol_pack_processor, NULL); + symbols_do (symbol_pack_processor, NULL, symbol_table, symbols_sorted); /* Aliases leave empty slots in symbols, so remove them. */ { @@ -927,13 +969,13 @@ symbols_pack (void) symbols_token_translations_init (); if (startsymbol->class == unknown_sym) - fatal_at (startsymbol_location, - _("the start symbol %s is undefined"), - startsymbol->tag); + complain_at (startsymbol_location, fatal, + _("the start symbol %s is undefined"), + startsymbol->tag); else if (startsymbol->class == token_sym) - fatal_at (startsymbol_location, - _("the start symbol %s is a token"), - startsymbol->tag); + complain_at (startsymbol_location, fatal, + _("the start symbol %s is a token"), + startsymbol->tag); } @@ -942,53 +984,29 @@ symbols_pack (void) `--------------------------------------------------*/ void -default_tagged_destructor_set (const char *destructor, location loc) -{ - if (default_tagged_destructor != NULL) - { - complain_at (loc, _("redeclaration for default tagged %%destructor")); - complain_at (default_tagged_destructor_location, - _("previous declaration")); - } - default_tagged_destructor = destructor; - default_tagged_destructor_location = loc; -} - -void -default_tagless_destructor_set (const char *destructor, location loc) -{ - if (default_tagless_destructor != NULL) - { - complain_at (loc, _("redeclaration for default tagless %%destructor")); - complain_at (default_tagless_destructor_location, - _("previous declaration")); - } - default_tagless_destructor = destructor; - default_tagless_destructor_location = loc; -} - -void -default_tagged_printer_set (const char *printer, location loc) +default_tagged_code_props_set (code_props_type kind, code_props const *code) { - if (default_tagged_printer != NULL) + if (default_tagged_code_props[kind].code) { - complain_at (loc, _("redeclaration for default tagged %%printer")); - complain_at (default_tagged_printer_location, - _("previous declaration")); + complain_at (code->location, complaint, + _("redeclaration for default tagged %s"), + code_props_type_string (kind)); + complain_at (default_tagged_code_props[kind].location, complaint, + _("previous declaration")); } - default_tagged_printer = printer; - default_tagged_printer_location = loc; + default_tagged_code_props[kind] = *code; } void -default_tagless_printer_set (const char *printer, location loc) +default_tagless_code_props_set (code_props_type kind, code_props const *code) { - if (default_tagless_printer != NULL) + if (default_tagless_code_props[kind].code) { - complain_at (loc, _("redeclaration for default tagless %%printer")); - complain_at (default_tagless_printer_location, - _("previous declaration")); + complain_at (code->location, complaint, + _("redeclaration for default tagless %s"), + code_props_type_string (kind)); + complain_at (default_tagless_code_props[kind].location, complaint, + _("previous declaration")); } - default_tagless_printer = printer; - default_tagless_printer_location = loc; + default_tagless_code_props[kind] = *code; }