* src/output.c: Formatting changes.

[bison.git] / src / lex.c

diff --git a/src/lex.c b/src/lex.c
index 3a51c9741e84498a6f27761136a6ea3647b61a3b..b236ea4393ff254d10f5470933fb78c5c2c431be 100644 (file)
--- a/src/lex.c
+++ b/src/lex.c
@@ -1,22 +1,22 @@
 /* Token-reader for Bison's input parser,
 /* Token-reader for Bison's input parser,

-   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, 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.  */

 
 
 /*
 
 
 /*


@@ -26,45 +26,31 @@ Boston, MA 02111-1307, USA.  */
    and the name is looked up in the symbol table using symtab.c;
    symval is set to a pointer to the entry found.  */
 
    and the name is looked up in the symbol table using symtab.c;
    symval is set to a pointer to the entry found.  */
 

-#include <stdio.h>

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

+#include "getargs.h"

 #include "files.h"
 #include "getopt.h"            /* for optarg */
 #include "symtab.h"
 #include "lex.h"
 #include "alloc.h"
 #include "files.h"
 #include "getopt.h"            /* for optarg */
 #include "symtab.h"
 #include "lex.h"
 #include "alloc.h"

+#include "complain.h"

 
 

-/* flags set by % directives */
-extern int definesflag;        /* for -d */
-extern int toknumflag;         /* for -k */
-extern int noparserflag;       /* for -n */
-extern int fixed_outfiles;     /* for -y */
-extern int nolinesflag;        /* for -l */
-extern int rawtoknumflag;      /* for -r */
-extern int verboseflag;        /* for -v */
-extern int debugflag;                  /* for -t */
-extern char *spec_name_prefix;         /* for -p */
-extern char *spec_file_prefix; /* for -b */

 /*spec_outfile is declared in files.h, for -o */
 
 /*spec_outfile is declared in files.h, for -o */
 

-extern int lineno;

 extern int translations;
 
 extern int translations;
 

-void init_lex PARAMS((void));
-char *grow_token_buffer PARAMS((char *));
-int skip_white_space PARAMS((void));
-int safegetc PARAMS((FILE *));
-int literalchar PARAMS((char **, int *, char));
-void unlex PARAMS((int));
-int lex PARAMS((void));
-int parse_percent_token PARAMS((void));
+extern void init_lex PARAMS((void));
+extern char *grow_token_buffer PARAMS((char *));
+extern int skip_white_space PARAMS((void));
+extern void unlex PARAMS((int));
+extern int lex PARAMS((void));
+extern int parse_percent_token PARAMS((void));
+
+static int safegetc PARAMS((FILE *));
+static int literalchar PARAMS((char **, int *, char));

 
 /* functions from main.c */
 extern char *printable_version PARAMS((int));
 
 /* functions from main.c */
 extern char *printable_version PARAMS((int));

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

 
 /* Buffer for storing the current token.  */
 char *token_buffer;
 
 /* Buffer for storing the current token.  */
 char *token_buffer;


@@ -116,7 +102,7 @@ skip_white_space (void)
          c = getc(finput);
          if (c != '*' && c != '/')
            {
          c = getc(finput);
          if (c != '*' && c != '/')
            {

-             warn(_("unexpected `/' found and ignored"));
+             complain (_("unexpected `/' found and ignored"));

              break;
            }
          cplus_comment = (c == '/');
              break;
            }
          cplus_comment = (c == '/');


@@ -145,7 +131,7 @@ skip_white_space (void)
                  c = getc(finput);
                }
              else if (c == EOF)
                  c = getc(finput);
                }
              else if (c == EOF)

-               fatal(_("unterminated comment"));
+               fatal (_("unterminated comment"));

              else
                c = getc(finput);
            }
              else
                c = getc(finput);
            }


@@ -162,18 +148,18 @@ skip_white_space (void)
          break;
 
        default:
          break;
 
        default:

-         return (c);
+         return c;

        }
     }
 }
 
 /* do a getc, but give error message if EOF encountered */
        }
     }
 }
 
 /* do a getc, but give error message if EOF encountered */

