s/return (foo)/return foo/

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index e67a11891793478e0c550a7e264f1293f6f92a95..552bdd48eb818cfc6f7bb27b1705968bcf609c4c 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1,30 +1,31 @@
 /* Input parser for bison
 /* Input parser for bison

-   Copyright (C) 1984, 1986, 1989, 1992, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1984, 86, 89, 92, 98, 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, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with Bison; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

 
 
 
 

-/* read in the grammar specification and record it in the format described in gram.h.
-  All guards are copied into the fguard file and all actions into faction,
-  in each case forming the body of a C function (yyguard or yyaction)
-  which contains a switch statement to decide which guard or action to execute.
+/* Read in the grammar specification and record it in the format
+   described in gram.h.  All guards are copied into the fguard file
+   and all actions into faction, in each case forming the body of a C
+   function (yyguard or yyaction) which contains a switch statement to
+   decide which guard or action to execute.

 
 

-The entry point is reader().  */
+   The entry point is reader ().  */

 
 #include <stdio.h>
 #include "system.h"
 
 #include <stdio.h>
 #include "system.h"


@@ -34,16 +35,33 @@ The entry point is reader().  */
 #include "lex.h"
 #include "gram.h"
 #include "machine.h"
 #include "lex.h"
 #include "gram.h"
 #include "machine.h"

-
-#define        LTYPESTR        "\n#ifndef YYLTYPE\ntypedef\n  struct yyltype\n\
-    {\n      int timestamp;\n      int first_line;\n      int first_column;\
-\n      int last_line;\n      int last_column;\n      char *text;\n   }\n\
-  yyltype;\n\n#define YYLTYPE yyltype\n#endif\n\n"
+#include "complain.h"
+
+#define        LTYPESTR        "\
+\n\
+#ifndef YYLTYPE\n\
+typedef\n\
+  struct yyltype\n\
+\
+    {\n\
+      int timestamp;\n\
+      int first_line;\n\
+      int first_column;\
+\n\
+      int last_line;\n\
+      int last_column;\n\
+      char *text;\n\
+   }\n\
+\
+  yyltype;\n\
+\n\
+#define YYLTYPE yyltype\n\
+#endif\n\
+\n"

 
 /* Number of slots allocated (but not necessarily used yet) in `rline'  */
 int rline_allocated;
 
 
 /* Number of slots allocated (but not necessarily used yet) in `rline'  */
 int rline_allocated;
 

-extern char *program_name;

 extern int definesflag;
 extern int nolinesflag;
 extern int noparserflag;
 extern int definesflag;
 extern int nolinesflag;
 extern int noparserflag;


@@ -61,17 +79,8 @@ extern void output_headers PARAMS((void));
 extern void output_trailers PARAMS((void));
 extern void free_symtab PARAMS((void));
 extern void open_extra_files PARAMS((void));
 extern void output_trailers PARAMS((void));
 extern void free_symtab PARAMS((void));
 extern void open_extra_files PARAMS((void));

-extern char *int_to_string PARAMS((int));

 extern char *printable_version PARAMS((int));
 extern char *printable_version PARAMS((int));

-extern void fatal PARAMS((char *));
-extern void fatals PARAMS((char *, char *));
-extern void warn PARAMS((char *));
-extern void warni PARAMS((char *, int));
-extern void warns PARAMS((char *, char *));
-extern void warnss PARAMS((char *, char *, char *));
-extern void warnsss PARAMS((char *, char *, char *, char *));

 extern void unlex PARAMS((int));
 extern void unlex PARAMS((int));

-extern void done PARAMS((int));

 
 extern int skip_white_space PARAMS((void));
 extern int parse_percent_token PARAMS((void));
 
 extern int skip_white_space PARAMS((void));
 extern int parse_percent_token PARAMS((void));


@@ -142,9 +151,9 @@ skip_to_char (int target)
 {
   int c;
   if (target == '\n')
 {
   int c;
   if (target == '\n')

-    warn(_("   Skipping to next \\n"));
+    complain (_("   Skipping to next \\n"));

   else
   else

-    warni(_("   Skipping to next %c"), target);
+    complain (_("   Skipping to next %c"), target);

 
   do
     c = skip_white_space();
 
   do
     c = skip_white_space();


@@ -154,6 +163,98 @@ skip_to_char (int target)
 }
 
 
 }
 
 

+/* Dump the string from FINPUT to FOUTPUT.  MATCH is the delimiter of
+   the string (either ' or ").  */
+
+static inline void
+copy_string (FILE *finput, FILE *foutput, int match)
+{
+  int c;
+
+  putc (match, foutput);
+  c = getc (finput);
+
+  while (c != match)
+    {
+      if (c == EOF)
+       fatal (_("unterminated string at end of file"));
+      if (c == '\n')
+       {
+         complain (_("unterminated string"));
+         ungetc (c, finput);
+         c = match;            /* invent terminator */
+         continue;
+       }
+
+      putc(c, foutput);
+
+      if (c == '\\')
+       {
+         c = getc (finput);
+         if (c == EOF)
+           fatal (_("unterminated string at end of file"));
+         putc (c, foutput);
+         if (c == '\n')
+           lineno++;
+       }
+
+      c = getc(finput);
+    }
+
+  putc(c, foutput);
+}
+
+
+/* Dump the comment from FINPUT to FOUTPUT.  C is either `*' or `/',
+   depending upon the type of comments used.  */
+
+static inline void
+copy_comment (FILE *finput, FILE *foutput, int c)
+{
+  int cplus_comment;
+  register int ended;
+
+  cplus_comment = (c == '/');
+  putc (c, foutput);
+  c = getc (finput);
+
+  ended = 0;
+  while (!ended)
+    {
+      if (!cplus_comment && c == '*')
+       {
+         while (c == '*')
+           {
+             putc(c, foutput);
+             c = getc(finput);
+           }
+
+         if (c == '/')
+           {
+             putc(c, foutput);
+             ended = 1;
+           }
+       }
+      else if (c == '\n')
+       {
+         lineno++;
+         putc (c, foutput);
+         if (cplus_comment)
+           ended = 1;
+         else
+           c = getc(finput);
+       }
+      else if (c == EOF)
+       fatal (_("unterminated comment"));
+      else
+       {
+         putc (c, foutput);
+         c = getc (finput);
+       }
+    }
+}
+
+

 void
 reader (void)
 {
 void
 reader (void)
 {


@@ -239,9 +340,9 @@ reader_output_yylsp (FILE *f)
     fprintf(f, LTYPESTR);
 }
 
     fprintf(f, LTYPESTR);
 }
 

