* src/lalr.h: New file.

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index d7a8301c07572052a63a4ea0934eae9b80c79d65..1d1dbd2fab1164df6c1755ec61a019b9bd7a3f9c 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,171 +1,113 @@
 /* Output the generated parsing program for bison,
 /* Output the generated parsing program for bison,

-   Copyright (C) 1984, 1986, 1989, 1992 Free Software Foundation, Inc.
+   Copyright (C) 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.

 
 

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

 
 

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

 
 

-You should have received a copy of the GNU General Public License
-along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with Bison; see the file COPYING.  If not, write to the Free
+   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */

 
 
 
 

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

 
 

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

 
 

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

 
 

-  output_trailers()
+   ** yytoknum = vector of yylex token numbers corresponding to entries
+   in yytname

 
 

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

 
 

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

 
 

-Output the parsing tables and the parser code to ftable.
+   yyprhs[r] = index in yyrhs of first item for rule r.

 
 

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

 
 

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

 
 

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

 
 

-** yytoknum = vector of yylex token numbers corresponding to entries in yytname
+   yydefact[s] = default rule to reduce with in state s,
+   when yytable doesn't specify something else to do.
+   Zero means the default is an error.

 
 

-yyrline = vector of line-numbers of all rules.  For yydebug printouts.
+   yydefgoto[i] = default state to go to after a reduction of a rule that
+   generates variable ntokens + i, except when yytable
+   specifies something else to do.

 
 

-yyrhs = vector of items of all rules.
-        This is exactly what ritems contains.  For yydebug and for semantic
-       parser.
+   yypact[s] = index in yytable of the portion describing state s.
+   The lookahead token's type is used to index that portion
+   to find out what to do.

 
 

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

 
 

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

 
 

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

 
 

-* yystos[s] = the symbol number of the symbol that leads to state s.
+   yypgoto[i] = the index in yytable of the portion describing
+   what to do after reducing a rule that derives variable i + ntokens.
+   This portion is indexed by the parser state number, s,
+   as of before the text for this nonterminal was read.
+   The value from yytable is the state to go to if
+   the corresponding value in yycheck is s.

 
 

-yydefact[s] = default rule to reduce with in state s,
-             when yytable doesn't specify something else to do.
-             Zero means the default is an error.
+   yytable = a vector filled with portions for different uses,
+   found via yypact and yypgoto.

 
 

-yydefgoto[i] = default state to go to after a reduction of a rule that
-              generates variable ntokens + i, except when yytable
-              specifies something else to do.
+   yycheck = a vector indexed in parallel with yytable.
+   It indicates, in a roundabout way, the bounds of the
+   portion you are trying to examine.

 
 

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

 
 

+   YYFINAL = the state number of the termination state.
+   YYFLAG = most negative short int.  Used to flag ??
+   YYNTBASE = ntokens.

 */
 
 */
 

-#include <stdio.h>

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

-#include "machine.h"
+#include "getargs.h"

 #include "alloc.h"
 #include "files.h"
 #include "gram.h"
 #include "state.h"
 #include "alloc.h"
 #include "files.h"
 #include "gram.h"
 #include "state.h"

+#include "complain.h"
+#include "output.h"
+#include "lalr.h"

 
 

-
-extern int debugflag;
-extern int nolinesflag;
-extern int noparserflag;
-extern int toknumflag;
+extern void berror PARAMS((const char *));

 
 extern char **tags;
 
 extern char **tags;

-extern int *user_toknums;
-extern int tokensetsize;
+extern short *user_toknums;

 extern int final_state;
 extern int final_state;

-extern core **state_table;
-extern shifts **shift_table;

 extern errs **err_table;
 extern errs **err_table;

-extern reductions **reduction_table;
-extern short *accessing_symbol;
-extern unsigned *LA;
-extern short *LAruleno;
-extern short *lookaheads;
-extern char *consistent;
-extern short *goto_map;
-extern short *from_state;
-extern short *to_state;
-extern int lineno;
-
-void output_headers PARAMS((void));
-void output_trailers PARAMS((void));
-void output PARAMS((void));
-void output_token_translations PARAMS((void));
-void output_gram PARAMS((void));
-void output_stos PARAMS((void));
-void output_rule_data PARAMS((void));
-void output_defines PARAMS((void));
-void output_actions PARAMS((void));
-void token_actions PARAMS((void));
-void save_row PARAMS((int));
-void goto_actions PARAMS((void));
-void save_column PARAMS((int, int));
-void sort_actions PARAMS((void));
-void pack_table PARAMS((void));
-void output_base PARAMS((void));
-void output_table PARAMS((void));
-void output_check PARAMS((void));
-void output_parser PARAMS((void));
-void output_program PARAMS((void));
-void free_shifts PARAMS((void));
-void free_reductions PARAMS((void));
-void free_itemsets PARAMS((void));
-int action_row PARAMS((int));
-int default_goto PARAMS((int));
-int matching_state PARAMS((int));
-int pack_vector PARAMS((int));
-
-extern void berror PARAMS((char *));
-extern void fatals PARAMS((char *, char *));
-extern char *int_to_string PARAMS((int));
-extern void reader_output_yylsp PARAMS((FILE *));
+
+extern void reader_output_yylsp PARAMS ((FILE *));

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


@@ -185,30 +127,89 @@ static int high;
 
 
 
 
 
 