-int
+static int

 safegetc (FILE *f)
 {
   register int c = getc(f);
   if (c == EOF)
 safegetc (FILE *f)
 {
   register int c = getc(f);
   if (c == EOF)

-    fatal(_("Unexpected end of file"));
+    fatal (_("unexpected end of file"));

   return c;
 }
 
   return c;
 }
 


@@ -183,7 +169,7 @@ safegetc (FILE *f)
    return 1 unless the character is an unescaped `term' or \n
        report error for \n
 */
    return 1 unless the character is an unescaped `term' or \n
        report error for \n
 */

-int
+static int

 literalchar (char **pp, int *pcode, char term)
 {
   register int c;
 literalchar (char **pp, int *pcode, char term)
 {
   register int c;


@@ -194,7 +180,7 @@ literalchar (char **pp, int *pcode, char term)
   c = safegetc(finput);
   if (c == '\n')
     {
   c = safegetc(finput);
   if (c == '\n')
     {

-      warn(_("unescaped newline in constant"));
+      complain (_("unescaped newline in constant"));

       ungetc(c, finput);
       code = '?';
       wasquote = 1;
       ungetc(c, finput);
       code = '?';
       wasquote = 1;


@@ -226,7 +212,8 @@ literalchar (char **pp, int *pcode, char term)
              code = (code * 8) + (c - '0');
              if (code >= 256 || code < 0)
                {
              code = (code * 8) + (c - '0');
              if (code >= 256 || code < 0)
                {

-                 warni(_("octal value outside range 0...255: `\\%o'"), code);
+                 complain (_("octal value outside range 0...255: `\\%o'"),
+                           code);

                  code &= 0xFF;
                  break;
                }
                  code &= 0xFF;
                  break;
                }


@@ -250,7 +237,8 @@ literalchar (char **pp, int *pcode, char term)
                break;
              if (code >= 256 || code<0)
                {
                break;
              if (code >= 256 || code<0)
                {

-                 warni(_("hexadecimal value above 255: `\\x%x'"), code);
+                 complain (_("hexadecimal value above 255: `\\x%x'"),
+                           code);

                  code &= 0xFF;
                  break;
                }
                  code &= 0xFF;
                  break;
                }


@@ -260,8 +248,8 @@ literalchar (char **pp, int *pcode, char term)
        }
       else
        {
        }
       else
        {

-         warns (_("unknown escape sequence: `\\' followed by `%s'"),
-                printable_version(c));
+         complain (_("unknown escape sequence: `\\' followed by `%s'"),
+                   printable_version(c));

          code = '?';
        }
     } /* has \ */
          code = '?';
        }
     } /* has \ */


@@ -316,7 +304,7 @@ lex (void)
       symval = unlexed_symval;
       c = unlexed;
       unlexed = -1;
       symval = unlexed_symval;
       c = unlexed;
       unlexed = -1;

-      return (c);
+      return c;

     }
 
   c = skip_white_space();
     }
 
   c = skip_white_space();


@@ -327,7 +315,7 @@ lex (void)
     {
     case EOF:
       strcpy(token_buffer, "EOF");
     {
     case EOF:
       strcpy(token_buffer, "EOF");

-      return (ENDFILE);
+      return ENDFILE;

 
     case 'A':  case 'B':  case 'C':  case 'D':  case 'E':
     case 'F':  case 'G':  case 'H':  case 'I':  case 'J':
 
     case 'A':  case 'B':  case 'C':  case 'D':  case 'E':
     case 'F':  case 'G':  case 'H':  case 'I':  case 'J':


@@ -355,7 +343,7 @@ lex (void)
       *p = 0;
       ungetc(c, finput);
       symval = getsym(token_buffer);
       *p = 0;
       ungetc(c, finput);
       symval = getsym(token_buffer);

-      return (IDENTIFIER);
+      return IDENTIFIER;

 
     case '0':  case '1':  case '2':  case '3':  case '4':
     case '5':  case '6':  case '7':  case '8':  case '9':
 
     case '0':  case '1':  case '2':  case '3':  case '4':
     case '5':  case '6':  case '7':  case '8':  case '9':


@@ -374,7 +362,7 @@ lex (void)
          }
        *p = 0;
        ungetc(c, finput);
          }
        *p = 0;
        ungetc(c, finput);

