tests: minor refactoring

[bison.git] / src / complain.c

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

-   Copyright (C) 2000-2002, 2004-2006, 2009-2012 Free Software
+   Copyright (C) 2000-2002, 2004-2006, 2009-2013 Free Software

    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify


@@ -28,12 +28,14 @@
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"

+#include "quote.h"

 
 warnings warnings_flag =
   Wconflicts_sr | Wconflicts_rr | Wdeprecated  | Wother;
 
 warnings warnings_flag =
   Wconflicts_sr | Wconflicts_rr | Wdeprecated  | Wother;

+

 warnings errors_flag;
 
 warnings errors_flag;
 

-bool complaint_issued;
+err_status complaint_status = status_none;

 static unsigned *indent_ptr = 0;
 
 void
 static unsigned *indent_ptr = 0;
 
 void


@@ -83,17 +85,18 @@ void
 error_message (const location *loc, warnings flags, 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)
     pos += location_print (stderr, *loc);
   else
   unsigned pos = 0;
 
   if (loc)
     pos += location_print (stderr, *loc);
   else

-    pos += fprintf(stderr, "%s", current_file ? current_file : program_name);
-  pos += fprintf(stderr, ": ");
+    pos += fprintf (stderr, "%s", current_file ? current_file : program_name);
+  pos += fprintf (stderr, ": ");

 
   if (indent_ptr)
     {
 
   if (indent_ptr)
     {

+      if (*indent_ptr)
+        prefix = NULL;

       if (!*indent_ptr)
         *indent_ptr = pos;
       else if (*indent_ptr > pos)
       if (!*indent_ptr)
         *indent_ptr = pos;
       else if (*indent_ptr > pos)


@@ -108,94 +111,96 @@ error_message (const location *loc, warnings flags, const char *prefix,
   warnings_print_categories (flags);
   {
     size_t l = strlen (message);
   warnings_print_categories (flags);
   {
     size_t l = strlen (message);

-    if (l < 2 || message[l-2] != ':' || message[l-1] != ' ')
+    if (l < 2 || message[l - 2] != ':' || message[l - 1] != ' ')

       {
         putc ('\n', stderr);
         fflush (stderr);
       {
         putc ('\n', stderr);
         fflush (stderr);

+        if (loc && feature_flag & feature_caret && !(flags & no_caret))
+          location_caret (stderr, *loc);

       }
   }
       }
   }

+  fflush (stderr);

 }
 
 /** Raise a complaint. That can be a fatal error, a complaint or just a
     warning.  */
 }
 
 /** 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)
 {
 static inline void
 complains (const location *loc, warnings flags, const char *message,
            va_list args)
 {

-  if (flags & complaint)
-    {
-      error_message (loc, complaint, NULL, message, args);
-      complaint_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)
-        {
-          char* severity = Wyacc & errors_flag ? _("error") : _("warning");
-          set_warning_issued (Wyacc);
-          error_message (loc, flags, severity, message, args);
-        }
-    }
-  else if (warnings_flag & flags)
-    {
-      char* severity = flags & errors_flag ? _("error") : _("warning");
-      set_warning_issued (flags);
-      error_message (loc, flags, severity, message, args);
-    }
+  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

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

 {
   va_list args;
   va_start (args, message);
 {
   va_list args;
   va_start (args, message);

-  complains (NULL, flags, message, args);
+  complains (loc, flags, message, args);

   va_end (args);
 }
 
 void
   va_end (args);
 }
 
 void

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

 {
   va_list args;
 {
   va_list args;

+  indent_ptr = indent;

   va_start (args, message);
   va_start (args, message);

-  complains (&loc, flags, message, args);
+  complains (loc, flags, message, args);

   va_end (args);
 }
 
   va_end (args);
 }
 

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

 {
 {

-  indent_ptr = indent;
+  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;
+  }

 
 

-  va_list args;
-  va_start (args, message);
-  complains (&loc, flags, message, args);
-  va_end (args);

 }
 
 }
 

-/*--------------------------------.
-| Report a warning, and proceed.  |
-`--------------------------------*/
-

 void
 void

-set_warning_issued (warnings warning)
+deprecated_directive (location const *loc, char const *old, char const *upd)

 {
 {

-  static bool warning_issued = false;
-  if (!warning_issued && (warning & warnings_flag & errors_flag))
-    {
-      fprintf (stderr, "%s: warnings being treated as errors\n", program_name);
-      complaint_issued = true;
-    }
-  warning_issued = true;
+  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));

 }
 }