-#define        GUARDSTR        "\n#include \"%s\"\nextern int yyerror;\n\
-extern int yycost;\nextern char * yymsg;\nextern YYSTYPE yyval;\n\n\
-yyguard(n, yyvsp, yylsp)\nregister int n;\nregister YYSTYPE *yyvsp;\n\
-register YYLTYPE *yylsp;\n\
-{\n  yyerror = 0;\nyycost = 0;\n  yymsg = 0;\nswitch (n)\n    {"
+static inline void
+output_short_table (FILE *out,
+                   const char *table_name,
+                   short *short_table,
+                   short first_value,
+                   short begin, short end)
+{
+  int i, j;

 
 

-#define        ACTSTR          "\n#include \"%s\"\nextern YYSTYPE yyval;\
-\nextern int yychar;\
-yyaction(n, yyvsp, yylsp)\nregister int n;\nregister YYSTYPE *yyvsp;\n\
-register YYLTYPE *yylsp;\n{\n  switch (n)\n{"
+  fprintf (out, "static const short %s[] = {%6d", table_name, first_value);

 
 

-#define        ACTSTR_SIMPLE   "\n  switch (yyn) {\n"
+  j = 10;
+  for (i = begin; i < end; i++)
+    {
+      putc (',', out);

 
 

+      if (j >= 10)
+       {
+         putc ('\n', out);
+         j = 1;
+       }
+      else
+       {
+         j++;
+       }
+
+      fprintf (out, "%6d", short_table[i]);
+    }
+
+  fprintf (out, "\n};\n");
+}
+
+
+/*--------------------------------------------------------------.
+| output_headers -- Output constant strings to the beginning of |
+| certain files.                                                |
+`--------------------------------------------------------------*/
+
+#define        GUARDSTR        \
+"\n\
+#include \"%s\"\n\
+extern int yyerror;\n\
+extern int yycost;\n\
+extern char * yymsg;\n\
+extern YYSTYPE yyval;\n\
+\n\
+yyguard(n, yyvsp, yylsp)\n\
+register int n;\n\
+register YYSTYPE *yyvsp;\n\
+register YYLTYPE *yylsp;\n\
+{\n\
+  yyerror = 0;\n\
+  yycost = 0;\n\
+  yymsg = 0;\n\
+  switch (n)\n\
+    {"
+
+#define        ACTSTR          \
+"\n\
+#include \"%s\"\n\
+extern YYSTYPE yyval;\n\
+extern int yychar;\n\
+\n\
+yyaction(n, yyvsp, yylsp)\n\
+register int n;\n\
+register YYSTYPE *yyvsp;\n\
+register YYLTYPE *yylsp;\n\
+{\n\
+  switch (n)\n\
+    {"
+
+#define        ACTSTR_SIMPLE   "\n  switch (yyn) {\n"

 
 void
 output_headers (void)
 {
   if (semantic_parser)
 
 void
 output_headers (void)
 {
   if (semantic_parser)

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

 
   if (noparserflag)
 
   if (noparserflag)

-       return;
+    return;

 
 

-  fprintf(faction, (semantic_parser ? ACTSTR : ACTSTR_SIMPLE), attrsfile);
+  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)       JF moved this below
     fprintf(ftable, "#include \"%s\"\n", attrsfile);
   fprintf(ftable, "#include <stdio.h>\n\n");


@@ -217,166 +218,108 @@ 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);
+      fprintf (ftable, "#define yyparse %sparse\n", spec_name_prefix);
+      fprintf (ftable, "#define yylex %slex\n", spec_name_prefix);
+      fprintf (ftable, "#define yyerror %serror\n", spec_name_prefix);
+      fprintf (ftable, "#define yylval %slval\n", spec_name_prefix);
+      fprintf (ftable, "#define yychar %schar\n", spec_name_prefix);
+      fprintf (ftable, "#define yydebug %sdebug\n", spec_name_prefix);
+      fprintf (ftable, "#define yynerrs %snerrs\n", spec_name_prefix);

     }
 }
 
 
     }
 }
 
 

-void
-output_trailers (void)
-{
-  if (semantic_parser)
-      fprintf(fguard, "\n    }\n}\n");
-
-  fprintf(faction, "\n");
-  
-  if (noparserflag) 
-      return;
-
-  if (semantic_parser)
-      fprintf(faction, "    }\n");
-  fprintf(faction, "}\n");
-}
-
+/*-------------------------------------------------------.
+| Output constant strings to the ends of certain files.  |
+`-------------------------------------------------------*/

 
 void
 
 void

-output (void)
+output_trailers (void)

 {
 {

-  int c;
-
-  /* output_token_defines(ftable);     / * JF put out token defines FIRST */
-  if (!semantic_parser)                /* JF Put out other stuff */
-    {
-      rewind(fattrs);
-      while ((c=getc(fattrs))!=EOF)
-        putc(c,ftable);
-    }
-  reader_output_yylsp(ftable);
-  if (debugflag)
-    fprintf(ftable, "#ifndef YYDEBUG\n#define YYDEBUG %d\n#endif\n\n",
-           !!debugflag);
-

   if (semantic_parser)
   if (semantic_parser)

-    fprintf(ftable, "#include \"%s\"\n", attrsfile);
+    fprintf (fguard, "\n    }\n}\n");

 
 

-  if (! noparserflag)
-    fprintf(ftable, "#include <stdio.h>\n\n");
+  fprintf (faction, "\n");

 
 

-  /* Make "const" do nothing if not in ANSI C.  */
-  fprintf (ftable, "#ifndef __cplusplus\n#ifndef __STDC__\n#define const\n#endif\n#endif\n\n");
+  if (noparserflag)
+    return;

 
 

-  free_itemsets();
-  output_defines();
-  output_token_translations();
-/*   if (semantic_parser) */
-  /* This is now unconditional because debugging printouts can use it.  */
-  output_gram();
-  FREE(ritem);

   if (semantic_parser)
   if (semantic_parser)

-    output_stos();
-  output_rule_data();
-  output_actions();
-  if (! noparserflag)
-    output_parser();
-  output_program();
+    fprintf (faction, "    }\n");
+  fprintf (faction, "}\n");

 }
 
 
 }
 
 

