(jm_PREREQ_QUOTEARG): AC_MBSTATE_T -> AC_TYPE_MBSTATE_T.

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 573eb0ca0bd9d178cfcd2f86f56d9577f07a4790..f82daee066e6d2e1471245d4a788d92949590e75 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -20,17 +20,15 @@
    02111-1307, USA.  */
 
 
    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.
+/* The parser tables consist of these tables.

 
    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.


@@ -44,8 +42,7 @@
 
    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
 
    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


@@ -79,7 +76,7 @@
    in a roundabout way, the bounds of the portion you are trying to
    examine.
 
    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
+   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,
    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,


@@ -89,866 +86,436 @@
    negative short int.  Used to flag ??  */
 
 #include "system.h"
    negative short int.  Used to flag ??  */
 
 #include "system.h"

-#include "bitsetv.h"

 #include "quotearg.h"
 #include "error.h"
 #include "getargs.h"
 #include "files.h"
 #include "gram.h"
 #include "quotearg.h"
 #include "error.h"
 #include "getargs.h"
 #include "files.h"
 #include "gram.h"

-#include "LR0.h"

 #include "complain.h"
 #include "output.h"
 #include "complain.h"
 #include "output.h"

-#include "lalr.h"

 #include "reader.h"
 #include "symtab.h"
 #include "reader.h"
 #include "symtab.h"

-#include "conflicts.h"
+#include "tables.h"

 #include "muscle_tab.h"
 
 #include "muscle_tab.h"
 

-/* From lib/readpipe.h.  */
-FILE *readpipe PARAMS ((const char *, ...));
-

 /* From src/scan-skel.l. */
 /* 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 short *tally = NULL;
-static short *width = NULL;
-static short *actrow = NULL;
-static short *state_count = NULL;
-static short *order = NULL;
-static short *base = NULL;
-static short *pos = NULL;
-static short *table = NULL;
-static short *check = NULL;
-static int lowzero;
-static int high;
-
-struct obstack muscle_obstack;
-static struct obstack format_obstack;
+void m4_invoke PARAMS ((const char *definitions));

 
 

-int error_verbose = 0;

 
 

-/* Returns the number of lines of S.  */
-size_t
-get_lines_number (const char *s)
-{
-  size_t lines = 0;
+static struct obstack format_obstack;

 
 

-  size_t i;
-  for (i = 0; s[i]; ++i)
-    if (s[i] == '\n')
-      ++lines;
+int error_verbose = 0;

 
 

-  return lines;
-}

 
 
 
 

-/* FIXME. */
+/*-------------------------------------------------------------------.
+| Create a function NAME which associates to the muscle NAME the     |
+| result of formatting the FIRST and then TABLE_DATA[BEGIN..END[ (of |
+| TYPE), and to the muscle NAME_max, the max value of the            |
+| TABLE_DATA.                                                        |
+`-------------------------------------------------------------------*/

 
 

-static inline void
-output_table_data (struct obstack *oout,
-                  short *table_data,
-                  short first,
-                  int begin,
-                  int end)
-{
-  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]);
-    }
-  obstack_1grow (oout, 0);
+#define GENERATE_MUSCLE_INSERT_TABLE(Name, Type)                       \
+                                                                       \
+static void                                                            \
+Name (const char *name,                                                        \
+      Type *table_data,                                                        \
+      Type first,                                                      \
+      int begin,                                                       \
+      int end)                                                         \
+{                                                                      \
+  Type min = first;                                                    \
+  Type max = first;                                                    \
+  int i;                                                               \
+  int j = 1;                                                           \
+                                                                       \
+  obstack_fgrow1 (&format_obstack, "%6d", first);                      \
+  for (i = begin; i < end; ++i)                                                \
+    {                                                                  \
+      obstack_1grow (&format_obstack, ',');                            \
+      if (j >= 10)                                                     \
+       {                                                               \
+         obstack_sgrow (&format_obstack, "\n  ");                      \
+         j = 1;                                                        \
+       }                                                               \
+      else                                                             \
+       ++j;                                                            \
+      obstack_fgrow1 (&format_obstack, "%6d", table_data[i]);          \
+      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_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),            \
+                         (long int) max);                              \

 }
 
 }
 

