(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 8783dbd5b6367dd6571e26033135bf15fb226be3..f82daee066e6d2e1471245d4a788d92949590e75 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,5 +1,6 @@
 /* Output the generated parsing program for bison,
 /* Output the generated parsing program for bison,

-   Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002
+   Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -20,1284 +21,606 @@
 
 
 /* The parser tables consist of these tables.
 
 
 /* The parser tables consist of these tables.

-   Starred ones needed only for the semantic parser.
-   Double starred are output only if switches are set.

 
 

-   yytranslate = vector mapping yylex's token numbers into bison's token
-   numbers.
+   YYTRANSLATE = vector mapping yylex's token numbers into bison's
+   token numbers.

 
 

-   ** yytname = vector of string-names indexed by bison token number
+   YYTNAME = vector of string-names indexed by bison token number.

 
 

-   ** yytoknum = vector of yylex token numbers corresponding to entries
-   in yytname
+   YYTOKNUM = vector of yylex token numbers corresponding to entries
+   in YYTNAME.

 
 

-   yyrline = vector of line-numbers of all rules.  For yydebug printouts.
+   YYRLINE = vector of line-numbers of all rules.  For yydebug
+   printouts.

 
 

-   yyrhs = vector of items of all rules.
-   This is exactly what ritems contains.  For yydebug and for semantic
-   parser.
+   YYRHS = vector of items of all rules.  This is exactly what RITEMS
+   contains.  For yydebug and for semantic parser.

 
 

-   yyprhs[r] = index in yyrhs of first item for rule r.
+   YYPRHS[R] = index in YYRHS of first item for rule R.

 
 

-   yyr1[r] = symbol number of symbol that rule r derives.
+   YYR1[R] = symbol number of symbol that rule R derives.

 
 

-   yyr2[r] = number of symbols composing right hand side of rule r.
+   YYR2[R] = number of symbols composing right hand side of rule R.

 
 

-   * yystos[s] = the symbol number of the symbol that leads to state s.
+   YYSTOS[S] = the symbol number of the symbol that leads to state S.

 
 

-   yydefact[s] = default rule to reduce with in state s,
-   when yytable doesn't specify something else to do.
-   Zero means the default is an error.
+   YYDEFACT[S] = default rule to reduce with in state s, when YYTABLE
+   doesn't specify something else to do.  Zero means the default is an
+   error.

 
 

-   yydefgoto[i] = default state to go to after a reduction of a rule that
-   generates variable ntokens + i, except when yytable
-   specifies something else to do.
+   YYDEFGOTO[I] = default state to go to after a reduction of a rule
+   that generates variable NTOKENS + I, except when YYTABLE specifies
+   something else to do.

 
 

-   yypact[s] = index in yytable of the portion describing state s.
-   The lookahead token's type is used to index that portion
-   to find out what to do.
+   YYPACT[S] = index in YYTABLE of the portion describing state S.
+   The lookahead token's type is used to index that portion to find
+   out what to do.

 
 

-   If the value in yytable is positive,
-   we shift the token and go to that state.
+   If the value in YYTABLE is positive, we shift the token and go to
+   that state.

 
    If the value is negative, it is minus a rule number to reduce by.
 
 
    If the value is negative, it is minus a rule number to reduce by.
 

-   If the value is zero, the default action from yydefact[s] is used.
+   If the value is zero, the default action from YYDEFACT[S] is used.

 
 

-   yypgoto[i] = the index in yytable of the portion describing
-   what to do after reducing a rule that derives variable i + ntokens.
-   This portion is indexed by the parser state number, s,
-   as of before the text for this nonterminal was read.
-   The value from yytable is the state to go to if
-   the corresponding value in yycheck is s.
+   YYPGOTO[I] = the index in YYTABLE of the portion describing what to
+   do after reducing a rule that derives variable I + NTOKENS.  This
+   portion is indexed by the parser state number, S, as of before the
+   text for this nonterminal was read.  The value from YYTABLE is the
+   state to go to if the corresponding value in YYCHECK is S.

 
 

-   yytable = a vector filled with portions for different uses,
-   found via yypact and yypgoto.
+   YYTABLE = a vector filled with portions for different uses, found
+   via YYPACT and YYPGOTO.

 
 

-   yycheck = a vector indexed in parallel with yytable.
-   It indicates, in a roundabout way, the bounds of the
-   portion you are trying to examine.
+   YYCHECK = a vector indexed in parallel with YYTABLE.  It indicates,
+   in a roundabout way, the bounds of the portion you are trying to
+   examine.

 
 

-   Suppose that the portion of yytable starts at index p
-   and the index to be examined within the portion is i.
-   Then if yycheck[p+i] != i, i is outside the bounds
-   of what is actually allocated, and the default
-   (from yydefact or yydefgoto) should be used.
-   Otherwise, yytable[p+i] should be used.
+   Suppose that the portion of YYTABLE starts at index P and the index
+   to be examined within the portion is I.  Then if YYCHECK[P+I] != I,
+   I is outside the bounds of what is actually allocated, and the
+   default (from YYDEFACT or YYDEFGOTO) should be used.  Otherwise,
+   YYTABLE[P+I] should be used.

 
 

-   YYFINAL = the state number of the termination state.
-   YYFLAG = most negative short int.  Used to flag ??
-   YYNTBASE = ntokens.
-*/
+   YYFINAL = the state number of the termination state.  YYFLAG = most
+   negative short int.  Used to flag ??  */

 
 #include "system.h"
 
 #include "system.h"

-#include "obstack.h"
+#include "quotearg.h"
+#include "error.h"

 #include "getargs.h"
 #include "getargs.h"

-#include "xalloc.h"

 #include "files.h"
 #include "gram.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 "reader.h"

-#include "conflicts.h"
-
-extern void berror PARAMS((const char *));
-
-
-
-static int nvectors;
-static int nentries;
-static short **froms;
-static short **tos;
-static short *tally;
-static short *width;
-static short *actrow;
-static short *state_count;
-static short *order;
-static short *base;
-static short *pos;
-static short *table;
-static short *check;
-static int lowzero;
-static int high;
-
-
-
-static inline void
-output_short_or_char_table (struct obstack *oout,
-                           const char *comment,
-                           const char *type,
-                           const char *table_name,
-                           short *short_table,
-                           short first_value,
-                           short begin, short end)
-{
-  int i, j;
-
-  if (comment)
-    obstack_fgrow1 (oout, "/* %s. */\n", comment);
-
-  obstack_fgrow3 (oout, "static const %s %s[] =\n{\n  %6d",
-                 type, table_name, first_value);
-
-  j = 1;
-  for (i = begin; i < end; i++)
-    {
-      obstack_1grow (oout, ',');
-
-      if (j >= 10)
-       {
-         obstack_grow_literal_string (oout, "\n  ");
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
+#include "symtab.h"
+#include "tables.h"
+#include "muscle_tab.h"

 
 

-      obstack_fgrow1 (oout, "%6d", short_table[i]);
-    }
+/* From src/scan-skel.l. */
+void m4_invoke PARAMS ((const char *definitions));

 
 

-  obstack_grow_literal_string (oout, "\n};\n");
-}

 
 

+static struct obstack format_obstack;

 
 

-static inline void
-output_short_table (struct obstack *oout,
-                   const char *comment,
-                   const char *table_name,
-                   short *short_table,
-                   short first_value,
-                   short begin, short end)
-{
-  output_short_or_char_table (oout, comment, "short", table_name, short_table,
-                             first_value, begin, end);
-}
+int error_verbose = 0;

 
 
 
 

-/*--------------------------------------------------------------.
-| output_headers -- Output constant strings to the beginning of |
-| certain files.                                                |
-`--------------------------------------------------------------*/
-
-#define        GUARDSTR        \
-"\n\
-#include \"%s\"\n\
-extern int yyerror;\n\
-extern int yycost;\n\
-extern char * yymsg;\n\
-extern YYSTYPE yyval;\n\
-\n\
-yyguard(n, yyvsp, yylsp)\n\
-register int n;\n\
-register YYSTYPE *yyvsp;\n\
-register YYLTYPE *yylsp;\n\
-{\n\
-  yyerror = 0;\n\
-  yycost = 0;\n\
-  yymsg = 0;\n\
-  switch (n)\n\
-    {"
-
-#define        ACTSTR          \
-"\n\
-#include \"%s\"\n\
-extern YYSTYPE yyval;\n\
-extern int yychar;\n\
-\n\
-yyaction(n, yyvsp, yylsp)\n\
-register int n;\n\
-register YYSTYPE *yyvsp;\n\
-register YYLTYPE *yylsp;\n\
-{\n\
-  switch (n)\n\
-    {"
-
-#define        ACTSTR_PROLOGUE         \
-"\n\
-#include \""
-
-#define        ACTSTR_EPILOGUE         \
-"\"\n\
-extern YYSTYPE yyval;\n\
-extern int yychar;\n\
-\n\
-yyaction(n, yyvsp, yylsp)\n\
-register int n;\n\
-register YYSTYPE *yyvsp;\n\
-register YYLTYPE *yylsp;\n\
-{\n\
-  switch (n)\n\
-    {"
-
-#define        ACTSTR_SIMPLE   "\n  switch (yyn) {\n"

 
 

-void
-output_headers (void)
-{
-  if (semantic_parser)
-    fprintf (fguard, GUARDSTR, attrsfile);
+/*-------------------------------------------------------------------.
+| 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.                                                        |
+`-------------------------------------------------------------------*/

 
 

-  if (no_parser_flag)
-    return;

 
 

-  if (semantic_parser)
-    {
-      obstack_grow_literal_string (&action_obstack,
-                                  ACTSTR_PROLOGUE);
-      obstack_grow (&action_obstack,
-                    attrsfile, strlen (attrsfile));
-      obstack_grow_literal_string (&action_obstack,
-                                  ACTSTR_EPILOGUE);
-   }
-  else
-   {
-      obstack_grow_literal_string (&action_obstack, ACTSTR_SIMPLE);
-   }
-
-/*  if (semantic_parser)       JF moved this below
-    fprintf(ftable, "#include \"%s\"\n", attrsfile);
-  fprintf(ftable, "#include <stdio.h>\n\n");
-*/
-
-  /* Rename certain symbols if -p was specified.  */
-  if (spec_name_prefix)
-    {
-      obstack_fgrow1 (&table_obstack,
-                       "#define yyparse %sparse\n", spec_name_prefix);
-      obstack_fgrow1 (&table_obstack,
-                       "#define yylex %slex\n", spec_name_prefix);
-      obstack_fgrow1 (&table_obstack,
-                       "#define yyerror %serror\n", spec_name_prefix);
-      obstack_fgrow1 (&table_obstack,
-                       "#define yylval %slval\n", spec_name_prefix);
-      obstack_fgrow1 (&table_obstack,
-                       "#define yychar %schar\n", spec_name_prefix);
-      obstack_fgrow1 (&table_obstack,
-                       "#define yydebug %sdebug\n", spec_name_prefix);
-      obstack_fgrow1 (&table_obstack,
-                       "#define yynerrs %snerrs\n", spec_name_prefix);
-    }
+#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);                              \

 }
 
 }
 

-
-/*-------------------------------------------------------.
-| Output constant strings to the ends of certain files.  |
-`-------------------------------------------------------*/
-
-void
-output_trailers (void)
-{
-  if (semantic_parser)
-    fprintf (fguard, "\n    }\n}\n");
-
-  obstack_1grow (&action_obstack, '\n');
-
-  if (no_parser_flag)
-    return;
-
-  if (semantic_parser)
-    {
-      obstack_grow_literal_string (&action_obstack,
-                                  "    }\n");
-    }
-  obstack_grow_literal_string (&action_obstack,
-                              "}\n");
-}
+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)

 
 
 
 

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

 
 static void
 
 static void

