Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-18 00: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

13
src/complain.c
View File

@@ -122,7 +122,9 @@ complains (const location *loc, warnings flags, const char *message,
{
if (flags & complaint)
{
error_message (loc, complaint, NULL, message, args);
error_message (loc, complaint,
indent_ptr && *indent_ptr ? NULL : _("error"),
message, args);
complaint_issued = true;
}
else if (flags & fatal)
@@ -140,13 +142,17 @@ complains (const location *loc, warnings flags, const char *message,
else if (warnings_flag & Wyacc)
{
set_warning_issued ();
error_message (loc, flags, _("warning"), message, args);
error_message (loc, flags,
indent_ptr && *indent_ptr ? NULL : _("warning"),
message, args);
}
}
else if (warnings_flag & flags)
{
set_warning_issued ();
error_message (loc, flags, _("warning"), message, args);
error_message (loc, flags,
indent_ptr && *indent_ptr ? NULL : _("warning"),
message, args);
}
}
@@ -179,6 +185,7 @@ void complain_at_indent (location loc, warnings flags, unsigned *indent,
va_end (args);
}
/*--------------------------------.
| Report a warning, and proceed. |
`--------------------------------*/