-/* read from finput until %% is seen.  Discard the %%.
-Handle any % declarations,
-and copy the contents of any %{ ... %} groups to fattrs.  */
+/* Read from finput until `%%' is seen.  Discard the `%%'.  Handle any
+   `%' declarations, and copy the contents of any `%{ ... %}' groups
+   to fattrs.  */

 
 void
 read_declarations (void)
 
 void
 read_declarations (void)


@@ -320,41 +421,37 @@ read_declarations (void)
              break;
 
            default:
              break;
 
            default:

-             warns(_("unrecognized: %s"), token_buffer);
+             complain (_("unrecognized: %s"), token_buffer);

              skip_to_char('%');
          }
        }
       else if (c == EOF)
              skip_to_char('%');
          }
        }
       else if (c == EOF)

-        fatal(_("no input grammar"));
+        fatal (_("no input grammar"));

       else
        {
       else
        {

-               char buff[100];
-               sprintf(buff, _("unknown character: %s"), printable_version(c));
-               warn(buff);
-               skip_to_char('%');
+         complain (_("unknown character: %s"), printable_version(c));
+         skip_to_char('%');

        }
     }
 }
 
 
        }
     }
 }
 
 

-/* copy the contents of a %{ ... %} into the definitions file.
-The %{ has already been read.  Return after reading the %}.  */
+/* Copy the contents of a `%{ ... %}' into the definitions file.  The
+   `%{' has already been read.  Return after reading the `%}'.  */

 
 void
 copy_definition (void)
 {
   register int c;
 
 void
 copy_definition (void)
 {
   register int c;

-  register int match;
-  register int ended;
-  register int after_percent;  /* -1 while reading a character if prev char was % */
-  int cplus_comment;
+  /* -1 while reading a character if prev char was %. */
+  register int after_percent;

 
   if (!nolinesflag)
     fprintf(fattrs, "#line %d \"%s\"\n", lineno, infile);
 
   after_percent = 0;
 
 
   if (!nolinesflag)
     fprintf(fattrs, "#line %d \"%s\"\n", lineno, infile);
 
   after_percent = 0;
 

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

 
   for (;;)
     {
 
   for (;;)
     {


@@ -371,89 +468,20 @@ copy_definition (void)
 
        case '\'':
        case '"':
 
        case '\'':
        case '"':

-         match = c;
-         putc(c, fattrs);
-         c = getc(finput);
-
-         while (c != match)
-           {
-             if (c == EOF)
-               fatal(_("unterminated string at end of file"));
-             if (c == '\n')
-               {
-                 warn(_("unterminated string"));
-                 ungetc(c, finput);
-                 c = match;
-                 continue;
-               }
-
-             putc(c, fattrs);
-
-             if (c == '\\')
-               {
-                 c = getc(finput);
-                 if (c == EOF)
-                   fatal(_("unterminated string at end of file"));
-                 putc(c, fattrs);
-                 if (c == '\n')
-                   lineno++;
-               }
-
-             c = getc(finput);
-           }
-
-         putc(c, fattrs);
+         copy_string (finput, fattrs, c);

          break;
 
        case '/':
          break;
 
        case '/':

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

          if (c != '*' && c != '/')
            continue;
          if (c != '*' && c != '/')
            continue;

-
-         cplus_comment = (c == '/');
-         putc(c, fattrs);
-         c = getc(finput);
-
-         ended = 0;
-         while (!ended)
-           {
-             if (!cplus_comment && c == '*')
-               {
-                 while (c == '*')
-                   {
-                     putc(c, fattrs);
-                     c = getc(finput);
-                   }
-
-                 if (c == '/')
-                   {
-                     putc(c, fattrs);
-                     ended = 1;
-                   }
-               }
-             else if (c == '\n')
-               {
-                 lineno++;
-                 putc(c, fattrs);
-                 if (cplus_comment)
-                   ended = 1;
-                 else
-                   c = getc(finput);
-               }
-             else if (c == EOF)
-               fatal(_("unterminated comment in `%{' definition"));
-             else
-               {
-                 putc(c, fattrs);
-                 c = getc(finput);
-               }
-           }
-
+         copy_comment (finput, fattrs, c);

          break;
 
        case EOF:
          break;
 
        case EOF:

-         fatal(_("unterminated `%{' definition"));
+         fatal ("%s",
+                _("unterminated `%{' definition"));

 
        default:
          putc(c, fattrs);
 
        default:
          putc(c, fattrs);


@@ -494,7 +522,7 @@ parse_token_decl (int what_is, int what_is_not)
       if (tmp_char == '%')
        return;
       if (tmp_char == EOF)
       if (tmp_char == '%')
        return;
       if (tmp_char == EOF)

-       fatals ("Premature EOF after %s", token_buffer);
+       fatal (_("Premature EOF after %s"), token_buffer);

 
       token = lex();
       if (token == COMMA)
 
       token = lex();
       if (token == COMMA)


@@ -531,7 +559,7 @@ parse_token_decl (int what_is, int what_is_not)
          symbol = symval;
 
          if (symbol->class == what_is_not)
          symbol = symval;
 
          if (symbol->class == what_is_not)

-           warns(_("symbol %s redefined"), symbol->tag);
+           complain (_("symbol %s redefined"), symbol->tag);

          symbol->class = what_is;
          if (what_is == SNTERM && oldclass != SNTERM)
            symbol->value = nvars++;
          symbol->class = what_is;
          if (what_is == SNTERM && oldclass != SNTERM)
            symbol->value = nvars++;


@@ -541,7 +569,7 @@ parse_token_decl (int what_is, int what_is_not)
              if (symbol->type_name == NULL)
                symbol->type_name = typename;
              else if (strcmp(typename, symbol->type_name) != 0)
              if (symbol->type_name == NULL)
                symbol->type_name = typename;
              else if (strcmp(typename, symbol->type_name) != 0)

-               warns(_("type redeclaration for %s"), symbol->tag);
+               complain (_("type redeclaration for %s"), symbol->tag);

            }
        }
       else if (symbol && token == NUMBER)
            }
        }
       else if (symbol && token == NUMBER)