-output_token_translations (void)
+prepare_tokens (void)

 {
 {

-  obstack_grow_literal_string (&table_obstack, "\
-\n\
-/* YYRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */\n");
-
-  if (translations)
-    {
-      obstack_fgrow2 (&table_obstack,
-      "#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\
-\n\
-\n",
-              max_user_token_number, nsyms);
-
-      output_short_or_char_table (&table_obstack,
-            "YYRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX",
-                   ntokens < 127 ? "char" : "short",
-                   "yytranslate", token_translations,
-                   0, 1, max_user_token_number + 1);
-    }
-  else
-    {
-      obstack_grow_literal_string (&table_obstack,
-                                  "\n#define YYTRANSLATE(x) (x)\n");
-    }
-}
-
-
-static void
-output_gram (void)
-{
-  /* With the ordinary parser,
-     yyprhs and yyrhs are needed only for yydebug. */
-  /* With the no_parser option, all tables are generated */
-  if (!semantic_parser && !no_parser_flag)
-    obstack_grow_literal_string (&table_obstack, "\n#if YYDEBUG != 0\n");
-
-  output_short_table (&table_obstack, NULL, "yyprhs", rrhs,
-                     0, 1, nrules + 1);
+  muscle_insert_symbol_number_table ("translate",
+                                    token_translations,
+                                    token_translations[0],
+                                    1, max_user_token_number + 1);

 
   {
 
   {

-    size_t yyrhs_size = 1;
-    short *yyrhs, *sp;

     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;
+         }

 
 

-    for (sp = ritem + 1; *sp; sp++)
-      ++yyrhs_size;
-    yyrhs = XMALLOC (short, yyrhs_size);
-
-    for (sp = ritem + 1, i = 1; *sp; ++sp, ++i)
-      yyrhs[i] = *sp > 0 ? *sp : 0;
+       obstack_sgrow (&format_obstack, cp);
+       obstack_sgrow (&format_obstack, ", ");
+       j += strsize;
+      }
+    /* Add a NULL entry to list of tokens (well, 0, as NULL might not be
+       defined).  */
+    obstack_sgrow (&format_obstack, "0");

 
 

-    output_short_table (&table_obstack, NULL, "yyrhs", yyrhs,
-                       ritem[0], 1, yyrhs_size);
-    XFREE (yyrhs);
+    /* Finish table and store. */
+    obstack_1grow (&format_obstack, 0);
+    muscle_insert ("tname", obstack_finish (&format_obstack));

   }
 
   }
 

