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

multistart: adjust reader checks for generated rules

Browse Source 
So far we were not checking the generated rule 0 at all.  Now there
can be several of them.  Instead of not checking at all, let's be more
selective on the check to run on them.

* src/reader.c (grammar_rule_check_and_complete): Don't check for
value usage for generated rules, it is ok to have a valued start
symbol, in which case it is ok for the generated rule ("accept: start
$end {}") to not use $1.
(packgram): Call grammar_rule_check_and_complete for all the rules.
This commit is contained in:
Akim Demaille
2020-07-05 07:56:04 +02:00
parent a0b044186b
commit a6805bb8d9
1 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/reader.c
View File

@@ -266,6 +266,7 @@ symbol_should_be_used (symbol_list const *s, bool *midrule_warning)
static void static void
grammar_rule_check_and_complete (symbol_list *r) grammar_rule_check_and_complete (symbol_list *r)
{ {
const symbol *lhs = r->content.sym;
/* Type check. /* Type check.
If there is an action, then there is nothing we can do: the user If there is an action, then there is nothing we can do: the user
@@ -273,13 +274,13 @@ grammar_rule_check_and_complete (symbol_list *r)
Don't worry about the default action if $$ is untyped, since $$'s Don't worry about the default action if $$ is untyped, since $$'s
value can't be used. */ value can't be used. */
if (!r->action_props.code && r->content.sym->content->type_name) if (!r->action_props.code && lhs->content->type_name)
{ {
symbol *first_rhs = r->next->content.sym; symbol *first_rhs = r->next->content.sym;
/* If $$ is being set in default way, report if any type mismatch. */ /* If $$ is being set in default way, report if any type mismatch. */
if (first_rhs) if (first_rhs)
{ {
char const *lhs_type = r->content.sym->content->type_name; char const *lhs_type = lhs->content->type_name;
char const *rhs_type = char const *rhs_type =
first_rhs->content->type_name ? first_rhs->content->type_name : ""; first_rhs->content->type_name ? first_rhs->content->type_name : "";
if (!UNIQSTR_EQ (lhs_type, rhs_type)) if (!UNIQSTR_EQ (lhs_type, rhs_type))
@@ -311,7 +312,11 @@ grammar_rule_check_and_complete (symbol_list *r)
_("empty rule for typed nonterminal, and no action")); _("empty rule for typed nonterminal, and no action"));
} }
/* Check that symbol values that should be used are in fact used. */ /* Check that symbol values that should be used are in fact used.
Don't check the generated start rules. It has no action, so some
rhs symbols may appear unused, but the parsing algorithm ensures
that %destructor's are invoked appropriately. */
if (lhs != acceptsymbol)
{ {
int n = 0; int n = 0;
for (symbol_list const *l = r; l && l->content.sym; l = l->next, ++n) for (symbol_list const *l = r; l && l->content.sym; l = l->next, ++n)
@@ -624,10 +629,6 @@ packgram (void)
->action_props.is_value_used))) ->action_props.is_value_used)))
lhs->content.sym->tag += 1; lhs->content.sym->tag += 1;
/* Don't check the generated rule 0. It has no action, so some rhs
symbols may appear unused, but the parsing algorithm ensures that
%destructor's are invoked appropriately. */
if (lhs != grammar)
grammar_rule_check_and_complete (lhs); grammar_rule_check_and_complete (lhs);
rules[ruleno].code = ruleno; rules[ruleno].code = ruleno;