X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/43591cec981a3e7dd87bd1aef63ea0b9ec73c01c..e91ff6ce3d2653b41265591dafd4bdb32ae114c2:/src/output.c?ds=inline diff --git a/src/output.c b/src/output.c index b23ffe8e..f8cb5350 100644 --- a/src/output.c +++ b/src/output.c @@ -1,5 +1,6 @@ /* Output the generated parsing program for bison, - Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002 + Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -19,80 +20,79 @@ 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 "bitsetv.h" +#include "quotearg.h" +#include "error.h" #include "getargs.h" -#include "xalloc.h" #include "files.h" #include "gram.h" #include "LR0.h" @@ -100,383 +100,253 @@ #include "output.h" #include "lalr.h" #include "reader.h" +#include "symtab.h" #include "conflicts.h" +#include "muscle_tab.h" -extern void berror PARAMS((const char *)); - +/* From lib/readpipe.h. */ +FILE *readpipe PARAMS ((const char *, ...)); +/* From src/scan-skel.l. */ +int skel_lex PARAMS ((void)); +extern FILE *skel_in; 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; + +/* TABLE_SIZE is the allocated size of both TABLE and CHECK. + We start with the original hard-coded value: SHRT_MAX + (yes, not USHRT_MAX). */ +static size_t table_size = SHRT_MAX; +static short *table = NULL; +static short *check = NULL; static int lowzero; static int high; +struct obstack muscle_obstack; +static struct obstack format_obstack; +int error_verbose = 0; -static inline void -output_short_or_char_table (FILE *out, - const char *comment, - const char *type, - const char *table_name, - short *short_table, - short first_value, - short begin, short end) -{ - int i, j; - - if (comment) - fprintf (out, "/* %s. */\n", comment); - - fprintf (out, "static const %s %s[] =\n{\n %6d", - type, table_name, first_value); - j = 1; - for (i = begin; i < end; i++) - { - putc (',', out); +/*----------------------------------------------------------------. +| If TABLE (and CHECK) appear to be small to be addressed at | +| DESIRED, grow them. Note that TABLE[DESIRED] is to be used, so | +| the desired size is at least DESIRED + 1. | +`----------------------------------------------------------------*/ - if (j >= 10) - { - fputs ("\n ", out); - j = 1; - } - else - { - j++; - } - - fprintf (out, "%6d", short_table[i]); - } - - fprintf (out, "\n};\n"); -} - - -static inline void -output_short_table (FILE *out, - const char *comment, - const char *table_name, - short *short_table, - short first_value, - short begin, short end) +static void +table_grow (size_t desired) { - output_short_or_char_table (out, comment, "short", table_name, short_table, - first_value, begin, end); -} + size_t old_size = table_size; + while (table_size <= desired) + table_size *= 2; -/*--------------------------------------------------------------. -| 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 (no_parser_flag) - return; + if (trace_flag) + fprintf (stderr, "growing table and check from: %d to %d\n", + old_size, table_size); - 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"); -*/ + table = XREALLOC (table, short, table_size); + check = XREALLOC (check, short, table_size); - /* Rename certain symbols if -p was specified. */ - if (spec_name_prefix) + for (/* Nothing. */; old_size < table_size; ++old_size) { - 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); + table[old_size] = 0; + check[old_size] = -1; } } -/*-------------------------------------------------------. -| Output constant strings to the ends of certain files. | -`-------------------------------------------------------*/ - -void -output_trailers (void) -{ - if (semantic_parser) - fprintf (fguard, "\n }\n}\n"); - - fprintf (faction, "\n"); +/*------------------------------------------------------------------. +| Create a function NAME which Format the FIRST and then | +| TABLE_DATA[BEGIN..END[ (of TYPE) into OOUT, and return the number | +| of bits needed for its longuest value. | +`------------------------------------------------------------------*/ - if (no_parser_flag) - return; - if (semantic_parser) - fprintf (faction, " }\n"); - fprintf (faction, "}\n"); +#define GENERATE_OUTPUT_TABLE(Name, Type) \ + \ +static inline long int \ +Name (struct obstack *oout, \ + Type *table_data, \ + Type first, \ + int begin, \ + int end) \ +{ \ + long int max = first; \ + int i; \ + int j = 1; \ + \ + obstack_fgrow1 (oout, "%6d", first); \ + for (i = begin; i < end; ++i) \ + { \ + obstack_1grow (oout, ','); \ + if (j >= 10) \ + { \ + obstack_sgrow (oout, "\n "); \ + j = 1; \ + } \ + else \ + ++j; \ + obstack_fgrow1 (oout, "%6d", table_data[i]); \ + if (table_data[i] > max) \ + max = table_data[i]; \ + } \ + obstack_1grow (oout, 0); \ + \ + return max; \ } +GENERATE_OUTPUT_TABLE(output_int_table, int) +GENERATE_OUTPUT_TABLE(output_short_table, short) +GENERATE_OUTPUT_TABLE(output_token_number_table, token_number_t) +GENERATE_OUTPUT_TABLE(output_item_number_table, item_number_t) -static void -output_token_translations (void) -{ - fputs ("\ -\n\ -/* YYRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */\n", - ftable); - if (translations) - { - fprintf (ftable, - "#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\ -\n\ -\n", - max_user_token_number, nsyms); - - output_short_or_char_table (ftable, - "YYRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX", - ntokens < 127 ? "char" : "short", - "yytranslate", token_translations, - 0, 1, max_user_token_number + 1); - } - else - { - fprintf (ftable, "\n#define YYTRANSLATE(x) (x)\n"); - } -} - +/*-----------------------------------------------------------------. +| Prepare the muscles related to the tokens: translate, tname, and | +| toknum. | +`-----------------------------------------------------------------*/ static void -output_gram (void) +prepare_tokens (void) { - /* With the ordinary parser, - yyprhs and yyrhs are needed only for yydebug. */ - /* With the no_parser option, all tables are generated */ - if (!semantic_parser && !no_parser_flag) - fprintf (ftable, "\n#if YYDEBUG != 0\n"); - - output_short_table (ftable, NULL, "yyprhs", rrhs, - 0, 1, nrules + 1); + long int max = output_token_number_table (&format_obstack, + token_translations, + 0, 1, max_user_token_number + 1); + muscle_insert ("translate", obstack_finish (&format_obstack)); + MUSCLE_INSERT_LONG_INT ("token_number_max", max); + XFREE (token_translations); { - size_t yyrhs_size = 1; - short *yyrhs, *sp; int i; + int j = 0; + for (i = 0; i < nsyms; i++) + { + /* 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, + 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 (&format_obstack, "\n "); + j = 2; + } - 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; + obstack_sgrow (&format_obstack, cp); + obstack_sgrow (&format_obstack, ", "); + j += strsize; + } + /* Add a NULL entry to list of tokens (well, 0, as NULL might not be + defined). */ + obstack_sgrow (&format_obstack, "0"); - output_short_table (ftable, NULL, "yyrhs", yyrhs, - ritem[0], 1, yyrhs_size); - XFREE (yyrhs); + /* Finish table and store. */ + obstack_1grow (&format_obstack, 0); + muscle_insert ("tname", obstack_finish (&format_obstack)); } - if (!semantic_parser && !no_parser_flag) - fprintf (ftable, "\n#endif\n"); + /* Output YYTOKNUM. */ + { + int i; + short *values = XCALLOC (short, ntokens + 1); + for (i = 0; i < ntokens + 1; ++i) + values[i] = symbols[i]->user_token_number; + output_short_table (&format_obstack, values, + 0, 1, ntokens + 1); + muscle_insert ("toknum", obstack_finish (&format_obstack)); + free (values); + } } -static void -output_stos (void) -{ - output_short_table (ftable, NULL, "yystos", accessing_symbol, - 0, 1, nstates); -} - +/*-------------------------------------------------------------. +| Prepare the muscles related to the rules: rhs, prhs, r1, r2, | +| rline. | +`-------------------------------------------------------------*/ static void -output_rule_data (void) +prepare_rules (void) { - int i; - int j; - short *short_tab = NULL; - - fputs ("\n\ -#if YYDEBUG != 0\n", - ftable); - - output_short_table (ftable, - "YYRLINE[YYN] -- source line where rule number YYN was defined", - "yyrline", rline, - 0, 1, nrules + 1); - - fputs ("#endif\n\n", ftable); - - if (token_table_flag || no_parser_flag) + long int max; + item_number_t *rhsp; + int r; + int i = 0; + item_number_t *rhs = XMALLOC (item_number_t, nritems); + short *prhs = XMALLOC (short, nrules + 1); + token_number_t *r1 = XMALLOC (token_number_t, nrules + 1); + short *r2 = XMALLOC (short, nrules + 1); + short *rline = XMALLOC (short, nrules + 1); + + for (r = 1; r < nrules + 1; ++r) { - 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); + /* Index of rule R in RHS. */ + prhs[r] = i; + /* RHS of the rule R. */ + for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp) + rhs[i++] = *rhsp; + /* LHS of the rule R. */ + r1[r] = rules[r].lhs->number; + /* Length of rule R's RHS. */ + r2[r] = i - prhs[r]; + /* Separator in RHS. */ + rhs[i++] = -1; + /* Line where rule was defined. */ + rline[r] = rules[r].line; } + assert (i == nritems); - /* Output the table of symbol names. */ - if (!token_table_flag && !no_parser_flag) - fputs ("\n#if YYDEBUG != 0 || defined YYERROR_VERBOSE\n\n", ftable); - fputs ("\ -/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */\n", - ftable); - fprintf (ftable, - "static const char *const yytname[] =\n{\n "); - - j = 0; - for (i = 0; i < nsyms; i++) - /* this used to be i<=nsyms, but that output a final "" symbol - almost by accident */ - { - /* Width of the next token, including the two quotes, the coma - and the space. */ - int strsize = 4; - char *p; - - for (p = tags[i]; p && *p; p++) - if (*p == '"' || *p == '\\' || *p == '\n' || *p == '\t' - || *p == '\b') - strsize += 2; - else if (*p < 040 || *p >= 0177) - strsize += 4; - else - strsize++; - - if (j + strsize > 75) - { - fputs ("\n ", ftable); - j = 2; - } + max = output_int_table (&format_obstack, rhs, ritem[0], 1, nritems); + muscle_insert ("rhs", obstack_finish (&format_obstack)); + MUSCLE_INSERT_LONG_INT ("rhs_number_max", max); - putc ('\"', ftable); - for (p = tags[i]; p && *p; p++) - { - if (*p == '"' || *p == '\\') - { - fprintf (ftable, "\\%c", *p); - } - else if (*p == '\n') - { - fprintf (ftable, "\\n"); - } - else if (*p == '\t') - { - fprintf (ftable, "\\t"); - } - else if (*p == '\b') - { - fprintf (ftable, "\\b"); - } - else if (*p < 040 || *p >= 0177) - { - fprintf (ftable, "\\%03o", *p); - } - else - { - putc (*p, ftable); - } - } + output_short_table (&format_obstack, prhs, 0, 1, nrules + 1); + muscle_insert ("prhs", obstack_finish (&format_obstack)); - fputs ("\", ", ftable); - j += strsize; - } - /* add a NULL entry to list of tokens */ - fprintf (ftable, "NULL\n};\n"); + output_short_table (&format_obstack, rline, 0, 1, nrules + 1); + muscle_insert ("rline", obstack_finish (&format_obstack)); - if (!token_table_flag && !no_parser_flag) - fprintf (ftable, "#endif\n\n"); + output_token_number_table (&format_obstack, r1, 0, 1, nrules + 1); + muscle_insert ("r1", obstack_finish (&format_obstack)); - /* Output YYTOKNUM. */ - if (token_table_flag) - { - output_short_table (ftable, - "YYTOKNUM[YYLEX] -- Index in YYTNAME corresponding to YYLEX", - "yytoknum", user_toknums, - 0, 1, ntokens + 1); - } + output_short_table (&format_obstack, r2, 0, 1, nrules + 1); + muscle_insert ("r2", obstack_finish (&format_obstack)); - /* Output YYR1. */ - output_short_table (ftable, - "YYR1[YYN] -- Symbol number of symbol that rule YYN derives", - "yyr1", rlhs, - 0, 1, nrules + 1); - XFREE (rlhs + 1); - - putc ('\n', ftable); - - /* Output YYR2. */ - short_tab = XMALLOC (short, nrules + 1); - for (i = 1; i < nrules; i++) - short_tab[i] = rrhs[i + 1] - rrhs[i] - 1; - short_tab[nrules] = nitems - rrhs[nrules] - 1; - output_short_table (ftable, - "YYR2[YYN] -- Number of symbols composing right hand side of rule YYN", - "yyr2", short_tab, - 0, 1, nrules + 1); - putc ('\n', ftable); - - XFREE (short_tab); - - XFREE (rrhs + 1); + free (rhs); + free (prhs); + free (r2); } +/*--------------------------------------------. +| Prepare the muscles related to the states. | +`--------------------------------------------*/ static void -output_defines (void) +prepare_states (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); + size_t i; + token_number_t *values = + (token_number_t *) alloca (sizeof (token_number_t) * nstates); + for (i = 0; i < nstates; ++i) + values[i] = states[i]->accessing_symbol; + output_token_number_table (&format_obstack, values, + 0, 1, nstates); + muscle_insert ("stos", obstack_finish (&format_obstack)); } @@ -486,7 +356,7 @@ output_defines (void) | default action (yydefact) for the state. In addition, actrow is | | filled with what to do for each kind of token, index by symbol | | number, with zero meaning do the default action. The value | -| MINSHORT, a very negative number, means this situation is an | +| SHRT_MIN, a very negative number, means this situation is an | | error. The parser recognizes this value specially. | | | | This is where conflicts are resolved. The loop over lookahead | @@ -495,137 +365,84 @@ output_defines (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 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; - 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 = reduction_table[state]; - - if (redp) + if (redp->nreds >= 1) { - nreds = redp->nreds; - - if (nreds >= 1) - { - /* loop over all the rules available here which require - lookahead */ - m = lookaheads[state]; - n = lookaheads[state + 1]; - - 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++; - } - } - } - } + 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 (bitset_test (LA[state->lookaheadsp + i], j)) + actrow[j] = -LArule[state->lookaheadsp + i]->number; } - 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) + for (i = 0; i < shiftp->nshifts; i++) { - k = shiftp->nshifts; + token_number_t symbol; + int shift_state = shiftp->shifts[i]; + if (!shift_state) + continue; - for (i = 0; i < k; i++) - { - shift_state = shiftp->shifts[i]; - if (!shift_state) - continue; - - symbol = accessing_symbol[shift_state]; + symbol = states[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 == errtoken->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. */ - - if (errp) + %nonassoc). For them, record SHRT_MIN as the action. */ + 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] = SHRT_MIN; } /* 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 (consistent[state]) + if (state->consistent) default_rule = redp->rules[0]; else { - max = 0; - for (i = m; i < n; i++) + int max = 0; + for (i = 0; i < state->nlookaheads; i++) { - count = 0; - rule = -LAruleno[i]; + int count = 0; + int rule = -LArule[state->lookaheadsp + i]->number; + int j; for (j = 0; j < ntokens; j++) - { - if (actrow[j] == rule) - count++; - } + if (actrow[j] == rule) + count++; if (count > max) { @@ -639,11 +456,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; } @@ -654,11 +470,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] == SHRT_MIN) + actrow[i] = 0; return default_rule; } @@ -675,10 +489,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; @@ -687,13 +499,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; @@ -711,59 +521,123 @@ save_row (int state) static void token_actions (void) { - int i; + size_t i; short *yydefact = XCALLOC (short, nstates); actrow = XCALLOC (short, ntokens); for (i = 0; i < nstates; ++i) { - yydefact[i] = action_row (i); + yydefact[i] = action_row (states[i]); save_row (i); } - XFREE (actrow); - output_short_table (ftable, - "YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE\n\ - doesn't specify something else to do. Zero means the default is an\n\ - error", - "yydefact", yydefact, - yydefact[0], 1, nstates); - putc ('\n', ftable); + output_short_table (&format_obstack, yydefact, + yydefact[0], 1, nstates); + muscle_insert ("defact", obstack_finish (&format_obstack)); + + XFREE (actrow); XFREE (yydefact); } -static void -free_shifts (void) -{ - shifts *sp, *sptmp; /* JF derefrenced freed ptr */ +/*-----------------------------. +| Output the actions to OOUT. | +`-----------------------------*/ - XFREE (shift_table); - - for (sp = first_shift; sp; sp = sptmp) - { - sptmp = sp->next; - XFREE (sp); - } +void +actions_output (FILE *out) +{ + 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].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", + rules[rule].action, + yacc_flag ? ";" : ""); + } } -static void -free_reductions (void) +/*----------------------------. +| Output the guards to OOUT. | +`----------------------------*/ + +void +guards_output (FILE *out) { - reductions *rp, *rptmp; /* JF fixed freed ptr */ + int rule; + for (rule = 1; rule < nrules + 1; ++rule) + if (rules[rule].guard) + { + 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); + } +} + - XFREE (reduction_table); +/*---------------------------------------. +| Output the tokens definition to OOUT. | +`---------------------------------------*/ - for (rp = first_reduction; rp; rp = rptmp) +void +token_definitions_output (FILE *out) +{ + int i; + int first = 1; + for (i = 0; i < ntokens; ++i) { - rptmp = rp->next; - XFREE (rp); + symbol_t *symbol = symbols[i]; + int number = symbol->user_token_number; + + if (number == SALIAS) + continue; + /* Skip error token. */ + if (symbol == errtoken) + 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, "%s [[[%s]], [%d]]", + first ? "" : ",\n", symbol->tag, number); + 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->number); + first = 0; } } - static void save_column (int symbol, int default_state) { @@ -772,34 +646,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; @@ -808,14 +676,11 @@ save_column (int symbol, int default_state) 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]; + size_t i; + size_t m = goto_map[symbol]; + size_t n = goto_map[symbol + 1]; + int default_state = -1; + int max = 0; if (m == n) return -1; @@ -826,17 +691,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; } @@ -855,10 +715,9 @@ static void goto_actions (void) { int i; - short *yydefgoto = XMALLOC (short, nsyms - ntokens); - state_count = XCALLOC (short, nstates); + state_count = XCALLOC (short, nstates); for (i = ntokens; i < nsyms; ++i) { int default_state = default_goto (i); @@ -866,8 +725,9 @@ goto_actions (void) yydefgoto[i - ntokens] = default_state; } - output_short_table (ftable, NULL, "yydefgoto", yydefgoto, - yydefgoto[0], 1, nsyms - ntokens); + output_short_table (&format_obstack, yydefgoto, + yydefgoto[0], 1, nsyms - ntokens); + muscle_insert ("defgoto", obstack_finish (&format_obstack)); XFREE (state_count); XFREE (yydefgoto); @@ -881,51 +741,42 @@ 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) + if (i >= (int) nstates) return -1; t = tally[i]; @@ -933,16 +784,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; @@ -955,42 +806,33 @@ 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++) + for (j = lowzero - from[0]; j < (int) table_size; j++) { - ok = 1; + int k; + int ok = 1; for (k = 0; ok && k < t; k++) { loc = j + from[k]; - if (loc > MAXTABLE) - fatal (_("maximum table size (%d) exceeded"), MAXTABLE); + if (loc > (int) table_size) + table_grow (loc); if (table[loc] != 0) ok = 0; } for (k = 0; ok && k < vector; k++) - { - if (pos[k] == j) - ok = 0; - } + if (pos[k] == j) + ok = 0; if (ok) { @@ -1010,9 +852,9 @@ pack_vector (int vector) return j; } } - - berror ("pack_vector"); - return 0; /* JF keep lint happy */ +#define pack_vector_succeeded 0 + assert (pack_vector_succeeded); + return 0; } @@ -1025,16 +867,16 @@ pack_table (void) base = XCALLOC (short, nvectors); pos = XCALLOC (short, nentries); - table = XCALLOC (short, MAXTABLE); - check = XCALLOC (short, MAXTABLE); + table = XCALLOC (short, table_size); + check = XCALLOC (short, table_size); lowzero = 0; high = 0; for (i = 0; i < nvectors; i++) - base[i] = MINSHORT; + base[i] = SHRT_MIN; - for (i = 0; i < MAXTABLE; i++) + for (i = 0; i < (int) table_size; i++) check[i] = -1; for (i = 0; i < nentries; i++) @@ -1052,10 +894,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); @@ -1069,13 +909,15 @@ pack_table (void) static void output_base (void) { - output_short_table (ftable, NULL, "yypact", base, - base[0], 1, nstates); + /* Output pact. */ + output_short_table (&format_obstack, base, + base[0], 1, nstates); + muscle_insert ("pact", obstack_finish (&format_obstack)); - putc ('\n', ftable); - - output_short_table (ftable, NULL, "yypgoto", base, - base[nstates], nstates + 1, nvectors); + /* Output pgoto. */ + output_short_table (&format_obstack, base, + base[nstates], nstates + 1, nvectors); + muscle_insert ("pgoto", obstack_finish (&format_obstack)); XFREE (base); } @@ -1084,9 +926,9 @@ output_base (void) static void output_table (void) { - fprintf (ftable, "\n\n#define\tYYLAST\t\t%d\n\n\n", high); - output_short_table (ftable, NULL, "yytable", table, - table[0], 1, high + 1); + output_short_table (&format_obstack, table, + table[0], 1, high + 1); + muscle_insert ("table", obstack_finish (&format_obstack)); XFREE (table); } @@ -1094,17 +936,21 @@ output_table (void) static void output_check (void) { - output_short_table (ftable, NULL, "yycheck", check, - check[0], 1, high + 1); + output_short_table (&format_obstack, check, + check[0], 1, high + 1); + muscle_insert ("check", obstack_finish (&format_obstack)); XFREE (check); } -/* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable - and yycheck. */ +/*-----------------------------------------------------------------. +| Compute and output yydefact, yydefgoto, yypact, yypgoto, yytable | +| and yycheck. | +`-----------------------------------------------------------------*/ static void output_actions (void) { + size_t i; nvectors = nstates + nvars; froms = XCALLOC (short *, nvectors); @@ -1113,12 +959,8 @@ output_actions (void) width = XCALLOC (short, nvectors); token_actions (); - free_shifts (); - free_reductions (); - XFREE (lookaheads); - XFREE (LA); - XFREE (LAruleno); - XFREE (accessing_symbol); + bitsetv_free (LA); + free (LArule); goto_actions (); XFREE (goto_map + ntokens); @@ -1127,131 +969,143 @@ output_actions (void) sort_actions (); pack_table (); - putc ('\n', ftable); + output_base (); output_table (); - putc ('\n', ftable); - output_check (); -} -/* copy the parser code into the ftable file at the end. */ + output_check (); -static void -output_parser (void) -{ - int c; - static int number_of_dollar_signs = 0; -#ifdef DONTDEF - FILE *fpars; -#else -#define fpars fparser -#endif - - if (pure_parser) - fprintf (ftable, "#define YYPURE 1\n\n"); - -#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) + for (i = 0; i < nstates; ++i) { - int write_line = 1; - - c = getc (fpars); - - /* See if the line starts with `#line. - If so, set write_line to 0. */ - if (no_lines_flag) - 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 == '$') - { - number_of_dollar_signs++; - assert (number_of_dollar_signs == 1); - /* `$' 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); - /* Skip the end of the line containing `$'. */ - write_line = 0; - } - else - putc (c, ftable); - } - if (c == EOF) - break; - putc (c, ftable); + free (states[i]->shifts); + XFREE (states[i]->reductions); + free (states[i]->errs); + free (states[i]); } - assert (number_of_dollar_signs == 1); + XFREE (states); } + +/*---------------------------. +| Call the skeleton parser. | +`---------------------------*/ + static void -output_program (void) +output_skeleton (void) { - int c; - - if (!no_lines_flag) - fprintf (ftable, "#line %d \"%s\"\n", lineno, infile); - - c = getc (finput); - while (c != EOF) - { - putc (c, ftable); - c = getc (finput); - } + /* Store the definition of all the muscles. */ + const char *tempdir = getenv ("TMPDIR"); + char *tempfile = NULL; + FILE *out = NULL; + int fd; + + if (tempdir == NULL) + tempdir = DEFAULT_TMPDIR; + tempfile = xmalloc (strlen (tempdir) + 11); + sprintf (tempfile, "%s/bsnXXXXXX", tempdir); + fd = mkstemp (tempfile); + if (fd == -1) + error (EXIT_FAILURE, errno, "%s", tempfile); + + out = fdopen (fd, "w"); + if (out == NULL) + error (EXIT_FAILURE, errno, "%s", tempfile); + + /* There are no comments, especially not `#': we do want M4 expansion + after `#': think of CPP macros! */ + fputs ("m4_changecom()\n", out); + fputs ("m4_init()\n", out); + + fputs ("m4_define([b4_actions], \n[[", out); + actions_output (out); + fputs ("]])\n\n", out); + + fputs ("m4_define([b4_guards], \n[[", out); + guards_output (out); + fputs ("]])\n\n", out); + + fputs ("m4_define([b4_tokens], \n[", out); + token_definitions_output (out); + fputs ("])\n\n", out); + + muscles_m4_output (out); + + fputs ("m4_wrap([m4_divert_pop(0)])\n", out); + fputs ("m4_divert_push(0)dnl\n", out); + xfclose (out); + + /* Invoke m4 on the definition of the muscles, and the skeleton. */ + { + const char *bison_pkgdatadir = getenv ("BISON_PKGDATADIR"); + const char *m4 = getenv ("M4"); + if (!m4) + m4 = M4; + if (!bison_pkgdatadir) + bison_pkgdatadir = PKGDATADIR; + if (trace_flag) + fprintf (stderr, + "running: %s -I %s m4sugar/m4sugar.m4 %s %s\n", + m4, bison_pkgdatadir, tempfile, skeleton); + skel_in = readpipe (m4, + "-I", bison_pkgdatadir, + "m4sugar/m4sugar.m4", + tempfile, + skeleton, + NULL); + if (!skel_in) + error (EXIT_FAILURE, errno, "cannot run m4"); + skel_lex (); + + /* If `debugging', keep this file alive. */ + if (!trace_flag) + unlink (tempfile); + } } - static void -free_itemsets (void) +prepare (void) { - core *cp, *cptmp; - - XFREE (state_table); - - for (cp = first_state; cp; cp = cptmp) + MUSCLE_INSERT_INT ("last", high); + MUSCLE_INSERT_INT ("flag", SHRT_MIN); + 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 ("undef_token_number", undeftoken->number); + MUSCLE_INSERT_INT ("user_token_number_max", max_user_token_number); + MUSCLE_INSERT_INT ("error_verbose", error_verbose); + MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy"); + + /* FIXME: This is wrong: the muscles should decide whether they hold + a copy or not, but the situation is too obscure currently. */ + MUSCLE_INSERT_STRING ("output_infix", output_infix ? output_infix : ""); + MUSCLE_INSERT_STRING ("output_prefix", short_base_name); + MUSCLE_INSERT_STRING ("output_parser_name", parser_file_name); + MUSCLE_INSERT_STRING ("output_header_name", spec_defines_file); + + 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); + MUSCLE_INSERT_INT ("defines_flag", defines_flag); + + /* Copy definitions in directive. */ + obstack_1grow (&attrs_obstack, 0); + muscle_insert ("prologue", obstack_finish (&attrs_obstack)); + + /* Find the right skeleton file. */ + if (!skeleton) { - cptmp = cp->next; - XFREE (cp); + if (semantic_parser) + skeleton = "bison.hairy"; + else + skeleton = "bison.simple"; } + + /* Parse the skeleton file and output the needed parsers. */ + muscle_insert ("skeleton", skeleton); } @@ -1262,52 +1116,20 @@ free_itemsets (void) void output (void) { - int c; + obstack_init (&format_obstack); - /* 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 (debug_flag) - fputs ("\ -#ifndef YYDEBUG\n\ -# define YYDEBUG 1\n\ -#endif\n\ -\n", - ftable); - - if (semantic_parser) - fprintf (ftable, "#include \"%s\"\n", attrsfile); - - if (!no_parser_flag) - 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 (); - XFREE (ritem); - if (semantic_parser) - output_stos (); - output_rule_data (); + prepare_tokens (); + prepare_rules (); + prepare_states (); output_actions (); - if (!no_parser_flag) - output_parser (); - output_program (); + + prepare (); + + /* Process the selected skeleton file. */ + output_skeleton (); + + obstack_free (&muscle_obstack, NULL); + obstack_free (&format_obstack, NULL); + obstack_free (&action_obstack, NULL); + obstack_free (&attrs_obstack, NULL); }