* src/parse-gram.y: Define PERCENT_EXPECT_RR.
authorPaul Hilfinger <Hilfinger@CS.Berkeley.EDU>
Fri, 26 Mar 2004 22:41:16 +0000 (22:41 +0000)
committerPaul Hilfinger <Hilfinger@CS.Berkeley.EDU>
Fri, 26 Mar 2004 22:41:16 +0000 (22:41 +0000)
commitd63282419d27320c40be57d46418a0b44691626c
tree297b056008f97300f98a48d6a030aa9d11787b21
parent1452af69b4f4d2aeabf50918e9b6039cc809b988
* src/parse-gram.y: Define PERCENT_EXPECT_RR.
(declaration): Replace expected_conflicts with expected_sr_conflicts.
Add %expect-rr rule.

* src/scan-gram.l: Recognize %expect-rr.

* src/conflicts.h (expected_sr_conflicts): Rename from
expected_conflicts.
(expected_rr_conflicts): Declare.

* src/conflicts.c (expected_sr_conflicts): Rename from
expected_conflicts.
(expected_rr_conflicts): Define.
(conflicts_print): Check r/r conflicts against expected_rr_conflicts
for GLR parsers.
Use expected_sr_conflicts in place of expected_conflicts.
Warn if expected_rr_conflicts used in non-GLR parser.

* doc/bison.texinfo: Add documentation for %expect-rr.
ChangeLog
doc/bison.texinfo
src/conflicts.c
src/conflicts.h
src/parse-gram.c
src/parse-gram.h
src/parse-gram.y
src/scan-gram.l