Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-14 14:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

lr.default-reductions: rename "all" value to "full".

Browse Source 
States that shift the error token do not have default reductions,
and GLR disables some default reductions, so "all" was a misnomer.
* doc/bison.texinfo (%define Summary): Update.
(Default Reductions): Update.
* src/print.c (print_reductions): Update.
* src/reader.c (prepare_percent_define_front_end_variables):
Update.
* src/tables.c (action_row): Update.
* tests/input.at (%define enum variables): Update.
* tests/reduce.at (%define lr.default-reductions): Update.
This commit is contained in:
Joel E. Denny
2011-03-06 12:46:27 -05:00
parent 6f04ee6c78
commit d815ec4a62
7 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/input.at
View File

@@ -1034,7 +1034,7 @@ start: ;
]])
AT_BISON_CHECK([[input.y]], [[1]], [[]],
[[input.y:1.9-29: invalid value for %define variable `lr.default-reductions': `bogus'
input.y:1.9-29: accepted value: `all'
input.y:1.9-29: accepted value: `full'
input.y:1.9-29: accepted value: `consistent'
input.y:1.9-29: accepted value: `accepting'
]])

13
tests/reduce.at
View File

@@ -1451,12 +1451,12 @@ dnl PARSER-EXIT-VALUE, PARSER-STDOUT, PARSER-STDERR
m4_define([AT_TEST_LR_DEFAULT_REDUCTIONS],
[
AT_TEST_TABLES_AND_PARSE([[no %define lr.default-reductions]],
[[all]], [[]],
[[full]], [[]],
[[]],
[$1], [$2], [[]], [$3])
AT_TEST_TABLES_AND_PARSE([[%define lr.default-reductions all]],
[[all]], [[]],
[[%define lr.default-reductions all]],
AT_TEST_TABLES_AND_PARSE([[%define lr.default-reductions full]],
[[full]], [[]],
[[%define lr.default-reductions full]],
[$1], [$2], [[]], [$3])
AT_TEST_TABLES_AND_PARSE([[%define lr.default-reductions consistent]],
[[consistent]], [[]],
@@ -1529,7 +1529,7 @@ state 3
2 | a . b 'a'
3 | a . c 'b'
5 b: . [$end, 'a']
6 c: . ['b']]AT_COND_CASE([[all]], [[
6 c: . ['b']]AT_COND_CASE([[full]], [[
'b' reduce using rule 6 (c)
$default reduce using rule 5 (b)]], [[
@@ -1556,7 +1556,8 @@ state 5
'a' shift, and go to state 7
]AT_COND_CASE([[all]], [[$default]], [[$end]])[ reduce using rule 1 (start)
]AT_COND_CASE([[full]], [[$default]],
[[$end]])[ reduce using rule 1 (start)
state 6