/* Declaration for error-reporting function for Bison.
- Copyright (C) 2000-2002, 2004-2006, 2009-2012 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
#include "complain.h"
#include "files.h"
#include "getargs.h"
+#include "quote.h"
+
+err_status complaint_status = status_none;
+
+bool warnings_are_errors = false;
+severity warnings_flag[warnings_size];
-bool complaint_issued;
static unsigned *indent_ptr = 0;
-\f
+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,
*/
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)
{
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)
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); \
-}
-
+/** Raise a complaint. That can be a fatal error, an error or just a
+ warning. */
-/*--------------------------------.
-| Report a warning, and proceed. |
-`--------------------------------*/
-
-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, *indent ? NULL : _("warning"), message);
-}
-void
-warn (const char *message, ...)
-{
- if (!(warnings_flag & warnings_other))
- return;
- set_warning_issued ();
- ERROR_MESSAGE (NULL, _("warning"), message);
+ if (flags & fatal)
+ exit (EXIT_FAILURE);
}
-
-/*-----------------------------------------------------------.
-| 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, _("error"), 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, *indent ? NULL : _("error"), 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, _("error"), 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));
}
projects / bison.git / blobdiff