Merge remote-tracking branch 'origin/maint'

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 7428a4af2f50c95493116348e7d83930f5a94c7b..d79a250250d6c41f5932e4a64c70fa4368a20412 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,12 +1,12 @@
 /* Declaration for error-reporting function for Bison.
 
 /* Declaration for error-reporting function for Bison.
 

-   Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2004-2006, 2009-2012 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 the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -14,9 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */


@@ -25,121 +23,174 @@
 #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"
 

-/* The calling program should define program_name and set it to the
-   name of the executing program.  */
-extern char *program_name;
+warnings warnings_flag =
+  Wconflicts_sr | Wconflicts_rr | Wdeprecated  | Wother;

 
 bool complaint_issued;
 
 bool complaint_issued;

+static unsigned *indent_ptr = 0;

 
 

-\f
+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)
+          {
+            fprintf (stderr, "%s-W%s", any ? ", " : " [", 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)

 {
 {

+  (void) flags;
+  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)
+        *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);
-  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);  \
+  warnings_print_categories (flags);
+  {
+    size_t l = strlen (message);
+    if (l < 2 || message[l-2] != ':' || message[l-1] != ' ')
+      {
+        putc ('\n', stderr);
+        fflush (stderr);
+      }
+  }

 }
 
 }
 

+/** Raise a complaint. That can be a fatal error, a complaint or just a
+    warning.  */

 
 

-/*--------------------------------.
-| Report a warning, and proceed.  |
-`--------------------------------*/
-
-static void
-set_warning_issued (void)
+static inline void
+complains (const location *loc, warnings flags, const char *message,
+           va_list args)

 {
 {

-  static bool warning_issued = false;
-  if (!warning_issued && (warnings_flag & warnings_error))
+  if (flags & complaint)

     {
     {

-      fprintf (stderr, "%s: warnings being treated as errors\n", program_name);
+      error_message (loc, complaint, NULL, message, args);

       complaint_issued = true;
     }
       complaint_issued = true;
     }

-  warning_issued = true;
+  else if (flags & fatal)
+    {
+      error_message (loc, fatal, _("fatal error"), message, args);
+      exit (EXIT_FAILURE);
+    }
+  else if (flags & Wyacc)
+    {
+      if (yacc_flag)
+        {
+          error_message (loc, flags, NULL, message, args);
+          complaint_issued = true;
+        }
+      else if (warnings_flag & Wyacc)
+        {
+          set_warning_issued ();
+          error_message (loc, flags, _("warning"), message, args);
+        }
+    }
+  else if (warnings_flag & flags)
+    {
+      set_warning_issued ();
+      error_message (loc, flags, _("warning"), message, args);
+    }

 }
 
 void
 }
 
 void

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

 {
 {

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

 }
 
 void
 }
 
 void

-warn (const char *message, ...)
+complain_at (location 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
-complain_at (location loc, const char *message, ...)
+void complain_at_indent (location loc, warnings flags, unsigned *indent,
+                         const char *message, ...)

 {
 {

-  ERROR_MESSAGE (&loc, NULL, message);
-  complaint_issued = true;
-}
+  indent_ptr = indent;

 
 

-void
-complain (const char *message, ...)
-{
-  ERROR_MESSAGE (NULL, NULL, message);
-  complaint_issued = true;
+  va_list args;
+  va_start (args, message);
+  complains (&loc, flags, message, args);
+  va_end (args);

 }
 
 }
 

-
-/*-------------------------------------------------.
-| 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);
-}
+/*--------------------------------.
+| Report a warning, and proceed.  |
+`--------------------------------*/

 
 void
 
 void

-fatal (const char *message, ...)
+set_warning_issued (void)

 {
 {

-  ERROR_MESSAGE (NULL, _("fatal error"), message);
-  exit (EXIT_FAILURE);
+  static bool warning_issued = false;
+  if (!warning_issued && (warnings_flag & Werror))
+    {
+      fprintf (stderr, "%s: warnings being treated as errors\n", program_name);
+      complaint_issued = true;
+    }
+  warning_issued = true;

 }
 }