Paul Eggert [Mon, 12 Aug 2002 14:57:12 +0000 (14:57 +0000)]
(yylex): Do not pass signed char to isupper; it's not portable.
Paul Eggert [Mon, 12 Aug 2002 14:56:24 +0000 (14:56 +0000)]
(EXTRA_DIST): Avoid +=, a GNU make extension.
Paul Eggert [Mon, 12 Aug 2002 14:55:23 +0000 (14:55 +0000)]
(table_grow, pack_vector): Wrap strings in _() if
they need translation.
Paul Eggert [Mon, 12 Aug 2002 14:54:27 +0000 (14:54 +0000)]
(alloca): Use same pattern as ../lib/error.c.
Do not include <ctype.h>; no longer needed.
Do not include <malloc.h>; no longer needed (and generates
warnings on OpenBSD 3.0).
Paul Eggert [Mon, 12 Aug 2002 14:53:26 +0000 (14:53 +0000)]
(symbol_get): Don't cast LHS of an assignment;
this is a GCC extension and is not portable to other compilers.
Paul Eggert [Mon, 12 Aug 2002 14:52:47 +0000 (14:52 +0000)]
Wrap strings in _() if they need translation.
Use strings rather than escapes when possible,
to minimize the number of warnings from xgettext.
(handle_action_dollar, handle_action_at): Don't use isdigit,
as it mishandles negative chars and it may not work as expected
outside the C locale.
Paul Eggert [Mon, 12 Aug 2002 14:50:38 +0000 (14:50 +0000)]
(relation_transpose): Wrap strings in _() if they need translation.
Paul Eggert [Mon, 12 Aug 2002 14:49:45 +0000 (14:49 +0000)]
Fix spelling in comment.
Paul Eggert [Mon, 12 Aug 2002 14:41:48 +0000 (14:41 +0000)]
Cast result of bindtextdomain and textdomain
to void, to avoid a GCC warning when --disable-nls is in effect.
Paul Eggert [Mon, 12 Aug 2002 14:40:55 +0000 (14:40 +0000)]
(lookaheads_print): Wrap strings in _() if they need translation.
Paul Eggert [Mon, 12 Aug 2002 14:40:07 +0000 (14:40 +0000)]
(injections_compute): Wrap strings in _() if
they need translation.
Paul Eggert [Mon, 12 Aug 2002 14:39:16 +0000 (14:39 +0000)]
(grammar_dump): Wrap strings in _() if they need translation.
Do not assume ptrdiff_t fits in int.
Paul Eggert [Mon, 12 Aug 2002 14:38:04 +0000 (14:38 +0000)]
(compute_header_macro): Remove; unused.
Paul Eggert [Mon, 12 Aug 2002 14:36:57 +0000 (14:36 +0000)]
(strerror_r): Remove decl; not needed.
(strerror): Use same pattern as ../lib/error.c.
Paul Eggert [Mon, 12 Aug 2002 14:36:09 +0000 (14:36 +0000)]
(print_closure, set_firsts, closure): Wrap strings in _() if they need
translation.
Paul Eggert [Mon, 12 Aug 2002 14:34:51 +0000 (14:34 +0000)]
(assoc_to_string): Wrap strings in _() if they need translation.
Paul Eggert [Mon, 12 Aug 2002 14:33:54 +0000 (14:33 +0000)]
(INCLUDES): Do not include from the intl directory, which has been removed.
Paul Eggert [Mon, 12 Aug 2002 14:33:12 +0000 (14:33 +0000)]
(state_list_append, new_itemsets, get_state, append_states, generate_states):
Wrap strings in _() if they need translation.
Paul Eggert [Mon, 12 Aug 2002 14:31:24 +0000 (14:31 +0000)]
Update translations from Translation Project.
Paul Eggert [Mon, 12 Aug 2002 14:28:29 +0000 (14:28 +0000)]
Add src/assoc.c, src/closure.c, src/gram.c,
src/main.c, src/relation.c, src/state.c, lib/bitset_stats.c,
lib/timevar.c.
Use src/parse-gram.y instead of src/parse-gram.c, as the gettext
manual recommends.
Similarly, use src/scan-gram.l instead of src/scan-gram.c.
Paul Eggert [Mon, 12 Aug 2002 14:27:49 +0000 (14:27 +0000)]
New files from gettext-0.11.5.
Paul Eggert [Mon, 12 Aug 2002 14:26:37 +0000 (14:26 +0000)]
Sync with gettext (comment change only).
Paul Eggert [Mon, 12 Aug 2002 14:25:56 +0000 (14:25 +0000)]
(jm_PREREQ_QUOTEARG): AC_MBSTATE_T -> AC_TYPE_MBSTATE_T.
Paul Eggert [Mon, 12 Aug 2002 14:25:24 +0000 (14:25 +0000)]
Sync with fileutils.
Paul Eggert [Mon, 12 Aug 2002 14:25:03 +0000 (14:25 +0000)]
Sync with diffutils.
Paul Eggert [Mon, 12 Aug 2002 14:23:35 +0000 (14:23 +0000)]
(EXTRA_DIST): Remove codeset.m4,
glibc21.m4, isc-posix.m4 lcmessage.m4, stage.m4.
Paul Eggert [Mon, 12 Aug 2002 14:22:08 +0000 (14:22 +0000)]
(lbitset_set, lbitset_reset): Do not assume that
bitset_word is the same width as int.
(lbitset_op1): Use -1, not ~0, as memset arg (for
portability to one's complement hosts!).
Paul Eggert [Mon, 12 Aug 2002 14:20:35 +0000 (14:20 +0000)]
(ebitset_set, ebitset_reset): Do not assume that bitset_word is the
same width as int.
(ebitset_op1): Use -1, not ~0, as memset arg (for portability to one's
complement hosts!).
Paul Eggert [Mon, 12 Aug 2002 14:19:02 +0000 (14:19 +0000)]
(bitset_set, bitset_reset): Do not assume that bitset_word is the same
width as int.
Paul Eggert [Mon, 12 Aug 2002 14:16:49 +0000 (14:16 +0000)]
Include "gettext.h".
(_): New macro.
(bitset_stats_set, bitset_stats_reset, bitset_stats_test): Don't
name locals "index", as it generates unnecessary warnings on some
hosts that have an "index" function.
(bitset_stats_print_1, bitset_stats_print, bitset_stats_read,
bitset_stats_write): Wrap strings in _() if they need translation.
(bitset_stats_set, bitset_stats_reset): Do not assume that bitset_word
is the same width as int.
Paul Eggert [Mon, 12 Aug 2002 14:13:56 +0000 (14:13 +0000)]
(BITSET_WORD_BITS): Now of type unsigned, not
size_t; the old version tried to do this but casted improperly.
(bitset_bindex, bitset_windex): Now size_t, not unsigned long.
(bitset_test): Now returns int, not unsigned long.
Paul Eggert [Mon, 12 Aug 2002 14:12:57 +0000 (14:12 +0000)]
Sync with fileutils, except use
PROTOTYPES to check for prototypes, and "defined __STDC__" to
check for void *.
Paul Eggert [Mon, 12 Aug 2002 14:12:13 +0000 (14:12 +0000)]
Use GPL, not LGPL.
Paul Eggert [Mon, 12 Aug 2002 14:10:23 +0000 (14:10 +0000)]
Sync with GNU tar.
Paul Eggert [Mon, 12 Aug 2002 14:09:24 +0000 (14:09 +0000)]
(abitset_reverse_list, ebitset_reverse_list):
Do not assume that bitset_windex is the same width as unsigned.
(abitset_unused_clear): Do not assume that bitset_word is the same
width as int.
(abitset_op1): Use -1, not ~0, as memset arg (for portability to one's
complement hosts!).
Paul Eggert [Mon, 12 Aug 2002 14:08:04 +0000 (14:08 +0000)]
(INCLUDES): Do not include from the intl directory, which has been
removed.
(libbison_a_SOURCES): Add unlocked-io.h. Avoid +=, a GNU make extension.
(bitsets_sources, additional_bitsets_sources, timevars_sources): New vars.
Paul Eggert [Mon, 12 Aug 2002 14:04:38 +0000 (14:04 +0000)]
New translation.
Paul Eggert [Mon, 12 Aug 2002 14:04:17 +0000 (14:04 +0000)]
From fileutils.
Paul Eggert [Mon, 12 Aug 2002 14:02:32 +0000 (14:02 +0000)]
Include string.h, for strlen.
(yyreportParseError): Use size_t for yysize.
(yy_yypstack): No longer nested inside yypstates, as nested
functions are not portable. Do not assume size_t is the
same width as int.
(yypstates): Do not assume that ptrdiff_t is the same width
as int, and similarly for yyposn and YYINDEX.
Paul Eggert [Mon, 12 Aug 2002 14:01:45 +0000 (14:01 +0000)]
Sync with Automake 1.6.3.
Paul Eggert [Mon, 12 Aug 2002 14:00:04 +0000 (14:00 +0000)]
(AC_CHECK_DECLS): Add getenv, getopt.
(AM_GNU_GETTEXT_VERSION): New macro, replacing GETTEXT_VERSION var.
Bump version from 0.11.2 to 0.11.5.
(BISON_PREREQ_STAGE): Remove.
(AM_GNU_GETTEXT): Use external gettext.
(AC_OUTPUT): Remove intl/Makefile.
Paul Eggert [Mon, 12 Aug 2002 13:59:13 +0000 (13:59 +0000)]
Mention that GNU M4 is now required. Clarify what is meant by "larger
grammars". Mention the pt_BR translation.
Paul Eggert [Mon, 12 Aug 2002 13:58:17 +0000 (13:58 +0000)]
(SUBDIRS): Remove intl.
(DISTCLEANFILES): Remove.
Akim Demaille [Fri, 2 Aug 2002 08:05:01 +0000 (08:05 +0000)]
* src/conflicts.c (conflicts_output): Don't output rules never
reduced here, since anyway that computation doesn't work.
* src/gram.h, src/gram.h (rule_filter_t, rule_useful_p)
(rule_useless_p, rule_never_reduced_p): New.
(grammar_rules_partial_print): Use a filter instead of a range.
Display the title only if needed.
(grammar_rules_print): Adjust.
(grammar_rules_never_reduced_report): New.
* src/tables.c (action_row): Move the computation of rules never
reduced to...
(token_actions): here.
* src/main.c (main): Make the parser before making the report, so
that rules never reduced are computed.
Call grammar_rules_never_reduced_report.
* src/print.c (print_results): Report rules never reduced.
* tests/conflicts.at, tests/reduce.at: Adjust.
Akim Demaille [Thu, 1 Aug 2002 18:14:30 +0000 (18:14 +0000)]
Instead of attaching lookaheads and duplicating the rules being
reduced by a state, attach the lookaheads to the reductions.
* src/state.h (state_t): Remove the `lookaheads',
`lookaheads_rule' member.
(reductions_t): Add a `lookaheads' member.
Use a regular array for the `rules'.
* src/state.c (reductions_new): Initialize the lookaheads member
to 0.
(state_rule_lookaheads_print): Adjust.
* src/state.h, src/state.c (state_reductions_find): New.
* src/conflicts.c (resolve_sr_conflict, set_conflicts)
(count_rr_conflicts): Adjust.
* src/lalr.c (LArule): Remove.
(add_lookback_edge): Adjust.
(state_lookaheads_count): New.
(states_lookaheads_initialize): Merge into...
(initialize_LA): this.
(lalr_free): Adjust.
* src/main.c (main): Don't free nullable and derives too early: it
is used by --verbose.
* src/print.c, src/print_graph.c, src/tables.c: Adjust.
Akim Demaille [Thu, 1 Aug 2002 18:13:29 +0000 (18:13 +0000)]
* src/derives.h, src/derives.c (derives): A `rule_t***' instead of
`rule_number_t**'.
(set_derives, free_derives): Rename as...
(derives_compute, derives_free): this.
Adjust all dependencies.
* src/nullable.c (set_nullable, free_nullable): Rename as...
(nullable_compute, nullable_free): these.
(rule_list_t): Store rule_t *, not rule_number_t.
* src/state.c (state_rule_lookaheads_print): Directly compare rule
pointers, instead of their numbers.
* src/main.c (main): Call nullable_free, and derives_free earlier,
as they were lo longer used.
Akim Demaille [Thu, 1 Aug 2002 18:12:11 +0000 (18:12 +0000)]
* lib/timevar.c (get_time): Include children time.
* src/lalr.h (LA, LArule): Don't export them: used with the
state_t.
* src/lalr.c (LA, LArule): Static.
* src/lalr.h, src/lalr.c (lalr_free): New.
* src/main.c (main): Call it.
* src/tables.c (pack_vector): Check whether loc is >= to the
table_size, not >.
(pack_tables): Don't free froms, tos, conflict_tos, and pos...
(tables_generate): do it, since that's also it which allocates
them.
Don't free LA and LArule, main does.
Akim Demaille [Wed, 31 Jul 2002 21:52:00 +0000 (21:52 +0000)]
Separate parser tables computation and output.
* src/output.c (nvectors, base_t, base, base_ninf, conflict_table)
(conflict_list, conflict_list_cnt, table, check, table_ninf)
(yydefgoto, yydefact, high): Move to...
* src/tables.h, src/tables.c: here.
* src/output.c (vector_number_t, VECTOR_NUMBER_MAX)
(VECTOR_NUMBER_MIN, state_number_to_vector_number)
(symbol_number_to_vector_number, nvectors, BASE_MAX, BASE_MIN)
(froms, tos, conflict_tos, tally, width, action_t, ACTION_MAX)
(ACTION_MIN, actrow, order, nentries, pos, conflrow)
(conflict_list_free, table_size, lowzero, table_grow, conflict_row)
(action_row, save_row, token_actions, save_column, default_goto)
(goto_actions, sort_actions, matching_state, pack_vector)
(table_ninf_remap, pack_table, prepare_actions): Move to...
* src/tables.c: here.
* src/tables.h, src/tables.c(tables_generate, tables_free): New.
* src/output.c (token_actions, output_base, output_conflicts)
(output_check): Merge into...
(prepare_actions): this.
(actions_output): Rename as...
(user_actions_output): this.
* src/main.c (main): Call tables_generate and tables_free.
Akim Demaille [Wed, 31 Jul 2002 19:52:13 +0000 (19:52 +0000)]
Steal GCC's --time-report support.
* lib/timevar.c, lib/timevar.h, lib/timevar.def: New,
stolen/adjusted from GCC.
* m4/stage.m4: Remove time related checks.
* m4/timevar.m4: New.
* configure.in: Adjust.
* src/system.h: Adjust to using timevar.h.
* src/getargs.h, src/getargs.c: Support trace_time for
--trace=time.
* src/main.c (stage): Remove.
(main): Replace `stage' invocations with timevar calls.
* src/output.c: Insert pertinent timevar calls.
Akim Demaille [Wed, 31 Jul 2002 19:49:52 +0000 (19:49 +0000)]
Let --trace have arguments.
* src/getargs.h (enum trace_e): New.
* src/getargs.c (trace_args, trace_types, trace_argmatch): New.
(long_options, short_options): --trace/-T takes an optional
argument.
Change all the uses of trace_flag to reflect the new flags.
* tests/sets.at (Firsts, Nullable, Broken Closure): Use --trace=sets.
Strengthen `stage' portability.
* m4/stage.m4 (BISON_PREREQ_STAGE): New.
* configure.in: Use it.
Don't check for malloc.h and sys/times.h.
* src/system.h: Include them when appropriate.
* src/main.c (stage): Compile only when mallinfo, struct mallinfo,
times and struct tms are available.
Akim Demaille [Wed, 31 Jul 2002 16:57:39 +0000 (16:57 +0000)]
Add HACKING.
Akim Demaille [Tue, 30 Jul 2002 11:56:44 +0000 (11:56 +0000)]
In verbose parse error message, don't report `error' as an
expected token.
* tests/actions.at (Printers and Destructors): Adjust.
* tests/calc.at (Calculator $1): Adjust.
* data/yacc.c, data/glr.c, data/lalr1.c: When making the verbose
error message, do not report the parser accepts the error token in
that state.
Akim Demaille [Tue, 30 Jul 2002 11:09:59 +0000 (11:09 +0000)]
Normalize conflict related messages.
* src/complain.h, src/complain.c (warn, complain): New.
* src/conflicts.c (conflicts_print): Use them.
(conflict_report_yacc): New, extracted from...
(conflicts_print): here.
* tests/conflicts.at, tests/existing.at: Adjust.
Akim Demaille [Tue, 30 Jul 2002 11:06:50 +0000 (11:06 +0000)]
Report rules which are never reduced by the parser: those hidden
by conflicts.
* src/LR0.c (save_reductions): Don't make the final state too
different: save its reduction (accept) instead of having a state
without any action (no shift or goto, no reduce).
Note: the final state is now a ``regular'' state, i.e., the
parsers now contain `reduce 0' as default reduction.
Nevertheless, since they decide to `accept' when yystate =
final_state, they still will not reduce rule 0.
* src/print.c (print_actions, print_reduction): Adjust.
* src/output.c (action_row): Track reduced rules.
(token_actions): Report rules never reduced.
* tests/conflicts.at, tests/regression.at: Adjust.
Akim Demaille [Tue, 30 Jul 2002 08:15:04 +0000 (08:15 +0000)]
`stage' was accidently included in a previous patch.
Initiate its autoconfiscation.
* configure.in: Look for malloc.h and sys/times.h.
* src/main.c (stage): Adjust.
Report only when trace_flag.
Akim Demaille [Mon, 29 Jul 2002 17:31:46 +0000 (17:31 +0000)]
* src/state.h, src/state.c (transitions_t): Holds state_t*'s, not
state_number_t.
(errs_t): symbol_t*, not symbol_number_t.
(reductions_t): rule_t*, not rule_number_t.
(FOR_EACH_SHIFT): New.
* src/LR0.c, src/conflicts.c, src/lalr.c, src/output.c
* src/print.c, src/print_graph.c: Adjust.
Akim Demaille [Mon, 29 Jul 2002 17:30:33 +0000 (17:30 +0000)]
Use $accept and $end, as BYacc and BTYacc do, instead of $axiom and $.
* src/symtab.h, src/symtab.c (eoftoken, axiom): Rename as...
(endtoken, accept): these.
* src/reader.c (reader): Set endtoken's default tag to "$end".
Set undeftoken's tag to "$undefined" instead of "$undefined.".
* doc/bison.texinfo (Table of Symbols): Mention $accept and $end.
Adjust.
Akim Demaille [Mon, 29 Jul 2002 17:28:56 +0000 (17:28 +0000)]
* src/reduce.c (reduce_grammar): When the language is empty,
complain about the start symbol, not the axiom.
Use its location.
* tests/reduce.at (Empty Language): New.
Akim Demaille [Fri, 26 Jul 2002 06:25:35 +0000 (06:25 +0000)]
* src/reader.h, src/reader.c (gram_error): ... can't get
yycontrol without making too strong assumptions on the parser
itself.
* src/output.c (prepare_tokens): Use the real 0th value of
token_translations instead of `0'.
* src/parse-gram.y (yyerror): Don't rely on yycontrol being
visible here.
* data/yacc.c (yyreport_parse_error): Rename yylocation as yylloc
for the time being: %locations ought to provide it to yyerror.
Akim Demaille [Fri, 26 Jul 2002 06:24:11 +0000 (06:24 +0000)]
* src/output.c (prepare_tokens): Go up to ntokens, not ntokens + 1.
* doc/bison.texinfo (Decl Summary): s/$illegal/$undefined./.
* tests/regression.at (Web2c Actions): Adjust.
Akim Demaille [Thu, 25 Jul 2002 21:21:02 +0000 (21:21 +0000)]
Stop storing rules from 1 to nrules + 1.
* src/LR0.c, src/closure.c, src/derives.c, src/gram.c, src/lalr.c
* src/nullable.c, src/output.c, src/print.c, src/reader.c
* src/reduce.c: Allocate and free from &rules[0], not &rules[1].
Iterate from 0 to nrules.
Use rule_number_as_item_number and item_number_as_rule_number.
Adjust to `derive' now containing possibly 0.
* src/gram.h (rule_number_as_item_number, item_number_as_rule_number):
Handle the `- 1' part in rule numbers from/to item numbers.
* src/conflicts.c (log_resolution): Fix the message which reversed
shift and reduce.
* src/output.c (action_row): Initialize default_rule to -1.
(token_actions): Adjust.
* tests/sets.at (Nullable, Firsts): Fix the previously bogus
expected output.
* tests/conflicts.at (Resolved SR Conflicts): Likewise.
Akim Demaille [Thu, 25 Jul 2002 19:34:54 +0000 (19:34 +0000)]
* data/c.m4 (b4_c_function, b4_c_ansi_args, b4_c_ansi_arg)
(b4_c_knr_arg_names, b4_c_knr_arg_name, b4_c_knr_arg_decls)
(b4_c_knr_arg_decl): New.
* data/yacc.c: Use it to define yysymprint, yydestruct, and
yyreport_parse_error.
Akim Demaille [Thu, 25 Jul 2002 19:33:36 +0000 (19:33 +0000)]
* data/yacc.c (yyreport_parse_error): New, extracted from...
(yyparse): here.
(yydestruct, yysymprint): Move above yyparse.
Be K&R compliant.
Akim Demaille [Thu, 25 Jul 2002 17:32:34 +0000 (17:32 +0000)]
* data/c.m4 (b4_ints_in, b4_int_type, b4_int_type_for): New,
replace...
(b4_sint_type, b4_uint_type): these.
* data/yacc.c, data/glr.c, data/lalr1.cc: Use b4_int_type_for.
* tests/regression.at (Web2c Actions): Adjust.
Akim Demaille [Thu, 25 Jul 2002 17:30:44 +0000 (17:30 +0000)]
* src/gram.h (TIEM_NUMBER_MAX): New.
(item_number_of_rule_number, rule_number_of_item_number): Rename
as...
(rule_number_as_item_number, item_number_as_rule_number): these.
Adjust dependencies.
* src/output.c (vector_number_t, VECTOR_NUMBER_MAX)
(VECTOR_NUMBER_MIN, state_number_to_vector_number)
(symbol_number_to_vector_number): New.
(order): Of vector_number_t* type.
(base_t, BASE_MAX, BASE_MIN): New.
(froms, tos, width, pos, check): Of base_t type.
(action_number_t, ACTION_MIN, ACTION_MAX): New.
(actrow): Of action_number_t type.
(conflrow): Of unsigned int type.
(table_ninf, base_ninf): New.
(GENERATE_MUSCLE_INSERT_TABLE): Also output the `*_min' value.
(muscle_insert_int_table, muscle_insert_base_table)
(muscle_insert_rule_number_table): New.
(prepare_tokens): Output `toknum' as int_table.
(action_row): Returns a rule_number_t.
Use ACTION_MIN, not SHRT_MIN.
(token_actions): yydefact is rule_number_t*.
(table_ninf_remap): New.
(pack_table): Use it for `base' and `table'.
* data/yacc.c, data/glr.c, data/lalr1.cc (YYFLAG): Remove,
replaced with...
(YYPACT_NINF, YYTABLE_NINF): these.
(yypact, yytable): Compute their types instead of hard-coded
`short'.
* tests/regression.at (Web2c Actions): Adjust.
Akim Demaille [Fri, 19 Jul 2002 08:31:32 +0000 (08:31 +0000)]
* src/scan-gram.l (id): Can start with an underscore.
Akim Demaille [Tue, 16 Jul 2002 14:04:06 +0000 (14:04 +0000)]
* src/assoc.c, src/asssoc.h (assoc_t, assoc_to_string): New.
Adjust all former `associativity' dependencies.
* src/symtab.c (symbol_new): Default associativity is `undef', not
`right'.
(symbol_check_alias_consistence): Adjust.
Paul Eggert [Wed, 10 Jul 2002 06:24:51 +0000 (06:24 +0000)]
Fix dates in copyright notice.
Akim Demaille [Tue, 9 Jul 2002 17:01:42 +0000 (17:01 +0000)]
* doc/bison.texinfo: Properly set the ``header'' part.
Use @dircategory ``GNU programming tools'' as per Texinfo's
documentation.
Use @copying.
Akim Demaille [Tue, 9 Jul 2002 16:24:57 +0000 (16:24 +0000)]
* lib/quotearg.h: Protect against multiple inclusions.
* src/location.h (location_t): Add a `file' member.
(LOCATION_RESET, LOCATION_PRINT): Adjust.
* src/complain.c (warn_at, complain_at, fatal_at): Drop
`error_one_per_line' support.
Akim Demaille [Tue, 9 Jul 2002 15:54:39 +0000 (15:54 +0000)]
* src/complain.h, src/complain.c (warn, complain): Remove, unused.
* src/reader.c (lineno): Remove.
Adjust all dependencies.
(get_merge_function): Take a location and use complain_at.
* src/symtab.h, src/symtab.c (symbol_make_alias): Likewise.
* tests/regression.at (Invalid inputs, Mixing %token styles):
Adjust.
Akim Demaille [Tue, 9 Jul 2002 14:48:01 +0000 (14:48 +0000)]
* src/parse-gram.y (rules_or_grammar_declaration): Add an error
recovery rule, and forbid extensions when --yacc.
(gram_error): Use complain_at.
* src/reader.c (reader): Exit if there were parse errors.
Akim Demaille [Tue, 9 Jul 2002 13:05:22 +0000 (13:05 +0000)]
Regen.
Akim Demaille [Tue, 9 Jul 2002 10:41:44 +0000 (10:41 +0000)]
Update.
Akim Demaille [Tue, 9 Jul 2002 10:06:20 +0000 (10:06 +0000)]
* tests/synclines.at (AT_SYNCLINES_COMPILE): New.
(AT_TEST_SYNCLINE): Adjust to unusual GCC outputs.
Reported by R Blake <blakers@mac.com>.
Akim Demaille [Tue, 9 Jul 2002 09:43:22 +0000 (09:43 +0000)]
* data/yacc.c: Output the copyright notive in the header.
Akim Demaille [Wed, 3 Jul 2002 12:51:30 +0000 (12:51 +0000)]
* src/output.c (froms, tos): Are state_number_t.
(save_column): sp, sp1, and sp2 are state_number_t.
(prepare): Rename `final' as `final_state_number', `nnts' as
`nterms_number', `nrules' as `rules_number', `nstates' as
`states_number', and `ntokens' as `tokens_number'. Remove `nsym',
unused.
* data/yacc.c, data/glr.c, data/lalr1.cc: Adjust.
* data/lalr1.cc (nsym_): Remove, unused.
Akim Demaille [Wed, 3 Jul 2002 12:50:58 +0000 (12:50 +0000)]
Regen.
Akim Demaille [Wed, 3 Jul 2002 10:54:33 +0000 (10:54 +0000)]
* src/lalr.h, src/lalr.c (goto_number_t): New.
* src/lalr.c (goto_list_t): New.
Propagate them.
* src/nullable.c (rule_list_t): New.
Propagate.
* src/types.h: Remove.
Akim Demaille [Wed, 3 Jul 2002 10:36:38 +0000 (10:36 +0000)]
* src/closure.c (print_fderives): Use rule_rhs_print.
* src/derives.c (print_derives): Use rule_rhs_print.
(rule_list_t): New, replaces `shorts'.
(set_derives): Add comments.
* tests/sets.at (Nullable, Firsts): Adjust.
Akim Demaille [Wed, 3 Jul 2002 06:52:02 +0000 (06:52 +0000)]
* src/output.c (prepare_actions): Free `tally' and `width'.
(prepare_actions): Allocate and free `order'.
* src/symtab.c (symbols_free): Free `symbols'.
* src/scan-gram.l (scanner_free): Clear Flex's scanners memory.
* src/output.c (m4_invoke): Move to...
* src/scan-skel.l: here.
(<<EOF>>): Close yyout, and free its name.
Akim Demaille [Wed, 3 Jul 2002 06:51:43 +0000 (06:51 +0000)]
Fix some memory leaks, and fix a bug: state 0 was examined twice.
* src/LR0.c (new_state): Merge into...
(state_list_append): this.
(new_states): Merge into...
(generate_states): here.
(set_states): Don't ensure a proper `errs' state member here, do it...
* src/conflicts.c (conflicts_solve): here.
* src/state.h, src/state.c: Comment changes.
(state_t): Rename member `shifts' as `transitions'.
Adjust all dependencies.
(errs_new): For consistency, also take the values as argument.
(errs_dup): Remove.
(state_errs_set): New.
(state_reductions_set, state_transitions_set): Assert that no
previous value was assigned.
(state_free): New.
(states_free): Use it.
* src/conflicts.c (resolve_sr_conflict): Don't use an `errs_t' as
temporary storage: use `errs' and `nerrs' as elsewhere.
(set_conflicts): Allocate and free this `errs'.
Akim Demaille [Tue, 2 Jul 2002 13:51:27 +0000 (13:51 +0000)]
* lib/libiberty.h: New.
* lib: Update the bitset implementation from upstream.
* src/closure.c, src/lalr.c, src/output.c, src/print_graph.c,
* src/state.c: Use BITSET_FOR_EACH, not BITSET_EXECUTE.
* src/main.c: Adjust bitset stats calls.
Akim Demaille [Tue, 2 Jul 2002 11:39:04 +0000 (11:39 +0000)]
Regen.
Paul Eggert [Mon, 1 Jul 2002 08:37:14 +0000 (08:37 +0000)]
* src/scan-gram.l (<SC_ESCAPED_CHARACTER>): Convert to unsigned
char, so that negative chars don't collide with $.
Paul Eggert [Mon, 1 Jul 2002 08:36:37 +0000 (08:36 +0000)]
(<SC_ESCAPED_CHARACTER>): Convert to unsigned char, so that negative
chars don't collide with $.
Akim Demaille [Sun, 30 Jun 2002 17:43:22 +0000 (17:43 +0000)]
Typo.
Akim Demaille [Sun, 30 Jun 2002 17:37:38 +0000 (17:37 +0000)]
Regen.
Akim Demaille [Sun, 30 Jun 2002 17:35:06 +0000 (17:35 +0000)]
Have the GLR tests be `warning' checked, and fix the warnings.
* data/glr.c (YYFPRINTF): Always define it, not only when YYDEBUG
(yyuserAction, yyreportAmbiguity): `Use' all the arguments.
(yyremoveDeletes): `yyi' and `yyj' are size_t.
Use YYFPRINTF when under if (YYDEBUG) to avoid empty `if' bodies.
(yyaddDeferredAction): static.
(yyglrReduce): yyi, yyk, amd yyposn are size_t.
(yyreportParseError): yyprefix is const.
yytokenp is used only when verbose.
(yy__GNUC__): Replace with __GNUC__.
(yypdumpstack): yyi is size_t.
(yypreference): Un-yy local variables and arguments, to avoid
clashes with `yyr1'. Anyway, we are not in the user name space.
(yytname_size): be an int, as is compared with ints.
* tests/testsuite.at (AT_COMPILE, AT_PARSER_CHECK): New.
Use them.
* tests/cxx-gram.at: Use quotation to protect $1.
Use AT_COMPILE to enable warnings hunts.
Prototype yylex and yyerror.
`Use' argc.
Include `string.h', not `strings.h'.
Produce and prototype stmtMerge only when used.
yylex takes a location.
Akim Demaille [Sun, 30 Jun 2002 17:34:52 +0000 (17:34 +0000)]
We spend a lot of time in quotearg, in particular when --verbose.
* src/symtab.c (symbol_get): Store a quoted version of the key.
(symbol_tag_get, symbol_tag_get_n, symbol_tag_print): Remove.
Adjust all callers.
Akim Demaille [Sun, 30 Jun 2002 17:34:31 +0000 (17:34 +0000)]
* src/state.h (reductions_t): Rename member `nreds' as num.
(errs_t): Rename members `nerrs' and `errs' as `num' and `symbols'.
* src/state.c (ERRS_ALLOC, REDUCTIONS_ALLOC): Use the correct types.
Akim Demaille [Sun, 30 Jun 2002 17:33:37 +0000 (17:33 +0000)]
* src/state.h, src/state.c (shift_t, SHIFT_SYMBOL, SHIFT_IS_SHIFT)
(SHIFT_IS_GOTO, SHIFT_IS_ERROR, SHIFT_DISABLE, SHIFT_IS_DISABLED)
(shifts_to): Rename as...
(transition_t, TRANSITION_SYMBOL, TRANSITION_IS_TRANSITION)
(TRANSITION_IS_GOTO, TRANSITION_IS_ERROR, TRANSITION_DISABLE)
(TRANSITION_IS_DISABLED, transitions_to): these.
Akim Demaille [Sun, 30 Jun 2002 17:33:20 +0000 (17:33 +0000)]
* src/print.c (print_shifts, print_gotos): Merge into...
(print_transitions): this.
(print_transitions, print_errs, print_reductions): Align the
lookaheads columns.
(print_core, print_transitions, print_errs, print_state,
print_grammar): Output empty lines separator before, not after.
(state_default_rule_compute): Rename as...
(state_default_rule): this.
* tests/conflicts.at (Defaulted Conflicted Reduction),
(Unresolved SR Conflicts, Resolved SR Conflicts): Adjust.
* tests/regression.at (Rule Line Numbers, Web2c Report): Adjust.
Akim Demaille [Sun, 30 Jun 2002 17:33:08 +0000 (17:33 +0000)]
Display items as we display rules.
* src/gram.h, src/gram.c (rule_lhs_print): New.
* src/gram.c (grammar_rules_partial_print): Use it.
* src/print.c (print_core): Likewise.
* tests/conflicts.at (Defaulted Conflicted Reduction),
(Unresolved SR Conflicts): Adjust.
(Unresolved SR Conflicts): Adjust and rename as...
(Resolved SR Conflicts): this, as was meant.
* tests/regression.at (Web2c Report): Adjust.
Akim Demaille [Sun, 30 Jun 2002 17:32:47 +0000 (17:32 +0000)]
* src/print.c (state_default_rule_compute): New, extracted from...
(print_reductions): here.
Pessimize, but clarify the code.
* tests/conflicts.at (Defaulted Conflicted Reduction): New.
Akim Demaille [Sun, 30 Jun 2002 17:32:35 +0000 (17:32 +0000)]
* src/output.c (action_row): Let default_rule be always a rule
number.
Akim Demaille [Sun, 30 Jun 2002 17:32:17 +0000 (17:32 +0000)]
* src/closure.c (print_firsts, print_fderives, closure):
Use BITSET_EXECUTE.
* src/lalr.c (lookaheads_print): Likewise.
* src/state.c (state_rule_lookaheads_print): Likewise.
* src/print_graph.c (print_core): Likewise.
* src/print.c (print_reductions): Likewise.
* src/output.c (action_row): Likewise.
Use SHIFT_IS_DISABLED, SHIFT_IS_SHIFT and SHIFT_SYMBOL.
Akim Demaille [Sun, 30 Jun 2002 17:32:02 +0000 (17:32 +0000)]
* src/print_graph.c: Use report_flag.
Akim Demaille [Sun, 30 Jun 2002 17:31:51 +0000 (17:31 +0000)]
* src/lalr.c (traverse, digraph, matrix_print, transpose): Move
to...
* src/relation.h, src/relation.c (traverse, relation_digraph)
(relation_print, relation_transpose): New.
Akim Demaille [Sun, 30 Jun 2002 17:31:37 +0000 (17:31 +0000)]
* src/state.h, src/state.c (shifts_to): New.
* src/lalr.c (build_relations): Use it.