X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/6c89f1c1388ef0368855fc0400d35dfaf57db3ef..e89a22bfab22e4d2ee73be49dcb66b51f8d0e892:/src/output.c

diff --git a/src/output.c b/src/output.c
index 4bb09cd7..2daac6c3 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,5 +1,7 @@
 /* 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 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -91,54 +93,99 @@
 */
 
 #include "system.h"
+#include "obstack.h"
+#include "quotearg.h"
 #include "getargs.h"
-#include "alloc.h"
 #include "files.h"
 #include "gram.h"
-#include "state.h"
+#include "LR0.h"
 #include "complain.h"
 #include "output.h"
+#include "lalr.h"
+#include "reader.h"
+#include "conflicts.h"
 
-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 reader_output_yylsp PARAMS ((FILE *));
 
 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 inline void
+output_short_or_char_table (struct obstack *oout,
+			    const char *comment,
+			    const char *type,
+			    const char *table_name,
+			    short *short_table,
+			    short first_value,
+			    int begin, int end)
+{
+  int i, j;
+
+  if (comment)
+    obstack_fgrow1 (oout, "/* %s. */\n", comment);
+
+  obstack_fgrow3 (oout, "static const %s %s[] =\n{\n  %6d",
+		  type, table_name, first_value);
+
+  j = 1;
+  for (i = begin; i < end; i++)
+    {
+      obstack_1grow (oout, ',');
+
+      if (j >= 10)
+	{
+	  obstack_sgrow (oout, "\n  ");
+	  j = 1;
+	}
+      else
+	{
+	  j++;
+	}
+
+      obstack_fgrow1 (oout, "%6d", short_table[i]);
+    }
+
+  obstack_sgrow (oout, "\n};\n");
+}
+
+
+static inline void
+output_short_table (struct obstack *oout,
+		    const char *comment,
+		    const char *table_name,
+		    short *short_table,
+		    short first_value,
+		    int begin, int end)
+{
+  output_short_or_char_table (oout, comment, "short", table_name, short_table,
+			      first_value, begin, end);
+}
+
+
+/*--------------------------------------------------------------.
+| output_headers -- Output constant strings to the beginning of |
+| certain files.                                                |
+`--------------------------------------------------------------*/
+
+/* Don't put the `%s' insides quotes, since it quotearg puts them. */
+
 #define	GUARDSTR	\
 "\n\
-#include \"%s\"\n\
+#include %s\n\
 extern int yyerror;\n\
 extern int yycost;\n\
 extern char * yymsg;\n\
@@ -157,7 +204,7 @@ register YYLTYPE *yylsp;\n\
 
 #define	ACTSTR		\
 "\n\
-#include \"%s\"\n\
+#include %s\n\
 extern YYSTYPE yyval;\n\
 extern int yychar;\n\
 \n\
@@ -171,36 +218,47 @@ register YYLTYPE *yylsp;\n\
 
 #define	ACTSTR_SIMPLE	"\n  switch (yyn) {\n"
 
-
-/*------------------------------------------------------------.
-| Output constant strings to the beginning of certain files.  |
-`------------------------------------------------------------*/
-
 void
 output_headers (void)
 {
+  char *attrsfile_quoted = 0;
+
   if (semantic_parser)
-    fprintf (fguard, GUARDSTR, attrsfile);
+    {
+      /* FIXME: This is *buggy*.  ATTRSFILE is not computed yet, since
+	 we are waiting for the full input file to have been read to
+	 be sure of the output file name.  So basically, here, a SEGV
+	 is guaranteed.  OTOH, currently semantic parsers are not
+	 supported.  */
+      attrsfile_quoted = quotearg_style (c_quoting_style, attrsfile);
+      obstack_fgrow1 (&guard_obstack, GUARDSTR, attrsfile_quoted);
+    }
 
-  if (noparserflag)
+  if (no_parser_flag)
     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");
-*/
+  if (semantic_parser)
+    obstack_fgrow1 (&action_obstack, ACTSTR, attrsfile_quoted);
+  else
+    obstack_sgrow (&action_obstack, ACTSTR_SIMPLE);
 
   /* 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);
+      obstack_fgrow1 (&table_obstack,
+		      "#define yyparse %sparse\n", spec_name_prefix);
+      obstack_fgrow1 (&table_obstack,
+		      "#define yylex %slex\n", spec_name_prefix);
+      obstack_fgrow1 (&table_obstack,
+		      "#define yyerror %serror\n", spec_name_prefix);
+      obstack_fgrow1 (&table_obstack,
+		      "#define yylval %slval\n", spec_name_prefix);
+      obstack_fgrow1 (&table_obstack,
+		      "#define yychar %schar\n", spec_name_prefix);
+      obstack_fgrow1 (&table_obstack,
+		      "#define yydebug %sdebug\n", spec_name_prefix);
+      obstack_fgrow1 (&table_obstack,
+		      "#define yynerrs %snerrs\n", spec_name_prefix);
     }
 }
 
@@ -213,16 +271,17 @@ void
 output_trailers (void)
 {
   if (semantic_parser)
-    fprintf (fguard, "\n    }\n}\n");
+    obstack_sgrow (&guard_obstack, "\n    }\n}\n");
 
-  fprintf (faction, "\n");
+  obstack_1grow (&action_obstack, '\n');
 
-  if (noparserflag)
+  if (no_parser_flag)
     return;
 
   if (semantic_parser)
-    fprintf (faction, "    }\n");
-  fprintf (faction, "}\n");
+    obstack_sgrow (&action_obstack, "    }\n");
+
+  obstack_sgrow (&action_obstack, "}\n");
 }
 
 
@@ -230,109 +289,64 @@ output_trailers (void)
 static void
 output_token_translations (void)
 {
-  int i, j;
-/*   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);
+  obstack_sgrow (&table_obstack, "\
+\n\
+/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */\n");
 
-	  if (j >= 10)
-	    {
-	      putc ('\n', ftable);
-	      j = 1;
-	    }
-	  else
-	    {
-	      j++;
-	    }
+  obstack_fgrow2 (&table_obstack,
+      "#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\
+\n\
+\n",
+		  max_user_token_number, nsyms);
 
-	  fprintf (ftable, "%6d", token_translations[i]);
-	}
+  output_short_or_char_table (&table_obstack,
+	     "YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX",
+			      ntokens < 127 ? "char" : "short",
+			      "yytranslate", token_translations,
+			      0, 1, max_user_token_number + 1);
 