@@ -551,8 +579,8 @@ parse_token_decl (int what_is, int what_is_not)
         }
       else
        {
         }
       else
        {

-         warnss(_("`%s' is invalid in %s"),
-               token_buffer,
+         complain (_("`%s' is invalid in %s"),
+                   token_buffer,

                (what_is == STOKEN) ? "%token" : "%nterm");
          skip_to_char('%');
        }
                (what_is == STOKEN) ? "%token" : "%nterm");
          skip_to_char('%');
        }


@@ -599,8 +627,8 @@ parse_thong_decl (void)
 
   if (token != IDENTIFIER)
     {
 
   if (token != IDENTIFIER)
     {

-      warns(_("unrecognized item %s, expected an identifier"),
-           token_buffer);
+      complain (_("unrecognized item %s, expected an identifier"),
+               token_buffer);

       skip_to_char('%');
       return;
     }
       skip_to_char('%');
       return;
     }


@@ -621,8 +649,8 @@ parse_thong_decl (void)
 
   if (token != IDENTIFIER || *symval->tag != '\"')
     {
 
   if (token != IDENTIFIER || *symval->tag != '\"')
     {

-      warns(_("expected string constant instead of %s"),
-           token_buffer);
+      complain (_("expected string constant instead of %s"),
+               token_buffer);

       skip_to_char('%');
       return;
     }
       skip_to_char('%');
       return;
     }


@@ -637,15 +665,15 @@ parse_thong_decl (void)
 }
 
 
 }
 
 

-/* parse what comes after %start */
+/* Parse what comes after %start */

 
 void
 parse_start_decl (void)
 {
   if (start_flag)
 
 void
 parse_start_decl (void)
 {
   if (start_flag)

-    warn(_("multiple %start declarations"));
+    complain ("%s", _("multiple %start declarations"));

   if (lex() != IDENTIFIER)
   if (lex() != IDENTIFIER)

-    warn(_("invalid %start declaration"));
+    complain ("%s", _("invalid %start declaration"));

   else
     {
       start_flag = 1;
   else
     {
       start_flag = 1;


@@ -665,7 +693,7 @@ parse_type_decl (void)
 
   if (lex() != TYPENAME)
     {
 
   if (lex() != TYPENAME)
     {

-      warn(_("%type declaration has no <typename>"));
+      complain ("%s", _("%type declaration has no <typename>"));

       skip_to_char('%');
       return;
     }
       skip_to_char('%');
       return;
     }


@@ -682,7 +710,7 @@ parse_type_decl (void)
       if (tmp_char == '%')
        return;
       if (tmp_char == EOF)
       if (tmp_char == '%')
        return;
       if (tmp_char == EOF)

-       fatals ("Premature EOF after %s", token_buffer);
+       fatal (_("Premature EOF after %s"), token_buffer);

 
       t = lex();
 
 
       t = lex();
 


@@ -697,12 +725,13 @@ parse_type_decl (void)
          if (symval->type_name == NULL)
            symval->type_name = name;
          else if (strcmp(name, symval->type_name) != 0)
          if (symval->type_name == NULL)
            symval->type_name = name;
          else if (strcmp(name, symval->type_name) != 0)

-           warns(_("type redeclaration for %s"), symval->tag);
+           complain (_("type redeclaration for %s"), symval->tag);

 
          break;
 
        default:
 
          break;
 
        default:

-         warns(_("invalid %%type declaration due to item: `%s'"), token_buffer);
+         complain (_("invalid %%type declaration due to item: %s"),
+                   token_buffer);

          skip_to_char('%');
        }
     }
          skip_to_char('%');
        }
     }


@@ -730,7 +759,7 @@ parse_assoc_decl (int assoc)
       if (tmp_char == '%')
        return;
       if (tmp_char == EOF)
       if (tmp_char == '%')
        return;
       if (tmp_char == EOF)

-       fatals ("Premature EOF after %s", token_buffer);
+       fatal (_("Premature EOF after %s"), token_buffer);

 
       t = lex();
 
 
       t = lex();
 


@@ -748,18 +777,18 @@ parse_assoc_decl (int assoc)
 
        case IDENTIFIER:
          if (symval->prec != 0)
 
        case IDENTIFIER:
          if (symval->prec != 0)

-           warns(_("redefining precedence of %s"), symval->tag);
+           complain (_("redefining precedence of %s"), symval->tag);

          symval->prec = lastprec;
          symval->assoc = assoc;
          if (symval->class == SNTERM)
          symval->prec = lastprec;
          symval->assoc = assoc;
          if (symval->class == SNTERM)

-           warns(_("symbol %s redefined"), symval->tag);
+           complain (_("symbol %s redefined"), symval->tag);

          symval->class = STOKEN;
          if (name)
            { /* record the type, if one is specified */
              if (symval->type_name == NULL)
                symval->type_name = name;
              else if (strcmp(name, symval->type_name) != 0)
          symval->class = STOKEN;
          if (name)
            { /* record the type, if one is specified */
              if (symval->type_name == NULL)
                symval->type_name = name;
              else if (strcmp(name, symval->type_name) != 0)

-               warns(_("type redeclaration for %s"), symval->tag);
+               complain (_("type redeclaration for %s"), symval->tag);

            }
          break;
 
            }
          break;
 


@@ -771,7 +800,7 @@ parse_assoc_decl (int assoc)
             }
           else
             {
             }
           else
             {

-             warns(_("invalid text (%s) - number should be after identifier"),
+             complain (_("invalid text (%s) - number should be after identifier"),

                        token_buffer);
              skip_to_char('%');
             }
                        token_buffer);
              skip_to_char('%');
             }


@@ -781,7 +810,7 @@ parse_assoc_decl (int assoc)
          return;
 
        default:
          return;
 
        default:

-         warns(_("unexpected item: %s"), token_buffer);
+         complain (_("unexpected item: %s"), token_buffer);

          skip_to_char('%');
        }
 
          skip_to_char('%');
        }
 


@@ -805,7 +834,7 @@ parse_union_decl (void)
   int cplus_comment;
 
   if (typed)
   int cplus_comment;
 
   if (typed)

-    warn(_("multiple %union declarations"));
+    complain ("%s", _("multiple %union declarations"));

 
   typed = 1;
 
 
   typed = 1;
 


