X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a70083a3ed3fc3f69e0bed00220614f9d8263994..3f96f4dc41e366349d61f8918d8d6e9406da933d:/src/output.c diff --git a/src/output.c b/src/output.c index 20b33618..7c2d0136 100644 --- a/src/output.c +++ b/src/output.c @@ -1,5 +1,5 @@ /* Output the generated parsing program for bison, - Copyright (C) 1984, 1986, 1989, 1992, 2000 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. @@ -91,260 +91,126 @@ */ #include "system.h" +#include "obstack.h" +#include "quotearg.h" #include "getargs.h" -#include "alloc.h" #include "files.h" #include "gram.h" -#include "state.h" +#include "LR0.h" #include "complain.h" #include "output.h" #include "lalr.h" #include "reader.h" - -extern void berror PARAMS((const char *)); - -extern char **tags; -extern short *user_toknums; -extern int final_state; -extern errs **err_table; +#include "conflicts.h" +#include "muscle_tab.h" static int nvectors; static int nentries; -static short **froms; -static short **tos; -static short *tally; -static short *width; -static short *actrow; -static short *state_count; -static short *order; -static short *base; -static short *pos; -static short *table; -static short *check; +static short **froms = NULL; +static short **tos = NULL; +static short *tally = NULL; +static short *width = NULL; +static short *actrow = NULL; +static short *state_count = NULL; +static short *order = NULL; +static short *base = NULL; +static short *pos = NULL; +static short *table = NULL; +static short *check = NULL; static int lowzero; static int high; +struct obstack muscle_obstack; +struct obstack output_obstack; +int error_verbose = 0; + +/* FIXME. */ static inline void -output_short_table (FILE *out, - const char *table_name, - short *short_table, - short first_value, - short begin, short end) +output_table_data (struct obstack *oout, + short *table_data, + short first, + short begin, + short end) { - int i, j; - - fprintf (out, "static const short %s[] = {%6d", table_name, first_value); + int i; + int j = 1; - j = 10; - for (i = begin; i < end; i++) + obstack_fgrow1 (oout, "%6d", first); + for (i = begin; i < end; ++i) { - putc (',', out); - + obstack_1grow (oout, ','); if (j >= 10) { - putc ('\n', out); + obstack_sgrow (oout, "\n "); j = 1; } else - { - j++; - } - - fprintf (out, "%6d", short_table[i]); + ++j; + obstack_fgrow1 (oout, "%6d", table_data[i]); } - - fprintf (out, "\n};\n"); + obstack_1grow (oout, 0); } -/*--------------------------------------------------------------. -| output_headers -- Output constant strings to the beginning of | -| certain files. | -`--------------------------------------------------------------*/ - -#define GUARDSTR \ -"\n\ -#include \"%s\"\n\ -extern int yyerror;\n\ -extern int yycost;\n\ -extern char * yymsg;\n\ -extern YYSTYPE yyval;\n\ -\n\ -yyguard(n, yyvsp, yylsp)\n\ -register int n;\n\ -register YYSTYPE *yyvsp;\n\ -register YYLTYPE *yylsp;\n\ -{\n\ - yyerror = 0;\n\ - yycost = 0;\n\ - yymsg = 0;\n\ - switch (n)\n\ - {" - -#define ACTSTR \ -"\n\ -#include \"%s\"\n\ -extern YYSTYPE yyval;\n\ -extern int yychar;\n\ -\n\ -yyaction(n, yyvsp, yylsp)\n\ -register int n;\n\ -register YYSTYPE *yyvsp;\n\ -register YYLTYPE *yylsp;\n\ -{\n\ - switch (n)\n\ - {" - -#define ACTSTR_SIMPLE "\n switch (yyn) {\n" - -void -output_headers (void) -{ - if (semantic_parser) - fprintf (fguard, GUARDSTR, attrsfile); - - if (noparserflag) - return; - - fprintf (faction, (semantic_parser ? ACTSTR : ACTSTR_SIMPLE), attrsfile); -/* if (semantic_parser) JF moved this below - fprintf(ftable, "#include \"%s\"\n", attrsfile); - fprintf(ftable, "#include \n\n"); -*/ - - /* Rename certain symbols if -p was specified. */ - if (spec_name_prefix) - { - fprintf (ftable, "#define yyparse %sparse\n", spec_name_prefix); - fprintf (ftable, "#define yylex %slex\n", spec_name_prefix); - fprintf (ftable, "#define yyerror %serror\n", spec_name_prefix); - fprintf (ftable, "#define yylval %slval\n", spec_name_prefix); - fprintf (ftable, "#define yychar %schar\n", spec_name_prefix); - fprintf (ftable, "#define yydebug %sdebug\n", spec_name_prefix); - fprintf (ftable, "#define yynerrs %snerrs\n", spec_name_prefix); - } -} - - -/*-------------------------------------------------------. -| Output constant strings to the ends of certain files. | -`-------------------------------------------------------*/ - -void -output_trailers (void) -{ - if (semantic_parser) - fprintf (fguard, "\n }\n}\n"); - - fprintf (faction, "\n"); - - if (noparserflag) - return; - - if (semantic_parser) - fprintf (faction, " }\n"); - fprintf (faction, "}\n"); -} - - - static void output_token_translations (void) { - int i, j; -/* short *sp; JF unused */ - - if (translations) - { - fprintf (ftable, - "\n#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\n", - max_user_token_number, nsyms); - - if (ntokens < 127) /* play it very safe; check maximum element value. */ - fprintf (ftable, "\nstatic const char yytranslate[] = { 0"); - else - fprintf (ftable, "\nstatic const short yytranslate[] = { 0"); - - j = 10; - for (i = 1; i <= max_user_token_number; i++) - { - putc (',', ftable); - - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } - - fprintf (ftable, "%6d", token_translations[i]); - } - - fprintf (ftable, "\n};\n"); - } - else - { - fprintf (ftable, "\n#define YYTRANSLATE(x) (x)\n"); - } + output_table_data (&output_obstack, token_translations, + 0, 1, max_user_token_number + 1); + muscle_insert ("translate", obstack_finish (&output_obstack)); + XFREE (token_translations); } static void output_gram (void) { - int j; - short *sp; - - /* With the ordinary parser, - yyprhs and yyrhs are needed only for yydebug. */ - /* With the noparser option, all tables are generated */ - if (!semantic_parser && !noparserflag) - fprintf (ftable, "\n#if YYDEBUG != 0\n"); - - output_short_table (ftable, "yyprhs", rrhs, - 0, 1, nrules + 1); - - fprintf (ftable, "\nstatic const short yyrhs[] = {%6d", ritem[0]); - - j = 10; - for (sp = ritem + 1; *sp; sp++) - { - putc (',', ftable); - - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } - - if (*sp > 0) - fprintf (ftable, "%6d", *sp); - else - fprintf (ftable, " 0"); - } - - fprintf (ftable, "\n};\n"); - - if (!semantic_parser && !noparserflag) - fprintf (ftable, "\n#endif\n"); + { + 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, + 0, 1, nrules + 1); + XFREE (values); + } + + muscle_insert ("prhs", obstack_finish (&output_obstack)); + + { + size_t yyrhs_size = 1; + short *yyrhs, *sp; + int i; + + for (sp = ritem + 1; *sp; sp++) + ++yyrhs_size; + yyrhs = XMALLOC (short, yyrhs_size); + + for (sp = ritem + 1, i = 1; *sp; ++sp, ++i) + yyrhs[i] = *sp > 0 ? *sp : 0; + + output_table_data (&output_obstack, yyrhs, + ritem[0], 1, yyrhs_size); + muscle_insert ("rhs", obstack_finish (&output_obstack)); + + XFREE (yyrhs); + } } static void output_stos (void) { - output_short_table (ftable, "yystos", accessing_symbol, - 0, 1, nstates); + 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, + 0, 1, nstates); + muscle_insert ("stos", obstack_finish (&output_obstack)); } @@ -353,152 +219,74 @@ output_rule_data (void) { int i; int j; + short *short_tab = NULL; - fputs ("\n\ -#if YYDEBUG != 0\n\ -/* YYRLINE[yyn]: source line where rule number YYN was defined. */\n", - ftable); - - output_short_table (ftable, "yyrline", rline, - 0, 1, nrules + 1); + { + 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, + 0, 1, nrules + 1); + muscle_insert ("rline", obstack_finish (&output_obstack)); + XFREE (values); + } - fputs ("#endif\n\n", ftable); - if (toknumflag || noparserflag) + j = 0; + for (i = 0; i < nsyms; i++) { - fprintf (ftable, "#define YYNTOKENS %d\n", ntokens); - fprintf (ftable, "#define YYNNTS %d\n", nvars); - fprintf (ftable, "#define YYNRULES %d\n", nrules); - fprintf (ftable, "#define YYNSTATES %d\n", nstates); - fprintf (ftable, "#define YYMAXUTOK %d\n\n", max_user_token_number); - } - - if (!toknumflag && !noparserflag) - fprintf (ftable, "\n#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)\n\n"); - - /* Output the table of symbol names. */ - - fprintf (ftable, - "static const char * const yytname[] = { \"%s\"", tags[0]); - - j = strlen (tags[0]) + 44; - for (i = 1; i < nsyms; i++) - /* this used to be i<=nsyms, but that output a final "" symbol - almost by accident */ - { - char *p; - putc (',', ftable); - j++; - - if (j > 75) + /* 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])); + /* Width of the next token, including the two quotes, the coma + and the space. */ + int strsize = strlen (cp) + 2; + + if (j + strsize > 75) { - putc ('\n', ftable); - j = 0; + obstack_sgrow (&output_obstack, "\n "); + j = 2; } - putc ('\"', ftable); - j++; - - for (p = tags[i]; p && *p; p++) - { - if (*p == '"' || *p == '\\') - { - fprintf (ftable, "\\%c", *p); - j += 2; - } - else if (*p == '\n') - { - fprintf (ftable, "\\n"); - j += 2; - } - else if (*p == '\t') - { - fprintf (ftable, "\\t"); - j += 2; - } - else if (*p == '\b') - { - fprintf (ftable, "\\b"); - j += 2; - } - else if (*p < 040 || *p >= 0177) - { - fprintf (ftable, "\\%03o", *p); - j += 4; - } - else - { - putc (*p, ftable); - j++; - } - } - - putc ('\"', ftable); - j++; + obstack_sgrow (&output_obstack, cp); + obstack_sgrow (&output_obstack, ", "); + j += strsize; } /* add a NULL entry to list of tokens */ - fprintf (ftable, ", NULL\n};\n"); + obstack_sgrow (&output_obstack, "NULL"); - if (!toknumflag && !noparserflag) - fprintf (ftable, "#endif\n\n"); + /* Finish table and store. */ + obstack_1grow (&output_obstack, 0); + muscle_insert ("tname", obstack_finish (&output_obstack)); /* Output YYTOKNUM. */ - if (toknumflag) - { - output_short_table (ftable, "yytoknum", user_toknums, - 0, 1, ntokens + 1); - } + output_table_data (&output_obstack, user_toknums, + 0, 1, ntokens + 1); + muscle_insert ("toknum", obstack_finish (&output_obstack)); /* Output YYR1. */ - fputs ("\ -/* YYR1[YYN]: Symbol number of symbol that rule YYN derives. */\n", ftable); - - output_short_table (ftable, "yyr1", rlhs, - 0, 1, nrules + 1); - FREE (rlhs + 1); - - putc ('\n', ftable); + { + 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, + 0, 1, nrules + 1); + muscle_insert ("r1", obstack_finish (&output_obstack)); + XFREE (values); + } /* Output YYR2. */ - fputs ("\ -/* YYR2[YYN]: Number of symbols composing right hand side of rule YYN. */\n\ -static const short yyr2[] = { 0", ftable); - j = 10; + short_tab = XMALLOC (short, nrules + 1); for (i = 1; i < nrules; i++) - { - putc (',', ftable); - - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } - - fprintf (ftable, "%6d", rrhs[i + 1] - rrhs[i] - 1); - } - - putc (',', ftable); - if (j >= 10) - putc ('\n', ftable); - - fprintf (ftable, "%6d\n};\n", nitems - rrhs[nrules] - 1); - FREE (rrhs + 1); + 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, + 0, 1, nrules + 1); + muscle_insert ("r2", obstack_finish (&output_obstack)); + XFREE (short_tab); } - -static void -output_defines (void) -{ - fprintf (ftable, "\n\n#define\tYYFINAL\t\t%d\n", final_state); - fprintf (ftable, "#define\tYYFLAG\t\t%d\n", MINSHORT); - fprintf (ftable, "#define\tYYNTBASE\t%d\n", ntokens); -} - - /*------------------------------------------------------------------. | Decide what to do for each type of token if seen as the lookahead | | token in specified state. The value returned is used as the | @@ -521,15 +309,11 @@ action_row (int state) int k; int m = 0; int n = 0; - int count; int default_rule; int nreds; - int max; int rule; int shift_state; int symbol; - unsigned mask; - unsigned *wordp; reductions *redp; shifts *shiftp; errs *errp; @@ -540,7 +324,7 @@ action_row (int state) default_rule = 0; nreds = 0; - redp = reduction_table[state]; + redp = state_table[state]->reductions; if (redp) { @@ -550,69 +334,46 @@ action_row (int state) { /* loop over all the rules available here which require lookahead */ - m = lookaheads[state]; - n = lookaheads[state + 1]; + m = state_table[state]->lookaheads; + n = state_table[state + 1]->lookaheads; for (i = n - 1; i >= m; i--) - { - rule = -LAruleno[i]; - wordp = LA + i * tokensetsize; - mask = 1; - - /* 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 (mask & *wordp) - actrow[j] = rule; - - mask <<= 1; - if (mask == 0) - { - mask = 1; - wordp++; - } - } - } + /* 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]; } } - shiftp = shift_table[state]; - /* 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. */ - - if (shiftp) + shiftp = state_table[state]->shifts; + for (i = 0; i < shiftp->nshifts; i++) { - k = shiftp->nshifts; - - for (i = 0; i < k; i++) - { - shift_state = shiftp->shifts[i]; - if (!shift_state) - continue; + shift_state = shiftp->shifts[i]; + if (!shift_state) + continue; - symbol = accessing_symbol[shift_state]; + symbol = state_table[shift_state]->accessing_symbol; - if (ISVAR (symbol)) - break; + if (ISVAR (symbol)) + break; - actrow[symbol] = shift_state; + actrow[symbol] = shift_state; - /* Do not use any default reduction if there is a shift for - error */ - if (symbol == error_token_number) - nodefault = 1; - } + /* Do not use any default reduction if there is a shift for + error */ + if (symbol == error_token_number) + nodefault = 1; } - errp = err_table[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) { @@ -630,14 +391,14 @@ action_row (int state) if (nreds >= 1 && !nodefault) { - if (consistent[state]) + if (state_table[state]->consistent) default_rule = redp->rules[0]; else { - max = 0; + int max = 0; for (i = m; i < n; i++) { - count = 0; + int count = 0; rule = -LAruleno[i]; for (j = 0; j < ntokens; j++) @@ -702,8 +463,8 @@ save_row (int state) if (count == 0) return; - froms[state] = sp1 = sp = NEW2 (count, short); - tos[state] = sp2 = NEW2 (count, short); + froms[state] = sp1 = sp = XCALLOC (short, count); + tos[state] = sp2 = XCALLOC (short, count); for (i = 0; i < ntokens; i++) { @@ -731,70 +492,67 @@ static void token_actions (void) { int i; - short *yydefact = NEW2 (nstates, short); + short *yydefact = XCALLOC (short, nstates); - actrow = NEW2 (ntokens, short); + actrow = XCALLOC (short, ntokens); for (i = 0; i < nstates; ++i) { yydefact[i] = action_row (i); save_row (i); } - FREE (actrow); - - output_short_table (ftable, "yydefact", yydefact, - yydefact[0], 1, nstates); - FREE (yydefact); -} + output_table_data (&output_obstack, yydefact, + yydefact[0], 1, nstates); + muscle_insert ("defact", obstack_finish (&output_obstack)); -static void -free_shifts (void) -{ - shifts *sp, *sptmp; /* JF derefrenced freed ptr */ - - FREE (shift_table); - - for (sp = first_shift; sp; sp = sptmp) - { - sptmp = sp->next; - FREE (sp); - } + XFREE (actrow); + XFREE (yydefact); } +/*-----------------------------. +| Output the actions to OOUT. | +`-----------------------------*/ + static void -free_reductions (void) +actions_output (struct obstack *oout) { - reductions *rp, *rptmp; /* JF fixed freed ptr */ - - FREE (reduction_table); - - for (rp = first_reduction; rp; rp = rptmp) - { - rptmp = rp->next; - FREE (rp); - } + int rule; + for (rule = 1; rule < nrules + 1; ++rule) + if (rule_table[rule].action) + { + obstack_fgrow1 (oout, " case %d:\n", rule); + + if (!no_lines_flag) + obstack_fgrow2 (oout, muscle_find ("linef"), + rule_table[rule].action_line, + quotearg_style (c_quoting_style, + muscle_find ("filename"))); + obstack_1grow (oout, '{'); + obstack_sgrow (oout, rule_table[rule].action); + /* 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. */ + obstack_fgrow1 (oout, "%s}\n break;\n\n", yacc_flag ? ";" : ""); + } } - static void save_column (int symbol, int default_state) { int i; - int m; - int n; short *sp; short *sp1; short *sp2; int count; int symno; - m = goto_map[symbol]; - n = goto_map[symbol + 1]; + short begin = goto_map[symbol]; + short end = goto_map[symbol + 1]; count = 0; - for (i = m; i < n; i++) + for (i = begin; i < end; i++) { if (to_state[i] != default_state) count++; @@ -805,10 +563,10 @@ save_column (int symbol, int default_state) symno = symbol - ntokens + nstates; - froms[symno] = sp1 = sp = NEW2 (count, short); - tos[symno] = sp2 = NEW2 (count, short); + froms[symno] = sp1 = sp = XCALLOC (short, count); + tos[symno] = sp2 = XCALLOC (short, count); - for (i = m; i < n; i++) + for (i = begin; i < end; i++) { if (to_state[i] != default_state) { @@ -870,36 +628,23 @@ default_goto (int symbol) static void goto_actions (void) { - int i, j, k; - - state_count = NEW2 (nstates, short); - - k = default_goto (ntokens); - fprintf (ftable, "\nstatic const short yydefgoto[] = {%6d", k); - save_column (ntokens, k); + int i; + short *yydefgoto = XMALLOC (short, nsyms - ntokens); - j = 10; - for (i = ntokens + 1; i < nsyms; i++) + state_count = XCALLOC (short, nstates); + for (i = ntokens; i < nsyms; ++i) { - putc (',', ftable); - - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } - - k = default_goto (i); - fprintf (ftable, "%6d", k); - save_column (i, k); + int default_state = default_goto (i); + save_column (i, default_state); + yydefgoto[i - ntokens] = default_state; } - fprintf (ftable, "\n};\n"); - FREE (state_count); + output_table_data (&output_obstack, yydefgoto, + yydefgoto[0], 1, nsyms - ntokens); + muscle_insert ("defgoto", obstack_finish (&output_obstack)); + + XFREE (state_count); + XFREE (yydefgoto); } @@ -915,7 +660,7 @@ sort_actions (void) int t; int w; - order = NEW2 (nvectors, short); + order = XCALLOC (short, nvectors); nentries = 0; for (i = 0; i < nvectors; i++) @@ -996,8 +741,7 @@ pack_vector (int vector) i = order[vector]; t = tally[i]; - if (t == 0) - berror ("pack_vector"); + assert (t); from = froms[i]; to = tos[i]; @@ -1041,8 +785,8 @@ pack_vector (int vector) } } - berror ("pack_vector"); - return 0; /* JF keep lint happy */ + assert (!"pack_vector"); + return 0; } @@ -1053,10 +797,10 @@ pack_table (void) int place; int state; - base = NEW2 (nvectors, short); - pos = NEW2 (nentries, short); - table = NEW2 (MAXTABLE, short); - check = NEW2 (MAXTABLE, short); + base = XCALLOC (short, nvectors); + pos = XCALLOC (short, nentries); + table = XCALLOC (short, MAXTABLE); + check = XCALLOC (short, MAXTABLE); lowzero = 0; high = 0; @@ -1083,14 +827,14 @@ pack_table (void) for (i = 0; i < nvectors; i++) { if (froms[i]) - FREE (froms[i]); + XFREE (froms[i]); if (tos[i]) - FREE (tos[i]); + XFREE (tos[i]); } - FREE (froms); - FREE (tos); - FREE (pos); + XFREE (froms); + XFREE (tos); + XFREE (pos); } /* the following functions output yytable, yycheck @@ -1099,34 +843,37 @@ pack_table (void) static void output_base (void) { - output_short_table (ftable, "yypact", base, - base[0], 1, nstates); + /* Output pact. */ + output_table_data (&output_obstack, base, + base[0], 1, nstates); + muscle_insert ("pact", obstack_finish (&output_obstack)); - putc ('\n', ftable); + /* Output pgoto. */ + output_table_data (&output_obstack, base, + base[nstates], nstates + 1, nvectors); + muscle_insert ("pgoto", obstack_finish (&output_obstack)); - output_short_table (ftable, "yypgoto", base, - base[nstates], nstates + 1, nvectors); - - FREE (base); + XFREE (base); } static void output_table (void) { - fprintf (ftable, "\n\n#define\tYYLAST\t\t%d\n\n\n", high); - output_short_table (ftable, "yytable", table, - table[0], 1, high + 1); - FREE (table); + output_table_data (&output_obstack, table, + table[0], 1, high + 1); + muscle_insert ("table", obstack_finish (&output_obstack)); + XFREE (table); } static void output_check (void) { - output_short_table (ftable, "yycheck", check, - check[0], 1, high + 1); - FREE (check); + output_table_data (&output_obstack, check, + check[0], 1, high + 1); + muscle_insert ("check", obstack_finish (&output_obstack)); + XFREE (check); } /* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable @@ -1135,148 +882,164 @@ output_check (void) static void output_actions (void) { + int i; nvectors = nstates + nvars; - froms = NEW2 (nvectors, short *); - tos = NEW2 (nvectors, short *); - tally = NEW2 (nvectors, short); - width = NEW2 (nvectors, short); + froms = XCALLOC (short *, nvectors); + tos = XCALLOC (short *, nvectors); + tally = XCALLOC (short, nvectors); + width = XCALLOC (short, nvectors); token_actions (); - free_shifts (); - free_reductions (); - FREE (lookaheads); - FREE (LA); - FREE (LAruleno); - FREE (accessing_symbol); + XFREE (LA); + XFREE (LAruleno); goto_actions (); - FREE (goto_map + ntokens); - FREE (from_state); - FREE (to_state); + XFREE (goto_map + ntokens); + XFREE (from_state); + XFREE (to_state); sort_actions (); pack_table (); - putc ('\n', ftable); + output_base (); output_table (); - putc ('\n', ftable); + output_check (); + + 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]); + } + XFREE (state_table); } -/* copy the parser code into the ftable file at the end. */ + +/*------------------------------------------------------------. +| Copy the parser code from SKEL_FILENAME into OOUT obstack. | +| and do the muscle substitution. | +`------------------------------------------------------------*/ static void -output_parser (void) +output_parser (const char *skel_filename, struct obstack *oout) { int c; -#ifdef DONTDEF - FILE *fpars; -#else -#define fpars fparser -#endif + FILE *fskel; + size_t line; - if (pure_parser) - fprintf (ftable, "#define YYPURE 1\n\n"); + fskel = xfopen (skel_filename, "r"); -#ifdef DONTDEF /* JF no longer needed 'cuz open_extra_files changes the - currently open parser from bison.simple to bison.hairy */ - if (semantic_parser) - fpars = fparser; - else - fpars = fparser1; -#endif - - /* Loop over lines in the standard parser file. */ - - while (1) + /* New output code. */ + line = 1; + c = getc (fskel); + while (c != EOF) { - int write_line = 1; - - c = getc (fpars); - - /* See if the line starts with `#line. - If so, set write_line to 0. */ - if (nolinesflag) - if (c == '#') - { - c = getc (fpars); - if (c == 'l') - { - c = getc (fpars); - if (c == 'i') - { - c = getc (fpars); - if (c == 'n') - { - c = getc (fpars); - if (c == 'e') - write_line = 0; - else - fprintf (ftable, "#lin"); - } - else - fprintf (ftable, "#li"); - } - else - fprintf (ftable, "#l"); - } - else - fprintf (ftable, "#"); - } - - /* now write out the line... */ - for (; c != '\n' && c != EOF; c = getc (fpars)) - if (write_line) - { - if (c == '$') - { - /* `$' in the parser file indicates where to put the actions. - Copy them in at this point. */ - rewind (faction); - for (c = getc (faction); c != EOF; c = getc (faction)) - putc (c, ftable); - } - else - putc (c, ftable); - } - if (c == EOF) - break; - putc (c, ftable); + if (c != '%') + { + if (c == '\n') + ++line; + obstack_1grow (oout, c); + c = getc (fskel); + } + else if ((c = getc (fskel)) == '%') + { + /* Read the muscle. */ + const char *muscle_key = 0; + const char *muscle_value = 0; + + while (isalnum (c = getc (fskel)) || c == '-') + obstack_1grow (&muscle_obstack, c); + obstack_1grow (&muscle_obstack, 0); + + /* Output the right value, or see if it's something special. */ + muscle_key = obstack_finish (&muscle_obstack); + muscle_value = muscle_find (muscle_key); + if (!strcmp (muscle_key, "actions")) + actions_output (oout); + else if (!strcmp (muscle_key, "line")) + obstack_fgrow1 (oout, "%d", line + 1); + else if (muscle_value) + obstack_sgrow (oout, muscle_value); + else + { + obstack_sgrow (oout, "%%"); + obstack_sgrow (oout, muscle_key); + } + } + else + obstack_1grow (oout, '%'); } + + /* End. */ + xfclose (fskel); } +/*----------------------------------------. +| Prepare the master parser to be output | +`----------------------------------------*/ + static void -output_program (void) +output_master_parser (void) { - int c; - - if (!nolinesflag) - fprintf (ftable, "#line %d \"%s\"\n", lineno, infile); - - c = getc (finput); - while (c != EOF) + if (!skeleton) { - putc (c, ftable); - c = getc (finput); + if (semantic_parser) + skeleton = skeleton_find ("BISON_HAIRY", BISON_HAIRY); + else + skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE); } + muscle_insert ("skeleton", skeleton); + output_parser (skeleton, &table_obstack); } -static void -free_itemsets (void) -{ - core *cp, *cptmp; +/* FIXME. */ - FREE (state_table); +#define MUSCLE_INSERT_INT(Key, Value) \ +{ \ + obstack_fgrow1 (&muscle_obstack, "%d", Value); \ + obstack_1grow (&muscle_obstack, 0); \ + muscle_insert (Key, obstack_finish (&muscle_obstack)); \ +} - for (cp = first_state; cp; cp = cptmp) - { - cptmp = cp->next; - FREE (cp); - } +#define MUSCLE_INSERT_STRING(Key, Value) \ +{ \ + obstack_sgrow (&muscle_obstack, Value); \ + obstack_1grow (&muscle_obstack, 0); \ + muscle_insert (Key, obstack_finish (&muscle_obstack)); \ } +#define MUSCLE_INSERT_PREFIX(Key, Value) \ +{ \ + obstack_fgrow2 (&muscle_obstack, "%s%s", spec_name_prefix, Value); \ + obstack_1grow (&muscle_obstack, 0); \ + muscle_insert (Key, obstack_finish (&muscle_obstack)); \ +} + +static void +prepare (void) +{ + MUSCLE_INSERT_INT ("last", high); + MUSCLE_INSERT_INT ("flag", MINSHORT); + MUSCLE_INSERT_INT ("pure", pure_parser); + MUSCLE_INSERT_INT ("nsym", nsyms); + 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_INT ("nnts", nvars); + MUSCLE_INSERT_INT ("nrules", nrules); + MUSCLE_INSERT_INT ("nstates", nstates); + MUSCLE_INSERT_INT ("ntokens", ntokens); + + MUSCLE_INSERT_INT ("locations-flag", locations_flag); +} /*----------------------------------------------------------. | Output the parsing tables and the parser code to ftable. | @@ -1285,52 +1048,27 @@ free_itemsets (void) void output (void) { - int c; - - /* output_token_defines(ftable); / * JF put out token defines FIRST */ - if (!semantic_parser) /* JF Put out other stuff */ - { - rewind (fattrs); - while ((c = getc (fattrs)) != EOF) - putc (c, ftable); - } - reader_output_yylsp (ftable); - if (debugflag) - fputs ("\ -#ifndef YYDEBUG\n\ -#define YYDEBUG 1\n\ -#endif\n\ -\n", - ftable); + obstack_init (&output_obstack); - if (semantic_parser) - fprintf (ftable, "#include \"%s\"\n", attrsfile); - - if (!noparserflag) - fprintf (ftable, "#include \n\n"); - - /* Make "const" do nothing if not in ANSI C. */ - fputs ("\ -#ifndef __cplusplus\n\ -# ifndef __STDC__\n\ -# define const\n\ -# endif\n\ -#endif\n\ -\n", - ftable); - - free_itemsets (); - output_defines (); output_token_translations (); -/* if (semantic_parser) */ - /* This is now unconditional because debugging printouts can use it. */ output_gram (); - FREE (ritem); + + XFREE (ritem); if (semantic_parser) output_stos (); output_rule_data (); + XFREE (user_toknums); output_actions (); - if (!noparserflag) - output_parser (); - output_program (); + + prepare (); + /* Copy definitions in directive. */ + obstack_1grow (&attrs_obstack, 0); + muscle_insert ("prologue", obstack_finish (&attrs_obstack)); + + output_master_parser (); + + free (rule_table + 1); + obstack_free (&muscle_obstack, 0); + obstack_free (&output_obstack, 0); + obstack_free (&action_obstack, 0); }