-      fprintf (ftable, "\n};\n");
-    }
-  else
-    {
-      fprintf (ftable, "\n#define YYTRANSLATE(x) (x)\n");
-    }
+  XFREE (token_translations);
 }
 
 
 static void
 output_gram (void)
 {
-  int i;
-  int j;
-  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");
+  /* With the no_parser option, all tables are generated */
+  if (!semantic_parser && !no_parser_flag)
+    obstack_sgrow (&table_obstack, "\n#if YYDEBUG\n");
+
+  {
+    int i;
+    short *values = XCALLOC (short, nrules + 1);
+    for (i = 0; i < nrules + 1; ++i)
+      values[i] = rule_table[i].rhs;
+    output_short_table (&table_obstack, NULL, "yyprhs", values,
+			0, 1, nrules + 1);
+    XFREE (values);
+  }
+
+  {
+    size_t yyrhs_size = 1;
+    short *yyrhs, *sp;
+    int i;
+
+    for (sp = ritem + 1; *sp; sp++)
+      ++yyrhs_size;
+    yyrhs = XMALLOC (short, yyrhs_size);
+
+    for (sp = ritem + 1, i = 1; *sp; ++sp, ++i)
+      yyrhs[i] = *sp > 0 ? *sp : 0;
+
+    output_short_table (&table_obstack, NULL, "yyrhs", yyrhs,
+			ritem[0], 1, yyrhs_size);
+    XFREE (yyrhs);
+  }
+
+  if (!semantic_parser && !no_parser_flag)
+    obstack_sgrow (&table_obstack, "\n#endif\n");
 }
 
 
@@ -340,29 +354,13 @@ static void
 output_stos (void)
 {
   int i;
-  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");
+  short *values = (short *) alloca (sizeof (short) * nstates);
+  for (i = 0; i < nstates; ++i)
+    values[i] = state_table[i].accessing_symbol;
+  output_short_table (&table_obstack,
+		      "YYSTOS[STATE] -- Accessing symbol to the STATE",
+		      "yystos", values,
+		      0, 1, nstates);
 }
 
 