-  if (!semantic_parser && !no_parser_flag)
-    obstack_grow_literal_string (&table_obstack, "\n#endif\n");
-}
-
-
-static void
-output_stos (void)
-{
-  output_short_table (&table_obstack, NULL, "yystos", accessing_symbol,
-                     0, 1, nstates);
-}
-
-
-static void
-output_rule_data (void)
-{
-  int i;
-  int j;
-  short *short_tab = NULL;
-
-  obstack_grow_literal_string (&table_obstack, "\n\
-#if YYDEBUG != 0\n");
-
-  output_short_table (&table_obstack,
-           "YYRLINE[YYN] -- source line where rule number YYN was defined",
-                     "yyrline", rline,
-                     0, 1, nrules + 1);
-
-  obstack_grow_literal_string (&table_obstack, "#endif\n\n");
-
-  if (token_table_flag || no_parser_flag)
-    {
-      obstack_fgrow1 (&table_obstack, "#define YYNTOKENS %d\n", ntokens);
-      obstack_fgrow1 (&table_obstack, "#define YYNNTS %d\n", nvars);
-      obstack_fgrow1 (&table_obstack, "#define YYNRULES %d\n", nrules);
-      obstack_fgrow1 (&table_obstack, "#define YYNSTATES %d\n", nstates);
-      obstack_fgrow1 (&table_obstack, "#define YYMAXUTOK %d\n\n",
-                     max_user_token_number);
-    }
-
-  /* Output the table of symbol names.  */
-  if (!token_table_flag && !no_parser_flag)
-    obstack_grow_literal_string (&table_obstack,
-                         "\n#if YYDEBUG != 0 || defined YYERROR_VERBOSE\n\n");
-  obstack_grow_literal_string (&table_obstack, "\
-/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */\n");
-  obstack_grow_literal_string (&table_obstack,
-          "static const char *const yytname[] =\n{\n  ");
-
-  j = 0;
-  for (i = 0; i < nsyms; i++)
-    /* this used to be i<=nsyms, but that output a final "" symbol
-       almost by accident */
-    {
-      /* Width of the next token, including the two quotes, the coma
-        and the space.  */
-      int strsize = 4;
-      char *p;
-
-      for (p = tags[i]; p && *p; p++)
-       if (*p == '"' || *p == '\\' || *p == '\n' || *p == '\t'
-           || *p == '\b')
-         strsize += 2;
-       else if (*p < 040 || *p >= 0177)
-         strsize += 4;
-       else
-         strsize++;
-
-      if (j + strsize > 75)
-       {
-         obstack_grow_literal_string (&table_obstack, "\n  ");
-         j = 2;
-       }
-
-      obstack_1grow (&table_obstack, '\"');
-      for (p = tags[i]; p && *p; p++)
-       {
-         if (*p == '"' || *p == '\\')
-           {
-             obstack_fgrow1 (&table_obstack, "\\%c", *p);
-           }
-         else if (*p == '\n')
-           {
-             obstack_grow_literal_string (&table_obstack, "\\n");
-           }
-         else if (*p == '\t')
-           {
-             obstack_grow_literal_string (&table_obstack, "\\t");
-           }
-         else if (*p == '\b')
-           {
-             obstack_grow_literal_string (&table_obstack, "\\b");
-           }
-         else if (*p < 040 || *p >= 0177)
-           {
-             obstack_fgrow1 (&table_obstack, "\\%03o", *p);
-           }
-         else
-           {
-             obstack_1grow (&table_obstack, *p);
-           }
-       }
-
-      obstack_grow_literal_string (&table_obstack, "\", ");
-      j += strsize;
-    }
-  /* add a NULL entry to list of tokens */
-  obstack_grow_literal_string (&table_obstack, "NULL\n};\n");
-
-  if (!token_table_flag && !no_parser_flag)
-    obstack_grow_literal_string (&table_obstack, "#endif\n\n");
-

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

-  if (token_table_flag)
-    {
-      output_short_table (&table_obstack,
-                 "YYTOKNUM[YYLEX] -- Index in YYTNAME corresponding to YYLEX",
-                         "yytoknum", user_toknums,
-                         0, 1, ntokens + 1);
-    }
-
-  /* Output YYR1. */
-  output_short_table (&table_obstack,
-             "YYR1[YYN] -- Symbol number of symbol that rule YYN derives",
-                     "yyr1", rlhs,
-                     0, 1, nrules + 1);
-  XFREE (rlhs + 1);
-
-  obstack_1grow (&table_obstack, '\n');
-
-  /* Output YYR2. */
-  short_tab = XMALLOC (short, nrules + 1);
-  for (i = 1; i < nrules; i++)
-    short_tab[i] = rrhs[i + 1] - rrhs[i] - 1;
-  short_tab[nrules] = nitems - rrhs[nrules] - 1;
-  output_short_table (&table_obstack,
-        "YYR2[YYN] -- Number of symbols composing right hand side of rule YYN",
-                     "yyr2", short_tab,
-                     0, 1, nrules + 1);
-  obstack_1grow (&table_obstack, '\n');
-
-  XFREE (short_tab);
-
-  XFREE (rrhs + 1);
-}
-
-
-static void
-output_defines (void)
-{
-  obstack_fgrow1 (&table_obstack, "\n\n#define\tYYFINAL\t\t%d\n", final_state);
-  obstack_fgrow1 (&table_obstack, "#define\tYYFLAG\t\t%d\n", MINSHORT);
-  obstack_fgrow1 (&table_obstack, "#define\tYYNTBASE\t%d\n", ntokens);
+  {
+    int i;
+    int *values = XCALLOC (int, ntokens);
+    for (i = 0; i < ntokens; ++i)
+      values[i] = symbols[i]->user_token_number;
+    muscle_insert_int_table ("toknum", values,
+                            values[0], 1, ntokens);
+    free (values);
+  }

 }
 
 
 }
 
 

