errors: indent "%define var" redefinition context

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>

diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index bd1fd174719941c0ea86b2e727e34404d6dbf13f..d187f828a01e00bc6198062eee7940f877c3d0b7 100644 (file)
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -426,6 +426,7 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
   if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
       && muscle_find_const (name))
     {
   if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
       && muscle_find_const (name))
     {

+      unsigned i = 0;

       muscle_percent_define_how how_old =
         atoi (muscle_find_const (how_name));
       if (how_old == MUSCLE_PERCENT_DEFINE_F)
       muscle_percent_define_how how_old =
         atoi (muscle_find_const (how_name));
       if (how_old == MUSCLE_PERCENT_DEFINE_F)


@@ -433,10 +434,11 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
           free (variable_tr);
           return;
         }
           free (variable_tr);
           return;
         }

-      complain_at (variable_loc, _("%%define variable %s redefined"),
-                   quote (variable));
-      complain_at (muscle_percent_define_get_loc (variable),
-                   _("previous definition"));
+      complain_at_indent (variable_loc, &i,
+                          _("%%define variable %s redefined"), quote (variable));
+      i += SUB_INDENT;
+      complain_at_indent (muscle_percent_define_get_loc (variable), &i,
+                          _("previous definition"));

     }
 
   MUSCLE_INSERT_STRING (name, value);
     }
 
   MUSCLE_INSERT_STRING (name, value);

diff --git a/tests/input.at b/tests/input.at
index fc92abe007879f56fef80d5c578ee180b3cff42b..2facf9ee5369a2e2d5c4611dc80d038e77b003d2 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -928,9 +928,9 @@ start: ;
 
 AT_BISON_CHECK([[input-redefined.y]], [[1]], [],
 [[input-redefined.y:2.9-11: %define variable 'var' redefined
 
 AT_BISON_CHECK([[input-redefined.y]], [[1]], [],
 [[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]], [],
 [[input-dg.y:1.9-11: %define variable 'var' redefined
 ]])
 AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [],
 [[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]],