getargs: add support for --flags/-f

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index b3703eae43af31a03991618751808f54bd06700e..86fde7b2e4303b3371b233a48a9da98673e2a27b 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -22,7 +22,6 @@
 #include "system.h"
 
 #include <quote.h>
-#include <quotearg.h>
 
 #include "complain.h"
 #include "conflicts.h"
@@ -129,12 +128,16 @@ record_merge_function_type (int merger, uniqstr type, location declaration_loc)
   aver (merge_function != NULL && merger_find == merger);
   if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
     {
-      complain_at (declaration_loc,
-                   _("result type clash on merge function '%s': <%s> != <%s>"),
-                   merge_function->name, type, merge_function->type);
-      complain_at (merge_function->type_declaration_location,
-                  _("previous declaration"));
-    }
+      unsigned indent = 0;
+      complain_at_indent (declaration_loc, &indent,
+                          _("result type clash on merge function %s: "
+                            "<%s> != <%s>"),
+                          quote (merge_function->name), type,
+                          merge_function->type);
+      indent += SUB_INDENT;
+      complain_at_indent (merge_function->type_declaration_location, &indent,
+                          _("previous declaration"));
+   }
   merge_function->type = uniqstr_new (type);
   merge_function->type_declaration_location = declaration_loc;
 }