@@ -371,193 +369,140 @@ output_rule_data (void)
 {
   int i;
   int j;
+  short *short_tab = NULL;
 
-  fputs ("\n\
-#if YYDEBUG != 0\n\
-/* YYRLINE[yyn]: source line where rule number YYN was defined. */\n\
-static const short yyrline[] = { 0", ftable);
+  obstack_sgrow (&table_obstack, "\n\
+#if YYDEBUG\n");
 
-  j = 10;
-  for (i = 1; i <= nrules; i++)
-    {
-      putc (',', ftable);
+  {
+    short *values = XCALLOC (short, nrules + 1);
+    for (i = 0; i < nrules + 1; ++i)
+      values[i] = rule_table[i].line;
+    output_short_table (&table_obstack,
+			"YYRLINE[YYN] -- source line where rule number YYN was defined",
+			"yyrline", values,
+			0, 1, nrules + 1);
+    XFREE (values);
+  }
 
-      if (j >= 10)
-	{
-	  putc ('\n', ftable);
-	  j = 1;
-	}
-      else
-	{
-	  j++;
-	}
-
-      fprintf (ftable, "%6d", rline[i]);
-    }
-  fprintf (ftable, "\n};\n#endif\n\n");
+  obstack_sgrow (&table_obstack, "#endif\n\n");
 
-  if (toknumflag || noparserflag)
+  if (token_table_flag || no_parser_flag)
     {
-      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);
+      obstack_fgrow1 (&table_obstack, "#define YYNTOKENS %d\n", ntokens);
+      obstack_fgrow1 (&table_obstack, "#define YYNNTS %d\n", nvars);
+      obstack_fgrow1 (&table_obstack, "#define YYNRULES %d\n", nrules);
+      obstack_fgrow1 (&table_obstack, "#define YYNSTATES %d\n", nstates);
+      obstack_fgrow1 (&table_obstack, "#define YYMAXUTOK %d\n\n",
+		      max_user_token_number);
     }
 
-  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++)
+  if (!token_table_flag && !no_parser_flag)
+    obstack_sgrow (&table_obstack,
+			 "\n#if (YYDEBUG) || defined YYERROR_VERBOSE\n\n");
+  obstack_sgrow (&table_obstack, "\
+/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */\n");
+  obstack_sgrow (&table_obstack,
+	   "static const char *const yytname[] =\n{\n  ");
+
+  j = 0;
+  for (i = 0; i < nsyms; i++)
     /* this used to be i<=nsyms, but that output a final "" symbol
        almost by accident */
     {
+      /* Width of the next token, including the two quotes, the coma
+	 and the space.  */
+      int strsize = 4;
       char *p;
-      putc (',', ftable);
-      j++;
 
-      if (j > 75)
+      for (p = tags[i]; p && *p; p++)
+	if (*p == '"' || *p == '\\' || *p == '\n' || *p == '\t'
+	    || *p == '\b')
+	  strsize += 2;
+	else if (*p < 040 || *p >= 0177)
+	  strsize += 4;
+	else
+	  strsize++;
+
+      if (j + strsize > 75)
 	{
-	  putc ('\n', ftable);
-	  j = 0;
+	  obstack_sgrow (&table_obstack, "\n  ");
+	  j = 2;
 	}
 
-      putc ('\"', ftable);
-      j++;
-
+      obstack_1grow (&table_obstack, '\"');
       for (p = tags[i]; p && *p; p++)
 	{
 	  if (*p == '"' || *p == '\\')
-	    {
-	      fprintf (ftable, "\\%c", *p);
-	      j += 2;
-	    }
+	    obstack_fgrow1 (&table_obstack, "\\%c", *p);
 	  else if (*p == '\n')
-	    {
-	      fprintf (ftable, "\\n");
-	      j += 2;
-	    }
+	    obstack_sgrow (&table_obstack, "\\n");
 	  else if (*p == '\t')
-	    {
-	      fprintf (ftable, "\\t");
-	      j += 2;
-	    }
+	    obstack_sgrow (&table_obstack, "\\t");
 	  else if (*p == '\b')
-	    {
-	      fprintf (ftable, "\\b");
-	      j += 2;
-	    }
+	    obstack_sgrow (&table_obstack, "\\b");
 	  else if (*p < 040 || *p >= 0177)
-	    {
-	      fprintf (ftable, "\\%03o", *p);
-	      j += 4;
-	    }
+	    obstack_fgrow1 (&table_obstack, "\\%03o", *p);
 	  else
-	    {
-	      putc (*p, ftable);
-	      j++;
-	    }
+	    obstack_1grow (&table_obstack, *p);
 	}
 
-      putc ('\"', ftable);
-      j++;
+      obstack_sgrow (&table_obstack, "\", ");
+      j += strsize;
     }
   /* add a NULL entry to list of tokens */
-  fprintf (ftable, ", NULL\n};\n");
+  obstack_sgrow (&table_obstack, "NULL\n};\n");
 
-  if (!toknumflag && !noparserflag)
-    fprintf (ftable, "#endif\n\n");
+  if (!token_table_flag && !no_parser_flag)
+    obstack_sgrow (&table_obstack, "#endif\n\n");
 
   /* Output YYTOKNUM. */
-  if (toknumflag)
+  if (token_table_flag)
     {
-      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");
+      output_short_table (&table_obstack,
+		  "YYTOKNUM[YYLEX] -- Index in YYTNAME corresponding to YYLEX",
+			  "yytoknum", user_toknums,
+			  0, 1, ntokens + 1);
     }
 
   /* Output YYR1. */