-/*------------------------------------------------------------------.
-| 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 (int state)
-{
-  int i;
-  int j;
-  int k;
-  int m = 0;
-  int n = 0;
-  int count;
-  int default_rule;
-  int nreds;
-  int max;
-  int rule;
-  int shift_state;
-  int symbol;
-  unsigned mask;
-  unsigned *wordp;
-  reductions *redp;
-  shifts *shiftp;
-  errs *errp;
-  int nodefault = 0;           /* set nonzero to inhibit having any default reduction */
-
-  for (i = 0; i < ntokens; i++)
-    actrow[i] = 0;
-
-  default_rule = 0;
-  nreds = 0;
-  redp = reduction_table[state];
-
-  if (redp)
-    {
-      nreds = redp->nreds;
-
-      if (nreds >= 1)
-       {
-         /* loop over all the rules available here which require
-            lookahead */
-         m = lookaheads[state];
-         n = lookaheads[state + 1];
-
-         for (i = n - 1; i >= m; i--)
-           {
-             rule = -LAruleno[i];
-             wordp = LA + i * tokensetsize;
-             mask = 1;
-
-             /* and find each token which the rule finds acceptable
-                to come next */
-             for (j = 0; j < ntokens; j++)
-               {
-                 /* and record this rule as the rule to use if that
-                    token follows.  */
-                 if (mask & *wordp)
-                   actrow[j] = rule;
-
-                 mask <<= 1;
-                 if (mask == 0)
-                   {
-                     mask = 1;
-                     wordp++;
-                   }
-               }
-           }
-       }
-    }
-
-  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)
-    {
-      k = shiftp->nshifts;
-
-      for (i = 0; i < k; i++)
-       {
-         shift_state = shiftp->shifts[i];
-         if (!shift_state)
-           continue;
-
-         symbol = accessing_symbol[shift_state];
-
-         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;
-       }
-    }
-
-  errp = err_table[state];
-
-  /* See which tokens are an explicit error in this state (due to
-     %nonassoc).  For them, record MINSHORT as the action.  */
-
-  if (errp)
-    {
-      k = errp->nerrs;
-
-      for (i = 0; i < k; i++)
-       {
-         symbol = errp->errs[i];
-         actrow[symbol] = MINSHORT;
-       }
-    }
-
-  /* Now find the most common reduction and make it the default action
-     for this state.  */
-
-  if (nreds >= 1 && !nodefault)
-    {
-      if (consistent[state])
-       default_rule = redp->rules[0];
-      else
-       {
-         max = 0;
-         for (i = m; i < n; i++)
-           {
-             count = 0;
-             rule = -LAruleno[i];
-
-             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)
-           {
-             for (j = 0; j < ntokens; j++)
-               {
-                 if (actrow[j] == default_rule)
-                   actrow[j] = 0;
-               }
-
-             default_rule = -default_rule;
-           }
-       }
-    }
-
-  /* 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 (j = 0; j < ntokens; j++)
-      {
-       if (actrow[j] == MINSHORT)
-         actrow[j] = 0;
-      }
-
-  return default_rule;
-}
-
+/*-------------------------------------------------------------.
+| Prepare the muscles related to the rules: rhs, prhs, r1, r2, |
+| rline, dprec, merger                                         |
+`-------------------------------------------------------------*/

 
 static void
 
 static void

