(nonterminals_reduce): Use warn_at rather than rolling our own.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 7adff368b94832f5ebcab9b66f57e72423854fd6..89b1ce5b2e37f1d1f393fe823f696ac88aca78c1 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002 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
@@ -32,6 +32,7 @@
 #endif
 
 #include "complain.h"
+#include "files.h"
 
 #ifndef _
 # define _(String) String
@@ -98,7 +99,7 @@ warn_at (location_t location, const char *message, ...)
   va_list args;
 
   fflush (stdout);
-  LOCATION_PRINT (stderr, location);
+  location_print (stderr, location);
   fputs (": ", stderr);
   fputs (_("warning: "), stderr);
 
@@ -117,7 +118,7 @@ warn (const char *message, ...)
   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);
@@ -138,7 +139,7 @@ complain_at (location_t location, const char *message, ...)
   va_list args;
 
   fflush (stdout);
-  LOCATION_PRINT (stderr, location);
+  location_print (stderr, location);
   fputs (": ", stderr);
 
   va_start (args, message);
@@ -156,7 +157,7 @@ complain (const char *message, ...)
   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);
@@ -177,7 +178,7 @@ fatal_at (location_t location, const char *message, ...)
   va_list args;
 
   fflush (stdout);
-  LOCATION_PRINT (stderr, location);
+  location_print (stderr, location);
   fputs (": ", stderr);
   fputs (_("fatal error: "), stderr);
 
@@ -195,7 +196,7 @@ fatal (const char *message, ...)
   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);