tests: minor refactoring

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 4cc35c8a9506768cafed48fddc37dfaba97388b0..d43e623e933b6bac43b50dfecddeea65b7447061 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,7 +1,7 @@
 /* Declaration for error-reporting function for Bison.
 
 /* Declaration for error-reporting function for Bison.
 

-   Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2004-2006, 2009-2013 Free Software
+   Foundation, Inc.

 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


@@ -23,138 +23,184 @@
 #include "system.h"
 
 #include <stdarg.h>
 #include "system.h"
 
 #include <stdarg.h>

+#include <progname.h>

 
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"
 
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"

+#include "quote.h"

 
 

-bool complaint_issued;
+warnings warnings_flag =
+  Wconflicts_sr | Wconflicts_rr | Wdeprecated  | Wother;

 
 

-\f
+warnings errors_flag;
+
+err_status complaint_status = status_none;
+static unsigned *indent_ptr = 0;
+
+void
+warnings_print_categories (warnings warn_flags)
+{
+  if (! (warn_flags & silent))
+    {
+      char const *warn_names[] =
+        {
+          "midrule-values",
+          "yacc",
+          "conflicts-sr",
+          "conflicts-rr",
+          "deprecated",
+          "other"
+        };
+
+      bool any = false;
+      int i;
+      for (i = 0; i < ARRAY_CARDINALITY (warn_names); ++i)
+        if (warn_flags & 1 << i)
+          {
+            bool err = warn_flags & errors_flag;
+            fprintf (stderr, "%s-W", any ? ", " : " [");
+            fprintf (stderr, "%s%s", err ? "error=" : "" , warn_names[i]);
+            any = true;
+          }
+      if (any)
+        fprintf (stderr, "]");
+    }
+}

 
 /** Report an error message.
  *
  * \param loc     the location, defaulting to the current file,
  *                or the program name.
 
 /** Report an error message.
  *
  * \param loc     the location, defaulting to the current file,
  *                or the program name.

+ * \param flags   the category for this message.

  * \param prefix  put before the message (e.g., "warning").
  * \param prefix  put before the message (e.g., "warning").

- * \param message the error message, a printf format string.
+ * \param message the error message, a printf format string.  Iff it
+ *                ends with ": ", then no trailing newline is printed,
+ *                and the caller should print the remaining
+ *                newline-terminated message to stderr.

  * \param args    the arguments of the format string.
  */
 static
 void
  * \param args    the arguments of the format string.
  */
 static
 void

-error_message (location *loc,
-              const char *prefix,
-              const char *message, va_list args)
+error_message (const location *loc, warnings flags, const char *prefix,
+               const char *message, va_list args)

 {
 {

+  unsigned pos = 0;
+

   if (loc)
   if (loc)

-    location_print (stderr, *loc);
+    pos += location_print (stderr, *loc);

   else
   else

-    fputs (current_file ? current_file : program_name, stderr);
-  fputs (": ", stderr);
+    pos += fprintf (stderr, "%s", current_file ? current_file : program_name);
+  pos += fprintf (stderr, ": ");
+
+  if (indent_ptr)
+    {
+      if (*indent_ptr)
+        prefix = NULL;
+      if (!*indent_ptr)
+        *indent_ptr = pos;
+      else if (*indent_ptr > pos)
+        fprintf (stderr, "%*s", *indent_ptr - pos, "");
+      indent_ptr = 0;
+    }

 
   if (prefix)
     fprintf (stderr, "%s: ", prefix);
 
   vfprintf (stderr, message, args);
 
   if (prefix)
     fprintf (stderr, "%s: ", prefix);
 
   vfprintf (stderr, message, args);

-  va_end (args);
-  putc ('\n', stderr);
+  warnings_print_categories (flags);
+  {
+    size_t l = strlen (message);
+    if (l < 2 || message[l - 2] != ':' || message[l - 1] != ' ')
+      {
+        putc ('\n', stderr);
+        fflush (stderr);
+        if (loc && feature_flag & feature_caret && !(flags & no_caret))
+          location_caret (stderr, *loc);
+      }
+  }

   fflush (stderr);
 }
 
   fflush (stderr);
 }
 

