Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 20:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

diagnostics: use appropriate location for useless precedence/associativity

Browse Source 
* src/symtab.c (symbol_precedence_set): Use prec_location, not
location (which is the first occurrence of the symbol, possibly just
%token).
Also, as redefinitions are not allowed, keep the first values, not
the subsequent ones.
* tests/conflicts.at, tests/existing.at, tests/regression.at: Adjust.
This commit is contained in:
Akim Demaille
2013-04-22 11:26:28 +02:00
parent 8782fe26cb
commit d8ce703102
4 changed files with 138 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/symtab.c
View File

@@ -321,12 +321,15 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc)
{
if (a != undef_assoc)
{
if (sym->prec != 0)
if (sym->prec)
symbol_redeclaration (sym, assoc_to_string (a), sym->prec_location,
loc);
sym->prec = prec;
sym->assoc = a;
sym->prec_location = loc;
else
{
sym->prec = prec;
sym->assoc = a;
sym->prec_location = loc;
}
}
/* Only terminals have a precedence. */
@@ -1153,14 +1156,14 @@ print_precedence_warnings (void)
&& !prec_nodes[i]->succ)
{
if (is_assoc_useless (s))
complain (&s->location, Wprecedence,
complain (&s->prec_location, Wprecedence,
_("useless precedence and associativity for %s"), s->tag);
else if (s->assoc == precedence_assoc)
complain (&s->location, Wprecedence,
complain (&s->prec_location, Wprecedence,
_("useless precedence for %s"), s->tag);
}
else if (is_assoc_useless (s))
complain (&s->location, Wprecedence,
complain (&s->prec_location, Wprecedence,
_("useless associativity for %s, use %%precedence"), s->tag);
}
free (used_assoc);