Simplify y.tab.c when location tracking is disabled.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 8a192bd26c5f631970137134c84810f3c2a7eef0..63dfc935143830a3a1874941c48c3a5a1990a2b6 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,10 +1,12 @@
 /* Declaration for error-reporting function for Bison.
 /* 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, 2009
+   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
 
    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,114 @@
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   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>.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <stdarg.h>
 
 #include "complain.h"
 #include "files.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;
 bool complaint_issued;

+static unsigned *indent_ptr = 0;

 
 \f
 
 \f

+
+/** 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
+error_message (location *loc,
+              const char *prefix,
+              const char *message, va_list args)
+{
+  unsigned pos = 0;
+
+  if (loc)
+    pos += location_print (stderr, *loc);
+  else
+    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);
+  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);  \
+  va_end (args);                               \
+}
+
+

 /*--------------------------------.
 | Report a warning, and proceed.  |
 `--------------------------------*/
 
 /*--------------------------------.
 | 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, ...)
 {
 void
 warn_at (location loc, const char *message, ...)
 {

-  va_list args;
-
-  location_print (stderr, loc);
-  fputs (": ", stderr);
-  fputs (_("warning: "), stderr);
-
-  va_start (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
+  set_warning_issued ();
+  ERROR_MESSAGE (&loc, _("warning"), message);
+}

 
 

-  warning_issued = true;
-  putc ('\n', stderr);
+void
+warn_at_indent (location loc, unsigned *indent,
+                const char *message, ...)
+{
+  set_warning_issued ();
+  indent_ptr = indent;
+  ERROR_MESSAGE (&loc, _("warning"), message);

 }
 
 void
 warn (const char *message, ...)
 {
 }
 
 void
 warn (const char *message, ...)
 {

-  va_list args;
-
-  fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: "));
+  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);
-}
-\f

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


@@ -80,34 +129,48 @@ warn (const char *message, ...)
 void
 complain_at (location loc, 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;
+}

 
 

+void
+complain_at_indent (location loc, unsigned *indent,
+                    const char *message, ...)
+{
+  indent_ptr = indent;
+  ERROR_MESSAGE (&loc, NULL, message);

   complaint_issued = true;
   complaint_issued = true;

-  putc ('\n', stderr);

 }
 
 void
 complain (const char *message, ...)
 {
 }
 
 void
 complain (const char *message, ...)
 {

-  va_list args;
+  ERROR_MESSAGE (NULL, NULL, message);
+  complaint_issued = true;
+}

 
 

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

 
 

-  va_start (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
+/*--------------------------------------------------------------.
+| An incompatibility with POSIX Yacc: mapped either to warn* or |
+| complain* depending on yacc_flag.                             |
+`--------------------------------------------------------------*/

 
 

-  complaint_issued = true;
-  putc ('\n', stderr);
+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);
+    }

 }
 }

-\f
+
+

 /*-------------------------------------------------.
 | A severe error has occurred, we cannot proceed.  |
 `-------------------------------------------------*/
 /*-------------------------------------------------.
 | A severe error has occurred, we cannot proceed.  |
 `-------------------------------------------------*/


@@ -115,31 +178,13 @@ complain (const char *message, ...)
 void
 fatal_at (location loc, 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, ...)
 {
   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);
 }
   exit (EXIT_FAILURE);
 }