-       return (NUMBER);
+       return NUMBER;

       }
 
     case '\'':
       }
 
     case '\'':


@@ -393,7 +381,7 @@ lex (void)
        c = getc(finput);
        if (c != '\'')
          {
        c = getc(finput);
        if (c != '\'')
          {

-           warn(_("use \"...\" for multi-character literal tokens"));
+           complain (_("use \"...\" for multi-character literal tokens"));

            while (1)
              {
                dp = discard;
            while (1)
              {
                dp = discard;


@@ -407,7 +395,7 @@ lex (void)
        symval->class = STOKEN;
        if (! symval->user_token_number)
          symval->user_token_number = code;
        symval->class = STOKEN;
        if (! symval->user_token_number)
          symval->user_token_number = code;

-       return (IDENTIFIER);
+       return IDENTIFIER;

       }
 
     case '\"':
       }
 
     case '\"':


@@ -429,23 +417,23 @@ lex (void)
        symval = getsym(token_buffer);
        symval->class = STOKEN;
 
        symval = getsym(token_buffer);
        symval->class = STOKEN;
 

-       return (IDENTIFIER);
+       return IDENTIFIER;

       }
 
     case ',':
       }
 
     case ',':

-      return (COMMA);
+      return COMMA;

 
     case ':':
 
     case ':':

-      return (COLON);
+      return COLON;

 
     case ';':
 
     case ';':

-      return (SEMICOLON);
+      return SEMICOLON;

 
     case '|':
 
     case '|':

-      return (BAR);
+      return BAR;

 
     case '{':
 
     case '{':

-      return (LEFT_CURLY);
+      return LEFT_CURLY;

 
     case '=':
       do
 
     case '=':
       do


@@ -458,12 +446,12 @@ lex (void)
       if (c == '{')
        {
          strcpy(token_buffer, "={");
       if (c == '{')
        {
          strcpy(token_buffer, "={");

-         return(LEFT_CURLY);
+         return LEFT_CURLY;

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

-         return(ILLEGAL);
+         return ILLEGAL;

        }
 
     case '<':
        }
 
     case '<':


@@ -472,10 +460,10 @@ lex (void)
       while (c != '>')
        {
          if (c == EOF)
       while (c != '>')
        {
          if (c == EOF)

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

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

-             warn(_("unterminated type name"));
+             complain (_("unterminated type name"));

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


@@ -487,14 +475,14 @@ lex (void)
          c = getc(finput);
        }
       *p = 0;
          c = getc(finput);
        }
       *p = 0;

-      return (TYPENAME);
+      return TYPENAME;

 
 
     case '%':
 
 
     case '%':

-      return (parse_percent_token());
+      return parse_percent_token();

 
     default:
 
     default:

-      return (ILLEGAL);
+      return ILLEGAL;

     }
 }
 
     }
 }
 


@@ -503,7 +491,7 @@ lex (void)
        set.  A retval action returns the code.
 */
 struct percent_table_struct {
        set.  A retval action returns the code.
 */
 struct percent_table_struct {

-       char *name;
+       const char *name;

        void *setflag;
        int retval;
 } percent_table[] =
        void *setflag;
        int retval;
 } percent_table[] =


@@ -572,28 +560,28 @@ parse_percent_token (void)
   switch (c)
     {
     case '%':
   switch (c)
     {
     case '%':

-      return (TWO_PERCENTS);
+      return TWO_PERCENTS;

 
     case '{':
 
     case '{':

-      return (PERCENT_LEFT_CURLY);
+      return PERCENT_LEFT_CURLY;

 
     case '<':
 
     case '<':

-      return (LEFT);
+      return LEFT;

 
     case '>':
 
     case '>':

-      return (RIGHT);
+      return RIGHT;

 
     case '2':
 
     case '2':

-      return (NONASSOC);
+      return NONASSOC;

 
     case '0':
 
     case '0':

-      return (TOKEN);
+      return TOKEN;

 
     case '=':
 
     case '=':

-      return (PREC);
+      return PREC;

     }
   if (!isalpha(c))
     }
   if (!isalpha(c))

-    return (ILLEGAL);
+    return ILLEGAL;

 
   p = token_buffer;
   *p++ = '%';
 
   p = token_buffer;
   *p++ = '%';