Regen.

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 84581843d5469fde80d693600e54e29251899c0a..34d6b06ae840305bd98bcf1547af8b41e3a25eb3 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,852 +1,426 @@
 /* Output the generated parsing program for bison,
 /* Output the generated parsing program for bison,

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

 
 

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

 
 

-Bison is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   Bison is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.

 
 

-Bison is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   Bison is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.

 
 

-You should have received a copy of the GNU General Public License
-along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with Bison; see the file COPYING.  If not, write to the Free
+   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   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 "quotearg.h"
+#include "getargs.h"

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

-#include "state.h"
-
-
-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 int lineno;
-
-void output_headers PARAMS((void));
-void output_trailers PARAMS((void));
-void output PARAMS((void));
-void output_token_translations PARAMS((void));
-void output_gram PARAMS((void));
-void output_stos PARAMS((void));
-void output_rule_data PARAMS((void));
-void output_defines PARAMS((void));
-void output_actions PARAMS((void));
-void token_actions PARAMS((void));
-void save_row PARAMS((int));
-void goto_actions PARAMS((void));
-void save_column PARAMS((int, int));
-void sort_actions PARAMS((void));
-void pack_table PARAMS((void));
-void output_base PARAMS((void));
-void output_table PARAMS((void));
-void output_check PARAMS((void));
-void output_parser PARAMS((void));
-void output_program PARAMS((void));
-void free_shifts PARAMS((void));
-void free_reductions PARAMS((void));
-void free_itemsets PARAMS((void));
-int action_row PARAMS((int));
-int default_goto PARAMS((int));
-int matching_state PARAMS((int));
-int pack_vector PARAMS((int));
-
-extern void berror PARAMS((char *));
-extern void fatals PARAMS((char *, char *));
-extern char *int_to_string PARAMS((int));
-extern void reader_output_yylsp PARAMS((FILE *));
+#include "LR0.h"
+#include "complain.h"
+#include "output.h"
+#include "lalr.h"
+#include "reader.h"
+#include "symtab.h"
+#include "conflicts.h"
+#include "muscle_tab.h"
+

 
 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;
+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)
+/* Returns the number of lines of S.  */
+static size_t
+get_lines_number (const char *s)

 {
 {

-  if (semantic_parser)
-    fprintf(fguard, GUARDSTR, attrsfile);
-
-  if (noparserflag)
-       return;
+  size_t lines = 0;

 
 

-  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");
-*/
+  size_t i;
+  for (i = 0; s[i]; ++i)
+    if (s[i] == '\n')
+      ++lines;

 
 

-  /* 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);
-    }
+  return lines;

 }
 
 
 }
 
 

-void
-output_trailers (void)
-{
-  if (semantic_parser)
-      fprintf(fguard, "\n    }\n}\n");
-
-  fprintf(faction, "\n");
-  
-  if (noparserflag) 
-      return;
+/* FIXME. */

 
 

-  if (semantic_parser)
-      fprintf(faction, "    }\n");
-  fprintf(faction, "}\n");
-}
-
-
-void
-output (void)
+static inline void
+output_table_data (struct obstack *oout,
+                  short *table_data,
+                  short first,
+                  int begin,
+                  int end)

 {
 {

-  int c;
+  int i;
+  int j = 1;

 
 

-  /* output_token_defines(ftable);     / * JF put out token defines FIRST */
-  if (!semantic_parser)                /* JF Put out other stuff */
+  obstack_fgrow1 (oout, "%6d", first);
+  for (i = begin; i < end; ++i)

     {
     {

-      rewind(fattrs);
-      while ((c=getc(fattrs))!=EOF)
-        putc(c,ftable);
+      obstack_1grow (oout, ',');
+      if (j >= 10)
+       {
+         obstack_sgrow (oout, "\n  ");
+         j = 1;
+       }
+      else
+       ++j;
+      obstack_fgrow1 (oout, "%6d", table_data[i]);

     }
     }

-  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();
+  obstack_1grow (oout, 0);

 }
 
 
 }
 
 

-void
+static void

 output_token_translations (void)
 {
 output_token_translations (void)
 {

-  register int i, j;
-/*   register short *sp; JF unused */
-
-  if (translations)
-    {
-      fprintf(ftable,
-             "\n#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\n",
-             max_user_token_number, nsyms);
-    
-      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");
-    
-      j = 10;
-      for (i = 1; i <= max_user_token_number; i++)
-       {
-         putc(',', ftable);
-    
-         if (j >= 10)
-           {
-             putc('\n', ftable);
-             j = 1;
-           }
-         else
-           {
-             j++;
-           }
-    
-         fprintf(ftable, "%6d", token_translations[i]);
-       }
-    
-      fprintf(ftable, "\n};\n");
-    }
-  else
-    {
-      fprintf(ftable, "\n#define YYTRANSLATE(x) (x)\n");
-    } 
+  output_table_data (&format_obstack, token_translations,
+                    0, 1, max_user_token_number + 1);
+  muscle_insert ("translate", obstack_finish (&format_obstack));
+  XFREE (token_translations);

 }
 
 
 }
 
 

-void
+static void

 output_gram (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++;
-       }
+  {
+    int i;
+    short *values = XCALLOC (short, nrules + 1);
+    for (i = 0; i < nrules + 1; ++i)
+      values[i] = rules[i].rhs;
+    output_table_data (&format_obstack, values,
+                      0, 1, nrules + 1);
+    XFREE (values);
+  }

 
 

-      fprintf(ftable, "%6d", rrhs[i]);
-    }
+  muscle_insert ("prhs", obstack_finish (&format_obstack));

 
 

