From 93d7dde97a383a41223a3f19e807bac758dcef5f Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" <joeldenny@joeldenny.org> Date: Wed, 4 Aug 2010 20:17:40 -0400 Subject: [PATCH] doc: fix -W and %expect documentation some. * NEWS (2.4.3): Mention that there are documentation fixes. * doc/bison.texinfo (Expect Decl): Make it clear that %expect turns conflicts into errors not warnings. (Shift/Reduce): Likewise. (Bison Options): Don't mention -Wsyntax. It doesn't exist. (cherry picked from commit 3ffdd5f1254fd9403a5a1d31dbdc5b2756c22775) --- ChangeLog | 9 +++++++++ NEWS | 2 ++ doc/bison.texinfo | 14 ++++++++------ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cf99430..e8e9171b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-08-04 Joel E. Denny <joeldenny@joeldenny.org> + + doc: fix -W and %expect documentation some. + * NEWS (2.4.3): Mention that there are documentation fixes. + * doc/bison.texinfo (Expect Decl): Make it clear that %expect + turns conflicts into errors not warnings. + (Shift/Reduce): Likewise. + (Bison Options): Don't mention -Wsyntax. It doesn't exist. + 2010-08-01 Joel E. Denny <joeldenny@joeldenny.org> -Werror: fix for rules useless in parser after conflicts. diff --git a/NEWS b/NEWS index 1f0c42c0..40c06f5b 100644 --- a/NEWS +++ b/NEWS @@ -299,6 +299,8 @@ Bison News errors in Bison 2.5. They will remain warnings, which should be sufficient for POSIX while avoiding backward compatibility issues. +** Minor documentation fixes. + * Changes in version 2.4.2 (2010-03-20): ** Some portability problems that resulted in failures and livelocks diff --git a/doc/bison.texinfo b/doc/bison.texinfo index d6e56a93..209bc5ce 100644 --- a/doc/bison.texinfo +++ b/doc/bison.texinfo @@ -4695,8 +4695,8 @@ number which Bison printed. With @acronym{GLR} parsers, add an @code{%expect-rr} declaration as well. @end itemize -Now Bison will warn you if you introduce an unexpected conflict, but -will keep silent otherwise. +Now Bison will report an error if you introduce an unexpected conflict, +but will keep silent otherwise. @node Start Decl @subsection The Start-Symbol @@ -6705,8 +6705,10 @@ This particular ambiguity was first encountered in the specifications of Algol 60 and is called the ``dangling @code{else}'' ambiguity. To avoid warnings from Bison about predictable, legitimate shift/reduce -conflicts, use the @code{%expect @var{n}} declaration. There will be no -warning as long as the number of shift/reduce conflicts is exactly @var{n}. +conflicts, use the @code{%expect @var{n}} declaration. +There will be no warning as long as the number of shift/reduce conflicts +is exactly @var{n}, and Bison will report an error if there is a +different number. @xref{Expect Decl, ,Suppressing Conflict Warnings}. The definition of @code{if_stmt} above is solely to blame for the @@ -8415,8 +8417,8 @@ Treat warnings as errors. @end table A category can be turned off by prefixing its name with @samp{no-}. For -instance, @option{-Wno-syntax} will hide the warnings about unused -variables. +instance, @option{-Wno-yacc} will hide the warnings about +@acronym{POSIX} Yacc incompatibilities. @end table @noindent -- 2.45.2