* src/lex.c (read_typename): New function.

[bison.git] / src / lex.c

diff --git a/src/lex.c b/src/lex.c
index cc27ccbb94f5e8c7d3da2f8ba39ad4af04c6edc0..c5d73082d8a502d697f65ff8e0fe3f629794c0c9 100644 (file)
--- a/src/lex.c
+++ b/src/lex.c
@@ -27,9 +27,7 @@
 #include "xalloc.h"
 #include "complain.h"
 #include "gram.h"
 #include "xalloc.h"
 #include "complain.h"
 #include "gram.h"

-
-/* functions from main.c */
-extern char *printable_version PARAMS ((int));
+#include "quote.h"

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


@@ -78,6 +76,7 @@ skip_white_space (void)
       switch (c)
        {
        case '/':
       switch (c)
        {
        case '/':

+         /* FIXME: Should probably be merged with copy_comment.  */

          c = getc (finput);
          if (c != '*' && c != '/')
            {
          c = getc (finput);
          if (c != '*' && c != '/')
            {


@@ -132,7 +131,11 @@ skip_white_space (void)
     }
 }
 
     }
 }
 

-/* do a getc, but give error message if EOF encountered */
+
+/*-----------------------------------------------------.
+| Do a getc, but give error message if EOF encountered |
+`-----------------------------------------------------*/
+

 static int
 xgetc (FILE *f)
 {
 static int
 xgetc (FILE *f)
 {


@@ -238,8 +241,10 @@ literalchar (char **pp, int *pcode, char term)
        }
       else
        {
        }
       else
        {

+         char buf [] = "c";
+         buf[0] = c;

          complain (_("unknown escape sequence: `\\' followed by `%s'"),
          complain (_("unknown escape sequence: `\\' followed by `%s'"),

-                   printable_version (c));
+                   quote (buf));

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


@@ -318,6 +323,37 @@ unlex (int token)
   unlexed_symval = symval;
 }
 
   unlexed_symval = symval;
 }
 

+/*-----------------------------------------------------------------.
+| We just read `<' from FIN.  Store in TOKEN_BUFFER, the type name |
+| specified between the `<...>'.                                   |
+`-----------------------------------------------------------------*/
+
+void
+read_type_name (FILE *fin)
+{
+  char *p = token_buffer;
+  int c = getc (fin);
+
+  while (c != '>')
+    {
+      if (c == EOF)
+       fatal (_("unterminated type name at end of file"));
+      if (c == '\n')
+       {
+         complain (_("unterminated type name"));
+         ungetc (c, fin);
+         break;
+       }
+
+      if (p == token_buffer + maxtoken)
+       p = grow_token_buffer (p);
+
+      *p++ = c;
+      c = getc (fin);
+    }
+  *p = 0;
+}
+

 
 int
 lex (void)
 
 int
 lex (void)


@@ -334,7 +370,8 @@ lex (void)
     }
 
   c = skip_white_space ();
     }
 
   c = skip_white_space ();

-  *token_buffer = c;           /* for error messages (token buffer always valid) */
+  /* for error messages (token buffer always valid) */
+  *token_buffer = c;

   token_buffer[1] = 0;
 
   switch (c)
   token_buffer[1] = 0;
 
   switch (c)


@@ -418,7 +455,7 @@ lex (void)
        *p++ = '\'';
        *p = 0;
        symval = getsym (token_buffer);
        *p++ = '\'';
        *p = 0;
        symval = getsym (token_buffer);

-       symval->class = STOKEN;
+       symval->class = token_sym;

        if (!symval->user_token_number)
          symval->user_token_number = code;
        return IDENTIFIER;
        if (!symval->user_token_number)
          symval->user_token_number = code;
        return IDENTIFIER;


@@ -432,7 +469,8 @@ lex (void)
        int code;               /* ignored here */
        p = token_buffer;
        *p++ = '\"';
        int code;               /* ignored here */
        p = token_buffer;
        *p++ = '\"';

-       while (literalchar (&p, &code, '\"'))   /* read up to and including " */
+       /* Read up to and including ".  */
+       while (literalchar (&p, &code, '\"'))

          {
            if (p >= token_buffer + maxtoken - 4)
              p = grow_token_buffer (p);
          {
            if (p >= token_buffer + maxtoken - 4)
              p = grow_token_buffer (p);


@@ -440,7 +478,7 @@ lex (void)
        *p = 0;
 
        symval = getsym (token_buffer);
        *p = 0;
 
        symval = getsym (token_buffer);

-       symval->class = STOKEN;
+       symval->class = token_sym;

 
        return IDENTIFIER;
       }
 
        return IDENTIFIER;
       }


@@ -481,29 +519,9 @@ lex (void)
        }
 
     case '<':
        }
 
     case '<':

