* src/files.c (open_files): Yipee! We no longer need all the code

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 4bb09cd77f45238365ea2d06d578eccb0eef949f..27fcae4f2aadaa68ec07c441263f972aac876b14 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,5 +1,5 @@
 /* Output the generated parsing program for bison,
 /* Output the generated parsing program for bison,

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

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


@@ -91,32 +91,22 @@
 */
 
 #include "system.h"
 */
 
 #include "system.h"

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

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

-#include "alloc.h"
+#include "xalloc.h"

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

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

 #include "complain.h"
 #include "output.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 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 int nvectors;
 static int nentries;


@@ -136,9 +126,68 @@ static int high;
 
 
 
 
 
 

+static inline void
+output_short_or_char_table (struct obstack *oout,
+                           const char *comment,
+                           const char *type,
+                           const char *table_name,
+                           short *short_table,
+                           short first_value,
+                           short begin, short end)
+{
+  int i, j;
+
+  if (comment)
+    obstack_fgrow1 (oout, "/* %s. */\n", comment);
+
+  obstack_fgrow3 (oout, "static const %s %s[] =\n{\n  %6d",
+                 type, table_name, first_value);
+
+  j = 1;
+  for (i = begin; i < end; i++)
+    {
+      obstack_1grow (oout, ',');
+
+      if (j >= 10)
+       {
+         obstack_grow_literal_string (oout, "\n  ");
+         j = 1;
+       }
+      else
+       {
+         j++;
+       }
+
+      obstack_fgrow1 (oout, "%6d", short_table[i]);
+    }
+
+  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);
+}
+
+
+/*--------------------------------------------------------------.
+| 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\
 #define        GUARDSTR        \
 "\n\

-#include \"%s\"\n\
+#include %s\n\

 extern int yyerror;\n\
 extern int yycost;\n\
 extern char * yymsg;\n\
 extern int yyerror;\n\
 extern int yycost;\n\
 extern char * yymsg;\n\


@@ -157,7 +206,7 @@ register YYLTYPE *yylsp;\n\
 
 #define        ACTSTR          \
 "\n\
 
 #define        ACTSTR          \
 "\n\

-#include \"%s\"\n\
+#include %s\n\

 extern YYSTYPE yyval;\n\
 extern int yychar;\n\
 \n\
 extern YYSTYPE yyval;\n\
 extern int yychar;\n\
 \n\


@@ -171,21 +220,22 @@ register YYLTYPE *yylsp;\n\
 
 #define        ACTSTR_SIMPLE   "\n  switch (yyn) {\n"
 
 
 #define        ACTSTR_SIMPLE   "\n  switch (yyn) {\n"
 

-
-/*------------------------------------------------------------.
-| Output constant strings to the beginning of certain files.  |
-`------------------------------------------------------------*/
-

 void
 output_headers (void)
 {
 void
 output_headers (void)
 {

+  char *attrsfile_quoted = quotearg_style (c_quoting_style, attrsfile);
+

   if (semantic_parser)
   if (semantic_parser)

-    fprintf (fguard, GUARDSTR, attrsfile);
+    fprintf (fguard, GUARDSTR, attrsfile_quoted);

 
 

-  if (noparserflag)
+  if (no_parser_flag)

     return;
 
     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");
 /*  if (semantic_parser)       JF moved this below
     fprintf(ftable, "#include \"%s\"\n", attrsfile);
   fprintf(ftable, "#include <stdio.h>\n\n");


@@ -194,13 +244,20 @@ output_headers (void)
   /* Rename certain symbols if -p was specified.  */
   if (spec_name_prefix)
     {
   /* 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);

     }
 }
 
     }
 }
 


@@ -215,14 +272,15 @@ output_trailers (void)
   if (semantic_parser)
     fprintf (fguard, "\n    }\n}\n");
 
   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)
     return;
 
   if (semantic_parser)

-    fprintf (faction, "    }\n");
-  fprintf (faction, "}\n");
+    obstack_grow_literal_string (&action_obstack, "    }\n");
+
+  obstack_grow_literal_string (&action_obstack, "}\n");

 }
 
 
 }
 
 


@@ -230,43 +288,28 @@ output_trailers (void)
 static void
 output_token_translations (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)
     {
 
   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);
 
               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
     {
     }
   else
     {

-      fprintf (ftable, "\n#define YYTRANSLATE(x) (x)\n");
+      obstack_grow_literal_string (&table_obstack,
+                                  "\n#define YYTRANSLATE(x) (x)\n");

     }
 }
 
     }
 }
 


@@ -274,95 +317,42 @@ output_token_translations (void)
 static void
 output_gram (void)
 {
 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 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");
+  /* 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");

 
 

-  fprintf (ftable, "\nstatic const short yyprhs[] = {     0");
+  output_short_table (&table_obstack, NULL, "yyprhs", rrhs,
+                     0, 1, nrules + 1);

 
 

-  j = 10;
-  for (i = 1; i <= nrules; i++)
-    {
-      putc (',', ftable);
+  {
+    size_t yyrhs_size = 1;
+    short *yyrhs, *sp;
+    int i;

 
 

-      if (j >= 10)
-       {
-         putc ('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
-
-      fprintf (ftable, "%6d", rrhs[i]);
-    }
+    for (sp = ritem + 1; *sp; sp++)
+      ++yyrhs_size;
+    yyrhs = XMALLOC (short, yyrhs_size);

 
 

-  fprintf (ftable, "\n};\n");
+    for (sp = ritem + 1, i = 1; *sp; ++sp, ++i)
+      yyrhs[i] = *sp > 0 ? *sp : 0;

 
 

-  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++;
-       }
+    output_short_table (&table_obstack, NULL, "yyrhs", yyrhs,
+                       ritem[0], 1, yyrhs_size);
+    XFREE (yyrhs);
+  }

 
 

-      if (*sp > 0)
-       fprintf (ftable, "%6d", *sp);
-      else
-       fprintf (ftable, "     0");
-    }
-
-  fprintf (ftable, "\n};\n");
-
-  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)
 {
 }
 
 
 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");
+  output_short_table (&table_obstack, NULL, "yystos", accessing_symbol,
+                     0, 1, nstates);

 }
 
 
 }
 
 


@@ -371,193 +361,141 @@ output_rule_data (void)
 {
   int i;
   int j;
 {
   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);
-
-  j = 10;
-  for (i = 1; i <= nrules; i++)
-    {
-      putc (',', ftable);
+  obstack_grow_literal_string (&table_obstack, "\n\
+#if YYDEBUG != 0\n");

 
 

-      if (j >= 10)
-       {
-         putc ('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
+  output_short_table (&table_obstack,
+           "YYRLINE[YYN] -- source line where rule number YYN was defined",
+                     "yyrline", rline,
+                     0, 1, nrules + 1);

 
 

-      fprintf (ftable, "%6d", rline[i]);
-    }
-  fprintf (ftable, "\n};\n#endif\n\n");
+  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.  */
   /* 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 */
     {
     /* 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;
       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 == '\\')
            {
       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')
            {
            }
          else if (*p == '\n')
            {

-             fprintf (ftable, "\\n");
-             j += 2;
+             obstack_grow_literal_string (&table_obstack, "\\n");

            }
          else if (*p == '\t')
            {
            }
          else if (*p == '\t')
            {

-             fprintf (ftable, "\\t");
-             j += 2;
+             obstack_grow_literal_string (&table_obstack, "\\t");

            }
          else if (*p == '\b')
            {
            }
          else if (*p == '\b')
            {

-             fprintf (ftable, "\\b");
-             j += 2;
+             obstack_grow_literal_string (&table_obstack, "\\b");

            }
          else if (*p < 040 || *p >= 0177)
            {
            }
          else if (*p < 040 || *p >= 0177)
            {

-             fprintf (ftable, "\\%03o", *p);
-             j += 4;
+             obstack_fgrow1 (&table_obstack, "\\%03o", *p);

            }
          else
            {
            }
          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 */
     }
   /* 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. */
 
   /* 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. */
     }
 
   /* 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++;
-       }
+  output_short_table (&table_obstack,
+             "YYR1[YYN] -- Symbol number of symbol that rule YYN derives",
+                     "yyr1", rlhs,
+                     0, 1, nrules + 1);
+  XFREE (rlhs + 1);

 
 

-      fprintf (ftable, "%6d", rlhs[i]);
-    }
-  FREE (rlhs + 1);
-  fputs ("\n\
-};\n\
-\n", ftable);
+  obstack_1grow (&table_obstack, '\n');

 
   /* Output YYR2. */
 
   /* 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++)
   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)
 {
 }
 
 
 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);

 }
 
 
 }
 
 


@@ -764,8 +702,8 @@ save_row (int state)
   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++)
     {


@@ -785,45 +723,32 @@ save_row (int state)
 | Figure out the actions for the specified state, indexed by        |
 | lookahead token type.                                             |
 |                                                                   |
 | 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;
 `------------------------------------------------------------------*/
 
 static void
 token_actions (void)
 {
   int i;

-  int j;
-  int k;
-
-  actrow = NEW2 (ntokens, short);
+  short *yydefact = XCALLOC (short, nstates);

 
 

-  k = action_row (0);
-  fprintf (ftable, "\nstatic const short yydefact[] = {%6d", k);
-  save_row (0);
-
-  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);
     }
       save_row (i);
     }

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

 }
 
 
 }
 
 