-save_row (int state)
+prepare_rules (void)

 {
 {

-  int i;
-  int count;
-  short *sp;
-  short *sp1;
-  short *sp2;
-
-  count = 0;
-  for (i = 0; i < ntokens; i++)
+  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 (actrow[i] != 0)
-       count++;
+      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 (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;
+  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);

 }
 
 }
 

-
-/*------------------------------------------------------------------.
-| 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.                                       |
-`------------------------------------------------------------------*/
+/*--------------------------------------------.
+| Prepare the muscles related to the states.  |
+`--------------------------------------------*/

 
 static void
 
 static void

-token_actions (void)
+prepare_states (void)

 {
 {

-  int i;
-  short *yydefact = XCALLOC (short, nstates);
-
-  actrow = XCALLOC (short, ntokens);
+  state_number_t i;
+  symbol_number_t *values =
+    (symbol_number_t *) alloca (sizeof (symbol_number_t) * nstates);

   for (i = 0; i < nstates; ++i)
   for (i = 0; i < nstates; ++i)

-    {
-      yydefact[i] = action_row (i);
-      save_row (i);
-    }
-  XFREE (actrow);
-
-  output_short_table (&table_obstack,
-  "YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE\n\
-   doesn't specify something else to do.  Zero means the default is an\n\
-   error",
-                     "yydefact", yydefact,
-                     yydefact[0], 1, nstates);
-  obstack_1grow (&table_obstack, '\n');
-  XFREE (yydefact);
+    values[i] = states[i]->accessing_symbol;
+  muscle_insert_symbol_number_table ("stos", values,
+                                    0, 1, nstates);

 }
 
 
 }
 
 

-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);
-    }
-}

 
 

+/*----------------------------------.
+| Output the user actions to OOUT.  |
+`----------------------------------*/

 
 static void
 
 static void

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

 {
 {

-  reductions *rp, *rptmp;      /* JF fixed freed ptr */
-
-  XFREE (reduction_table);
+  rule_number_t r;

 
 

-  for (rp = first_reduction; rp; rp = rptmp)
-    {
-      rptmp = rp->next;
-      XFREE (rp);
-    }
+  fputs ("m4_define([b4_actions], \n[[", out);
+  for (r = 0; r < nrules; ++r)
+    if (rules[r].action)
+      {
+       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, "    %s\n    break;\n\n",
+                rules[r].action);
+      }
+  fputs ("]])\n\n", out);

 }
 
 }
 

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

 
 static void
 
 static void

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

 {
 {

-  int i;
-  short *sp;
-  short *sp1;
-  short *sp2;
-  int count;
-  int symno;
-
-  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;
-
-  symno = symbol - ntokens + nstates;
-
-  froms[symno] = sp1 = sp = XCALLOC (short, count);
-  tos[symno] = sp2 = XCALLOC (short, count);
-
-  for (i = begin; i < end; i++)
-    {
-      if (to_state[i] != default_state)
-       {
-         *sp1++ = from_state[i];
-         *sp2++ = to_state[i];
-       }
-    }
-
-  tally[symno] = count;
-  width[symno] = sp1[-1] - sp[0] + 1;
-}
-
-static int
-default_goto (int symbol)
-{
-  int i;
-  int m;

   int n;
   int n;

-  int default_state;
-  int max;
-
-  m = goto_map[symbol];
-  n = goto_map[symbol + 1];
-
-  if (m == n)
-    return -1;
+  merger_list* p;

 
 

-  for (i = 0; i < nstates; i++)
-    state_count[i] = 0;
-
-  for (i = m; i < n; i++)
-    state_count[to_state[i]]++;
-
-  max = 0;
-  default_state = -1;
-
-  for (i = 0; i < nstates; i++)
+  fputs ("m4_define([b4_mergers], \n[[", out);
+  for (n = 1, p = merge_functions; p != NULL; n += 1, p = p->next)

     {
     {

-      if (state_count[i] > max)
-       {
-         max = state_count[i];
-         default_state = i;
-       }
+      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);

     }
     }

-
-  return default_state;
+  fputs ("]])\n\n", out);

 }
 
 }
 

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

 
 static void
 
 static void

