lalr1.cc: rename lex_symbol as api.token.constructor

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 020b688b15c95e20a318138e238773c0a8deb367..2e4e71afb92e1deac07c1d9e7bd69643fd746c2a 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -34,7 +34,7 @@ warnings warnings_flag =
 
 warnings errors_flag;
 
-bool complaint_issued;
+err_status complaint_status = status_none;
 static unsigned *indent_ptr = 0;
 
 void
@@ -120,19 +120,20 @@ error_message (const location *loc, warnings flags, const char *prefix,
 
 /** Raise a complaint. That can be a fatal error, a complaint or just a
     warning.  */
-
 static inline void
 complains (const location *loc, warnings flags, const char *message,
            va_list args)
-
 {
   const char* prefix =
     flags & fatal ? _("fatal error")
     : flags & (errors_flag | complaint) ? _("error")
     : _("warning");
 
-  complaint_issued |= flags & (complaint | errors_flag);
-  if (flags & (warnings_flag | silent | fatal | complaint))
+  if ((flags & complaint) && complaint_status < status_complaint)
+    complaint_status = status_complaint;
+  else if ((flags & (warnings_flag & errors_flag)) && ! complaint_status)
+    complaint_status = status_warning_as_error;
+  if (flags & (warnings_flag | fatal | complaint))
     error_message (loc, flags, prefix, message, args);
   if (flags & fatal)
     exit (EXIT_FAILURE);
@@ -159,24 +160,26 @@ complain_indent (location const *loc, warnings flags, unsigned *indent,
 }
 
 void
-complain_args (location const *loc, warnings w, int argc, char *argv[])
+complain_args (location const *loc, warnings w, unsigned *indent,
+               int argc, char *argv[])
 {
   switch (argc)
   {
+  case 1:
+    complain_indent (loc, w, indent, "%s", _(argv[0]));
+    break;
   case 2:
-    complain (loc, w, "%s", _(argv[1]));
+    complain_indent (loc, w, indent, _(argv[0]), argv[1]);
     break;
   case 3:
-    complain (loc, w, _(argv[1]), argv[2]);
+    complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2]);
     break;
   case 4:
-    complain (loc, w, _(argv[1]), argv[2], argv[3]);
+    complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2], argv[3]);
     break;
   case 5:
-    complain (loc, w, _(argv[1]), argv[2], argv[3], argv[4]);
-    break;
-  case 6:
-    complain (loc, w, _(argv[1]), argv[2], argv[3], argv[4], argv[5]);
+    complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2], argv[3],
+                     argv[4]);
     break;
   default:
     complain (loc, fatal, "too many arguments for complains");