X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b1ae9233bc1ab111bbac4b427cc4397fa9ee0564..6175ffe3211dad578ce6585584c4eb85cf891830:/src/reader.c diff --git a/src/reader.c b/src/reader.c index 5c65d020..3f8cab8b 100644 --- a/src/reader.c +++ b/src/reader.c @@ -1,5 +1,6 @@ -/* Input parser for bison - Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000, 2001, 2002 +/* Input parser for Bison + + Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -19,21 +20,22 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - #include "system.h" -#include "quotearg.h" -#include "getargs.h" + +#include + +#include "complain.h" +#include "conflicts.h" #include "files.h" -#include "symtab.h" -#include "symlist.h" +#include "getargs.h" #include "gram.h" -#include "complain.h" +#include "muscle_tab.h" #include "output.h" #include "reader.h" -#include "conflicts.h" -#include "muscle_tab.h" +#include "symlist.h" +#include "symtab.h" -static symbol_list_t *grammar = NULL; +static symbol_list *grammar = NULL; static int start_flag = 0; merger_list *merge_functions; @@ -45,15 +47,15 @@ int typed = 0; `-----------------------*/ void -grammar_start_symbol_set (symbol_t *s, location_t l) +grammar_start_symbol_set (symbol *sym, location loc) { if (start_flag) - complain_at (l, _("multiple %s declarations"), "%start"); + complain_at (loc, _("multiple %s declarations"), "%start"); else { start_flag = 1; - startsymbol = s; - startsymbol_location = l; + startsymbol = sym; + startsymbol_location = loc; } } @@ -64,14 +66,14 @@ grammar_start_symbol_set (symbol_t *s, location_t l) `----------------------------------------------------------------*/ void -prologue_augment (const char *prologue, location_t location) +prologue_augment (const char *prologue, location loc) { struct obstack *oout = !typed ? &pre_prologue_obstack : &post_prologue_obstack; - obstack_fgrow1 (oout, "]b4_syncline([[%d]], [[", - location.first_line); - MUSCLE_OBSTACK_SGROW (oout, quotearg_style (c_quoting_style, location.file)); + obstack_fgrow1 (oout, "]b4_syncline([[%d]], [[", loc.start.line); + MUSCLE_OBSTACK_SGROW (oout, + quotearg_style (c_quoting_style, loc.start.file)); obstack_sgrow (oout, "]])[\n"); obstack_sgrow (oout, prologue); } @@ -84,13 +86,12 @@ prologue_augment (const char *prologue, location_t location) `----------------------*/ void -epilogue_augment (const char *epilogue, location_t location) +epilogue_augment (const char *epilogue, location loc) { char *extension = NULL; - obstack_fgrow1 (&muscle_obstack, "]b4_syncline([[%d]], [[", - location.first_line); + obstack_fgrow1 (&muscle_obstack, "]b4_syncline([[%d]], [[", loc.start.line); MUSCLE_OBSTACK_SGROW (&muscle_obstack, - quotearg_style (c_quoting_style, location.file)); + quotearg_style (c_quoting_style, loc.start.file)); obstack_sgrow (&muscle_obstack, "]])[\n"); obstack_sgrow (&muscle_obstack, epilogue); obstack_1grow (&muscle_obstack, 0); @@ -109,7 +110,7 @@ epilogue_augment (const char *epilogue, location_t location) `-------------------------------------------------------------------*/ static int -get_merge_function (struniq_t name, struniq_t type, location_t loc) +get_merge_function (uniqstr name, uniqstr type, location loc) { merger_list *syms; merger_list head; @@ -119,21 +120,21 @@ get_merge_function (struniq_t name, struniq_t type, location_t loc) return 0; if (type == NULL) - type = struniq_new (""); + type = uniqstr_new (""); head.next = merge_functions; for (syms = &head, n = 1; syms->next != NULL; syms = syms->next, n += 1) - if (STRUNIQ_EQ (name, syms->next->name)) + if (UNIQSTR_EQ (name, syms->next->name)) break; if (syms->next == NULL) { - syms->next = XMALLOC (merger_list, 1); - syms->next->name = struniq_new (name); - syms->next->type = struniq_new (type); + MALLOC (syms->next, 1); + syms->next->name = uniqstr_new (name); + syms->next->type = uniqstr_new (type); syms->next->next = NULL; merge_functions = head.next; } - else if (!STRUNIQ_EQ (type, syms->next->type)) + else if (!UNIQSTR_EQ (type, syms->next->type)) warn_at (loc, _("result type clash on merge function %s: <%s> != <%s>"), name, type, syms->next->type); return n; @@ -160,7 +161,7 @@ free_merger_functions (void) /*-------------------------------------------------------------------. -| Parse the input grammar into a one symbol_list_t structure. Each | +| Parse the input grammar into a one symbol_list structure. Each | | rule is represented by a sequence of symbols: the left hand side | | followed by the contents of the right hand side, followed by a | | null pointer instead of a symbol to terminate the rule. The next | @@ -178,13 +179,13 @@ free_merger_functions (void) `-------------------------------------------------------------------*/ /* The (currently) last symbol of GRAMMAR. */ -symbol_list_t *grammar_end = NULL; +symbol_list *grammar_end = NULL; -/* Append S to the GRAMMAR. */ +/* Append SYM to the grammar. */ void -grammar_symbol_append (symbol_t *symbol, location_t location) +grammar_symbol_append (symbol *sym, location loc) { - symbol_list_t *p = symbol_list_new (symbol, location); + symbol_list *p = symbol_list_new (sym, loc); if (grammar_end) grammar_end->next = p; @@ -197,8 +198,8 @@ grammar_symbol_append (symbol_t *symbol, location_t location) /* 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). */ -symbol_list_t *current_rule = NULL; -symbol_list_t *previous_rule_end = NULL; +symbol_list *current_rule = NULL; +symbol_list *previous_rule_end = NULL; /*----------------------------------------------. @@ -206,12 +207,12 @@ symbol_list_t *previous_rule_end = NULL; `----------------------------------------------*/ void -grammar_rule_begin (symbol_t *lhs, location_t location) +grammar_rule_begin (symbol *lhs, location loc) { if (!start_flag) { startsymbol = lhs; - startsymbol_location = location; + startsymbol_location = loc; start_flag = 1; } @@ -220,7 +221,7 @@ grammar_rule_begin (symbol_t *lhs, location_t location) ++nritems; previous_rule_end = grammar_end; - grammar_symbol_append (lhs, location); + grammar_symbol_append (lhs, loc); current_rule = grammar_end; /* Mark the rule's lhs as a nonterminal if not already so. */ @@ -232,7 +233,7 @@ grammar_rule_begin (symbol_t *lhs, location_t location) ++nvars; } else if (lhs->class == token_sym) - complain_at (location, _("rule given for %s, which is a token"), lhs->tag); + complain_at (loc, _("rule given for %s, which is a token"), lhs->tag); } /* Check that the last rule (CURRENT_RULE) is properly defined. For @@ -241,9 +242,9 @@ grammar_rule_begin (symbol_t *lhs, location_t location) static void grammar_current_rule_check (void) { - symbol_t *lhs = current_rule->sym; + symbol *lhs = current_rule->sym; char const *lhs_type = lhs->type_name; - symbol_t *first_rhs = current_rule->next->sym; + symbol *first_rhs = current_rule->next->sym; /* If there is an action, then there is nothing we can do: the user is allowed to shoot herself in the foot. */ @@ -259,15 +260,15 @@ grammar_current_rule_check (void) if (first_rhs) { const char *rhs_type = first_rhs->type_name ? first_rhs->type_name : ""; - if (!STRUNIQ_EQ (lhs_type, rhs_type)) - complain_at (current_rule->location, - _("type clash on default action: <%s> != <%s>"), - lhs_type, rhs_type); + if (!UNIQSTR_EQ (lhs_type, rhs_type)) + warn_at (current_rule->location, + _("type clash on default action: <%s> != <%s>"), + lhs_type, rhs_type); } /* Warn if there is no default for $$ but we need one. */ else - complain_at (current_rule->location, - _("empty rule for typed nonterminal, and no action")); + warn_at (current_rule->location, + _("empty rule for typed nonterminal, and no action")); } @@ -276,11 +277,11 @@ grammar_current_rule_check (void) `-------------------------------------*/ void -grammar_rule_end (location_t location) +grammar_rule_end (location loc) { /* Put an empty link in the list to mark the end of this rule */ grammar_symbol_append (NULL, grammar_end->location); - current_rule->location = location; + current_rule->location = loc; grammar_current_rule_check (); } @@ -301,9 +302,9 @@ grammar_midrule_action (void) /* Make a DUMMY nonterminal, whose location is that of the midrule action. Create the MIDRULE. */ - location_t dummy_location = current_rule->action_location; - symbol_t *dummy = dummy_symbol_get (dummy_location); - symbol_list_t *midrule = symbol_list_new (dummy, dummy_location); + location dummy_location = current_rule->action_location; + symbol *dummy = dummy_symbol_get (dummy_location); + symbol_list *midrule = symbol_list_new (dummy, dummy_location); /* Make a new rule, whose body is empty, before the current one, so that the action just read can belong to it. */ @@ -334,25 +335,24 @@ grammar_midrule_action (void) /* Set the precedence symbol of the current rule to PRECSYM. */ void -grammar_current_rule_prec_set (symbol_t *precsym, location_t location) +grammar_current_rule_prec_set (symbol *precsym, location loc) { if (current_rule->ruleprec) - complain_at (location, _("only one %s allowed per rule"), "%prec"); + complain_at (loc, _("only one %s allowed per rule"), "%prec"); current_rule->ruleprec = precsym; } /* Attach dynamic precedence DPREC to the current rule. */ void -grammar_current_rule_dprec_set (int dprec, location_t location) +grammar_current_rule_dprec_set (int dprec, location loc) { if (! glr_parser) - warn_at (location, _("%s affects only GLR parsers"), "%dprec"); + warn_at (loc, _("%s affects only GLR parsers"), "%dprec"); if (dprec <= 0) - complain_at (location, - _("%s must be followed by positive number"), "%dprec"); + complain_at (loc, _("%s must be followed by positive number"), "%dprec"); else if (current_rule->dprec != 0) - complain_at (location, _("only one %s allowed per rule"), "%dprec"); + complain_at (loc, _("only one %s allowed per rule"), "%dprec"); current_rule->dprec = dprec; } @@ -360,38 +360,38 @@ grammar_current_rule_dprec_set (int dprec, location_t location) rule. */ void -grammar_current_rule_merge_set (struniq_t name, location_t location) +grammar_current_rule_merge_set (uniqstr name, location loc) { if (! glr_parser) - warn_at (location, _("%s affects only GLR parsers"), "%merge"); + warn_at (loc, _("%s affects only GLR parsers"), "%merge"); if (current_rule->merger != 0) - complain_at (location, _("only one %s allowed per rule"), "%merge"); + complain_at (loc, _("only one %s allowed per rule"), "%merge"); current_rule->merger = - get_merge_function (name, current_rule->sym->type_name, location); + get_merge_function (name, current_rule->sym->type_name, loc); } -/* Attach a SYMBOL to the current rule. If needed, move the previous +/* Attach SYM to the current rule. If needed, move the previous action as a mid-rule action. */ void -grammar_current_rule_symbol_append (symbol_t *symbol, location_t location) +grammar_current_rule_symbol_append (symbol *sym, location loc) { if (current_rule->action) grammar_midrule_action (); ++nritems; - grammar_symbol_append (symbol, location); + grammar_symbol_append (sym, loc); } /* Attach an ACTION to the current rule. If needed, move the previous action as a mid-rule action. */ void -grammar_current_rule_action_append (const char *action, location_t location) +grammar_current_rule_action_append (const char *action, location loc) { if (current_rule->action) grammar_midrule_action (); current_rule->action = action; - current_rule->action_location = location; + current_rule->action_location = loc; } @@ -404,15 +404,15 @@ static void packgram (void) { unsigned int itemno = 0; - rule_number_t ruleno = 0; - symbol_list_t *p = grammar; + rule_number ruleno = 0; + symbol_list *p = grammar; - ritem = XCALLOC (item_number_t, nritems); - rules = XCALLOC (rule_t, nrules); + CALLOC (ritem, nritems); + CALLOC (rules, nrules); while (p) { - symbol_t *ruleprec = p->ruleprec; + symbol *ruleprec = p->ruleprec; rules[ruleno].user_number = ruleno; rules[ruleno].number = ruleno; rules[ruleno].lhs = p->sym; @@ -427,7 +427,7 @@ packgram (void) p = p->next; while (p && p->sym) { - /* item_number_t = symbol_number_t. + /* item_number = symbol_number. But the former needs to contain more: negative rule numbers. */ ritem[itemno++] = symbol_number_as_item_number (p->sym->number); /* A rule gets by default the precedence and associativity @@ -452,7 +452,8 @@ packgram (void) p = p->next; } - assert (itemno == nritems); + if (itemno != nritems) + abort (); if (trace_flag & trace_sets) ritem_print (stderr); @@ -468,8 +469,6 @@ packgram (void) void reader (void) { - gram_control_t gram_control; - /* Initialize the symbol table. */ symbols_new (); @@ -499,7 +498,7 @@ reader (void) gram__flex_debug = trace_flag & trace_scan; gram_debug = trace_flag & trace_parse; scanner_initialize (); - gram_parse (&gram_control); + gram_parse (); /* If something went wrong during the parsing, don't try to continue. */ @@ -528,7 +527,7 @@ reader (void) accept: %start EOF. */ { - symbol_list_t *p = symbol_list_new (accept, empty_location); + symbol_list *p = symbol_list_new (accept, empty_location); p->location = grammar->location; p->next = symbol_list_new (startsymbol, empty_location); p->next->next = symbol_list_new (endtoken, empty_location); @@ -539,8 +538,8 @@ reader (void) grammar = p; } - assert (nsyms <= SYMBOL_NUMBER_MAX); - assert (nsyms == ntokens + nvars); + if (! (nsyms <= SYMBOL_NUMBER_MAXIMUM && nsyms == ntokens + nvars)) + abort (); xfclose (finput); @@ -551,6 +550,6 @@ reader (void) /* Convert the grammar into the format described in gram.h. */ packgram (); - /* The grammar as a symbol_list_t is no longer needed. */ - LIST_FREE (symbol_list_t, grammar); + /* The grammar as a symbol_list is no longer needed. */ + LIST_FREE (symbol_list, grammar); }