-  fprintf(ftable, "\n};\n");
+  {
+    short *yyrhs;
+    int i;

 
 

-  fprintf(ftable, "\nstatic const short yyrhs[] = {%6d", ritem[0]);
+    yyrhs = XMALLOC (short, nritems);

 
 

-  j = 10;
-  for (sp = ritem + 1; *sp; sp++)
-    {
-      putc(',', ftable);
+    for (i = 1; i < nritems; ++i)
+      yyrhs[i] = ritem[i] >= 0 ? ritem[i] : -1;

 
 

-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
+    output_table_data (&format_obstack, yyrhs,
+                      ritem[0], 1, nritems);
+    muscle_insert ("rhs", obstack_finish (&format_obstack));

 
 

-      if (*sp > 0)
-       fprintf(ftable, "%6d", *sp);
-      else
-       fprintf(ftable, "     0");
-    }
-
-  fprintf(ftable, "\n};\n");
+    XFREE (yyrhs);
+  }

 
 

-  if (! semantic_parser  && ! noparserflag)
-    fprintf(ftable, "\n#endif\n");
+#if 0
+  if (!semantic_parser)
+    obstack_sgrow (&table_obstack, "\n#endif\n");
+#endif

 }
 
 
 }
 
 

-void
+static void

 output_stos (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");
+  int i;
+  short *values = (short *) alloca (sizeof (short) * nstates);
+  for (i = 0; i < nstates; ++i)
+    values[i] = states[i]->accessing_symbol;
+  output_table_data (&format_obstack, values,
+                    0, 1, nstates);
+  muscle_insert ("stos", obstack_finish (&format_obstack));

 }
 
 
 }
 
 

-void
+static void

 output_rule_data (void)
 {
 output_rule_data (void)
 {

-  register int i;
-  register int j;
-
-  fprintf(ftable, "\n#if YYDEBUG != 0\n");
-  fprintf(ftable, "static const short yyrline[] = { 0");
-
-  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++;
-    }
-    fprintf(ftable, ", NULL\n};\n");   /* add a NULL entry to list of tokens */
-
-  if (! toknumflag  && ! noparserflag)
-    fprintf(ftable, "#endif\n\n");
-
-  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]);
-      }
-      fprintf(ftable, "\n};\n\n");
-    }
+  int i;
+  int j;
+  short *short_tab = NULL;
+
+  {
+    short *values = XCALLOC (short, nrules + 1);
+    for (i = 0; i < nrules + 1; ++i)
+      values[i] = rules[i].line;
+    output_table_data (&format_obstack, values,
+                      0, 1, nrules + 1);
+    muscle_insert ("rline", obstack_finish (&format_obstack));
+    XFREE (values);
+  }

 
 

