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

In warnings, say "previous declaration" rather than "first

Browse Source 
declaration".
* src/symtab.c (redeclaration): Do that here.
* src/reader.c (record_merge_function_type): In the case of a result
type clash, report the previous declaration rather than the very first
one in the grammar file.
* tests/glr-regression.at (Missed %merge type warnings when LHS type is
declared later): Add a third declaration to check this behavior.
* tests/input.at (Incompatible Aliases): Update output.
This commit is contained in:
Joel E. Denny
2006-07-07 21:25:03 +00:00
parent fab044e6da
commit dd60572a8b
5 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/reader.c
View File

@@ -146,19 +146,16 @@ record_merge_function_type (int merger, uniqstr type, location declaration_loc)
merge_function = merge_function->next)
merger_find += 1;
assert (merge_function != NULL && merger_find == merger);
if (merge_function->type == NULL)
{
merge_function->type = uniqstr_new (type);
merge_function->type_declaration_location = declaration_loc;
}
else if (!UNIQSTR_EQ (merge_function->type, type))
if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
{
warn_at (declaration_loc,
_("result type clash on merge function `%s': <%s> != <%s>"),
merge_function->name, type, merge_function->type);
warn_at (merge_function->type_declaration_location,
_("first declaration"));
_("previous declaration"));
}
merge_function->type = uniqstr_new (type);
merge_function->type_declaration_location = declaration_loc;
}
/*--------------------------------------.

2
src/symtab.c
View File

@@ -108,7 +108,7 @@ static void
redeclaration (symbol* s, const char *what, location first, location second)
{
complain_at (second, _("%s redeclaration for %s"), what, s->tag);
complain_at (first, _("first declaration"));
complain_at (first, _("previous declaration"));
}