mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-12 22:03:02 +00:00
* lib/quotearg.h: Protect against multiple inclusions.
* src/location.h (location_t): Add a `file' member. (LOCATION_RESET, LOCATION_PRINT): Adjust. * src/complain.c (warn_at, complain_at, fatal_at): Drop `error_one_per_line' support.
This commit is contained in:
@@ -41,9 +41,6 @@
|
||||
void exit ();
|
||||
#endif
|
||||
|
||||
/* To get error_one_per_line. */
|
||||
#include "error.h"
|
||||
|
||||
#include "complain.h"
|
||||
|
||||
#ifndef HAVE_DECL_STRERROR_R
|
||||
@@ -128,20 +125,6 @@ warn_at (location, message, va_alist)
|
||||
va_list args;
|
||||
#endif
|
||||
|
||||
if (error_one_per_line)
|
||||
{
|
||||
static const char *old_infile;
|
||||
static int old_lineno;
|
||||
|
||||
if (old_lineno == location.first_line &&
|
||||
(infile == old_infile || !strcmp (old_infile, infile)))
|
||||
/* Simply return and print nothing. */
|
||||
return;
|
||||
|
||||
old_infile = infile;
|
||||
old_lineno = location.first_line;
|
||||
}
|
||||
|
||||
fflush (stdout);
|
||||
LOCATION_PRINT (stderr, location);
|
||||
fputs (": ", stderr);
|
||||
@@ -178,20 +161,6 @@ complain_at (location, message, va_alist)
|
||||
va_list args;
|
||||
#endif
|
||||
|
||||
if (error_one_per_line)
|
||||
{
|
||||
static const char *old_infile;
|
||||
static int old_lineno;
|
||||
|
||||
if (old_lineno == location.first_line &&
|
||||
(infile == old_infile || !strcmp (old_infile, infile)))
|
||||
/* Simply return and print nothing. */
|
||||
return;
|
||||
|
||||
old_infile = infile;
|
||||
old_lineno = location.first_line;
|
||||
}
|
||||
|
||||
fflush (stdout);
|
||||
LOCATION_PRINT (stderr, location);
|
||||
fputs (": ", stderr);
|
||||
|
||||
Reference in New Issue
Block a user