+2002-11-11 Paul Eggert <eggert@twinsun.com>
+
+ Revamp to fix many (but not all) of the C- and M4-related quoting
+ problems. Among other things, this fixes the Bison bug reported
+ by Jan Hubicka when processing the Bash grammar; see:
+ <http://mail.gnu.org/pipermail/bison-patches/2002-November/001329.html>
+
+ Use new @ escapes consistently. Represent brackets with @{ and @}
+ rather than @<:@ and @:>@, since this works a bit better with dumb
+ editors like vi. Represent @ with @@, since @ is now consistently
+ an escape. Use @oline@ and @ofile@ rather than __oline__ and
+ __ofile__, to avoid unexpected expansions. Similarly, use @output
+ rather than #output.
+
+ * data/c.m4 (b4_copyright): Omit file name from comment, since
+ the file name could contain "*/".
+ (b4_synclines_flag): Don't quote the 2nd argument; it should already
+ be quoted. All uses changed.
+
+ * data/glr.c: Use new @ escapes consistently.
+ (b4_input_suffix, b4_output_parser_suffix, b4_output_parser_name,
+ b4_output_header_suffix, b4_output_header_name, b4_header_guard):
+ Remove, since they couldn't handle arbitrary characters in file
+ names.
+ * data/lalr1.cc: Likewise.
+ * data/yacc.c: Likewise.
+
+ * src/files.c (output_infix): Remove; all uses removed.
+ * src/files.h: Likewise.
+
+ * data/glr.c: Remove use of "#ifdef b4_header_guard", since it
+ mishandled funny characters in file names, and anyway it isn't
+ needed any more.
+ * data/yacc.c: Likewise.
+ * data/lalr1.cc: Use YYSLP_NEEDED instead of b4_header_guard.
+
+ * data/glr.c (YYSTYPE_IS_TRIVIAL): Define when the .h file would.
+ * data/yacc.c: Likewise.
+
+ * src/muscle_tab.c: Include quotearg.h, since we need to quote C
+ strings now.
+ (muscle_init): Quote filename as a C string.
+ * src/muscle_tab.h (MUSCLE_GROW_STRING_PAIR): Remove; unused.
+ (MUSCLE_OBSTACK_SGROW, MUSCLE_INSERT_C_STRING): New macros.
+ * src/output.c (escaped_file_name_output): New function.
+ (prepare_symbols): Quote tokens for M4.
+ (prepare): Don't insert output_infix, output_prefix,
+ output_parser_name, output_header_name; this is now down by scan-skel.
+ Insert skeleton as a C string.
+
+ * src/output.c (user_actions_output, symbol_destructors_output,
+ symbol_printers_output): Quote filenames for C and M4.
+ * src/reader.c (prologue_augment, epilogue_set): Likewise.
+
+ * src/scan-gram.l (<SC_CHARACTER>): Don't worry about any backslash
+ escapes other than \\ and \'; this simplifies the code.
+ (<SC_STRING>): Likewise, for \\ and \".
+ (<SC_COMMENT,SC_LINE_COMMENT,SC_STRING,SC_CHARACTER,SC_BRACED_CODE,
+ SC_PROLOGUE,SC_EPILOGUE>): Escape $ and @, too.
+ Use new escapes @{ and @} for [ and ].
+
+ * src/scan-skel.l (yylineno, yyoutname): Remove static vars, replacing
+ them with auto vars.
+ Switch to new escape scheme, where @ is the escape character uniformly.
+ Abort if a stray escape character is found. Avoid unbounded input
+ buffer when parsing non-escaped text.
+
+ * tests/input.at (Torturing the Scanner): Add tests that @oline@,
+ __oline__, #output, $@, and @{ do not have unintended meanings.
+
+2002-11-09 Paul Eggert <eggert@twinsun.com>
+
+ Fix the test failure due to GCC warnings described in
+ <http://mail.gnu.org/pipermail/bug-bison/2002-November/001815.html>.
+ * data/glr.c (yyis_pact_ninf, yyis_table_ninf): New macros, which
+ evaluate to 0 if it's impossible for NINF to be in the respective
+ table.
+ (yygetLRActions, yyrecoverParseError): Use them.
+
+ * src/scan-gram.l (unexpected_end_of_file): Fix bug: columns were
+ counted in the token inserted at end of file. Now takes
+ location_t *, not location_t, so that the location can be
+ adjusted. All uses changed.
+
+ * tests/regression.at (Invalid inputs): Adjust wording in
+ diagnostic to match the new behavior.
+
+ * tests/torture.at (AT_DATA_TRIANGULAR_GRAMMAR,
+ AT_DATA_HORIZONTAL_GRAMMAR, AT_DATA_LOOKAHEADS_GRAMMAR,
+ AT_DATA_STACK_TORTURE): Replace `assert (x);' with `if (! (x))
+ abort ();'. This reduces the runtime of the "Many lookaheads"
+ test from 27.6 to 2.7 minutes on a 440 MHz Ultrasparc III running
+ GCC 3.2.
+
2002-11-07 Paul Eggert <eggert@twinsun.com>
- * src/scan-gram.l (unexpected_end_of_file): New function.
+ * src/parse-gram.y (CHARACTER): Remove unused token.
+ All uses removed.
+
+ * src/scan-gram.l: Remove stack option. We no longer use the
+ stack, since the stack was never deeper than 1; instead, use the
+ new auto var c_context to record the stacked value.
+
+ Remove nounput option. At an unexpected end of file, we now unput
+ the minimal input necessary to end cleanly; this simplifies the
+ code.
+
+ Avoid unbounded token sizes where this is easy.
+
+ (unexpected_end_of_file): New function.
Use it to systematize the error message on unexpected EOF.
+ (last-string): Now auto, not static.
+ (YY_OBS_FREE): Remove unnecessary do while (0) wrapper.
+ (scanner_last_string_free): Remove; not used.
+ (percent_percent_count): Move decl to just before use.
+ (SC_ESCAPED_CHARACTER): Return ID at unexpected end of file,
+ not the (never otherwised-used) CHARACTER.
+
+2002-11-07 Akim Demaille <akim@epita.fr>
+
+ Let yyerror always receive the msg as last argument, so that
+ yyerror can be variadic.
+
+ * data/yacc.c (b4_yyerror_args): New.
+ Use it when calling yyerror.
+ * data/glr.c (b4_yyerror_args, b4_lyyerror_args): New.
+ Use it when calling yyerror.
+ * doc/bison.texinfo (Error Reporting): Adjust.
+ * tests/calc.at (_AT_DATA_CALC_Y): Adjust.
+ * tests/cxx-type.at (_AT_TEST_GLR_CALC): Adjust.
2002-11-06 Akim Demaille <akim@epita.fr>
projects / bison.git / blobdiff