Paul Eggert
7601152fab
Fix dates in copyright notice.
2002-07-10 06:24:51 +00:00
Akim Demaille
fae437e835
* doc/bison.texinfo: Properly set the ``header'' part.
...
Use @dircategory ``GNU programming tools'' as per Texinfo's
documentation.
Use @copying.
2002-07-09 17:01:42 +00:00
Akim Demaille
1a715ef2fc
* 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.
2002-07-09 16:24:57 +00:00
Akim Demaille
a5d5099417
* 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.
2002-07-09 15:54:39 +00:00
Akim Demaille
b275314e2d
* 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.
2002-07-09 14:48:01 +00:00
Akim Demaille
c5f5043618
Regen.
2002-07-09 13:05:22 +00:00
Akim Demaille
2ab9a04ffc
Update.
2002-07-09 10:41:44 +00:00
Akim Demaille
865b9df14c
* tests/synclines.at (AT_SYNCLINES_COMPILE): New.
...
(AT_TEST_SYNCLINE): Adjust to unusual GCC outputs.
Reported by R Blake <blakers@mac.com >.
2002-07-09 10:06:20 +00:00
Akim Demaille
c76e14da4b
* data/yacc.c: Output the copyright notive in the header.
2002-07-09 09:43:22 +00:00
Akim Demaille
7db2ed2d82
* 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.
2002-07-03 12:51:30 +00:00
Akim Demaille
3a9e26be57
Regen.
2002-07-03 12:50:58 +00:00
Akim Demaille
e68e0410ab
* 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.
2002-07-03 10:54:33 +00:00
Akim Demaille
e1a4f3a428
* 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.
2002-07-03 10:36:38 +00:00
Akim Demaille
536545f3a4
* 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.
2002-07-03 06:52:02 +00:00
Akim Demaille
8b752b00fd
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'.
2002-07-03 06:51:43 +00:00
Akim Demaille
613f5e1a89
* 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.
2002-07-02 13:51:27 +00:00
Akim Demaille
524346a3a3
Regen.
2002-07-02 11:39:04 +00:00
Paul Eggert
26e0cadc37
* src/scan-gram.l (<SC_ESCAPED_CHARACTER>): Convert to unsigned
...
char, so that negative chars don't collide with $.
2002-07-01 08:37:14 +00:00
Paul Eggert
e68d4575b3
(<SC_ESCAPED_CHARACTER>): Convert to unsigned char, so that negative
...
chars don't collide with $.
2002-07-01 08:36:37 +00:00
Akim Demaille
bb3f671805
Typo.
2002-06-30 17:43:22 +00:00
Akim Demaille
88e7e94146
Regen.
2002-06-30 17:37:38 +00:00
Akim Demaille
1154ccedaf
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.
2002-06-30 17:35:06 +00:00
Akim Demaille
97650f4efc
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.
2002-06-30 17:34:52 +00:00
Akim Demaille
d257636504
* 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.
2002-06-30 17:34:31 +00:00
Akim Demaille
ccaf65bc63
* 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.
2002-06-30 17:33:37 +00:00
Akim Demaille
87675353bf
* 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.
2002-06-30 17:33:20 +00:00
Akim Demaille
ce4ccb4b11
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.
2002-06-30 17:33:08 +00:00
Akim Demaille
bc933ef16d
* 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.
2002-06-30 17:32:47 +00:00
Akim Demaille
53d4308dbb
* src/output.c (action_row): Let default_rule be always a rule
...
number.
2002-06-30 17:32:35 +00:00
Akim Demaille
574fb2d568
* 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.
2002-06-30 17:32:17 +00:00
Akim Demaille
05811fd755
* src/print_graph.c: Use report_flag.
2002-06-30 17:32:02 +00:00
Akim Demaille
0e4d575330
* src/lalr.c (traverse, digraph, matrix_print, transpose): Move
...
to...
* src/relation.h, src/relation.c (traverse, relation_digraph)
(relation_print, relation_transpose): New.
2002-06-30 17:31:51 +00:00
Akim Demaille
24c7d80020
* src/state.h, src/state.c (shifts_to): New.
...
* src/lalr.c (build_relations): Use it.
2002-06-30 17:31:37 +00:00
Akim Demaille
9222837b27
* src/gram.h (rule_number_t, RULE_NUMBER_MAX, int_of_rule_number)
...
(item_number_of_rule_number, rule_number_of_item_number): New.
* src/LR0.c, src/closure.c, src/derives.c, src/derives.h,
* src/gram.c, src/lalr.c, src/nullable.c, src/output.c, src/print.c,
* src/print_graph.c, src/reader.c, src/reduce.c, src/reduce.h:
Propagate their use.
Much remains to be done, in particular wrt `shorts' from types.h.
2002-06-30 17:31:19 +00:00
Akim Demaille
260008e546
* src/symtab.c (symbol_new): Initialize the `printer' member.
2002-06-30 17:30:58 +00:00
Akim Demaille
8a731ca829
* src/LR0.c (save_reductions): Remove, replaced by...
...
* src/state.h, src/state.c (state_reductions_set): New.
(reductions, errs): Rename as...
(reductions_t, errs_t): these.
Adjust all dependencies.
2002-06-30 17:30:46 +00:00
Akim Demaille
32e1e0a486
* src/LR0.c (state_list_t, state_list_append): New.
...
(first_state, last_state): Now symbol_list_t.
(this_state): Remove.
(new_itemsets, append_states, save_reductions): Take a state_t as
argument.
(set_states, generate_states): Adjust.
(save_shifts): Remove, replaced by...
* src/state.h, src/state.c (state_shifts_set): New.
(shifts): Rename as...
(shifts_t): this.
Adjust all dependencies.
* src/state.h (state_t): Remove the `next' member.
2002-06-30 17:30:29 +00:00
Akim Demaille
e5fb671032
* src/vcg.c (quote): Use slot 2, since we often pass symbol tag
...
escaped in slot 0.
2002-06-30 17:30:09 +00:00
Akim Demaille
c7ca99d4b0
Use hash.h for the state hash table.
...
* src/LR0.c (STATE_HASH_SIZE, state_hash): Remove.
(allocate_storage): Use state_hash_new.
(free_storage): Use state_hash_free.
(new_state, get_state): Adjust.
* src/lalr.h, src/lalr.c (states): Move to...
* src/states.h (state_t): Remove the `link' member, no longer
used.
* src/states.h, src/states.c: here.
(state_hash_new, state_hash_free, state_hash_lookup)
(state_hash_insert, states_free): New.
* src/states.c (state_table, state_compare, state_hash): New.
* src/output.c (output_actions): Do not free states now, since we
still need to know the final_state number in `prepare', called
afterwards. Do it...
* src/main.c (main): here: call states_free after `output'.
2002-06-30 17:29:36 +00:00
Akim Demaille
df0e7316a9
* src/state.h, src/state.c (state_new): New, extracted from...
...
* src/LR0.c (new_state): here.
* src/state.h (STATE_ALLOC): Move to...
* src/state.c: here.
* src/LR0.h, src/LR0.c (nstates, final_state): Move to...
* src/state.h, src/state.c: here.
2002-06-30 17:28:44 +00:00
Akim Demaille
39f4191608
* src/reader.c (gensym): Rename as...
...
* src/symtab.h, src/symtab.c (dummy_symbol_get): this.
(getsym): Rename as...
(symbol_get): this.
2002-06-30 17:27:57 +00:00
Akim Demaille
d57650a5ff
* src/state.h (state_number_t, STATE_NUMBER_MAX): New.
...
* src/LR0.c, src/LR0.h, src/conflicts.c, src/lalr.c, src/lalr.h,
* src/output.c, src/print.c, src/print_graph.c: Propagate.
* src/LR0.h, src/LR0.h (final_state): Is a state_t*.
2002-06-30 17:27:34 +00:00
Akim Demaille
5a08f1ce21
Make the test suite pass with warnings checked.
...
* tests/actions.at (Printers and Destructors): Improve.
Avoid unsigned vs. signed issues.
* tests/calc.at: Don't exercise the scanner here, do it...
* tests/input.at (Torturing the Scanner): here.
2002-06-30 17:27:14 +00:00
Paul Hilfinger
720623af84
* data/glr.c: Correct typo in Emacs-mode directive. Slightly
...
reorganize first lines parallel to yacc.c.
2002-06-28 22:42:58 +00:00
Akim Demaille
fb8135fa99
* data/c.m4 (b4_copyright, b4_sint_type, b4_uint_type, b4_token_define)
...
(b4_token_enum, b4_token_defines): New, factored from...
* data/lalr1.cc, data/yacc.c, glr.c: here.
2002-06-28 17:27:29 +00:00
Akim Demaille
4fa887b790
regen.
2002-06-28 17:12:10 +00:00
Akim Demaille
4144248075
* data/yacc.c (yydestruct, yysymprint): Pacify GCC warnings for
...
unused variables.
* src/output.c (merger_output): static.
2002-06-28 09:05:11 +00:00
Akim Demaille
e0e5bf84b0
* src/reader.h: s/grammer_current_rule_merge_set/grammar_.../.
...
* src/conflicts.c (conflicts_total_count): `i' is unsigned, to
pacify GCC.
* src/output.c (save_row): Initialize all the variables to pacify GCC.
(merger_output): static.
2002-06-28 08:41:45 +00:00
Paul Hilfinger
b5480d74b8
Fix small formatting glitch.
2002-06-28 02:47:14 +00:00
Paul Hilfinger
676385e29c
Initial check-in introducing experimental GLR parsing. See entry in
...
ChangeLog dated 2002-06-27 from Paul Hilfinger for details.
2002-06-28 02:26:44 +00:00