diff options
| author | Paul Hilfinger <Hilfinger@CS.Berkeley.EDU> | 2004-03-26 22:41:16 +0000 |
|---|---|---|
| committer | Paul Hilfinger <Hilfinger@CS.Berkeley.EDU> | 2004-03-26 22:41:16 +0000 |
| commit | d63282419d27320c40be57d46418a0b44691626c (patch) | |
| tree | 297b056008f97300f98a48d6a030aa9d11787b21 /src/conflicts.h | |
| parent | 1452af69b4f4d2aeabf50918e9b6039cc809b988 (diff) | |
| download | bison-d63282419d27320c40be57d46418a0b44691626c.tar.gz | |
* 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.
Diffstat (limited to 'src/conflicts.h')
| -rw-r--r-- | src/conflicts.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/conflicts.h b/src/conflicts.h index 234283a4..50b785e6 100644 --- a/src/conflicts.h +++ b/src/conflicts.h @@ -29,5 +29,6 @@ void conflicts_output (FILE *out); void conflicts_free (void); /* Were there conflicts? */ -extern int expected_conflicts; +extern int expected_sr_conflicts; +extern int expected_rr_conflicts; #endif /* !CONFLICTS_H_ */ |