Currently "-Werror -Wno-error=foo" still turns "foo" warnings into errors.
Reported by Alexandre Duret-Lutz.
See http://lists.gnu.org/archive/html/bug-bison/2013-09/msg00015.html.
* src/complain.c (errority, errority_flag): New.
(complain_init): Initialize the latter.
(warning_argmatch): Extract the loop iterating on the flag's bits.
Set and unset errority_flag here.
(warnings_argmatch): -Wno-error is not the same as -Wno-error=everything:
we must remember if category foo was explicitly turned in an error/warning
via -W(no-)error=foo.
(warning_severity): Use errority_flag.
* tests/input.at (Symbols): Just check --yacc, not -Wyacc, that's the
job of tests on -W.
(-Werror is not affected by -Wnone and -Wall): Rename as...
(-Werror combinations): this.
Tests more combinations of -W, -W(no-)error, and -W(no-)error=foo.
* tests/local.at (AT_BISON_CHECK_WARNINGS): Don't expect -Werror
to turn runs that issue warnings into runs with errors, as the
warnings might be enforced as warnings by -Wno-error=foo, in which
case -Werror does not change anything.
* doc/bison.texi (Bison Options): Try to be clearer about how
-W(no-)error and -W(no-)error=foo interact.
- Portability issues in the test suite.
+*** Portability issues in the test suite.
+
+*** Fixes of the -Werror option
+
+ Options such as "-Werror -Wno-error=foo" were still turning "foo"
+ diagnostics into errors instead of warnings. This is fixed.
+
+ Actually, for consistency with GCC, "-Wno-error=foo -Werror" now also
+ leaves "foo" diagnostics as warnings. Similarly, with "-Werror=foo
+ -Wno-error", "foo" diagnostics are now errors.
* Noteworthy changes in release 3.0 (2013-07-25) [stable]
* Noteworthy changes in release 3.0 (2013-07-25) [stable]
instance, @option{-Wno-yacc} will hide the warnings about
POSIX Yacc incompatibilities.
instance, @option{-Wno-yacc} will hide the warnings about
POSIX Yacc incompatibilities.
-@item -Werror[=@var{category}]
-@itemx -Wno-error[=@var{category}]
-Enable warnings falling in @var{category}, and treat them as errors. If no
-@var{category} is given, it defaults to making all enabled warnings into errors.
+@item -Werror
+Turn enabled warnings for every @var{category} into errors, unless they are
+explicitly disabled by @option{-Wno-error=@var{category}}.
+
+@item -Werror=@var{category}
+Enable warnings falling in @var{category}, and treat them as errors.
@var{category} is the same as for @option{--warnings}, with the exception that
it may not be prefixed with @samp{no-} (see above).
@var{category} is the same as for @option{--warnings}, with the exception that
it may not be prefixed with @samp{no-} (see above).
-Prefixed with @samp{no}, it deactivates the error treatment for this
-@var{category}. However, the warning itself won't be disabled, or enabled, by
-this option.
-
Note that the precedence of the @samp{=} and @samp{,} operators is such that
the following commands are @emph{not} equivalent, as the first will not treat
S/R conflicts as errors.
Note that the precedence of the @samp{=} and @samp{,} operators is such that
the following commands are @emph{not} equivalent, as the first will not treat
S/R conflicts as errors.
$ bison -Werror=yacc,error=conflicts-sr input.y
@end example
$ bison -Werror=yacc,error=conflicts-sr input.y
@end example
+@item -Wno-error
+Do not turn enabled warnings for every @var{category} into errors, unless
+they are explicitly enabled by @option{-Werror=@var{category}}.
+
+@item -Wno-error=@var{category}
+Deactivate the error treatment for this @var{category}. However, the warning
+itself won't be disabled, or enabled, by this option.
+
@item -f [@var{feature}]
@itemx --feature[=@var{feature}]
Activate miscellaneous @var{feature}. @var{feature} can be one of:
@item -f [@var{feature}]
@itemx --feature[=@var{feature}]
Activate miscellaneous @var{feature}. @var{feature} can be one of:
bool warnings_are_errors = false;
bool warnings_are_errors = false;
+/** Whether -Werror/-Wno-error was applied to a warning. */
+typedef enum
+ {
+ errority_unset = 0, /** No explict status. */
+ errority_disabled = 1, /** Explictly disabled with -Wno-error=foo. */
+ errority_enabled = 2 /** Explictly enabled with -Werror=foo. */
+ } errority;
+
+/** For each warning type, its errority. */
+static errority errority_flag[warnings_size];
+
/** Diagnostics severity. */
typedef enum
{
/** Diagnostics severity. */
typedef enum
{
- if (no)
- {
- size_t b;
- for (b = 0; b < warnings_size; ++b)
- if (value & 1 << b)
+ size_t b;
+ for (b = 0; b < warnings_size; ++b)
+ if (value & 1 << b)
+ {
+ if (err && no)
+ /* -Wno-error=foo. */
+ errority_flag[b] = errority_disabled;
+ else if (err && !no)
- 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;
+ /* -Werror=foo: enables -Wfoo. */
+ errority_flag[b] = errority_enabled;
+ warnings_flag[b] = severity_warning;
- }
- 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;
- }
+ else if (no)
+ /* -Wno-foo. */
+ warnings_flag[b] = severity_disabled;
+ else
+ /* -Wfoo. */
+ warnings_flag[b] = severity_warning;
+ }
}
/** Decode a comma-separated list of arguments from -W.
}
/** Decode a comma-separated list of arguments from -W.
if (STREQ (args, "error"))
warnings_are_errors = true;
else if (STREQ (args, "no-error"))
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);
- }
+ warnings_are_errors = false;
else
{
// The length of the possible 'no-' prefix: 3, or 0.
else
{
// The length of the possible 'no-' prefix: 3, or 0.
size_t b;
for (b = 0; b < warnings_size; ++b)
size_t b;
for (b = 0; b < warnings_size; ++b)
- warnings_flag[b] = (1 << b & warnings_default
- ? severity_warning
- : severity_unset);
+ {
+ warnings_flag[b] = (1 << b & warnings_default
+ ? severity_warning
+ : severity_unset);
+ errority_flag[b] = errority_unset;
+ }
+
+/* A diagnostic with FLAGS is about to be issued. With what severity?
+ (severity_fatal, severity_error, severity_disabled, or
+ severity_warning.) */
+
static severity
warning_severity (warnings flags)
{
if (flags & fatal)
static severity
warning_severity (warnings flags)
{
if (flags & fatal)
+ /* Diagnostics about fatal errors. */
return severity_fatal;
else if (flags & complaint)
return severity_fatal;
else if (flags & complaint)
+ /* Diagnostics about errors. */
return severity_error;
else
{
return severity_error;
else
{
+ /* Diagnostics about warnings. */
severity res = severity_disabled;
size_t b;
for (b = 0; b < warnings_size; ++b)
if (flags & 1 << b)
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;
+ {
+ res = res < warnings_flag[b] ? warnings_flag[b] : res;
+ /* If the diagnostic is enabled, and -Werror is enabled,
+ and -Wno-error=foo was not explicitly requested, this
+ is an error. */
+ if (res == severity_warning
+ && (errority_flag[b] == errority_enabled
+ || (warnings_are_errors
+ && errority_flag[b] != errority_disabled)))
+ res = severity_error;
+ }
AT_BISON_OPTION_POPDEFS
# POSIX Yacc accept periods, but not dashes.
AT_BISON_OPTION_POPDEFS
# POSIX Yacc accept periods, but not dashes.
-AT_BISON_CHECK([--yacc -Wno-error input.y], [], [],
-[[input.y:9.8-16: warning: POSIX Yacc forbids dashes in symbol names: WITH-DASH [-Wyacc]
-input.y:20.8-16: warning: POSIX Yacc forbids dashes in symbol names: with-dash [-Wyacc]
-]])
-
-# So warn about them.
-AT_BISON_CHECK([-Wyacc input.y], [], [],
-[[input.y:9.8-16: warning: POSIX Yacc forbids dashes in symbol names: WITH-DASH [-Wyacc]
-input.y:20.8-16: warning: POSIX Yacc forbids dashes in symbol names: with-dash [-Wyacc]
+AT_BISON_CHECK([--yacc input.y], [1], [],
+[[input.y:9.8-16: error: POSIX Yacc forbids dashes in symbol names: WITH-DASH [-Werror=yacc]
+input.y:20.8-16: error: POSIX Yacc forbids dashes in symbol names: with-dash [-Werror=yacc]
]])
# Dashes are fine for GNU Bison.
]])
# Dashes are fine for GNU Bison.
-## --------------------------------------------- ##
-## -Werror is not affected by -Wnone and -Wall. ##
-## --------------------------------------------- ##
+## ---------------------- ##
+## -Werror combinations. ##
+## ---------------------- ##
-AT_SETUP([[-Werror is not affected by -Wnone and -Wall]])
+AT_SETUP([[-Werror combinations]])
AT_DATA([[input.y]],
[[%%
AT_DATA([[input.y]],
[[%%
[[input.y:2.15: error: stray '$' [-Werror=other]
]])
[[input.y:2.15: error: stray '$' [-Werror=other]
]])
+# Check that -Wno-error keeps warnings enabled, but non fatal.
+AT_BISON_CHECK([[-Werror -Wno-error=other input.y]], [[0]], [[]],
+[[input.y:2.15: warning: stray '$' [-Wother]
+]])
+
+AT_BISON_CHECK([[-Wno-error=other -Werror input.y]], [[0]], [[]],
+[[input.y:2.15: warning: stray '$' [-Wother]
+]])
+
+AT_BISON_CHECK([[-Werror=other -Wno-other input.y]], [[0]], [[]],
+[[]])
+
# ----------------------------------------------------------
# Check that warnings (if some are expected) are correctly
# turned into errors with -Werror, etc.
# ----------------------------------------------------------
# Check that warnings (if some are expected) are correctly
# turned into errors with -Werror, etc.
+#
+# When -Wno-error is used, the rules are really different, don't try.
m4_define([AT_BISON_CHECK_WARNINGS],
[m4_if(m4_bregexp([$4], [: warning: ]), [-1], [],
m4_define([AT_BISON_CHECK_WARNINGS],
[m4_if(m4_bregexp([$4], [: warning: ]), [-1], [],
- [m4_null_if([$2], [AT_BISON_CHECK_WARNINGS_($@)])])])
+ m4_bregexp([$1], [-Wno-error=]), [-1],
+ [m4_null_if([$2], [AT_BISON_CHECK_WARNINGS_($@)])])])
m4_define([AT_BISON_CHECK_WARNINGS_],
[[# Defining POSIXLY_CORRECT causes bison to complain if options are
m4_define([AT_BISON_CHECK_WARNINGS_],
[[# Defining POSIXLY_CORRECT causes bison to complain if options are
projects / bison.git / commitdiff
