* src/bison.s1: Properly indent CPP directives.

[bison.git] / src / lex.c

diff --git a/src/lex.c b/src/lex.c
index c73bc40f820fcc167d4a1de2863ca9c4597c6789..3a51c9741e84498a6f27761136a6ea3647b61a3b 100644 (file)
--- a/src/lex.c
+++ b/src/lex.c
@@ -15,7 +15,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
@@ -26,7 +27,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    symval is set to a pointer to the entry found.  */
 
 #include <stdio.h>
-#include <ctype.h>
 #include "system.h"
 #include "files.h"
 #include "getopt.h"            /* for optarg */
@@ -50,19 +50,27 @@ extern char *spec_file_prefix;      /* for -b */
 extern int lineno;
 extern int translations;
 
-int parse_percent_token();
+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));
 
 /* functions from main.c */
-extern char *printable_version();
-extern void fatal();
-extern void warni();
-extern void warn();
+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;
 
 /* Allocated size of token_buffer, not including space for terminator.  */
-static int maxtoken;
+int maxtoken;
 
 bucket *symval;
 int numval;
@@ -72,7 +80,7 @@ static bucket *unlexed_symval;        /* by the next call to lex */
 
 
 void
-init_lex()
+init_lex (void)
 {
   maxtoken = 100;
   token_buffer = NEW2 (maxtoken + 1, char);
@@ -80,9 +88,8 @@ init_lex()
 }
 
 
-static char *
-grow_token_buffer (p)
-     char *p;
+char *
+grow_token_buffer (char *p)
 {
   int offset = p - token_buffer;
   maxtoken *= 2;
@@ -92,7 +99,7 @@ grow_token_buffer (p)
 
 
 int
-skip_white_space()
+skip_white_space (void)
 {
   register int c;
   register int inside;
@@ -162,8 +169,7 @@ skip_white_space()
 
 /* do a getc, but give error message if EOF encountered */
 int
-safegetc(f)
-  FILE *f;
+safegetc (FILE *f)
 {
   register int c = getc(f);
   if (c == EOF)
@@ -178,10 +184,7 @@ safegetc(f)
        report error for \n
 */
 int
-literalchar(pp, pcode, term)
-  char **pp;
-  int *pcode;
-  char term;
+literalchar (char **pp, int *pcode, char term)
 {
   register int c;
   register char *p;
@@ -211,7 +214,7 @@ literalchar(pp, pcode, term)
       else if (c == 'r')  code = '\r';
       else if (c == 'f')  code = '\f';
       else if (c == 'b')  code = '\b';
-      else if (c == 'v')  code = 013;
+      else if (c == 'v')  code = '\013';
       else if (c == '\\')  code = '\\';
       else if (c == '\'')  code = '\'';
       else if (c == '\"')  code = '\"';
@@ -268,7 +271,9 @@ literalchar(pp, pcode, term)
      so that `\012' and `\n' can be interchangeable.  */
 
   p = *pp;
-  if (code == '\\')  {*p++ = '\\'; *p++ = '\\';}
+  if (code == term && wasquote)
+    *p++ = code;
+  else if (code == '\\')  {*p++ = '\\'; *p++ = '\\';}
   else if (code == '\'')  {*p++ = '\\'; *p++ = '\'';}
   else if (code == '\"')  {*p++ = '\\'; *p++ = '\"';}
   else if (code >= 040 && code < 0177)
@@ -293,8 +298,7 @@ literalchar(pp, pcode, term)
 
 
 void
-unlex(token)
-     int token;
+unlex (int token)
 {
   unlexed = token;
   unlexed_symval = symval;
@@ -302,7 +306,7 @@ unlex(token)
 
 
 int
-lex()
+lex (void)
 {
   register int c;
   char *p;
@@ -542,8 +546,8 @@ struct percent_table_struct {
   /* These would be acceptable, but they do not affect processing */
   {"verbose", &verboseflag, NOOP}, /* -v */
   {"debug", &debugflag, NOOP}, /* -t */
-  /*   {"help", <print usage stmt>, NOOP},     /* -h */
-  /*   {"version", <print version number> ,  NOOP},    /* -V */
+  /*   {"help", <print usage stmt>, NOOP},*/   /* -h */
+  /*   {"version", <print version number> ,  NOOP},*/  /* -V */
 #endif
 
   {NULL, NULL, ILLEGAL}
@@ -553,7 +557,7 @@ struct percent_table_struct {
    Assumes the % has already been read and discarded.  */
 
 int
-parse_percent_token ()
+parse_percent_token (void)
 {
   register int c;
   register char *p;