diff options
author | Joel E. Denny <jdenny@ces.clemson.edu> | 2009-04-23 03:18:03 -0400 |
---|---|---|
committer | Joel E. Denny <jdenny@ces.clemson.edu> | 2009-04-23 04:29:25 -0400 |
commit | 620b5727730997767040a023463ce952a0d15ee9 (patch) | |
tree | a990189bbb6ea44f32a156d818e5741ceafe24c2 /src/print.c | |
parent | 34a6c2d19b85d4650b2d90f60b76d44071d167d1 (diff) | |
download | bison-620b5727730997767040a023463ce952a0d15ee9.tar.gz |
Rename "default rule" to "default reduction".
This includes changing variable names in code, changing
comments, and renaming %define lr.default_rules to %define
lr.default_reductions.
* NEWS (2.5): Update IELR documentation.
* data/glr.c, data/lalr1.cc, data/lalr1.java, data/yacc.c:
Adjust YYDEFACT and yydefact_ documentation.
* doc/bison.texinfo (Decl Summary): Adjust lr.default_reductions
and lr.type documentation. Make some other wording
improvements.
(Glossary): Adjust cross-references and Default Reduction
definition.
* src/lalr.c (state_lookahead_tokens_count): Adjust code.
Remove a confusing comment pointed out by Akim Demaille.
(initialize_LA): Adjust code.
* src/print-xml.c (print_reductions): Adjust code.
* src/print.c (print_reductions): Adjust code.
* src/reader.c (reader): Adjust code.
* src/tables.c (action_row): Adjust code.
(token_actions): Adjust code.
* src/tables.h: Adjust YYDEFACT documentation.
* tests/input.at (%define lr.default_rules invalid values):
Rename test group to...
(%define lr.default_reductions invalid values): ... this, and
update grammar file and expected output.
* tests/reduce.at (AT_TEST_LR_DEFAULT_RULES): Rename to...
(AT_TEST_LR_DEFAULT_REDUCTIONS): ... this, and update.
Diffstat (limited to 'src/print.c')
-rw-r--r-- | src/print.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/print.c b/src/print.c index 413896c2..7fc577c4 100644 --- a/src/print.c +++ b/src/print.c @@ -242,7 +242,7 @@ print_reductions (FILE *out, state *s) { transitions *trans = s->transitions; reductions *reds = s->reductions; - rule *default_rule = NULL; + rule *default_reduction = NULL; size_t width = 0; int i, j; bool non_default_action = false; @@ -251,7 +251,7 @@ print_reductions (FILE *out, state *s) return; if (yydefact[s->number] != 0) - default_rule = &rules[yydefact[s->number] - 1]; + default_reduction = &rules[yydefact[s->number] - 1]; bitset_zero (no_reduce_set); FOR_EACH_SHIFT (trans, i) @@ -261,7 +261,7 @@ print_reductions (FILE *out, state *s) bitset_set (no_reduce_set, s->errs->symbols[i]->number); /* Compute the width of the lookahead token column. */ - if (default_rule) + if (default_reduction) width = strlen (_("$default")); if (reds->lookahead_tokens) @@ -274,7 +274,7 @@ print_reductions (FILE *out, state *s) { if (! count) { - if (reds->rules[j] != default_rule) + if (reds->rules[j] != default_reduction) max_length (&width, symbols[i]->tag); count = true; } @@ -306,7 +306,7 @@ print_reductions (FILE *out, state *s) { if (! count) { - if (reds->rules[j] != default_rule) + if (reds->rules[j] != default_reduction) { non_default_action = true; print_reduction (out, width, @@ -323,7 +323,7 @@ print_reductions (FILE *out, state *s) if (defaulted) print_reduction (out, width, symbols[i]->tag, - default_rule, true); + default_reduction, true); defaulted = false; print_reduction (out, width, symbols[i]->tag, @@ -332,15 +332,16 @@ print_reductions (FILE *out, state *s) } } - if (default_rule) + if (default_reduction) { - char *default_rules = muscle_percent_define_get ("lr.default_rules"); - print_reduction (out, width, _("$default"), default_rule, true); - aver (0 == strcmp (default_rules, "all") - || (0 == strcmp (default_rules, "consistent") + char *default_reductions = + muscle_percent_define_get ("lr.default_reductions"); + print_reduction (out, width, _("$default"), default_reduction, true); + aver (0 == strcmp (default_reductions, "all") + || (0 == strcmp (default_reductions, "consistent") && !non_default_action) || (reds->num == 1 && reds->rules[0]->number == 0)); - free (default_rules); + free (default_reductions); } } |