X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9703cc49e0f3518e136b435b6cbcae3263eb7b7a..5449dd0f25f584ec596f165cb6004e1b4d092f10:/src/output.c?ds=sidebyside diff --git a/src/output.c b/src/output.c index ff8b72c0..dbcfbf01 100644 --- a/src/output.c +++ b/src/output.c @@ -104,7 +104,6 @@ #include "conflicts.h" #include "muscle_tab.h" -extern void berror PARAMS((const char *)); static int nvectors; static int nentries; @@ -125,6 +124,8 @@ static int high; struct obstack muscle_obstack; struct obstack output_obstack; +int error_verbose = 0; + /* FIXME. */ static inline void @@ -167,8 +168,16 @@ output_token_translations (void) static void output_gram (void) { - output_table_data (&output_obstack, rrhs, - 0, 1, nrules + 1); + { + 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)); { @@ -203,7 +212,7 @@ output_stos (void) int i; short *values = (short *) alloca (sizeof (short) * nstates); for (i = 0; i < nstates; ++i) - values[i] = state_table[i].accessing_symbol; + values[i] = state_table[i]->accessing_symbol; output_table_data (&output_obstack, values, 0, 1, nstates); muscle_insert ("stos", obstack_finish (&output_obstack)); @@ -217,9 +226,16 @@ output_rule_data (void) int j; short *short_tab = NULL; - output_table_data (&output_obstack, rline, - 0, 1, nrules + 1); - muscle_insert ("rline", obstack_finish (&output_obstack)); + { + 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); + } + j = 0; for (i = 0; i < nsyms; i++) @@ -279,22 +295,27 @@ output_rule_data (void) muscle_insert ("toknum", obstack_finish (&output_obstack)); /* Output YYR1. */ - output_table_data (&output_obstack, rlhs, - 0, 1, nrules + 1); - muscle_insert ("r1", obstack_finish (&output_obstack)); - XFREE (rlhs + 1); + { + 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. */ 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; + 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); - XFREE (rrhs + 1); + XFREE (rule_table + 1); } /*------------------------------------------------------------------. @@ -319,15 +340,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; @@ -338,7 +355,7 @@ action_row (int state) default_rule = 0; nreds = 0; - redp = reduction_table[state]; + redp = state_table[state]->reductions; if (redp) { @@ -348,69 +365,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; + 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 = state_table[shift_state].accessing_symbol; + 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) { @@ -428,14 +422,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++) @@ -547,37 +541,6 @@ token_actions (void) } -static void -free_shifts (void) -{ - shifts *sp, *sptmp; /* JF derefrenced freed ptr */ - - XFREE (shift_table); - - for (sp = first_shift; sp; sp = sptmp) - { - sptmp = sp->next; - XFREE (sp); - } -} - - -static void -free_reductions (void) -{ - reductions *rp, *rptmp; /* JF fixed freed ptr */ - - XFREE (reduction_table); - - for (rp = first_reduction; rp; rp = rptmp) - { - rptmp = rp->next; - XFREE (rp); - } -} - - - static void save_column (int symbol, int default_state) { @@ -825,8 +788,8 @@ pack_vector (int vector) } } - berror ("pack_vector"); - return 0; /* JF keep lint happy */ + assert (!"pack_vector"); + return 0; } @@ -930,9 +893,8 @@ output_actions (void) width = XCALLOC (short, nvectors); token_actions (); - free_shifts (); - free_reductions (); - XFREE (lookaheads); + LIST_FREE (shifts, first_shift); + LIST_FREE (reductions, first_reduction); XFREE (LA); XFREE (LAruleno); @@ -948,6 +910,7 @@ output_actions (void) output_table (); output_check (); + LIST_FREE (state_t, first_state); XFREE (state_table); } @@ -984,7 +947,7 @@ output_parser (const char *skel_filename, struct obstack *oout) const char *muscle_key = 0; const char *muscle_value = 0; - while (isalnum (c = getc (fskel)) || c == '_') + while (isalnum (c = getc (fskel)) || c == '-') obstack_1grow (&muscle_obstack, c); obstack_1grow (&muscle_obstack, 0); @@ -995,9 +958,8 @@ output_parser (const char *skel_filename, struct obstack *oout) obstack_sgrow (oout, muscle_value); else if (!strcmp (muscle_key, "line")) obstack_fgrow1 (oout, "%d", line + 1); - else if (!strcmp (muscle_key, "input_line")) + else if (!strcmp (muscle_key, "input-line")) obstack_fgrow1 (oout, "%d", lineno); - /* FIXME: Insert the code to recognize %%sub-skeleton for exemple. */ else { obstack_sgrow (oout, "%%"); @@ -1026,21 +988,11 @@ output_master_parser (void) 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; - for (cp = first_state; cp; cp = cptmp) - { - cptmp = cp->next; - XFREE (cp); - } -} - /* FIXME. */ #define MUSCLE_INSERT_INT(Key, Value) \ @@ -1075,16 +1027,17 @@ prepare (void) MUSCLE_INSERT_INT ("final", final_state); MUSCLE_INSERT_INT ("maxtok", max_user_token_number); MUSCLE_INSERT_INT ("ntbase", ntokens); - MUSCLE_INSERT_INT ("verbose", 0); + MUSCLE_INSERT_INT ("error-verbose", error_verbose); 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 ("locations-flag", locations_flag); /* We need to save the actions in the muscle %%action. */ + obstack_1grow (&action_obstack, 0); muscle_insert ("action", obstack_finish (&action_obstack)); if (spec_name_prefix) @@ -1100,8 +1053,6 @@ output (void) { obstack_init (&output_obstack); - free_itemsets (); - output_token_translations (); output_gram (); @@ -1117,6 +1068,7 @@ output (void) #endif prepare (); /* Copy definitions in directive. */ + obstack_1grow (&attrs_obstack, 0); muscle_insert ("prologue", obstack_finish (&attrs_obstack)); output_master_parser ();