X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/fbc8ecb7ef65f0cf216e2da94f9bf899bf4c1c92..3cd5bcdd19537bafd3ae7d0851cda452a3422e98:/src/output.c diff --git a/src/output.c b/src/output.c index 841ebe4f..34d6b06a 100644 --- a/src/output.c +++ b/src/output.c @@ -1,5 +1,6 @@ /* Output the generated parsing program for bison, - Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc. + Copyright 1984, 1986, 1989, 1992, 2000, 2001 + Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -19,76 +20,73 @@ 02111-1307, USA. */ -/* The parser tables consist of these tables. - Starred ones needed only for the semantic parser. - Double starred are output only if switches are set. +/* The parser tables consist of these tables. Marked ones needed only + for the semantic parser. Double marked are output only if switches + are set. - yytranslate = vector mapping yylex's token numbers into bison's token - numbers. + YYTRANSLATE = vector mapping yylex's token numbers into bison's + token numbers. - ** yytname = vector of string-names indexed by bison token number + ++ YYTNAME = vector of string-names indexed by bison token number. - ** yytoknum = vector of yylex token numbers corresponding to entries - in yytname + ++ YYTOKNUM = vector of yylex token numbers corresponding to + entries in YYTNAME. - yyrline = vector of line-numbers of all rules. For yydebug printouts. + YYRLINE = vector of line-numbers of all rules. For yydebug + printouts. - yyrhs = vector of items of all rules. - This is exactly what ritems contains. For yydebug and for semantic - parser. + YYRHS = vector of items of all rules. This is exactly what RITEMS + contains. For yydebug and for semantic parser. - yyprhs[r] = index in yyrhs of first item for rule r. + YYPRHS[R] = index in YYRHS of first item for rule R. - yyr1[r] = symbol number of symbol that rule r derives. + YYR1[R] = symbol number of symbol that rule R derives. - yyr2[r] = number of symbols composing right hand side of rule r. + YYR2[R] = number of symbols composing right hand side of rule R. - * yystos[s] = the symbol number of the symbol that leads to state s. + + YYSTOS[S] = the symbol number of the symbol that leads to state + S. - yydefact[s] = default rule to reduce with in state s, - when yytable doesn't specify something else to do. - Zero means the default is an error. + YYDEFACT[S] = default rule to reduce with in state s, when YYTABLE + doesn't specify something else to do. Zero means the default is an + error. - yydefgoto[i] = default state to go to after a reduction of a rule that - generates variable ntokens + i, except when yytable - specifies something else to do. + YYDEFGOTO[I] = default state to go to after a reduction of a rule + that generates variable NTOKENS + I, except when YYTABLE specifies + something else to do. - yypact[s] = index in yytable of the portion describing state s. - The lookahead token's type is used to index that portion - to find out what to do. + YYPACT[S] = index in YYTABLE of the portion describing state S. + The lookahead token's type is used to index that portion to find + out what to do. - If the value in yytable is positive, - we shift the token and go to that state. + If the value in YYTABLE is positive, we shift the token and go to + that state. If the value is negative, it is minus a rule number to reduce by. - If the value is zero, the default action from yydefact[s] is used. + If the value is zero, the default action from YYDEFACT[S] is used. - yypgoto[i] = the index in yytable of the portion describing - what to do after reducing a rule that derives variable i + ntokens. - This portion is indexed by the parser state number, s, - as of before the text for this nonterminal was read. - The value from yytable is the state to go to if - the corresponding value in yycheck is s. + YYPGOTO[I] = the index in YYTABLE of the portion describing what to + do after reducing a rule that derives variable I + NTOKENS. This + portion is indexed by the parser state number, S, as of before the + text for this nonterminal was read. The value from YYTABLE is the + state to go to if the corresponding value in YYCHECK is S. - yytable = a vector filled with portions for different uses, - found via yypact and yypgoto. + YYTABLE = a vector filled with portions for different uses, found + via YYPACT and YYPGOTO. - yycheck = a vector indexed in parallel with yytable. - It indicates, in a roundabout way, the bounds of the - portion you are trying to examine. + YYCHECK = a vector indexed in parallel with YYTABLE. It indicates, + in a roundabout way, the bounds of the portion you are trying to + examine. - Suppose that the portion of yytable starts at index p - and the index to be examined within the portion is i. - Then if yycheck[p+i] != i, i is outside the bounds - of what is actually allocated, and the default - (from yydefact or yydefgoto) should be used. - Otherwise, yytable[p+i] should be used. + Suppose that the portion of yytable starts at index P and the index + to be examined within the portion is I. Then if YYCHECK[P+I] != I, + I is outside the bounds of what is actually allocated, and the + default (from YYDEFACT or YYDEFGOTO) should be used. Otherwise, + YYTABLE[P+I] should be used. - YYFINAL = the state number of the termination state. - YYFLAG = most negative short int. Used to flag ?? - YYNTBASE = ntokens. -*/ + YYFINAL = the state number of the termination state. YYFLAG = most + negative short int. Used to flag ?? */ #include "system.h" #include "quotearg.h" @@ -100,6 +98,7 @@ #include "output.h" #include "lalr.h" #include "reader.h" +#include "symtab.h" #include "conflicts.h" #include "muscle_tab.h" @@ -121,7 +120,7 @@ static int lowzero; static int high; struct obstack muscle_obstack; -struct obstack output_obstack; +static struct obstack format_obstack; int error_verbose = 0; @@ -130,14 +129,12 @@ static size_t get_lines_number (const char *s) { size_t lines = 0; - + size_t i; for (i = 0; s[i]; ++i) - { - if (s[i] == '\n') - ++lines; - } - + if (s[i] == '\n') + ++lines; + return lines; } @@ -148,8 +145,8 @@ static inline void output_table_data (struct obstack *oout, short *table_data, short first, - short begin, - short end) + int begin, + int end) { int i; int j = 1; @@ -174,9 +171,9 @@ output_table_data (struct obstack *oout, static void output_token_translations (void) { - output_table_data (&output_obstack, token_translations, + output_table_data (&format_obstack, token_translations, 0, 1, max_user_token_number + 1); - muscle_insert ("translate", obstack_finish (&output_obstack)); + muscle_insert ("translate", obstack_finish (&format_obstack)); XFREE (token_translations); } @@ -188,33 +185,30 @@ output_gram (void) int i; short *values = XCALLOC (short, nrules + 1); for (i = 0; i < nrules + 1; ++i) - values[i] = rule_table[i].rhs; - output_table_data (&output_obstack, values, + values[i] = rules[i].rhs; + output_table_data (&format_obstack, values, 0, 1, nrules + 1); XFREE (values); } - muscle_insert ("prhs", obstack_finish (&output_obstack)); + muscle_insert ("prhs", obstack_finish (&format_obstack)); { - size_t yyrhs_size = 1; - short *yyrhs, *sp; + short *yyrhs; int i; - for (sp = ritem + 1; *sp; sp++) - ++yyrhs_size; - yyrhs = XMALLOC (short, yyrhs_size); + yyrhs = XMALLOC (short, nritems); - for (sp = ritem + 1, i = 1; *sp; ++sp, ++i) - yyrhs[i] = *sp > 0 ? *sp : 0; + for (i = 1; i < nritems; ++i) + yyrhs[i] = ritem[i] >= 0 ? ritem[i] : -1; - output_table_data (&output_obstack, yyrhs, - ritem[0], 1, yyrhs_size); - muscle_insert ("rhs", obstack_finish (&output_obstack)); + output_table_data (&format_obstack, yyrhs, + ritem[0], 1, nritems); + muscle_insert ("rhs", obstack_finish (&format_obstack)); XFREE (yyrhs); } - + #if 0 if (!semantic_parser) obstack_sgrow (&table_obstack, "\n#endif\n"); @@ -228,10 +222,10 @@ output_stos (void) int i; short *values = (short *) alloca (sizeof (short) * nstates); for (i = 0; i < nstates; ++i) - values[i] = state_table[i]->accessing_symbol; - output_table_data (&output_obstack, values, + values[i] = states[i]->accessing_symbol; + output_table_data (&format_obstack, values, 0, 1, nstates); - muscle_insert ("stos", obstack_finish (&output_obstack)); + muscle_insert ("stos", obstack_finish (&format_obstack)); } @@ -245,10 +239,10 @@ output_rule_data (void) { short *values = XCALLOC (short, nrules + 1); for (i = 0; i < nrules + 1; ++i) - values[i] = rule_table[i].line; - output_table_data (&output_obstack, values, + values[i] = rules[i].line; + output_table_data (&format_obstack, values, 0, 1, nrules + 1); - muscle_insert ("rline", obstack_finish (&output_obstack)); + muscle_insert ("rline", obstack_finish (&format_obstack)); XFREE (values); } @@ -259,52 +253,59 @@ output_rule_data (void) /* Be sure not to use twice the same quotearg slot. */ const char *cp = quotearg_n_style (1, c_quoting_style, - quotearg_style (escape_quoting_style, tags[i])); + quotearg_style (escape_quoting_style, symbols[i]->tag)); /* Width of the next token, including the two quotes, the coma and the space. */ int strsize = strlen (cp) + 2; if (j + strsize > 75) { - obstack_sgrow (&output_obstack, "\n "); + obstack_sgrow (&format_obstack, "\n "); j = 2; } - obstack_sgrow (&output_obstack, cp); - obstack_sgrow (&output_obstack, ", "); + obstack_sgrow (&format_obstack, cp); + obstack_sgrow (&format_obstack, ", "); j += strsize; } /* add a NULL entry to list of tokens */ - obstack_sgrow (&output_obstack, "NULL"); + obstack_sgrow (&format_obstack, "NULL"); /* Finish table and store. */ - obstack_1grow (&output_obstack, 0); - muscle_insert ("tname", obstack_finish (&output_obstack)); + obstack_1grow (&format_obstack, 0); + muscle_insert ("tname", obstack_finish (&format_obstack)); /* Output YYTOKNUM. */ - output_table_data (&output_obstack, user_toknums, - 0, 1, ntokens + 1); - muscle_insert ("toknum", obstack_finish (&output_obstack)); + { + short *values = XCALLOC (short, ntokens + 1); + for (i = 0; i < ntokens + 1; ++i) + values[i] = symbols[i]->user_token_number; + output_table_data (&format_obstack, values, + 0, 1, ntokens + 1); + muscle_insert ("toknum", obstack_finish (&format_obstack)); + XFREE (values); + } + /* Output YYR1. */ { short *values = XCALLOC (short, nrules + 1); for (i = 0; i < nrules + 1; ++i) - values[i] = rule_table[i].lhs; - output_table_data (&output_obstack, values, + values[i] = rules[i].lhs; + output_table_data (&format_obstack, values, 0, 1, nrules + 1); - muscle_insert ("r1", obstack_finish (&output_obstack)); + muscle_insert ("r1", obstack_finish (&format_obstack)); XFREE (values); } /* Output YYR2. */ short_tab = XMALLOC (short, nrules + 1); for (i = 1; i < nrules; i++) - short_tab[i] = rule_table[i + 1].rhs - rule_table[i].rhs - 1; - short_tab[nrules] = nitems - rule_table[nrules].rhs - 1; - output_table_data (&output_obstack, short_tab, + short_tab[i] = rules[i + 1].rhs - rules[i].rhs - 1; + short_tab[nrules] = nritems - rules[nrules].rhs - 1; + output_table_data (&format_obstack, short_tab, 0, 1, nrules + 1); - muscle_insert ("r2", obstack_finish (&output_obstack)); + muscle_insert ("r2", obstack_finish (&format_obstack)); XFREE (short_tab); } @@ -323,63 +324,45 @@ output_rule_data (void) `------------------------------------------------------------------*/ static int -action_row (int state) +action_row (state_t *state) { int i; - int j; - int k; - int m = 0; - int n = 0; - int default_rule; - int nreds; - int rule; - int shift_state; - int symbol; - reductions *redp; - shifts *shiftp; - errs *errp; - int nodefault = 0; /* set nonzero to inhibit having any default reduction */ + int default_rule = 0; + reductions *redp = state->reductions; + shifts *shiftp = state->shifts; + errs *errp = state->errs; + /* set nonzero to inhibit having any default reduction */ + int nodefault = 0; for (i = 0; i < ntokens; i++) actrow[i] = 0; - default_rule = 0; - nreds = 0; - redp = state_table[state]->reductions; - - if (redp) + if (redp->nreds >= 1) { - nreds = redp->nreds; - - if (nreds >= 1) - { - /* loop over all the rules available here which require - lookahead */ - m = state_table[state]->lookaheads; - n = state_table[state + 1]->lookaheads; - - for (i = n - 1; i >= m; i--) - /* and find each token which the rule finds acceptable - to come next */ - for (j = 0; j < ntokens; j++) - /* and record this rule as the rule to use if that - token follows. */ - if (BITISSET (LA (i), j)) - actrow[j] = -LAruleno[i]; - } + int j; + /* loop over all the rules available here which require + lookahead */ + for (i = state->nlookaheads - 1; i >= 0; --i) + /* and find each token which the rule finds acceptable + to come next */ + for (j = 0; j < ntokens; j++) + /* and record this rule as the rule to use if that + token follows. */ + if (BITISSET (LA (state->lookaheadsp + i), j)) + actrow[j] = -LAruleno[state->lookaheadsp + i]; } /* Now see which tokens are allowed for shifts in this state. For them, record the shift as the thing to do. So shift is preferred to reduce. */ - shiftp = state_table[state]->shifts; for (i = 0; i < shiftp->nshifts; i++) { - shift_state = shiftp->shifts[i]; + int symbol; + int shift_state = shiftp->shifts[i]; if (!shift_state) continue; - symbol = state_table[shift_state]->accessing_symbol; + symbol = states[shift_state]->accessing_symbol; if (ISVAR (symbol)) break; @@ -394,39 +377,31 @@ action_row (int state) /* See which tokens are an explicit error in this state (due to %nonassoc). For them, record MINSHORT as the action. */ - errp = state_table[state]->errs; - - if (errp) + for (i = 0; i < errp->nerrs; i++) { - k = errp->nerrs; - - for (i = 0; i < k; i++) - { - symbol = errp->errs[i]; - actrow[symbol] = MINSHORT; - } + int symbol = errp->errs[i]; + actrow[symbol] = MINSHORT; } /* Now find the most common reduction and make it the default action for this state. */ - if (nreds >= 1 && !nodefault) + if (redp->nreds >= 1 && !nodefault) { - if (state_table[state]->consistent) + if (state->consistent) default_rule = redp->rules[0]; else { int max = 0; - for (i = m; i < n; i++) + for (i = 0; i < state->nlookaheads; i++) { int count = 0; - rule = -LAruleno[i]; + int rule = -LAruleno[state->lookaheadsp + i]; + int j; for (j = 0; j < ntokens; j++) - { - if (actrow[j] == rule) - count++; - } + if (actrow[j] == rule) + count++; if (count > max) { @@ -440,11 +415,10 @@ action_row (int state) if (max > 0) { + int j; for (j = 0; j < ntokens; j++) - { - if (actrow[j] == default_rule) - actrow[j] = 0; - } + if (actrow[j] == default_rule) + actrow[j] = 0; default_rule = -default_rule; } @@ -455,11 +429,9 @@ action_row (int state) So replace any action which says "error" with "use default". */ if (default_rule == 0) - for (j = 0; j < ntokens; j++) - { - if (actrow[j] == MINSHORT) - actrow[j] = 0; - } + for (i = 0; i < ntokens; i++) + if (actrow[i] == MINSHORT) + actrow[i] = 0; return default_rule; } @@ -476,10 +448,8 @@ save_row (int state) count = 0; for (i = 0; i < ntokens; i++) - { - if (actrow[i] != 0) - count++; - } + if (actrow[i] != 0) + count++; if (count == 0) return; @@ -488,13 +458,11 @@ save_row (int state) tos[state] = sp2 = XCALLOC (short, count); for (i = 0; i < ntokens; i++) - { - if (actrow[i] != 0) - { - *sp1++ = i; - *sp2++ = actrow[i]; - } - } + if (actrow[i] != 0) + { + *sp1++ = i; + *sp2++ = actrow[i]; + } tally[state] = count; width[state] = sp1[-1] - sp[0] + 1; @@ -518,13 +486,13 @@ token_actions (void) actrow = XCALLOC (short, ntokens); for (i = 0; i < nstates; ++i) { - yydefact[i] = action_row (i); + yydefact[i] = action_row (states[i]); save_row (i); } - output_table_data (&output_obstack, yydefact, + output_table_data (&format_obstack, yydefact, yydefact[0], 1, nstates); - muscle_insert ("defact", obstack_finish (&output_obstack)); + muscle_insert ("defact", obstack_finish (&format_obstack)); XFREE (actrow); XFREE (yydefact); @@ -540,20 +508,20 @@ actions_output (FILE *out, size_t *line) { int rule; for (rule = 1; rule < nrules + 1; ++rule) - if (rule_table[rule].action) + if (rules[rule].action) { fprintf (out, " case %d:\n", rule); if (!no_lines_flag) fprintf (out, muscle_find ("linef"), - rule_table[rule].action_line, + rules[rule].action_line, quotearg_style (c_quoting_style, muscle_find ("filename"))); /* As a Bison extension, add the ending semicolon. Since some Yacc don't do that, help people using bison as a Yacc finding their missing semicolons. */ fprintf (out, "{ %s%s }\n break;\n\n", - rule_table[rule].action, + rules[rule].action, yacc_flag ? ";" : ""); /* We always output 4 '\n' per action. */ @@ -562,11 +530,91 @@ actions_output (FILE *out, size_t *line) if (!no_lines_flag) ++*line; /* Get the number of lines written by the user. */ - *line += get_lines_number (rule_table[rule].action); + *line += get_lines_number (rules[rule].action); } } +/*----------------------------. +| Output the guards to OOUT. | +`----------------------------*/ + +static void +guards_output (FILE *out, size_t *line) +{ + int rule; + for (rule = 1; rule < nrules + 1; ++rule) + if (rules[rule].action) + { + fprintf (out, " case %d:\n", rule); + + if (!no_lines_flag) + fprintf (out, muscle_find ("linef"), + rules[rule].guard_line, + quotearg_style (c_quoting_style, + muscle_find ("filename"))); + fprintf (out, "{ %s; }\n break;\n\n", + rules[rule].guard); + + /* We always output 4 '\n' per action. */ + *line += 4; + /* Plus one if !no_lines_flag. */ + if (!no_lines_flag) + ++*line; + /* Get the number of lines written by the user. */ + *line += get_lines_number (rules[rule].guard); + } +} + + +/*---------------------------------------. +| Output the tokens definition to OOUT. | +`---------------------------------------*/ + +static void +token_definitions_output (FILE *out, size_t *line) +{ + int i; + for (i = 0; i < ntokens; ++i) + { + bucket *symbol = symbols[i]; + int number = symbol->user_token_number; + + if (number == SALIAS) + continue; + /* Skip error token. */ + if (symbol->value == error_token_number) + continue; + if (symbol->tag[0] == '\'') + continue; /* skip literal character */ + if (symbol->tag[0] == '\"') + { + /* use literal string only if given a symbol with an alias */ + if (symbol->alias) + symbol = symbol->alias; + else + continue; + } + + /* Don't #define nonliteral tokens whose names contain periods + or '$' (as does the default value of the EOF token). */ + if (strchr (symbol->tag, '.') || strchr (symbol->tag, '$')) + continue; + + fprintf (out, "# define %s\t%d\n", + symbol->tag, number); + ++*line; + if (semantic_parser) + { + /* FIXME: This is probably wrong, and should be just as + above. --akim. */ + fprintf (out, "# define T%s\t%d\n", symbol->tag, symbol->value); + ++*line; + } + } +} + + static void save_column (int symbol, int default_state) { @@ -575,34 +623,28 @@ save_column (int symbol, int default_state) short *sp1; short *sp2; int count; - int symno; + int symno = symbol - ntokens + nstates; short begin = goto_map[symbol]; short end = goto_map[symbol + 1]; count = 0; for (i = begin; i < end; i++) - { - if (to_state[i] != default_state) - count++; - } + if (to_state[i] != default_state) + count++; if (count == 0) return; - symno = symbol - ntokens + nstates; - froms[symno] = sp1 = sp = XCALLOC (short, count); tos[symno] = sp2 = XCALLOC (short, count); for (i = begin; i < end; i++) - { - if (to_state[i] != default_state) - { - *sp1++ = from_state[i]; - *sp2++ = to_state[i]; - } - } + if (to_state[i] != default_state) + { + *sp1++ = from_state[i]; + *sp2++ = to_state[i]; + } tally[symno] = count; width[symno] = sp1[-1] - sp[0] + 1; @@ -612,13 +654,10 @@ static int default_goto (int symbol) { int i; - int m; - int n; - int default_state; - int max; - - m = goto_map[symbol]; - n = goto_map[symbol + 1]; + int m = goto_map[symbol]; + int n = goto_map[symbol + 1]; + int default_state = -1; + int max = 0; if (m == n) return -1; @@ -629,17 +668,12 @@ default_goto (int symbol) for (i = m; i < n; i++) state_count[to_state[i]]++; - max = 0; - default_state = -1; - for (i = 0; i < nstates; i++) - { - if (state_count[i] > max) - { - max = state_count[i]; - default_state = i; - } - } + if (state_count[i] > max) + { + max = state_count[i]; + default_state = i; + } return default_state; } @@ -668,9 +702,9 @@ goto_actions (void) yydefgoto[i - ntokens] = default_state; } - output_table_data (&output_obstack, yydefgoto, + output_table_data (&format_obstack, yydefgoto, yydefgoto[0], 1, nsyms - ntokens); - muscle_insert ("defgoto", obstack_finish (&output_obstack)); + muscle_insert ("defgoto", obstack_finish (&format_obstack)); XFREE (state_count); XFREE (yydefgoto); @@ -684,50 +718,41 @@ static void sort_actions (void) { int i; - int j; - int k; - int t; - int w; order = XCALLOC (short, nvectors); nentries = 0; for (i = 0; i < nvectors; i++) - { - if (tally[i] > 0) - { - t = tally[i]; - w = width[i]; - j = nentries - 1; + if (tally[i] > 0) + { + int k; + int t = tally[i]; + int w = width[i]; + int j = nentries - 1; - while (j >= 0 && (width[order[j]] < w)) - j--; + while (j >= 0 && (width[order[j]] < w)) + j--; - while (j >= 0 && (width[order[j]] == w) && (tally[order[j]] < t)) - j--; + while (j >= 0 && (width[order[j]] == w) && (tally[order[j]] < t)) + j--; - for (k = nentries - 1; k > j; k--) - order[k + 1] = order[k]; + for (k = nentries - 1; k > j; k--) + order[k + 1] = order[k]; - order[j + 1] = i; - nentries++; - } - } + order[j + 1] = i; + nentries++; + } } static int matching_state (int vector) { - int i; - int j; - int k; + int i = order[vector]; int t; int w; - int match; int prev; - i = order[vector]; if (i >= nstates) return -1; @@ -736,16 +761,16 @@ matching_state (int vector) for (prev = vector - 1; prev >= 0; prev--) { - j = order[prev]; + int j = order[prev]; + int k; + int match = 1; + if (width[j] != w || tally[j] != t) return -1; - match = 1; for (k = 0; match && k < t; k++) - { - if (tos[j][k] != tos[i][k] || froms[j][k] != froms[i][k]) - match = 0; - } + if (tos[j][k] != tos[i][k] || froms[j][k] != froms[i][k]) + match = 0; if (match) return j; @@ -758,26 +783,19 @@ matching_state (int vector) static int pack_vector (int vector) { - int i; + int i = order[vector]; int j; - int k; - int t; + int t = tally[i]; int loc = 0; - int ok; - short *from; - short *to; - - i = order[vector]; - t = tally[i]; + short *from = froms[i]; + short *to = tos[i]; assert (t); - from = froms[i]; - to = tos[i]; - for (j = lowzero - from[0]; j < MAXTABLE; j++) { - ok = 1; + int k; + int ok = 1; for (k = 0; ok && k < t; k++) { @@ -790,10 +808,8 @@ pack_vector (int vector) } for (k = 0; ok && k < vector; k++) - { - if (pos[k] == j) - ok = 0; - } + if (pos[k] == j) + ok = 0; if (ok) { @@ -813,8 +829,8 @@ pack_vector (int vector) return j; } } - - assert (!"pack_vector"); +#define pack_vector_succeeded 0 + assert (pack_vector_succeeded); return 0; } @@ -855,10 +871,8 @@ pack_table (void) for (i = 0; i < nvectors; i++) { - if (froms[i]) - XFREE (froms[i]); - if (tos[i]) - XFREE (tos[i]); + XFREE (froms[i]); + XFREE (tos[i]); } XFREE (froms); @@ -873,14 +887,14 @@ static void output_base (void) { /* Output pact. */ - output_table_data (&output_obstack, base, + output_table_data (&format_obstack, base, base[0], 1, nstates); - muscle_insert ("pact", obstack_finish (&output_obstack)); + muscle_insert ("pact", obstack_finish (&format_obstack)); /* Output pgoto. */ - output_table_data (&output_obstack, base, + output_table_data (&format_obstack, base, base[nstates], nstates + 1, nvectors); - muscle_insert ("pgoto", obstack_finish (&output_obstack)); + muscle_insert ("pgoto", obstack_finish (&format_obstack)); XFREE (base); } @@ -889,9 +903,9 @@ output_base (void) static void output_table (void) { - output_table_data (&output_obstack, table, + output_table_data (&format_obstack, table, table[0], 1, high + 1); - muscle_insert ("table", obstack_finish (&output_obstack)); + muscle_insert ("table", obstack_finish (&format_obstack)); XFREE (table); } @@ -899,9 +913,9 @@ output_table (void) static void output_check (void) { - output_table_data (&output_obstack, check, + output_table_data (&format_obstack, check, check[0], 1, high + 1); - muscle_insert ("check", obstack_finish (&output_obstack)); + muscle_insert ("check", obstack_finish (&format_obstack)); XFREE (check); } @@ -938,12 +952,12 @@ output_actions (void) for (i = 0; i < nstates; ++i) { - XFREE (state_table[i]->shifts); - XFREE (state_table[i]->reductions); - XFREE (state_table[i]->errs); - free (state_table[i]); + free (states[i]->shifts); + XFREE (states[i]->reductions); + free (states[i]->errs); + free (states[i]); } - XFREE (state_table); + XFREE (states); } @@ -957,19 +971,24 @@ output_parser (const char *skel_filename, FILE *out) { int c; FILE *fskel; - size_t line; + size_t output_line; + size_t skeleton_line; fskel = xfopen (skel_filename, "r"); /* New output code. */ - line = 1; + output_line = 1; + skeleton_line = 1; c = getc (fskel); while (c != EOF) { if (c != '%') { if (c == '\n') - ++line; + { + ++output_line; + ++skeleton_line; + } putc (c, out); c = getc (fskel); } @@ -987,14 +1006,20 @@ output_parser (const char *skel_filename, FILE *out) muscle_key = obstack_finish (&muscle_obstack); muscle_value = muscle_find (muscle_key); if (!strcmp (muscle_key, "actions")) - actions_output (out, &line); + actions_output (out, &output_line); + else if (!strcmp (muscle_key, "guards")) + guards_output (out, &output_line); else if (!strcmp (muscle_key, "line")) - fprintf (out, "%d", line); + fprintf (out, "%d", output_line); + else if (!strcmp (muscle_key, "tokendef")) + token_definitions_output (out, &output_line); + else if (!strcmp (muscle_key, "skeleton-line")) + fprintf (out, "%d", skeleton_line); else if (muscle_value) { fputs (muscle_value, out); - line += get_lines_number (muscle_value); - } + output_line += get_lines_number (muscle_value); + } else { fputs ("%%", out); @@ -1050,7 +1075,8 @@ output_master_parser (void) #define MUSCLE_INSERT_PREFIX(Key, Value) \ { \ - obstack_fgrow2 (&muscle_obstack, "%s%s", spec_name_prefix, Value); \ + obstack_fgrow2 (&muscle_obstack, "%s%s", \ + spec_name_prefix ? spec_name_prefix : "yy", Value); \ obstack_1grow (&muscle_obstack, 0); \ muscle_insert (Key, obstack_finish (&muscle_obstack)); \ } @@ -1065,9 +1091,8 @@ prepare (void) MUSCLE_INSERT_INT ("debug", debug_flag); MUSCLE_INSERT_INT ("final", final_state); MUSCLE_INSERT_INT ("maxtok", max_user_token_number); - MUSCLE_INSERT_INT ("ntbase", ntokens); MUSCLE_INSERT_INT ("error-verbose", error_verbose); - MUSCLE_INSERT_STRING ("prefix", spec_name_prefix); + MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy"); MUSCLE_INSERT_INT ("nnts", nvars); MUSCLE_INSERT_INT ("nrules", nrules); @@ -1085,13 +1110,14 @@ prepare (void) static void header_output (void) { + size_t dummy_line; FILE *out = xfopen (spec_defines_file, "w"); char *macro_name = compute_header_macro (); fprintf (out, "#ifndef %s\n", macro_name); fprintf (out, "# define %s\n\n", macro_name); - fputs (muscle_find ("tokendef"), out); + token_definitions_output (out, &dummy_line); fprintf (out, "\ #ifndef YYSTYPE\n\ typedef %s @@ -1102,15 +1128,35 @@ yystype;\n\ if (!pure_parser) fprintf (out, "\nextern YYSTYPE %slval;\n", - spec_name_prefix); + spec_name_prefix ? spec_name_prefix : "yy"); + + if (locations_flag) + { + fputs ("\n\n", out); + fprintf (out, "\ +#ifndef YYLTYPE\n\ +typedef struct yyltype\n\ +{\n\ + int first_line;\n\ + int first_column;\n\ + int last_line;\n\ + int last_column;\n\ +} yyltype;\n\ +# define YYLTYPE yyltype\n\ +#endif\n"); + if (!pure_parser) + fprintf (out, "\nextern YYLTYPE %slloc;\n", + spec_name_prefix ? spec_name_prefix : "yy"); + } + if (semantic_parser) { int i; for (i = ntokens; i < nsyms; i++) /* don't make these for dummy nonterminals made by gensym. */ - if (*tags[i] != '@') - fprintf (out, "# define\tNT%s\t%d\n", tags[i], i); + if (*symbols[i]->tag != '@') + fprintf (out, "# define NT%s\t%d\n", symbols[i]->tag, i); } fprintf (out, "\n#endif /* not %s */\n", macro_name); @@ -1126,7 +1172,7 @@ yystype;\n\ void output (void) { - obstack_init (&output_obstack); + obstack_init (&format_obstack); output_token_translations (); output_gram (); @@ -1135,7 +1181,6 @@ output (void) if (semantic_parser) output_stos (); output_rule_data (); - XFREE (user_toknums); output_actions (); prepare (); @@ -1149,8 +1194,9 @@ output (void) if (defines_flag) header_output (); - free (rule_table + 1); - obstack_free (&muscle_obstack, 0); - obstack_free (&output_obstack, 0); - obstack_free (&action_obstack, 0); + free (rules + 1); + obstack_free (&muscle_obstack, NULL); + obstack_free (&format_obstack, NULL); + obstack_free (&action_obstack, NULL); + obstack_free (&attrs_obstack, NULL); }