@@ -832,12 +757,12 @@ free_shifts (void)
 {
   shifts *sp, *sptmp;  /* JF derefrenced freed ptr */
 
 {
   shifts *sp, *sptmp;  /* JF derefrenced freed ptr */
 

-  FREE (shift_table);
+  XFREE (shift_table);

 
   for (sp = first_shift; sp; sp = sptmp)
     {
       sptmp = sp->next;
 
   for (sp = first_shift; sp; sp = sptmp)
     {
       sptmp = sp->next;

-      FREE (sp);
+      XFREE (sp);

     }
 }
 
     }
 }
 


@@ -847,12 +772,12 @@ free_reductions (void)
 {
   reductions *rp, *rptmp;      /* JF fixed freed ptr */
 
 {
   reductions *rp, *rptmp;      /* JF fixed freed ptr */
 

-  FREE (reduction_table);
+  XFREE (reduction_table);

 
   for (rp = first_reduction; rp; rp = rptmp)
     {
       rptmp = rp->next;
 
   for (rp = first_reduction; rp; rp = rptmp)
     {
       rptmp = rp->next;

-      FREE (rp);
+      XFREE (rp);

     }
 }
 
     }
 }
 


@@ -862,19 +787,17 @@ static void
 save_column (int symbol, int default_state)
 {
   int i;
 save_column (int symbol, int default_state)
 {
   int i;

-  int m;
-  int n;

   short *sp;
   short *sp1;
   short *sp2;
   int count;
   int symno;
 
   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;
 
   count = 0;

-  for (i = m; i < n; i++)
+  for (i = begin; i < end; i++)

     {
       if (to_state[i] != default_state)
        count++;
     {
       if (to_state[i] != default_state)
        count++;


@@ -885,10 +808,10 @@ save_column (int symbol, int default_state)
 
   symno = symbol - ntokens + nstates;
 
 
   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)
        {
     {
       if (to_state[i] != default_state)
        {


@@ -950,36 +873,23 @@ default_goto (int symbol)
 static void
 goto_actions (void)
 {
 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 +905,7 @@ sort_actions (void)
   int t;
   int w;
 
   int t;
   int w;
 

-  order = NEW2 (nvectors, short);
+  order = XCALLOC (short, nvectors);

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


@@ -1076,8 +986,7 @@ pack_vector (int vector)
   i = order[vector];
   t = tally[i];
 
   i = order[vector];
   t = tally[i];
 

-  if (t == 0)
-    berror ("pack_vector");
+  assert (t);

 
   from = froms[i];
   to = tos[i];
 
   from = froms[i];
   to = tos[i];


@@ -1133,10 +1042,10 @@ pack_table (void)
   int place;
   int state;
 
   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;
 
   lowzero = 0;
   high = 0;


@@ -1163,14 +1072,14 @@ pack_table (void)
   for (i = 0; i < nvectors; i++)
     {
       if (froms[i])
   for (i = 0; i < nvectors; i++)
     {
       if (froms[i])

-       FREE (froms[i]);
+       XFREE (froms[i]);

       if (tos[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
 }
 
 /* the following functions output yytable, yycheck


@@ -1179,115 +1088,34 @@ pack_table (void)
 static void
 output_base (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)
 {
 }
 
 
 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)
 {
 }
 
 
 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
 }
 
 /* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable


@@ -1298,28 +1126,30 @@ output_actions (void)
 {
   nvectors = nstates + nvars;
 
 {
   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 ();
 
   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 ();
 
   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 ();
 
   sort_actions ();
   pack_table ();

+  obstack_1grow (&table_obstack, '\n');

   output_base ();
   output_table ();
   output_base ();
   output_table ();

+  obstack_1grow (&table_obstack, '\n');

   output_check ();
 }
 
   output_check ();
 }
 


@@ -1329,6 +1159,7 @@ static void
 output_parser (void)
 {
   int c;
 output_parser (void)
 {
   int c;

+  static int number_of_dollar_signs = 0;

 #ifdef DONTDEF
   FILE *fpars;
 #else
 #ifdef DONTDEF
   FILE *fpars;
 #else


@@ -1336,10 +1167,11 @@ output_parser (void)
 #endif
 
   if (pure_parser)
 #endif
 
   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 */
+#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
   if (semantic_parser)
     fpars = fparser;
   else


@@ -1356,7 +1188,7 @@ output_parser (void)
 
       /* See if the line starts with `#line.
          If so, set write_line to 0.  */
 
       /* See if the line starts with `#line.
          If so, set write_line to 0.  */

-      if (nolinesflag)
+      if (no_lines_flag)

        if (c == '#')
          {
            c = getc (fpars);
        if (c == '#')
          {
            c = getc (fpars);


@@ -1372,37 +1204,45 @@ output_parser (void)
                        if (c == 'e')
                          write_line = 0;
                        else
                        if (c == 'e')
                          write_line = 0;
                        else

-                         fprintf (ftable, "#lin");
+                         obstack_grow_literal_string (&table_obstack, "#lin");

                      }
                    else
                      }
                    else

-                     fprintf (ftable, "#li");
+                     obstack_grow_literal_string (&table_obstack, "#li");

                  }
                else
                  }
                else

-                 fprintf (ftable, "#l");
+                 obstack_grow_literal_string (&table_obstack, "#l");

              }
            else
              }
            else

-             fprintf (ftable, "#");
+             obstack_grow_literal_string (&table_obstack, "#");

          }
 
       /* now write out the line... */
       for (; c != '\n' && c != EOF; c = getc (fpars))
        if (write_line)
          {
          }
 
       /* now write out the line... */
       for (; c != '\n' && c != EOF; c = getc (fpars))
        if (write_line)
          {

+           /* `$' in the parser file indicates where to put the
+              actions.  Copy them in at this point.  */

            if (c == '$')
              {
            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
              }
            else

-             putc (c, ftable);
+             obstack_1grow (&table_obstack, c);

          }
       if (c == EOF)
        break;
          }
       if (c == EOF)
        break;

-      putc (c, ftable);
+      obstack_1grow (&table_obstack, c);

     }
     }

+  assert (number_of_dollar_signs == 1);

 }
 
 static void
 }
 
 static void