-  fputs ("\
-/* YYR1[YYN]: Symbol number of symbol that rule YYN derives. */\n\
-static const short yyr1[] = {     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", rlhs[i]);
-    }
-  FREE (rlhs + 1);
-  fputs ("\n\
-};\n\
-\n", ftable);
+  {
+    short *values = XCALLOC (short, nrules + 1);
+    for (i = 0; i < nrules + 1; ++i)
+      values[i] = rule_table[i].lhs;
+    output_short_table (&table_obstack,
+	      "YYR1[YYN] -- Symbol number of symbol that rule YYN derives",
+			"yyr1", values,
+			0, 1, nrules + 1);
+    XFREE (values);
+  }
+
+  obstack_1grow (&table_obstack, '\n');
 
   /* Output YYR2. */
-  fputs ("\
-/* YYR2[YYN]: Number of symbols composing right hand side of rule YYN. */\n\
-static const short yyr2[] = {     0", ftable);
-  j = 10;
+  short_tab = XMALLOC (short, nrules + 1);
   for (i = 1; i < nrules; i++)
-    {
-      putc (',', ftable);
+    short_tab[i] = rule_table[i + 1].rhs - rule_table[i].rhs - 1;
+  short_tab[nrules] = nitems - rule_table[nrules].rhs - 1;
+  output_short_table (&table_obstack,
+        "YYR2[YYN] -- Number of symbols composing right hand side of rule YYN",
+		      "yyr2", short_tab,
+		      0, 1, nrules + 1);
+  obstack_1grow (&table_obstack, '\n');
 
-      if (j >= 10)
-	{
-	  putc ('\n', ftable);
-	  j = 1;
-	}
-      else
-	{
-	  j++;
-	}
+  XFREE (short_tab);
 
-      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);
+  XFREE (rule_table + 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);
+  obstack_fgrow1 (&table_obstack, "\n\n#define\tYYFINAL\t\t%d\n", final_state);
+  obstack_fgrow1 (&table_obstack, "#define\tYYFLAG\t\t%d\n", MINSHORT);
+  obstack_fgrow1 (&table_obstack, "#define\tYYNTBASE\t%d\n", ntokens);
 }
 
 
@@ -583,15 +528,11 @@ action_row (int state)
   int k;
   int m = 0;
   int n = 0;
-  int count;
   int default_rule;
   int nreds;
-  int max;
   int rule;
   int shift_state;
   int symbol;
-  unsigned mask;
-  unsigned *wordp;
   reductions *redp;
   shifts *shiftp;
   errs *errp;
@@ -602,7 +543,7 @@ action_row (int state)
 
   default_rule = 0;
   nreds = 0;
-  redp = reduction_table[state];
+  redp = state_table[state].reductions;
 
   if (redp)
     {
@@ -612,69 +553,46 @@ action_row (int state)
 	{
 	  /* loop over all the rules available here which require
 	     lookahead */
-	  m = lookaheads[state];
-	  n = lookaheads[state + 1];
+	  m = state_table[state].lookaheads;
+	  n = state_table[state + 1].lookaheads;
 
 	  for (i = n - 1; i >= m; i--)
-	    {
-	      rule = -LAruleno[i];
-	      wordp = LA + i * tokensetsize;
-	      mask = 1;
-
-	      /* and find each token which the rule finds acceptable
-	         to come next */
-	      for (j = 0; j < ntokens; j++)
-		{
-		  /* and record this rule as the rule to use if that
-		     token follows.  */
-		  if (mask & *wordp)
-		    actrow[j] = rule;
-
-		  mask <<= 1;
-		  if (mask == 0)
-		    {
-		      mask = 1;
-		      wordp++;
-		    }
-		}
-	    }
+	    /* and find each token which the rule finds acceptable
+	       to come next */
+	    for (j = 0; j < ntokens; j++)
+	      /* and record this rule as the rule to use if that
+		 token follows.  */
+	      if (BITISSET (LA (i), j))
+		actrow[j] = -LAruleno[i];
 	}
     }
 
-  shiftp = shift_table[state];
-
   /* Now see which tokens are allowed for shifts in this state.  For
      them, record the shift as the thing to do.  So shift is preferred
      to reduce.  */
-
-  if (shiftp)
+  shiftp = state_table[state].shifts;
+  for (i = 0; i < shiftp->nshifts; i++)
     {
-      k = shiftp->nshifts;
+      shift_state = shiftp->shifts[i];
+      if (!shift_state)
+	continue;
 
-      for (i = 0; i < k; i++)
-	{
-	  shift_state = shiftp->shifts[i];
-	  if (!shift_state)
-	    continue;
+      symbol = state_table[shift_state].accessing_symbol;
 
-	  symbol = accessing_symbol[shift_state];
-
-	  if (ISVAR (symbol))
-	    break;
+      if (ISVAR (symbol))
+	break;
 
-	  actrow[symbol] = shift_state;
+      actrow[symbol] = shift_state;
 
-	  /* Do not use any default reduction if there is a shift for
-	     error */
-	  if (symbol == error_token_number)
-	    nodefault = 1;
-	}
+      /* Do not use any default reduction if there is a shift for
+	 error */
+      if (symbol == error_token_number)
+	nodefault = 1;
     }
 