-  fprintf(ftable, "static const short yyr1[] = {     0");

 
 

-  j = 10;
-  for (i = 1; i <= nrules; i++)
+  j = 0;
+  for (i = 0; i < nsyms; i++)

     {
     {

-      putc(',', ftable);
-
-      if (j >= 10)
+      /* 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)

        {
        {

-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
+         obstack_sgrow (&format_obstack, "\n  ");
+         j = 2;

        }
 
        }
 

-      fprintf(ftable, "%6d", rlhs[i]);
+      obstack_sgrow (&format_obstack, cp);
+      obstack_sgrow (&format_obstack, ", ");
+      j += strsize;

     }
     }

+  /* add a NULL entry to list of tokens */
+  obstack_sgrow (&format_obstack, "NULL");
+
+  /* Finish table and store. */
+  obstack_1grow (&format_obstack, 0);
+  muscle_insert ("tname", obstack_finish (&format_obstack));
+
+  /* Output YYTOKNUM. */
+  {
+    short *values = XCALLOC (short, ntokens + 1);
+    for (i = 0; i < ntokens + 1; ++i)
+      values[i] = symbols[i]->user_token_number;
+    output_table_data (&format_obstack, values,
+                      0, 1, ntokens + 1);
+    muscle_insert ("toknum", obstack_finish (&format_obstack));
+    XFREE (values);
+  }

 
 

-  FREE(rlhs + 1);

 
 

-  fprintf(ftable, "\n};\n\nstatic const short yyr2[] = {     0");
+  /* Output YYR1. */
+  {
+    short *values = XCALLOC (short, nrules + 1);
+    for (i = 0; i < nrules + 1; ++i)
+      values[i] = rules[i].lhs;
+    output_table_data (&format_obstack, values,
+                      0, 1, nrules + 1);
+    muscle_insert ("r1", obstack_finish (&format_obstack));
+    XFREE (values);
+  }

 
 

-  j = 10;
+  /* Output YYR2. */
+  short_tab = XMALLOC (short, nrules + 1);

   for (i = 1; i < nrules; i++)
   for (i = 1; i < nrules; i++)

-    {
-      putc(',', ftable);
-
-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
-
-      fprintf(ftable, "%6d", rrhs[i + 1] - rrhs[i] - 1);
-    }
-
-  putc(',', ftable);
-  if (j >= 10)
-    putc('\n', ftable);
-
-  fprintf(ftable, "%6d\n};\n", nitems - rrhs[nrules] - 1);
-  FREE(rrhs + 1);
-}
-
-
-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);
+    short_tab[i] = rules[i + 1].rhs - rules[i].rhs - 1;
+  short_tab[nrules] =  nritems - rules[nrules].rhs - 1;
+  output_table_data (&format_obstack, short_tab,
+                    0, 1, nrules + 1);
+  muscle_insert ("r2", obstack_finish (&format_obstack));
+  XFREE (short_tab);

 }
 
 }
 

-
-
-/* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable and yycheck.  */
-
-void
-output_actions (void)
+/*------------------------------------------------------------------.
+| Decide what to do for each type of token if seen as the lookahead |
+| token in specified state.  The value returned is used as the      |
+| default action (yydefact) for the state.  In addition, actrow is  |
+| filled with what to do for each kind of token, index by symbol    |
+| number, with zero meaning do the default action.  The value       |
+| MINSHORT, a very negative number, means this situation is an      |
+| error.  The parser recognizes this value specially.               |
+|                                                                   |
+| This is where conflicts are resolved.  The loop over lookahead    |
+| rules considered lower-numbered rules last, and the last rule     |
+| considered that likes a token gets to handle it.                  |
+`------------------------------------------------------------------*/
+
+static int
+action_row (state_t *state)

 {
 {

-  nvectors = nstates + nvars;
-
-  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();
-}
-
-
-
-/* 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.  */
-
-void
-token_actions (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);
-}
-
-
-
-/* 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.  */
-
-int
-action_row (int 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 (BITISSET (LA (state->lookaheadsp + i), j))
+           actrow[j] = -LAruleno[state->lookaheadsp + i];

     }
 
     }
 