-void
+
+static void

 output_token_translations (void)
 {
 output_token_translations (void)
 {

-  register int i, j;
-/*   register short *sp; JF unused */
+  int i, j;
+/*   short *sp; JF unused */

 
   if (translations)
     {
 
   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");
+      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
       else

-       fprintf(ftable, "\nstatic const short yytranslate[] = {     0");
-    
+       fprintf (ftable, "\nstatic const short yytranslate[] = {     0");
+

       j = 10;
       for (i = 1; i <= max_user_token_number; i++)
        {
       j = 10;
       for (i = 1; i <= max_user_token_number; i++)
        {

-         putc(',', ftable);
-    
+         putc (',', ftable);
+

          if (j >= 10)
            {
          if (j >= 10)
            {

-             putc('\n', ftable);
+             putc ('\n', ftable);

              j = 1;
            }
          else
            {
              j++;
            }
              j = 1;
            }
          else
            {
              j++;
            }

-    
-         fprintf(ftable, "%6d", token_translations[i]);
+
+         fprintf (ftable, "%6d", token_translations[i]);

        }
        }

-    
-      fprintf(ftable, "\n};\n");
+
+      fprintf (ftable, "\n};\n");

     }
   else
     {
     }
   else
     {

-      fprintf(ftable, "\n#define YYTRANSLATE(x) (x)\n");
-    } 
+      fprintf (ftable, "\n#define YYTRANSLATE(x) (x)\n");
+    }

 }
 
 
 }
 
 

-void
+static void

 output_gram (void)
 {
 output_gram (void)
 {

-  register int i;
-  register int j;
-  register short *sp;
+  int j;
+  short *sp;

 
 

-  /* With the ordinary parser, 
+  /* With the ordinary parser,

      yyprhs and yyrhs are needed only for yydebug. */
   /* With the noparser option, all tables are generated */
      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");
+  if (!semantic_parser && !noparserflag)
+    fprintf (ftable, "\n#if YYDEBUG != 0\n");

 
 

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

 
 

-  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]);
+  fprintf (ftable, "\nstatic const short yyrhs[] = {%6d", ritem[0]);

 
   j = 10;
   for (sp = ritem + 1; *sp; sp++)
     {
 
   j = 10;
   for (sp = ritem + 1; *sp; sp++)
     {

-      putc(',', ftable);
+      putc (',', ftable);

 
       if (j >= 10)
        {
 
       if (j >= 10)
        {

-         putc('\n', ftable);
+         putc ('\n', ftable);

          j = 1;
        }
       else
          j = 1;
        }
       else


@@ -385,106 +328,71 @@ output_gram (void)
        }
 
       if (*sp > 0)
        }
 
       if (*sp > 0)

-       fprintf(ftable, "%6d", *sp);
+       fprintf (ftable, "%6d", *sp);

       else
       else

-       fprintf(ftable, "     0");
+       fprintf (ftable, "     0");

     }
 
     }
 

-  fprintf(ftable, "\n};\n");
+  fprintf (ftable, "\n};\n");

 
 

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

 }
 
 
 }
 
 

-void
+static void

 output_stos (void)
 {
 output_stos (void)
 {

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

 }
 
 
 }
 
 

-void
+static void

 output_rule_data (void)
 {
 output_rule_data (void)
 {

-  register int i;
-  register int j;
+  int i;
+  int j;

 
 

-  fprintf(ftable, "\n#if YYDEBUG != 0\n");
-  fprintf(ftable, "static const short yyrline[] = { 0");
+  fputs ("\n\
+#if YYDEBUG != 0\n\
+/* YYRLINE[yyn]: source line where rule number YYN was defined. */\n",
+        ftable);

 
 

-  j = 10;
-  for (i = 1; i <= nrules; i++)
-    {
-      putc(',', ftable);
-
-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
+  output_short_table (ftable, "yyrline", rline,
+                     0, 1, nrules + 1);

 
 

-      fprintf(ftable, "%6d", rline[i]);
-    }
-  fprintf(ftable, "\n};\n#endif\n\n");
+  fputs ("#endif\n\n", ftable);

 
   if (toknumflag || noparserflag)
     {
 
   if (toknumflag || noparserflag)
     {

-      fprintf(ftable, "#define YYNTOKENS %d\n", ntokens);
-      fprintf(ftable, "#define YYNNTS %d\n", nvars);
-      fprintf(ftable, "#define YYNRULES %d\n", nrules);
-      fprintf(ftable, "#define YYNSTATES %d\n", nstates);
-      fprintf(ftable, "#define YYMAXUTOK %d\n\n", max_user_token_number);
+      fprintf (ftable, "#define YYNTOKENS %d\n", ntokens);
+      fprintf (ftable, "#define YYNNTS %d\n", nvars);
+      fprintf (ftable, "#define YYNRULES %d\n", nrules);
+      fprintf (ftable, "#define YYNSTATES %d\n", nstates);
+      fprintf (ftable, "#define YYMAXUTOK %d\n\n", max_user_token_number);

     }
 
     }
 

-  if (! toknumflag  && ! noparserflag)
-    fprintf(ftable, "\n#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)\n\n");
+  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]);
+  fprintf (ftable,
+          "static const char * const yytname[] = {   \"%s\"", tags[0]);

 
   j = strlen (tags[0]) + 44;
   for (i = 1; i < nsyms; i++)
 
   j = strlen (tags[0]) + 44;
   for (i = 1; i < nsyms; i++)

