/* 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"
-warnings warnings_flag =
- Wconflicts_sr | Wconflicts_rr | Wdeprecated | Wother;
+err_status complaint_status = status_none;
-warnings errors_flag;
+bool warnings_are_errors = false;
+severity warnings_flag[warnings_size];
-bool complaint_issued;
static unsigned *indent_ptr = 0;
void
-warnings_print_categories (warnings warn_flags)
+complain_init (void)
{
- if (! (warn_flags & silent))
+ 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
{
- 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)
- {
- bool err = warn_flags & errors_flag;
- fprintf (stderr, "%s-W", any ? ", " : " [");
- fprintf (stderr, "%s%s", err ? "error=" : "" , warn_names[i]);
- any = true;
- }
- if (any)
- fprintf (stderr, "]");
+ 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,
error_message (const location *loc, warnings flags, const char *prefix,
const char *message, va_list args)
{
- (void) flags;
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);
- warnings_print_categories (flags);
+ if (! (flags & silent))
+ warnings_print_categories (flags, stderr);
{
size_t l = strlen (message);
- if (l < 2 || message[l-2] != ':' || message[l-1] != ' ')
+ 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);
}
-/** Raise a complaint. That can be a fatal error, a complaint or just a
+/** Raise a complaint. That can be a fatal error, an error or just a
warning. */
-static inline void
+static void
complains (const location *loc, warnings flags, const char *message,
va_list args)
-
{
- if (flags & fatal)
- {
- error_message (loc, fatal, _("fatal error"), message, args);
- exit (EXIT_FAILURE);
- }
- else if (flags & (complaint | warnings_flag))
+ severity s = warning_severity (flags);
+ if ((flags & complaint) && complaint_status < status_complaint)
+ complaint_status = status_complaint;
+
+ if (severity_warning <= s)
{
const char* prefix =
- flags & (errors_flag | complaint) ? _("error") : _("warning");
- if (flags & (complaint | errors_flag))
- complaint_issued = true;
- error_message (loc, flags,
- indent_ptr && *indent_ptr ? NULL : prefix,
- message, args);
+ 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);
}
+
+ if (flags & fatal)
+ exit (EXIT_FAILURE);
}
void
-complain (warnings flags, const char *message, ...)
+complain (location const *loc, warnings flags, const char *message, ...)
{
va_list args;
va_start (args, message);
- complains (NULL, flags, message, args);
+ complains (loc, flags, message, args);
va_end (args);
}
void
-complain_at (location loc, warnings flags, const char *message, ...)
+complain_indent (location const *loc, warnings flags, unsigned *indent,
+ const char *message, ...)
{
va_list args;
+ indent_ptr = indent;
va_start (args, message);
- complains (&loc, flags, message, args);
+ complains (loc, flags, message, args);
va_end (args);
}
-void complain_at_indent (location loc, warnings flags, unsigned *indent,
- const char *message, ...)
+void
+complain_args (location const *loc, warnings w, unsigned *indent,
+ int argc, char *argv[])
{
- indent_ptr = indent;
+ 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;
+ }
+}
- va_list args;
- va_start (args, message);
- complains (&loc, flags, message, args);
- va_end (args);
+void
+deprecated_directive (location const *loc, char const *old, char const *upd)
+{
+ 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