X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a5d5099417229a48aa18477073266e9aa3b77a8e..60aa04a236004d3d03f00aeaf07b643a52ef0760:/src/complain.c diff --git a/src/complain.c b/src/complain.c index 8f27b378..7d905de5 100644 --- a/src/complain.c +++ b/src/complain.c @@ -1,10 +1,12 @@ /* Declaration for error-reporting function for Bison. - Copyright 2000, 2001 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 - Free Software Foundation; either version 2, or (at your option) any - later version. + Copyright (C) 2000-2002, 2004-2006, 2009-2012 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 Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -12,264 +14,181 @@ GNU General Public License for more details. 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, - USA. */ + along with this program. If not, see . */ /* Based on error.c and error.h, written by David MacKenzie . */ +#include #include "system.h" -#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC -# ifdef __STDC__ -# include -# define VA_START(args, lastarg) va_start(args, lastarg) -# else -# include -# 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 -# include -#else -void exit (); -#endif - -/* To get error_one_per_line. */ -#include "error.h" +#include +#include #include "complain.h" +#include "files.h" +#include "getargs.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 - -/* 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 -# define fflush(s) _IO_fflush (s) -# endif +warnings warnings_flag = Wconflicts_sr | Wconflicts_rr | Wother; -#else /* not _LIBC */ +bool complaint_issued; +static unsigned *indent_ptr = 0; -/* 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; +void +warnings_print_categories (warnings warn_flags) { - extern char *sys_errlist[]; - extern int sys_nerr; - - if (errnum > 0 && errnum <= sys_nerr) - return _(sys_errlist[errnum]); - return _("Unknown system error"); + if (! (warn_flags & silent)) + { + char const *warn_names[] = + { + "midrule-values", + "yacc", + "conflicts-sr", + "conflicts-rr", + "other" + }; + + bool any = false; + int i; + for (i = 0; i < ARRAY_CARDINALITY (warn_names); ++i) + if (warn_flags & 1 << i) + { + fprintf (stderr, "%s-W%s", any ? ", " : " [", warn_names[i]); + any = true; + } + if (any) + fprintf (stderr, "]"); + } } -# 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 incremented each time `complain' is called. */ -unsigned int complain_message_count; - - -/*--------------------------------. -| Report a warning, and proceed. | -`--------------------------------*/ +/** Report an error message. + * + * \param loc the location, defaulting to the current file, + * or the program name. + * \param flags the category for this message. + * \param prefix put before the message (e.g., "warning"). + * \param message the error message, a printf format string. Iff it + * ends with ": ", then no trailing newline is printed, + * and the caller should print the remaining + * newline-terminated message to stderr. + * \param args the arguments of the format string. + */ +static void -#if defined VA_START && defined __STDC__ -warn_at (location_t location, const char *message, ...) -#else -warn_at (location, message, va_alist) - location_t location - char *message; - va_dcl -#endif +error_message (const location *loc, warnings flags, const char *prefix, + const char *message, va_list args) { -#ifdef VA_START - va_list args; -#endif + (void) flags; + unsigned pos = 0; - 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; + if (loc) + pos += location_print (stderr, *loc); + else + pos += fprintf(stderr, "%s", current_file ? current_file : program_name); + pos += fprintf(stderr, ": "); - old_infile = infile; - old_lineno = location.first_line; + if (indent_ptr) + { + if (!*indent_ptr) + *indent_ptr = pos; + else if (*indent_ptr > pos) + fprintf (stderr, "%*s", *indent_ptr - pos, ""); + indent_ptr = 0; } - fflush (stdout); - LOCATION_PRINT (stderr, location); - fputs (": ", stderr); - fputs (_("warning: "), stderr); + if (prefix) + fprintf (stderr, "%s: ", prefix); -#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); + warnings_print_categories (flags); + { + size_t l = strlen (message); + if (l < 2 || message[l-2] != ':' || message[l-1] != ' ') + { + putc ('\n', stderr); + fflush (stderr); + } + } } - -/*-----------------------------------------------------------. -| An error has occurred, but we can proceed, and die later. | -`-----------------------------------------------------------*/ -void -#if defined VA_START && defined __STDC__ -complain_at (location_t location, const char *message, ...) -#else -complain_at (location, message, va_alist) - location_t location; - char *message; - va_dcl -#endif -{ -#ifdef VA_START - va_list args; -#endif +/** Raise a complaint. That can be a fatal error, a complaint or just a + warning. */ - if (error_one_per_line) +static inline void +complains (const location *loc, warnings flags, const char *message, + va_list args) +{ + if (flags & complaint) { - 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; + error_message (loc, complaint, NULL, message, args); + complaint_issued = true; + } + else if (flags & fatal) + { + error_message (loc, fatal, _("fatal error"), message, args); + exit (EXIT_FAILURE); + } + else if (flags & Wyacc) + { + if (yacc_flag) + { + error_message (loc, flags, NULL, message, args); + complaint_issued = true; + } + else if (warnings_flag & Wyacc) + { + set_warning_issued (); + error_message (loc, flags, _("warning"), message, args); + } + } + else if (warnings_flag & flags) + { + set_warning_issued (); + error_message (loc, flags, _("warning"), message, args); } - - fflush (stdout); - 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); } - -/*-------------------------------------------------. -| A severe error has occurred, we cannot proceed. | -`-------------------------------------------------*/ void -#if defined VA_START && defined __STDC__ -fatal_at (location_t location, const char *message, ...) -#else -fatal (location, message, va_alist) - location_t location; - char *message; - va_dcl -#endif +complain (warnings flags, const char *message, ...) { -#ifdef VA_START va_list args; -#endif - - fflush (stdout); - LOCATION_PRINT (stderr, location); - fputs (": ", stderr); - fputs (_("fatal error: "), stderr); - -#ifdef VA_START - VA_START (args, message); - vfprintf (stderr, message, args); + va_start (args, message); + complains (NULL, flags, message, args); va_end (args); -#else - fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8); -#endif - putc ('\n', stderr); - fflush (stderr); - exit (1); } void -#if defined VA_START && defined __STDC__ -fatal (const char *message, ...) -#else -fatal (message, va_alist) - char *message; - va_dcl -#endif +complain_at (location loc, warnings flags, const char *message, ...) { -#ifdef VA_START va_list args; -#endif - - fflush (stdout); - fprintf (stderr, "%s: ", infile ? infile : program_name); + va_start (args, message); + complains (&loc, flags, message, args); + va_end (args); +} - fputs (_("fatal error: "), stderr); +void complain_at_indent (location loc, warnings flags, unsigned *indent, + const char *message, ...) +{ + indent_ptr = indent; -#ifdef VA_START - VA_START (args, message); - vfprintf (stderr, message, args); + va_list args; + va_start (args, message); + complains (&loc, flags, message, args); va_end (args); -#else - fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8); -#endif - putc ('\n', stderr); - fflush (stderr); - exit (1); +} + +/*--------------------------------. +| Report a warning, and proceed. | +`--------------------------------*/ + +void +set_warning_issued (void) +{ + static bool warning_issued = false; + if (!warning_issued && (warnings_flag & Werror)) + { + fprintf (stderr, "%s: warnings being treated as errors\n", program_name); + complaint_issued = true; + } + warning_issued = true; }