-/** Wrap error_message() with varargs handling. */
-#define ERROR_MESSAGE(Loc, Prefix, Message)    \
-{                                              \
-  va_list args;                                        \
-  va_start (args, Message);                    \
-  error_message (Loc, Prefix, Message, args);  \
-}
-
-
-/*--------------------------------.
-| Report a warning, and proceed.  |
-`--------------------------------*/
-
-static void
-set_warning_issued (void)
-{
-  static bool warning_issued = false;
-  if (!warning_issued && (warnings_flag & warnings_error))
-    {
-      fprintf (stderr, "%s: warnings being treated as errors\n", program_name);
-      complaint_issued = true;
-    }
-  warning_issued = true;
-}
-
-void
-warn_at (location loc, const char *message, ...)
+/** 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)

 {
 {

-  set_warning_issued ();
-  ERROR_MESSAGE (&loc, _("warning"), message);
+  const char* prefix =
+    flags & fatal ? _("fatal error")
+    : flags & (errors_flag | complaint) ? _("error")
+    : _("warning");
+
+  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);

 }
 
 void
 }
 
 void

-warn (const char *message, ...)
+complain (location const *loc, warnings flags, const char *message, ...)

 {
 {

-  set_warning_issued ();
-  ERROR_MESSAGE (NULL, _("warning"), message);
+  va_list args;
+  va_start (args, message);
+  complains (loc, flags, message, args);
+  va_end (args);

 }
 
 }
 

-
-/*-----------------------------------------------------------.
-| An error has occurred, but we can proceed, and die later.  |
-`-----------------------------------------------------------*/
-

 void
 void

-complain_at (location loc, const char *message, ...)
+complain_indent (location const *loc, warnings flags, unsigned *indent,
+                 const char *message, ...)

 {
 {

-  ERROR_MESSAGE (&loc, NULL, message);
-  complaint_issued = true;
+  va_list args;
+  indent_ptr = indent;
+  va_start (args, message);
+  complains (loc, flags, message, args);
+  va_end (args);

 }
 
 void
 }
 
 void

-complain (const char *message, ...)
+complain_args (location const *loc, warnings w, unsigned *indent,
+               int argc, char *argv[])

 {
 {

-  ERROR_MESSAGE (NULL, NULL, message);
-  complaint_issued = true;
-}
+  switch (argc)
+  {
+  case 1:
+    complain_indent (loc, w, indent, "%s", _(argv[0]));
+    break;
+  case 2:
+    complain_indent (loc, w, indent, _(argv[0]), argv[1]);
+    break;
+  case 3:
+    complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2]);
+    break;
+  case 4:
+    complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2], argv[3]);
+    break;
+  case 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");
+    break;
+  }

 
 

-
-/*--------------------------------------------------------------.
-| An incompatibility with POSIX Yacc: mapped either to warn* or |
-| complain* depending on yacc_flag.                             |
-`--------------------------------------------------------------*/
-
-void
-yacc_at (location loc, const char *message, ...)
-{
-  if (yacc_flag)
-    {
-      ERROR_MESSAGE (&loc, NULL, message);
-      complaint_issued = true;
-    }
-  else if (warnings_flag & warnings_yacc)
-    {
-      set_warning_issued ();
-      ERROR_MESSAGE (&loc, _("warning"), message);
-    }
-}
-
-
-/*-------------------------------------------------.
-| A severe error has occurred, we cannot proceed.  |
-`-------------------------------------------------*/
-
-void
-fatal_at (location loc, const char *message, ...)
-{
-  ERROR_MESSAGE (&loc, _("fatal error"), message);
-  exit (EXIT_FAILURE);

 }
 
 void
 }
 
 void

-fatal (const char *message, ...)
+deprecated_directive (location const *loc, char const *old, char const *upd)

 {
 {

-  ERROR_MESSAGE (NULL, _("fatal error"), message);
-  exit (EXIT_FAILURE);
+  if (feature_flag & feature_caret)
+    complain (loc, Wdeprecated,
+              _("deprecated directive, use %s"),
+              quote_n (1, upd));
+  else
+    complain (loc, Wdeprecated,
+              _("deprecated directive: %s, use %s"),
+              quote (old), quote_n (1, upd));

 }
 }