-  errp = err_table[state];
-
   /* See which tokens are an explicit error in this state (due to
      %nonassoc).  For them, record MINSHORT as the action.  */
+  errp = state_table[state].errs;
 
   if (errp)
     {
@@ -692,14 +610,14 @@ action_row (int state)
 
   if (nreds >= 1 && !nodefault)
     {
-      if (consistent[state])
+      if (state_table[state].consistent)
 	default_rule = redp->rules[0];
       else
 	{
-	  max = 0;
+	  int max = 0;
 	  for (i = m; i < n; i++)
 	    {
-	      count = 0;
+	      int count = 0;
 	      rule = -LAruleno[i];
 
 	      for (j = 0; j < ntokens; j++)
@@ -764,8 +682,8 @@ save_row (int state)
   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++)
     {
@@ -785,96 +703,50 @@ save_row (int state)
 | 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.                                       |
+| The YYDEFACT table is output now.  The detailed info is saved for |
+| putting into YYTABLE later.                                       |
 `------------------------------------------------------------------*/
 
 static void
 token_actions (void)
 {
   int i;
-  int j;
-  int k;
-
-  actrow = NEW2 (ntokens, short);
-
-  k = action_row (0);
-  fprintf (ftable, "\nstatic const short yydefact[] = {%6d", k);
-  save_row (0);
+  short *yydefact = XCALLOC (short, nstates);
 
-  j = 10;
-  for (i = 1; i < nstates; i++)
+  actrow = XCALLOC (short, ntokens);
+  for (i = 0; i < nstates; ++i)
     {
-      putc (',', ftable);
-
-      if (j >= 10)
-	{
-	  putc ('\n', ftable);
-	  j = 1;
-	}
-      else
-	{
-	  j++;
-	}
-
-      k = action_row (i);
-      fprintf (ftable, "%6d", k);
+      yydefact[i] = action_row (i);
       save_row (i);
     }
-
-  fprintf (ftable, "\n};\n");
-  FREE (actrow);
-}
-
-
-static void
-free_shifts (void)
-{
-  shifts *sp, *sptmp;	/* JF derefrenced freed ptr */
-
-  FREE (shift_table);
-
-  for (sp = first_shift; sp; sp = sptmp)
-    {
-      sptmp = sp->next;
-      FREE (sp);
-    }
+  XFREE (actrow);
+
+  output_short_table (&table_obstack,
+  "YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE\n\
+   doesn't specify something else to do.  Zero means the default is an\n\
+   error",
+		      "yydefact", yydefact,
+		      yydefact[0], 1, nstates);
+  obstack_1grow (&table_obstack, '\n');
+  XFREE (yydefact);
 }
 
 
-static void
-free_reductions (void)
-{
-  reductions *rp, *rptmp;	/* JF fixed freed ptr */
-
-  FREE (reduction_table);
-
-  for (rp = first_reduction; rp; rp = rptmp)
-    {
-      rptmp = rp->next;
-      FREE (rp);
-    }
-}
-
-
-
 static void
 save_column (int symbol, int default_state)
 {
   int i;
-  int m;
-  int n;
   short *sp;
   short *sp1;
   short *sp2;
   int count;
   int symno;
 
-  m = goto_map[symbol];
-  n = goto_map[symbol + 1];
+  short begin = goto_map[symbol];
+  short end = goto_map[symbol + 1];
 
   count = 0;
-  for (i = m; i < n; i++)
+  for (i = begin; i < end; i++)
     {
       if (to_state[i] != default_state)
 	count++;
@@ -885,10 +757,10 @@ save_column (int symbol, int default_state)
 
   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++)
+  for (i = begin; i < end; i++)
     {
       if (to_state[i] != default_state)
 	{
@@ -950,36 +822,23 @@ default_goto (int symbol)
 static void
 goto_actions (void)
 {
-  int i, j, k;
-
-  state_count = NEW2 (nstates, short);
+  int i;
 
-  k = default_goto (ntokens);
-  fprintf (ftable, "\nstatic const short yydefgoto[] = {%6d", k);
-  save_column (ntokens, k);
+  short *yydefgoto = XMALLOC (short, nsyms - ntokens);
+  state_count = XCALLOC (short, nstates);
 
-  j = 10;
-  for (i = ntokens + 1; i < nsyms; i++)
+  for (i = ntokens; i < nsyms; ++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);
+      int default_state = default_goto (i);
+      save_column (i, default_state);
+      yydefgoto[i - ntokens] = default_state;
     }
 
-  fprintf (ftable, "\n};\n");
-  FREE (state_count);
+  output_short_table (&table_obstack, NULL, "yydefgoto", yydefgoto,
+		      yydefgoto[0], 1, nsyms - ntokens);
+
+  XFREE (state_count);
+  XFREE (yydefgoto);
 }
 
 
@@ -995,7 +854,7 @@ sort_actions (void)
   int t;
   int w;
 
-  order = NEW2 (nvectors, short);
+  order = XCALLOC (short, nvectors);
   nentries = 0;
 
   for (i = 0; i < nvectors; i++)
@@ -1076,8 +935,7 @@ pack_vector (int vector)
   i = order[vector];
   t = tally[i];
 
-  if (t == 0)
-    berror ("pack_vector");
+  assert (t);
 
   from = froms[i];
   to = tos[i];
@@ -1120,9 +978,9 @@ pack_vector (int vector)
 	  return j;
 	}
     }
-
-  berror ("pack_vector");
-  return 0;			/* JF keep lint happy */
+#define pack_vector_succeeded 0
+  assert (pack_vector_succeeded);
+  return 0;
 }
 
 
@@ -1133,10 +991,10 @@ pack_table (void)
   int place;
   int state;
 
-  base = NEW2 (nvectors, short);
-  pos = NEW2 (nentries, short);
-  table = NEW2 (MAXTABLE, short);
-  check = NEW2 (MAXTABLE, short);
+  base = XCALLOC (short, nvectors);
+  pos = XCALLOC (short, nentries);
+  table = XCALLOC (short, MAXTABLE);
+  check = XCALLOC (short, MAXTABLE);
 
   lowzero = 0;
   high = 0;
@@ -1163,14 +1021,14 @@ pack_table (void)
   for (i = 0; i < nvectors; i++)
     {
       if (froms[i])
-	FREE (froms[i]);
+	XFREE (froms[i]);
       if (tos[i])
-	FREE (tos[i]);
+	XFREE (tos[i]);
     }
 
-  FREE (froms);
-  FREE (tos);
-  FREE (pos);
+  XFREE (froms);
+  XFREE (tos);
+  XFREE (pos);
 }
 
 /* the following functions output yytable, yycheck
@@ -1179,115 +1037,34 @@ pack_table (void)
 static void
 output_base (void)
 {
-  int i;
-  int j;
+  output_short_table (&table_obstack, NULL, "yypact", base,
+		      base[0], 1, nstates);
 
-  fprintf (ftable, "\nstatic const short yypact[] = {%6d", base[0]);
+  obstack_1grow (&table_obstack, '\n');
 
-  j = 10;
-  for (i = 1; i < nstates; i++)
-    {
-      putc (',', ftable);
+  output_short_table (&table_obstack, NULL, "yypgoto", base,
+		      base[nstates], nstates + 1, nvectors);
 
-      if (j >= 10)
-	{
-	  putc ('\n', ftable);
-	  j = 1;
-	}
-      else
-	{
-	  j++;
-	}
-
-      fprintf (ftable, "%6d", base[i]);
-    }
-
-  fprintf (ftable, "\n};\n\nstatic const short yypgoto[] = {%6d",
-	   base[nstates]);
-
-  j = 10;
-  for (i = nstates + 1; i < nvectors; i++)
-    {
-      putc (',', ftable);
-
-      if (j >= 10)
-	{
-	  putc ('\n', ftable);
-	  j = 1;
-	}
-      else
-	{
-	  j++;
-	}
-
-      fprintf (ftable, "%6d", base[i]);
-    }
-
-  fprintf (ftable, "\n};\n");
-  FREE (base);
+  XFREE (base);
 }
 
 
 static void
 output_table (void)
 {
-  int i;
-  int j;
-
-  fprintf (ftable, "\n\n#define\tYYLAST\t\t%d\n\n", high);
-  fprintf (ftable, "\nstatic const short yytable[] = {%6d", table[0]);
-
-  j = 10;
-  for (i = 1; i <= high; i++)
-    {
-      putc (',', ftable);
-
-      if (j >= 10)
-	{
-	  putc ('\n', ftable);
-	  j = 1;
-	}
-      else
-	{
-	  j++;
-	}
-
-      fprintf (ftable, "%6d", table[i]);
-    }
-
-  fprintf (ftable, "\n};\n");
-  FREE (table);
+  obstack_fgrow1 (&table_obstack, "\n\n#define\tYYLAST\t\t%d\n\n\n", high);
+  output_short_table (&table_obstack, NULL, "yytable", table,
+		      table[0], 1, high + 1);
+  XFREE (table);
 }
 
 
 static void
 output_check (void)
 {
-  int i;
-  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 (&table_obstack, NULL, "yycheck", check,
+		      check[0], 1, high + 1);
+  XFREE (check);
 }
 
 /* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable
@@ -1298,111 +1075,166 @@ output_actions (void)
 {
   nvectors = nstates + nvars;
 
-  froms = NEW2 (nvectors, short *);
-  tos = NEW2 (nvectors, short *);
-  tally = NEW2 (nvectors, short);
-  width = NEW2 (nvectors, short);
+  froms = XCALLOC (short *, nvectors);
+  tos = XCALLOC (short *, nvectors);
+  tally = XCALLOC (short, nvectors);
+  width = XCALLOC (short, nvectors);
 
   token_actions ();
-  free_shifts ();
-  free_reductions ();
-  FREE (lookaheads);
-  FREE (LA);
-  FREE (LAruleno);
-  FREE (accessing_symbol);
+  LIST_FREE (shifts, first_shift);
+  LIST_FREE (reductions, first_reduction);
+  XFREE (LA);
+  XFREE (LAruleno);
 
   goto_actions ();
-  FREE (goto_map + ntokens);
-  FREE (from_state);
-  FREE (to_state);
+  XFREE (goto_map + ntokens);
+  XFREE (from_state);
+  XFREE (to_state);
 
   sort_actions ();
   pack_table ();
+  obstack_1grow (&table_obstack, '\n');
   output_base ();
   output_table ();
+  obstack_1grow (&table_obstack, '\n');
   output_check ();
 }
 
-/* copy the parser code into the ftable file at the end.  */
+/*------------------------------------------.
+| Copy the parser code into TABLE_OBSTACK.  |
+`------------------------------------------*/
 
 static void
 output_parser (void)
 {
   int c;
-#ifdef DONTDEF
-  FILE *fpars;
-#else
-#define fpars fparser
-#endif
+  FILE *fskel;
+  size_t line;
+  int actions_dumped = 0;
 
   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
+    obstack_sgrow (&table_obstack, "#define YYPURE 1\n\n");
 
   /* Loop over lines in the standard parser file.  */
+  if (!skeleton)
+    {
+      if (semantic_parser)
+	skeleton = skeleton_find ("BISON_HAIRY", BISON_HAIRY);
+      else
+	skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);
+    }
+  assert (skeleton);
+  fskel = xfopen (skeleton, "r");
+
+  /* Set LINE to 2, not 1: `#line LINENUM' -- Here LINENUM is a
+     decimal integer constant.  This specifies that the line number of
+     the *following* line of input, in its original source file, was
+     LINENUM.  */
+  line = 2;
 
   while (1)
     {
-      int write_line = 1;
+      enum line_type_e
+	{
+	  regular_line,
+	  sync_line,	/* #line. */
+	  actions_line	/* %% actions. */
+	};
+      enum line_type_e line_type = regular_line;
 
-      c = getc (fpars);
+      c = getc (fskel);
 
-      /* 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;
+      /* Is this line special? */
+      if (c == '#')
+	{
+	  /* See if it's a `#line' line. */
+	  if ((c = getc (fskel)) == 'l')
+	    if ((c = getc (fskel)) == 'i')
+	      if ((c = getc (fskel)) == 'n')
+		if ((c = getc (fskel)) == 'e')
+		  line_type = sync_line;
+		else
+		  obstack_sgrow (&table_obstack, "#lin");
+	      else
+		obstack_sgrow (&table_obstack, "#li");
+	    else
+	      obstack_sgrow (&table_obstack, "#l");
+	  else
+	    obstack_sgrow (&table_obstack, "#");
+	}
+      else if (c == '%')
+	{
+	  /* See if it's a `%% actions' line. */
+	  if ((c = getc (fskel)) == '%')
+	    if ((c = getc (fskel)) == ' ')
+	      if ((c = getc (fskel)) == 'a')
+		if ((c = getc (fskel)) == 'c')
+		  if ((c = getc (fskel)) == 't')
+		    if ((c = getc (fskel)) == 'i')
+		      if ((c = getc (fskel)) == 'o')
+			if ((c = getc (fskel)) == 'n')
+			  if ((c = getc (fskel)) == 's')
+			    line_type = actions_line;
+			  else
+			    obstack_sgrow (&table_obstack, "%% action");
 			else
-			  fprintf (ftable, "#lin");
-		      }
+			  obstack_sgrow (&table_obstack, "%% actio");
+		      else
+			obstack_sgrow (&table_obstack, "%% acti");
 		    else
-		      fprintf (ftable, "#li");
-		  }
+		      obstack_sgrow (&table_obstack, "%% act");
+		  else
+		    obstack_sgrow (&table_obstack, "%% ac");
 		else
-		  fprintf (ftable, "#l");
-	      }
+		  obstack_sgrow (&table_obstack, "%% a");
+	      else
+		obstack_sgrow (&table_obstack, "%% ");
 	    else
-	      fprintf (ftable, "#");
-	  }
+	      obstack_sgrow (&table_obstack, "%%");
+	  else
+	    obstack_sgrow (&table_obstack, "%");
+	}
+
+      switch (line_type)
+	{
+	case sync_line:
+	  if (!no_lines_flag)
+	    obstack_fgrow2 (&table_obstack, "#line %d %s\n",
+			    line, quotearg_style (c_quoting_style, skeleton));
+
+	  /* Skip the end of line. */
+	  for (; c != '\n' && c != EOF; c = getc (fskel))
+	    /* nothing */;
+	  break;
 
-      /* now write out the line... */
-      for (; c != '\n' && c != EOF; c = getc (fpars))
-	if (write_line)
+	case actions_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);
+	    size_t size = obstack_object_size (&action_obstack);
+
+	    actions_dumped++;
+	    assert (actions_dumped == 1);
+	    obstack_grow (&table_obstack,
+			  obstack_finish (&action_obstack),
+			  size);
 	  }