-  shiftp = shift_table[state];
-
-  /* now see which tokens are allowed for shifts in this state.
-     For them, record the shift as the thing to do.  So shift is preferred to reduce.  */
-
-  if (shiftp)
+  /* Now see which tokens are allowed for shifts in this state.  For
+     them, record the shift as the thing to do.  So shift is preferred
+     to reduce.  */
+  for (i = 0; i < shiftp->nshifts; i++)

     {
     {

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

 
 

-         symbol = accessing_symbol[shift_state];
+      symbol = states[shift_state]->accessing_symbol;

 
 

-         if (ISVAR(symbol))
-           break;
-
-         actrow[symbol] = shift_state;
+      if (ISVAR (symbol))
+       break;

 
 

-         /* do not use any default reduction if there is a shift for error */
+      actrow[symbol] = shift_state;

 
 

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

     }
 
     }
 

-  errp = err_table[state];
-
-  /* See which tokens are an explicit error in this state
-     (due to %nonassoc).  For them, record MINSHORT as the action.  */
-
-  if (errp)
+  /* See which tokens are an explicit error in this state (due to
+     %nonassoc).  For them, record MINSHORT as the action.  */
+  for (i = 0; i < errp->nerrs; i++)

     {
     {

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

     }
 
     }
 

-  /* 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 = -LAruleno[state->lookaheadsp + i];
+             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)
                {
                  max = count;
                  default_rule = rule;
                }
            }
              if (count > max)
                {
                  max = count;
                  default_rule = rule;
                }
            }

-    
+

          /* actions which match the default are replaced with zero,
             which means "use the default" */
          /* actions which match the default are replaced with zero,
             which means "use the default" */

-    
+

          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;
-               }
-    
-             default_rule = - default_rule;
+               if (actrow[j] == default_rule)
+                 actrow[j] = 0;
+
+             default_rule = -default_rule;

            }
        }
     }
            }
        }
     }


@@ -855,349 +429,387 @@ 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] == MINSHORT)
+       actrow[i] = 0;

 
 

-  return (default_rule);
+  return default_rule;

 }
 
 
 }
 
 

