X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a70083a3ed3fc3f69e0bed00220614f9d8263994..ef7ddeddaaafb6b648ff04c8126cc94f8ea458b6:/src/output.c

diff --git a/src/output.c b/src/output.c
index 20b33618..adef0433 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,5 +1,5 @@
 /* Output the generated parsing program for bison,
-   Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -91,22 +91,21 @@
 */
 
 #include "system.h"
+#include "obstack.h"
+#include "quotearg.h"
 #include "getargs.h"
-#include "alloc.h"
+#include "xalloc.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 void berror PARAMS((const char *));
 
-extern char **tags;
-extern short *user_toknums;
-extern int final_state;
-extern errs **err_table;
 
 
 static int nvectors;
@@ -128,24 +127,30 @@ static int high;
 
 
 static inline void
-output_short_table (FILE *out,
-		    const char *table_name,
-		    short *short_table,
-		    short first_value,
-		    short begin, short end)
+output_short_or_char_table (struct obstack *oout,
+			    const char *comment,
+			    const char *type,
+			    const char *table_name,
+			    short *short_table,
+			    short first_value,
+			    short begin, short end)
 {
   int i, j;
 
-  fprintf (out, "static const short %s[] = {%6d", table_name, first_value);
+  if (comment)
+    obstack_fgrow1 (oout, "/* %s. */\n", comment);
 
-  j = 10;
+  obstack_fgrow3 (oout, "static const %s %s[] =\n{\n  %6d",
+		  type, table_name, first_value);
+
+  j = 1;
   for (i = begin; i < end; i++)
     {
-      putc (',', out);
+      obstack_1grow (oout, ',');
 
       if (j >= 10)
 	{
-	  putc ('\n', out);
+	  obstack_grow_literal_string (oout, "\n  ");
 	  j = 1;
 	}
       else
@@ -153,10 +158,23 @@ output_short_table (FILE *out,
 	  j++;
 	}
 
-      fprintf (out, "%6d", short_table[i]);
+      obstack_fgrow1 (oout, "%6d", short_table[i]);
     }
 
-  fprintf (out, "\n};\n");
+  obstack_grow_literal_string (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,
+		    short begin, short end)
+{
+  output_short_or_char_table (oout, comment, "short", table_name, short_table,
+			      first_value, begin, end);
 }
 
 
@@ -165,9 +183,11 @@ output_short_table (FILE *out,
 | 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\
@@ -186,7 +206,7 @@ register YYLTYPE *yylsp;\n\
 
 #define	ACTSTR		\
 "\n\
-#include \"%s\"\n\
+#include %s\n\
 extern YYSTYPE yyval;\n\
 extern int yychar;\n\
 \n\
@@ -203,13 +223,19 @@ register YYLTYPE *yylsp;\n\
 void
 output_headers (void)
 {
+  char *attrsfile_quoted = quotearg_style (c_quoting_style, attrsfile);
+
   if (semantic_parser)
-    fprintf (fguard, GUARDSTR, attrsfile);
+    fprintf (fguard, GUARDSTR, attrsfile_quoted);
 
-  if (noparserflag)
+  if (no_parser_flag)
     return;
 
-  fprintf (faction, (semantic_parser ? ACTSTR : ACTSTR_SIMPLE), attrsfile);
+  if (semantic_parser)
+    obstack_fgrow1 (&action_obstack, ACTSTR, attrsfile_quoted);
+  else
+    obstack_grow_literal_string (&action_obstack, ACTSTR_SIMPLE);
+
 /*  if (semantic_parser)	JF moved this below
     fprintf(ftable, "#include \"%s\"\n", attrsfile);
   fprintf(ftable, "#include <stdio.h>\n\n");
@@ -218,13 +244,20 @@ output_headers (void)
   /* 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);
     }
 }
 
@@ -239,14 +272,15 @@ output_trailers (void)
   if (semantic_parser)
     fprintf (fguard, "\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_grow_literal_string (&action_obstack, "    }\n");
+
+  obstack_grow_literal_string (&action_obstack, "}\n");
 }
 
 
@@ -254,43 +288,28 @@ output_trailers (void)
 static void
 output_token_translations (void)
 {
-  int i, j;
-/*   short *sp; JF unused */
+  obstack_grow_literal_string (&table_obstack, "\
+\n\
+/* YYRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */\n");
 
   if (translations)
     {
-      fprintf (ftable,
-	       "\n#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\n",
+      obstack_fgrow2 (&table_obstack,
+      "#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\
+\n\
+\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");
+      output_short_or_char_table (&table_obstack,
+	     "YYRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX",
+		    ntokens < 127 ? "char" : "short",
+		    "yytranslate", token_translations,
+		    0, 1, max_user_token_number + 1);
     }
   else
     {
-      fprintf (ftable, "\n#define YYTRANSLATE(x) (x)\n");
+      obstack_grow_literal_string (&table_obstack,
+				   "\n#define YYTRANSLATE(x) (x)\n");
     }
 }
 
@@ -298,52 +317,41 @@ output_token_translations (void)
 static void
 output_gram (void)
 {
-  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\n");
+  /* With the no_parser option, all tables are generated */
+  if (!semantic_parser && !no_parser_flag)
+    obstack_grow_literal_string (&table_obstack, "\n#if YYDEBUG != 0\n");
 
-  output_short_table (ftable, "yyprhs", rrhs,
+  output_short_table (&table_obstack, NULL, "yyprhs", rrhs,
 		      0, 1, nrules + 1);
 
-  fprintf (ftable, "\nstatic const short yyrhs[] = {%6d", ritem[0]);
+  {
+    size_t yyrhs_size = 1;
+    short *yyrhs, *sp;
+    int i;
 
-  j = 10;
-  for (sp = ritem + 1; *sp; sp++)
-    {
-      putc (',', ftable);
+    for (sp = ritem + 1; *sp; sp++)
+      ++yyrhs_size;
+    yyrhs = XMALLOC (short, yyrhs_size);
 
-      if (j >= 10)
-	{
-	  putc ('\n', ftable);
-	  j = 1;
-	}
-      else
-	{
-	  j++;
-	}
+    for (sp = ritem + 1, i = 1; *sp; ++sp, ++i)
+      yyrhs[i] = *sp > 0 ? *sp : 0;
 
-      if (*sp > 0)
-	fprintf (ftable, "%6d", *sp);
-      else
-	fprintf (ftable, "     0");
-    }
-
-  fprintf (ftable, "\n};\n");
+    output_short_table (&table_obstack, NULL, "yyrhs", yyrhs,
+			ritem[0], 1, yyrhs_size);
+    XFREE (yyrhs);
+  }
 
-  if (!semantic_parser && !noparserflag)
-    fprintf (ftable, "\n#endif\n");
+  if (!semantic_parser && !no_parser_flag)
+    obstack_grow_literal_string (&table_obstack, "\n#endif\n");
 }
 
 
 static void
 output_stos (void)
 {
-  output_short_table (ftable, "yystos", accessing_symbol,
+  output_short_table (&table_obstack, NULL, "yystos", accessing_symbol,
 		      0, 1, nstates);
 }
 
@@ -353,149 +361,141 @@ 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",
-	 ftable);
+  obstack_grow_literal_string (&table_obstack, "\n\
+#if YYDEBUG != 0\n");
 
-  output_short_table (ftable, "yyrline", rline,
+  output_short_table (&table_obstack,
+           "YYRLINE[YYN] -- source line where rule number YYN was defined",
+		      "yyrline", rline,
 		      0, 1, nrules + 1);
 
-  fputs ("#endif\n\n", ftable);
+  obstack_grow_literal_string (&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_grow_literal_string (&table_obstack,
+			  "\n#if YYDEBUG != 0 || defined YYERROR_VERBOSE\n\n");
+  obstack_grow_literal_string (&table_obstack, "\
+/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */\n");
+  obstack_grow_literal_string (&table_obstack,
+	   "static const char *const yytname[] =\n{\n  ");
+
+  j = 0;
+  for (i = 0; i < nsyms; i++)
     /* this used to be i<=nsyms, but that output a final "" symbol
        almost by accident */
     {
+      /* Width of the next token, including the two quotes, the coma
+	 and the space.  */
+      int strsize = 4;
       char *p;
-      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_grow_literal_string (&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_grow_literal_string (&table_obstack, "\\n");
 	    }
 	  else if (*p == '\t')
 	    {
-	      fprintf (ftable, "\\t");
-	      j += 2;
+	      obstack_grow_literal_string (&table_obstack, "\\t");
 	    }
 	  else if (*p == '\b')
 	    {
-	      fprintf (ftable, "\\b");
-	      j += 2;
+	      obstack_grow_literal_string (&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_grow_literal_string (&table_obstack, "\", ");
+      j += strsize;
     }
   /* add a NULL entry to list of tokens */
-  fprintf (ftable, ", NULL\n};\n");
+  obstack_grow_literal_string (&table_obstack, "NULL\n};\n");
 
-  if (!toknumflag && !noparserflag)
-    fprintf (ftable, "#endif\n\n");
+  if (!token_table_flag && !no_parser_flag)
+    obstack_grow_literal_string (&table_obstack, "#endif\n\n");
 
   /* Output YYTOKNUM. */
-  if (toknumflag)
+  if (token_table_flag)
     {
-      output_short_table (ftable, "yytoknum", user_toknums,
+      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", ftable);
-
-  output_short_table (ftable, "yyr1", rlhs,
+  output_short_table (&table_obstack,
+	      "YYR1[YYN] -- Symbol number of symbol that rule YYN derives",
+		      "yyr1", rlhs,
 		      0, 1, nrules + 1);
-  FREE (rlhs + 1);
+  XFREE (rlhs + 1);
 
-  putc ('\n', ftable);
+  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);
-
-      if (j >= 10)
-	{
-	  putc ('\n', ftable);
-	  j = 1;
-	}
-      else
-	{
-	  j++;
-	}
-
-      fprintf (ftable, "%6d", rrhs[i + 1] - rrhs[i] - 1);
-    }
+    short_tab[i] = rrhs[i + 1] - rrhs[i] - 1;
+  short_tab[nrules] = nitems - rrhs[nrules] - 1;
+  output_short_table (&table_obstack,
+        "YYR2[YYN] -- Number of symbols composing right hand side of rule YYN",
+		      "yyr2", short_tab,
+		      0, 1, nrules + 1);
+  obstack_1grow (&table_obstack, '\n');
 
-  putc (',', ftable);
-  if (j >= 10)
-    putc ('\n', ftable);
+  XFREE (short_tab);
 
-  fprintf (ftable, "%6d\n};\n", nitems - rrhs[nrules] - 1);
-  FREE (rrhs + 1);
+  XFREE (rrhs + 1);
 }
 
 
 static void
 output_defines (void)
 {
-  fprintf (ftable, "\n\n#define\tYYFINAL\t\t%d\n", final_state);
-  fprintf (ftable, "#define\tYYFLAG\t\t%d\n", MINSHORT);
-  fprintf (ftable, "#define\tYYNTBASE\t%d\n", ntokens);
+  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);
 }
 
 
@@ -702,8 +702,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++)
     {
@@ -731,19 +731,24 @@ static void
 token_actions (void)
 {
   int i;
-  short *yydefact = NEW2 (nstates, short);
+  short *yydefact = XCALLOC (short, nstates);
 
-  actrow = NEW2 (ntokens, short);
+  actrow = XCALLOC (short, ntokens);
   for (i = 0; i < nstates; ++i)
     {
       yydefact[i] = action_row (i);
       save_row (i);
     }
-  FREE (actrow);
+  XFREE (actrow);
 
-  output_short_table (ftable, "yydefact", yydefact,
+  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);
-  FREE (yydefact);
+  obstack_1grow (&table_obstack, '\n');
+  XFREE (yydefact);
 }
 
 
@@ -752,12 +757,12 @@ free_shifts (void)
 {
   shifts *sp, *sptmp;	/* JF derefrenced freed ptr */
 
-  FREE (shift_table);
+  XFREE (shift_table);
 
   for (sp = first_shift; sp; sp = sptmp)
     {
       sptmp = sp->next;
-      FREE (sp);
+      XFREE (sp);
     }
 }
 
@@ -767,12 +772,12 @@ free_reductions (void)
 {
   reductions *rp, *rptmp;	/* JF fixed freed ptr */
 
-  FREE (reduction_table);
+  XFREE (reduction_table);
 
   for (rp = first_reduction; rp; rp = rptmp)
     {
       rptmp = rp->next;
-      FREE (rp);
+      XFREE (rp);
     }
 }
 
@@ -782,19 +787,17 @@ 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++;
@@ -805,10 +808,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)
 	{
@@ -870,36 +873,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);
 }
 
 
@@ -915,7 +905,7 @@ sort_actions (void)
   int t;
   int w;
 
-  order = NEW2 (nvectors, short);
+  order = XCALLOC (short, nvectors);
   nentries = 0;
 
   for (i = 0; i < nvectors; i++)
@@ -996,8 +986,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];
@@ -1053,10 +1042,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;
@@ -1083,14 +1072,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
@@ -1099,34 +1088,34 @@ pack_table (void)
 static void
 output_base (void)
 {
-  output_short_table (ftable, "yypact", base,
+  output_short_table (&table_obstack, NULL, "yypact", base,
 		      base[0], 1, nstates);
 
-  putc ('\n', ftable);
+  obstack_1grow (&table_obstack, '\n');
 
-  output_short_table (ftable, "yypgoto", base,
+  output_short_table (&table_obstack, NULL, "yypgoto", base,
 		      base[nstates], nstates + 1, nvectors);
 
-  FREE (base);
+  XFREE (base);
 }
 
 
 static void
 output_table (void)
 {
-  fprintf (ftable, "\n\n#define\tYYLAST\t\t%d\n\n\n", high);
-  output_short_table (ftable, "yytable", 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);
-  FREE (table);
+  XFREE (table);
 }
 
 
 static void
 output_check (void)
 {
-  output_short_table (ftable, "yycheck", check,
+  output_short_table (&table_obstack, NULL, "yycheck", check,
 		      check[0], 1, high + 1);
-  FREE (check);
+  XFREE (check);
 }
 
 /* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable
@@ -1137,113 +1126,122 @@ 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);
+  XFREE (lookaheads);
+  XFREE (LA);
+  XFREE (LAruleno);
+  XFREE (accessing_symbol);
 
   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 ();
-  putc ('\n', ftable);
+  obstack_1grow (&table_obstack, '\n');
   output_base ();
   output_table ();
-  putc ('\n', ftable);
+  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;
+  const char *skeleton = NULL;
+  int number_of_dollar_signs = 0;
 
   if (pure_parser)
-    fprintf (ftable, "#define YYPURE 1\n\n");
+    obstack_grow_literal_string (&table_obstack, "#define YYPURE 1\n\n");
 
-#ifdef DONTDEF			/* JF no longer needed 'cuz open_extra_files changes the
-				   currently open parser from bison.simple to bison.hairy */
+  /* Loop over lines in the standard parser file.  */
   if (semantic_parser)
-    fpars = fparser;
+    skeleton = skeleton_find ("BISON_HAIRY", BISON_HAIRY);
   else
-    fpars = fparser1;
-#endif
+    skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);
+  fskel = xfopen (skeleton, "r");
 
-  /* Loop over lines in the standard parser file.  */
+  /* 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 is_sync_line = 0;
       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");
-	      }
+      c = getc (fskel);
+
+      /* See if the line starts with `#line'. */
+      if (c == '#')
+	if ((c = getc (fskel)) == 'l')
+	  if ((c = getc (fskel)) == 'i')
+	    if ((c = getc (fskel)) == 'n')
+	      if ((c = getc (fskel)) == 'e')
+		is_sync_line = 1;
+	      else
+		obstack_grow_literal_string (&table_obstack, "#lin");
 	    else
-	      fprintf (ftable, "#");
-	  }
+	      obstack_grow_literal_string (&table_obstack, "#li");
+	  else
+	    obstack_grow_literal_string (&table_obstack, "#l");
+	else
+	  obstack_grow_literal_string (&table_obstack, "#");
+
+      /* If was a `#line' line, either compute it, or drop it. */
+      if (is_sync_line && !no_lines_flag)
+	obstack_fgrow2 (&table_obstack, "#line %d %s\n",
+			line, quotearg_style (c_quoting_style, skeleton));
+
+      if (is_sync_line)
+	write_line = 0;
 
       /* now write out the line... */
-      for (; c != '\n' && c != EOF; c = getc (fpars))
+      for (; c != '\n' && c != EOF; c = getc (fskel))
 	if (write_line)
 	  {
+	    /* `$' in the parser file indicates where to put the
+	       actions.  Copy them in at this point.  */
 	    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);
+		size_t size = obstack_object_size (&action_obstack);
+
+		number_of_dollar_signs++;
+		assert (number_of_dollar_signs == 1);
+		obstack_grow (&table_obstack,
+			      obstack_finish (&action_obstack),
+			      size);
+
+		/* Skip the end of the line containing `$'. */
+		write_line = 0;
 	      }
 	    else
-	      putc (c, ftable);
+	      obstack_1grow (&table_obstack, c);
 	  }
       if (c == EOF)
 	break;
-      putc (c, ftable);
+      obstack_1grow (&table_obstack, c);
+      line++;
     }
+  assert (number_of_dollar_signs == 1);
+  xfclose (fskel);
 }
 
 static void
@@ -1251,15 +1249,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);
-    }
+  while ((c = getc (finput)) != EOF)
+    obstack_1grow (&table_obstack, c);
 }
 
 
