X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/613f5e1a895b0742c9b6c5e9461e4cf3f7389d7e..3671fb8483b88a8b9298444aeb796cf26d69ba40:/src/output.c diff --git a/src/output.c b/src/output.c index 5eddd106..1f70e948 100644 --- a/src/output.c +++ b/src/output.c @@ -1,4 +1,4 @@ -/* Output the generated parsing program for bison, +/* Output the generated parsing program for Bison. Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -20,160 +20,33 @@ 02111-1307, USA. */ -/* 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. - - ++ YYTNAME = vector of string-names indexed by bison token number. - - ++ YYTOKNUM = vector of yylex token numbers corresponding to - entries in YYTNAME. - - 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. - - YYPRHS[R] = index in YYRHS of first item for rule R. - - YYR1[R] = symbol number of symbol that rule R derives. - - 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. - - 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. - - 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 is negative, it is minus a rule number to reduce by. - - 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. - - 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. - - 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. +#include "system.h" - YYFINAL = the state number of the termination state. YYFLAG = most - negative short int. Used to flag ?? */ +#include +#include +#include +#include +#include -#include "system.h" -#include "bitsetv.h" -#include "quotearg.h" -#include "error.h" -#include "getargs.h" +#include "complain.h" #include "files.h" +#include "getargs.h" #include "gram.h" -#include "LR0.h" -#include "complain.h" +#include "muscle_tab.h" #include "output.h" -#include "lalr.h" #include "reader.h" #include "symtab.h" -#include "conflicts.h" -#include "muscle_tab.h" - -/* From lib/readpipe.h. */ -FILE *readpipe PARAMS ((const char *, ...)); +#include "tables.h" /* From src/scan-skel.l. */ -int skel_lex PARAMS ((void)); -extern FILE *skel_in; - -static int nvectors; -static int nentries; -static short **froms = NULL; -static short **tos = NULL; -static unsigned int **conflict_tos = NULL; -static short *tally = NULL; -static short *width = NULL; -static short *actrow = NULL; -static short *conflrow = NULL; -static short *state_count = NULL; -static short *order = NULL; -static short *base = NULL; -static short *pos = NULL; - -static unsigned int *conflict_table = NULL; -static unsigned int *conflict_list = NULL; -static int conflict_list_cnt; -static int conflict_list_free; - -/* 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; +void scan_skel (FILE *); + static struct obstack format_obstack; int error_verbose = 0; -/*----------------------------------------------------------------. -| 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. | -`----------------------------------------------------------------*/ - -static void -table_grow (size_t desired) -{ - size_t old_size = table_size; - - while (table_size <= desired) - table_size *= 2; - - if (trace_flag) - fprintf (stderr, "growing table and check from: %d to %d\n", - old_size, table_size); - - table = XREALLOC (table, short, table_size); - check = XREALLOC (check, short, table_size); - if (glr_parser) - conflict_table = XREALLOC (conflict_table, unsigned int, table_size); - - for (/* Nothing. */; old_size < table_size; ++old_size) - { - table[old_size] = 0; - check[old_size] = -1; - } -} - /*-------------------------------------------------------------------. | Create a function NAME which associates to the muscle NAME the | @@ -192,6 +65,7 @@ Name (const char *name, \ int begin, \ int end) \ { \ + Type min = first; \ Type max = first; \ int i; \ int j = 1; \ @@ -208,13 +82,19 @@ Name (const char *name, \ else \ ++j; \ obstack_fgrow1 (&format_obstack, "%6d", table_data[i]); \ - if (table_data[i] > max) \ + if (table_data[i] < min) \ + min = table_data[i]; \ + if (max < table_data[i]) \ max = table_data[i]; \ } \ obstack_1grow (&format_obstack, 0); \ muscle_insert (name, obstack_finish (&format_obstack)); \ \ - /* Build `NAME_max' in the obstack. */ \ + /* Build `NAME_min' and `NAME_max' in the obstack. */ \ + obstack_fgrow1 (&format_obstack, "%s_min", name); \ + obstack_1grow (&format_obstack, 0); \ + MUSCLE_INSERT_LONG_INT (obstack_finish (&format_obstack), \ + (long int) min); \ obstack_fgrow1 (&format_obstack, "%s_max", name); \ obstack_1grow (&format_obstack, 0); \ MUSCLE_INSERT_LONG_INT (obstack_finish (&format_obstack), \ @@ -222,24 +102,58 @@ Name (const char *name, \ } GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_unsigned_int_table, unsigned int) +GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_int_table, int) GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_short_table, short) -GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_symbol_number_table, symbol_number_t) -GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_item_number_table, item_number_t) -GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_state_number_table, state_number_t) +GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_base_table, base_number) +GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_rule_number_table, rule_number) +GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_symbol_number_table, symbol_number) +GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_item_number_table, item_number) +GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_state_number_table, state_number) -/*-----------------------------------------------------------------. -| Prepare the muscles related to the tokens: translate, tname, and | -| toknum. | -`-----------------------------------------------------------------*/ +/*----------------------------------------------------------------------. +| Print to OUT a representation of FILENAME escaped both for C and M4. | +`----------------------------------------------------------------------*/ static void -prepare_tokens (void) +escaped_file_name_output (FILE *out, char const *filename) { + char const *p; + fprintf (out, "[["); + + for (p = quotearg_style (c_quoting_style, filename); *p; p++) + switch (*p) + { + case '$': fputs ("$][", out); break; + case '@': fputs ("@@", out); break; + case '[': fputs ("@{", out); break; + case ']': fputs ("@}", out); break; + default: fputc (*p, out); break; + } + + fprintf (out, "]]"); +} + + +/*------------------------------------------------------------------. +| Prepare the muscles related to the symbols: translate, tname, and | +| toknum. | +`------------------------------------------------------------------*/ + +static void +prepare_symbols (void) +{ + MUSCLE_INSERT_INT ("tokens_number", ntokens); + MUSCLE_INSERT_INT ("nterms_number", nvars); + MUSCLE_INSERT_INT ("undef_token_number", undeftoken->number); + MUSCLE_INSERT_INT ("user_token_number_max", max_user_token_number); + muscle_insert_symbol_number_table ("translate", - token_translations, - 0, 1, max_user_token_number + 1); + token_translations, + token_translations[0], + 1, max_user_token_number + 1); + /* tname -- token names. */ { int i; int j = 0; @@ -250,19 +164,19 @@ prepare_tokens (void) const char *cp = quotearg_n_style (1, c_quoting_style, symbols[i]->tag); - /* Width of the next token, including the two quotes, the coma + /* Width of the next token, including the two quotes, the comma and the space. */ - int strsize = strlen (cp) + 2; + int width = strlen (cp) + 2; - if (j + strsize > 75) + if (j + width > 75) { obstack_sgrow (&format_obstack, "\n "); j = 2; } - obstack_sgrow (&format_obstack, cp); + MUSCLE_OBSTACK_SGROW (&format_obstack, cp); obstack_sgrow (&format_obstack, ", "); - j += strsize; + j += width; } /* Add a NULL entry to list of tokens (well, 0, as NULL might not be defined). */ @@ -273,14 +187,14 @@ prepare_tokens (void) muscle_insert ("tname", obstack_finish (&format_obstack)); } - /* Output YYTOKNUM. */ + /* Output YYTOKNUM. */ { int i; - short *values = XCALLOC (short, ntokens + 1); - for (i = 0; i < ntokens + 1; ++i) + int *values = XCALLOC (int, ntokens); + for (i = 0; i < ntokens; ++i) values[i] = symbols[i]->user_token_number; - muscle_insert_short_table ("toknum", values, - 0, 1, ntokens + 1); + muscle_insert_int_table ("toknum", values, + values[0], 1, ntokens); free (values); } } @@ -288,25 +202,25 @@ prepare_tokens (void) /*-------------------------------------------------------------. | Prepare the muscles related to the rules: rhs, prhs, r1, r2, | -| rline, dprec, merger | +| rline, dprec, merger. | `-------------------------------------------------------------*/ static void prepare_rules (void) { - rule_number_t r; + rule_number r; unsigned int i = 0; - item_number_t *rhs = XMALLOC (item_number_t, nritems); - unsigned int *prhs = XMALLOC (unsigned int, nrules + 1); - unsigned int *rline = XMALLOC (unsigned int, nrules + 1); - symbol_number_t *r1 = XMALLOC (symbol_number_t, nrules + 1); - unsigned int *r2 = XMALLOC (unsigned int, nrules + 1); - short *dprec = XMALLOC (short, nrules + 1); - short *merger = XMALLOC (short, nrules + 1); - - for (r = 1; r < nrules + 1; ++r) + item_number *rhs = XMALLOC (item_number, nritems); + unsigned int *prhs = XMALLOC (unsigned int, nrules); + unsigned int *rline = XMALLOC (unsigned int, nrules); + symbol_number *r1 = XMALLOC (symbol_number, nrules); + unsigned int *r2 = XMALLOC (unsigned int, nrules); + short *dprec = XMALLOC (short, nrules); + short *merger = XMALLOC (short, nrules); + + for (r = 0; r < nrules; ++r) { - item_number_t *rhsp = NULL; + item_number *rhsp = NULL; /* Index of rule R in RHS. */ prhs[r] = i; /* RHS of the rule R. */ @@ -319,21 +233,24 @@ prepare_rules (void) /* Separator in RHS. */ rhs[i++] = -1; /* Line where rule was defined. */ - rline[r] = rules[r].location.first_line; - /* Dynamic precedence (GLR) */ + rline[r] = rules[r].location.start.line; + /* Dynamic precedence (GLR). */ dprec[r] = rules[r].dprec; - /* Merger-function index (GLR) */ + /* Merger-function index (GLR). */ merger[r] = rules[r].merger; } - assert (i == nritems); + if (i != nritems) + abort (); muscle_insert_item_number_table ("rhs", rhs, ritem[0], 1, nritems); - muscle_insert_unsigned_int_table ("prhs", prhs, 0, 1, nrules + 1); - muscle_insert_unsigned_int_table ("rline", rline, 0, 1, nrules + 1); - muscle_insert_symbol_number_table ("r1", r1, 0, 1, nrules + 1); - muscle_insert_unsigned_int_table ("r2", r2, 0, 1, nrules + 1); - muscle_insert_short_table ("dprec", dprec, 0, 1, nrules + 1); - muscle_insert_short_table ("merger", merger, 0, 1, nrules + 1); + muscle_insert_unsigned_int_table ("prhs", prhs, 0, 0, nrules); + muscle_insert_unsigned_int_table ("rline", rline, 0, 0, nrules); + muscle_insert_symbol_number_table ("r1", r1, 0, 0, nrules); + muscle_insert_unsigned_int_table ("r2", r2, 0, 0, nrules); + muscle_insert_short_table ("dprec", dprec, 0, 0, nrules); + muscle_insert_short_table ("merger", merger, 0, 0, nrules); + + MUSCLE_INSERT_INT ("rules_number", nrules); free (rhs); free (prhs); @@ -351,300 +268,40 @@ prepare_rules (void) static void prepare_states (void) { - state_number_t i; - symbol_number_t *values = - (symbol_number_t *) alloca (sizeof (symbol_number_t) * nstates); + state_number i; + symbol_number *values = + (symbol_number *) alloca (sizeof (symbol_number) * nstates); for (i = 0; i < nstates; ++i) values[i] = states[i]->accessing_symbol; muscle_insert_symbol_number_table ("stos", values, 0, 1, nstates); -} - - -/*-------------------------------------------------------------------. -| For GLR parsers, for each conflicted token in STATE, as indicated | -| by non-zero entries in conflrow, create a list of possible | -| reductions that are alternatives to the shift or reduction | -| currently recorded for that token in STATE. Store the alternative | -| reductions followed by a 0 in conflict_list, updating | -| conflict_list_cnt, and storing an index to the start of the list | -| back into conflrow. | -`-------------------------------------------------------------------*/ - -static void -conflict_row (state_t *state) -{ - int i, j; - - if (! glr_parser) - return; - for (j = 0; j < ntokens; j += 1) - if (conflrow[j]) - { - conflrow[j] = conflict_list_cnt; - - /* find all reductions for token j, and record all that do - * not match actrow[j] */ - for (i = 0; i < state->nlookaheads; i += 1) - if (bitset_test (state->lookaheads[i], j) - && actrow[j] != -state->lookaheads_rule[i]->number) - { - assert (conflict_list_free > 0); - conflict_list[conflict_list_cnt] - = state->lookaheads_rule[i]->number; - conflict_list_cnt += 1; - conflict_list_free -= 1; - } - - /* Leave a 0 at the end */ - assert (conflict_list_free > 0); - conflict_list_cnt += 1; - conflict_list_free -= 1; - } + MUSCLE_INSERT_INT ("last", high); + MUSCLE_INSERT_INT ("final_state_number", final_state->number); + MUSCLE_INSERT_INT ("states_number", nstates); } -/*------------------------------------------------------------------. -| 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 | -| 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 | -| 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 | -| rules considered lower-numbered rules last, and the last rule | -| considered that likes a token gets to handle it. | -| | -| For GLR parsers, also sets conflrow[SYM] to an index into | -| conflict_list iff there is an unresolved conflict (s/r or r/r) | -| with symbol SYM. The default reduction is not used for a symbol | -| that has any such conflicts. | -`------------------------------------------------------------------*/ - -static int -action_row (state_t *state) -{ - int i; - rule_number_t default_rule = 0; - reductions_t *redp = state->reductions; - transitions_t *transitions = state->shifts; - errs_t *errp = state->errs; - /* set nonzero to inhibit having any default reduction */ - int nodefault = 0; - int conflicted = 0; - - for (i = 0; i < ntokens; i++) - actrow[i] = conflrow[i] = 0; - - if (redp->num >= 1) - { - int j; - bitset_iterator biter; - /* 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 */ - BITSET_FOR_EACH (biter, state->lookaheads[i], j, 0) - { - /* and record this rule as the rule to use if that - token follows. */ - if (actrow[j] != 0) - conflicted = conflrow[j] = 1; - actrow[j] = -state->lookaheads_rule[i]->number; - } - } - - /* 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. */ - for (i = 0; i < transitions->num && TRANSITION_IS_SHIFT (transitions, i); i++) - if (!TRANSITION_IS_DISABLED (transitions, i)) - { - symbol_number_t symbol = TRANSITION_SYMBOL (transitions, i); - state_number_t shift_state = transitions->states[i]; - - if (actrow[symbol] != 0) - conflicted = conflrow[symbol] = 1; - actrow[symbol] = state_number_as_int (shift_state); - - /* Do not use any default reduction if there is a shift for - error */ - if (symbol == errtoken->number) - nodefault = 1; - } - - /* See which tokens are an explicit error in this state (due to - %nonassoc). For them, record SHRT_MIN as the action. */ - for (i = 0; i < errp->num; i++) - { - symbol_number_t symbol = errp->symbols[i]; - actrow[symbol] = SHRT_MIN; - } - - /* Now find the most common reduction and make it the default action - for this state. */ - - if (redp->num >= 1 && !nodefault) - { - if (state->consistent) - default_rule = redp->rules[0]; - else - { - int max = 0; - for (i = 0; i < state->nlookaheads; i++) - { - int count = 0; - rule_number_t rule = state->lookaheads_rule[i]->number; - symbol_number_t j; - - for (j = 0; j < ntokens; j++) - if (actrow[j] == -rule) - count++; - - if (count > max) - { - max = count; - default_rule = rule; - } - } - - /* GLR parsers need space for conflict lists, so we can't - default conflicted entries. For non-conflicted entries - or as long as we are not building a GLR parser, - actions that match the default are replaced with zero, - which means "use the default". */ - - if (max > 0) - { - int j; - for (j = 0; j < ntokens; j++) - if (actrow[j] == -default_rule - && ! (glr_parser && conflrow[j])) - actrow[j] = 0; - } - } - } - - /* If have no default rule, the default is an error. - So replace any action which says "error" with "use default". */ - - if (default_rule == 0) - for (i = 0; i < ntokens; i++) - if (actrow[i] == SHRT_MIN) - actrow[i] = 0; - - if (conflicted) - conflict_row (state); - - return default_rule; -} +/*---------------------------------. +| Output the user actions to OUT. | +`---------------------------------*/ static void -save_row (state_number_t state) +user_actions_output (FILE *out) { - symbol_number_t i; - int count; - short *sp = NULL; - short *sp1 = NULL; - short *sp2 = NULL; - unsigned int *sp3 = NULL; - - count = 0; - for (i = 0; i < ntokens; i++) - if (actrow[i] != 0) - count++; - - if (count == 0) - return; - - froms[state] = sp1 = sp = XCALLOC (short, count); - tos[state] = sp2 = XCALLOC (short, count); - if (glr_parser) - conflict_tos[state] = sp3 = XCALLOC (unsigned int, count); - else - conflict_tos[state] = NULL; - - for (i = 0; i < ntokens; i++) - if (actrow[i] != 0) - { - *sp1++ = i; - *sp2++ = actrow[i]; - if (glr_parser) - *sp3++ = conflrow[i]; - } - - tally[state] = count; - width[state] = sp1[-1] - sp[0] + 1; -} - - -/*------------------------------------------------------------------. -| Figure out the actions for the specified state, indexed by | -| lookahead token type. | -| | -| The YYDEFACT table is output now. The detailed info is saved for | -| putting into YYTABLE later. | -`------------------------------------------------------------------*/ - -static void -token_actions (void) -{ - state_number_t i; - int nconflict = conflicts_total_count (); - - short *yydefact = XCALLOC (short, nstates); - - actrow = XCALLOC (short, ntokens); - - conflrow = XCALLOC (short, ntokens); - if (glr_parser) - { - conflict_list = XCALLOC (unsigned int, 1 + 2 * nconflict); - conflict_list_free = 2 * nconflict; - conflict_list_cnt = 1; - } - else - conflict_list_free = conflict_list_cnt = 0; - - for (i = 0; i < nstates; ++i) - { - yydefact[i] = action_row (states[i]); - save_row (i); - } - - muscle_insert_short_table ("defact", yydefact, - yydefact[0], 1, nstates); - XFREE (actrow); - XFREE (conflrow); - XFREE (yydefact); -} - - -/*-----------------------------. -| Output the actions to OOUT. | -`-----------------------------*/ - -void -actions_output (FILE *out) -{ - rule_number_t r; + rule_number r; fputs ("m4_define([b4_actions], \n[[", out); - for (r = 1; r < nrules + 1; ++r) + for (r = 0; r < nrules; ++r) if (rules[r].action) { - fprintf (out, " case %d:\n", r); + fprintf (out, " case %d:\n", r + 1); - if (!no_lines_flag) - fprintf (out, muscle_find ("linef"), - rules[r].action_location.first_line, - quotearg_style (c_quoting_style, - muscle_find ("filename"))); + fprintf (out, "]b4_syncline([[%d]], ", + rules[r].action_location.start.line); + escaped_file_name_output (out, rules[r].action_location.start.file); + fprintf (out, ")[\n"); fprintf (out, " %s\n break;\n\n", rules[r].action); } @@ -674,11 +331,11 @@ merger_output (FILE *out) fputs ("]])\n\n", out); } -/*---------------------------------------. -| Output the tokens definition to OOUT. | -`---------------------------------------*/ +/*--------------------------------------. +| Output the tokens definition to OUT. | +`--------------------------------------*/ -void +static void token_definitions_output (FILE *out) { int i; @@ -687,36 +344,37 @@ token_definitions_output (FILE *out) fputs ("m4_define([b4_tokens], \n[", out); for (i = 0; i < ntokens; ++i) { - symbol_t *symbol = symbols[i]; - int number = symbol->user_token_number; + symbol *sym = symbols[i]; + int number = sym->user_token_number; /* At this stage, if there are literal aliases, they are part of SYMBOLS, so we should not find symbols which are the aliases here. */ - assert (number != USER_NUMBER_ALIAS); + if (number == USER_NUMBER_ALIAS) + abort (); /* Skip error token. */ - if (symbol == errtoken) + if (sym == errtoken) continue; /* If this string has an alias, then it is necessarily the alias which is to be output. */ - if (symbol->alias) - symbol = symbol->alias; + if (sym->alias) + sym = sym->alias; /* Don't output literal chars or strings (when defined only as a string). Note that must be done after the alias resolution: think about `%token 'f' "f"'. */ - if (symbol->tag[0] == '\'' || symbol->tag[0] == '\"') + if (sym->tag[0] == '\'' || sym->tag[0] == '\"') 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, '$')) + if (strchr (sym->tag, '.') || strchr (sym->tag, '$')) continue; fprintf (out, "%s[[[%s]], [%d]]", - first ? "" : ",\n", symbol->tag, number); + first ? "" : ",\n", sym->tag, number); first = 0; } @@ -724,9 +382,9 @@ token_definitions_output (FILE *out) } -/*----------------------------------------. -| Output the symbol destructors to OOUT. | -`----------------------------------------*/ +/*---------------------------------------. +| Output the symbol destructors to OUT. | +`---------------------------------------*/ static void symbol_destructors_output (FILE *out) @@ -738,18 +396,20 @@ symbol_destructors_output (FILE *out) for (i = 0; i < nsyms; ++i) if (symbols[i]->destructor) { - symbol_t *symbol = symbols[i]; + symbol *sym = symbols[i]; /* Filename, lineno, Symbol-name, Symbol-number, destructor, typename. */ - fprintf (out, "%s[[[%s]], [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]", - first ? "" : ",\n", - infile, symbol->destructor_location.first_line, - symbol->tag, - symbol->number, - symbol->destructor, - symbol->type_name); + fprintf (out, "%s[", + first ? "" : ",\n"); + escaped_file_name_output (out, sym->destructor_location.start.file); + fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]", + sym->destructor_location.start.line, + sym->tag, + sym->number, + sym->destructor, + sym->type_name); first = 0; } @@ -757,9 +417,9 @@ symbol_destructors_output (FILE *out) } -/*-------------------------------------. -| Output the symbol printers to OOUT. | -`-------------------------------------*/ +/*------------------------------------. +| Output the symbol printers to OUT. | +`------------------------------------*/ static void symbol_printers_output (FILE *out) @@ -771,18 +431,20 @@ symbol_printers_output (FILE *out) for (i = 0; i < nsyms; ++i) if (symbols[i]->destructor) { - symbol_t *symbol = symbols[i]; + symbol *sym = symbols[i]; /* Filename, lineno, Symbol-name, Symbol-number, - destructor, typename. */ - fprintf (out, "%s[[[%s]], [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]", - first ? "" : ",\n", - infile, symbol->printer_location.first_line, - symbol->tag, - symbol->number, - symbol->printer, - symbol->type_name); + printer, typename. */ + fprintf (out, "%s[", + first ? "" : ",\n"); + escaped_file_name_output (out, sym->printer_location.start.file); + fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]", + sym->printer_location.start.line, + sym->tag, + sym->number, + sym->printer, + sym->type_name); first = 0; } @@ -791,415 +453,53 @@ symbol_printers_output (FILE *out) static void -save_column (symbol_number_t symbol, state_number_t default_state) +prepare_actions (void) { - int i; - short *sp; - short *sp1; - short *sp2; - int count; - int symno = symbol - ntokens + state_number_as_int (nstates); - - int begin = goto_map[symbol]; - int end = goto_map[symbol + 1]; - - count = 0; - for (i = begin; i < end; i++) - if (to_state[i] != default_state) - count++; + /* Figure out the actions for the specified state, indexed by + lookahead token type. */ - if (count == 0) - return; - - 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]; - } - - tally[symno] = count; - width[symno] = sp1[-1] - sp[0] + 1; -} - - -static state_number_t -default_goto (symbol_number_t symbol) -{ - state_number_t s; - int i; - int m = goto_map[symbol]; - int n = goto_map[symbol + 1]; - state_number_t default_state = (state_number_t) -1; - int max = 0; - - if (m == n) - return (state_number_t) -1; - - for (s = 0; s < nstates; s++) - state_count[s] = 0; - - for (i = m; i < n; i++) - state_count[to_state[i]]++; - - for (s = 0; s < nstates; s++) - if (state_count[s] > max) - { - max = state_count[s]; - default_state = s; - } - - return default_state; -} - - -/*-------------------------------------------------------------------. -| Figure out what to do after reducing with each rule, depending on | -| the saved state from before the beginning of parsing the data that | -| matched this rule. | -| | -| The YYDEFGOTO table is output now. The detailed info is saved for | -| putting into YYTABLE later. | -`-------------------------------------------------------------------*/ - -static void -goto_actions (void) -{ - symbol_number_t i; - state_number_t *yydefgoto = XMALLOC (state_number_t, nsyms - ntokens); - - state_count = XCALLOC (short, nstates); - for (i = ntokens; i < nsyms; ++i) - { - state_number_t default_state = default_goto (i); - save_column (i, default_state); - yydefgoto[i - ntokens] = default_state; - } + muscle_insert_rule_number_table ("defact", yydefact, + yydefact[0], 1, nstates); + /* Figure out what to do after reducing with each rule, depending on + the saved state from before the beginning of parsing the data + that matched this rule. */ muscle_insert_state_number_table ("defgoto", yydefgoto, yydefgoto[0], 1, nsyms - ntokens); - XFREE (state_count); - XFREE (yydefgoto); -} - -/* The next few functions decide how to pack the actions and gotos - information into yytable. */ - -static void -sort_actions (void) -{ - int i; - order = XCALLOC (short, nvectors); - nentries = 0; - - for (i = 0; i < nvectors; i++) - 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) && (tally[order[j]] < t)) - j--; - - for (k = nentries - 1; k > j; k--) - order[k + 1] = order[k]; - - order[j + 1] = i; - nentries++; - } -} - - -static int -matching_state (int vector) -{ - int i = order[vector]; - int t; - int w; - int prev; - - if (i >= (int) nstates) - return -1; - - t = tally[i]; - w = width[i]; - - for (prev = vector - 1; prev >= 0; prev--) - { - int j = order[prev]; - int k; - int match = 1; - - if (width[j] != w || tally[j] != t) - return -1; - - for (k = 0; match && k < t; k++) - if (tos[j][k] != tos[i][k] || froms[j][k] != froms[i][k]) - match = 0; - - if (match) - return j; - } - - return -1; -} - - -static int -pack_vector (int vector) -{ - int i = order[vector]; - int j; - int t = tally[i]; - int loc = 0; - short *from = froms[i]; - short *to = tos[i]; - unsigned int *conflict_to = conflict_tos[i]; - - assert (t); - - for (j = lowzero - from[0]; j < (int) table_size; j++) - { - int k; - int ok = 1; - - for (k = 0; ok && k < t; k++) - { - loc = j + state_number_as_int (from[k]); - 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 (ok) - { - for (k = 0; k < t; k++) - { - loc = j + state_number_as_int (from[k]); - table[loc] = state_number_as_int (to[k]); - if (glr_parser && conflict_to != NULL) - conflict_table[loc] = conflict_to[k]; - check[loc] = state_number_as_int (from[k]); - } - - while (table[lowzero] != 0) - lowzero++; - - if (loc > high) - high = loc; - - return j; - } - } -#define pack_vector_succeeded 0 - assert (pack_vector_succeeded); - return 0; -} - - -static void -pack_table (void) -{ - int i; - int place; - int state; - - base = XCALLOC (short, nvectors); - pos = XCALLOC (short, nentries); - table = XCALLOC (short, table_size); - if (glr_parser) - conflict_table = XCALLOC (unsigned int, table_size); - check = XCALLOC (short, table_size); - - lowzero = 0; - high = 0; - - for (i = 0; i < nvectors; i++) - base[i] = SHRT_MIN; - - for (i = 0; i < (int) table_size; i++) - check[i] = -1; - - for (i = 0; i < nentries; i++) - { - state = matching_state (i); - - if (state < 0) - place = pack_vector (i); - else - place = base[state]; - - pos[i] = place; - base[order[i]] = place; - } - - for (i = 0; i < nvectors; i++) - { - XFREE (froms[i]); - XFREE (tos[i]); - XFREE (conflict_tos[i]); - } - - XFREE (froms); - XFREE (tos); - XFREE (conflict_tos); - XFREE (pos); -} - -/* the following functions output yytable, yycheck, yyconflp, yyconfl, - and the vectors whose elements index the portion starts */ - -static void -output_base (void) -{ - /* Output pact. */ - muscle_insert_short_table ("pact", base, + /* Output PACT. */ + muscle_insert_base_table ("pact", base, base[0], 1, nstates); + MUSCLE_INSERT_INT ("pact_ninf", base_ninf); - /* Output pgoto. */ - muscle_insert_short_table ("pgoto", base, + /* Output PGOTO. */ + muscle_insert_base_table ("pgoto", base, base[nstates], nstates + 1, nvectors); - XFREE (base); -} + muscle_insert_base_table ("table", table, + table[0], 1, high + 1); + MUSCLE_INSERT_INT ("table_ninf", table_ninf); -static void -output_table (void) -{ - muscle_insert_short_table ("table", table, - table[0], 1, high + 1); - XFREE (table); -} - + muscle_insert_base_table ("check", check, + check[0], 1, high + 1); -static void -output_conflicts (void) -{ - /* GLR parsing slightly modifies yytable and yycheck - (and thus yypact) so that in states with unresolved conflicts, - the default reduction is not used in the conflicted entries, so - that there is a place to put a conflict pointer. This means that - yyconflp and yyconfl are nonsense for a non-GLR parser, so we - avoid accidents by not writing them out in that case. */ - if (! glr_parser) - return; + /* GLR parsing slightly modifies YYTABLE and YYCHECK (and thus + YYPACT) so that in states with unresolved conflicts, the default + reduction is not used in the conflicted entries, so that there is + a place to put a conflict pointer. + This means that YYCONFLP and YYCONFL are nonsense for a non-GLR + parser, so we could avoid accidents by not writing them out in + that case. Nevertheless, it seems even better to be able to use + the GLR skeletons even without the non-deterministic tables. */ muscle_insert_unsigned_int_table ("conflict_list_heads", conflict_table, - conflict_table[0], 1, high+1); + conflict_table[0], 1, high + 1); muscle_insert_unsigned_int_table ("conflicting_rules", conflict_list, - conflict_list[0], 1, conflict_list_cnt); - - XFREE (conflict_table); - XFREE (conflict_list); -} - - -static void -output_check (void) -{ - muscle_insert_short_table ("check", check, - check[0], 1, high + 1); - XFREE (check); -} - -/*-----------------------------------------------------------------. -| Compute and output yydefact, yydefgoto, yypact, yypgoto, yytable | -| and yycheck. | -`-----------------------------------------------------------------*/ - -static void -output_actions (void) -{ - /* That's a poor way to make sure the sizes are properly corelated, - in particular the signedness is not taking into account, but it's - not useless. */ - assert (sizeof (nvectors) >= sizeof (nstates)); - assert (sizeof (nvectors) >= sizeof (nvars)); - - nvectors = state_number_as_int (nstates) + nvars; - - froms = XCALLOC (short *, nvectors); - tos = XCALLOC (short *, nvectors); - conflict_tos = XCALLOC (unsigned int *, nvectors); - tally = XCALLOC (short, nvectors); - width = XCALLOC (short, nvectors); - - token_actions (); - bitsetv_free (LA); - free (LArule); - - goto_actions (); - XFREE (goto_map + ntokens); - XFREE (from_state); - XFREE (to_state); - - sort_actions (); - pack_table (); - - output_base (); - output_table (); - output_conflicts (); - - output_check (); + conflict_list[0], 1, conflict_list_cnt); } -/*----------------------. -| Run our backend, M4. | -`----------------------*/ - -static void -m4_invoke (const char *definitions) -{ - /* Invoke m4 on the definition of the muscles, and the skeleton. */ - const char *bison_pkgdatadir = getenv ("BISON_PKGDATADIR"); - const char *m4 = getenv ("M4"); - int pkg_data_len; - char *full_skeleton; - - if (!m4) - m4 = M4; - if (!bison_pkgdatadir) - bison_pkgdatadir = PKGDATADIR; - pkg_data_len = strlen (bison_pkgdatadir); - full_skeleton = XMALLOC (char, pkg_data_len + strlen (skeleton) + 2); - if (bison_pkgdatadir[pkg_data_len-1] == '/') - sprintf (full_skeleton, "%s%s", bison_pkgdatadir, skeleton); - else - sprintf (full_skeleton, "%s/%s", bison_pkgdatadir, skeleton); - if (trace_flag) - fprintf (stderr, - "running: %s -I %s m4sugar/m4sugar.m4 %s %s\n", - m4, bison_pkgdatadir, definitions, full_skeleton); - skel_in = readpipe (m4, - "-I", bison_pkgdatadir, - "m4sugar/m4sugar.m4", - definitions, - full_skeleton, - NULL); - XFREE (full_skeleton); - if (!skel_in) - error (EXIT_FAILURE, errno, "cannot run m4"); - skel_lex (); -} - - /*---------------------------. | Call the skeleton parser. | `---------------------------*/ @@ -1207,30 +507,60 @@ m4_invoke (const char *definitions) static void output_skeleton (void) { - /* 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); + FILE *in; + FILE *out; + int filter_fd[2]; + char const *argv[7]; + pid_t pid; + + /* Compute the names of the package data dir and skeleton file. + Test whether m4sugar.m4 is readable, to check for proper + installation. A faulty installation can cause deadlock, so a + cheap sanity check is worthwhile. */ + char const m4sugar[] = "m4sugar/m4sugar.m4"; + char *full_path; + char const *p; + char const *m4 = (p = getenv ("M4")) ? p : M4; + char const *pkgdatadir = (p = getenv ("BISON_PKGDATADIR")) ? p : PKGDATADIR; + size_t skeleton_size = strlen (skeleton) + 1; + size_t pkgdatadirlen = strlen (pkgdatadir); + while (pkgdatadirlen && pkgdatadir[pkgdatadirlen - 1] == '/') + pkgdatadirlen--; + full_path = xmalloc (pkgdatadirlen + 1 + + (skeleton_size < sizeof m4sugar + ? sizeof m4sugar : skeleton_size)); + strcpy (full_path, pkgdatadir); + full_path[pkgdatadirlen] = '/'; + strcpy (full_path + pkgdatadirlen + 1, m4sugar); + xfclose (xfopen (full_path, "r")); + strcpy (full_path + pkgdatadirlen + 1, skeleton); + + /* Create an m4 subprocess connected to us via two pipes. */ + + if (trace_flag & trace_tools) + fprintf (stderr, "running: %s -I %s %s - %s\n", + m4, pkgdatadir, m4sugar, full_path); + + argv[0] = m4; + argv[1] = "-I"; + argv[2] = pkgdatadir; + argv[3] = m4sugar; + argv[4] = "-"; + argv[5] = full_path; + argv[6] = NULL; + + init_subpipe (); + pid = create_subpipe (argv, filter_fd); + free (full_path); + + out = fdopen (filter_fd[0], "w"); + if (! out) + error (EXIT_FAILURE, get_errno (), "fdopen"); + + /* Output the definitions of all the muscles. */ fputs ("m4_init()\n", out); - actions_output (out); + user_actions_output (out); merger_output (out); token_definitions_output (out); symbol_destructors_output (out); @@ -1242,45 +572,32 @@ output_skeleton (void) fputs ("m4_divert_push(0)dnl\n", out); xfclose (out); - m4_invoke (tempfile); - - /* If `debugging', keep this file alive. */ - if (!trace_flag) - unlink (tempfile); - - free (tempfile); + /* Read and process m4's output. */ + timevar_push (TV_M4); + in = fdopen (filter_fd[1], "r"); + if (! in) + error (EXIT_FAILURE, get_errno (), "fdopen"); + scan_skel (in); + xfclose (in); + reap_subpipe (pid, m4); + timevar_pop (TV_M4); } static void prepare (void) { - MUSCLE_INSERT_INT ("last", high); - MUSCLE_INSERT_INT ("flag", SHRT_MIN); - MUSCLE_INSERT_INT ("pure", pure_parser); - MUSCLE_INSERT_INT ("nsym", nsyms); + /* Flags. */ MUSCLE_INSERT_INT ("debug", debug_flag); - MUSCLE_INSERT_INT ("final", final_state->number); - MUSCLE_INSERT_INT ("undef_token_number", undeftoken->number); - MUSCLE_INSERT_INT ("user_token_number_max", max_user_token_number); + MUSCLE_INSERT_INT ("defines_flag", defines_flag); 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); + MUSCLE_INSERT_INT ("pure", pure_parser); + MUSCLE_INSERT_INT ("synclines_flag", !no_lines_flag); + + /* File names. */ + MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy"); - /* Copy definitions in directive. */ + /* User Code. */ obstack_1grow (&pre_prologue_obstack, 0); obstack_1grow (&post_prologue_obstack, 0); muscle_insert ("pre_prologue", obstack_finish (&pre_prologue_obstack)); @@ -1296,7 +613,7 @@ prepare (void) } /* Parse the skeleton file and output the needed parsers. */ - muscle_insert ("skeleton", skeleton); + MUSCLE_INSERT_C_STRING ("skeleton", skeleton); } @@ -1309,10 +626,10 @@ output (void) { obstack_init (&format_obstack); - prepare_tokens (); + prepare_symbols (); prepare_rules (); prepare_states (); - output_actions (); + prepare_actions (); prepare ();