@@ -863,7 +892,7 @@ parse_union_decl (void)
                        }
                    }
                  if (c == EOF)
                        }
                    }
                  if (c == EOF)

-                   fatal(_("unterminated comment at end of file"));
+                   fatal (_("unterminated comment at end of file"));

 
                  if (!cplus_comment && c == '*')
                    {
 
                  if (!cplus_comment && c == '*')
                    {


@@ -889,7 +918,7 @@ parse_union_decl (void)
 
        case '}':
          if (count == 0)
 
        case '}':
          if (count == 0)

-           warn (_("unmatched close-brace (`}')"));
+           complain (_("unmatched close-brace (`}')"));

          count--;
          if (count <= 0)
            {
          count--;
          if (count <= 0)
            {


@@ -933,25 +962,54 @@ parse_expect_decl (void)
   ungetc (c, finput);
 
   if (count <= 0 || count > 10)
   ungetc (c, finput);
 
   if (count <= 0 || count > 10)

-       warn(_("argument of %expect is not an integer"));
+    complain ("%s", _("argument of %expect is not an integer"));

   expected_conflicts = atoi (buffer);
 }
 
 /* that's all of parsing the declaration section */
 \f
   expected_conflicts = atoi (buffer);
 }
 
 /* that's all of parsing the declaration section */
 \f

-/* Get the data type (alternative in the union) of the value for symbol n in rule rule.  */
+/* FINPUT is pointing to a location (i.e., a `@').  Output to FOUTPUT
+   a reference to this location. STACK_OFFSET is the number of values
+   in the current rule so far, which says where to find `$0' with
+   respect to the top of the stack.  */
+static inline void
+copy_at (FILE *finput, FILE *foutput, int stack_offset)
+{
+  int c;
+
+  c = getc (finput);
+  if (c == '$')
+    {
+      fprintf (foutput, "yyloc");
+      yylsp_needed = 1;
+    }
+  else if (isdigit(c) || c == '-')
+    {
+      int n;
+
+      ungetc (c, finput);
+      n = read_signed_integer (finput);
+
+      fprintf (foutput, "yylsp[%d]", n - stack_offset);
+      yylsp_needed = 1;
+    }
+  else
+    complain (_("@%s is invalid"), printable_version (c));
+}
+
+
+/* Get the data type (alternative in the union) of the value for
+   symbol n in rule rule.  */

 
 char *
 get_type_name (int n, symbol_list *rule)
 {
 
 char *
 get_type_name (int n, symbol_list *rule)
 {

-  static char *msg = N_("invalid $ value");
-

   register int i;
   register symbol_list *rp;
 
   if (n < 0)
     {
   register int i;
   register symbol_list *rp;
 
   if (n < 0)
     {

-      warn(_(msg));
+      complain (_("invalid $ value"));

       return NULL;
     }
 
       return NULL;
     }
 


@@ -963,22 +1021,23 @@ get_type_name (int n, symbol_list *rule)
       rp = rp->next;
       if (rp == NULL || rp->sym == NULL)
        {
       rp = rp->next;
       if (rp == NULL || rp->sym == NULL)
        {

-         warn(_(msg));
+         complain (_("invalid $ value"));

          return NULL;
        }
       i++;
     }
 
          return NULL;
        }
       i++;
     }
 

-  return (rp->sym->type_name);
+  return rp->sym->type_name;

 }
 
 
 }
 
 

-/* after %guard is seen in the input file,
-copy the actual guard into the guards file.
-If the guard is followed by an action, copy that into the actions file.
-stack_offset is the number of values in the current rule so far,
-which says where to find $0 with respect to the top of the stack,
-for the simple parser in which the stack is not popped until after the guard is run.  */
+
+/* After `%guard' is seen in the input file, copy the actual guard
+   into the guards file.  If the guard is followed by an action, copy
+   that into the actions file.  STACK_OFFSET is the number of values
+   in the current rule so far, which says where to find `$0' with
+   respect to the top of the stack, for the simple parser in which the
+   stack is not popped until after the guard is run.  */

 
 void
 copy_guard (symbol_list *rule, int stack_offset)
 
 void
 copy_guard (symbol_list *rule, int stack_offset)


@@ -986,18 +1045,15 @@ copy_guard (symbol_list *rule, int stack_offset)
   register int c;
   register int n;
   register int count;
   register int c;
   register int n;
   register int count;

-  register int match;
-  register int ended;

   register char *type_name;
   int brace_flag = 0;
   register char *type_name;
   int brace_flag = 0;

-  int cplus_comment;

 
   /* offset is always 0 if parser has already popped the stack pointer */
   if (semantic_parser) stack_offset = 0;
 
   fprintf(fguard, "\ncase %d:\n", nrules);
   if (!nolinesflag)
 
   /* offset is always 0 if parser has already popped the stack pointer */
   if (semantic_parser) stack_offset = 0;
 
   fprintf(fguard, "\ncase %d:\n", nrules);
   if (!nolinesflag)

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

   putc('{', fguard);
 
   count = 0;
   putc('{', fguard);
 
   count = 0;


@@ -1024,92 +1080,22 @@ copy_guard (symbol_list *rule, int stack_offset)
            count--;
          else
            {
            count--;
          else
            {

-             warn(_("unmatched right brace (`}')"));
+             complain (_("unmatched right brace (`}')"));

              c = getc(finput); /* skip it */
            }
           break;
 
        case '\'':
        case '"':
              c = getc(finput); /* skip it */
            }
           break;
 
        case '\'':
        case '"':

-         match = c;
-         putc(c, fguard);
-         c = getc(finput);
-
-         while (c != match)
-           {
-             if (c == EOF)
-               fatal(_("unterminated string at end of file"));
-             if (c == '\n')
-               {
-                 warn(_("unterminated string"));
-                 ungetc(c, finput);
-                 c = match;            /* invent terminator */
-                 continue;
-               }
-
-             putc(c, fguard);
-
-             if (c == '\\')
-               {
-                 c = getc(finput);
-                 if (c == EOF)
-                   fatal(_("unterminated string"));
-                 putc(c, fguard);
-                 if (c == '\n')
-                   lineno++;
-               }
-
-             c = getc(finput);
-           }
-
-         putc(c, fguard);
+         copy_string (finput, fguard, c);

          break;
 
        case '/':
          break;
 
        case '/':

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

          if (c != '*' && c != '/')
            continue;
          if (c != '*' && c != '/')
            continue;

