+2002-12-27 Paul Eggert <eggert@twinsun.com>
+
+ Fix a bug where error locations were not being recorded correctly.
+ This problem was originally reported by Paul Hilfinger in
+ <http://mail.gnu.org/pipermail/bug-bison/2002-November/001901.html>.
+
+ * data/yacc.c (yyparse): New local var yylerrsp, to record the
+ top of the location stack's error locations.
+ (yyerrlab): Set it. When discarding a token, push its location
+ onto yylerrsp so that we don't lose track of the error's end.
+ (yyerrlab1): Now is only the target of YYERROR, so that we can
+ properly record the location of the action that failed. For GCC
+ 2.93 and later, insert an __attribute__ ((__unused__)) to avoid
+ GCC warning about yyerrlab1 being unused if YYERROR is unused.
+ (yyerrlab2): New label, which yyerrlab now falls through to.
+ Compute the error's location by applying YYLLOC_DEFAULT to
+ the locations of all the symbols that went into the error.
+ * doc/bison.texinfo (Location Default Action): Mention that
+ YYLLOC_DEFAULT is also invoked for syntax errors.
+ * tests/actions.at (_AT_CHECK_PRINTER_AND_DESTRUCTOR):
+ Error locations include the locations of all the tokens that were
+ discarded, not just the last token.
+
+2002-12-26 Paul Eggert <eggert@twinsun.com>
+
+ * src/files.c: Include quote.h.
+ (compute_output_file_names): Warn if we detect conflicting
+ outputs to the same file. This should catch the misunderstanding
+ exemplified by Debian Bug 165349, reported by Bruce Stephens..
+
+ * src/conflicts.c (conflicts_print): If the user specifies
+ "%expect N", report an error if there are any reduce/reduce
+ conflicts. This is what the manual says should happen.
+ This fixes Debian bug 130890, reported by Anthony DeRobertis.
+ * tests/conflicts.at (%expect with reduce conflicts): New test.
+
+ Don't use m4_include on relative file names, as it doesn't work as
+ desired if there happens to be a file with that name under ".".
+
+ * m4sugar/version.m4: Remove; it was included but it wasn't used.
+ * data/Makefile.am (dist_m4sugar_DATA): Remove m4sugar/version.m4.
+ * data/m4sugar/m4sugar.m4: Don't include m4sugar/version.m4.
+ * data/glr.c, data/lalr1.cc, data/yacc.c: Don't include c.m4.
+ * src/output.c (output_skeleton): Use full path names when
+ specifying a file to include; don't rely on include path, as
+ it's unreliable when the working file contains a file with
+ that name.
+
+2002-12-25 Paul Eggert <eggert@twinsun.com>
+
+ Remove obsolete references to bison.simple and bison.hairy.
+ Problem mentioned by Aubin Mahe in
+ <http://mail.gnu.org/pipermail/help-bison/2002-December/001765.html>.
+ * data/glr.c: Comment fix.
+ * doc/bison.1: Remove references. Also, mention "yacc".
+
+ * src/getargs.c (getargs) [MSDOS]: Don't assume optarg != NULL
+ with -g option.
+
+ * src/parse-gram.y (declaration): Use enum "report_states" rather
+ than its numeric value 1.
+
+ * src/scan-skel.l ("@output ".*\n): Close any old yyout before
+ opening a new one. This fixes Debian bug 165349, reported by
+ Bruce Stephens.
+
+2002-12-24 Paul Eggert <eggert@twinsun.com>
+
+ Version 1.75e.
+
+ * Makefile.maint (cvs-update): Don't assume that the shell
+ supports $(...), as Solaris sh doesn't.
+
+ * src/parse-gram.y (lloc_default): Remove test for empty
+ nonterminals at the end, since it didn't change the result.
+
+2002-12-24 Paul Eggert <eggert@twinsun.com>
+
+ If the user does not define YYSTYPE as a macro, Bison now declares it
+ using typedef instead of defining it as a macro. POSIX requires this.
+ For consistency, YYLTYPE is also declared instead of defined.
+
+ %union directives can now have a tag before the `{', e.g., the
+ directive `%union foo {...}' now generates the C code
+ `typedef union foo { ... } YYSTYPE;'; this is for Yacc compatibility.
+ The default union tag is `YYSTYPE', for compatibility with Solaris 9
+ Yacc. For consistency, YYLTYPE's struct tag is now `YYLTYPE'
+ instead of `yyltype'.
+
+ `yystype' and `yyltype' are now obsolescent macros instead of being
+ typedefs or tags; they are no longer documented and will be
+ withdrawn in a future release.
+
+ * data/glr.c (b4_location_type): Remove.
+ (YYSTYPE): Renamed from yystype.
+ (YYSTYPE_IS_DECLARED): New macro, used to prevent double-typedef.
+ (struct YYLTYPE): Renamed from struct yyltype.
+ (YYLTYPE): Renamed from yyltype.
+ (yyltype, yystype): New (and obsolescent) macros,
+ for backward compatibility.
+ * data/yacc.c: Likewise.
+
+ * data/yacc.c (YYSTYPE): Declare as union YYSTYPE if the user
+ does not specify a union tag. This is for compatibility with
+ Solaris 9 yacc.
+
+ * src/parse-gram.y (add_param): 2nd arg is now char * not char
+ const *, since it is now modified by stripping surrounding { }.
+ (current_braced_code): Remove.
+ (PERCENT_DESTRUCTOR, PERCENT_PRINTER, PERCENT_UNION,
+ PERCENT_LEX_PARAM, PERCENT_PARSE_PARAM): Change names to include
+ trailing " {...}". Now of type <chars>.
+ (grammar_declaration): Adjust to bundled tokens.
+ (code_content): Remove; stripping is now done by add_param.
+ (print_token_value): Print contents of bundled tokens.
+ (token_name): New function.
+
+ * src/reader.h (braced_code, current_braced_code): Remove.
+ (token_name): New decl.
+
+ * src/scan-gram.l (handle_dollar, handle_at): Now takes int
+ token_type, not braced_code code_kind. All uses changed.
+ (SC_PRE_CODE): New state, for scanning after a keyword that
+ has (or usually has) an immediately-following braced code.
+ (token_type): New local var, to keep track of which token type
+ to return when scanning braced code.
+ (<INITIAL>"%destructor", <INITIAL>"%lex-param",
+ <INITIAL>"%parse-param", <INITIAL>"%printer,
+ <INITIAL>"%union"): Set token type and BEGIN SC_PRE_CODE
+ instead of returning a token type immediately.
+ (<INITIAL>"{"): Set token type.
+ (<SC_BRACED_CODE>"}"): Use it.
+ (handle_action_dollar, handle_action_at): Now returns bool
+ indicating success. Fail if ! current_rule; this prevents a core dump.
+ (handle_symbol_code_dollar, handle_symbol_code_at):
+ Remove; merge body into caller.
+ (handle_dollar, handle_at): Complain in invalid contexts.
+
+ * NEWS, doc/bison.texinfo: Document the above.
+ * NEWS: Fix years and program names in copyright notice.
+
+2002-12-17 Paul Eggert <eggert@twinsun.com>
+
+ * NEWS, doc/bison.texinfo (Parser Function, Pure Calling, Error
+ Reporting, Table of Symbols): Omit mentions of %lex-param and
+ %parse-param from the documentation for now.
+
+2002-12-15 Paul Eggert <eggert@twinsun.com>
+
+ Undo most of the 2002-11-12 yychar -> yytoken patch, as it broke
+ GCC 3.2.1 (which depends on yychar == YYEMPTY when there is no
+ lookahead symbol, and which sets yychar in parser actions) and it
+ disagreed with the Bison documentation. Bug
+ reported by Andrew Walrond.
+
+ * data/yacc.c (YYTRANSLATE): Don't check for negative argument,
+ as the caller now does that.
+ (yyclearin, YYBACKUP, yyparse): Use yychar, not yytoken.
+ (YYEMPTY): Parenthesize right hand side, since others use it.
+ (yyparse): Don't assume that our generated code is the only code
+ that sets yychar.
+
+2002-12-13 Paul Eggert <eggert@twinsun.com>
+
+ Version 1.75d.
+
+ POSIX requires a "yacc" command.
+ * src/Makefile.am (bin_SCRIPTS): New macro, for yacc.
+ (MOSTLYCLEANFILES): Add yacc.
+ (yacc): New rule.
+ * doc/bison.texinfo (Invocation, Bison Options): Mention yacc
+ as an alias for bison y.
+
+ * po/LINGUAS: Add da.
+
+ * src/getargs.c (__GNU_LIBRARY__) [lint]: Define to work around
+ problem with latest <getopt.h>.
+ (HACK_FOR___GNU_LIBRARY___PROTOTYPE): New macro.
+
+ * doc/fdl.texi: Upgrade to 1.2.
+ * lib/alloca.c, lib/error.c, lib/getopt.c, lib/getopt.h
+ lib/getopt1.c, lib/gettext.h, lib/memrchr.c, lib/obstack.c,
+ lib/obstack.h, lib/strnlen.c, lib/unlocked-io.h: Sync with
+ gnulib.
+ * config/install-sh: Sync with autotools.
+
+ Fix a bad interaction with flex 2.5.23 reported by Bruce Lilly in
+ <http://mail.gnu.org/pipermail/bug-bison/2002-November/001929.html>.
+ * data/yacc.c (YYLTYPE, struct yyltype): Do not define unless
+ locations are requested.
+ (union yyalloc): Do not depend on YYLTYPE_IS_TRIVIAL unless
+ locations are requested.
+
+2002-12-12 Paul Eggert <eggert@twinsun.com>
+
+ Remove unportable casts and storage allocation tricks.
+ While we're at it, remove almost all casts, since they
+ usually aren't needed and are a sign of trouble.
+
+ * configure.ac (AC_CHECK_TYPES): Check for uintptr_t.
+
+ * src/derives.c (derives_compute): Do not subtract NTOKENS from
+ the pointer DSET returned by malloc; this isn't portable.
+ Instead, always use DSET[i - NTOKENS] rather than DSET[i].
+ Similarly for DERIVES.
+ * src/lalr.c (set_goto_map): Likewise, for GOTO_MAP and TEMP_MAP.
+ * src/nullable.c (nullable_compute): Likewise, for RSETS and NULLABLE.
+ * src/reduce.c (reduce_grammar_tables): Likewise, for nontermmap
+
+ * src/derives.c (derives_compute): Do not bother invoking
+ int_of_rule_number, since rule numbers are integers.
+
+ * src/files.c (concat2, tr, compute_base_name): Use xmalloc (N)
+ rather than XMALLOC (char, N).
+
+ * src/files.c (filename_split): Rewrite to avoid cast.
+
+ * src/gram.h (symbol_number_as_item_number,
+ item_number_as_symbol_number, rule_number_as_item_number,
+ item_number_as_rule_number):
+ Now inline functions rather than macros, to avoid casts.
+ * src/state.h (state_number_as_int): Likewise.
+ * src/tables.c (state_number_to_vector_number,
+ symbol_number_to_vector_number): Likewise.
+
+ * src/gram.h (int_of_rule_number): Remove; no longer used.
+
+ * src/lalr.c (add_lookback_edge): Use malloc rather than calloc,
+ since the resulting storage is always stored into.
+
+ * src/main.c (alloca) [C_ALLOCA]: Add decl here, the only place
+ where it's needed.
+
+ * src/muscle_tab.c (muscle_m4_output):
+ Now inline. Return bool, not int.
+ * src/state.c (state_compare): Likewise.
+ * src/symtab.c (symbol_check_defined,
+ symbol_check_alias_consistency, symbol_pack, symbol_translation,
+ hash_compare_symbol, hash_symbol):
+ Likewise.
+ * src/uniqstr.c (uniqstr_print): Likewise.
+ * src/muscle_tab.c (muscle_m4_output_processor):
+ New function, to avoid casts.
+ * src/state.c (state_comparator, stage_hasher): Likewise.
+ * src/symtab.c (symbol_check_defined_processor,
+ symbol_check_alias_consistency_processor, symbol_pack_processor,
+ symbol_translation_processor, hash_symbol_comparator,
+ hash_symbol_hasher): Likewise.
+ * src/uniqstr.c (uniqstr_print_processor): Likewise.
+ * src/muscle_tab.c (muscles_m4_output):
+ Use new functions instead of casting old functions unportably.
+ * src/state.c (state_hash_new): Likewise.
+ * src/symtab.c (symbols_new, symbols_do, symbols_check_defined,
+ symbols_token_translations_init):
+ Likewise.
+ * src/uniqstr.c (uniqstrs_new, hash_initialize, uniqstrs_do): Likewise.
+
+ * src/output.c (GENERATE_MUSCLE_INSERT_TABLE): Use long local
+ var instead of casting to long, to avoid casts.
+ (prepare_states): Use MALLOC rather than alloca, so that we don't
+ have to worry about alloca.
+ * src/state.c (state_hash_lookup): Likewise.
+
+ * src/scan-gram.l (<SC_ESCAPED_CHARACTER>"'"): Use unsigned char
+ local var instead of casting to unsigned char, to avoid casts.
+
+ * src/state.c (TRANSITIONS_ALLOC, ERRS_ALLOC, REDUCTIONS_ALLOC,
+ STATE_ALLOC): Remove.
+ (transitions_new, errs_new, reductions_new, state_new): Use malloc
+ rather than calloc, and use offsetof to avoid allocating slightly
+ too much storage.
+ (state_new): Initialize all members.
+
+ * src/state.c (state_hash): Use unsigned accumulator, not signed.
+
+ * src/symtab.c (symbol_free): Remove; unused.
+ (symbol_get): Remove cast in lhs of assignment.
+ (symbols_do): Now static. Accept generic arguments, not
+ hashing-related ones.
+
+ * src/symtab.h: (NUMBER_UNDEFINED): Remove unnecessary cast.
+ (symbol_processor): Remove.
+ (symbols_do): Remove decl; now static.
+
+ * src/system.h (alloca): Remove; decl no longer needed.
+ (<stddef.h>): Include, for offsetof.
+ (<inttypes.>, <stdint.h>): Include if available.
+ (uintptr_t): New type, if system lacks it.
+ (CALLOC, MALLOC, REALLOC): New macros.
+ All uses of XCALLOC, XMALLOC, and XREALLOC changed to use these
+ new macros.
+
+ * src/tables.c (table_size): Now int, to pacify GCC.
+ (table_grow, table_ninf_remap): Use signed table size.
+ (save_row): Don't bother initializing locals when not needed.
+ (default_goto, goto_actions, pack_vector): Remove unnecessary casts.
+ * src/uniqstr.c (hash_compare_uniqstr): Likewise.
+
+ * src/vcg.h: Correct misspellings.
+
+ * src/vcg_defaults.h (G_CMAX): Now INT_MAX.
+
+
+ * src/getargs.c (getargs): Don't assume EOF == -1.
+
+2002-12-09 Paul Eggert <eggert@twinsun.com>
+
+ Change identifier spellings to avoid collisions with names
+ that are reserved by POSIX.
+
+ Don't use names ending in _t, since POSIX reserves them.
+ For consistency, remove _e and _s endings -- they're weren't
+ needed to remove ambiguity. All uses changed.
+ * src/uniqstr.h (uniqstr): Renamed from uniqstr_t, which in
+ turn was just renamed from struniq_t.
+ * src/uniqstr.c (uniqstr_processor): Renamed from struniq_processor,
+ which in turn was just renamed from struniq_processor_t.
+ (hash_compare_uniqstr): Renamed from hash_compare_struniq, which
+ in turn was renamed from hash_compare_struniq_t.
+ * src/LR0.c (struct state_list): Renamed from struct state_list_s.
+ (state_list): Renamed from state_list_t.
+ * src/assoc.h (assoc): Renamed from assoc_t.
+ * src/conflicts.c (enum conflict_resolution): Renamed from
+ enum conflict_resolution_e.
+ * src/derives.c (struct rule_list): Renamed from struct rule_list_s.
+ (rule_list): Renamed from rule_list_t.
+ * src/getargs.h (enum trace): Renamed from enum trace_e.
+ (enum report): Renamed from enum report_e.
+ * src/gram.h (item_number): Renamed from item_number_t.
+ (rule_number): Renamed from rule_number_t.
+ (struct rule_s): Remove the "rule_s" part; not used.
+ (rule): Renamed from rule_t.
+ (rule_filter): Renamed from rule_filter_t.
+ * src/lalr.c (struct goto_list): Renamed from struct goto_list_s.
+ (goto_list): Renamed from goto_list_t.
+ * src/lalr.h (goto_number): Renamed from goto_number_t.
+ * src/location.h (location): Renamed from location_t.
+ * src/muscle_tab.c (muscle_entry): Renamed from muscle_entry_t,
+ and moved here from:
+ * src/muscle_tab.h (muscle_entry_t): here.
+ * src/nullable.c (struct rule_list): Renamed from struct rule_list_s.
+ (rule_list): Renamed from rule_list_t.
+ * src/print_graph.c (static_graph): Renamed from graph.
+ * src/reader.h (braced_code): Renamed from braced_code_t.
+ Remove brace_code_e tag.
+ * src/relation.h (relation_node): Renamed from relation_node_t.
+ (relation_nodes): Renamed from relation_nodes_t.
+ (relation): Renamed from relation_t.
+ * src/state.h (state_number): Renamed from state_number_t.
+ (struct state): Renamed from struct state_s.
+ (state): Renamed from state_t.
+ (transitions): Renamed from transitions_t. Unused (and
+ misspelled) transtion_s tag removed.
+ (errs): Renamed from errs_t. Unused errs_s tag removed.
+ (reductions): Renamed from reductions_t. Unused tag
+ reductions_s removed.
+ * src/symlist.h (symbol_list): Renamed from symbol_list_t.
+ (struct symbol_list): Renamed from struct symbol_list_s.
+ * src/symtab.h (symbol_number): Renamed from symbol_number_t.
+ (struct symbol): Renamed from struct symbol_s.
+ (symbol): Renamed from symbol_t.
+ * src/tables.c (vector_number): Renamed from vector_number_t.
+ (action_number): Renamed from action_t.
+ * src/tables.h (base_number): Renamed from base_t.
+ * src/vcg.h (enum color): Renamed from enum color_e.
+ (enum textmode): Renamed from enum textmode_e.
+ (enum shape): Renamed from enum shape_e.
+ (struct colorentry): Renamed from struct colorentry_s.
+ (struct classname): Renamed from struct classname_s.
+ (struct infoname): Renamed from struct infoname_s.
+ (enum layoutalgorithm): Renamed from enum layoutalgorithm_e.
+ (enum decision): Renamed from enum decision_e.
+ (enum orientation): Renamed from enum orientation_e.
+ (enum alignment): Renamed from enum alignment_e.
+ (enum arrow_mode): Renamed from enum arrow_mode_e.
+ (enum crossing_type): Renamed from enum crossing_type_e.
+ (enum view): Renamed from enum view_e.
+ (struct node): Renamed from struct node_s.
+ (node): Renamed from node_t.
+ (enum linestyle): Renamed from enum linestyle_e.
+ (enum arrowstyle): Renamed from enum arrowstyle_e.
+ (struct edge): Renamed from struct edge.
+ (edge): Renamed from edge_t.
+ (struct graph): Renamed from struct graph_s.
+ (graph): Renamed from graph_t.
+ * tests/calc.at (_AT_DATA_CALC_Y, Simple LALR Calculator):
+ Rename value_t -> value.
+ * tests/input.at (Torturing the Scanner): Rename value_t -> value,
+ value_t_as_yystype -> value_as_yystype.
+
+ Don't include <errno.h> in the mainstream code, since it
+ reserves E[A-Z0-9]* and we want to use symbols like 'EQUALS'.
+ * lib/get-errno.c, lib/get-errno.h: New files.
+ * lib/Makefile.am (libbison_a_SOURCES): Add get-errno.h,
+ get-errno.c.
+ * src/files.c (xfopen, xfclose): Use get_errno instead of errno.
+ * src/output.c (output_skeleton): Likewise.
+ * src/scan-gram.l (<INITIAL>{int}): Use set_errno and get_errno
+ instead of errno.
+ (<SC_ESCAPED_STRING,SC_ESCAPED_CHARACTER>\\x[0-9abcdefABCDEF]+):
+ Likewise.
+ (handle_action_dollar, handle_action_at): Likewise.
+ * src/system.h: Do not include <errno.h>.
+ (TAB_EXT): Renamed from EXT_TAB.
+ (OUTPUT_EXT): Renamed from EXT_OUTPUT.
+
+ Avoid str[a-z]*, since <string.h> reserves that name space.
+ Change all instances of "struniq" in names to "uniqstr", and
+ likewise for "STRUNIQ" and "UNIQSTR".
+ * src/uniqstr.c: Renamed from src/struniq.c.
+ * src/uniqstr.h: Renamed from src/struniq.h.
+ * src/Makefile.am (bison_SOURCES): Adjust to these renamings.
+ * src/files.c (strsuffix): Remove; unused.
+ (concat2): Renamed from stringappend. Now static.
+ * src/files.h (strsuffix, stringappend): Remove; unused.
+ * src/parse-gram.y (<chars>): Renamed from <string>.
+ (<uniqstr>): Renamed from <struniq>.
+ * src/scan-gram.l (obstack_for_string): Renamed from string_obstack.
+ * src/vcg.h (struct node_s.expand): Renamed from struct node_s.stretch.
+ (struct graph_s.expand): Renamed from struct graph_s.stretch.
+ * src/vcg_defaults.h (G_EXPAND): Renamed from G_STRETCH.
+ (G_LONG_STRAIGHT_PHASE): Renamed from G_STRAIGHT_PHASE.
+ (N_EXPAND): Renamed from N_STRETCH.
+
+ Avoid *_MAX and *_MIN, since <limits.h> reserves that name space.
+ * data/yacc.c (YYSTACK_GAP_MAXIMUM): Renamed from YYSTACK_GAP_MAX.
+ * src/gram.h (ITEM_NUMBER_MAX, ITEM_NUMBER_MIN, RULE_NUMBER_MAX):
+ Remove; unused.
+ * src/lalr.h (GOTO_NUMBER_MAXIMUM): Renamed from GOTO_NUMBER_MAX.
+ * src/state.h (STATE_NUMBER_MAXIMUM): Renamed from STATE_NUMBER_MAX.
+ * src/symtab.h (SYMBOL_NUMBER_MAXIMUM): Renamed from SYMBOL_NUMBER_MAX.
+ * src/tables.c (VECTOR_NUMBER_MAX, VECTOR_NUMBER_MIN): Remove; unused.
+ (BASE_MAXIMUM): Renamed from BASE_MAX.
+ (BASE_MINIMUM): Renamed from BASE_MIN.
+ (ACTION_MAX): Remove; unused.
+ (ACTION_NUMBER_MINIMUM): Renamed from ACTION_MIN.
+ Unnecessary casts removed from above defines.
+
+
+ Fix misspelling in names.
+ * src/vcg.h (enum_alignment_e): Renamed from enum_alignement_e.
+ * src/vcg_defaults.h (G_NODE_ALIGNMENT): Renamed from
+ G_NODE_ALIGNEMENT.
+
+
+ * lib/timevar.c (timevar_report): Renamed from time_report,
+ for consistency with other names.
+ * lib/timevar.h (timevar_report): New decl.
+ * src/system.h (time_report): Remove; decl is now in lib/timevar.h.
+
+
+ Sort include-file uses.
+
+ Reorder all include files under src to be in the order "system.h".
+ then the ../lib include files in angle brackets (alphabetized),
+ then the . include files in double-quotes (alphabetized). Fix
+ dependency breakages encountered in this process, as follows:
+ * src/closure.h, src/derives.h, src/state.h: Include "gram.h".
+ * src/complain.c: Don't include stdlib.h, string.h _LIBC stuff.
+ * src/state.h: Include "symtab.h".
+
+2002-12-08 Paul Eggert <eggert@twinsun.com>
+
+ * data/glr.c, data/lalr1.cc, data/yacc.c: Do not use __file__,
+ since this causes problems when __file__ contains character
+ sequences like "@" that are treated specially by src/scan-skel.l.
+ Instead, just use the file's basename. This fixes the bug
+ reported by Martin Mokrejs in
+ <http://mail.gnu.org/pipermail/bug-bison/2002-December/001945.html>.
+
+2002-12-06 Paul Eggert <eggert@twinsun.com>
+
+ Add support for rules that do not have trailing semicolons, as
+ POSIX requires. Improve the quality of locations in Bison
+ diagnostics.
+
+ * src/location.c: Include <quotearg.h>.
+ (empty_location): Now const.
+ (location_print): New function. Follow the recommendation of the
+ GNU Coding Standards for locations that span file boundaries.
+ * src/location.h: Do not include <quotearg.h>; no longer needed.
+ (boundary): New type.
+ (location_t): Use it. This allows locations to span file boundaries.
+ All member uses changed: file -> start.file or end.file (as needed),
+ first_line -> start.line, first_column -> start.column,
+ last_line -> end.line, last_column -> end.column.
+ (equal_boundaries): New function.
+ (LOCATION_RESET, LOCATION_STEP): Remove.
+ (LOCATION_PRINT): Remove. All callers changed to use location_print.
+ (empty_location): Now const.
+ (location_print): New decl.
+ * src/parse-gram.y (lloc_default): New function, which handles
+ empty locations more accurately.
+ (YYLLOC_DEFAULT): Use it.
+ (%token COLON): Remove.
+ (%token ID_COLON): New token.
+ (rules): Use it.
+ (declarations, rules): Remove trailing semicolon.
+ (declaration, rules_or_grammar_declaration):
+ Allow empty (";") declaration.
+ (symbol_def): Remove empty actions; no longer needed.
+ (rules_or_grammar_declaration): Remove trailing semicolon.
+ (semi_colon.opt): Remove.
+ * src/reader.h: Include location.h.
+ (scanner_cursor): New decl.
+ * src/reduce.c (nonterminals_reduce): Use warn_at rather than
+ rolling our own.
+ * src/scan-gram.l (YY_USER_INIT): Initialize scanner_cursor instead
+ of *loc.
+ (STEP): Remove. No longer needed, now that adjust_location does
+ the work. All uses removed.
+ (scanner_cursor): New var.
+ (adjust_location): Renamed from extend_location. It now sets
+ *loc and adjusts the scanner cursor. All uses changed.
+ Don't bother testing for CR.
+ (handle_syncline): Remove location arg; now updates scanner cursor.
+ All callers changed.
+ (unexpected_end_of_file): Now accepts start boundary of token or
+ comment, not location. All callers changed. Update scanner cursor,
+ not the location.
+ (SC_AFTER_IDENTIFIER): New state.
+ (context_state): Renamed from c_context. All uses changed.
+ (id_loc, code_start, token_start): New local vars.
+ (<INITIAL,SC_AFTER_IDENTIFIER>): New initial context. Move all
+ processing of Yacc white space and equivalents here.
+ (<INITIAL>{id}): Save id_loc. Begin state SC_AFTER_IDENTIFIER
+ instead of returning ID immediately, since we need to search for
+ a subsequent colon.
+ (<INITIAL>"'", "\""): Save token_start.
+ (<INITIAL>"%{", "{", "%%"): Save code_start.
+ (<SC_AFTER_IDENTIFIER>): New state, looking for a colon.
+ (<SC_YACC_COMMENT>, <SC_COMMENT>, <SC_LINE_COMMENT>):
+ BEGIN context_state at end, not INITIAL.
+ (<SC_ESCAPED_STRING>"\"", <SC_ESCAPED_CHARACTER>"'",
+ <SC_BRACED_CODE>"}", <SC_PROLOGUE>"%}", <SC_EPILOGUE><<EOF>>):
+ Return correct token start.
+ (<SC_BRACED_CODE,SC_PROLOGUE,SC_EPILOGUE>): Save start boundary when
+ the start of a character, string or multiline comment is found.
+ * tests/conflicts.at (S/R in initial, Defaulted Conflicted
+ Reduction): Adjust reported locations to match the more-precise
+ results now expected.
+ * tests/input.at (Invalid $n, Invalid @n, Type Clashes): Likewise.
+ * tests/reduce.at (Useless Rules, Reduced Automaton,
+ Underivable Rules): Likewise.
+ * tests/regression.at (Invalid inputs): No longer `expecting ";"
+ or "|"' now that so many other tokens are allowed by the new grammar.
+
+ * src/complain.h (current_file): Remove duplicate decl;
+ current_file is now owned by files.h.
+ * src/complain.c, src/scan-gram.l: Include files.h.
+
+2002-12-06 Paul Eggert <eggert@twinsun.com>
+
+ * data/glr.c (yy_reduce_print): Don't assume that yyrline[yyrule]
+ promotes to int; it might be unsigned int.
+ * data/yacc.c (yy_reduce_print): Likewise.
+
+ * doc/bison.texinfo (Table of Symbols): YYERROR_VERBOSE should
+ be #defined in the prologue, not in the Bison declarations.
+ This fixes Debian Bug 102878, reported by Shaul Karl.
+
+2002-12-02 Paul Eggert <eggert@twinsun.com>
+
+ * configure.ac (AC_REPLACE_FUNCS): Add strtoul.
+ * lib/strtoul.c: New file, from gnulib.
+ This fixes a porting bug reported by Peter Klein in
+ <http://mail.gnu.org/pipermail/bug-bison/2002-December/001944.html>.
+
2002-11-30 Paul Eggert <eggert@twinsun.com>
+ * src/scan-gram.l (no_cr_read, extend_location): Move to epilogue,
+ and put only a forward declaration in the prologue. This is for
+ consistency with the other scanner helper functions.
+
Type clashes now generate warnings, not errors, since it
appears that POSIX may allow some grammars with type clashes.
* src/reader.c (grammar_current_rule_check): Warn about
* lib/quotearg.c, lib/quotearg.h: Sync with gnulib.
* lib/mbswidth.c, lib/mbswidth.h: Likewise.
* lib/xmalloc.c: Likewise.
-
+
2002-11-20 Paul Eggert <eggert@twinsun.com>
* lib/argmatch.c, lib/argmatch.h: Sync with gnulib.
2002-11-20 Paul Eggert <eggert@twinsun.com>
-
+
Avoid use of <assert.h>, as the GNU Coding Standards hint that one
should use `if (! x) abort ();' rather than `assert (x);', and
anyway it's one less thing to worry about configuring.
* REFERENCES: entered into RCS
-----
-Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-This file is part of GNU Bison.
+This file is part of Bison, the GNU Compiler Compiler.
-GNU Bison is free software; you can redistribute it and/or modify
+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.
-GNU Bison is distributed in the hope that it will be useful,
+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 GNU Bison; see the file COPYING. If not, write to
+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.
projects / bison.git / blobdiff