@@ -1268,12 +1263,12 @@ free_itemsets (void)
 {
   core *cp, *cptmp;
 
-  FREE (state_table);
+  XFREE (state_table);
 
   for (cp = first_state; cp; cp = cptmp)
     {
       cptmp = cp->next;
-      FREE (cp);
+      XFREE (cp);
     }
 }
 
@@ -1285,39 +1280,38 @@ 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);
+  if (debug_flag)
+    obstack_grow_literal_string (&table_obstack, "\
 #ifndef YYDEBUG\n\
-#define YYDEBUG 1\n\
+# define YYDEBUG 1\n\
 #endif\n\
-\n",
-	   ftable);
+\n");
 
   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");
+  if (!no_parser_flag)
+    obstack_grow_literal_string (&table_obstack, "#include <stdio.h>\n\n");
 
   /* Make "const" do nothing if not in ANSI C.  */
-  fputs ("\
+  obstack_grow_literal_string (&table_obstack, "\
 #ifndef __cplusplus\n\
 # ifndef __STDC__\n\
 #  define const\n\
 # endif\n\
 #endif\n\
-\n",
-	 ftable);
+\n");
 
   free_itemsets ();
   output_defines ();
@@ -1325,12 +1319,12 @@ output (void)
 /*   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)
+  if (!no_parser_flag)
     output_parser ();
   output_program ();
 }