diff options
| author | Joel E. Denny <joeldenny@joeldenny.org> | 2011-03-06 12:46:27 -0500 |
|---|---|---|
| committer | Joel E. Denny <joeldenny@joeldenny.org> | 2011-03-06 16:42:39 -0500 |
| commit | 32493bc84db0c69e6e1d9d5c5c7505ab4f698f7b (patch) | |
| tree | 51f28c1097538715881548b5dbaa88521a31432e /tests/reduce.at | |
| parent | 7fceb615a5c1a2a9445ac85faa0a2a1618b5ab54 (diff) | |
| download | bison-32493bc84db0c69e6e1d9d5c5c7505ab4f698f7b.tar.gz | |
lr.default-reductions: rename "all" value to "full".
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.
(cherry picked from commit d815ec4a6290e18fac9220438622f6dd27b3227f)
Diffstat (limited to 'tests/reduce.at')
| -rw-r--r-- | tests/reduce.at | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/reduce.at b/tests/reduce.at index 65ccf16d..ad4d329b 100644 --- a/tests/reduce.at +++ b/tests/reduce.at @@ -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 |