X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8ca1967ea2f09bccb26e94ae7c15f5919cab68e9..2dc8862bab59de5680c40d1d6f65d176ce1ed249:/src/complain.c
diff --git a/src/complain.c b/src/complain.c
index e14f40b6..fdc4b542 100644
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,10 +1,12 @@
/* Declaration for error-reporting function for Bison.
- Copyright (C) 2000, 2001, 2002 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-2013 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,162 +14,366 @@
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"
+#include
#include
-#if ! (HAVE_VPRINTF || defined vfprintf)
-# define vfprintf(stream, message, args) _doprnt (message, args, stream)
-#endif
+#include
#include "complain.h"
#include "files.h"
+#include "getargs.h"
+#include "quote.h"
-#ifndef _
-# define _(String) String
-#endif
-
-/* The calling program should define program_name and set it to the
- name of the executing program. */
-extern char *program_name;
-
-#if HAVE_STRERROR
-# ifndef HAVE_DECL_STRERROR
-"this configure-time declaration test was not run"
-# endif
-# if !HAVE_DECL_STRERROR && !defined strerror
-char *strerror (int);
-# endif
-#else
-static char *
-private_strerror (int errnum)
-{
- extern char *sys_errlist[];
- extern int sys_nerr;
+err_status complaint_status = status_none;
- if (errnum > 0 && errnum <= sys_nerr)
- return _(sys_errlist[errnum]);
- return _("Unknown system error");
-}
-# define strerror private_strerror
-#endif /* HAVE_STRERROR */
+bool warnings_are_errors = false;
-/* This variable is set each time `warn' is called. */
-bool warning_issued;
+/** Diagnostics severity. */
+typedef enum
+ {
+ severity_disabled = 0,
+ severity_unset = 1,
+ severity_warning = 2,
+ severity_error = 3,
+ severity_fatal = 4
+ } severity;
-/* This variable is set each time `complain' is called. */
-bool complaint_issued;
-
-/*--------------------------------.
-| Report a warning, and proceed. |
-`--------------------------------*/
+/** For each warning type, its severity. */
+static severity warnings_flag[warnings_size];
-void
-warn_at (location loc, const char *message, ...)
-{
- va_list args;
+static unsigned *indent_ptr = 0;
- location_print (stderr, loc);
- fputs (": ", stderr);
- fputs (_("warning: "), stderr);
+/*------------------------.
+| --warnings's handling. |
+`------------------------*/
- va_start (args, message);
- vfprintf (stderr, message, args);
- va_end (args);
+static const char * const warnings_args[] =
+{
+ "none",
+ "midrule-values",
+ "yacc",
+ "conflicts-sr",
+ "conflicts-rr",
+ "deprecated",
+ "empty-rule",
+ "precedence",
+ "other",
+ "all",
+ "error",
+ "everything",
+ 0
+};
+
+static const int warnings_types[] =
+{
+ Wnone,
+ Wmidrule_values,
+ Wyacc,
+ Wconflicts_sr,
+ Wconflicts_rr,
+ Wdeprecated,
+ Wempty_rule,
+ Wprecedence,
+ Wother,
+ Wall,
+ Werror,
+ Weverything
+};
+
+ARGMATCH_VERIFY (warnings_args, warnings_types);
- warning_issued = true;
- putc ('\n', stderr);
+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-everything, and -Wno-none == -Weverything. */
+ if (!value)
+ {
+ value = Weverything;
+ 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
-warn (const char *message, ...)
+warnings_argmatch (char *args)
{
- va_list 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=everything", 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);
+}
- fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: "));
- va_start (args, message);
- vfprintf (stderr, message, args);
- va_end (args);
+/*-----------.
+| complain. |
+`-----------*/
- warning_issued = true;
- putc ('\n', stderr);
+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);
}
-
-/*-----------------------------------------------------------.
-| An error has occurred, but we can proceed, and die later. |
-`-----------------------------------------------------------*/
-void
-complain_at (location loc, const char *message, ...)
+static severity
+warning_severity (warnings flags)
{
- va_list args;
+ 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;
+ }
+}
- location_print (stderr, loc);
- fputs (": ", stderr);
+bool
+warning_is_unset (warnings flags)
+{
+ size_t b;
+ for (b = 0; b < warnings_size; ++b)
+ if (flags & 1 << b && warnings_flag[b] != severity_unset)
+ return false;
+ return true;
+}
- va_start (args, message);
- vfprintf (stderr, message, args);
- va_end (args);
+/** Display a "[-Wyacc]" like message on \a f. */
- complaint_issued = true;
- putc ('\n', stderr);
+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,
+ * and the caller should print the remaining
+ * newline-terminated message to stderr.
+ * \param args the arguments of the format string.
+ */
+static
void
-complain (const char *message, ...)
+error_message (const location *loc, warnings flags, const char *prefix,
+ const char *message, va_list args)
{
- va_list args;
+ unsigned pos = 0;
+
+ if (loc)
+ pos += location_print (*loc, stderr);
+ else
+ 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", *indent_ptr - pos, "");
+ indent_ptr = 0;
+ }
+
+ if (prefix)
+ fprintf (stderr, "%s: ", prefix);
- fprintf (stderr, "%s: ", current_file ? current_file : program_name);
-
- va_start (args, message);
vfprintf (stderr, message, args);
- va_end (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 (loc && feature_flag & feature_caret && !(flags & no_caret))
+ location_caret (*loc, stderr);
+ }
+ }
+ fflush (stderr);
+}
+
+/** Raise a complaint. That can be a fatal error, an error or just a
+ warning. */
- complaint_issued = true;
- putc ('\n', stderr);
+static void
+complains (const location *loc, warnings flags, const char *message,
+ va_list args)
+{
+ severity s = warning_severity (flags);
+ if ((flags & complaint) && complaint_status < status_complaint)
+ complaint_status = status_complaint;
+
+ if (severity_warning <= s)
+ {
+ 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);
+ }
+
+ if (flags & fatal)
+ exit (EXIT_FAILURE);
}
-
-/*-------------------------------------------------.
-| A severe error has occurred, we cannot proceed. |
-`-------------------------------------------------*/
void
-fatal_at (location loc, const char *message, ...)
+complain (location const *loc, warnings flags, const char *message, ...)
{
va_list args;
-
- location_print (stderr, loc);
- fputs (": ", stderr);
- fputs (_("fatal error: "), stderr);
-
va_start (args, message);
- vfprintf (stderr, message, args);
+ complains (loc, flags, message, args);
va_end (args);
- putc ('\n', stderr);
- exit (EXIT_FAILURE);
}
void
-fatal (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);
+ va_end (args);
+}
- fprintf (stderr, "%s: ", current_file ? current_file : program_name);
+void
+complain_args (location const *loc, warnings w, unsigned *indent,
+ int argc, char *argv[])
+{
+ 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;
+ }
+}
- fputs (_("fatal error: "), stderr);
+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));
+}
- va_start (args, message);
- vfprintf (stderr, message, args);
- va_end (args);
- putc ('\n', stderr);
- exit (EXIT_FAILURE);
+void
+duplicate_directive (char const *directive,
+ location first, location second)
+{
+ unsigned i = 0;
+ complain (&second, complaint, _("only one %s allowed per rule"), directive);
+ i += SUB_INDENT;
+ complain_indent (&first, complaint, &i, _("previous declaration"));
}