-goto_actions (void)
+token_definitions_output (FILE *out)

 {
   int i;
 {
   int i;

+  int first = 1;

 
 

-  short *yydefgoto = XMALLOC (short, nsyms - ntokens);
-  state_count = XCALLOC (short, nstates);
-
-  for (i = ntokens; i < nsyms; ++i)
+  fputs ("m4_define([b4_tokens], \n[", out);
+  for (i = 0; i < ntokens; ++i)

     {
     {

-      int default_state = default_goto (i);
-      save_column (i, default_state);
-      yydefgoto[i - ntokens] = default_state;
+      symbol_t *symbol = symbols[i];
+      int number = symbol->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);
+
+      /* Skip error token.  */
+      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;
+
+      /* Don't #define nonliteral tokens whose names contain periods
+        or '$' (as does the default value of the EOF token).  */
+      if (strchr (symbol->tag, '.') || strchr (symbol->tag, '$'))
+       continue;
+
+      fprintf (out, "%s[[[%s]], [%d]]",
+              first ? "" : ",\n", symbol->tag, number);
+
+      first = 0;

     }
     }

-
-  output_short_table (&table_obstack, NULL, "yydefgoto", yydefgoto,
-                     yydefgoto[0], 1, nsyms - ntokens);
-
-  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 destructors to OOUT.  |
+`----------------------------------------*/

 
 static void
 
 static void

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

 {
   int i;
 {
   int i;

-  int j;
-  int k;
-  int t;
-  int w;
-
-  order = XCALLOC (short, nvectors);
-  nentries = 0;
-
-  for (i = 0; i < nvectors; i++)
-    {
-      if (tally[i] > 0)
-       {
-         t = tally[i];
-         w = width[i];
-         j = nentries - 1;
-
-         while (j >= 0 && (width[order[j]] < w))
-           j--;
+  int first = 1;

 
 

-         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++;
-       }
-    }
+  fputs ("m4_define([b4_symbol_destructors], \n[", out);
+  for (i = 0; i < nsyms; ++i)
+    if (symbols[i]->destructor)
+      {
+       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;
+      }
+  fputs ("])\n\n", out);

 }
 
 
 }
 
 

-static int
-matching_state (int vector)
-{
-  int i;
-  int j;
-  int k;
-  int t;
-  int w;
-  int match;
-  int prev;
-
-  i = order[vector];
-  if (i >= nstates)
-    return -1;
-
-  t = tally[i];
-  w = width[i];
-
-  for (prev = vector - 1; prev >= 0; prev--)
-    {
-      j = order[prev];
-      if (width[j] != w || tally[j] != t)
-       return -1;
-
-      match = 1;
-      for (k = 0; match && k < t; k++)
-       {
-         if (tos[j][k] != tos[i][k] || froms[j][k] != froms[i][k])
-           match = 0;
-       }
-
-      if (match)
-       return j;
-    }
-
-  return -1;
-}
-
+/*-------------------------------------.
+| Output the symbol printers to OOUT.  |
+`-------------------------------------*/

 
 

-static int
-pack_vector (int vector)
+static void
+symbol_printers_output (FILE *out)

 {
   int i;
 {
   int i;

-  int j;
-  int k;
-  int t;
-  int loc = 0;
-  int ok;
-  short *from;
-  short *to;
-
-  i = order[vector];
-  t = tally[i];
-
-  assert (t);
-
-  from = froms[i];
-  to = tos[i];
+  int first = 1;

 
 

-  for (j = lowzero - from[0]; j < MAXTABLE; j++)
-    {
-      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;
-       }
-    }
-
-  berror ("pack_vector");
-  return 0;                    /* JF keep lint happy */
+  fputs ("m4_define([b4_symbol_printers], \n[", out);
+  for (i = 0; i < nsyms; ++i)
+    if (symbols[i]->destructor)
+      {
+       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;
+      }
+  fputs ("])\n\n", out);

 }
 
 
 static void
 }
 
 
 static void

