X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1f6b3679b2f6eb9d5a7643e2b62f0f2939677be5..28126202a52cda40411bc33ed795ceb4cfdd302d:/src/symtab.c diff --git a/src/symtab.c b/src/symtab.c index 8b3e30d3..b3f94560 100644 --- a/src/symtab.c +++ b/src/symtab.c @@ -1,35 +1,39 @@ /* 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; + /*------------------------. | Distinguished symbols. | `------------------------*/ @@ -41,14 +45,14 @@ symbol *accept = NULL; symbol *startsymbol = NULL; location startsymbol_location; -/*-----------------------------------. -| Default %destructor and %printer. | -`-----------------------------------*/ +/*---------------------------------------. +| Default %destructor's and %printer's. | +`---------------------------------------*/ -static const char *default_destructor = NULL; -static location default_destructor_location; -static const char *default_printer = NULL; -static location default_printer_location; +static code_props default_tagged_destructor = CODE_PROPS_NONE_INIT; +static code_props default_tagless_destructor = CODE_PROPS_NONE_INIT; +static code_props default_tagged_printer = CODE_PROPS_NONE_INIT; +static code_props default_tagless_printer = CODE_PROPS_NONE_INIT; /*---------------------------------. | Create a new symbol, named TAG. | @@ -60,12 +64,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] != '\'' && mbschr (tag, '-')) + yacc_at (loc, _("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; + code_props_none_init (&res->destructor); + code_props_none_init (&res->printer); res->number = NUMBER_UNDEFINED; res->prec = 0; @@ -78,20 +89,41 @@ symbol_new (uniqstr tag, location loc) if (nsyms == SYMBOL_NUMBER_MAXIMUM) fatal (_("too many symbols in input grammar (limit is %d)"), - SYMBOL_NUMBER_MAXIMUM); + SYMBOL_NUMBER_MAXIMUM); nsyms++; return res; } +/*----------------------------------------. +| Create a new semantic type, named TAG. | +`----------------------------------------*/ + +static semantic_type * +semantic_type_new (uniqstr tag) +{ + semantic_type *res = xmalloc (sizeof *res); + + uniqstr_assert (tag); + res->tag = tag; + code_props_none_init (&res->destructor); + code_props_none_init (&res->printer); + + return res; +} + /*-----------------. | 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->Attr.code) \ + fprintf (f, " %s { %s }", #Attr, s->Attr.code) + void symbol_print (symbol *s, FILE *f) { @@ -99,14 +131,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 | @@ -114,12 +182,22 @@ symbol_print (symbol *s, FILE *f) `------------------------------------------------------------------*/ static void -redeclaration (symbol* s, const char *what, location first, location second) +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")); } +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")); +} + + /*-----------------------------------------------------------------. | Set the TYPE_NAME associated with SYM. Does nothing if passed 0 | @@ -132,103 +210,124 @@ symbol_type_set (symbol *sym, uniqstr type_name, location loc) if (type_name) { if (sym->type_name) - 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. | +`-----------------------------------------*/ -/*------------------------------------------------------------------. -| Set the DESTRUCTOR associated with SYM. Do nothing if passed 0. | -`------------------------------------------------------------------*/ +void +symbol_destructor_set (symbol *sym, code_props const *destructor) +{ + if (sym->destructor.code) + symbol_redeclaration (sym, "%destructor", sym->destructor.location, + destructor->location); + sym->destructor = *destructor; +} + +/*------------------------------------------. +| Set the DESTRUCTOR associated with TYPE. | +`------------------------------------------*/ void -symbol_destructor_set (symbol *sym, const char *destructor, location loc) +semantic_type_destructor_set (semantic_type *type, + code_props const *destructor) { - if (destructor) - { - if (sym->destructor) - redeclaration (sym, "%destructor", sym->destructor_location, loc); - sym->destructor = destructor; - sym->destructor_location = loc; - } + if (type->destructor.code) + semantic_type_redeclaration (type, "%destructor", + type->destructor.location, + destructor->location); + type->destructor = *destructor; } /*---------------------------------------. | Get the computed %destructor for SYM. | `---------------------------------------*/ -const char * -symbol_destructor_get (symbol *sym) +code_props const * +symbol_destructor_get (symbol const *sym) { - /* Token 0 cannot have a %destructor unless the user renames it. */ - if (UNIQSTR_EQ (sym->tag, uniqstr_new ("$end"))) - return NULL; + /* Per-symbol %destructor. */ + if (sym->destructor.code) + return &sym->destructor; + + /* Per-type %destructor. */ + if (sym->type_name) + { + code_props const *destructor = + &semantic_type_get (sym->type_name)->destructor; + if (destructor->code) + return destructor; + } + + /* Apply default %destructor's only to user-defined symbols. */ + if (sym->tag[0] == '$' || sym == errtoken) + return &code_props_none; - if (sym->destructor != NULL) - return sym->destructor; - return default_destructor; + if (sym->type_name) + return &default_tagged_destructor; + return &default_tagless_destructor; } -/*---------------------------------------------------------------. -| Get the grammar location of the %destructor computed for SYM. | -`---------------------------------------------------------------*/ +/*--------------------------------------. +| Set the PRINTER associated with SYM. | +`--------------------------------------*/ -location -symbol_destructor_location_get (symbol *sym) +void +symbol_printer_set (symbol *sym, code_props const *printer) { - if (sym->destructor != NULL) - return sym->destructor_location; - return default_destructor_location; + if (sym->printer.code) + symbol_redeclaration (sym, "%printer", + sym->printer.location, printer->location); + sym->printer = *printer; } -/*---------------------------------------------------------------. -| Set the PRINTER associated with SYM. Do nothing if passed 0. | -`---------------------------------------------------------------*/ +/*---------------------------------------. +| Set the PRINTER associated with TYPE. | +`---------------------------------------*/ void -symbol_printer_set (symbol *sym, const char *printer, location loc) +semantic_type_printer_set (semantic_type *type, code_props const *printer) { - if (printer) - { - if (sym->printer) - redeclaration (sym, "%printer", sym->printer_location, loc); - sym->printer = printer; - sym->printer_location = loc; - } + if (type->printer.code) + semantic_type_redeclaration (type, "%printer", + type->printer.location, printer->location); + type->printer = *printer; } /*------------------------------------. | Get the computed %printer for SYM. | `------------------------------------*/ -const char * -symbol_printer_get (symbol *sym) +code_props const * +symbol_printer_get (symbol const *sym) { - /* Token 0 cannot have a %printer unless the user renames it. */ - if (UNIQSTR_EQ (sym->tag, uniqstr_new ("$end"))) - return NULL; + /* Per-symbol %printer. */ + if (sym->printer.code) + return &sym->printer; - if (sym->printer != NULL) - return sym->printer; - return default_printer; -} + /* Per-type %printer. */ + if (sym->type_name) + { + code_props const *printer = &semantic_type_get (sym->type_name)->printer; + if (printer->code) + return printer; + } -/*------------------------------------------------------------. -| Get the grammar location of the %printer computed for SYM. | -`------------------------------------------------------------*/ + /* Apply the default %printer only to user-defined symbols. */ + if (sym->tag[0] == '$' || sym == errtoken) + return &code_props_none; -location -symbol_printer_location_get (symbol *sym) -{ - if (sym->printer != NULL) - return sym->printer_location; - return default_printer_location; + if (sym->type_name) + return &default_tagged_printer; + return &default_tagless_printer; } - /*-----------------------------------------------------------------. | Set the PRECEDENCE associated with SYM. Does nothing if invoked | | with UNDEF_ASSOC as ASSOC. | @@ -240,7 +339,8 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc) if (a != undef_assoc) { if (sym->prec != 0) - redeclaration (sym, assoc_to_string (a), sym->prec_location, loc); + symbol_redeclaration (sym, assoc_to_string (a), sym->prec_location, + loc); sym->prec = prec; sym->assoc = a; sym->prec_location = loc; @@ -274,7 +374,7 @@ 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); + warn_at (loc, _("symbol %s redeclared"), sym->tag); sym->declared = true; } } @@ -289,9 +389,7 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc) { int *user_token_numberp; - assert (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; @@ -304,10 +402,11 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc) 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; } } @@ -323,9 +422,9 @@ 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); + (sym->location, + _("symbol %s is used, but is not defined as a token and has no rules"), + sym->tag); sym->class = nterm_sym; sym->number = nvars++; } @@ -340,34 +439,24 @@ symbol_check_defined_processor (void *sym, void *null ATTRIBUTE_UNUSED) } -/*------------------------------------------------------------------. -| 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) + warn_at (loc, _("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); + warn_at (loc, _("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; - /* sym and symval combined are only one symbol. */ - nsyms--; - ntokens--; - 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); + 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); } } @@ -380,54 +469,53 @@ 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 (str->destructor.code || sym->destructor.code) { - if (orig->destructor) - symbol_destructor_set (alias, orig->destructor, - orig->destructor_location); + if (str->destructor.code) + symbol_destructor_set (sym, &str->destructor); else - symbol_destructor_set (orig, alias->destructor, - alias->destructor_location); + symbol_destructor_set (str, &sym->destructor); } - if (orig->printer || alias->printer) + if (str->printer.code || sym->printer.code) { - if (orig->printer) - symbol_printer_set (alias, orig->printer, orig->printer_location); + if (str->printer.code) + symbol_printer_set (sym, &str->printer); else - symbol_printer_set (orig, alias->printer, alias->printer_location); + symbol_printer_set (str, &sym->printer); } - if (alias->prec || orig->prec) + if (sym->prec || str->prec) { - if (orig->prec) - symbol_precedence_set (alias, orig->prec, orig->assoc, - orig->prec_location); + if (str->prec) + symbol_precedence_set (sym, str->prec, str->assoc, + str->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; @@ -442,31 +530,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 - { - assert (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 */ - assert (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; @@ -479,7 +547,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, + _("user token number %d redeclaration for %s"), + num, second->tag); + complain_at (first->location, _("previous declaration for %s"), + first->tag); +} /*--------------------------------------------------. | Put THIS in TOKEN_TRANSLATIONS if it is a token. | @@ -490,14 +577,14 @@ 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; } @@ -512,14 +599,15 @@ symbol_translation_processor (void *this, void *null ATTRIBUTE_UNUSED) } -/*----------------------. -| A symbol hash table. | -`----------------------*/ +/*---------------------------------------. +| Symbol and semantic type hash tables. | +`---------------------------------------*/ -/* Initial capacity of symbols hash table. */ +/* Initial capacity of symbol and semantic type hash table. */ #define HT_INITIAL_CAPACITY 257 static struct hash_table *symbol_table = NULL; +static struct hash_table *semantic_type_table = NULL; static inline bool hash_compare_symbol (const symbol *m1, const symbol *m2) @@ -528,12 +616,25 @@ hash_compare_symbol (const symbol *m1, const symbol *m2) return UNIQSTR_EQ (m1->tag, m2->tag); } +static inline bool +hash_compare_semantic_type (const semantic_type *m1, const semantic_type *m2) +{ + /* Since names are unique, we can compare the pointers themselves. */ + return UNIQSTR_EQ (m1->tag, m2->tag); +} + static bool hash_symbol_comparator (void const *m1, void const *m2) { return hash_compare_symbol (m1, m2); } +static bool +hash_semantic_type_comparator (void const *m1, void const *m2) +{ + return hash_compare_semantic_type (m1, m2); +} + static inline size_t hash_symbol (const symbol *m, size_t tablesize) { @@ -541,12 +642,24 @@ hash_symbol (const symbol *m, size_t tablesize) return ((uintptr_t) m->tag) % tablesize; } +static inline size_t +hash_semantic_type (const semantic_type *m, size_t tablesize) +{ + /* Since names are unique, we can hash the pointer itself. */ + return ((uintptr_t) m->tag) % tablesize; +} + static size_t hash_symbol_hasher (void const *m, size_t tablesize) { return hash_symbol (m, tablesize); } +static size_t +hash_semantic_type_hasher (void const *m, size_t tablesize) +{ + return hash_semantic_type (m, tablesize); +} /*-------------------------------. | Create the symbol hash table. | @@ -556,10 +669,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); } @@ -580,8 +698,35 @@ 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; +} + + +/*-----------------------------------------------------------------------. +| Find the semantic type named KEY, and return it. If it does not exist | +| yet, create it. | +`-----------------------------------------------------------------------*/ + +semantic_type * +semantic_type_from_uniqstr (const uniqstr key) +{ + semantic_type probe; + semantic_type *entry; + + probe.tag = key; + entry = hash_lookup (semantic_type_table, &probe); + + if (!entry) + { + /* First insertion in the hash. */ + entry = semantic_type_new (key); + if (!hash_insert (semantic_type_table, entry)) + xalloc_die (); } return entry; } @@ -599,6 +744,18 @@ symbol_get (const char *key, location loc) } +/*-----------------------------------------------------------------------. +| Find the semantic type named KEY, and return it. If it does not exist | +| yet, create it. | +`-----------------------------------------------------------------------*/ + +semantic_type * +semantic_type_get (const char *key) +{ + return semantic_type_from_uniqstr (uniqstr_new (key)); +} + + /*------------------------------------------------------------------. | Generate a dummy nonterminal, whose name cannot conflict with the | | user's names. | @@ -613,13 +770,18 @@ dummy_symbol_get (location loc) symbol *sym; - sprintf (buf, "@%d", ++dummy_count); + sprintf (buf, "$@%d", ++dummy_count); sym = symbol_get (buf, loc); sym->class = nterm_sym; sym->number = nvars++; return sym; } +bool +symbol_is_dummy (const symbol *sym) +{ + return sym->tag[0] == '@' || (sym->tag[0] == '$' && sym->tag[1] == '@'); +} /*-------------------. | Free the symbols. | @@ -629,7 +791,9 @@ void symbols_free (void) { hash_free (symbol_table); + hash_free (semantic_type_table); free (symbols); + free (symbols_sorted); } @@ -638,13 +802,36 @@ symbols_free (void) | terminals. | `---------------------------------------------------------------*/ +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) +{ + return symbols_cmp (*(symbol * const *)a, *(symbol * const *)b); +} + static void symbols_do (Hash_processor processor, void *processor_data) { - hash_do_for_each (symbol_table, processor, processor_data); + size_t count = hash_get_n_entries (symbol_table); + if (!symbols_sorted) + { + symbols_sorted = xnmalloc (count, sizeof *symbols_sorted); + hash_get_entries (symbol_table, (void**)symbols_sorted, count); + qsort (symbols_sorted, count, sizeof *symbols_sorted, + symbols_cmp_qsort); + } + { + size_t i; + for (i = 0; i < count; ++i) + processor (symbols_sorted[i], processor_data); + } } - /*--------------------------------------------------------------. | Check that all the symbols are defined. Report any undefined | | symbols and consider them nonterminals. | @@ -674,12 +861,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. */ @@ -695,17 +882,16 @@ 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); @@ -720,48 +906,100 @@ symbols_token_translations_init (void) void symbols_pack (void) { - symbols = xcalloc (nsyms, sizeof *symbols); - 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) fatal_at (startsymbol_location, - _("the start symbol %s is undefined"), - startsymbol->tag); + _("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); + _("the start symbol %s is a token"), + startsymbol->tag); } -/*-----------------------------------. -| Set default %destructor/%printer. | -`-----------------------------------*/ +/*--------------------------------------------------. +| Set default tagged/tagless %destructor/%printer. | +`--------------------------------------------------*/ + +void +default_tagged_destructor_set (code_props const *destructor) +{ + if (default_tagged_destructor.code) + { + complain_at (destructor->location, + _("redeclaration for default tagged %%destructor")); + complain_at (default_tagged_destructor.location, + _("previous declaration")); + } + default_tagged_destructor = *destructor; +} + +void +default_tagless_destructor_set (code_props const *destructor) +{ + if (default_tagless_destructor.code) + { + complain_at (destructor->location, + _("redeclaration for default tagless %%destructor")); + complain_at (default_tagless_destructor.location, + _("previous declaration")); + } + default_tagless_destructor = *destructor; +} void -default_destructor_set (const char *destructor, location loc) +default_tagged_printer_set (code_props const *printer) { - if (default_destructor != NULL) + if (default_tagged_printer.code) { - complain_at (loc, _("redeclaration for default %%destructor")); - complain_at (default_destructor_location, _("previous declaration")); + complain_at (printer->location, + _("redeclaration for default tagged %%printer")); + complain_at (default_tagged_printer.location, + _("previous declaration")); } - default_destructor = destructor; - default_destructor_location = loc; + default_tagged_printer = *printer; } void -default_printer_set (const char *printer, location loc) +default_tagless_printer_set (code_props const *printer) { - if (default_printer != NULL) + if (default_tagless_printer.code) { - complain_at (loc, _("redeclaration for default %%printer")); - complain_at (default_printer_location, _("previous declaration")); + complain_at (printer->location, + _("redeclaration for default tagless %%printer")); + complain_at (default_tagless_printer.location, + _("previous declaration")); } - default_printer = printer; - default_printer_location = loc; + default_tagless_printer = *printer; }