symbol_t *errtoken = NULL;
symbol_t *undeftoken = NULL;
-symbol_t *eoftoken = NULL;
-symbol_t *axiom = NULL;
+symbol_t *endtoken = NULL;
+symbol_t *accept = NULL;
symbol_t *startsymbol = NULL;
location_t startsymbol_location;
res->type_name = NULL;
res->destructor = NULL;
+ res->printer = NULL;
res->number = NUMBER_UNDEFINED;
res->prec = 0;
- res->assoc = right_assoc;
+ res->assoc = undef_assoc;
res->user_token_number = USER_NUMBER_UNDEFINED;
+
res->alias = NULL;
res->class = unknown_sym;
}
-/*-----------------------------------------------------------------.
-| Return the tag of this SYMBOL in a printable form. Warning: use |
-| the first QUOTEARG slot: 0. |
-`-----------------------------------------------------------------*/
-
-const char *
-symbol_tag_get (symbol_t *symbol)
-{
- return quotearg_style (escape_quoting_style, symbol->tag);
-}
-
-
-/*------------------------------------------------------------.
-| Return the tag of this SYMBOL in a printable form. Use the |
-| QUOTEARG slot number N. |
-`------------------------------------------------------------*/
-
-const char *
-symbol_tag_get_n (symbol_t *symbol, int n)
-{
- return quotearg_n_style (n, escape_quoting_style, symbol->tag);
-}
-
-
-/*-------------------------------.
-| Print the tag of this SYMBOL. |
-`-------------------------------*/
-
-void
-symbol_tag_print (symbol_t *symbol, FILE *out)
-{
- fputs (symbol_tag_get (symbol), out);
-}
-
-
/*------------------------------------------------------------------.
| Set the TYPE_NAME associated to SYMBOL. Does nothing if passed 0 |
| as TYPE_NAME. |
{
if (symbol->type_name)
complain_at (location,
- _("type redeclaration for %s"), symbol_tag_get (symbol));
+ _("type redeclaration for %s"), symbol->tag);
symbol->type_name = type_name;
}
}
if (symbol->destructor)
complain_at (location,
_("%s redeclaration for %s"),
- "%destructor", symbol_tag_get (symbol));
+ "%destructor", symbol->tag);
symbol->destructor = destructor;
symbol->destructor_location = location;
}
if (symbol->printer)
complain_at (location,
_("%s redeclaration for %s"),
- "%printer", symbol_tag_get (symbol));
+ "%printer", symbol->tag);
symbol->printer = printer;
symbol->printer_location = location;
}
void
symbol_precedence_set (symbol_t *symbol,
- int prec, associativity assoc, location_t location)
+ int prec, assoc_t assoc, location_t location)
{
if (assoc != undef_assoc)
{
if (symbol->prec != 0)
complain_at (location,
_("redefining precedence of %s"),
- symbol_tag_get (symbol));
+ symbol->tag);
symbol->prec = prec;
symbol->assoc = assoc;
}
symbol_class_set (symbol_t *symbol, symbol_class class, location_t location)
{
if (symbol->class != unknown_sym && symbol->class != class)
- complain_at (location, _("symbol %s redefined"), symbol_tag_get (symbol));
+ complain_at (location, _("symbol %s redefined"), symbol->tag);
if (class == nterm_sym && symbol->class != nterm_sym)
symbol->number = nvars++;
if (symbol->user_token_number != USER_NUMBER_UNDEFINED
&& symbol->user_token_number != user_token_number)
complain_at (location, _("redefining user token number of %s"),
- symbol_tag_get (symbol));
+ symbol->tag);
symbol->user_token_number = user_token_number;
- /* User defined EOF token? */
+ /* User defined $end token? */
if (user_token_number == 0)
{
- eoftoken = symbol;
- eoftoken->number = 0;
+ endtoken = symbol;
+ endtoken->number = 0;
/* It is always mapped to 0, so it was already counted in
NTOKENS. */
--ntokens;
complain_at
(this->location,
_("symbol %s is used, but is not defined as a token and has no rules"),
- symbol_tag_get (this));
+ this->tag);
this->class = nterm_sym;
this->number = nvars++;
}
`-------------------------------------------------------------------*/
void
-symbol_make_alias (symbol_t *symbol, symbol_t *symval)
+symbol_make_alias (symbol_t *symbol, symbol_t *symval, location_t loc)
{
if (symval->alias)
- warn (_("symbol `%s' used more than once as a literal string"),
- symbol_tag_get (symval));
+ warn_at (loc, _("symbol `%s' used more than once as a literal string"),
+ symval->tag);
else if (symbol->alias)
- warn (_("symbol `%s' given more than one literal string"),
- symbol_tag_get (symbol));
+ warn_at (loc, _("symbol `%s' given more than one literal string"),
+ symbol->tag);
else
{
symval->class = token_sym;
if (this->prec != this->alias->prec)
{
if (this->prec != 0 && this->alias->prec != 0)
- complain (_("conflicting precedences for %s and %s"),
- symbol_tag_get (this), symbol_tag_get (this->alias));
+ complain_at (this->alias->location,
+ _("conflicting precedences for %s and %s"),
+ this->tag, this->alias->tag);
if (this->prec != 0)
this->alias->prec = this->prec;
else
if (this->assoc != this->alias->assoc)
{
- /* FIXME: For some reason (probably the S/R => keep the S),
- the right assoc is chosen has the ``not set''. This is
- not nice, fix this! */
- if (this->assoc != right_assoc
- && this->alias->assoc != right_assoc)
- complain (_("conflicting associativities for %s and %s"),
- symbol_tag_get (this), symbol_tag_get (this->alias));
- if (this->assoc != 0)
+ if (this->assoc != undef_assoc && this->alias->assoc != undef_assoc)
+ complain_at (this->alias->location,
+ _("conflicting associativities for %s (%s) and %s (%s)"),
+ this->tag, assoc_to_string (this->assoc),
+ this->alias->tag, assoc_to_string (this->alias->assoc));
+ if (this->assoc != undef_assoc)
this->alias->assoc = this->assoc;
else
this->assoc = this->alias->assoc;
prec and assoc fields and make both the same */
if (this->number == NUMBER_UNDEFINED)
{
- if (this == eoftoken || this->alias == eoftoken)
+ if (this == endtoken || this->alias == endtoken)
this->number = this->alias->number = 0;
else
{
{
/* A token which translation has already been set? */
if (token_translations[this->user_token_number] != undeftoken->number)
- complain (_("tokens %s and %s both assigned number %d"),
- symbol_tag_get (symbols[token_translations[this->user_token_number]]),
- symbol_tag_get (this), this->user_token_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);
token_translations[this->user_token_number] = this->number;
}
symbol_t probe;
symbol_t *entry;
- (const char *) probe.tag = key;
+ /* Keep the symbol in a printable form. */
+ key = quotearg_style (escape_quoting_style, key);
+ *(char const **) &probe.tag = key;
entry = hash_lookup (symbol_table, &probe);
if (!entry)
symbols_free (void)
{
hash_free (symbol_table);
+ free (symbols);
}
token_translations = XCALLOC (symbol_number_t, max_user_token_number + 1);
/* Initialize all entries for literal tokens to 2, the internal
- token number for $undefined., which represents all invalid
- inputs. */
+ token number for $undefined, which represents all invalid inputs.
+ */
for (i = 0; i < max_user_token_number + 1; i++)
token_translations[i] = undeftoken->number;
symbols_do (symbol_translation, NULL);
if (startsymbol->class == unknown_sym)
fatal_at (startsymbol_location,
_("the start symbol %s is undefined"),
- symbol_tag_get (startsymbol));
+ startsymbol->tag);
else if (startsymbol->class == token_sym)
fatal_at (startsymbol_location,
_("the start symbol %s is a token"),
- symbol_tag_get (startsymbol));
+ startsymbol->tag);
}
projects / bison.git / blobdiff