-pack_table (void)
+prepare_actions (void)

 {
 {

-  int i;
-  int place;
-  int state;
+  /* Figure out the actions for the specified state, indexed by
+     lookahead token type.  */

 
 

-  base = XCALLOC (short, nvectors);
-  pos = XCALLOC (short, nentries);
-  table = XCALLOC (short, MAXTABLE);
-  check = XCALLOC (short, MAXTABLE);
+  muscle_insert_rule_number_table ("defact", yydefact,
+                                  yydefact[0], 1, nstates);

 
 

-  lowzero = 0;
-  high = 0;
+  /* 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);

 
 

-  for (i = 0; i < nvectors; i++)
-    base[i] = MINSHORT;

 
 

-  for (i = 0; i < MAXTABLE; i++)
-    check[i] = -1;
+  /* Output PACT. */
+  muscle_insert_base_table ("pact", base,
+                            base[0], 1, nstates);
+  MUSCLE_INSERT_INT ("pact_ninf", base_ninf);

 
 

-  for (i = 0; i < nentries; i++)
-    {
-      state = matching_state (i);
+  /* Output PGOTO. */
+  muscle_insert_base_table ("pgoto", base,
+                            base[nstates], nstates + 1, nvectors);

 
 

-      if (state < 0)
-       place = pack_vector (i);
-      else
-       place = base[state];
+  muscle_insert_base_table ("table", table,
+                           table[0], 1, high + 1);
+  MUSCLE_INSERT_INT ("table_ninf", table_ninf);

 
 

-      pos[i] = place;
-      base[order[i]] = place;
-    }
+  muscle_insert_base_table ("check", check,
+                           check[0], 1, high + 1);

 
 

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

     {
     {

-      if (froms[i])
-       XFREE (froms[i]);
-      if (tos[i])
-       XFREE (tos[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 (froms);
-  XFREE (tos);
-  XFREE (pos);

 }
 
 }
 

-/* the following functions output yytable, yycheck
-   and the vectors whose elements index the portion starts */
+\f
+/*---------------------------.
+| Call the skeleton parser.  |
+`---------------------------*/

 
 static void
 
 static void

-output_base (void)
+output_skeleton (void)

 {
 {

-  output_short_table (&table_obstack, NULL, "yypact", base,
-                     base[0], 1, nstates);
-
-  obstack_1grow (&table_obstack, '\n');
-
-  output_short_table (&table_obstack, NULL, "yypgoto", base,
-                     base[nstates], nstates + 1, nvectors);
-
-  XFREE (base);
-}
-
-
-static void
-output_table (void)
-{
-  obstack_fgrow1 (&table_obstack, "\n\n#define\tYYLAST\t\t%d\n\n\n", high);
-  output_short_table (&table_obstack, NULL, "yytable", table,
-                     table[0], 1, high + 1);
-  XFREE (table);
+  /* Store the definition of all the muscles. */
+  const char *tempdir = getenv ("TMPDIR");
+  char *tempfile = NULL;
+  FILE *out = NULL;
+  int fd;
+
+  if (tempdir == NULL)
+    tempdir = DEFAULT_TMPDIR;
+  tempfile = xmalloc (strlen (tempdir) + 11);
+  sprintf (tempfile, "%s/bsnXXXXXX", tempdir);
+  fd = mkstemp (tempfile);
+  if (fd == -1)
+    error (EXIT_FAILURE, errno, "%s", tempfile);
+
+  out = fdopen (fd, "w");
+  if (out == NULL)
+    error (EXIT_FAILURE, errno, "%s", tempfile);
+
+  /* There are no comments, especially not `#': we do want M4 expansion
+     after `#': think of CPP macros!  */
+  fputs ("m4_changecom()\n", out);
+  fputs ("m4_init()\n", out);
+
+  user_actions_output (out);
+  merger_output (out);
+  token_definitions_output (out);
+  symbol_destructors_output (out);
+  symbol_printers_output (out);
+
+  muscles_m4_output (out);
+
+  fputs ("m4_wrap([m4_divert_pop(0)])\n", out);
+  fputs ("m4_divert_push(0)dnl\n", out);
+  xfclose (out);
+
+  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
 static void

-output_check (void)
+prepare (void)

 {
 {

-  output_short_table (&table_obstack, NULL, "yycheck", check,
-                     check[0], 1, high + 1);
-  XFREE (check);
-}
-
-/* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable
-   and yycheck.  */
-
-static void
-output_actions (void)
-{
-  nvectors = nstates + nvars;
-
-  froms = XCALLOC (short *, nvectors);
-  tos = XCALLOC (short *, nvectors);
-  tally = XCALLOC (short, nvectors);
-  width = XCALLOC (short, nvectors);
-
-  token_actions ();
-  free_shifts ();
-  free_reductions ();
-  XFREE (lookaheads);
-  XFREE (LA);
-  XFREE (LAruleno);
-  XFREE (accessing_symbol);
-
-  goto_actions ();
-  XFREE (goto_map + ntokens);
-  XFREE (from_state);
-  XFREE (to_state);
-
-  sort_actions ();
-  pack_table ();
-  obstack_1grow (&table_obstack, '\n');
-  output_base ();
-  output_table ();
-  obstack_1grow (&table_obstack, '\n');
-  output_check ();
-}
-
-/* copy the parser code into the ftable file at the end.  */
-
-static void
-output_parser (void)
-{
-  int c;
-  static int number_of_dollar_signs = 0;
-#ifdef DONTDEF
-  FILE *fpars;
-#else
-#define fpars fparser
-#endif
-
-  if (pure_parser)
-    obstack_grow_literal_string (&table_obstack, "#define YYPURE 1\n\n");
-
-#ifdef DONTDEF
-  /* JF no longer needed 'cuz open_extra_files changes the currently
-     open parser from bison.simple to bison.hairy */
-  if (semantic_parser)
-    fpars = fparser;
-  else
-    fpars = fparser1;
-#endif
-
-  /* Loop over lines in the standard parser file.  */
-
-  while (1)
-    {
-      int write_line = 1;
-
-      c = getc (fpars);
-
-      /* See if the line starts with `#line.
-         If so, set write_line to 0.  */
-      if (no_lines_flag)
-       if (c == '#')
-         {
-           c = getc (fpars);
-           if (c == 'l')
-             {
-               c = getc (fpars);
-               if (c == 'i')
-                 {
-                   c = getc (fpars);
-                   if (c == 'n')
-                     {
-                       c = getc (fpars);
-                       if (c == 'e')
-                         write_line = 0;
-                       else
-                         obstack_grow_literal_string (&table_obstack, "#lin");
-                     }
-                   else
-                     obstack_grow_literal_string (&table_obstack, "#li");
-                 }
-               else
-                 obstack_grow_literal_string (&table_obstack, "#l");
-             }
-           else
-             obstack_grow_literal_string (&table_obstack, "#");
-         }
-
-      /* now write out the line... */
-      for (; c != '\n' && c != EOF; c = getc (fpars))
-       if (write_line)
-         {
-           /* `$' in the parser file indicates where to put the
-              actions.  Copy them in at this point.  */
-           if (c == '$')
-             {
-               size_t size = obstack_object_size (&action_obstack);
-
-               number_of_dollar_signs++;
-               assert (number_of_dollar_signs == 1);
-               obstack_grow (&table_obstack,
-                             obstack_finish (&action_obstack),
-                             size);
-
-               /* Skip the end of the line containing `$'. */
-               write_line = 0;
-             }
-           else
-             obstack_1grow (&table_obstack, c);
-         }
-      if (c == EOF)
-       break;
-      obstack_1grow (&table_obstack, c);
-    }
-  assert (number_of_dollar_signs == 1);
-}
-
-static void
-output_program (void)
-{
-  int c;
-
-  if (!no_lines_flag)
-    obstack_fgrow2 (&table_obstack, "#line %d \"%s\"\n", lineno, infile);
-
-  c = getc (finput);
-  while (c != EOF)
+  /* 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 ("debug", debug_flag);
+
+  /* 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);
+
+  /* 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);
+
+  /* Rules. */
+  MUSCLE_INSERT_INT ("rules_number", nrules);
+
+  /* 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)

     {
     {

-      obstack_1grow (&table_obstack, c);
-      c = getc (finput);
+      if (glr_parser)
+       skeleton = "glr.c";
+      else
+       skeleton = "yacc.c";

     }
     }

-}
-
-
-static void
-free_itemsets (void)
-{
-  core *cp, *cptmp;

 
 

-  XFREE (state_table);
-
-  for (cp = first_state; cp; cp = cptmp)
-    {
-      cptmp = cp->next;
-      XFREE (cp);
-    }
+  /* Parse the skeleton file and output the needed parsers.  */
+  muscle_insert ("skeleton", skeleton);

 }
 
 
 }
 
 


@@ -1308,52 +631,19 @@ free_itemsets (void)
 void
 output (void)
 {
 void
 output (void)
 {

-  int c;
+  obstack_init (&format_obstack);

 
 

-  /* output_token_defines(ftable);      / * JF put out token defines FIRST */
+  prepare_tokens ();
+  prepare_rules ();
+  prepare_states ();
+  prepare_actions ();

 
 

-  /* If using a simple parser the definition of YYSTYPE are put into
-     TABLE_OBSTACK.  */
-  if (!semantic_parser)
-    {
-      size_t size = obstack_object_size (&attrs_obstack);
-      obstack_grow (&table_obstack, obstack_finish (&attrs_obstack), size);
-    }
-  reader_output_yylsp (&table_obstack);
-  if (debug_flag)
-    obstack_grow_literal_string (&table_obstack, "\
-#ifndef YYDEBUG\n\
-# define YYDEBUG 1\n\
-#endif\n\
-\n");
-
-  if (semantic_parser)
-    obstack_fgrow1 (&table_obstack, "#include \"%s\"\n", attrsfile);
-
-  if (!no_parser_flag)
-    obstack_grow_literal_string (&table_obstack, "#include <stdio.h>\n\n");
-
-  /* Make "const" do nothing if not in ANSI C.  */
-  obstack_grow_literal_string (&table_obstack, "\
-#ifndef __cplusplus\n\
-# ifndef __STDC__\n\
-#  define const\n\
-# endif\n\
-#endif\n\
-\n");
-
-  free_itemsets ();
-  output_defines ();
-  output_token_translations ();
-/*   if (semantic_parser) */
-  /* This is now unconditional because debugging printouts can use it.  */
-  output_gram ();
-  XFREE (ritem);
-  if (semantic_parser)
-    output_stos ();
-  output_rule_data ();
-  output_actions ();
-  if (!no_parser_flag)
-    output_parser ();
-  output_program ();
+  prepare ();
+
+  /* Process the selected skeleton file.  */
+  output_skeleton ();
+
+  obstack_free (&format_obstack, NULL);
+  obstack_free (&pre_prologue_obstack, NULL);
+  obstack_free (&post_prologue_obstack, NULL);

 }
 }