Also pass --install to the second invocation of autoreconf, to let automake install...

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index e2d62f58d4307b00e58e325c148b96ac01f03967..f8cb5350eff96bb1fbf1c178f39c76528a2de410 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 (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002
+   Free Software Foundation, Inc.

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


@@ -19,832 +20,429 @@
    02111-1307, USA.  */
 
 
    02111-1307, USA.  */
 
 

-/* functions to output parsing data to various files.  Entries are:
+/* The parser tables consist of these tables.  Marked ones needed only
+   for the semantic parser.  Double marked are output only if switches
+   are set.

 
 

-  output_headers ()
+   YYTRANSLATE = vector mapping yylex's token numbers into bison's
+   token numbers.

 
 

-Output constant strings to the beginning of certain files.
+   ++ YYTNAME = vector of string-names indexed by bison token number.

 
 

-  output_trailers()
+   ++ YYTOKNUM = vector of yylex token numbers corresponding to
+   entries in YYTNAME.

 
 

-Output constant strings to the ends of certain files.
+   YYRLINE = vector of line-numbers of all rules.  For yydebug
+   printouts.

 
 

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

 
 

-Output the parsing tables and the parser code to ftable.
+   YYPRHS[R] = index in YYRHS of first item for rule R.

 
 

-The parser tables consist of these tables.
-Starred ones needed only for the semantic parser.
-Double starred are output only if switches are set.
+   YYR1[R] = symbol number of symbol that rule R derives.

 
 

-yytranslate = vector mapping yylex's token numbers into bison's token numbers.
+   YYR2[R] = number of symbols composing right hand side of rule R.

 
 

-** yytname = vector of string-names indexed by bison token number
+   + YYSTOS[S] = the symbol number of the symbol that leads to state
+   S.

 
 

-** yytoknum = vector of yylex token numbers corresponding to entries in yytname
+   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.

 
 

-yyrline = vector of line-numbers of all rules.  For yydebug printouts.
+   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.

 
 

-yyrhs = vector of items of all rules.
-        This is exactly what ritems contains.  For yydebug and for semantic
-       parser.
+   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.

 
 

-yyprhs[r] = index in yyrhs of first item for rule r.
+   If the value in YYTABLE is positive, we shift the token and go to
+   that state.

 
 

-yyr1[r] = symbol number of symbol that rule r derives.
+   If the value is negative, it is minus a rule number to reduce by.

 
 

-yyr2[r] = number of symbols composing right hand side of rule r.
+   If the value is zero, the default action from YYDEFACT[S] is used.

 
 

-* yystos[s] = the symbol number of the symbol that leads to state 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.

 
 

-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.
+   YYTABLE = a vector filled with portions for different uses, found
+   via YYPACT and YYPGOTO.

 
 

-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.
+   YYCHECK = a vector indexed in parallel with YYTABLE.  It indicates,
+   in a roundabout way, the bounds of the portion you are trying to
+   examine.

 
 

-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.
+   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.

 
 

-           If the value in yytable is positive,
-           we shift the token and go to that state.
+   YYFINAL = the state number of the termination state.  YYFLAG = most
+   negative short int.  Used to flag ??  */

 
 

-           If the value is negative, it is minus a rule number to reduce by.
-
-           If the value is zero, the default action from yydefact[s] is used.
-
-yypgoto[i] = the index in yytable of the portion describing
-             what to do after reducing a rule that derives variable i + ntokens.
-             This portion is indexed by the parser state number, s,
-            as of before the text for this nonterminal was read.
-            The value from yytable is the state to go to if
-             the corresponding value in yycheck is s.
-
-yytable = a vector filled with portions for different uses,
-          found via yypact and yypgoto.
-
-yycheck = a vector indexed in parallel with yytable.
-         It indicates, in a roundabout way, the bounds of the
-         portion you are trying to examine.
-
-         Suppose that the portion of yytable starts at index p
-         and the index to be examined within the portion is i.
-         Then if yycheck[p+i] != i, i is outside the bounds
-         of what is actually allocated, and the default
-         (from yydefact or yydefgoto) should be used.
-         Otherwise, yytable[p+i] should be used.
-
-YYFINAL = the state number of the termination state.
-YYFLAG = most negative short int.  Used to flag ??
-YYNTBASE = ntokens.
-
-*/
-
-#include <stdio.h>

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

-#include "machine.h"
-#include "alloc.h"
+#include "bitsetv.h"
+#include "quotearg.h"
+#include "error.h"
+#include "getargs.h"

 #include "files.h"
 #include "gram.h"
 #include "files.h"
 #include "gram.h"

-#include "state.h"
+#include "LR0.h"

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

+#include "output.h"
+#include "lalr.h"
+#include "reader.h"
+#include "symtab.h"
+#include "conflicts.h"
+#include "muscle_tab.h"

 
 

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

 
 

-extern int debugflag;
-extern int nolinesflag;
-extern int noparserflag;
-extern int toknumflag;
-
-extern char **tags;
-extern int *user_toknums;
-extern int tokensetsize;
-extern int final_state;
-extern core **state_table;
-extern shifts **shift_table;
-extern errs **err_table;
-extern reductions **reduction_table;
-extern short *accessing_symbol;
-extern unsigned *LA;
-extern short *LAruleno;
-extern short *lookaheads;
-extern char *consistent;
-extern short *goto_map;
-extern short *from_state;
-extern short *to_state;
-
-extern void output_headers PARAMS((void));
-extern void output_trailers PARAMS((void));
-extern void output PARAMS((void));
-
-static void output_token_translations PARAMS((void));
-static void output_gram PARAMS((void));
-static void output_stos PARAMS((void));
-static void output_rule_data PARAMS((void));
-static void output_defines PARAMS((void));
-static void output_actions PARAMS((void));
-static void token_actions PARAMS((void));
-static void save_row PARAMS((int));
-static void goto_actions PARAMS((void));
-static void save_column PARAMS((int, int));
-static void sort_actions PARAMS((void));
-static void pack_table PARAMS((void));
-static void output_base PARAMS((void));
-static void output_table PARAMS((void));
-static void output_check PARAMS((void));
-static void output_parser PARAMS((void));
-static void output_program PARAMS((void));
-static void free_shifts PARAMS((void));
-static void free_reductions PARAMS((void));
-static void free_itemsets PARAMS((void));
-static int action_row PARAMS((int));
-static int default_goto PARAMS((int));
-static int matching_state PARAMS((int));
-static int pack_vector PARAMS((int));
-
-extern void berror PARAMS((const char *));
-extern void reader_output_yylsp PARAMS((FILE *));
+/* From src/scan-skel.l. */
+int skel_lex PARAMS ((void));
+extern FILE *skel_in;

 
 static int nvectors;
 static int nentries;
 
 static int nvectors;
 static int nentries;

-static short **froms;
-static short **tos;
-static short *tally;
-static short *width;
-static short *actrow;
-static short *state_count;
-static short *order;
-static short *base;
-static short *pos;
-static short *table;
-static short *check;
+static short **froms = NULL;
+static short **tos = NULL;
+static short *tally = NULL;
+static short *width = NULL;
+static short *actrow = NULL;
+static short *state_count = NULL;
+static short *order = NULL;
+static short *base = NULL;
+static short *pos = NULL;
+
+/* TABLE_SIZE is the allocated size of both TABLE and CHECK.
+   We start with the original hard-coded value: SHRT_MAX
+   (yes, not USHRT_MAX). */
+static size_t table_size = SHRT_MAX;
+static short *table = NULL;
+static short *check = NULL;

 static int lowzero;
 static int high;
 
 static int lowzero;
 static int high;
 

+struct obstack muscle_obstack;
+static struct obstack format_obstack;

 
 

+int error_verbose = 0;

 
 

-#define        GUARDSTR        "\n#include \"%s\"\nextern int yyerror;\n\
-extern int yycost;\nextern char * yymsg;\nextern YYSTYPE yyval;\n\n\
-yyguard(n, yyvsp, yylsp)\nregister int n;\nregister YYSTYPE *yyvsp;\n\
-register YYLTYPE *yylsp;\n\
-{\n  yyerror = 0;\nyycost = 0;\n  yymsg = 0;\nswitch (n)\n    {"
-
-#define        ACTSTR          "\n#include \"%s\"\nextern YYSTYPE yyval;\
-\nextern int yychar;\
-yyaction(n, yyvsp, yylsp)\nregister int n;\nregister YYSTYPE *yyvsp;\n\
-register YYLTYPE *yylsp;\n{\n  switch (n)\n{"
-
-#define        ACTSTR_SIMPLE   "\n  switch (yyn) {\n"
-
-
-void
-output_headers (void)
-{
-  if (semantic_parser)
-    fprintf(fguard, GUARDSTR, attrsfile);
-
-  if (noparserflag)
-       return;
-
-  fprintf(faction, (semantic_parser ? ACTSTR : ACTSTR_SIMPLE), attrsfile);
-/*  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)
-    {
-      fprintf(ftable, "#define yyparse %sparse\n", spec_name_prefix);
-      fprintf(ftable, "#define yylex %slex\n", spec_name_prefix);
-      fprintf(ftable, "#define yyerror %serror\n", spec_name_prefix);
-      fprintf(ftable, "#define yylval %slval\n", spec_name_prefix);
-      fprintf(ftable, "#define yychar %schar\n", spec_name_prefix);
-      fprintf(ftable, "#define yydebug %sdebug\n", spec_name_prefix);
-      fprintf(ftable, "#define yynerrs %snerrs\n", spec_name_prefix);
-    }
-}
-
-
-void
-output_trailers (void)
-{
-  if (semantic_parser)
-      fprintf(fguard, "\n    }\n}\n");
-
-  fprintf(faction, "\n");
-
-  if (noparserflag)
-      return;
-
-  if (semantic_parser)
-      fprintf(faction, "    }\n");
-  fprintf(faction, "}\n");
-}
-
-
-void
-output (void)
-{
-  int c;
-
-  /* output_token_defines(ftable);     / * JF put out token defines FIRST */
-  if (!semantic_parser)                /* JF Put out other stuff */
-    {
-      rewind(fattrs);
-      while ((c=getc(fattrs))!=EOF)
-        putc(c,ftable);
-    }
-  reader_output_yylsp(ftable);
-  if (debugflag)
-    fprintf(ftable, "#ifndef YYDEBUG\n#define YYDEBUG %d\n#endif\n\n",
-           !!debugflag);
-
-  if (semantic_parser)
-    fprintf(ftable, "#include \"%s\"\n", attrsfile);
-
-  if (! noparserflag)
-    fprintf(ftable, "#include <stdio.h>\n\n");
-
-  /* Make "const" do nothing if not in ANSI C.  */
-  fprintf (ftable, "#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();
-  FREE(ritem);
-  if (semantic_parser)
-    output_stos();
-  output_rule_data();
-  output_actions();
-  if (! noparserflag)
-    output_parser();
-  output_program();
-}

 
 

+/*----------------------------------------------------------------.
+| If TABLE (and CHECK) appear to be small to be addressed at      |
+| DESIRED, grow them.  Note that TABLE[DESIRED] is to be used, so |
+| the desired size is at least DESIRED + 1.                       |
+`----------------------------------------------------------------*/

 
 static void
 
 static void

-output_token_translations (void)
+table_grow (size_t desired)

 {
 {

-  register int i, j;
-/*   register short *sp; JF unused */
+  size_t old_size = table_size;

 
 

-  if (translations)
-    {
-      fprintf(ftable,
-             "\n#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\n",
-             max_user_token_number, nsyms);
+  while (table_size <= desired)
+    table_size *= 2;

 
 

-      if (ntokens < 127)  /* play it very safe; check maximum element value.  */
-        fprintf(ftable, "\nstatic const char yytranslate[] = {     0");
-      else
-       fprintf(ftable, "\nstatic const short yytranslate[] = {     0");
+  if (trace_flag)
+    fprintf (stderr, "growing table and check from: %d to %d\n",
+            old_size, table_size);

 
 

-      j = 10;
-      for (i = 1; i <= max_user_token_number; i++)
-       {
-         putc(',', ftable);
+  table = XREALLOC (table, short, table_size);
+  check = XREALLOC (check, short, table_size);

 
 

-         if (j >= 10)
-           {
-             putc('\n', ftable);
-             j = 1;
-           }
-         else
-           {
-             j++;
-           }
-
-         fprintf(ftable, "%6d", token_translations[i]);
-       }
-
-      fprintf(ftable, "\n};\n");
-    }
-  else
+  for (/* Nothing. */; old_size < table_size; ++old_size)

     {
     {

-      fprintf(ftable, "\n#define YYTRANSLATE(x) (x)\n");
+      table[old_size] = 0;
+      check[old_size] = -1;

     }
 }
 
 
     }
 }
 
 

-static void
-output_gram (void)
-{
-  register int i;
-  register int j;
-  register short *sp;
-
-  /* With the ordinary parser,
-     yyprhs and yyrhs are needed only for yydebug. */
-  /* With the noparser option, all tables are generated */
-  if (! semantic_parser  && ! noparserflag)
-    fprintf(ftable, "\n#if YYDEBUG != 0");
-
-  fprintf(ftable, "\nstatic const short yyprhs[] = {     0");
-
-  j = 10;
-  for (i = 1; i <= nrules; i++)
-    {
-      putc(',', ftable);
-
-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
-
-      fprintf(ftable, "%6d", rrhs[i]);
-    }
-
-  fprintf(ftable, "\n};\n");
-
-  fprintf(ftable, "\nstatic const short yyrhs[] = {%6d", ritem[0]);
-
-  j = 10;
-  for (sp = ritem + 1; *sp; sp++)
-    {
-      putc(',', ftable);
-
-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
-
-      if (*sp > 0)
-       fprintf(ftable, "%6d", *sp);
-      else
-       fprintf(ftable, "     0");
-    }
-
-  fprintf(ftable, "\n};\n");
-
-  if (! semantic_parser  && ! noparserflag)
-    fprintf(ftable, "\n#endif\n");
+/*------------------------------------------------------------------.
+| Create a function NAME which Format the FIRST and then            |
+| TABLE_DATA[BEGIN..END[ (of TYPE) into OOUT, and return the number |
+| of bits needed for its longuest value.                            |
+`------------------------------------------------------------------*/
+
+
+#define GENERATE_OUTPUT_TABLE(Name, Type)                              \
+                                                                       \
+static inline long int                                                 \
+Name (struct obstack *oout,                                            \
+      Type *table_data,                                                        \
+      Type first,                                                      \
+      int begin,                                                       \
+      int end)                                                         \
+{                                                                      \
+  long int max = first;                                                        \
+  int i;                                                               \
+  int j = 1;                                                           \
+                                                                       \
+  obstack_fgrow1 (oout, "%6d", first);                                 \
+  for (i = begin; i < end; ++i)                                                \
+    {                                                                  \
+      obstack_1grow (oout, ',');                                       \
+      if (j >= 10)                                                     \
+       {                                                               \
+         obstack_sgrow (oout, "\n  ");                                 \
+         j = 1;                                                        \
+       }                                                               \
+      else                                                             \
+       ++j;                                                            \
+      obstack_fgrow1 (oout, "%6d", table_data[i]);                     \
+      if (table_data[i] > max)                                         \
+       max = table_data[i];                                            \
+    }                                                                  \
+  obstack_1grow (oout, 0);                                             \
+                                                                       \
+  return max;                                                          \

 }
 
 }
 

+GENERATE_OUTPUT_TABLE(output_int_table, int)
+GENERATE_OUTPUT_TABLE(output_short_table, short)
+GENERATE_OUTPUT_TABLE(output_token_number_table, token_number_t)
+GENERATE_OUTPUT_TABLE(output_item_number_table, item_number_t)

 
 

-static void
-output_stos (void)
-{
-  register int i;
-  register int j;
-
-  fprintf(ftable, "\nstatic const short yystos[] = {     0");
-
-  j = 10;
-  for (i = 1; i < nstates; i++)
-    {
-      putc(',', ftable);
-
-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
-
-      fprintf(ftable, "%6d", accessing_symbol[i]);
-    }
-
-  fprintf(ftable, "\n};\n");
-}

 
 

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

 
 static void
 
 static void

-output_rule_data (void)
+prepare_tokens (void)

 {
 {

-  register int i;
-  register int j;
-
-  fputs ("\n\
-#if YYDEBUG != 0\n\
-/* YYRLINE[yyn]: source line where rule number YYN was defined. */\n\
-static const short yyrline[] = { 0", ftable);
-
-  j = 10;
-  for (i = 1; i <= nrules; i++)
-    {
-      putc(',', ftable);
-
-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
-
-      fprintf(ftable, "%6d", rline[i]);
-    }
-  fprintf(ftable, "\n};\n#endif\n\n");
-
-  if (toknumflag || noparserflag)
-    {
-      fprintf(ftable, "#define YYNTOKENS %d\n", ntokens);
-      fprintf(ftable, "#define YYNNTS %d\n", nvars);
-      fprintf(ftable, "#define YYNRULES %d\n", nrules);
-      fprintf(ftable, "#define YYNSTATES %d\n", nstates);
-      fprintf(ftable, "#define YYMAXUTOK %d\n\n", max_user_token_number);
-    }
-
-  if (! toknumflag  && ! noparserflag)
-    fprintf(ftable, "\n#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)\n\n");
-
-  /* Output the table of symbol names.  */
-
-  fprintf(ftable,
-          "static const char * const yytname[] = {   \"%s\"",
-          tags[0]);
-
-  j = strlen (tags[0]) + 44;
-  for (i = 1; i < nsyms; i++)
-               /* this used to be i<=nsyms, but that output a final "" symbol
-                       almost by accident */
-    {
-      register char *p;
-      putc(',', ftable);
-      j++;
-
-      if (j > 75)
-       {
-         putc('\n', ftable);
-         j = 0;
-       }
-
-      putc ('\"', ftable);
-      j++;
-
-      for (p = tags[i]; p && *p; p++)
-       {
-         if (*p == '"' || *p == '\\')
-           {
-             fprintf(ftable, "\\%c", *p);
-             j += 2;
-           }
-         else if (*p == '\n')
-           {
-             fprintf(ftable, "\\n");
-             j += 2;
-           }
-         else if (*p == '\t')
-           {
-             fprintf(ftable, "\\t");
-             j += 2;
-           }
-         else if (*p == '\b')
-           {
-             fprintf(ftable, "\\b");
-             j += 2;
-           }
-         else if (*p < 040 || *p >= 0177)
-           {
-             fprintf(ftable, "\\%03o", *p);
-             j += 4;
-           }
-         else
-           {
-             putc(*p, ftable);
-             j++;
-           }
-       }
-
-      putc ('\"', ftable);
-      j++;
-    }
-  /* add a NULL entry to list of tokens */
-  fprintf (ftable, ", NULL\n};\n");
-
-  if (! toknumflag  && ! noparserflag)
-    fprintf (ftable, "#endif\n\n");
+  long int max = output_token_number_table (&format_obstack,
+                                           token_translations,
+                                           0, 1, max_user_token_number + 1);
+  muscle_insert ("translate", obstack_finish (&format_obstack));
+  MUSCLE_INSERT_LONG_INT ("token_number_max", max);
+  XFREE (token_translations);
+
+  {
+    int i;
+    int j = 0;
+    for (i = 0; i < nsyms; i++)
+      {
+       /* Be sure not to use twice the same quotearg slot. */
+       const char *cp =
+         quotearg_n_style (1, c_quoting_style,
+                           quotearg_style (escape_quoting_style,
+                                           symbols[i]->tag));
+       /* Width of the next token, including the two quotes, the coma
+          and the space.  */
+       int strsize = strlen (cp) + 2;
+
+       if (j + strsize > 75)
+         {
+           obstack_sgrow (&format_obstack, "\n  ");
+           j = 2;
+         }

 
 

-  /* Output YYTOKNUM. */
-  if (toknumflag)
-    {
-      fprintf(ftable, "static const short yytoknum[] = { 0");
-      j = 10;
-      for (i = 1; i <= ntokens; i++) {
-          putc(',', ftable);
-          if (j >= 10)
-            {
-              putc('\n', ftable);
-              j = 1;
-            }
-          else
-            j++;
-          fprintf(ftable, "%6d", user_toknums[i]);
+       obstack_sgrow (&format_obstack, cp);
+       obstack_sgrow (&format_obstack, ", ");
+       j += strsize;

       }
       }

-      fprintf(ftable, "\n};\n\n");
-    }
-
-  /* Output YYR1. */
-  fputs ("\
-/* YYR1[YYN]: Symbol number of symbol that rule YYN derives. */\n\
-static const short yyr1[] = {     0", ftable);
+    /* 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. */
+  {
+    int i;
+    short *values = XCALLOC (short, ntokens + 1);
+    for (i = 0; i < ntokens + 1; ++i)
+      values[i] = symbols[i]->user_token_number;
+    output_short_table (&format_obstack, values,
+                      0, 1, ntokens + 1);
+    muscle_insert ("toknum", obstack_finish (&format_obstack));
+    free (values);
+  }
+}

 
 

-  j = 10;
-  for (i = 1; i <= nrules; i++)
-    {
-      putc(',', ftable);

 
 

-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
+/*-------------------------------------------------------------.
+| Prepare the muscles related to the rules: rhs, prhs, r1, r2, |
+| rline.                                                       |
+`-------------------------------------------------------------*/

 
 

-      fprintf(ftable, "%6d", rlhs[i]);
-    }
-  FREE(rlhs + 1);
-  fputs ("\n\
-};\n\
-\n", ftable);
-
-  /* Output YYR2. */
-  fputs ("\
-/* YYR2[YYN]: Number of symbols composing right hand side of rule YYN. */\n\
-static const short yyr2[] = {     0", ftable);
-  j = 10;
-  for (i = 1; i < nrules; i++)
+static void
+prepare_rules (void)
+{
+  long int max;
+  item_number_t *rhsp;
+  int r;
+  int i = 0;
+  item_number_t *rhs = XMALLOC (item_number_t, nritems);
+  short *prhs = XMALLOC (short, nrules + 1);
+  token_number_t *r1 = XMALLOC (token_number_t, nrules + 1);
+  short *r2 = XMALLOC (short, nrules + 1);
+  short *rline = XMALLOC (short, nrules + 1);
+
+  for (r = 1; r < nrules + 1; ++r)

     {
     {

-      putc(',', ftable);
-
-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
-
-      fprintf(ftable, "%6d", rrhs[i + 1] - rrhs[i] - 1);
+      /* Index of rule R in RHS. */
+      prhs[r] = i;
+      /* RHS of the rule R. */
+      for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp)
+       rhs[i++] = *rhsp;
+      /* LHS of the rule R. */
+      r1[r] = rules[r].lhs->number;
+      /* Length of rule R's RHS. */
+      r2[r] = i - prhs[r];
+      /* Separator in RHS. */
+      rhs[i++] = -1;
+      /* Line where rule was defined. */
+      rline[r] = rules[r].line;

     }
     }

+  assert (i == nritems);

 
 

-  putc(',', ftable);
-  if (j >= 10)
-    putc('\n', ftable);
-
-  fprintf(ftable, "%6d\n};\n", nitems - rrhs[nrules] - 1);
-  FREE(rrhs + 1);
-}
-
-
-static void
-output_defines (void)
-{
-  fprintf(ftable, "\n\n#define\tYYFINAL\t\t%d\n", final_state);
-  fprintf(ftable, "#define\tYYFLAG\t\t%d\n", MINSHORT);
-  fprintf(ftable, "#define\tYYNTBASE\t%d\n", ntokens);
-}
+  max = output_int_table (&format_obstack, rhs, ritem[0], 1, nritems);
+  muscle_insert ("rhs", obstack_finish (&format_obstack));
+  MUSCLE_INSERT_LONG_INT ("rhs_number_max", max);

 
 

+  output_short_table (&format_obstack, prhs, 0, 1, nrules + 1);
+  muscle_insert ("prhs", obstack_finish (&format_obstack));

 
 

+  output_short_table (&format_obstack, rline, 0, 1, nrules + 1);
+  muscle_insert ("rline", obstack_finish (&format_obstack));

 
 

-/* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable and yycheck.  */
+  output_token_number_table (&format_obstack, r1, 0, 1, nrules + 1);
+  muscle_insert ("r1", obstack_finish (&format_obstack));

 
 

-static void
-output_actions (void)
-{
-  nvectors = nstates + nvars;
+  output_short_table (&format_obstack, r2, 0, 1, nrules + 1);
+  muscle_insert ("r2", obstack_finish (&format_obstack));

 
 

-  froms = NEW2(nvectors, short *);
-  tos = NEW2(nvectors, short *);
-  tally = NEW2(nvectors, short);
-  width = NEW2(nvectors, short);
-
-  token_actions();
-  free_shifts();
-  free_reductions();
-  FREE(lookaheads);
-  FREE(LA);
-  FREE(LAruleno);
-  FREE(accessing_symbol);
-
-  goto_actions();
-  FREE(goto_map + ntokens);
-  FREE(from_state);
-  FREE(to_state);
-
-  sort_actions();
-  pack_table();
-  output_base();
-  output_table();
-  output_check();
+  free (rhs);
+  free (prhs);
+  free (r2);

 }
 
 }
 

-
-
-/* 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)

 {
 {

-  register int i;
-  register int j;
-  register int k;
-
-  actrow = NEW2(ntokens, short);
-
-  k = action_row(0);
-  fprintf(ftable, "\nstatic const short yydefact[] = {%6d", k);
-  save_row(0);
-
-  j = 10;
-  for (i = 1; i < nstates; i++)
-    {
-      putc(',', ftable);
-
-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
-
-      k = action_row(i);
-      fprintf(ftable, "%6d", k);
-      save_row(i);
-    }
-
-  fprintf(ftable, "\n};\n");
-  FREE(actrow);
+  size_t i;
+  token_number_t *values =
+    (token_number_t *) alloca (sizeof (token_number_t) * nstates);
+  for (i = 0; i < nstates; ++i)
+    values[i] = states[i]->accessing_symbol;
+  output_token_number_table (&format_obstack, values,
+                            0, 1, nstates);
+  muscle_insert ("stos", obstack_finish (&format_obstack));

 }
 
 
 }
 
 

-
-/* 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.  */
+/*------------------------------------------------------------------.
+| Decide what to do for each type of token if seen as the lookahead |
+| token in specified state.  The value returned is used as the      |
+| default action (yydefact) for the state.  In addition, actrow is  |
+| filled with what to do for each kind of token, index by symbol    |
+| number, with zero meaning do the default action.  The value       |
+| SHRT_MIN, a very negative number, means this situation is an      |
+| error.  The parser recognizes this value specially.               |
+|                                                                   |
+| This is where conflicts are resolved.  The loop over lookahead    |
+| rules considered lower-numbered rules last, and the last rule     |
+| considered that likes a token gets to handle it.                  |
+`------------------------------------------------------------------*/

 
 static int
 
 static int

-action_row (int state)
+action_row (state_t *state)

 {
 {

-  register int i;
-  register int j;
-  register int k;
-  register int m = 0;
-  register int n = 0;
-  register int count;
-  register int default_rule;
-  register int nreds;
-  register int max;
-  register int rule;
-  register int shift_state;
-  register int symbol;
-  register unsigned mask;
-  register unsigned *wordp;
-  register reductions *redp;
-  register shifts *shiftp;
-  register errs *errp;
-  int nodefault = 0;  /* set nonzero to inhibit having any default reduction */
+  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;
 
 
   for (i = 0; i < ntokens; i++)
     actrow[i] = 0;
 

-  default_rule = 0;
-  nreds = 0;
-  redp = reduction_table[state];
-
-  if (redp)
+  if (redp->nreds >= 1)

     {
     {

-      nreds = redp->nreds;
-
-      if (nreds >= 1)
-       {
-         /* loop over all the rules available here which require
-            lookahead */
-         m = lookaheads[state];
-         n = lookaheads[state + 1];
-
-         for (i = n - 1; i >= m; i--)
-           {
-             rule = - LAruleno[i];
-             wordp = LA + i * tokensetsize;
-             mask = 1;
-
-             /* and find each token which the rule finds acceptable
-                to come next */
-             for (j = 0; j < ntokens; j++)
-               {
-                 /* and record this rule as the rule to use if that
-                    token follows.  */
-                 if (mask & *wordp)
-                   actrow[j] = rule;
-
-                 mask <<= 1;
-                 if (mask == 0)
-                   {
-                     mask = 1;
-                     wordp++;
-                   }
-               }
-           }
-       }
+      int j;
+      /* loop over all the rules available here which require
+        lookahead */
+      for (i = state->nlookaheads - 1; i >= 0; --i)
+       /* and find each token which the rule finds acceptable
+          to come next */
+       for (j = 0; j < ntokens; j++)
+         /* and record this rule as the rule to use if that
+            token follows.  */
+         if (bitset_test (LA[state->lookaheadsp + i], j))
+           actrow[j] = -LArule[state->lookaheadsp + i]->number;

     }
 
     }
 

-  shiftp = shift_table[state];
-

   /* Now see which tokens are allowed for shifts in this state.  For
      them, record the shift as the thing to do.  So shift is preferred
      to reduce.  */
   /* Now see which tokens are allowed for shifts in this state.  For
      them, record the shift as the thing to do.  So shift is preferred
      to reduce.  */

-
-  if (shiftp)
+  for (i = 0; i < shiftp->nshifts; i++)

     {
     {

-      k = shiftp->nshifts;
+      token_number_t symbol;
+      int shift_state = shiftp->shifts[i];
+      if (!shift_state)
+       continue;

 
 

-      for (i = 0; i < k; i++)
-       {
-         shift_state = shiftp->shifts[i];
-         if (! shift_state) continue;
-
-         symbol = accessing_symbol[shift_state];
+      symbol = states[shift_state]->accessing_symbol;

 
 

-         if (ISVAR(symbol))
-           break;
+      if (ISVAR (symbol))
+       break;

 
 

-         actrow[symbol] = shift_state;
+      actrow[symbol] = shift_state;

 
 

-         /* Do not use any default reduction if there is a shift for
-            error */
-         if (symbol == error_token_number)
-           nodefault = 1;
-       }
+      /* Do not use any default reduction if there is a shift for
+        error */
+      if (symbol == errtoken->number)
+       nodefault = 1;

     }
 
     }
 

-  errp = err_table[state];
-

   /* See which tokens are an explicit error in this state (due to
   /* See which tokens are an explicit error in this state (due to

-     %nonassoc).  For them, record MINSHORT as the action.  */
-
-  if (errp)
+     %nonassoc).  For them, record SHRT_MIN as the action.  */
+  for (i = 0; i < errp->nerrs; i++)

     {
     {

-      k = errp->nerrs;
-
-      for (i = 0; i < k; i++)
-       {
-         symbol = errp->errs[i];
-         actrow[symbol] = MINSHORT;
-       }
+      int symbol = errp->errs[i];
+      actrow[symbol] = SHRT_MIN;

     }
 
   /* Now find the most common reduction and make it the default action
      for this state.  */
 
     }
 
   /* Now find the most common reduction and make it the default action
      for this state.  */
 

-  if (nreds >= 1 && ! nodefault)
+  if (redp->nreds >= 1 && !nodefault)

     {
     {

-      if (consistent[state])
+      if (state->consistent)

        default_rule = redp->rules[0];
       else
        {
        default_rule = redp->rules[0];
       else
        {

-         max = 0;
-         for (i = m; i < n; i++)
+         int max = 0;
+         for (i = 0; i < state->nlookaheads; i++)

            {
            {

-             count = 0;
-             rule = - LAruleno[i];
+             int count = 0;
+             int rule = -LArule[state->lookaheadsp + i]->number;
+             int j;

 
              for (j = 0; j < ntokens; j++)
 
              for (j = 0; j < ntokens; j++)

-               {
-                 if (actrow[j] == rule)
-                   count++;
-               }
+               if (actrow[j] == rule)
+                 count++;

 
              if (count > max)
                {
 
              if (count > max)
                {


@@ -858,13 +456,12 @@ action_row (int state)
 
          if (max > 0)
            {
 
          if (max > 0)
            {

+             int j;

              for (j = 0; j < ntokens; j++)
              for (j = 0; j < ntokens; j++)

-               {
-                 if (actrow[j] == default_rule)
-                   actrow[j] = 0;
-               }
+               if (actrow[j] == default_rule)
+                 actrow[j] = 0;

 
 

-             default_rule = - default_rule;
+             default_rule = -default_rule;

            }
        }
     }
            }
        }
     }


@@ -873,11 +470,9 @@ action_row (int state)
      So replace any action which says "error" with "use default".  */
 
   if (default_rule == 0)
      So replace any action which says "error" with "use default".  */
 
   if (default_rule == 0)

-    for (j = 0; j < ntokens; j++)
-      {
-       if (actrow[j] == MINSHORT)
-         actrow[j] = 0;
-      }
+    for (i = 0; i < ntokens; i++)
+      if (actrow[i] == SHRT_MIN)
+       actrow[i] = 0;

 
   return default_rule;
 }
 
   return default_rule;
 }


@@ -886,269 +481,302 @@ action_row (int state)
 static void
 save_row (int state)
 {
 static void
 save_row (int state)
 {

-  register int i;
-  register int count;
-  register short *sp;
-  register short *sp1;
-  register short *sp2;
+  int i;
+  int count;
+  short *sp;
+  short *sp1;
+  short *sp2;

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

-    {
-      if (actrow[i] != 0)
-       count++;
-    }
+    if (actrow[i] != 0)
+      count++;

 
   if (count == 0)
     return;
 
 
   if (count == 0)
     return;
 

-  froms[state] = sp1 = sp = NEW2(count, short);
-  tos[state] = sp2 = NEW2(count, short);
+  froms[state] = sp1 = sp = XCALLOC (short, count);
+  tos[state] = sp2 = XCALLOC (short, count);

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

-    {
-      if (actrow[i] != 0)
-       {
-         *sp1++ = i;
-         *sp2++ = actrow[i];
-       }
-    }
+    if (actrow[i] != 0)
+      {
+       *sp1++ = i;
+       *sp2++ = actrow[i];
+      }

 
   tally[state] = count;
   width[state] = sp1[-1] - sp[0] + 1;
 }
 
 
 
   tally[state] = count;
   width[state] = sp1[-1] - sp[0] + 1;
 }
 
 

-
-/* 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.  */
+/*------------------------------------------------------------------.
+| Figure out the actions for the specified state, indexed by        |
+| lookahead token type.                                             |
+|                                                                   |
+| The YYDEFACT table is output now.  The detailed info is saved for |
+| putting into YYTABLE later.                                       |
+`------------------------------------------------------------------*/

 
 static void
 
 static void

-goto_actions (void)
+token_actions (void)

 {
 {

-  register int i;
-  register int j;
-  register int k;
+  size_t i;
+  short *yydefact = XCALLOC (short, nstates);

 
 

-  state_count = NEW2(nstates, short);
-
-  k = default_goto(ntokens);
-  fprintf(ftable, "\nstatic const short yydefgoto[] = {%6d", k);
-  save_column(ntokens, k);
-
-  j = 10;
-  for (i = ntokens + 1; i < nsyms; i++)
+  actrow = XCALLOC (short, ntokens);
+  for (i = 0; i < nstates; ++i)

     {
     {

-      putc(',', ftable);
-
-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
-
-      k = default_goto(i);
-      fprintf(ftable, "%6d", k);
-      save_column(i, k);
+      yydefact[i] = action_row (states[i]);
+      save_row (i);

     }
 
     }
 

-  fprintf(ftable, "\n};\n");
-  FREE(state_count);
+  output_short_table (&format_obstack, yydefact,
+                    yydefact[0], 1, nstates);
+  muscle_insert ("defact", obstack_finish (&format_obstack));
+
+  XFREE (actrow);
+  XFREE (yydefact);

 }
 
 
 }
 
 

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

 
 

-static int
-default_goto (int symbol)
+void
+actions_output (FILE *out)

 {
 {

-  register int i;
-  register int m;
-  register int n;
-  register int default_state;
-  register int max;
+  int rule;
+  for (rule = 1; rule < nrules + 1; ++rule)
+    if (rules[rule].action)
+      {
+       fprintf (out, "  case %d:\n", rule);
+
+       if (!no_lines_flag)
+         fprintf (out, muscle_find ("linef"),
+                  rules[rule].action_line,
+                  quotearg_style (c_quoting_style,
+                                  muscle_find ("filename")));
+       /* As a Bison extension, add the ending semicolon.  Since some
+          Yacc don't do that, help people using bison as a Yacc
+          finding their missing semicolons.  */
+       fprintf (out, "{ %s%s }\n    break;\n\n",
+                rules[rule].action,
+                yacc_flag ? ";" : "");
+      }
+}

 
 

-  m = goto_map[symbol];
-  n = goto_map[symbol + 1];

 
 

-  if (m == n)
-    return -1;
+/*----------------------------.
+| Output the guards to OOUT.  |
+`----------------------------*/

 
 

-  for (i = 0; i < nstates; i++)
-    state_count[i] = 0;
+void
+guards_output (FILE *out)
+{
+  int rule;
+  for (rule = 1; rule < nrules + 1; ++rule)
+    if (rules[rule].guard)
+      {
+       fprintf (out, "  case %d:\n", rule);
+
+       if (!no_lines_flag)
+         fprintf (out, muscle_find ("linef"),
+                  rules[rule].guard_line,
+                  quotearg_style (c_quoting_style,
+                                  muscle_find ("filename")));
+       fprintf (out, "{ %s; }\n    break;\n\n",
+                rules[rule].guard);
+      }
+}

 
 

-  for (i = m; i < n; i++)
-    state_count[to_state[i]]++;

 
 

-  max = 0;
-  default_state = -1;
+/*---------------------------------------.
+| Output the tokens definition to OOUT.  |
+`---------------------------------------*/

 
 

-  for (i = 0; i < nstates; i++)
+void
+token_definitions_output (FILE *out)
+{
+  int i;
+  int first = 1;
+  for (i = 0; i < ntokens; ++i)

     {
     {

-      if (state_count[i] > max)
+      symbol_t *symbol = symbols[i];
+      int number = symbol->user_token_number;
+
+      if (number == SALIAS)
+       continue;
+      /* Skip error token.  */
+      if (symbol == errtoken)
+       continue;
+      if (symbol->tag[0] == '\'')
+       continue;               /* skip literal character */
+      if (symbol->tag[0] == '\"')

        {
        {

-         max = state_count[i];
-         default_state = i;
+         /* use literal string only if given a symbol with an alias */
+         if (symbol->alias)
+           symbol = symbol->alias;
+         else
+           continue;

        }
        }

-    }

 
 

-  return default_state;
+      /* Don't #define nonliteral tokens whose names contain periods
+        or '$' (as does the default value of the EOF token).  */
+      if (strchr (symbol->tag, '.') || strchr (symbol->tag, '$'))
+       continue;
+
+      fprintf (out, "%s  [[[%s]], [%d]]",
+              first ? "" : ",\n", symbol->tag, number);
+      if (semantic_parser)
+       /* FIXME: This is probably wrong, and should be just as
+          above. --akim.  */
+       fprintf (out, "# define T%s\t%d\n", symbol->tag, symbol->number);
+      first = 0;
+    }

 }
 
 
 static void
 save_column (int symbol, int default_state)
 {
 }
 
 
 static void
 save_column (int symbol, int default_state)
 {

-  register int i;
-  register int m;
-  register int n;
-  register short *sp;
-  register short *sp1;
-  register short *sp2;
-  register int count;
-  register int symno;
-
-  m = goto_map[symbol];
-  n = goto_map[symbol + 1];
+  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;
 
   count = 0;

-  for (i = m; i < n; i++)
-    {
-      if (to_state[i] != default_state)
-       count++;
-    }
+  for (i = begin; i < end; i++)
+    if (to_state[i] != default_state)
+      count++;

 
   if (count == 0)
     return;
 
 
   if (count == 0)
     return;
 

-  symno = symbol - ntokens + nstates;
+  froms[symno] = sp1 = sp = XCALLOC (short, count);
+  tos[symno] = sp2 = XCALLOC (short, count);

 
 

-  froms[symno] = sp1 = sp = NEW2(count, short);
-  tos[symno] = sp2 = NEW2(count, short);
-
-  for (i = m; i < n; i++)
-    {
-      if (to_state[i] != default_state)
-       {
-         *sp1++ = from_state[i];
-         *sp2++ = to_state[i];
-       }
-    }
+  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;
 }
 
 
   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;

 
 

-/* The next few functions decide how to pack the actions and gotos
-   information into yytable. */
+  for (i = 0; i < nstates; i++)
+    state_count[i] = 0;

 
 

-static void
-sort_actions (void)
-{
-  register int i;
-  register int j;
-  register int k;
-  register int t;
-  register int w;
+  for (i = m; i < n; i++)
+    state_count[to_state[i]]++;

 
 

-  order = NEW2(nvectors, short);
-  nentries = 0;
+  for (i = 0; i < nstates; i++)
+    if (state_count[i] > max)
+      {
+       max = state_count[i];
+       default_state = i;
+      }

 
 

-  for (i = 0; i < nvectors; i++)
-    {
-      if (tally[i] > 0)
-       {
-         t = tally[i];
-         w = width[i];
-         j = nentries - 1;
+  return default_state;
+}

 
 

-         while (j >= 0 && (width[order[j]] < w))
-           j--;

 
 

-         while (j >= 0 && (width[order[j]] == w) && (tally[order[j]] < t))
-           j--;
+/*-------------------------------------------------------------------.
+| 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.                                        |
+`-------------------------------------------------------------------*/

 
 

-         for (k = nentries - 1; k > j; k--)
-           order[k + 1] = order[k];
+static void
+goto_actions (void)
+{
+  int i;
+  short *yydefgoto = XMALLOC (short, nsyms - ntokens);

 
 

-         order[j + 1] = i;
-         nentries++;
-       }
+  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_short_table (&format_obstack, yydefgoto,
+                    yydefgoto[0], 1, nsyms - ntokens);
+  muscle_insert ("defgoto", obstack_finish (&format_obstack));
+
+  XFREE (state_count);
+  XFREE (yydefgoto);

 }
 
 
 }
 
 

+/* The next few functions decide how to pack the actions and gotos
+   information into yytable. */
+

 static void
 static void

-pack_table (void)
+sort_actions (void)

 {
 {

-  register int i;
-  register int place;
-  register int state;
-
-  base = NEW2(nvectors, short);
-  pos = NEW2(nentries, short);
-  table = NEW2(MAXTABLE, short);
-  check = NEW2(MAXTABLE, short);
+  int i;

 
 

-  lowzero = 0;
-  high = 0;
+  order = XCALLOC (short, nvectors);
+  nentries = 0;

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

-    base[i] = MINSHORT;
+    if (tally[i] > 0)
+      {
+       int k;
+       int t = tally[i];
+       int w = width[i];
+       int j = nentries - 1;

 
 

-  for (i = 0; i < MAXTABLE; i++)
-    check[i] = -1;
+       while (j >= 0 && (width[order[j]] < w))
+         j--;

 
 

-  for (i = 0; i < nentries; i++)
-    {
-      state = matching_state(i);
+       while (j >= 0 && (width[order[j]] == w) && (tally[order[j]] < t))
+         j--;

 
 

-      if (state < 0)
-       place = pack_vector(i);
-      else
-       place = base[state];
+       for (k = nentries - 1; k > j; k--)
+         order[k + 1] = order[k];

 
 

-      pos[i] = place;
-      base[order[i]] = place;
-    }
-
-  for (i = 0; i < nvectors; i++)
-    {
-      if (froms[i])
-       FREE(froms[i]);
-      if (tos[i])
-       FREE(tos[i]);
-    }
-
-  FREE(froms);
-  FREE(tos);
-  FREE(pos);
+       order[j + 1] = i;
+       nentries++;
+      }

 }
 
 
 }
 
 

-

 static int
 matching_state (int vector)
 {
 static int
 matching_state (int vector)
 {

-  register int i;
-  register int j;
-  register int k;
-  register int t;
-  register int w;
-  register int match;
-  register int prev;
-
-  i = order[vector];
-  if (i >= nstates)
+  int i = order[vector];
+  int t;
+  int w;
+  int prev;
+
+  if (i >= (int) nstates)

     return -1;
 
   t = tally[i];
     return -1;
 
   t = tally[i];


@@ -1156,16 +784,16 @@ matching_state (int vector)
 
   for (prev = vector - 1; prev >= 0; prev--)
     {
 
   for (prev = vector - 1; prev >= 0; prev--)
     {

-      j = order[prev];
+      int j = order[prev];
+      int k;
+      int match = 1;
+

       if (width[j] != w || tally[j] != t)
        return -1;
 
       if (width[j] != w || tally[j] != t)
        return -1;
 

-      match = 1;

       for (k = 0; match && k < t; k++)
       for (k = 0; match && k < t; k++)

-       {
-         if (tos[j][k] != tos[i][k] || froms[j][k] != froms[i][k])
-           match = 0;
-       }
+       if (tos[j][k] != tos[i][k] || froms[j][k] != froms[i][k])
+         match = 0;

 
       if (match)
        return j;
 
       if (match)
        return j;


@@ -1175,47 +803,36 @@ matching_state (int vector)
 }
 
 
 }
 
 

-

 static int
 pack_vector (int vector)
 {
 static int
 pack_vector (int vector)
 {

-  register int i;
-  register int j;
-  register int k;
-  register int t;
-  register int loc = 0;
-  register int ok;
-  register short *from;
-  register short *to;
-
-  i = order[vector];
-  t = tally[i];
-
-  if (t == 0)
-    berror("pack_vector");
+  int i = order[vector];
+  int j;
+  int t = tally[i];
+  int loc = 0;
+  short *from = froms[i];
+  short *to = tos[i];

 
 

-  from = froms[i];
-  to = tos[i];
+  assert (t);

 
 

-  for (j = lowzero - from[0]; j < MAXTABLE; j++)
+  for (j = lowzero - from[0]; j < (int) table_size; j++)

     {
     {

-      ok = 1;
+      int k;
+      int ok = 1;

 
       for (k = 0; ok && k < t; k++)
        {
          loc = j + from[k];
 
       for (k = 0; ok && k < t; k++)
        {
          loc = j + from[k];

-         if (loc > MAXTABLE)
-           fatal (_("maximum table size (%d) exceeded"), MAXTABLE);
+         if (loc > (int) table_size)
+           table_grow (loc);

 
          if (table[loc] != 0)
            ok = 0;
        }
 
       for (k = 0; ok && k < vector; k++)
 
          if (table[loc] != 0)
            ok = 0;
        }
 
       for (k = 0; ok && k < vector; k++)

-       {
-         if (pos[k] == j)
-           ok = 0;
-       }
+       if (pos[k] == j)
+         ok = 0;

 
       if (ok)
        {
 
       if (ok)
        {


@@ -1235,268 +852,284 @@ pack_vector (int vector)
          return j;
        }
     }
          return j;
        }
     }

-
-  berror("pack_vector");
-  return 0;    /* JF keep lint happy */
+#define pack_vector_succeeded 0
+  assert (pack_vector_succeeded);
+  return 0;

 }
 
 
 }
 
 

-
-/* the following functions output yytable, yycheck
-   and the vectors whose elements index the portion starts */
-

 static void
 static void

-output_base (void)
+pack_table (void)

 {
 {

-  register int i;
-  register int j;
+  int i;
+  int place;
+  int state;

 
 

-  fprintf(ftable, "\nstatic const short yypact[] = {%6d", base[0]);
+  base = XCALLOC (short, nvectors);
+  pos = XCALLOC (short, nentries);
+  table = XCALLOC (short, table_size);
+  check = XCALLOC (short, table_size);

 
 

-  j = 10;
-  for (i = 1; i < nstates; i++)
-    {
-      putc(',', ftable);
-
-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
+  lowzero = 0;
+  high = 0;

 
 

-      fprintf(ftable, "%6d", base[i]);
-    }
+  for (i = 0; i < nvectors; i++)
+    base[i] = SHRT_MIN;

 
 

-  fprintf(ftable, "\n};\n\nstatic const short yypgoto[] = {%6d", base[nstates]);
+  for (i = 0; i < (int) table_size; i++)
+    check[i] = -1;

 
 

-  j = 10;
-  for (i = nstates + 1; i < nvectors; i++)
+  for (i = 0; i < nentries; i++)

     {
     {

-      putc(',', ftable);
+      state = matching_state (i);

 
 

-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
+      if (state < 0)
+       place = pack_vector (i);

       else
       else

-       {
-         j++;
-       }
+       place = base[state];

 
 

-      fprintf(ftable, "%6d", base[i]);
+      pos[i] = place;
+      base[order[i]] = place;

     }
 
     }
 

-  fprintf(ftable, "\n};\n");
-  FREE(base);
+  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
 
 static void

-output_table (void)
+output_base (void)

 {
 {

-  register int i;
-  register int j;
-
-  fprintf(ftable, "\n\n#define\tYYLAST\t\t%d\n\n", high);
-  fprintf(ftable, "\nstatic const short yytable[] = {%6d", table[0]);
+  /* Output pact. */
+  output_short_table (&format_obstack, base,
+                    base[0], 1, nstates);
+  muscle_insert ("pact", obstack_finish (&format_obstack));

 
 

-  j = 10;
-  for (i = 1; i <= high; i++)
-    {
-      putc(',', ftable);
+  /* Output pgoto. */
+  output_short_table (&format_obstack, base,
+                    base[nstates], nstates + 1, nvectors);
+  muscle_insert ("pgoto", obstack_finish (&format_obstack));

 
 

-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
+  XFREE (base);
+}

 
 

-      fprintf(ftable, "%6d", table[i]);
-    }

 
 

-  fprintf(ftable, "\n};\n");
-  FREE(table);
+static void
+output_table (void)
+{
+  output_short_table (&format_obstack, table,
+                    table[0], 1, high + 1);
+  muscle_insert ("table", obstack_finish (&format_obstack));
+  XFREE (table);

 }
 
 
 static void
 output_check (void)
 {
 }
 
 
 static void
 output_check (void)
 {

-  register int i;
-  register int j;
-
-  fprintf(ftable, "\nstatic const short yycheck[] = {%6d", check[0]);
-
-  j = 10;
-  for (i = 1; i <= high; i++)
-    {
-      putc(',', ftable);
-
-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
-
-      fprintf(ftable, "%6d", check[i]);
-    }
-
-  fprintf(ftable, "\n};\n");
-  FREE(check);
+  output_short_table (&format_obstack, check,
+                    check[0], 1, high + 1);
+  muscle_insert ("check", obstack_finish (&format_obstack));
+  XFREE (check);

 }
 
 }
 

-
-
-/* copy the parser code into the ftable file at the end.  */
+/*-----------------------------------------------------------------.
+| Compute and output yydefact, yydefgoto, yypact, yypgoto, yytable |
+| and yycheck.                                                     |
+`-----------------------------------------------------------------*/

 
 static void
 
 static void

-output_parser (void)
+output_actions (void)

 {
 {

-  register int c;
-#ifdef DONTDEF
-  FILE *fpars;
-#else
-#define fpars fparser
-#endif
-
-  if (pure_parser)
-    fprintf(ftable, "#define YYPURE 1\n\n");
-
-#ifdef DONTDEF /* JF no longer needed 'cuz open_extra_files changes the
-                  currently open parser from bison.simple to bison.hairy */
-  if (semantic_parser)
-    fpars = fparser;
-  else fpars = fparser1;
-#endif
-
-  /* Loop over lines in the standard parser file.  */
-
-  while (1)
-    {
-      int write_line = 1;
+  size_t i;
+  nvectors = nstates + nvars;

 
 

-      c = getc(fpars);
+  froms = XCALLOC (short *, nvectors);
+  tos = XCALLOC (short *, nvectors);
+  tally = XCALLOC (short, nvectors);
+  width = XCALLOC (short, nvectors);

 
 

-      /* See if the line starts with `#line.
-        If so, set write_line to 0.  */
-      if (nolinesflag)
-       if (c == '#')
-         {
-           c = getc(fpars);
-           if (c == 'l')
-             {
-               c = getc(fpars);
-               if (c == 'i')
-                 {
-                   c = getc(fpars);
-                   if (c == 'n')
-                     {
-                       c = getc(fpars);
-                       if (c == 'e')
-                         write_line = 0;
-                       else
-                         fprintf(ftable, "#lin");
-                     }
-                   else
-                     fprintf(ftable, "#li");
-                 }
-               else
-                 fprintf(ftable, "#l");
-             }
-           else
-             fprintf(ftable, "#");
-         }
+  token_actions ();
+  bitsetv_free (LA);
+  free (LArule);

 
 

-      /* now write out the line... */
-      for (; c != '\n' && c != EOF; c = getc(fpars))
-       if (write_line) {
-         if (c == '$')
-           {
-             /* `$' in the parser file indicates where to put the actions.
-                Copy them in at this point.  */
-             rewind(faction);
-             for(c=getc(faction);c!=EOF;c=getc(faction))
-               putc(c,ftable);
-           }
-         else
-           putc(c, ftable);
-       }
-      if (c == EOF)
-       break;
-      putc(c, ftable);
-    }
-}
+  goto_actions ();
+  XFREE (goto_map + ntokens);
+  XFREE (from_state);
+  XFREE (to_state);

 
 

-static void
-output_program (void)
-{
-  register int c;
+  sort_actions ();
+  pack_table ();

 
 

-  if (!nolinesflag)
-    fprintf(ftable, "#line %d \"%s\"\n", lineno, infile);
+  output_base ();
+  output_table ();

 
 

-  c = getc(finput);
-  while (c != EOF)
+  output_check ();
+
+  for (i = 0; i < nstates; ++i)

     {
     {

-      putc(c, ftable);
-      c = getc(finput);
+      free (states[i]->shifts);
+      XFREE (states[i]->reductions);
+      free (states[i]->errs);
+      free (states[i]);

     }
     }

+  XFREE (states);

 }
 
 }
 

+\f
+/*---------------------------.
+| Call the skeleton parser.  |
+`---------------------------*/

 
 static void
 
 static void

-free_itemsets (void)
+output_skeleton (void)

 {
 {

-  register core *cp,*cptmp;
-
-  FREE(state_table);
-
-  for (cp = first_state; cp; cp = cptmp)
-    {
-      cptmp=cp->next;
-      FREE(cp);
-    }
+  /* Store the definition of all the muscles. */
+  const char *tempdir = getenv ("TMPDIR");
+  char *tempfile = NULL;
+  FILE *out = NULL;
+  int fd;
+
+  if (tempdir == NULL)
+    tempdir = DEFAULT_TMPDIR;
+  tempfile = xmalloc (strlen (tempdir) + 11);
+  sprintf (tempfile, "%s/bsnXXXXXX", tempdir);
+  fd = mkstemp (tempfile);
+  if (fd == -1)
+    error (EXIT_FAILURE, errno, "%s", tempfile);
+
+  out = fdopen (fd, "w");
+  if (out == NULL)
+    error (EXIT_FAILURE, errno, "%s", tempfile);
+
+  /* There are no comments, especially not `#': we do want M4 expansion
+     after `#': think of CPP macros!  */
+  fputs ("m4_changecom()\n", out);
+  fputs ("m4_init()\n", out);
+
+  fputs ("m4_define([b4_actions], \n[[", out);
+  actions_output (out);
+  fputs ("]])\n\n", out);
+
+  fputs ("m4_define([b4_guards], \n[[", out);
+  guards_output (out);
+  fputs ("]])\n\n", out);
+
+  fputs ("m4_define([b4_tokens], \n[", out);
+  token_definitions_output (out);
+  fputs ("])\n\n", out);
+
+  muscles_m4_output (out);
+
+  fputs ("m4_wrap([m4_divert_pop(0)])\n", out);
+  fputs ("m4_divert_push(0)dnl\n", out);
+  xfclose (out);
+
+  /* Invoke m4 on the definition of the muscles, and the skeleton. */
+  {
+    const char *bison_pkgdatadir = getenv ("BISON_PKGDATADIR");
+    const char *m4 = getenv ("M4");
+    if (!m4)
+      m4 = M4;
+    if (!bison_pkgdatadir)
+      bison_pkgdatadir = PKGDATADIR;
+    if (trace_flag)
+      fprintf (stderr,
+              "running: %s -I %s m4sugar/m4sugar.m4 %s %s\n",
+              m4, bison_pkgdatadir, tempfile, skeleton);
+    skel_in = readpipe (m4,
+                       "-I", bison_pkgdatadir,
+                       "m4sugar/m4sugar.m4",
+                       tempfile,
+                       skeleton,
+                       NULL);
+    if (!skel_in)
+      error (EXIT_FAILURE, errno, "cannot run m4");
+    skel_lex ();
+
+    /* If `debugging', keep this file alive. */
+    if (!trace_flag)
+      unlink (tempfile);
+  }

 }
 
 }
 

-

 static void
 static void

-free_shifts (void)
+prepare (void)

 {
 {

-  register shifts *sp,*sptmp;/* JF derefrenced freed ptr */
-
-  FREE(shift_table);
-
-  for (sp = first_shift; sp; sp = sptmp)
+  MUSCLE_INSERT_INT ("last", high);
+  MUSCLE_INSERT_INT ("flag", SHRT_MIN);
+  MUSCLE_INSERT_INT ("pure", pure_parser);
+  MUSCLE_INSERT_INT ("nsym", nsyms);
+  MUSCLE_INSERT_INT ("debug", debug_flag);
+  MUSCLE_INSERT_INT ("final", final_state);
+  MUSCLE_INSERT_INT ("undef_token_number", undeftoken->number);
+  MUSCLE_INSERT_INT ("user_token_number_max", max_user_token_number);
+  MUSCLE_INSERT_INT ("error_verbose", error_verbose);
+  MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy");
+
+  /* FIXME: This is wrong: the muscles should decide whether they hold
+     a copy or not, but the situation is too obscure currently.  */
+  MUSCLE_INSERT_STRING ("output_infix", output_infix ? output_infix : "");
+  MUSCLE_INSERT_STRING ("output_prefix", short_base_name);
+  MUSCLE_INSERT_STRING ("output_parser_name", parser_file_name);
+  MUSCLE_INSERT_STRING ("output_header_name", spec_defines_file);
+
+  MUSCLE_INSERT_INT ("nnts", nvars);
+  MUSCLE_INSERT_INT ("nrules", nrules);
+  MUSCLE_INSERT_INT ("nstates", nstates);
+  MUSCLE_INSERT_INT ("ntokens", ntokens);
+
+  MUSCLE_INSERT_INT ("locations_flag", locations_flag);
+  MUSCLE_INSERT_INT ("defines_flag", defines_flag);
+
+  /* Copy definitions in directive.  */
+  obstack_1grow (&attrs_obstack, 0);
+  muscle_insert ("prologue", obstack_finish (&attrs_obstack));
+
+  /* Find the right skeleton file.  */
+  if (!skeleton)

     {
     {

-      sptmp=sp->next;
-      FREE(sp);
+      if (semantic_parser)
+       skeleton = "bison.hairy";
+      else
+       skeleton = "bison.simple";

     }
     }

+
+  /* Parse the skeleton file and output the needed parsers.  */
+  muscle_insert ("skeleton", skeleton);

 }
 
 
 }
 
 

-static void
-free_reductions (void)
+/*----------------------------------------------------------.
+| Output the parsing tables and the parser code to ftable.  |
+`----------------------------------------------------------*/
+
+void
+output (void)

 {
 {

-  register reductions *rp,*rptmp;/* JF fixed freed ptr */
+  obstack_init (&format_obstack);

 
 

-  FREE(reduction_table);
+  prepare_tokens ();
+  prepare_rules ();
+  prepare_states ();
+  output_actions ();

 
 

-  for (rp = first_reduction; rp; rp = rptmp)
-    {
-      rptmp=rp->next;
-      FREE(rp);
-    }
+  prepare ();
+
+  /* Process the selected skeleton file.  */
+  output_skeleton ();
+
+  obstack_free (&muscle_obstack, NULL);
+  obstack_free (&format_obstack, NULL);
+  obstack_free (&action_obstack, NULL);
+  obstack_free (&attrs_obstack, NULL);

 }
 }