+
+	  /* Skip the end of line. */
+	  for (; c != '\n' && c != EOF; c = getc (fskel))
+	    /* nothing */;
+	  break;
+
+	case regular_line:
+	  for (; c != '\n' && c != EOF; c = getc (fskel))
+	    obstack_1grow (&table_obstack, c);
+	}
+
       if (c == EOF)
 	break;
-      putc (c, ftable);
+      obstack_1grow (&table_obstack, c);
+      line++;
     }
+  assert (actions_dumped == 1);
+  xfclose (fskel);
 }
 
 static void
@@ -1410,30 +1242,12 @@ output_program (void)
 {
   int c;
 
-  if (!nolinesflag)
-    fprintf (ftable, "#line %d \"%s\"\n", lineno, infile);
+  if (!no_lines_flag)
+    obstack_fgrow2 (&table_obstack, "#line %d %s\n",
+		    lineno, quotearg_style (c_quoting_style, infile));
 
-  c = getc (finput);
-  while (c != EOF)
-    {
-      putc (c, ftable);
-      c = getc (finput);
-    }
-}
-
-
-static void
-free_itemsets (void)
-{
-  core *cp, *cptmp;
-
-  FREE (state_table);
-
-  for (cp = first_state; cp; cp = cptmp)
-    {
-      cptmp = cp->next;
-      FREE (cp);
-    }
+  while ((c = getc (finput)) != EOF)
+    obstack_1grow (&table_obstack, c);
 }
 
 
