X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7685e2f7ba6d5b3cc8db5862c14c1772d2a39872..e657f3698ed074bca2a84d5e2498f8f369c3bc49:/src/reader.c diff --git a/src/reader.c b/src/reader.c index ec560aa5..8a292b8a 100644 --- a/src/reader.c +++ b/src/reader.c @@ -29,13 +29,14 @@ #include "files.h" #include "getargs.h" #include "gram.h" -#include "muscle_tab.h" +#include "muscle-tab.h" #include "reader.h" #include "symlist.h" #include "symtab.h" #include "scan-gram.h" #include "scan-code.h" +static void prepare_percent_define_front_end_variables (void); static void check_and_convert_grammar (void); static symbol_list *grammar = NULL; @@ -190,6 +191,23 @@ grammar_symbol_append (symbol *sym, location loc) return p; } +static void +assign_named_ref (symbol_list *p, named_ref *name) +{ + symbol *sym = p->content.sym; + + if (name->id == sym->tag) + { + warn_at (name->loc, + _("duplicated symbol name for %s ignored"), + quote (sym->tag)); + named_ref_free (name); + } + else + p->named_ref = name; +} + + /* The rule currently being defined, and the previous rule. CURRENT_RULE points to the first LHS of the current rule, while PREVIOUS_RULE_END points to the *end* of the previous rule (NULL). */ @@ -203,7 +221,7 @@ static symbol_list *previous_rule_end = NULL; void grammar_current_rule_begin (symbol *lhs, location loc, - named_ref *lhs_named_ref) + named_ref *lhs_name) { symbol_list* p; @@ -212,18 +230,8 @@ grammar_current_rule_begin (symbol *lhs, location loc, previous_rule_end = grammar_end; p = grammar_symbol_append (lhs, loc); - if (lhs_named_ref) - { - if (lhs_named_ref->id == lhs->tag) - { - warn_at (lhs_named_ref->loc, - _("duplicated symbol name for %s ignored"), - quote (lhs->tag)); - named_ref_free (lhs_named_ref); - } - else - p->named_ref = lhs_named_ref; - } + if (lhs_name) + assign_named_ref(p, lhs_name); current_rule = grammar_end; @@ -348,8 +356,8 @@ grammar_midrule_action (void) symbol *dummy = dummy_symbol_get (dummy_location); symbol_list *midrule = symbol_list_sym_new (dummy, dummy_location); - /* Remember named_ref of previous action */ - named_ref *named_ref = current_rule->action_props.named_ref; + /* Remember named_ref of previous action. */ + named_ref *action_name = current_rule->action_props.named_ref; /* Make a new rule, whose body is empty, before the current one, so that the action just read can belong to it. */ @@ -376,7 +384,8 @@ grammar_midrule_action (void) /* Insert the dummy nonterminal replacing the midrule action into the current rule. Bind it to its dedicated rule. */ - grammar_current_rule_symbol_append (dummy, dummy_location, named_ref); + grammar_current_rule_symbol_append (dummy, dummy_location, + action_name); grammar_end->midrule = midrule; midrule->midrule_parent_rule = current_rule; midrule->midrule_parent_rhs_index = symbol_list_length (current_rule->next); @@ -426,39 +435,28 @@ grammar_current_rule_merge_set (uniqstr name, location loc) void grammar_current_rule_symbol_append (symbol *sym, location loc, - named_ref *named_ref) + named_ref *name) { symbol_list *p; if (current_rule->action_props.code) grammar_midrule_action (); p = grammar_symbol_append (sym, loc); - - if (named_ref) - { - if (named_ref->id == sym->tag) - { - warn_at (named_ref->loc, - _("duplicated symbol name for %s ignored"), - quote (sym->tag)); - named_ref_free (named_ref); - } - else - p->named_ref = named_ref; - } + if (name) + assign_named_ref(p, name); } /* Attach an ACTION to the current rule. */ void grammar_current_rule_action_append (const char *action, location loc, - named_ref *named_ref) + named_ref *name) { if (current_rule->action_props.code) grammar_midrule_action (); /* After all symbol declarations have been parsed, packgram invokes code_props_translate_code. */ code_props_rule_action_init (¤t_rule->action_props, action, loc, - current_rule, named_ref); + current_rule, name); } @@ -593,36 +591,41 @@ reader (void) gram_debug = trace_flag & trace_parse; gram_scanner_initialize (); gram_parse (); + prepare_percent_define_front_end_variables (); - /* Set front-end %define variable defaults. */ + if (! complaint_issued) + check_and_convert_grammar (); + + xfclose (gram_in); +} + +static void +prepare_percent_define_front_end_variables (void) +{ + /* Set %define front-end variable defaults. */ muscle_percent_define_default ("lr.keep-unreachable-states", "false"); { char *lr_type; /* IELR would be a better default, but LALR is historically the default. */ - muscle_percent_define_default ("lr.type", "LALR"); + muscle_percent_define_default ("lr.type", "lalr"); lr_type = muscle_percent_define_get ("lr.type"); - if (0 != strcmp (lr_type, "canonical LR")) + if (0 != strcmp (lr_type, "canonical-lr")) muscle_percent_define_default ("lr.default-reductions", "all"); else muscle_percent_define_default ("lr.default-reductions", "accepting"); free (lr_type); } - /* Check front-end %define variables. */ + /* Check %define front-end variables. */ { static char const * const values[] = { - "lr.type", "LALR", "IELR", "canonical LR", NULL, + "lr.type", "lalr", "ielr", "canonical-lr", NULL, "lr.default-reductions", "all", "consistent", "accepting", NULL, NULL }; muscle_percent_define_check_values (values); } - - if (! complaint_issued) - check_and_convert_grammar (); - - xfclose (gram_in); } @@ -638,9 +641,6 @@ check_and_convert_grammar (void) if (nrules == 0) fatal (_("no rules in the input grammar")); - /* Report any undefined symbols and consider them nonterminals. */ - symbols_check_defined (); - /* If the user did not define her ENDTOKEN, do it now. */ if (!endtoken) { @@ -651,6 +651,9 @@ check_and_convert_grammar (void) endtoken->user_token_number = 0; } + /* Report any undefined symbols and consider them nonterminals. */ + symbols_check_defined (); + /* Find the start symbol if no %start. */ if (!start_flag) {