+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_base_table, base_t)
+GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_rule_number_table, rule_number_t)
+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)

 
 

-static void
-output_token_translations (void)
-{
-  output_table_data (&format_obstack, token_translations,
-                    0, 1, max_user_token_number + 1);
-  muscle_insert ("translate", obstack_finish (&format_obstack));
-  XFREE (token_translations);
-}

 
 

+/*-----------------------------------------------------------------.
+| Prepare the muscles related to the tokens: translate, tname, and |
+| toknum.                                                          |
+`-----------------------------------------------------------------*/

 
 static void
 
 static void

-output_gram (void)
+prepare_tokens (void)

 {
 {

-  {
-    int i;
-    short *values = XCALLOC (short, nrules + 1);
-    for (i = 0; i < nrules + 1; ++i)
-      values[i] = rules[i].rhs;
-    output_table_data (&format_obstack, values,
-                      0, 1, nrules + 1);
-    XFREE (values);
-  }
-
-  muscle_insert ("prhs", obstack_finish (&format_obstack));
+  muscle_insert_symbol_number_table ("translate",
+                                    token_translations,
+                                    token_translations[0],
+                                    1, max_user_token_number + 1);

 
   {
 
   {

-    short *yyrhs;

     int i;
     int i;

+    int j = 0;
+    for (i = 0; i < nsyms; i++)
+      {
+       /* Be sure not to use twice the same QUOTEARG slot:
+          SYMBOL_TAG_GET uses slot 0.  */
+       const char *cp =
+         quotearg_n_style (1, c_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;
+         }
+
+       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");

 
 

-    yyrhs = XMALLOC (short, nritems);
-
-    for (i = 1; i < nritems; ++i)
-      yyrhs[i] = ritem[i] >= 0 ? ritem[i] : -1;
-
-    output_table_data (&format_obstack, yyrhs,
-                      ritem[0], 1, nritems);
-    muscle_insert ("rhs", obstack_finish (&format_obstack));
-
-    XFREE (yyrhs);
-  }
-
-#if 0
-  if (!semantic_parser)
-    obstack_sgrow (&table_obstack, "\n#endif\n");
-#endif
-}
-
-
-static void
-output_stos (void)
-{
-  size_t i;
-  short *values = (short *) alloca (sizeof (short) * nstates);
-  for (i = 0; i < nstates; ++i)
-    values[i] = states[i]->accessing_symbol;
-  output_table_data (&format_obstack, values,
-                    0, 1, nstates);
-  muscle_insert ("stos", obstack_finish (&format_obstack));
-}
-
-
-static void
-output_rule_data (void)
-{
-  int i;
-  int j;
-  short *short_tab = NULL;
-
-  {
-    short *values = XCALLOC (short, nrules + 1);
-    for (i = 0; i < nrules + 1; ++i)
-      values[i] = rules[i].line;
-    output_table_data (&format_obstack, values,
-                      0, 1, nrules + 1);
-    muscle_insert ("rline", obstack_finish (&format_obstack));
-    XFREE (values);
+    /* Finish table and store. */
+    obstack_1grow (&format_obstack, 0);
+    muscle_insert ("tname", obstack_finish (&format_obstack));

   }
 
   }
 

-
-  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;
-       }
-
-      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");
-
-  /* Finish table and store. */
-  obstack_1grow (&format_obstack, 0);
-  muscle_insert ("tname", obstack_finish (&format_obstack));
-

   /* Output YYTOKNUM. */
   {
   /* Output YYTOKNUM. */
   {

-    short *values = XCALLOC (short, ntokens + 1);
-    for (i = 0; i < ntokens + 1; ++i)
+    int i;
+    int *values = XCALLOC (int, ntokens);
+    for (i = 0; i < ntokens; ++i)

       values[i] = symbols[i]->user_token_number;
       values[i] = symbols[i]->user_token_number;

-    output_table_data (&format_obstack, values,
-                      0, 1, ntokens + 1);
-    muscle_insert ("toknum", obstack_finish (&format_obstack));
-    XFREE (values);
-  }
-
-
-  /* Output YYR1. */
-  {
-    short *values = XCALLOC (short, nrules + 1);
-    for (i = 0; i < nrules + 1; ++i)
-      values[i] = rules[i].lhs;
-    output_table_data (&format_obstack, values,
-                      0, 1, nrules + 1);
-    muscle_insert ("r1", obstack_finish (&format_obstack));
-    XFREE (values);
+    muscle_insert_int_table ("toknum", values,
+                            values[0], 1, ntokens);
+    free (values);

   }
   }

-
-  /* Output YYR2. */
-  short_tab = XMALLOC (short, nrules + 1);
-  for (i = 1; i < nrules; i++)
-    short_tab[i] = rules[i + 1].rhs - rules[i].rhs - 1;
-  short_tab[nrules] =  nritems - rules[nrules].rhs - 1;
-  output_table_data (&format_obstack, short_tab,
-                    0, 1, nrules + 1);
-  muscle_insert ("r2", obstack_finish (&format_obstack));
-  XFREE (short_tab);

 }
 
 }
 