-               /* this used to be i<=nsyms, but that output a final "" symbol
-                       almost by accident */
+    /* this used to be i<=nsyms, but that output a final "" symbol
+       almost by accident */

     {
     {

-      register char *p;
-      putc(',', ftable);
+      char *p;
+      putc (',', ftable);

       j++;
 
       if (j > 75)
        {
       j++;
 
       if (j > 75)
        {

-         putc('\n', ftable);
+         putc ('\n', ftable);

          j = 0;
        }
 
          j = 0;
        }
 


@@ -495,32 +403,32 @@ output_rule_data (void)
        {
          if (*p == '"' || *p == '\\')
            {
        {
          if (*p == '"' || *p == '\\')
            {

-             fprintf(ftable, "\\%c", *p);
+             fprintf (ftable, "\\%c", *p);

              j += 2;
            }
          else if (*p == '\n')
            {
              j += 2;
            }
          else if (*p == '\n')
            {

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

              j += 2;
            }
          else if (*p == '\t')
            {
              j += 2;
            }
          else if (*p == '\t')
            {

-             fprintf(ftable, "\\t");
+             fprintf (ftable, "\\t");

              j += 2;
            }
          else if (*p == '\b')
            {
              j += 2;
            }
          else if (*p == '\b')
            {

-             fprintf(ftable, "\\b");
+             fprintf (ftable, "\\b");

              j += 2;
            }
          else if (*p < 040 || *p >= 0177)
            {
              j += 2;
            }
          else if (*p < 040 || *p >= 0177)
            {

-             fprintf(ftable, "\\%03o", *p);
+             fprintf (ftable, "\\%03o", *p);

              j += 4;
            }
          else
            {
              j += 4;
            }
          else
            {

-             putc(*p, ftable);
+             putc (*p, ftable);

              j++;
            }
        }
              j++;
            }
        }


@@ -528,61 +436,41 @@ output_rule_data (void)
       putc ('\"', ftable);
       j++;
     }
       putc ('\"', ftable);
       j++;
     }

-    fprintf(ftable, ", NULL\n};\n");   /* add a NULL entry to list of tokens */
+  /* add a NULL entry to list of tokens */
+  fprintf (ftable, ", NULL\n};\n");

 
 

-  if (! toknumflag  && ! noparserflag)
-    fprintf(ftable, "#endif\n\n");
+  if (!toknumflag && !noparserflag)
+    fprintf (ftable, "#endif\n\n");

 
 

-  if (toknumflag) 
+  /* Output YYTOKNUM. */
+  if (toknumflag)

     {
     {

-      fprintf(ftable, "static const short yytoknum[] = { 0");
-      j = 10;
-      for (i = 1; i <= ntokens; i++) {
-          putc(',', ftable);
-          if (j >= 10) 
-            {
-              putc('\n', ftable);
-              j = 1;
-            }
-          else
-            j++;
-          fprintf(ftable, "%6d", user_toknums[i]);
-      }
-      fprintf(ftable, "\n};\n\n");
+      output_short_table (ftable, "yytoknum", user_toknums,
+                         0, 1, ntokens + 1);

     }
 
     }
 

-  fprintf(ftable, "static const short yyr1[] = {     0");
+  /* Output YYR1. */
+  fputs ("\
+/* YYR1[YYN]: Symbol number of symbol that rule YYN derives. */\n", ftable);

 
 

-  j = 10;
-  for (i = 1; i <= nrules; i++)
-    {
-      putc(',', ftable);
+  output_short_table (ftable, "yyr1", rlhs,
+                     0, 1, nrules + 1);
+  FREE (rlhs + 1);

 
 

-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
-
-      fprintf(ftable, "%6d", rlhs[i]);
-    }
-
-  FREE(rlhs + 1);
-
-  fprintf(ftable, "\n};\n\nstatic const short yyr2[] = {     0");
+  putc ('\n', ftable);

 
 

+  /* Output YYR2. */
+  fputs ("\
+/* YYR2[YYN]: Number of symbols composing right hand side of rule YYN. */\n\
+static const short yyr2[] = {     0", ftable);

   j = 10;
   for (i = 1; i < nrules; i++)
     {
   j = 10;
   for (i = 1; i < nrules; i++)
     {

-      putc(',', ftable);
+      putc (',', ftable);

 
       if (j >= 10)
        {
 
       if (j >= 10)
        {

-         putc('\n', ftable);
+         putc ('\n', ftable);

          j = 1;
        }
       else
          j = 1;
        }
       else


@@ -590,138 +478,62 @@ output_rule_data (void)
          j++;
        }
 
          j++;
        }
 

-      fprintf(ftable, "%6d", rrhs[i + 1] - rrhs[i] - 1);
+      fprintf (ftable, "%6d", rrhs[i + 1] - rrhs[i] - 1);

     }
 
     }
 

-  putc(',', ftable);
+  putc (',', ftable);

   if (j >= 10)
   if (j >= 10)

-    putc('\n', ftable);
+    putc ('\n', ftable);

 
 

-  fprintf(ftable, "%6d\n};\n", nitems - rrhs[nrules] - 1);
-  FREE(rrhs + 1);
+  fprintf (ftable, "%6d\n};\n", nitems - rrhs[nrules] - 1);
+  FREE (rrhs + 1);

 }
 
 
 }
 
 

-void
+static void

 output_defines (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);