-void
+static void

 save_row (int state)
 {
 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 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.                                       |
+`------------------------------------------------------------------*/

 
 

-/* 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.  */
-
-void
-goto_actions (void)
+static void
+token_actions (void)

 {
 {

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

 
 

-  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_table_data (&format_obstack, yydefact,
+                    yydefact[0], 1, nstates);
+  muscle_insert ("defact", obstack_finish (&format_obstack));
+
+  XFREE (actrow);
+  XFREE (yydefact);

 }
 
 
 }
 
 

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

 
 

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

 {
 {

-  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 ? ";" : "");
+
+       /* We always output 4 '\n' per action.  */
+       *line += 4;
+       /* Plus one if !no_lines_flag.  */
+       if (!no_lines_flag)
+         ++*line;
+       /* Get the number of lines written by the user.  */
+       *line += get_lines_number (rules[rule].action);
+      }
+}

 
 

-  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;
+static void
+guards_output (FILE *out, size_t *line)
+{
+  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].guard_line,
+                  quotearg_style (c_quoting_style,
+                                  muscle_find ("filename")));
+       fprintf (out, "{ %s; }\n    break;\n\n",
+                rules[rule].guard);
+
+       /* We always output 4 '\n' per action.  */
+       *line += 4;
+       /* Plus one if !no_lines_flag.  */
+       if (!no_lines_flag)
+         ++*line;
+       /* Get the number of lines written by the user.  */
+       *line += get_lines_number (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++)
+static void
+token_definitions_output (FILE *out, size_t *line)
+{
+  int i;
+  for (i = 0; i < ntokens; ++i)

     {
     {

-      if (state_count[i] > max)
+      bucket *symbol = symbols[i];
+      int number = symbol->user_token_number;
+
+      if (number == SALIAS)
+       continue;
+      /* Skip error token.  */
+      if (symbol->value == error_token_number)
+       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, "# define %s\t%d\n",
+              symbol->tag, number);
+      ++*line;
+      if (semantic_parser)
+       {
+         /* FIXME: This is probably wrong, and should be just as
+            above. --akim.  */
+         fprintf (out, "# define T%s\t%d\n", symbol->tag, symbol->value);
+         ++*line;
+       }
+    }

 }
 
 
 }
 
 

-void
+static void

 save_column (int symbol, int default_state)
 {
 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 = NEW2(count, short);
-  tos[symno] = sp2 = NEW2(count, short);
+  froms[symno] = sp1 = sp = XCALLOC (short, count);
+  tos[symno] = sp2 = XCALLOC (short, count);

 
 

-  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)
+{
+  int i;
+  int m = goto_map[symbol];
+  int 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;

 
 

-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_table_data (&format_obstack, yydefgoto,
+                    yydefgoto[0], 1, nsyms - ntokens);
+  muscle_insert ("defgoto", obstack_finish (&format_obstack));

 
 

-void
-pack_table (void)
-{
-  register int i;
-  register int place;
-  register int state;
+  XFREE (state_count);
+  XFREE (yydefgoto);
+}

 
 

-  base = NEW2(nvectors, short);
-  pos = NEW2(nentries, short);
-  table = NEW2(MAXTABLE, short);
-  check = NEW2(MAXTABLE, short);

 
 

-  lowzero = 0;
-  high = 0;
+/* The next few functions decide how to pack the actions and gotos
+   information into yytable. */

 
 

-  for (i = 0; i < nvectors; i++)
-    base[i] = MINSHORT;
+static void
+sort_actions (void)
+{
+  int i;

 
 

-  for (i = 0; i < MAXTABLE; i++)
-    check[i] = -1;
+  order = XCALLOC (short, nvectors);
+  nentries = 0;

 
 

-  for (i = 0; i < nentries; i++)
-    {
-      state = matching_state(i);
+  for (i = 0; i < nvectors; i++)
+    if (tally[i] > 0)
+      {
+       int k;
+       int t = tally[i];
+       int w = width[i];
+       int j = nentries - 1;

 
 

-      if (state < 0)
-       place = pack_vector(i);
-      else
-       place = base[state];
+       while (j >= 0 && (width[order[j]] < w))
+         j--;

 
 

-      pos[i] = place;
-      base[order[i]] = place;
-    }
+       while (j >= 0 && (width[order[j]] == w) && (tally[order[j]] < t))
+         j--;

 
 

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

 
 

-  FREE(froms);
-  FREE(tos);
-  FREE(pos);
+       order[j + 1] = i;
+       nentries++;
+      }

 }
 
 
 }
 
 

-
-int
+static int

 matching_state (int vector)
 {
 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];
+  int i = order[vector];
+  int t;
+  int w;
+  int prev;
+

   if (i >= nstates)
   if (i >= nstates)

-    return (-1);
+    return -1;

 
   t = tally[i];
   w = width[i];
 
   for (prev = vector - 1; prev >= 0; prev--)
     {
 
   t = tally[i];
   w = width[i];
 
   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)
       if (width[j] != w || tally[j] != t)

-       return (-1);
+       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)
 
       if (match)

-       return (j);
+       return j;

     }
 
     }
 

-  return (-1);
+  return -1;

 }
 
 
 }
 
 

-
-int
+static int

 pack_vector (int vector)
 {
 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];
+  int i = order[vector];
+  int j;
+  int t = tally[i];
+  int loc = 0;
+  short *from = froms[i];
+  short *to = tos[i];

 
 

-  if (t == 0)
-    berror("pack_vector");
-
-  from = froms[i];
-  to = tos[i];
+  assert (t);

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

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

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

-           fatals(_("maximum table size (%s) exceeded"), int_to_string(MAXTABLE));
+           fatal (_("maximum table size (%d) exceeded"), MAXTABLE);

 
          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)
        {


@@ -1214,268 +826,377 @@ pack_vector (int vector)
          if (loc > high)
            high = loc;
 
          if (loc > high)
            high = loc;
 

-         return (j);
+         return j;

        }
     }
        }
     }

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

 }
 
 
 }
 
 

+static void
+pack_table (void)
+{
+  int i;
+  int place;
+  int state;

 
 

-/* the following functions output yytable, yycheck
-   and the vectors whose elements index the portion starts */
+  base = XCALLOC (short, nvectors);
+  pos = XCALLOC (short, nentries);
+  table = XCALLOC (short, MAXTABLE);
+  check = XCALLOC (short, MAXTABLE);

 
 

-void
-output_base (void)
-{
-  register int i;
-  register int j;
+  lowzero = 0;
+  high = 0;
+
+  for (i = 0; i < nvectors; i++)
+    base[i] = MINSHORT;

 
 

-  fprintf(ftable, "\nstatic const short yypact[] = {%6d", base[0]);
+  for (i = 0; i < MAXTABLE; i++)
+    check[i] = -1;

 
 

-  j = 10;
-  for (i = 1; i < nstates; 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\nstatic const short yypgoto[] = {%6d", base[nstates]);
-
-  j = 10;
-  for (i = nstates + 1; i < nvectors; i++)
+  for (i = 0; i < nvectors; i++)

     {
     {

-      putc(',', ftable);
-
-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
-
-      fprintf(ftable, "%6d", base[i]);
+      XFREE (froms[i]);
+      XFREE (tos[i]);

     }
 
     }
 

-  fprintf(ftable, "\n};\n");
-  FREE(base);
+  XFREE (froms);
+  XFREE (tos);
+  XFREE (pos);

 }
 
 }
 

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

 
 

-void
-output_table (void)
+static void
+output_base (void)

 {
 {

-  register int i;
-  register int j;
+  /* Output pact. */
+  output_table_data (&format_obstack, base,
+                    base[0], 1, nstates);
+  muscle_insert ("pact", obstack_finish (&format_obstack));

 
 

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

 
 

-  j = 10;
-  for (i = 1; i <= high; i++)
-    {
-      putc(',', ftable);
-
-      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_table_data (&format_obstack, table,
+                    table[0], 1, high + 1);
+  muscle_insert ("table", obstack_finish (&format_obstack));
+  XFREE (table);

 }
 
 
 }
 
 

-void
+static void

 output_check (void)
 {
 output_check (void)
 {

-  register int i;
-  register int j;
+  output_table_data (&format_obstack, check,
+                    check[0], 1, high + 1);
+  muscle_insert ("check", obstack_finish (&format_obstack));
+  XFREE (check);
+}

 
 

-  fprintf(ftable, "\nstatic const short yycheck[] = {%6d", check[0]);
+/* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable
+   and yycheck.  */

 
 

-  j = 10;
-  for (i = 1; i <= high; i++)
-    {
-      putc(',', ftable);
+static void
+output_actions (void)
+{
+  int i;
+  nvectors = nstates + nvars;

 
 

-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
+  froms = XCALLOC (short *, nvectors);
+  tos = XCALLOC (short *, nvectors);
+  tally = XCALLOC (short, nvectors);
+  width = XCALLOC (short, nvectors);

 
 

-      fprintf(ftable, "%6d", check[i]);
-    }
+  token_actions ();
+  XFREE (LA);
+  XFREE (LAruleno);

 
 

-  fprintf(ftable, "\n};\n");
-  FREE(check);
-}
+  goto_actions ();
+  XFREE (goto_map + ntokens);
+  XFREE (from_state);
+  XFREE (to_state);

 
 

+  sort_actions ();
+  pack_table ();

 
 

+  output_base ();
+  output_table ();

 
 

-/* copy the parser code into the ftable file at the end.  */
+  output_check ();

 
 

-void
-output_parser (void)
-{
-  register int c;
-#ifdef DONTDEF
-  FILE *fpars;
-#else
-#define fpars fparser
-#endif
+  for (i = 0; i < nstates; ++i)
+    {
+      free (states[i]->shifts);
+      XFREE (states[i]->reductions);
+      free (states[i]->errs);
+      free (states[i]);
+    }
+  XFREE (states);
+}

 
 

-  if (pure_parser)
-    fprintf(ftable, "#define YYPURE 1\n\n");
+\f
+/*------------------------------------------------------------.
+| Copy the parser code from SKEL_FILENAME into OOUT obstack.  |
+| and do the muscle substitution.                             |
+`------------------------------------------------------------*/

 
 

-#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
+static void
+output_parser (const char *skel_filename, FILE *out)
+{
+  int c;
+  FILE *fskel;
+  size_t output_line;
+  size_t skeleton_line;

 
 

-  /* Loop over lines in the standard parser file.  */
+  fskel = xfopen (skel_filename, "r");

 
 

-  while (1)
+  /* New output code.  */
+  output_line = 1;
+  skeleton_line = 1;
+  c = getc (fskel);
+  while (c != EOF)

     {
     {

-      int write_line = 1;
-
-      c = getc(fpars);
-
-      /* 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, "#");
-         }
-
-      /* now write out the line... */
-      for (; c != '\n' && c != EOF; c = getc(fpars))
-       if (write_line) {
-         if (c == '$')
+      if (c != '%')
+       {
+         if (c == '\n')

            {
            {

-             /* `$' 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);
+             ++output_line;
+             ++skeleton_line;
+           }
+         putc (c, out);
+         c = getc (fskel);
+       }
+      else if ((c = getc (fskel)) == '%')
+       {
+         /* Read the muscle.  */
+         const char *muscle_key = 0;
+         const char *muscle_value = 0;
+
+         while (isalnum (c = getc (fskel)) || c == '-')
+           obstack_1grow (&muscle_obstack, c);
+         obstack_1grow (&muscle_obstack, 0);
+
+         /* Output the right value, or see if it's something special.  */
+         muscle_key = obstack_finish (&muscle_obstack);
+         muscle_value = muscle_find (muscle_key);
+         if (!strcmp (muscle_key, "actions"))
+           actions_output (out, &output_line);
+         else if (!strcmp (muscle_key, "guards"))
+           guards_output (out, &output_line);
+         else if (!strcmp (muscle_key, "line"))
+           fprintf (out, "%d", output_line);
+         else if (!strcmp (muscle_key, "tokendef"))
+           token_definitions_output (out, &output_line);
+         else if (!strcmp (muscle_key, "skeleton-line"))
+           fprintf (out, "%d", skeleton_line);
+         else if (muscle_value)
+           {
+             fputs (muscle_value, out);
+             output_line += get_lines_number (muscle_value);

            }
          else
            }
          else

-           putc(c, ftable);
+           {
+             fputs ("%%", out);
+             fputs (muscle_key, out);
+           }

        }
        }

-      if (c == EOF)
-       break;
-      putc(c, ftable);
+      else
+       putc ('%', out);

     }
     }

-}

 
 

-void
-output_program (void)
-{
-  register int c;
+  /* End.  */
+  xfclose (fskel);
+}

 
 

-  if (!nolinesflag)
-    fprintf(ftable, "#line %d \"%s\"\n", lineno, infile);
+/*----------------------------------------.
+| Prepare the master parser to be output  |
+`----------------------------------------*/

 
 

-  c = getc(finput);
-  while (c != EOF)
+static void
+output_master_parser (void)
+{
+  FILE *parser = xfopen (parser_file_name, "w");
+  if (!skeleton)

     {
     {

-      putc(c, ftable);
-      c = getc(finput);
+      if (semantic_parser)
+       skeleton = skeleton_find ("BISON_HAIRY", BISON_HAIRY);
+      else
+       skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);

     }
     }

+  muscle_insert ("skeleton", skeleton);
+  muscle_insert ("parser-file-name", parser_file_name);
+
+  output_parser (skeleton, parser);
+  xfclose (parser);

 }
 
 
 }
 
 

