* data/lalr1.cc: Move the body of the ctor and dtor into the

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 7adff368b94832f5ebcab9b66f57e72423854fd6..4769df5c27d7ca102724fcbc1ab65fad3d8d981a 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 (C) 2000, 2001, 2002  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


@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    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,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,

    USA.  */
 
 /* Based on error.c and error.h,
    USA.  */
 
 /* Based on error.c and error.h,


@@ -22,65 +22,14 @@
 #include "system.h"
 
 #include <stdarg.h>
 #include "system.h"
 
 #include <stdarg.h>

-#if ! (HAVE_VPRINTF || defined vfprintf)
-# define vfprintf(stream, message, args) _doprnt (message, args, stream)
-#endif
-
-#if STDC_HEADERS || _LIBC
-# include <stdlib.h>
-# include <string.h>
-#endif

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

-
-#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;
 

-# if HAVE_STRERROR
-#  ifndef HAVE_DECL_STRERROR
-"this configure-time declaration test was not run"
-#  endif
-#  if !HAVE_DECL_STRERROR && !defined strerror
-char *strerror (int);
-#  endif
-# else
-static char *
-private_strerror (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 /* not _LIBC */
-

 /* This variable is set each time `warn' is called.  */
 bool warning_issued;
 
 /* This variable is set each time `warn' is called.  */
 bool warning_issued;
 


@@ -93,12 +42,11 @@ bool complaint_issued;
 `--------------------------------*/
 
 void
 `--------------------------------*/
 
 void

-warn_at (location_t location, const char *message, ...)
+warn_at (location loc, const char *message, ...)

 {
   va_list args;
 
 {
   va_list args;
 

-  fflush (stdout);
-  LOCATION_PRINT (stderr, location);
+  location_print (stderr, loc);

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


@@ -108,7 +56,6 @@ warn_at (location_t location, const char *message, ...)
 
   warning_issued = true;
   putc ('\n', stderr);
 
   warning_issued = true;
   putc ('\n', stderr);

-  fflush (stderr);

 }
 
 void
 }
 
 void


@@ -116,8 +63,7 @@ warn (const char *message, ...)
 {
   va_list args;
 
 {
   va_list args;
 

-  fflush (stdout);
-  fprintf (stderr, "%s: %s", infile ? infile : program_name, _("warning: "));
+  fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: "));

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


@@ -125,7 +71,6 @@ warn (const char *message, ...)
 
   warning_issued = true;
   putc ('\n', stderr);
 
   warning_issued = true;
   putc ('\n', stderr);

-  fflush (stderr);

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


@@ -133,12 +78,11 @@ warn (const char *message, ...)
 `-----------------------------------------------------------*/
 
 void
 `-----------------------------------------------------------*/
 
 void

-complain_at (location_t location, const char *message, ...)
+complain_at (location loc, const char *message, ...)

 {
   va_list args;
 
 {
   va_list args;
 

-  fflush (stdout);
-  LOCATION_PRINT (stderr, location);
+  location_print (stderr, loc);

   fputs (": ", stderr);
 
   va_start (args, message);
   fputs (": ", stderr);
 
   va_start (args, message);


@@ -147,7 +91,6 @@ complain_at (location_t location, const char *message, ...)
 
   complaint_issued = true;
   putc ('\n', stderr);
 
   complaint_issued = true;
   putc ('\n', stderr);

-  fflush (stderr);

 }
 
 void
 }
 
 void


@@ -155,8 +98,7 @@ complain (const char *message, ...)
 {
   va_list args;
 
 {
   va_list args;
 

-  fflush (stdout);
-  fprintf (stderr, "%s: ", infile ? infile : program_name);
+  fprintf (stderr, "%s: ", current_file ? current_file : program_name);

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


@@ -164,7 +106,6 @@ complain (const char *message, ...)
 
   complaint_issued = true;
   putc ('\n', stderr);
 
   complaint_issued = true;
   putc ('\n', stderr);

-  fflush (stderr);

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


@@ -172,12 +113,11 @@ complain (const char *message, ...)
 `-------------------------------------------------*/
 
 void
 `-------------------------------------------------*/
 
 void

-fatal_at (location_t location, const char *message, ...)
+fatal_at (location loc, const char *message, ...)

 {
   va_list args;
 
 {
   va_list args;
 

-  fflush (stdout);
-  LOCATION_PRINT (stderr, location);
+  location_print (stderr, loc);

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


@@ -185,7 +125,6 @@ fatal_at (location_t location, const char *message, ...)
   vfprintf (stderr, message, args);
   va_end (args);
   putc ('\n', stderr);
   vfprintf (stderr, message, args);
   va_end (args);
   putc ('\n', stderr);

-  fflush (stderr);

   exit (EXIT_FAILURE);
 }
 
   exit (EXIT_FAILURE);
 }
 


@@ -194,8 +133,7 @@ fatal (const char *message, ...)
 {
   va_list args;
 
 {
   va_list args;
 

-  fflush (stdout);
-  fprintf (stderr, "%s: ", infile ? infile : program_name);
+  fprintf (stderr, "%s: ", current_file ? current_file : program_name);

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


@@ -203,6 +141,5 @@ fatal (const char *message, ...)
   vfprintf (stderr, message, args);
   va_end (args);
   putc ('\n', stderr);
   vfprintf (stderr, message, args);
   va_end (args);
   putc ('\n', stderr);

-  fflush (stderr);

   exit (EXIT_FAILURE);
 }
   exit (EXIT_FAILURE);
 }