-}
-
-
-
-/* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable and yycheck.  */
-
-void
-output_actions (void)
-{
-  nvectors = nstates + nvars;
-
-  froms = NEW2(nvectors, short *);
-  tos = NEW2(nvectors, short *);
-  tally = NEW2(nvectors, short);
-  width = NEW2(nvectors, short);
-
-  token_actions();
-  free_shifts();
-  free_reductions();
-  FREE(lookaheads);
-  FREE(LA);
-  FREE(LAruleno);
-  FREE(accessing_symbol);
-
-  goto_actions();
-  FREE(goto_map + ntokens);
-  FREE(from_state);
-  FREE(to_state);
-
-  sort_actions();
-  pack_table();
-  output_base();
-  output_table();
-  output_check();
-}
-
-
-
-/* figure out the actions for the specified state, indexed by lookahead token type.
-
-   The yydefact table is output now.  The detailed info
-   is saved for putting into yytable later.  */
-
-void
-token_actions (void)
-{
-  register int i;
-  register int j;
-  register int k;
-
-  actrow = NEW2(ntokens, short);
-
-  k = action_row(0);
-  fprintf(ftable, "\nstatic const short yydefact[] = {%6d", k);
-  save_row(0);
-
-  j = 10;
-  for (i = 1; i < nstates; i++)
-    {
-      putc(',', ftable);
-
-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
-
-      k = action_row(i);
-      fprintf(ftable, "%6d", k);
-      save_row(i);
-    }
-
-  fprintf(ftable, "\n};\n");
-  FREE(actrow);
+  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);

 }
 
 
 }
 
 

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

 action_row (int state)
 {
 action_row (int state)
 {

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

 
   for (i = 0; i < ntokens; i++)
     actrow[i] = 0;
 
   for (i = 0; i < ntokens; i++)
     actrow[i] = 0;


@@ -736,20 +548,23 @@ action_row (int state)
 
       if (nreds >= 1)
        {
 
       if (nreds >= 1)
        {

-         /* loop over all the rules available here which require lookahead */
+         /* loop over all the rules available here which require
+            lookahead */

          m = lookaheads[state];
          n = lookaheads[state + 1];
 
          for (i = n - 1; i >= m; i--)
            {
          m = lookaheads[state];
          n = lookaheads[state + 1];
 
          for (i = n - 1; i >= m; i--)
            {

-             rule = - LAruleno[i];
+             rule = -LAruleno[i];

              wordp = LA + i * tokensetsize;
              mask = 1;
 
              wordp = LA + i * tokensetsize;
              mask = 1;
 

-             /* and find each token which the rule finds acceptable to come next */
+             /* and find each token which the rule finds acceptable
+                to come next */

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

-                 /* and record this rule as the rule to use if that token follows.  */
+                 /* and record this rule as the rule to use if that
+                    token follows.  */

                  if (mask & *wordp)
                    actrow[j] = rule;
 
                  if (mask & *wordp)
                    actrow[j] = rule;
 


@@ -766,8 +581,9 @@ action_row (int state)
 
   shiftp = shift_table[state];
 
 
   shiftp = shift_table[state];
 

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

 
   if (shiftp)
     {
 
   if (shiftp)
     {


@@ -776,25 +592,27 @@ action_row (int state)
       for (i = 0; i < k; i++)
        {
          shift_state = shiftp->shifts[i];
       for (i = 0; i < k; i++)
        {
          shift_state = shiftp->shifts[i];

-         if (! shift_state) continue;
+         if (!shift_state)
+           continue;

 
          symbol = accessing_symbol[shift_state];
 
 
          symbol = accessing_symbol[shift_state];
 

-         if (ISVAR(symbol))
+         if (ISVAR (symbol))

            break;
 
          actrow[symbol] = shift_state;
 
            break;
 
          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];
 
        }
     }
 
   errp = err_table[state];
 

-  /* See which tokens are an explicit error in this state
-     (due to %nonassoc).  For them, record MINSHORT as the action.  */
+  /* See which tokens are an explicit error in this state (due to
+     %nonassoc).  For them, record MINSHORT as the action.  */

 
   if (errp)
     {
 
   if (errp)
     {


@@ -807,9 +625,10 @@ action_row (int state)
        }
     }
 
        }
     }
 

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

 
 

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

     {
       if (consistent[state])
        default_rule = redp->rules[0];
     {
       if (consistent[state])
        default_rule = redp->rules[0];


@@ -819,24 +638,24 @@ action_row (int state)
          for (i = m; i < n; i++)
            {
              count = 0;
          for (i = m; i < n; i++)
            {
              count = 0;

-             rule = - LAruleno[i];
-    
+             rule = -LAruleno[i];
+

              for (j = 0; j < ntokens; j++)
                {
                  if (actrow[j] == rule)
                    count++;
                }
              for (j = 0; j < ntokens; j++)
                {
                  if (actrow[j] == rule)
                    count++;
                }

-    
+

              if (count > max)
                {
                  max = count;
                  default_rule = rule;
                }
            }
              if (count > max)
                {
                  max = count;
                  default_rule = rule;
                }
            }

-    
+

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

-    
+

          if (max > 0)
            {
              for (j = 0; j < ntokens; j++)
          if (max > 0)
            {
              for (j = 0; j < ntokens; j++)


@@ -844,8 +663,8 @@ action_row (int state)
                  if (actrow[j] == default_rule)
                    actrow[j] = 0;
                }
                  if (actrow[j] == default_rule)
                    actrow[j] = 0;
                }

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

            }
        }
     }
            }
        }
     }


@@ -860,18 +679,18 @@ action_row (int state)
          actrow[j] = 0;
       }
 
          actrow[j] = 0;
       }
 

-  return (default_rule);
+  return default_rule;

 }
 
 
 }
 
 