-void
-free_itemsets (void)
-{
-  register core *cp,*cptmp;
+/* FIXME. */

 
 

-  FREE(state_table);
+#define MUSCLE_INSERT_INT(Key, Value)                          \
+{                                                              \
+  obstack_fgrow1 (&muscle_obstack, "%d", Value);               \
+  obstack_1grow (&muscle_obstack, 0);                          \
+  muscle_insert (Key, obstack_finish (&muscle_obstack));       \
+}

 
 

-  for (cp = first_state; cp; cp = cptmp) {
-    cptmp=cp->next;
-    FREE(cp);
-  }
+#define MUSCLE_INSERT_STRING(Key, Value)                       \
+{                                                              \
+  obstack_sgrow (&muscle_obstack, Value);                      \
+  obstack_1grow (&muscle_obstack, 0);                          \
+  muscle_insert (Key, obstack_finish (&muscle_obstack));       \

 }
 
 }
 

+#define MUSCLE_INSERT_PREFIX(Key, Value)                               \
+{                                                                      \
+  obstack_fgrow2 (&muscle_obstack, "%s%s",                             \
+                 spec_name_prefix ? spec_name_prefix : "yy", Value);   \
+  obstack_1grow (&muscle_obstack, 0);                                  \
+  muscle_insert (Key, obstack_finish (&muscle_obstack));               \
+}

 
 

