(_AT_CHECK_PRINTER_AND_DESTRUCTOR,

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 49c61897fc22542e76fe6a25e53afddd60253530..8a192bd26c5f631970137134c84810f3c2a7eef0 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
 /* Declaration for error-reporting function for Bison.

-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   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
 
    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


@@ -21,93 +21,20 @@
 
 #include "system.h"
 
 
 #include "system.h"
 

-#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
-# ifdef __STDC__
-#  include <stdarg.h>
-#  define VA_START(args, lastarg) va_start(args, lastarg)
-# else
-#  include <varargs.h>
-#  define VA_START(args, lastarg) va_start(args)
-# endif
-#else
-# define va_alist a1, a2, a3, a4, a5, a6, a7, a8
-# define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
-#endif
-
-#if STDC_HEADERS || _LIBC
-# include <stdlib.h>
-# include <string.h>
-#else
-void exit ();
-#endif
-
-/* To get error_one_per_line. */
-#include "error.h"
+#include <stdarg.h>

 
 #include "complain.h"
 
 #include "complain.h"

-
-#ifndef HAVE_DECL_STRERROR_R
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_STRERROR_R
-char *strerror_r ();
-#endif
-
-#ifndef _
-# define _(String) String
-#endif
-
-#ifdef _LIBC
-/* In the GNU C library, there is a predefined variable for this.  */
-
-# define program_name program_invocation_name
-# include <errno.h>
-
-/* In GNU libc we want do not want to use the common name `error' directly.
-   Instead make it a weak alias.  */
-# define error __error
-# define error_at_line __error_at_line
-
-# ifdef USE_IN_LIBIO
-#  include <libio/iolibio.h>
-#  define fflush(s) _IO_fflush (s)
-# endif
-
-#else /* not _LIBC */
+#include "files.h"

 
 /* The calling program should define program_name and set it to the
    name of the executing program.  */
 extern char *program_name;
 
 
 /* The calling program should define program_name and set it to the
    name of the executing program.  */
 extern char *program_name;
 

-# ifdef HAVE_STRERROR_R
-#  define __strerror_r strerror_r
-# else
-#  if HAVE_STRERROR
-#   ifndef strerror            /* On some systems, strerror is a macro */
-char *strerror ();
-#   endif
-#  else
-static char *
-private_strerror (errnum)
-     int errnum;
-{
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-
-  if (errnum > 0 && errnum <= sys_nerr)
-    return _(sys_errlist[errnum]);
-  return _("Unknown system error");
-}
-#   define strerror private_strerror
-#  endif /* HAVE_STRERROR */
-# endif        /* HAVE_STRERROR_R */
-#endif /* not _LIBC */
-
-/* This variable is incremented each time `warn' is called.  */
-unsigned int warn_message_count;
+/* This variable is set each time `warn' is called.  */
+bool warning_issued;

 
 

-/* This variable is incremented each time `complain' is called.  */
-unsigned int complain_message_count;
+/* This variable is set each time `complain' is called.  */
+bool complaint_issued;

 
 \f
 /*--------------------------------.
 
 \f
 /*--------------------------------.


@@ -115,101 +42,35 @@ unsigned int complain_message_count;
 `--------------------------------*/
 
 void
 `--------------------------------*/
 
 void

-#if defined VA_START && defined __STDC__
-warn_at (int location, const char *message, ...)
-#else
-warn_at (location, message, va_alist)
-  int location
-  char *message;
-  va_dcl
-#endif
+warn_at (location loc, const char *message, ...)

 {
 {

-#ifdef VA_START

   va_list args;
   va_list args;

-#endif
-
-  if (error_one_per_line)
-    {
-      static const char *old_infile;
-      static int old_lineno;
-
-      if (old_lineno == location &&
-         (infile == old_infile || !strcmp (old_infile, infile)))
-       /* Simply return and print nothing.  */
-       return;
-
-      old_infile = infile;
-      old_lineno = location;
-    }
-
-  fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, location);
-  else
-    fprintf (stderr, "%s:", program_name);

 
 

+  location_print (stderr, loc);
+  fputs (": ", stderr);

   fputs (_("warning: "), stderr);
 
   fputs (_("warning: "), stderr);
 

-#ifdef VA_START
-  VA_START (args, message);
+  va_start (args, message);

   vfprintf (stderr, message, args);
   va_end (args);
   vfprintf (stderr, message, args);
   va_end (args);

-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif

 
 

-  ++warn_message_count;
+  warning_issued = true;

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

-  fflush (stderr);

 }
 
 }
 

-

 void
 void

-#if defined VA_START && defined __STDC__

 warn (const char *message, ...)
 warn (const char *message, ...)

-#else
-warn (message, va_alist)
-     char *message;
-     va_dcl
-#endif

 {
 {

-#ifdef VA_START

   va_list args;
   va_list args;

-#endif
-
-  if (error_one_per_line)
-    {
-      static const char *old_infile;
-      static int old_lineno;
-
-      if (old_lineno == lineno &&
-         (infile == old_infile || !strcmp (old_infile, infile)))
-       /* Simply return and print nothing.  */
-       return;

 
 

-      old_infile = infile;
-      old_lineno = lineno;
-    }
-
-  fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, lineno);
-  else
-    fprintf (stderr, "%s:", program_name);
-
-  fputs (_("warning: "), stderr);
+  fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: "));

 
 

-#ifdef VA_START
-  VA_START (args, message);
+  va_start (args, message);

   vfprintf (stderr, message, args);
   va_end (args);
   vfprintf (stderr, message, args);
   va_end (args);

-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif

 
 

-  ++warn_message_count;
+  warning_issued = true;

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

-  fflush (stderr);

 }
 \f
 /*-----------------------------------------------------------.
 }
 \f
 /*-----------------------------------------------------------.


@@ -217,97 +78,34 @@ warn (message, va_alist)
 `-----------------------------------------------------------*/
 
 void
 `-----------------------------------------------------------*/
 
 void

-#if defined VA_START && defined __STDC__
-complain_at (int location, const char *message, ...)
-#else
-complain_at (location, message, va_alist)
-  int location;
-  char *message;
-  va_dcl
-#endif
+complain_at (location loc, const char *message, ...)

 {
 {

-#ifdef VA_START

   va_list args;
   va_list args;

-#endif
-
-  if (error_one_per_line)
-    {
-      static const char *old_infile;
-      static int old_lineno;
-
-      if (old_lineno == location &&
-         (infile == old_infile || !strcmp (old_infile, infile)))
-       /* Simply return and print nothing.  */
-       return;
-
-      old_infile = infile;
-      old_lineno = location;
-    }
-
-  fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, location);
-  else
-    fprintf (stderr, "%s:", program_name);
-
-#ifdef VA_START
-  VA_START (args, message);
+
+  location_print (stderr, loc);
+  fputs (": ", stderr);
+
+  va_start (args, message);

   vfprintf (stderr, message, args);
   va_end (args);
   vfprintf (stderr, message, args);
   va_end (args);

-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif

 
 

-  ++complain_message_count;
+  complaint_issued = true;

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

-  fflush (stderr);

 }
 
 }
 

-

 void
 void

-#if defined VA_START && defined __STDC__

 complain (const char *message, ...)
 complain (const char *message, ...)

-#else
-complain (message, va_alist)
-     char *message;
-     va_dcl
-#endif

 {
 {

-#ifdef VA_START

   va_list args;
   va_list args;

-#endif
-
-  if (error_one_per_line)
-    {
-      static const char *old_infile;
-      static int old_lineno;
-
-      if (old_lineno == lineno &&
-         (infile == old_infile || !strcmp (old_infile, infile)))
-       /* Simply return and print nothing.  */
-       return;
-
-      old_infile = infile;
-      old_lineno = lineno;
-    }
-
-  fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, lineno);
-  else
-    fprintf (stderr, "%s:", program_name);
-
-#ifdef VA_START
-  VA_START (args, message);
+
+  fprintf (stderr, "%s: ", current_file ? current_file : program_name);
+
+  va_start (args, message);

   vfprintf (stderr, message, args);
   va_end (args);
   vfprintf (stderr, message, args);
   va_end (args);

-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif

 
 

-  ++complain_message_count;
+  complaint_issued = true;

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

-  fflush (stderr);

 }
 \f
 /*-------------------------------------------------.
 }
 \f
 /*-------------------------------------------------.


@@ -315,68 +113,33 @@ complain (message, va_alist)
 `-------------------------------------------------*/
 
 void
 `-------------------------------------------------*/
 
 void

-#if defined VA_START && defined __STDC__
-fatal_at (int location, const char *message, ...)
-#else
-fatal (location, message, va_alist)
-  int location;
-  char *message;
-  va_dcl
-#endif
+fatal_at (location loc, const char *message, ...)

 {
 {

-#ifdef VA_START

   va_list args;
   va_list args;

-#endif
-
-  fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, location);
-  else
-    fprintf (stderr, "%s:", program_name);

 
 

+  location_print (stderr, loc);
+  fputs (": ", stderr);

   fputs (_("fatal error: "), stderr);
 
   fputs (_("fatal error: "), stderr);
 

-#ifdef VA_START
-  VA_START (args, message);
+  va_start (args, message);

   vfprintf (stderr, message, args);
   va_end (args);
   vfprintf (stderr, message, args);
   va_end (args);

-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif

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

-  fflush (stderr);
-  exit (1);
+  exit (EXIT_FAILURE);

 }
 
 void
 }
 
 void

-#if defined VA_START && defined __STDC__

 fatal (const char *message, ...)
 fatal (const char *message, ...)

-#else
-fatal (message, va_alist)
-     char *message;
-     va_dcl
-#endif

 {
 {

-#ifdef VA_START

   va_list args;
   va_list args;

-#endif

 
 

-  fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, lineno);
-  else
-    fprintf (stderr, "%s:", program_name);
+  fprintf (stderr, "%s: ", current_file ? current_file : program_name);

 
   fputs (_("fatal error: "), stderr);
 
 
   fputs (_("fatal error: "), stderr);
 

-#ifdef VA_START
-  VA_START (args, message);
+  va_start (args, message);

   vfprintf (stderr, message, args);
   va_end (args);
   vfprintf (stderr, message, args);
   va_end (args);

-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif

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

-  fflush (stderr);
-  exit (1);
+  exit (EXIT_FAILURE);

 }
 }