X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0fb669f9d648dfdd7a39478a6b658511455ae966..4654b0c0a8a355e7a8fcdf51b1a5eb6c485126f1:/src/complain.c?ds=sidebyside

diff --git a/src/complain.c b/src/complain.c
index 4769df5c..2c26c4e4 100644
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,10 +1,12 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright (C) 2000, 2001, 2002, 2004 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.
+   Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006
+   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 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
@@ -12,67 +14,93 @@
    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>.  */
 
+#include <config.h>
 #include "system.h"
 
 #include <stdarg.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;
-
-/* This variable is set each time `warn' is called.  */
-bool warning_issued;
-
-/* This variable is set each time `complain' is called.  */
 bool complaint_issued;
 
 
-/*--------------------------------.
-| Report a warning, and proceed.  |
-`--------------------------------*/
 
+/** Report an error message.
+ *
+ * \param loc     the location, defaulting to the current file,
+ *                or the program name.
+ * \param prefix  put before the message (e.g., "warning").
+ * \param message the error message, a printf format string.
+ * \param args    the arguments of the format string.
+ */
+static
 void
-warn_at (location loc, const char *message, ...)
+error_message (location *loc,
+	       const char *prefix,
+	       const char *message, va_list args)
 {
-  va_list args;
-
-  location_print (stderr, loc);
+  if (loc)
+    location_print (stderr, *loc);
+  else
+    fputs (current_file ? current_file : program_name, stderr);
   fputs (": ", stderr);
-  fputs (_("warning: "), stderr);
 
-  va_start (args, message);
+  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);	\
+}
+
 
+/*--------------------------------.
+| 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;
-  putc ('\n', stderr);
 }
 
 void
-warn (const char *message, ...)
+warn_at (location loc, const char *message, ...)
 {
-  va_list args;
+  set_warning_issued ();
+  ERROR_MESSAGE (&loc, _("warning"), message);
+}
 
-  fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: "));
+void
+warn (const char *message, ...)
+{
+  set_warning_issued ();
+  ERROR_MESSAGE (NULL, _("warning"), message);
+}
 
-  va_start (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
 
-  warning_issued = true;
-  putc ('\n', stderr);
-}
-
 /*-----------------------------------------------------------.
 | An error has occurred, but we can proceed, and die later.  |
 `-----------------------------------------------------------*/
@@ -80,34 +108,18 @@ warn (const char *message, ...)
 void
 complain_at (location loc, const char *message, ...)
 {
-  va_list args;
-
-  location_print (stderr, loc);
-  fputs (": ", stderr);
-
-  va_start (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
-
+  ERROR_MESSAGE (&loc, NULL, message);
   complaint_issued = true;
-  putc ('\n', stderr);
 }
 
 void
 complain (const char *message, ...)
 {
-  va_list args;
-
-  fprintf (stderr, "%s: ", current_file ? current_file : program_name);
-
-  va_start (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
-
+  ERROR_MESSAGE (NULL, NULL, message);
   complaint_issued = true;
-  putc ('\n', stderr);
 }
-
+
+
 /*-------------------------------------------------.
 | A severe error has occurred, we cannot proceed.  |
 `-------------------------------------------------*/
@@ -115,31 +127,13 @@ complain (const char *message, ...)
 void
 fatal_at (location loc, const char *message, ...)
 {
-  va_list args;
-
-  location_print (stderr, loc);
-  fputs (": ", stderr);
-  fputs (_("fatal error: "), stderr);
-
-  va_start (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
-  putc ('\n', stderr);
+  ERROR_MESSAGE (&loc, _("fatal error"), message);
   exit (EXIT_FAILURE);
 }
 
 void
 fatal (const char *message, ...)
 {
-  va_list args;
-
-  fprintf (stderr, "%s: ", current_file ? current_file : program_name);
-
-  fputs (_("fatal error: "), stderr);
-
-  va_start (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
-  putc ('\n', stderr);
+  ERROR_MESSAGE (NULL, _("fatal error"), message);
   exit (EXIT_FAILURE);
 }