Also test parse error messages, including with YYERROR_VERBOSE.

[bison.git] / src / lex.c

diff --git a/src/lex.c b/src/lex.c
index abcf199e2811cdf2bfd82e4cdc869b93239ecfb7..4ed8d457ed9f1a5932b581220760d35497a0fd8e 100644 (file)
--- a/src/lex.c
+++ b/src/lex.c
@@ -418,7 +418,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;


@@ -440,7 +440,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;
       }


@@ -548,8 +548,8 @@ percent_table[] =
        But %{ and %union both put information into files
        that have to be opened before read_declarations().
      */
        But %{ and %union both put information into files
        that have to be opened before read_declarations().
      */

-  { "yacc", &fixed_outfiles, NOOP},                    /* -y */
-  { "fixed_output_files", &fixed_outfiles, NOOP},      /* -y */
+  { "yacc", &yaccflag, NOOP},                  /* -y */
+  { "fixed_output_files", &yaccflag, NOOP},    /* -y */

   { "defines", &definesflag, NOOP},                    /* -d */
   { "no_parser", &noparserflag, NOOP},                 /* -n */
   { "output_file", &spec_outfile, SETOPT},             /* -o */
   { "defines", &definesflag, NOOP},                    /* -d */
   { "no_parser", &noparserflag, NOOP},                 /* -n */
   { "output_file", &spec_outfile, SETOPT},             /* -o */