X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2bfcac9a2be3778d9ee6915f1e615f7daaf10880..6c05543cb03b40b9728f7073c4073ce993d796c6:/src/complain.c diff --git a/src/complain.c b/src/complain.c index 22ad4248..d79a2502 100644 --- a/src/complain.c +++ b/src/complain.c @@ -1,7 +1,7 @@ /* Declaration for error-reporting function for Bison. - Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2009, 2010 Free - Software Foundation, Inc. + 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 @@ -23,20 +23,51 @@ #include "system.h" #include +#include #include "complain.h" #include "files.h" #include "getargs.h" +warnings warnings_flag = + Wconflicts_sr | Wconflicts_rr | Wdeprecated | Wother; + bool complaint_issued; static unsigned *indent_ptr = 0; - +void +warnings_print_categories (warnings warn_flags) +{ + if (! (warn_flags & silent)) + { + char const *warn_names[] = + { + "midrule-values", + "yacc", + "conflicts-sr", + "conflicts-rr", + "deprecated", + "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, "]"); + } +} /** 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, @@ -46,10 +77,10 @@ static unsigned *indent_ptr = 0; */ static void -error_message (location *loc, - const char *prefix, - const char *message, va_list args) +error_message (const location *loc, warnings flags, const char *prefix, + const char *message, va_list args) { + (void) flags; unsigned pos = 0; if (loc) @@ -71,128 +102,95 @@ error_message (location *loc, fprintf (stderr, "%s: ", prefix); vfprintf (stderr, message, args); + warnings_print_categories (flags); { size_t l = strlen (message); - if (l < 2 || message[l-2] != ':' || message[l-1] != ' ') { - putc ('\n', stderr); - fflush (stderr); - } + if (l < 2 || message[l-2] != ':' || message[l-1] != ' ') + { + putc ('\n', stderr); + fflush (stderr); + } } } -/** Wrap error_message() with varargs handling. */ -#define ERROR_MESSAGE(Loc, Prefix, Message) \ -{ \ - va_list args; \ - va_start (args, Message); \ - error_message (Loc, Prefix, Message, args); \ - va_end (args); \ -} +/** Raise a complaint. That can be a fatal error, a complaint or just a + warning. */ - -/*--------------------------------. -| Report a warning, and proceed. | -`--------------------------------*/ - -static void -set_warning_issued (void) +static inline void +complains (const location *loc, warnings flags, const char *message, + va_list args) { - static bool warning_issued = false; - if (!warning_issued && (warnings_flag & warnings_error)) + if (flags & complaint) { - fprintf (stderr, "%s: warnings being treated as errors\n", program_name); + error_message (loc, complaint, NULL, message, args); complaint_issued = true; } - warning_issued = true; -} - -void -warn_at (location loc, const char *message, ...) -{ - set_warning_issued (); - ERROR_MESSAGE (&loc, _("warning"), message); -} - -void -warn_at_indent (location loc, unsigned *indent, - const char *message, ...) -{ - set_warning_issued (); - indent_ptr = indent; - ERROR_MESSAGE (&loc, _("warning"), message); + 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); + } } void -warn (const char *message, ...) +complain (warnings flags, const char *message, ...) { - set_warning_issued (); - ERROR_MESSAGE (NULL, _("warning"), message); + va_list args; + va_start (args, message); + complains (NULL, flags, message, args); + va_end (args); } - -/*-----------------------------------------------------------. -| An error has occurred, but we can proceed, and die later. | -`-----------------------------------------------------------*/ - void -complain_at (location loc, const char *message, ...) +complain_at (location loc, warnings flags, const char *message, ...) { - ERROR_MESSAGE (&loc, NULL, message); - complaint_issued = true; + va_list args; + va_start (args, message); + complains (&loc, flags, message, args); + va_end (args); } -void -complain_at_indent (location loc, unsigned *indent, - const char *message, ...) +void complain_at_indent (location loc, warnings flags, unsigned *indent, + const char *message, ...) { indent_ptr = indent; - ERROR_MESSAGE (&loc, NULL, message); - complaint_issued = true; -} -void -complain (const char *message, ...) -{ - ERROR_MESSAGE (NULL, NULL, message); - complaint_issued = true; + va_list args; + va_start (args, message); + complains (&loc, flags, message, args); + va_end (args); } - -/*--------------------------------------------------------------. -| An incompatibility with POSIX Yacc: mapped either to warn* or | -| complain* depending on yacc_flag. | -`--------------------------------------------------------------*/ +/*--------------------------------. +| Report a warning, and proceed. | +`--------------------------------*/ void -yacc_at (location loc, const char *message, ...) +set_warning_issued (void) { - if (yacc_flag) + static bool warning_issued = false; + if (!warning_issued && (warnings_flag & Werror)) { - ERROR_MESSAGE (&loc, NULL, message); + fprintf (stderr, "%s: warnings being treated as errors\n", program_name); complaint_issued = true; } - else if (warnings_flag & warnings_yacc) - { - set_warning_issued (); - ERROR_MESSAGE (&loc, _("warning"), message); - } -} - - -/*-------------------------------------------------. -| A severe error has occurred, we cannot proceed. | -`-------------------------------------------------*/ - -void -fatal_at (location loc, const char *message, ...) -{ - ERROR_MESSAGE (&loc, _("fatal error"), message); - exit (EXIT_FAILURE); -} - -void -fatal (const char *message, ...) -{ - ERROR_MESSAGE (NULL, _("fatal error"), message); - exit (EXIT_FAILURE); + warning_issued = true; }