-/*------------------------------------------------------------------.
-| 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       |
-| MINSHORT, 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.                  |
-`------------------------------------------------------------------*/
-
-static int
-action_row (state_t *state)
-{
-  int i;
-  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;

 
 

-  if (redp->nreds >= 1)
-    {
-      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] = -LAruleno[state->lookaheadsp + i];
-    }
-
-  /* Now see which tokens are allowed for shifts in this state.  For
-     them, record the shift as the thing to do.  So shift is preferred
-     to reduce.  */
-  for (i = 0; i < shiftp->nshifts; i++)
-    {
-      int symbol;
-      int shift_state = shiftp->shifts[i];
-      if (!shift_state)
-       continue;
+/*-------------------------------------------------------------.
+| Prepare the muscles related to the rules: rhs, prhs, r1, r2, |
+| rline, dprec, merger                                         |
+`-------------------------------------------------------------*/

 
 

-      symbol = states[shift_state]->accessing_symbol;
-
-      if (ISVAR (symbol))
-       break;
-
-      actrow[symbol] = shift_state;
-
-      /* Do not use any default reduction if there is a shift for
-        error */
-      if (symbol == error_token_number)
-       nodefault = 1;
-    }
-
-  /* See which tokens are an explicit error in this state (due to
-     %nonassoc).  For them, record MINSHORT as the action.  */
-  for (i = 0; i < errp->nerrs; i++)
-    {
-      int symbol = errp->errs[i];
-      actrow[symbol] = MINSHORT;
-    }
-
-  /* Now find the most common reduction and make it the default action
-     for this state.  */
-
-  if (redp->nreds >= 1 && !nodefault)
+static void
+prepare_rules (void)
+{
+  rule_number_t r;
+  unsigned int i = 0;
+  item_number_t *rhs = XMALLOC (item_number_t, nritems);
+  unsigned int *prhs = XMALLOC (unsigned int, nrules);
+  unsigned int *rline = XMALLOC (unsigned int, nrules);
+  symbol_number_t *r1 = XMALLOC (symbol_number_t, nrules);
+  unsigned int *r2 = XMALLOC (unsigned int, nrules);
+  short *dprec = XMALLOC (short, nrules);
+  short *merger = XMALLOC (short, nrules);
+
+  for (r = 0; r < nrules; ++r)

     {
     {

-      if (state->consistent)
-       default_rule = redp->rules[0];
-      else
-       {
-         int max = 0;
-         for (i = 0; i < state->nlookaheads; i++)
-           {
-             int count = 0;
-             int rule = -LAruleno[state->lookaheadsp + i];
-             int j;
-
-             for (j = 0; j < ntokens; j++)
-               if (actrow[j] == rule)
-                 count++;
-
-             if (count > max)
-               {
-                 max = count;
-                 default_rule = rule;
-               }
-           }
-
-         /* actions which 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)
-                 actrow[j] = 0;
-
-             default_rule = -default_rule;
-           }
-       }
+      item_number_t *rhsp = NULL;
+      /* 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].location.first_line;
+      /* Dynamic precedence (GLR) */
+      dprec[r] = rules[r].dprec;
+      /* Merger-function index (GLR) */
+      merger[r] = rules[r].merger;

     }
     }

-
-  /* 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] == MINSHORT)
-       actrow[i] = 0;
-
-  return default_rule;
+  assert (i == nritems);
+
+  muscle_insert_item_number_table ("rhs", rhs, ritem[0], 1, nritems);
+  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);
+
+  free (rhs);
+  free (prhs);
+  free (rline);
+  free (r1);
+  free (r2);
+  free (dprec);
+  free (merger);

 }
 
 }
 

+/*--------------------------------------------.
+| Prepare the muscles related to the states.  |
+`--------------------------------------------*/

 
 static void
 
 static void

-save_row (int state)
+prepare_states (void)

 {
 {

-  int i;
-  int count;
-  short *sp;
-  short *sp1;
-  short *sp2;
-
-  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);
-
-  for (i = 0; i < ntokens; i++)
-    if (actrow[i] != 0)
-      {
-       *sp1++ = i;
-       *sp2++ = actrow[i];
-      }
-
-  tally[state] = count;
-  width[state] = sp1[-1] - sp[0] + 1;
+  state_number_t i;
+  symbol_number_t *values =
+    (symbol_number_t *) alloca (sizeof (symbol_number_t) * nstates);
+  for (i = 0; i < nstates; ++i)
+    values[i] = states[i]->accessing_symbol;
+  muscle_insert_symbol_number_table ("stos", values,
+                                    0, 1, nstates);

 }
 
 
 }
 
 

-/*------------------------------------------------------------------.
-| 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.                                       |
-`------------------------------------------------------------------*/
+
+/*----------------------------------.
+| Output the user actions to OOUT.  |
+`----------------------------------*/

 
 static void
 
 static void

-token_actions (void)
+user_actions_output (FILE *out)

 {
 {

-  size_t i;
-  short *yydefact = XCALLOC (short, nstates);
-
-  actrow = XCALLOC (short, ntokens);
-  for (i = 0; i < nstates; ++i)
-    {
-      yydefact[i] = action_row (states[i]);
-      save_row (i);
-    }
-
-  output_table_data (&format_obstack, yydefact,
-                    yydefact[0], 1, nstates);
-  muscle_insert ("defact", obstack_finish (&format_obstack));
+  rule_number_t r;

 
 

-  XFREE (actrow);
-  XFREE (yydefact);
-}
-
-
-/*-----------------------------.
-| Output the actions to OOUT.  |
-`-----------------------------*/
-
-void
-actions_output (FILE *out)
-{
-  int rule;
-  for (rule = 1; rule < nrules + 1; ++rule)
-    if (rules[rule].action)
+  fputs ("m4_define([b4_actions], \n[[", out);
+  for (r = 0; r < nrules; ++r)
+    if (rules[r].action)

       {
       {

-       fprintf (out, "  case %d:\n", rule);
+       fprintf (out, "  case %d:\n", r + 1);

 
        if (!no_lines_flag)
          fprintf (out, muscle_find ("linef"),
 
        if (!no_lines_flag)
          fprintf (out, muscle_find ("linef"),

-                  rules[rule].action_line,
+                  rules[r].action_location.first_line,

                   quotearg_style (c_quoting_style,
                                   muscle_find ("filename")));
                   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 ? ";" : "");
+       fprintf (out, "    %s\n    break;\n\n",
+                rules[r].action);

       }
       }

+  fputs ("]])\n\n", out);

 }
 
 }
 

+/*--------------------------------------.
+| Output the merge functions to OUT.   |
+`--------------------------------------*/

 
 

-/*----------------------------.
-| Output the guards to OOUT.  |
-`----------------------------*/
-
-void
-guards_output (FILE *out)
+static void
+merger_output (FILE *out)

 {
 {

-  int rule;
-  for (rule = 1; rule < nrules + 1; ++rule)
-    if (rules[rule].guard)
-      {
-       fprintf (out, "  case %d:\n", rule);
+  int n;
+  merger_list* p;

 
 

-       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);
-      }
+  fputs ("m4_define([b4_mergers], \n[[", out);
+  for (n = 1, p = merge_functions; p != NULL; n += 1, p = p->next)
+    {
+      if (p->type[0] == '\0')
+       fprintf (out, "  case %d: yyval = %s (*yy0, *yy1); break;\n",
+                n, p->name);
+      else
+       fprintf (out, "  case %d: yyval.%s = %s (*yy0, *yy1); break;\n",
+                n, p->type, p->name);
+    }
+  fputs ("]])\n\n", out);

 }
 
 }
 