@@ -1410,15 +1250,12 @@ output_program (void)
 {
   int c;
 
 {
   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);

 }
 
 
 }
 
 


@@ -1427,12 +1264,12 @@ free_itemsets (void)
 {
   core *cp, *cptmp;
 
 {
   core *cp, *cptmp;
 

-  FREE (state_table);
+  XFREE (state_table);

 
   for (cp = first_state; cp; cp = cptmp)
     {
       cptmp = cp->next;
 
   for (cp = first_state; cp; cp = cptmp)
     {
       cptmp = cp->next;

-      FREE (cp);
+      XFREE (cp);

     }
 }
 
     }
 }
 


@@ -1444,39 +1281,38 @@ free_itemsets (void)
 void
 output (void)
 {
 void
 output (void)
 {

-  int c;
-

   /* output_token_defines(ftable);      / * JF put out token defines FIRST */
   /* 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\
 #ifndef YYDEBUG\n\

-#define YYDEBUG 1\n\
+# define YYDEBUG 1\n\

 #endif\n\
 #endif\n\

-\n",
-          ftable);
+\n");

 
   if (semantic_parser)
 
   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.  */
 
   /* 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\
 #ifndef __cplusplus\n\
 # ifndef __STDC__\n\
 #  define const\n\
 # endif\n\
 #endif\n\

-\n",
-        ftable);
+\n");

 
   free_itemsets ();
   output_defines ();
 
   free_itemsets ();
   output_defines ();


@@ -1484,12 +1320,12 @@ output (void)
 /*   if (semantic_parser) */
   /* This is now unconditional because debugging printouts can use it.  */
   output_gram ();
 /*   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 (semantic_parser)
     output_stos ();
   output_rule_data ();
   output_actions ();

-  if (!noparserflag)
+  if (!no_parser_flag)

     output_parser ();
   output_program ();
 }
     output_parser ();
   output_program ();
 }