-
-         cplus_comment = (c == '/');
-         putc(c, fguard);
-         c = getc(finput);
-
-         ended = 0;
-         while (!ended)
-           {
-             if (!cplus_comment && c == '*')
-               {
-                 while (c == '*')
-                   {
-                     putc(c, fguard);
-                     c = getc(finput);
-                   }
-
-                 if (c == '/')
-                   {
-                     putc(c, fguard);
-                     ended = 1;
-                   }
-               }
-             else if (c == '\n')
-               {
-                 lineno++;
-                 putc(c, fguard);
-                 if (cplus_comment)
-                   ended = 1;
-                 else
-                   c = getc(finput);
-               }
-             else if (c == EOF)
-               fatal(_("unterminated comment"));
-             else
-               {
-                 putc(c, fguard);
-                 c = getc(finput);
-               }
-           }
-
+         copy_comment (finput, fguard, c);

          break;
 
        case '$':
          break;
 
        case '$':


@@ -1136,18 +1122,19 @@ copy_guard (symbol_list *rule, int stack_offset)
          if (c == '$')
            {
              fprintf(fguard, "yyval");
          if (c == '$')
            {
              fprintf(fguard, "yyval");

-             if (!type_name) type_name = rule->sym->type_name;
+             if (!type_name)
+               type_name = rule->sym->type_name;

              if (type_name)
                fprintf(fguard, ".%s", type_name);
              if(!type_name && typed)
              if (type_name)
                fprintf(fguard, ".%s", type_name);
              if(!type_name && typed)

-               warns(_("$$ of `%s' has no declared type"), rule->sym->tag);
+               complain (_("$$ of `%s' has no declared type"),
+                         rule->sym->tag);

            }
            }

-

          else if (isdigit(c) || c == '-')
            {
              ungetc (c, finput);
          else if (isdigit(c) || c == '-')
            {
              ungetc (c, finput);

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

 
              if (!type_name && n > 0)
                type_name = get_type_name(n, rule);
 
              if (!type_name && n > 0)
                type_name = get_type_name(n, rule);


@@ -1155,39 +1142,25 @@ copy_guard (symbol_list *rule, int stack_offset)
              fprintf(fguard, "yyvsp[%d]", n - stack_offset);
              if (type_name)
                fprintf(fguard, ".%s", type_name);
              fprintf(fguard, "yyvsp[%d]", n - stack_offset);
              if (type_name)
                fprintf(fguard, ".%s", type_name);

-             if(!type_name && typed)
-               warnss(_("$%s of `%s' has no declared type"), int_to_string(n), rule->sym->tag);
+             if (!type_name && typed)
+               complain (_("$%d of `%s' has no declared type"),
+                         n, rule->sym->tag);

              continue;
            }
          else
              continue;
            }
          else

-           warns(_("$%s is invalid"), printable_version(c));
-
+           complain (_("$%s is invalid"), printable_version (c));

          break;
 
        case '@':
          break;
 
        case '@':

-         c = getc(finput);
-         if (isdigit(c) || c == '-')
-           {
-             ungetc (c, finput);
-             n = read_signed_integer(finput);
-             c = getc(finput);
-           }
-         else
-           {
-             warns(_("@%s is invalid"), printable_version(c));
-             n = 1;
-           }
-
-         fprintf(fguard, "yylsp[%d]", n - stack_offset);
-         yylsp_needed = 1;
-
-         continue;
+         copy_at (finput, fguard, stack_offset);
+         break;

 
        case EOF:
 
        case EOF:

-         fatal(_("unterminated %%guard clause"));
+         fatal ("%s",
+                _("unterminated %guard clause"));

 
        default:
 
        default:

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

        }
 
       if (c != '}' || count != 0)
        }
 
       if (c != '}' || count != 0)


@@ -1198,12 +1171,12 @@ copy_guard (symbol_list *rule, int stack_offset)
 
   fprintf(fguard, ";\n    break;}");
   if (c == '{')
 
   fprintf(fguard, ";\n    break;}");
   if (c == '{')

-    copy_action(rule, stack_offset);
+    copy_action (rule, stack_offset);

   else if (c == '=')
     {
       c = getc(finput);        /* why not skip_white_space -wjh */
       if (c == '{')
   else if (c == '=')
     {
       c = getc(finput);        /* why not skip_white_space -wjh */
       if (c == '{')

-       copy_action(rule, stack_offset);
+       copy_action (rule, stack_offset);

     }
   else
     ungetc(c, finput);
     }
   else
     ungetc(c, finput);


@@ -1211,10 +1184,10 @@ copy_guard (symbol_list *rule, int stack_offset)
 
 
 
 
 
 

-/* Assuming that a { has just been seen, copy everything up to the matching }
-into the actions file.
-stack_offset is the number of values in the current rule so far,
-which says where to find $0 with respect to the top of the stack.  */
+/* Assuming that a `{' has just been seen, copy everything up to the
+   matching `}' into the actions file.  STACK_OFFSET is the number of
+   values in the current rule so far, which says where to find `$0'
+   with respect to the top of the stack.  */

 
 void
 copy_action (symbol_list *rule, int stack_offset)
 
 void
 copy_action (symbol_list *rule, int stack_offset)


@@ -1222,18 +1195,16 @@ copy_action (symbol_list *rule, int stack_offset)
   register int c;
   register int n;
   register int count;
   register int c;
   register int n;
   register int count;

-  register int match;
-  register int ended;

   register char *type_name;
   register char *type_name;

-  int cplus_comment;

 
   /* offset is always 0 if parser has already popped the stack pointer */
 
   /* offset is always 0 if parser has already popped the stack pointer */

-  if (semantic_parser) stack_offset = 0;
+  if (semantic_parser)
+    stack_offset = 0;

 
 

-  fprintf(faction, "\ncase %d:\n", nrules);
+  fprintf (faction, "\ncase %d:\n", nrules);

   if (!nolinesflag)
   if (!nolinesflag)

-    fprintf(faction, "#line %d \"%s\"\n", lineno, infile);
-  putc('{', faction);
+    fprintf (faction, "#line %d \"%s\"\n", lineno, infile);
+  putc ('{', faction);

 
   count = 1;
   c = getc(finput);
 
   count = 1;
   c = getc(finput);


