Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-14 23:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Normalize conflict related messages.

Browse Source 
* src/complain.h, src/complain.c (warn, complain): New.
* src/conflicts.c (conflicts_print): Use them.
(conflict_report_yacc): New, extracted from...
(conflicts_print): here.
* tests/conflicts.at, tests/existing.at: Adjust.
This commit is contained in:
Akim Demaille
2002-07-30 11:09:59 +00:00
parent e8832397ea
commit 52489d4445
6 changed files with 115 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/complain.c
View File

@@ -1,5 +1,5 @@
/* Declaration for error-reporting function for Bison.
Copyright 2000, 2001 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
@@ -130,6 +130,35 @@ warn_at (location, message, va_alist)
fputs (": ", stderr);
fputs (_("warning: "), stderr);
#ifdef VA_START
VA_START (args, message);
vfprintf (stderr, message, args);
va_end (args);
#else
fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
#endif
++warn_message_count;
putc ('\n', stderr);
fflush (stderr);
}
void
#if defined VA_START && defined __STDC__
warn (const char *message, ...)
#else
warn (message, va_alist)
char *message;
va_dcl
#endif
{
#ifdef VA_START
va_list args;
#endif
fflush (stdout);
fprintf (stderr, "%s: %s", infile ? infile : program_name, _("warning: "));
#ifdef VA_START
VA_START (args, message);
vfprintf (stderr, message, args);
@@ -165,6 +194,35 @@ complain_at (location, message, va_alist)
LOCATION_PRINT (stderr, location);
fputs (": ", stderr);
#ifdef VA_START
VA_START (args, message);
vfprintf (stderr, message, args);
va_end (args);
#else
fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
#endif
++complain_message_count;
putc ('\n', stderr);
fflush (stderr);
}
void
#if defined VA_START && defined __STDC__
complain (const char *message, ...)
#else
complain (message, va_alist)
char *message;
va_dcl
#endif
{
#ifdef VA_START
va_list args;
#endif
fflush (stdout);
fprintf (stderr, "%s: ", infile ? infile : program_name);
#ifdef VA_START
VA_START (args, message);
vfprintf (stderr, message, args);
@@ -186,7 +244,7 @@ void
#if defined VA_START && defined __STDC__
fatal_at (location_t location, const char *message, ...)
#else
fatal (location, message, va_alist)
fatal_at (location, message, va_alist)
location_t location;
char *message;
va_dcl