-void
+static void

 save_row (int state)
 {
 save_row (int state)
 {

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

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


@@ -883,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 = NEW2 (count, short);
+  tos[state] = sp2 = NEW2 (count, short);

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


@@ -900,67 +719,122 @@ 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.                                       |
+`------------------------------------------------------------------*/

 
 

-/* figure out what to do after reducing with each rule,
-   depending on the saved state from before the beginning
-   of parsing the data that matched this rule.
+static void
+token_actions (void)
+{
+  int i;
+  short *yydefact = NEW2 (nstates, short);

 
 

-   The yydefgoto table is output now.  The detailed info
-   is saved for putting into yytable later.  */
+  actrow = NEW2 (ntokens, short);
+  for (i = 0; i < nstates; ++i)
+    {
+      yydefact[i] = action_row (i);
+      save_row (i);
+    }
+  FREE (actrow);

 
 

-void
-goto_actions (void)
+  output_short_table (ftable, "yydefact", yydefact,
+                     yydefact[0], 1, nstates);
+  FREE (yydefact);
+}
+
+
+static void
+free_shifts (void)

 {
 {

-  register int i;
-  register int j;
-  register int k;
+  shifts *sp, *sptmp;  /* JF derefrenced freed ptr */

 
 

-  state_count = NEW2(nstates, short);
+  FREE (shift_table);

 
 

-  k = default_goto(ntokens);
-  fprintf(ftable, "\nstatic const short yydefgoto[] = {%6d", k);
-  save_column(ntokens, k);
+  for (sp = first_shift; sp; sp = sptmp)
+    {
+      sptmp = sp->next;
+      FREE (sp);
+    }
+}

 
 

-  j = 10;
-  for (i = ntokens + 1; i < nsyms; i++)
+
+static void
+free_reductions (void)
+{
+  reductions *rp, *rptmp;      /* JF fixed freed ptr */
+
+  FREE (reduction_table);
+
+  for (rp = first_reduction; rp; rp = rptmp)

     {
     {

-      putc(',', ftable);
+      rptmp = rp->next;
+      FREE (rp);
+    }
+}

 
 

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

 
 

-      k = default_goto(i);
-      fprintf(ftable, "%6d", k);
-      save_column(i, k);
+
+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];
+
+  count = 0;
+  for (i = m; i < n; i++)
+    {
+      if (to_state[i] != default_state)
+       count++;

     }
 
     }
 

-  fprintf(ftable, "\n};\n");
-  FREE(state_count);
-}
+  if (count == 0)
+    return;

 
 

+  symno = symbol - ntokens + nstates;

 
 

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

 
 

-int
+  for (i = m; i < n; i++)
+    {
+      if (to_state[i] != default_state)
+       {
+         *sp1++ = from_state[i];
+         *sp2++ = to_state[i];
+       }
+    }
+
+  tally[symno] = count;
+  width[symno] = sp1[-1] - sp[0] + 1;
+}
+
+static int

 default_goto (int symbol)
 {
 default_goto (int symbol)
 {

-  register int i;
-  register int m;
-  register int n;
-  register int default_state;
-  register int max;
+  int i;
+  int m;
+  int n;
+  int default_state;
+  int max;

 
   m = goto_map[symbol];
   n = goto_map[symbol + 1];
 
   if (m == n)
 
   m = goto_map[symbol];
   n = goto_map[symbol + 1];
 
   if (m == n)

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

 
   for (i = 0; i < nstates; i++)
     state_count[i] = 0;
 
   for (i = 0; i < nstates; i++)
     state_count[i] = 0;


@@ -980,68 +854,68 @@ default_goto (int symbol)
        }
     }
 
        }
     }
 

-  return (default_state);
+  return default_state;

 }
 
 
 }
 
 

-void
-save_column (int symbol, int default_state)
-{
-  register int i;
-  register int m;
-  register int n;
-  register short *sp;
-  register short *sp1;
-  register short *sp2;
-  register int count;
-  register int symno;
+/*-------------------------------------------------------------------.
+| Figure out what to do after reducing with each rule, depending on  |
+| the saved state from before the beginning of parsing the data that |
+| matched this rule.                                                 |
+|                                                                    |
+| The YYDEFGOTO table is output now.  The detailed info is saved for |
+| putting into YYTABLE later.                                        |
+`-------------------------------------------------------------------*/

 
 

-  m = goto_map[symbol];
-  n = goto_map[symbol + 1];
-
-  count = 0;
-  for (i = m; i < n; i++)
-    {
-      if (to_state[i] != default_state)
-       count++;
-    }
-
-  if (count == 0)
-    return;
+static void
+goto_actions (void)
+{
+  int i, j, k;

 
 

-  symno = symbol - ntokens + nstates;
+  state_count = NEW2 (nstates, short);

 
 

-  froms[symno] = sp1 = sp = NEW2(count, short);
-  tos[symno] = sp2 = NEW2(count, short);
+  k = default_goto (ntokens);
+  fprintf (ftable, "\nstatic const short yydefgoto[] = {%6d", k);
+  save_column (ntokens, k);

 
 

-  for (i = m; i < n; i++)
+  j = 10;
+  for (i = ntokens + 1; i < nsyms; i++)

     {
     {

-      if (to_state[i] != default_state)
+      putc (',', ftable);
+
+      if (j >= 10)

        {
        {

-         *sp1++ = from_state[i];
-         *sp2++ = to_state[i];
+         putc ('\n', ftable);
+         j = 1;
+       }
+      else
+       {
+         j++;

        }
        }

+
+      k = default_goto (i);
+      fprintf (ftable, "%6d", k);
+      save_column (i, k);

     }
 
     }
 

-  tally[symno] = count;
-  width[symno] = sp1[-1] - sp[0] + 1;
+  fprintf (ftable, "\n};\n");
+  FREE (state_count);

 }
 
 
 }
 
 

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

 
 

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

 sort_actions (void)
 {
 sort_actions (void)
 {

-  register int i;
-  register int j;
-  register int k;
-  register int t;
-  register int w;
+  int i;
+  int j;
+  int k;
+  int t;
+  int w;

 
 

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

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


@@ -1068,69 +942,20 @@ sort_actions (void)
 }
 
 
 }
 
 

-void
-pack_table (void)
-{
-  register int i;
-  register int place;
-  register int state;
-
-  base = NEW2(nvectors, short);
-  pos = NEW2(nentries, short);
-  table = NEW2(MAXTABLE, short);
-  check = NEW2(MAXTABLE, short);
-
-  lowzero = 0;
-  high = 0;
-
-  for (i = 0; i < nvectors; i++)
-    base[i] = MINSHORT;
-
-  for (i = 0; i < MAXTABLE; i++)
-    check[i] = -1;
-
-  for (i = 0; i < nentries; i++)
-    {
-      state = matching_state(i);
-
-      if (state < 0)
-       place = pack_vector(i);
-      else
-       place = base[state];
-
-      pos[i] = place;
-      base[order[i]] = place;
-    }
-
-  for (i = 0; i < nvectors; i++)
-    {
-      if (froms[i])
-       FREE(froms[i]);
-      if (tos[i])
-       FREE(tos[i]);
-    }
-
-  FREE(froms);
-  FREE(tos);
-  FREE(pos);
-}
-
-
-
-int
+static int

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

-  register int i;
-  register int j;
-  register int k;
-  register int t;
-  register int w;
-  register int match;
-  register int prev;
+  int i;
+  int j;
+  int k;
+  int t;
+  int w;
+  int match;
+  int prev;

 
   i = order[vector];
   if (i >= nstates)
 
   i = order[vector];
   if (i >= nstates)

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

 
   t = tally[i];
   w = width[i];
 
   t = tally[i];
   w = width[i];


@@ -1139,7 +964,7 @@ matching_state (int vector)
     {
       j = order[prev];
       if (width[j] != w || tally[j] != t)
     {
       j = order[prev];
       if (width[j] != w || tally[j] != t)

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

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


@@ -1149,31 +974,30 @@ matching_state (int vector)
        }
 
       if (match)
        }
 
       if (match)

-       return (j);
+       return j;

     }
 
     }
 

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

 }
 
 
 }
 
 