@@ -1256,38 +1227,7 @@ copy_action (symbol_list *rule, int stack_offset)
 
            case '\'':
            case '"':
 
            case '\'':
            case '"':

-             match = c;
-             putc(c, faction);
-             c = getc(finput);
-
-             while (c != match)
-               {
-                 if (c == '\n')
-                   {
-                     warn(_("unterminated string"));
-                     ungetc(c, finput);
-                     c = match;
-                     continue;
-                   }
-                 else if (c == EOF)
-                   fatal(_("unterminated string at end of file"));
-
-                 putc(c, faction);
-
-                 if (c == '\\')
-                   {
-                     c = getc(finput);
-                     if (c == EOF)
-                       fatal(_("unterminated string"));
-                     putc(c, faction);
-                     if (c == '\n')
-                       lineno++;
-                   }
-
-                 c = getc(finput);
-               }
-
-             putc(c, faction);
+             copy_string (finput, faction, c);

              break;
 
            case '/':
              break;
 
            case '/':


@@ -1295,46 +1235,7 @@ copy_action (symbol_list *rule, int stack_offset)
              c = getc(finput);
              if (c != '*' && c != '/')
                continue;
              c = getc(finput);
              if (c != '*' && c != '/')
                continue;

-
-             cplus_comment = (c == '/');
-             putc(c, faction);
-             c = getc(finput);
-
-             ended = 0;
-             while (!ended)
-               {
-                 if (!cplus_comment && c == '*')
-                   {
-                     while (c == '*')
-                       {
-                         putc(c, faction);
-                         c = getc(finput);
-                       }
-
-                     if (c == '/')
-                       {
-                         putc(c, faction);
-                         ended = 1;
-                       }
-                   }
-                 else if (c == '\n')
-                   {
-                     lineno++;
-                     putc(c, faction);
-                     if (cplus_comment)
-                       ended = 1;
-                     else
-                       c = getc(finput);
-                   }
-                 else if (c == EOF)
-                   fatal(_("unterminated comment"));
-                 else
-                   {
-                     putc(c, faction);
-                     c = getc(finput);
-                   }
-               }
-
+             copy_comment (finput, faction, c);

              break;
 
            case '$':
              break;
 
            case '$':


@@ -1361,11 +1262,13 @@ copy_action (symbol_list *rule, int stack_offset)
              if (c == '$')
                {
                  fprintf(faction, "yyval");
              if (c == '$')
                {
                  fprintf(faction, "yyval");

-                 if (!type_name) type_name = get_type_name(0, rule);
+                 if (!type_name)
+                   type_name = get_type_name(0, rule);

                  if (type_name)
                    fprintf(faction, ".%s", type_name);
                  if(!type_name && typed)
                  if (type_name)
                    fprintf(faction, ".%s", type_name);
                  if(!type_name && typed)

-                   warns(_("$$ of `%s' has no declared type"), rule->sym->tag);
+                   complain (_("$$ of `%s' has no declared type"),
+                             rule->sym->tag);

                }
              else if (isdigit(c) || c == '-')
                {
                }
              else if (isdigit(c) || c == '-')
                {


@@ -1380,36 +1283,21 @@ copy_action (symbol_list *rule, int stack_offset)
                  if (type_name)
                    fprintf(faction, ".%s", type_name);
                  if(!type_name && typed)
                  if (type_name)
                    fprintf(faction, ".%s", type_name);
                  if(!type_name && typed)

-                   warnss(_("$%s of `%s' has no declared type"),
-                               int_to_string(n), rule->sym->tag);
+                   complain (_("$%d of `%s' has no declared type"),
+                             n, rule->sym->tag);

                  continue;
                }
              else
                  continue;
                }
              else

-               warns(_("$%s is invalid"), printable_version(c));
+               complain (_("$%s is invalid"), printable_version (c));

 
              break;
 
            case '@':
 
              break;
 
            case '@':

-             c = getc(finput);
-             if (isdigit(c) || c == '-')
-               {
-                 ungetc (c, finput);
-                 n = read_signed_integer(finput);
-                 c = getc(finput);
-               }
-             else
-               {
-                 warn(_("invalid @-construct"));
-                 n = 1;
-               }
-
-             fprintf(faction, "yylsp[%d]", n - stack_offset);
-             yylsp_needed = 1;
-
-             continue;
+             copy_at (finput, faction, stack_offset);
+             break;

 
            case EOF:
 
            case EOF:

-             fatal(_("unmatched `{'"));
+             fatal (_("unmatched `{'"));

 
            default:
              putc(c, faction);
 
            default:
              putc(c, faction);


@@ -1444,7 +1332,7 @@ gensym (void)
   sym = getsym(token_buffer);
   sym->class = SNTERM;
   sym->value = nvars++;
   sym = getsym(token_buffer);
   sym->class = SNTERM;
   sym->value = nvars++;

-  return (sym);
+  return sym;

 }
 
 /* Parse the input grammar into a one symbol_list structure.
 }
 
 /* Parse the input grammar into a one symbol_list structure.


@@ -1495,14 +1383,14 @@ readgram (void)
              t = lex();
              if (t != COLON)
                {
              t = lex();
              if (t != COLON)
                {

-                 warn(_("ill-formed rule: initial symbol not followed by colon"));
+                 complain (_("ill-formed rule: initial symbol not followed by colon"));

                  unlex(t);
                }
            }
 
          if (nrules == 0 && t == BAR)
            {
                  unlex(t);
                }
            }
 
          if (nrules == 0 && t == BAR)
            {

-             warn(_("grammar starts with vertical bar"));
+             complain (_("grammar starts with vertical bar"));

              lhs = symval;     /* BOGUS: use a random symval */
            }
          /* start a new rule and record its lhs.  */
              lhs = symval;     /* BOGUS: use a random symval */
            }
          /* start a new rule and record its lhs.  */


@@ -1533,7 +1421,7 @@ readgram (void)
              nvars++;
            }
          else if (lhs->class == STOKEN)
              nvars++;
            }
          else if (lhs->class == STOKEN)

-           warns(_("rule given for %s, which is a token"), lhs->tag);
+           complain (_("rule given for %s, which is a token"), lhs->tag);

 
          /* read the rhs of the rule.  */
 
 
          /* read the rhs of the rule.  */
 


