/* Symbol table manager for Bison.
- Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008
- 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.
#include "system.h"
#include <hash.h>
-#include <quotearg.h>
#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. |
`------------------------*/
| Default %destructor's and %printer's. |
`---------------------------------------*/
-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;
+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. |
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;
- code_props_none_init (&res->destructor);
- code_props_none_init (&res->printer);
+ for (int i = 0; i < CODE_PROPS_SIZE; ++i)
+ code_props_none_init (&res->props[i]);
res->number = NUMBER_UNDEFINED;
res->prec = 0;
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;
- code_props_none_init (&res->destructor);
- code_props_none_init (&res->printer);
+ if (loc)
+ res->location = *loc;
+ for (int i = 0; i < CODE_PROPS_SIZE; ++i)
+ code_props_none_init (&res->props[i]);
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)
+#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)
uniqstr
symbol_id_get (symbol const *sym)
{
- aver (sym->user_token_number != USER_NUMBER_ALIAS);
+ aver (sym->user_token_number != USER_NUMBER_HAS_STRING_ALIAS);
if (sym->alias)
sym = sym->alias;
return is_identifier (sym->tag) ? sym->tag : 0;
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. |
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;
}
}
-/*-----------------------------------.
-| Get the CLASS associated with SYM. |
-`-----------------------------------*/
-
-const char *
-symbol_class_get_string (symbol *sym)
-{
- if (sym->class)
- {
- if (sym->class == token_sym)
- return "terminal";
- else if (sym->class == nterm_sym)
- return "nonterminal";
- }
- return "unknown";
-}
-
-
-/*-----------------------------------------.
-| Set the DESTRUCTOR associated with SYM. |
-`-----------------------------------------*/
-
-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
-semantic_type_destructor_set (semantic_type *type,
- code_props const *destructor)
-{
- if (type->destructor.code)
- semantic_type_redeclaration (type, "%destructor",
- type->destructor.location,
- destructor->location);
- type->destructor = *destructor;
-}
-
-/*---------------------------------------.
-| Get the computed %destructor for SYM. |
-`---------------------------------------*/
-
-code_props const *
-symbol_destructor_get (symbol const *sym)
-{
- /* 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->type_name)
- return &default_tagged_destructor;
- return &default_tagless_destructor;
-}
-
-/*--------------------------------------.
-| Set the PRINTER associated with SYM. |
-`--------------------------------------*/
+/*--------------------------------------------------------.
+| Set the DESTRUCTOR or PRINTER associated with the SYM. |
+`--------------------------------------------------------*/
void
-symbol_printer_set (symbol *sym, code_props const *printer)
+symbol_code_props_set (symbol *sym, code_props_type kind,
+ code_props const *code)
{
- if (sym->printer.code)
- symbol_redeclaration (sym, "%printer",
- sym->printer.location, printer->location);
- sym->printer = *printer;
+ 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 PRINTER associated with TYPE. |
-`---------------------------------------*/
+/*-----------------------------------------------------.
+| Set the DESTRUCTOR or PRINTER associated with TYPE. |
+`-----------------------------------------------------*/
void
-semantic_type_printer_set (semantic_type *type, code_props const *printer)
+semantic_type_code_props_set (semantic_type *type,
+ code_props_type kind,
+ code_props const *code)
{
- if (type->printer.code)
- semantic_type_redeclaration (type, "%printer",
- type->printer.location, printer->location);
- type->printer = *printer;
+ 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. |
+`---------------------------------------------------*/
code_props const *
-symbol_printer_get (symbol const *sym)
+symbol_code_props_get (symbol const *sym,
+ code_props_type kind)
{
- /* Per-symbol %printer. */
- if (sym->printer.code)
- 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)
{
- code_props const *printer = &semantic_type_get (sym->type_name)->printer;
- if (printer->code)
- return 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 &code_props_none;
if (sym->type_name)
- return &default_tagged_printer;
- return &default_tagless_printer;
+ return &default_tagged_code_props[kind];
+ return &default_tagless_code_props[kind];
}
/*-----------------------------------------------------------------.
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;
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)
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;
}
}
{
int *user_token_numberp;
- 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;
}
}
{
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;
}
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);
}
}
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.code || alias->destructor.code)
- {
- if (orig->destructor.code)
- symbol_destructor_set (alias, &orig->destructor);
- else
- symbol_destructor_set (orig, &alias->destructor);
- }
-
- if (orig->printer.code || alias->printer.code)
- {
- if (orig->printer.code)
- symbol_printer_set (alias, &orig->printer);
- else
- symbol_printer_set (orig, &alias->printer);
- }
+ 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 (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;
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;
}
+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. |
{
/* 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;
}
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);
}
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;
}
`-----------------------------------------------------------------------*/
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;
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;
}
`-----------------------------------------------------------------------*/
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);
}
hash_free (symbol_table);
hash_free (semantic_type_table);
free (symbols);
+ free (symbols_sorted);
}
| terminals. |
`---------------------------------------------------------------*/
-static void
-symbols_do (Hash_processor processor, void *processor_data)
+static int
+symbols_cmp (symbol const *a, symbol const *b)
{
- hash_do_for_each (symbol_table, processor, processor_data);
+ 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,
+ 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 |
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);
}
/*------------------------------------------------------------------.
{
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. */
{
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 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);
}
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. */
{
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);
}
`--------------------------------------------------*/
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_tagged_printer_set (code_props const *printer)
+default_tagged_code_props_set (code_props_type kind, code_props const *code)
{
- if (default_tagged_printer.code)
+ if (default_tagged_code_props[kind].code)
{
- complain_at (printer->location,
- _("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_code_props[kind] = *code;
}
void
-default_tagless_printer_set (code_props const *printer)
+default_tagless_code_props_set (code_props_type kind, code_props const *code)
{
- if (default_tagless_printer.code)
+ if (default_tagless_code_props[kind].code)
{
- complain_at (printer->location,
- _("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_code_props[kind] = *code;
}
projects / bison.git / blobdiff