Add -Wconflicts-sr and -Wconflicts-rr.

[bison.git] / doc / bison.texinfo

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 9e366da4d9bccf5d017851d80fa986715f9db864..e0d5aa5b7a7d621377f06ce862166558926b5e05 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -7256,10 +7256,9 @@ never physically copied.  In our experience, the performance penalty of LAC
 has proven insignificant for practical grammars.
 @end itemize
 
-While the basic premise behind LAC has been recognized in the parser
-community for years, for the first publication that uses the term LAC and
-that discusses Bison's LAC implementation, @pxref{Bibliography,,Denny 2010
-May}.
+While the LAC algorithm shares techniques that have been recognized in the
+parser community for years, for the publication that introduces LAC,
+@pxref{Bibliography,,Denny 2010 May}.
 
 @node Unreachable States
 @subsection Unreachable States
@@ -8427,10 +8426,24 @@ These warnings are not enabled by default since they sometimes prove to
 be false alarms in existing grammars employing the Yacc constructs
 @code{$0} or @code{$-@var{n}} (where @var{n} is some positive integer).
 
-
 @item yacc
 Incompatibilities with POSIX Yacc.
 
+@item conflicts-sr
+@itemx conflicts-rr
+S/R and R/R conflicts.  These warnings are enabled by default.  However, if
+the @code{%expect} or @code{%expect-rr} directive is specified, an
+unexpected number of conflicts is an error, and an expected number of
+conflicts is not reported, so @option{-W} and @option{--warning} then have
+no effect on the conflict report.
+
+@item other
+All warnings not categorized above.  These warnings are enabled by default.
+
+This category is provided merely for the sake of completeness.  Future
+releases of Bison may move warnings from this category to new, more specific
+categories.
+
 @item all
 All the warnings.
 @item none