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

errors: indent "%define var" redefinition context

Browse Source 
This is the continuation of the work on the readability of errors
context.

For example, what used to be:
  input.y:2.9-11: %define variable 'var' redefined
  input.y:1.9-11: previous definition

is now:
  input.y:2.9-11: %define variable 'var' redefined
  input.y:1.9-11:     previous definition

* src/muscle-tab.c (muscle_percent_define_insert): Use
complain_at_indent to output with increased indentation level.
* tests/input.at: Apply this change.

Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
This commit is contained in:
Theophile Ranquet
2012-09-26 11:49:20 +02:00
committed by Akim Demaille
parent cbaea0106d
commit 6b1e1872d4
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/muscle-tab.c
View File

@@ -426,6 +426,7 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
&& muscle_find_const (name)) && muscle_find_const (name))
{ {
unsigned i = 0;
muscle_percent_define_how how_old = muscle_percent_define_how how_old =
atoi (muscle_find_const (how_name)); atoi (muscle_find_const (how_name));
if (how_old == MUSCLE_PERCENT_DEFINE_F) if (how_old == MUSCLE_PERCENT_DEFINE_F)
@@ -433,10 +434,11 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
free (variable_tr); free (variable_tr);
return; return;
} }
complain_at (variable_loc, _("%%define variable %s redefined"), complain_at_indent (variable_loc, &i,
quote (variable)); _("%%define variable %s redefined"), quote (variable));
complain_at (muscle_percent_define_get_loc (variable), i += SUB_INDENT;
_("previous definition")); complain_at_indent (muscle_percent_define_get_loc (variable), &i,
_("previous definition"));
} }
MUSCLE_INSERT_STRING (name, value); MUSCLE_INSERT_STRING (name, value);

6
tests/input.at
View File

@@ -928,9 +928,9 @@ start: ;
AT_BISON_CHECK([[input-redefined.y]], [[1]], [], AT_BISON_CHECK([[input-redefined.y]], [[1]], [],
[[input-redefined.y:2.9-11: %define variable 'var' redefined [[input-redefined.y:2.9-11: %define variable 'var' redefined
input-redefined.y:1.9-11: previous definition input-redefined.y:1.9-11: previous definition
input-redefined.y:3.10-12: %define variable 'var' redefined input-redefined.y:3.10-12: %define variable 'var' redefined
input-redefined.y:2.9-11: previous definition input-redefined.y:2.9-11: previous definition
]]) ]])
AT_DATA([input-unused.y], AT_DATA([input-unused.y],
@@ -985,7 +985,7 @@ start: ;
]]) ]])
AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [], AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [],
[[input-dg.y:1.9-11: %define variable 'var' redefined [[input-dg.y:1.9-11: %define variable 'var' redefined
<command line>:2: previous definition <command line>:2: previous definition
]]) ]])
AT_DATA([[input-unused.y]], AT_DATA([[input-unused.y]],