@@ -1631,7 +1519,7 @@ readgram (void)
 
          if (t == PREC)
            {
 
          if (t == PREC)
            {

-             warn(_("two @prec's in a row"));
+             complain (_("two @prec's in a row"));

              t = lex();
              crule->ruleprec = symval;
              t = lex();
              t = lex();
              crule->ruleprec = symval;
              t = lex();


@@ -1639,7 +1527,8 @@ readgram (void)
          if (t == GUARD)
            {
              if (! semantic_parser)
          if (t == GUARD)
            {
              if (! semantic_parser)

-               warn(_("%%guard present but %%semantic_parser not specified"));
+               complain ("%s",
+                         _("%guard present but %semantic_parser not specified"));

 
              copy_guard(crule, rulelength);
              t = lex();
 
              copy_guard(crule, rulelength);
              t = lex();


@@ -1647,25 +1536,29 @@ readgram (void)
          else if (t == LEFT_CURLY)
            {
                /* This case never occurs -wjh */
          else if (t == LEFT_CURLY)
            {
                /* This case never occurs -wjh */

-             if (actionflag)  warn(_("two actions at end of one rule"));
+             if (actionflag)
+               complain (_("two actions at end of one rule"));

              copy_action(crule, rulelength);
              actionflag = 1;
              xactions++;       /* -wjh */
              t = lex();
            }
              copy_action(crule, rulelength);
              actionflag = 1;
              xactions++;       /* -wjh */
              t = lex();
            }

-         /* If $$ is being set in default way,
-            warn if any type mismatch.  */
-         else if (!xactions && first_rhs && lhs->type_name != first_rhs->type_name)
+         /* If $$ is being set in default way, report if any type
+            mismatch.  */
+         else if (!xactions
+                  && first_rhs
+                  && lhs->type_name != first_rhs->type_name)

            {
            {

-             if (lhs->type_name == 0 || first_rhs->type_name == 0
+             if (lhs->type_name == 0
+                 || first_rhs->type_name == 0

                  || strcmp(lhs->type_name,first_rhs->type_name))
                  || strcmp(lhs->type_name,first_rhs->type_name))

-               warnss(_("type clash (`%s' `%s') on default action"),
-                       lhs->type_name ? lhs->type_name : "",
-                       first_rhs->type_name ? first_rhs->type_name : "");
+               complain (_("type clash (`%s' `%s') on default action"),
+                         lhs->type_name ? lhs->type_name : "",
+                            first_rhs->type_name ? first_rhs->type_name : "");

            }
          /* Warn if there is no default for $$ but we need one.  */
          else if (!xactions && !first_rhs && lhs->type_name != 0)
            }
          /* Warn if there is no default for $$ but we need one.  */
          else if (!xactions && !first_rhs && lhs->type_name != 0)

-           warn(_("empty rule for typed nonterminal, and no action"));
+           complain (_("empty rule for typed nonterminal, and no action"));

          if (t == SEMICOLON)
            t = lex();
        }
          if (t == SEMICOLON)
            t = lex();
        }


@@ -1709,7 +1602,7 @@ readgram (void)
 
       else
        {
 
       else
        {

-         warns(_("invalid input: %s"), token_buffer);
+         complain (_("invalid input: %s"), token_buffer);

          t = lex();
        }
     }
          t = lex();
        }
     }


@@ -1717,10 +1610,10 @@ readgram (void)
   /* grammar has been read.  Do some checking */
 
   if (nsyms > MAXSHORT)
   /* grammar has been read.  Do some checking */
 
   if (nsyms > MAXSHORT)

-    fatals(_("too many symbols (tokens plus nonterminals); maximum %s"),
-          int_to_string(MAXSHORT));
+    fatal (_("too many symbols (tokens plus nonterminals); maximum %d"),
+          MAXSHORT);

   if (nrules == 0)
   if (nrules == 0)

-    fatal(_("no rules in the input grammar"));
+    fatal (_("no rules in the input grammar"));

 
   if (typed == 0       /* JF put out same default YYSTYPE as YACC does */
       && !value_components_used)
 
   if (typed == 0       /* JF put out same default YYSTYPE as YACC does */
       && !value_components_used)


@@ -1738,8 +1631,8 @@ readgram (void)
   for (bp = firstsymbol; bp; bp = bp->next)
     if (bp->class == SUNKNOWN)
       {
   for (bp = firstsymbol; bp; bp = bp->next)
     if (bp->class == SUNKNOWN)
       {

-       warns(_("symbol %s is used, but is not defined as a token and has no rules"),
-                       bp->tag);
+       complain (_("symbol %s is used, but is not defined as a token and has no rules"),
+                 bp->tag);

        bp->class = SNTERM;
        bp->value = nvars++;
       }
        bp->class = SNTERM;
        bp->value = nvars++;
       }


@@ -1777,7 +1670,7 @@ get_type (void)
 
   if (t != TYPENAME)
     {
 
   if (t != TYPENAME)
     {

-      warn(_("ill-formed %type declaration"));
+      complain (_("ill-formed %type declaration"));

       return t;
     }
 
       return t;
     }
 


@@ -1792,7 +1685,7 @@ get_type (void)
       switch (t)
        {
        case SEMICOLON:
       switch (t)
        {
        case SEMICOLON:

-         return (lex());
+         return lex();

 
        case COMMA:
          break;
 
        case COMMA:
          break;


@@ -1801,20 +1694,21 @@ get_type (void)
          if (symval->type_name == NULL)
            symval->type_name = name;
          else if (strcmp(name, symval->type_name) != 0)
          if (symval->type_name == NULL)
            symval->type_name = name;
          else if (strcmp(name, symval->type_name) != 0)

-           warns(_("type redeclaration for %s"), symval->tag);
+           complain (_("type redeclaration for %s"), symval->tag);

 
          break;
 
        default:
 
          break;
 
        default:

-         return (t);
+         return t;

        }
     }
 }
 #endif
 
 
        }
     }
 }
 #endif
 
 

-/* assign symbol numbers, and write definition of token names into fdefines.
-Set up vectors tags and sprec of names and precedences of symbols.  */
+/* Assign symbol numbers, and write definition of token names into
+   fdefines.  Set up vectors tags and sprec of names and precedences
+   of symbols.  */

 
 void
 packsymbols (void)
 
 void
 packsymbols (void)