-

 /*---------------------------------------.
 | Output the tokens definition to OOUT.  |
 `---------------------------------------*/
 
 /*---------------------------------------.
 | Output the tokens definition to OOUT.  |
 `---------------------------------------*/
 

-void
+static void

 token_definitions_output (FILE *out)
 {
   int i;
   int first = 1;
 token_definitions_output (FILE *out)
 {
   int i;
   int first = 1;

+
+  fputs ("m4_define([b4_tokens], \n[", out);

   for (i = 0; i < ntokens; ++i)
     {
   for (i = 0; i < ntokens; ++i)
     {

-      bucket *symbol = symbols[i];
+      symbol_t *symbol = symbols[i];

       int number = symbol->user_token_number;
 
       int number = symbol->user_token_number;
 

-      if (number == SALIAS)
-       continue;
+      /* 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);
+

       /* Skip error token.  */
       /* Skip error token.  */

-      if (symbol->value == error_token_number)
+      if (symbol == 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;
+
+      /* 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] == '\"')

        continue;
        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;
 
 
       /* 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]]",
+      fprintf (out, "%s[[[%s]], [%d]]",

               first ? "" : ",\n", symbol->tag, number);
               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->value);
+

       first = 0;
     }
       first = 0;
     }

+  fputs ("])\n\n", out);

 }
 
 
 }
 
 

+/*----------------------------------------.
+| Output the symbol destructors to OOUT.  |
+`----------------------------------------*/
+

 static void
 static void

-save_column (int symbol, int default_state)
+symbol_destructors_output (FILE *out)

 {
   int i;
 {
   int i;

-  short *sp;
-  short *sp1;
-  short *sp2;
-  int count;
-  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 (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 int
-default_goto (int symbol)
-{
-  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;
-
-  for (i = 0; i < nstates; i++)
-    state_count[i] = 0;
-
-  for (i = m; i < n; i++)
-    state_count[to_state[i]]++;
+  int first = 1;

 
 

-  for (i = 0; i < nstates; i++)
-    if (state_count[i] > max)
+  fputs ("m4_define([b4_symbol_destructors], \n[", out);
+  for (i = 0; i < nsyms; ++i)
+    if (symbols[i]->destructor)

       {
       {

-       max = state_count[i];
-       default_state = i;
+       symbol_t *symbol = 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);
+
+       first = 0;

       }
       }

-
-  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)
-{
-  int i;
-  short *yydefgoto = XMALLOC (short, nsyms - ntokens);
-
-  state_count = XCALLOC (short, nstates);
-  for (i = ntokens; i < nsyms; ++i)
-    {
-      int default_state = default_goto (i);
-      save_column (i, default_state);
-      yydefgoto[i - ntokens] = default_state;
-    }
-
-  output_table_data (&format_obstack, yydefgoto,
-                    yydefgoto[0], 1, nsyms - ntokens);
-  muscle_insert ("defgoto", obstack_finish (&format_obstack));
-
-  XFREE (state_count);
-  XFREE (yydefgoto);
+  fputs ("])\n\n", out);

 }
 
 
 }
 
 

-/* The next few functions decide how to pack the actions and gotos
-   information into yytable. */
+/*-------------------------------------.
+| Output the symbol printers to OOUT.  |
+`-------------------------------------*/

 
 static void
 
 static void

-sort_actions (void)
+symbol_printers_output (FILE *out)

 {
   int i;
 {
   int i;

+  int first = 1;

 
 

-  order = XCALLOC (short, nvectors);
-  nentries = 0;
-
-  for (i = 0; i < nvectors; i++)
-    if (tally[i] > 0)
+  fputs ("m4_define([b4_symbol_printers], \n[", out);
+  for (i = 0; i < nsyms; ++i)
+    if (symbols[i]->destructor)

       {
       {

-       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++;
+       symbol_t *symbol = 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);
+
+       first = 0;

       }
       }

-}
-
-
-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];
-
-  assert (t);
-
-  for (j = lowzero - from[0]; j < MAXTABLE; j++)
-    {
-      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 (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 + from[k];
-             table[loc] = to[k];
-             check[loc] = 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, MAXTABLE);
-  check = XCALLOC (short, MAXTABLE);
-
-  lowzero = 0;
-  high = 0;
-
-  for (i = 0; i < nvectors; i++)
-    base[i] = MINSHORT;
-
-  for (i = 0; i < MAXTABLE; 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 (froms);
-  XFREE (tos);
-  XFREE (pos);
-}
-
-/* the following functions output yytable, yycheck
-   and the vectors whose elements index the portion starts */
-
-static void
-output_base (void)
-{
-  /* Output pact. */
-  output_table_data (&format_obstack, base,
-                    base[0], 1, nstates);
-  muscle_insert ("pact", obstack_finish (&format_obstack));
-
-  /* Output pgoto. */
-  output_table_data (&format_obstack, base,
-                    base[nstates], nstates + 1, nvectors);
-  muscle_insert ("pgoto", obstack_finish (&format_obstack));
-
-  XFREE (base);
-}
-
-
-static void
-output_table (void)
-{
-  output_table_data (&format_obstack, table,
-                    table[0], 1, high + 1);
-  muscle_insert ("table", obstack_finish (&format_obstack));
-  XFREE (table);
+  fputs ("])\n\n", out);

 }
 
 
 static void
 }
 
 
 static void

-output_check (void)
+prepare_actions (void)

 {
 {

-  output_table_data (&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.  */
+  /* Figure out the actions for the specified state, indexed by
+     lookahead token type.  */

 
 

-static void
-output_actions (void)
-{
-  size_t i;
-  nvectors = nstates + nvars;
+  muscle_insert_rule_number_table ("defact", yydefact,
+                                  yydefact[0], 1, nstates);

 
 

-  froms = XCALLOC (short *, nvectors);
-  tos = XCALLOC (short *, nvectors);
-  tally = XCALLOC (short, nvectors);
-  width = XCALLOC (short, nvectors);
+  /* 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);

 
 

-  token_actions ();
-  bitsetv_free (LA);
-  XFREE (LAruleno);

 
 

-  goto_actions ();
-  XFREE (goto_map + ntokens);
-  XFREE (from_state);
-  XFREE (to_state);
+  /* Output PACT. */
+  muscle_insert_base_table ("pact", base,
+                            base[0], 1, nstates);
+  MUSCLE_INSERT_INT ("pact_ninf", base_ninf);

 
 

-  sort_actions ();
-  pack_table ();
+  /* Output PGOTO. */
+  muscle_insert_base_table ("pgoto", base,
+                            base[nstates], nstates + 1, nvectors);

 
 

-  output_base ();
-  output_table ();
+  muscle_insert_base_table ("table", table,
+                           table[0], 1, high + 1);
+  MUSCLE_INSERT_INT ("table_ninf", table_ninf);

 
 

-  output_check ();
+  muscle_insert_base_table ("check", check,
+                           check[0], 1, high + 1);

 
 

-  for (i = 0; i < nstates; ++i)
+  if (glr_parser)

     {
     {

-      free (states[i]->shifts);
-      XFREE (states[i]->reductions);
-      free (states[i]->errs);
-      free (states[i]);
+      /* 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. */
+      muscle_insert_unsigned_int_table ("conflict_list_heads", conflict_table,
+                                       conflict_table[0], 1, high+1);
+      muscle_insert_unsigned_int_table ("conflicting_rules", conflict_list,
+                            conflict_list[0], 1, conflict_list_cnt);

     }
     }

-  XFREE (states);

 }
 
 \f
 }
 
 \f


@@ -982,17 +549,11 @@ output_skeleton (void)
   fputs ("m4_changecom()\n", out);
   fputs ("m4_init()\n", out);
 
   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);
+  user_actions_output (out);
+  merger_output (out);

   token_definitions_output (out);
   token_definitions_output (out);

-  fputs ("])\n\n", out);
+  symbol_destructors_output (out);
+  symbol_printers_output (out);

 
   muscles_m4_output (out);
 
 
   muscles_m4_output (out);
 


@@ -1000,73 +561,62 @@ output_skeleton (void)
   fputs ("m4_divert_push(0)dnl\n", out);
   xfclose (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);
-  }
+  timevar_push (TV_M4);
+  m4_invoke (tempfile);
+  timevar_pop (TV_M4);
+
+  /* If `debugging', keep this file alive. */
+  if (!(trace_flag & trace_tools))
+    unlink (tempfile);
+
+  free (tempfile);

 }
 
 static void
 prepare (void)
 {
 }
 
 static void
 prepare (void)
 {

-  MUSCLE_INSERT_INT ("last", high);
-  MUSCLE_INSERT_INT ("flag", MINSHORT);
+  /* Flags. */
+  MUSCLE_INSERT_INT ("locations_flag", locations_flag);
+  MUSCLE_INSERT_INT ("defines_flag", defines_flag);
+  MUSCLE_INSERT_INT ("error_verbose", error_verbose);

   MUSCLE_INSERT_INT ("pure", pure_parser);
   MUSCLE_INSERT_INT ("pure", pure_parser);

-  MUSCLE_INSERT_INT ("nsym", nsyms);

   MUSCLE_INSERT_INT ("debug", debug_flag);
   MUSCLE_INSERT_INT ("debug", debug_flag);

-  MUSCLE_INSERT_INT ("final", final_state);
-  MUSCLE_INSERT_INT ("maxtok", 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.  */
 
   /* 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 ("prefix", spec_name_prefix ? spec_name_prefix : "yy");

   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_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);
+  /* Symbols. */
+  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_INT ("locations_flag", locations_flag);
-  MUSCLE_INSERT_INT ("defines_flag", defines_flag);
+  /* Rules. */
+  MUSCLE_INSERT_INT ("rules_number", nrules);

 
 

-  /* Copy definitions in directive.  */
-  obstack_1grow (&attrs_obstack, 0);
-  muscle_insert ("prologue", obstack_finish (&attrs_obstack));
+  /* States. */
+  MUSCLE_INSERT_INT ("last", high);
+  MUSCLE_INSERT_INT ("final_state_number", final_state->number);
+  MUSCLE_INSERT_INT ("states_number", nstates);
+
+  /* User Code.  */
+  obstack_1grow (&pre_prologue_obstack, 0);
+  obstack_1grow (&post_prologue_obstack, 0);
+  muscle_insert ("pre_prologue", obstack_finish (&pre_prologue_obstack));
+  muscle_insert ("post_prologue", obstack_finish (&post_prologue_obstack));

 
   /* Find the right skeleton file.  */
   if (!skeleton)
     {
 
   /* Find the right skeleton file.  */
   if (!skeleton)
     {

-      if (semantic_parser)
-       skeleton = "bison.hairy";
+      if (glr_parser)
+       skeleton = "glr.c";

       else
       else

-       skeleton = "bison.simple";
+       skeleton = "yacc.c";

     }
 
   /* Parse the skeleton file and output the needed parsers.  */
     }
 
   /* Parse the skeleton file and output the needed parsers.  */


@@ -1083,21 +633,17 @@ output (void)
 {
   obstack_init (&format_obstack);
 
 {
   obstack_init (&format_obstack);
 

-  output_token_translations ();
-  output_gram ();
-
-  if (semantic_parser)
-    output_stos ();
-  output_rule_data ();
-  output_actions ();
+  prepare_tokens ();
+  prepare_rules ();
+  prepare_states ();
+  prepare_actions ();

 
   prepare ();
 
   /* Process the selected skeleton file.  */
   output_skeleton ();
 
 
   prepare ();
 
   /* Process the selected skeleton file.  */
   output_skeleton ();
 

-  obstack_free (&muscle_obstack, NULL);

   obstack_free (&format_obstack, NULL);
   obstack_free (&format_obstack, NULL);

-  obstack_free (&action_obstack, NULL);
-  obstack_free (&attrs_obstack, NULL);
+  obstack_free (&pre_prologue_obstack, NULL);
+  obstack_free (&post_prologue_obstack, NULL);

 }
 }