X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e9690142325711b320ef444768fdd40a087d02f7..12bc1c9e47a5c043e1d2bba599846732b93d062c:/src/complain.c?ds=sidebyside diff --git a/src/complain.c b/src/complain.c index fdf773ee..1162da29 100644 --- a/src/complain.c +++ b/src/complain.c @@ -1,6 +1,6 @@ /* Declaration for error-reporting function for Bison. - Copyright (C) 2000-2002, 2004-2006, 2009-2011 Free Software + Copyright (C) 2000-2002, 2004-2006, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -22,21 +22,202 @@ #include #include "system.h" +#include #include +#include #include "complain.h" #include "files.h" #include "getargs.h" +#include "quote.h" + +err_status complaint_status = status_none; + +bool warnings_are_errors = false; + +/** Diagnostics severity. */ +typedef enum + { + severity_disabled = 0, + severity_unset = 1, + severity_warning = 2, + severity_error = 3, + severity_fatal = 4 + } severity; + + +/** For each warning type, its severity. */ +static severity warnings_flag[warnings_size]; -bool complaint_issued; static unsigned *indent_ptr = 0; - +/*------------------------. +| --warnings's handling. | +`------------------------*/ + +static const char * const warnings_args[] = +{ + "none", + "midrule-values", + "yacc", + "conflicts-sr", + "conflicts-rr", + "deprecated", + "precedence", + "other", + "all", + "error", + 0 +}; + +static const int warnings_types[] = +{ + Wnone, + Wmidrule_values, + Wyacc, + Wconflicts_sr, + Wconflicts_rr, + Wdeprecated, + Wprecedence, + Wother, + Wall, + Werror +}; + +ARGMATCH_VERIFY (warnings_args, warnings_types); + +void +warning_argmatch (char const *arg, size_t no, size_t err) +{ + int value = XARGMATCH ("--warning", arg + no + err, + warnings_args, warnings_types); + + /* -Wnone == -Wno-all, and -Wno-none == -Wall. */ + if (!value) + { + value = Wall; + no = !no; + } + + if (no) + { + size_t b; + for (b = 0; b < warnings_size; ++b) + if (value & 1 << b) + { + if (err) + { + /* -Wno-error=foo: if foo enabled as an error, + make it a warning. */ + if (warnings_flag[b] == severity_error) + warnings_flag[b] = severity_warning; + } + else + /* -Wno-foo. */ + warnings_flag[b] = severity_disabled; + } + } + else + { + size_t b; + for (b = 0; b < warnings_size; ++b) + if (value & 1 << b) + /* -Wfoo and -Werror=foo. */ + warnings_flag[b] = err ? severity_error : severity_warning; + } +} + +/** Decode a comma-separated list of arguments from -W. + * + * \param args comma separated list of effective subarguments to decode. + * If 0, then activate all the flags. + */ + +void +warnings_argmatch (char *args) +{ + if (args) + for (args = strtok (args, ","); args; args = strtok (NULL, ",")) + if (STREQ (args, "error")) + warnings_are_errors = true; + else if (STREQ (args, "no-error")) + { + warnings_are_errors = false; + warning_argmatch ("no-error=all", 3, 6); + } + else + { + size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0; + size_t err = STRPREFIX_LIT ("error=", args + no) ? 6 : 0; + + warning_argmatch (args, no, err); + } + else + warning_argmatch ("all", 0, 0); +} + + +/*-----------. +| complain. | +`-----------*/ + +void +complain_init (void) +{ + warnings warnings_default = + Wconflicts_sr | Wconflicts_rr | Wdeprecated | Wother; + + size_t b; + for (b = 0; b < warnings_size; ++b) + warnings_flag[b] = (1 << b & warnings_default + ? severity_warning + : severity_unset); +} + +static severity +warning_severity (warnings flags) +{ + if (flags & fatal) + return severity_fatal; + else if (flags & complaint) + return severity_error; + else + { + severity res = severity_disabled; + size_t b; + for (b = 0; b < warnings_size; ++b) + if (flags & 1 << b) + res = res < warnings_flag[b] ? warnings_flag[b] : res; + if (res == severity_warning && warnings_are_errors) + res = severity_error; + return res; + } +} + + +/** Display a "[-Wyacc]" like message on \a f. */ + +static void +warnings_print_categories (warnings warn_flags, FILE *f) +{ + /* Display only the first match, the second is "-Wall". */ + size_t i; + for (i = 0; warnings_args[i]; ++i) + if (warn_flags & warnings_types[i]) + { + severity s = warning_severity (warnings_types[i]); + fprintf (f, " [-W%s%s]", + s == severity_error ? "error=" : "", + warnings_args[i]); + return; + } +} /** 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,20 +227,21 @@ static unsigned *indent_ptr = 0; */ static void -error_message (location *loc, - const char *prefix, +error_message (const location *loc, warnings flags, const char *prefix, const char *message, va_list args) { unsigned pos = 0; if (loc) - pos += location_print (stderr, *loc); + pos += location_print (*loc, stderr); else - pos += fprintf(stderr, "%s", current_file ? current_file : program_name); - pos += fprintf(stderr, ": "); + pos += fprintf (stderr, "%s", current_file ? current_file : program_name); + pos += fprintf (stderr, ": "); if (indent_ptr) { + if (*indent_ptr) + prefix = NULL; if (!*indent_ptr) *indent_ptr = pos; else if (*indent_ptr > pos) @@ -71,142 +253,104 @@ error_message (location *loc, fprintf (stderr, "%s: ", prefix); vfprintf (stderr, message, args); + if (! (flags & silent)) + warnings_print_categories (flags, stderr); { 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); + if (loc && feature_flag & feature_caret && !(flags & no_caret)) + location_caret (*loc, 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); \ -} - - -/*--------------------------------. -| Report a warning, and proceed. | -`--------------------------------*/ +/** Raise a complaint. That can be a fatal error, an error or just a + warning. */ -void -set_warning_issued (void) +static 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)) + severity s = warning_severity (flags); + if ((flags & complaint) && complaint_status < status_complaint) + complaint_status = status_complaint; + + if (severity_warning <= s) { - fprintf (stderr, "%s: warnings being treated as errors\n", program_name); - complaint_issued = true; + const char* prefix = + s == severity_fatal ? _("fatal error") + : s == severity_error ? _("error") + : _("warning"); + if (severity_error <= s && ! complaint_status) + complaint_status = status_warning_as_error; + error_message (loc, flags, prefix, message, args); } - warning_issued = true; -} - -void -warn_at (location loc, const char *message, ...) -{ - if (!(warnings_flag & warnings_other)) - return; - set_warning_issued (); - ERROR_MESSAGE (&loc, _("warning"), message); -} -void -warn_at_indent (location loc, unsigned *indent, - const char *message, ...) -{ - if (!(warnings_flag & warnings_other)) - return; - set_warning_issued (); - indent_ptr = indent; - ERROR_MESSAGE (&loc, _("warning"), message); + if (flags & fatal) + exit (EXIT_FAILURE); } void -warn (const char *message, ...) -{ - if (!(warnings_flag & warnings_other)) - return; - set_warning_issued (); - ERROR_MESSAGE (NULL, _("warning"), message); -} - - -/*-----------------------------------------------------------. -| An error has occurred, but we can proceed, and die later. | -`-----------------------------------------------------------*/ - -void -complain_at (location loc, const char *message, ...) +complain (location const *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, ...) +complain_indent (location const *loc, warnings flags, unsigned *indent, + const char *message, ...) { + va_list args; indent_ptr = indent; - ERROR_MESSAGE (&loc, NULL, message); - complaint_issued = true; + va_start (args, message); + complains (loc, flags, message, args); + va_end (args); } void -complain (const char *message, ...) +complain_args (location const *loc, warnings w, unsigned *indent, + int argc, char *argv[]) { - ERROR_MESSAGE (NULL, NULL, message); - complaint_issued = true; -} - - -/*--------------------------------------------------------------. -| An incompatibility with POSIX Yacc: mapped either to warn* or | -| complain* depending on yacc_flag. | -`--------------------------------------------------------------*/ - -void -yacc_at (location loc, const char *message, ...) -{ - if (yacc_flag) - { - ERROR_MESSAGE (&loc, NULL, message); - complaint_issued = true; - } - else if (warnings_flag & warnings_yacc) - { - set_warning_issued (); - ERROR_MESSAGE (&loc, _("warning"), message); - } -} - -void -midrule_value_at (location loc, const char *message, ...) -{ - if (!(warnings_flag & warnings_midrule_values)) - return; - 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); + switch (argc) + { + case 1: + complain_indent (loc, w, indent, "%s", _(argv[0])); + break; + case 2: + complain_indent (loc, w, indent, _(argv[0]), argv[1]); + break; + case 3: + complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2]); + break; + case 4: + complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2], argv[3]); + break; + case 5: + complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2], argv[3], + argv[4]); + break; + default: + complain (loc, fatal, "too many arguments for complains"); + break; + } } void -fatal (const char *message, ...) +deprecated_directive (location const *loc, char const *old, char const *upd) { - ERROR_MESSAGE (NULL, _("fatal error"), message); - exit (EXIT_FAILURE); + if (feature_flag & feature_caret) + complain (loc, Wdeprecated, + _("deprecated directive, use %s"), + quote_n (1, upd)); + else + complain (loc, Wdeprecated, + _("deprecated directive: %s, use %s"), + quote (old), quote_n (1, upd)); }