@@ -1845,34 +1739,38 @@ packsymbols (void)
        }
       else if (bp->alias)
        {
        }
       else if (bp->alias)
        {

-               /* this symbol and its alias are a single token defn.
-                 allocate a tokno, and assign to both
-                 check agreement of ->prec and ->assoc fields
-                       and make both the same
-               */
-               if (bp->value == 0)
-                       bp->value = bp->alias->value = tokno++;
-
-               if (bp->prec != bp->alias->prec) {
-                       if (bp->prec != 0 && bp->alias->prec != 0
-                                       && bp->user_token_number == SALIAS)
-                               warnss(_("conflicting precedences for %s and %s"),
-                                       bp->tag, bp->alias->tag);
-                       if (bp->prec != 0) bp->alias->prec = bp->prec;
-                       else bp->prec = bp->alias->prec;
-               }
+         /* this symbol and its alias are a single token defn.
+            allocate a tokno, and assign to both check agreement of
+            ->prec and ->assoc fields and make both the same */
+         if (bp->value == 0)
+           bp->value = bp->alias->value = tokno++;

 
 

-               if (bp->assoc != bp->alias->assoc) {
-                       if (bp->assoc != 0 && bp->alias->assoc != 0
-                                       && bp->user_token_number == SALIAS)
-                               warnss(_("conflicting assoc values for %s and %s"),
-                                       bp->tag, bp->alias->tag);
-                       if (bp->assoc != 0) bp->alias->assoc = bp->assoc;
-                       else bp->assoc = bp->alias->assoc;
-               }
+         if (bp->prec != bp->alias->prec)
+           {
+             if (bp->prec != 0 && bp->alias->prec != 0
+                 && bp->user_token_number == SALIAS)
+               complain (_("conflicting precedences for %s and %s"),
+                         bp->tag, bp->alias->tag);
+             if (bp->prec != 0)
+               bp->alias->prec = bp->prec;
+             else
+               bp->prec = bp->alias->prec;
+           }

 
 

-               if (bp->user_token_number == SALIAS)
-                       continue;  /* do not do processing below for SALIASs */
+         if (bp->assoc != bp->alias->assoc)
+           {
+             if (bp->assoc != 0 && bp->alias->assoc != 0
+                 && bp->user_token_number == SALIAS)
+               complain (_("conflicting assoc values for %s and %s"),
+                         bp->tag, bp->alias->tag);
+             if (bp->assoc != 0)
+               bp->alias->assoc = bp->assoc;
+             else
+               bp->assoc = bp->alias->assoc;
+           }
+
+         if (bp->user_token_number == SALIAS)
+           continue;  /* do not do processing below for SALIASs */

 
        }
       else  /* bp->class == STOKEN */
 
        }
       else  /* bp->class == STOKEN */


@@ -1901,21 +1799,23 @@ packsymbols (void)
 
       token_translations = NEW2(max_user_token_number+1, short);
 
 
       token_translations = NEW2(max_user_token_number+1, short);
 

-      /* initialize all entries for literal tokens to 2,
-        the internal token number for $undefined.,
-        which represents all invalid inputs.  */
+      /* initialize all entries for literal tokens to 2, the internal
+        token number for $undefined., which represents all invalid
+        inputs.  */

       for (i = 0; i <= max_user_token_number; i++)
         token_translations[i] = 2;
 
       for (bp = firstsymbol; bp; bp = bp->next)
         {
       for (i = 0; i <= max_user_token_number; i++)
         token_translations[i] = 2;
 
       for (bp = firstsymbol; bp; bp = bp->next)
         {

-          if (bp->value >= ntokens) continue;            /* non-terminal */
-          if (bp->user_token_number == SALIAS) continue;
+          if (bp->value >= ntokens)
+           continue;             /* non-terminal */
+          if (bp->user_token_number == SALIAS)
+           continue;

           if (token_translations[bp->user_token_number] != 2)
           if (token_translations[bp->user_token_number] != 2)

-           warnsss(_("tokens %s and %s both assigned number %s"),
-                             tags[token_translations[bp->user_token_number]],
-                             bp->tag,
-                             int_to_string(bp->user_token_number));
+           complain (_("tokens %s and %s both assigned number %d"),
+                     tags[token_translations[bp->user_token_number]],
+                 bp->tag,
+                 bp->user_token_number);

           token_translations[bp->user_token_number] = bp->value;
         }
     }
           token_translations[bp->user_token_number] = bp->value;
         }
     }


@@ -1926,9 +1826,9 @@ packsymbols (void)
     output_token_defines(ftable);
 
   if (startval->class == SUNKNOWN)
     output_token_defines(ftable);
 
   if (startval->class == SUNKNOWN)

-    fatals(_("the start symbol %s is undefined"), startval->tag);
+    fatal (_("the start symbol %s is undefined"), startval->tag);

   else if (startval->class == STOKEN)
   else if (startval->class == STOKEN)

-    fatals(_("the start symbol %s is a token"), startval->tag);
+    fatal (_("the start symbol %s is a token"), startval->tag);

 
   start_symbol = startval->value;
 
 
   start_symbol = startval->value;
 


@@ -1960,9 +1860,9 @@ packsymbols (void)
     }
 }
 
     }
 }
 

-/* For named tokens, but not literal ones, define the name.
-   The value is the user token number.
-*/
+/* For named tokens, but not literal ones, define the name.  The value
+   is the user token number.  */
+

 void
 output_token_defines (FILE *file)
 {
 void
 output_token_defines (FILE *file)
 {


@@ -1992,12 +1892,12 @@ output_token_defines (FILE *file)
       while ((c = *cp++) && c != '.');
       if (c != '\0')  continue;
 
       while ((c = *cp++) && c != '.');
       if (c != '\0')  continue;
 

-      fprintf(file, "#define\t%s\t%d\n", symbol,
-               ((translations && ! rawtoknumflag)
-                       ? bp->user_token_number
-                       : bp->value));
+      fprintf (file, "#define\t%s\t%d\n", symbol,
+              ((translations && ! rawtoknumflag)
+               ? bp->user_token_number
+               : bp->value));

       if (semantic_parser)
       if (semantic_parser)

-        fprintf(file, "#define\tT%s\t%d\n", symbol, bp->value);
+        fprintf (file, "#define\tT%s\t%d\n", symbol, bp->value);

     }
 
   putc('\n', file);
     }
 
   putc('\n', file);