@@ -1444,52 +1258,40 @@ free_itemsets (void)
 void
 output (void)
 {
-  int c;
-
   /* output_token_defines(ftable);      / * JF put out token defines FIRST */
-  if (!semantic_parser)		/* JF Put out other stuff */
+
+  /* If using a simple parser the definition of YYSTYPE are put into
+     TABLE_OBSTACK.  */
+  if (!semantic_parser)
     {
-      rewind (fattrs);
-      while ((c = getc (fattrs)) != EOF)
-	putc (c, ftable);
+      size_t size = obstack_object_size (&attrs_obstack);
+      obstack_grow (&table_obstack, obstack_finish (&attrs_obstack), size);
     }
-  reader_output_yylsp (ftable);
-  if (debugflag)
-    fputs ("\
+  reader_output_yylsp (&table_obstack);
+  obstack_fgrow1 (&table_obstack, "\
 #ifndef YYDEBUG\n\
-#define YYDEBUG 1\n\
+# define YYDEBUG %d\n\
 #endif\n\
-\n",
-	   ftable);
+\n", debug_flag);
 
   if (semantic_parser)
-    fprintf (ftable, "#include \"%s\"\n", attrsfile);
+    obstack_fgrow1 (&table_obstack, "#include %s\n",
+		    quotearg_style (c_quoting_style, attrsfile));
 
-  if (!noparserflag)
-    fprintf (ftable, "#include <stdio.h>\n\n");
-
-  /* Make "const" do nothing if not in ANSI C.  */
-  fputs ("\
-#ifndef __cplusplus\n\
-# ifndef __STDC__\n\
-#  define const\n\
-# endif\n\
-#endif\n\
-\n",
-	 ftable);
-
-  free_itemsets ();
+  LIST_FREE (core, first_state);
   output_defines ();
   output_token_translations ();
 /*   if (semantic_parser) */
   /* This is now unconditional because debugging printouts can use it.  */
   output_gram ();
-  FREE (ritem);
+  XFREE (ritem);
   if (semantic_parser)
     output_stos ();
   output_rule_data ();
   output_actions ();
-  if (!noparserflag)
+  XFREE (state_table);
+
+  if (!no_parser_flag)
     output_parser ();
   output_program ();
 }