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

Merge branch 'maint'

Browse Source 
* maint:
  warnings: introduce -Wdeprecated in the usage info
  errors: prefix the output with "error: "
  errors: indent "invalid value for %define" context
  errors: indent "%define var" redefinition context
  errors: indent "symbol redeclaration" context
  errors: indent "result type clash" error context

Conflicts:
	src/complain.c
	src/muscle-tab.c
	src/reader.c
	src/symtab.c
	tests/conflicts.at
	tests/input.at
	tests/named-refs.at
	tests/output.at
	tests/skeletons.at
This commit is contained in:
Akim Demaille
2012-09-26 14:35:47 +02:00
parent 37cfa1195d bd52638008
commit 11b192127c
16 changed files with 288 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/symtab.c
View File

@@ -193,16 +193,24 @@ static void
symbol_redeclaration (symbol *s, const char *what, location first,
location second)
{
complain_at (second, complaint, _("%s redeclaration for %s"), what, s->tag);
complain_at (first, complaint, _("previous declaration"));
unsigned i = 0;
complain_at_indent (second, complaint, &i,
_("%s redeclaration for %s"), what, s->tag);
i += SUB_INDENT;
complain_at_indent (first, complaint, &i,
_("previous declaration"));
}
static void
semantic_type_redeclaration (semantic_type *s, const char *what, location first,
location second)
{
complain_at (second, complaint, _("%s redeclaration for <%s>"), what, s->tag);
complain_at (first, complaint, _("previous declaration"));
unsigned i = 0;
complain_at_indent (second, complaint, &i,
_("%s redeclaration for <%s>"), what, s->tag);
i += SUB_INDENT;
complain_at_indent (first, complaint, &i,
_("previous declaration"));
}
@@ -546,6 +554,7 @@ symbol_pack_processor (void *this, void *null ATTRIBUTE_UNUSED)
static void
user_token_number_redeclaration (int num, symbol *first, symbol *second)
{
unsigned i = 0;
/* User token numbers are not assigned during the parsing, but in a
second step, via a traversal of the symbol table sorted on tag.
@@ -557,11 +566,12 @@ user_token_number_redeclaration (int num, symbol *first, symbol *second)
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);
complain_at_indent (second->location, complaint, &i,
_("user token number %d redeclaration for %s"),
num, second->tag);
complain_at_indent (first->location, complaint, &i,
_("previous declaration for %s"),
first->tag);
}
/*--------------------------------------------------.