-void
-free_shifts (void)
+static void
+prepare (void)
+{
+  MUSCLE_INSERT_INT ("last", high);
+  MUSCLE_INSERT_INT ("flag", MINSHORT);
+  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 ("maxtok", max_user_token_number);
+  MUSCLE_INSERT_INT ("error-verbose", error_verbose);
+  MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy");
+
+  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);
+}
+
+
+/*-------------------------.
+| Output the header file.  |
+`-------------------------*/
+
+static void
+header_output (void)

 {
 {

-  register shifts *sp,*sptmp;/* JF derefrenced freed ptr */
+  size_t dummy_line;
+  FILE *out = xfopen (spec_defines_file, "w");
+  char *macro_name = compute_header_macro ();
+
+  fprintf (out, "#ifndef %s\n", macro_name);
+  fprintf (out, "# define %s\n\n", macro_name);
+
+  token_definitions_output (out, &dummy_line);
+  fprintf (out, "\
+#ifndef YYSTYPE\n\
+typedef %s
+yystype;\n\
+# define YYSTYPE yystype\n\
+#endif\n",
+                   muscle_find ("stype"));
+
+  if (!pure_parser)
+    fprintf (out, "\nextern YYSTYPE %slval;\n",
+            spec_name_prefix ? spec_name_prefix : "yy");
+
+  if (locations_flag)
+    {
+      fputs ("\n\n", out);
+      fprintf (out, "\
+#ifndef YYLTYPE\n\
+typedef struct yyltype\n\
+{\n\
+  int first_line;\n\
+  int first_column;\n\
+  int last_line;\n\
+  int last_column;\n\
+} yyltype;\n\
+# define YYLTYPE yyltype\n\
+#endif\n");
+      if (!pure_parser)
+       fprintf (out, "\nextern YYLTYPE %slloc;\n",
+                spec_name_prefix ? spec_name_prefix : "yy");
+    }

 
 

-  FREE(shift_table);
+  if (semantic_parser)
+    {
+      int i;

 
 

-  for (sp = first_shift; sp; sp = sptmp) {
-    sptmp=sp->next;
-    FREE(sp);
-  }
+      for (i = ntokens; i < nsyms; i++)
+       /* don't make these for dummy nonterminals made by gensym.  */
+       if (*symbols[i]->tag != '@')
+         fprintf (out, "# define NT%s\t%d\n", symbols[i]->tag, i);
+    }
+
+  fprintf (out, "\n#endif /* not %s */\n", macro_name);
+  free (macro_name);
+  xfclose (out);

 }
 
 
 }
 
 

+/*----------------------------------------------------------.
+| Output the parsing tables and the parser code to ftable.  |
+`----------------------------------------------------------*/
+

 void
 void

-free_reductions (void)
+output (void)

 {
 {

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

 
 

-  FREE(reduction_table);
+  output_token_translations ();
+  output_gram ();

 
 

-  for (rp = first_reduction; rp; rp = rptmp) {
-    rptmp=rp->next;
-    FREE(rp);
-  }
+  XFREE (ritem);
+  if (semantic_parser)
+    output_stos ();
+  output_rule_data ();
+  output_actions ();
+
+  prepare ();
+  /* Copy definitions in directive.  */
+  obstack_1grow (&attrs_obstack, 0);
+  muscle_insert ("prologue", obstack_finish (&attrs_obstack));
+
+  /* Output the parser. */
+  output_master_parser ();
+  /* Output the header if needed. */
+  if (defines_flag)
+    header_output ();
+
+  free (rules + 1);
+  obstack_free (&muscle_obstack, NULL);
+  obstack_free (&format_obstack, NULL);
+  obstack_free (&action_obstack, NULL);
+  obstack_free (&attrs_obstack, NULL);

 }
 }