-
-int
+static int

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

-  register int i;
-  register int j;
-  register int k;
-  register int t;
-  register int loc;
-  register int ok;
-  register short *from;
-  register short *to;
+  int i;
+  int j;
+  int k;
+  int t;
+  int loc = 0;
+  int ok;
+  short *from;
+  short *to;

 
   i = order[vector];
   t = tally[i];
 
   if (t == 0)
 
   i = order[vector];
   t = tally[i];
 
   if (t == 0)

-    berror("pack_vector");
+    berror ("pack_vector");

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


@@ -1186,7 +1010,7 @@ pack_vector (int vector)
        {
          loc = j + from[k];
          if (loc > MAXTABLE)
        {
          loc = j + from[k];
          if (loc > MAXTABLE)

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

 
          if (table[loc] != 0)
            ok = 0;
 
          if (table[loc] != 0)
            ok = 0;


@@ -1213,140 +1037,139 @@ pack_vector (int vector)
          if (loc > high)
            high = loc;
 
          if (loc > high)
            high = loc;
 

-         return (j);
+         return j;

        }
     }
 
        }
     }
 

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

 }
 
 
 }
 
 

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

 
 

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

 
 

-void
-output_base (void)
-{
-  register int i;
-  register int j;
+  lowzero = 0;
+  high = 0;

 
 

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

 
 

-  j = 10;
-  for (i = 1; i < nstates; i++)
+  for (i = 0; i < MAXTABLE; i++)
+    check[i] = -1;
+
+  for (i = 0; i < nentries; i++)

     {
     {

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

 
 

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

       else
       else

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

 
 

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

     }
 
     }
 

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

     {
     {

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

     }
 
     }
 

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

 }
 
 }
 

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

 
 

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

 {
 {

-  register int i;
-  register int j;
+  output_short_table (ftable, "yypact", base,
+                     base[0], 1, nstates);

 
 

-  fprintf(ftable, "\n\n#define\tYYLAST\t\t%d\n\n", high);
-  fprintf(ftable, "\nstatic const short yytable[] = {%6d", table[0]);
+  putc ('\n', ftable);

 
 

-  j = 10;
-  for (i = 1; i <= high; i++)
-    {
-      putc(',', ftable);
+  output_short_table (ftable, "yypgoto", base,
+                     base[nstates], nstates + 1, nvectors);

 
 

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

 
 

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

 
 

-  fprintf(ftable, "\n};\n");
-  FREE(table);
+static void
+output_table (void)
+{
+  fprintf (ftable, "\n\n#define\tYYLAST\t\t%d\n\n\n", high);
+  output_short_table (ftable, "yytable", table,
+                     table[0], 1, high + 1);
+  FREE (table);

 }
 
 
 }
 
 

-void
+static void

 output_check (void)
 {
 output_check (void)
 {

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

 
 

-      if (j >= 10)
-       {
-         putc('\n', ftable);
-         j = 1;
-       }
-      else
-       {
-         j++;
-       }
+/* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable
+   and yycheck.  */

 
 

-      fprintf(ftable, "%6d", check[i]);
-    }
+static void
+output_actions (void)
+{
+  nvectors = nstates + nvars;

 
 

-  fprintf(ftable, "\n};\n");
-  FREE(check);
+  froms = NEW2 (nvectors, short *);
+  tos = NEW2 (nvectors, short *);
+  tally = NEW2 (nvectors, short);
+  width = NEW2 (nvectors, short);
+
+  token_actions ();
+  free_shifts ();
+  free_reductions ();
+  FREE (lookaheads);
+  FREE (LA);
+  FREE (LAruleno);
+  FREE (accessing_symbol);
+
+  goto_actions ();
+  FREE (goto_map + ntokens);
+  FREE (from_state);
+  FREE (to_state);
+
+  sort_actions ();
+  pack_table ();
+  putc ('\n', ftable);
+  output_base ();
+  output_table ();
+  putc ('\n', ftable);
+  output_check ();

 }
 
 }
 

-
-

 /* copy the parser code into the ftable file at the end.  */
 
 /* copy the parser code into the ftable file at the end.  */
 

-void
+static void

 output_parser (void)
 {
 output_parser (void)
 {

-  register int c;
+  int c;

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


@@ -1354,13 +1177,14 @@ output_parser (void)
 #endif
 
   if (pure_parser)
 #endif
 
   if (pure_parser)

-    fprintf(ftable, "#define YYPURE 1\n\n");
+    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 */
+#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;
   if (semantic_parser)
     fpars = fparser;

-  else fpars = fparser1;
+  else
+    fpars = fparser1;

 #endif
 
   /* Loop over lines in the standard parser file.  */
 #endif
 
   /* Loop over lines in the standard parser file.  */


@@ -1369,112 +1193,144 @@ output_parser (void)
     {
       int write_line = 1;
 
     {
       int write_line = 1;
 

-      c = getc(fpars);
+      c = getc (fpars);

 
       /* See if the line starts with `#line.
 
       /* See if the line starts with `#line.

-        If so, set write_line to 0.  */
+         If so, set write_line to 0.  */

       if (nolinesflag)
       if (nolinesflag)

-       if (c == '#') 
+       if (c == '#')

          {
          {

-           c = getc(fpars);
+           c = getc (fpars);

            if (c == 'l')
              {
            if (c == 'l')
              {

-               c = getc(fpars);
+               c = getc (fpars);

                if (c == 'i')
                  {
                if (c == 'i')
                  {

-                   c = getc(fpars);
+                   c = getc (fpars);

                    if (c == 'n')
                      {
                    if (c == 'n')
                      {

-                       c = getc(fpars);
+                       c = getc (fpars);

                        if (c == 'e')
                          write_line = 0;
                        else
                        if (c == 'e')
                          write_line = 0;
                        else

-                         fprintf(ftable, "#lin");
+                         fprintf (ftable, "#lin");

                      }
                    else
                      }
                    else

-                     fprintf(ftable, "#li");
+                     fprintf (ftable, "#li");

                  }
                else
                  }
                else

-                 fprintf(ftable, "#l");
+                 fprintf (ftable, "#l");

              }
            else
              }
            else

-             fprintf(ftable, "#");
+             fprintf (ftable, "#");

          }
 
       /* now write out the line... */
          }
 
       /* now write out the line... */

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

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

-      putc(c, ftable);
+      putc (c, ftable);

     }
 }
 
     }
 }
 

-void
+static void

 output_program (void)
 {
 output_program (void)
 {

-  register int c;
+  int c;

 
   if (!nolinesflag)
 
   if (!nolinesflag)

-    fprintf(ftable, "#line %d \"%s\"\n", lineno, infile);
+    fprintf (ftable, "#line %d \"%s\"\n", lineno, infile);

 
 

-  c = getc(finput);
+  c = getc (finput);

   while (c != EOF)
     {
   while (c != EOF)
     {

-      putc(c, ftable);
-      c = getc(finput);
+      putc (c, ftable);
+      c = getc (finput);

     }
 }
 
 
     }
 }
 
 

-void
+static void

 free_itemsets (void)
 {
 free_itemsets (void)
 {

-  register core *cp,*cptmp;
+  core *cp, *cptmp;

 
 

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

 
 

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

 }
 
 
 }
 
 

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

 void
 void

-free_shifts (void)
+output (void)

 {
 {

-  register shifts *sp,*sptmp;/* JF derefrenced freed ptr */
-
-  FREE(shift_table);
-
-  for (sp = first_shift; sp; sp = sptmp) {
-    sptmp=sp->next;
-    FREE(sp);
-  }
-}
+  int c;

 
 

+  /* output_token_defines(ftable);      / * JF put out token defines FIRST */
+  if (!semantic_parser)                /* JF Put out other stuff */
+    {
+      rewind (fattrs);
+      while ((c = getc (fattrs)) != EOF)
+       putc (c, ftable);
+    }
+  reader_output_yylsp (ftable);
+  if (debugflag)
+    fputs ("\
+#ifndef YYDEBUG\n\
+#define YYDEBUG 1\n\
+#endif\n\
+\n",
+          ftable);

 
 

-void
-free_reductions (void)
-{
-  register reductions *rp,*rptmp;/* JF fixed freed ptr */
+  if (semantic_parser)
+    fprintf (ftable, "#include \"%s\"\n", attrsfile);

 
 

-  FREE(reduction_table);
+  if (!noparserflag)
+    fprintf (ftable, "#include <stdio.h>\n\n");

 
 

-  for (rp = first_reduction; rp; rp = rptmp) {
-    rptmp=rp->next;
-    FREE(rp);
-  }
+  /* 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 ();
+  output_defines ();
+  output_token_translations ();
+/*   if (semantic_parser) */
+  /* This is now unconditional because debugging printouts can use it.  */
+  output_gram ();
+  FREE (ritem);
+  if (semantic_parser)
+    output_stos ();
+  output_rule_data ();
+  output_actions ();
+  if (!noparserflag)
+    output_parser ();
+  output_program ();

 }
 }