-      p = token_buffer;
-      c = getc (finput);
-      while (c != '>')
-       {
-         if (c == EOF)
-           fatal (_("unterminated type name at end of file"));
-         if (c == '\n')
-           {
-             complain (_("unterminated type name"));
-             ungetc (c, finput);
-             break;
-           }
-
-         if (p == token_buffer + maxtoken)
-           p = grow_token_buffer (p);
-
-         *p++ = c;
-         c = getc (finput);
-       }
-      *p = 0;
+      read_type_name (finput);

       return TYPENAME;
 
       return TYPENAME;
 

-

     case '%':
       return parse_percent_token ();
 
     case '%':
       return parse_percent_token ();
 


@@ -513,12 +531,12 @@ lex (void)
 }
 
 /* the following table dictates the action taken for the various %
 }
 
 /* the following table dictates the action taken for the various %

-   directives.  A setflag value causes the named flag to be set.  A
+   directives.  A set_flag value causes the named flag to be set.  A

    retval action returns the code.  */
 struct percent_table_struct
 {
   const char *name;
    retval action returns the code.  */
 struct percent_table_struct
 {
   const char *name;

-  void *setflag;
+  void *set_flag;

   int retval;
 }
 percent_table[] =
   int retval;
 }
 percent_table[] =


@@ -539,25 +557,26 @@ percent_table[] =
   { "semantic_parser", NULL, SEMANTIC_PARSER },
   { "pure_parser", NULL, PURE_PARSER },
   { "prec", NULL, PREC },
   { "semantic_parser", NULL, SEMANTIC_PARSER },
   { "pure_parser", NULL, PURE_PARSER },
   { "prec", NULL, PREC },

-  { "no_lines", &nolinesflag, NOOP},   /* -l */
-  { "raw", &rawtoknumflag, NOOP },     /* -r */
-  { "token_table", &toknumflag, NOOP}, /* -k */
+  { "locations", &locations_flag, NOOP},       /* -l */
+  { "no_lines", &no_lines_flag, NOOP}, /* -l */
+  { "raw", &raw_flag, NOOP },  /* -r */
+  { "token_table", &token_table_flag, NOOP},   /* -k */

 #if 0
     /* These can be utilized after main is reoganized so
        open_files() is deferred 'til after read_declarations().
        But %{ and %union both put information into files
        that have to be opened before read_declarations().
      */
 #if 0
     /* These can be utilized after main is reoganized so
        open_files() is deferred 'til after read_declarations().
        But %{ and %union both put information into files
        that have to be opened before read_declarations().
      */

-  { "yacc", &yaccflag, NOOP},                  /* -y */
-  { "fixed_output_files", &yaccflag, NOOP},    /* -y */
-  { "defines", &definesflag, NOOP},                    /* -d */
-  { "no_parser", &noparserflag, NOOP},                 /* -n */
+  { "yacc", &yacc_flag, NOOP},                         /* -y */
+  { "fixed_output_files", &yacc_flag, NOOP},           /* -y */
+  { "defines", &defines_flag, NOOP},                   /* -d */
+  { "no_parser", &no_parser_flag, NOOP},               /* -n */

   { "output_file", &spec_outfile, SETOPT},             /* -o */
   { "file_prefix", &spec_file_prefix, SETOPT},         /* -b */
   { "name_prefix", &spec_name_prefix, SETOPT},         /* -p */
     /* These would be acceptable, but they do not affect processing */
   { "output_file", &spec_outfile, SETOPT},             /* -o */
   { "file_prefix", &spec_file_prefix, SETOPT},         /* -b */
   { "name_prefix", &spec_name_prefix, SETOPT},         /* -p */
     /* These would be acceptable, but they do not affect processing */

-  { "verbose", &verboseflag, NOOP},                    /* -v */
-  { "debug", &debugflag, NOOP},                                /* -t */
+  { "verbose", &verbose_flag, NOOP},                   /* -v */
+  { "debug", &debug_flag, NOOP},                       /* -t */

 /*    {"help", <print usage stmt>, NOOP}, *//* -h */
 /*    {"version", <print version number> ,  NOOP}, *//* -V */
 #endif
 /*    {"help", <print usage stmt>, NOOP}, *//* -h */
 /*    {"version", <print version number> ,  NOOP}, *//* -V */
 #endif


@@ -629,12 +648,12 @@ parse_percent_token (void)
       break;
   if (tx->retval == SETOPT)
     {
       break;
   if (tx->retval == SETOPT)
     {

-      *((char **) (tx->setflag)) = optarg;
+      *((char **) (tx->set_flag)) = optarg;

       return NOOP;
     }
       return NOOP;
     }

-  if (tx->setflag)
+  if (tx->set_flag)

     {
     {

-      *((int *) (tx->setflag)) = 1;
+      *((int *) (tx->set_flag)) = 1;

       return NOOP;
     }
   return tx->retval;
       return NOOP;
     }
   return tx->retval;