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

diagnostics: properly indent the "previous declaration" message

Browse Source 
* src/complain.c (duplicate_directive, duplicate_rule_directive):
Here.
This commit is contained in:
Akim Demaille
2019-01-16 08:29:03 +01:00
parent f5a646c390
commit b443932991
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/complain.c
View File

@@ -403,11 +403,12 @@ void
duplicate_directive (char const *directive, duplicate_directive (char const *directive,
location first, location second) location first, location second)
{ {
unsigned i = 0;
if (feature_flag & feature_caret) if (feature_flag & feature_caret)
complain (&second, Wother, _("duplicate directive")); complain_indent (&second, Wother, &i, _("duplicate directive"));
else else
complain (&second, Wother, _("duplicate directive: %s"), directive); complain_indent (&second, Wother, &i, _("duplicate directive: %s"), directive);
unsigned i = SUB_INDENT; i += SUB_INDENT;
complain_indent (&first, complaint, &i, _("previous declaration")); complain_indent (&first, complaint, &i, _("previous declaration"));
fixits_register (&second, ""); fixits_register (&second, "");
} }
@@ -416,7 +417,8 @@ void
duplicate_rule_directive (char const *directive, duplicate_rule_directive (char const *directive,
location first, location second) location first, location second)
{ {
complain (&second, complaint, _("only one %s allowed per rule"), directive); unsigned i = 0;
unsigned i = SUB_INDENT; complain_indent (&second, complaint, &i, _("only one %s allowed per rule"), directive);
i += SUB_INDENT;
complain_indent (&first, complaint, &i, _("previous declaration")); complain_indent (&first, complaint, &i, _("previous declaration"));
} }

2
tests/actions.at
View File

@@ -171,7 +171,7 @@ AT_BISON_CHECK([-fcaret one.y], [1], [],
[[one.y:11.13-18: error: only one %empty allowed per rule [[one.y:11.13-18: error: only one %empty allowed per rule
%empty {} %empty %empty {} %empty
^~~~~~ ^~~~~~
one.y:11.3-8: previous declaration one.y:11.3-8: previous declaration
%empty {} %empty %empty {} %empty
^~~~~~ ^~~~~~
]]) ]])

4
tests/input.at
View File

@@ -2527,10 +2527,10 @@ fix-it:"input.y":{14:1-15:3}:"%file-prefix"
input.y:17.1-19: warning: deprecated directive: '%fixed-output_files', use '%fixed-output-files' [-Wdeprecated] input.y:17.1-19: warning: deprecated directive: '%fixed-output_files', use '%fixed-output-files' [-Wdeprecated]
fix-it:"input.y":{17:1-17:20}:"%fixed-output-files" fix-it:"input.y":{17:1-17:20}:"%fixed-output-files"
input.y:18.1-19: warning: duplicate directive: %fixed_output-files [-Wother] input.y:18.1-19: warning: duplicate directive: %fixed_output-files [-Wother]
input.y:17.1-19: previous declaration input.y:17.1-19: previous declaration
fix-it:"input.y":{18:1-18:20}:"" fix-it:"input.y":{18:1-18:20}:""
input.y:19.1-19: warning: duplicate directive: %fixed-output-files [-Wother] input.y:19.1-19: warning: duplicate directive: %fixed-output-files [-Wother]
input.y:17.1-19: previous declaration input.y:17.1-19: previous declaration
fix-it:"input.y":{19:1-19:20}:"" fix-it:"input.y":{19:1-19:20}:""
input.y:20.1-19: warning: deprecated directive: '%name-prefix= "foo"', use '%define api.prefix {foo}' [-Wdeprecated] input.y:20.1-19: warning: deprecated directive: '%name-prefix= "foo"', use '%define api.prefix {foo}' [-Wdeprecated]
fix-it:"input.y":{20:1-20:20}:"%define api.prefix {foo}" fix-it:"input.y":{20:1-20:20}:"%define api.prefix {foo}"