]> git.saurik.com Git - bison.git/log
bison.git
22 years agoInstead of attaching lookaheads and duplicating the rules being
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.

22 years ago* src/derives.h, src/derives.c (derives): A `rule_t***' instead of
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.

22 years ago* lib/timevar.c (get_time): Include children time.
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.

22 years agoSeparate parser tables computation and output.
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.

22 years agoSteal GCC's --time-report support.
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.

22 years agoLet --trace have arguments.
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.

22 years agoAdd HACKING.
Akim Demaille [Wed, 31 Jul 2002 16:57:39 +0000 (16:57 +0000)] 
Add HACKING.

22 years agoIn verbose parse error message, don't report `error' as an
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.

22 years agoNormalize conflict related messages.
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.

22 years agoReport rules which are never reduced by the parser: those hidden
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.

22 years ago`stage' was accidently included in a previous patch.
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.

22 years ago* src/state.h, src/state.c (transitions_t): Holds state_t*'s, not
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.

22 years agoUse $accept and $end, as BYacc and BTYacc do, instead of $axiom and $.
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.

22 years ago* src/reduce.c (reduce_grammar): When the language is empty,
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.

22 years ago* src/reader.h, src/reader.c (gram_error): ... can't get
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.

22 years ago* src/output.c (prepare_tokens): Go up to ntokens, not ntokens + 1.
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.

22 years agoStop storing rules from 1 to nrules + 1.
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.

22 years ago* data/c.m4 (b4_c_function, b4_c_ansi_args, b4_c_ansi_arg)
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.

22 years ago* data/yacc.c (yyreport_parse_error): New, extracted from...
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.

22 years ago* data/c.m4 (b4_ints_in, b4_int_type, b4_int_type_for): New,
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.

22 years ago* src/gram.h (TIEM_NUMBER_MAX): New.
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.

22 years ago* src/scan-gram.l (id): Can start with an underscore.
Akim Demaille [Fri, 19 Jul 2002 08:31:32 +0000 (08:31 +0000)] 
* src/scan-gram.l (id): Can start with an underscore.

22 years ago* src/assoc.c, src/asssoc.h (assoc_t, assoc_to_string): New.
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.

22 years agoFix dates in copyright notice.
Paul Eggert [Wed, 10 Jul 2002 06:24:51 +0000 (06:24 +0000)] 
Fix dates in copyright notice.

22 years ago* doc/bison.texinfo: Properly set the ``header'' part.
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.

22 years ago* lib/quotearg.h: Protect against multiple inclusions.
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.

22 years ago* src/complain.h, src/complain.c (warn, complain): Remove, unused.
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.

22 years ago* src/parse-gram.y (rules_or_grammar_declaration): Add an error
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.

22 years agoRegen.
Akim Demaille [Tue, 9 Jul 2002 13:05:22 +0000 (13:05 +0000)] 
Regen.

22 years agoUpdate.
Akim Demaille [Tue, 9 Jul 2002 10:41:44 +0000 (10:41 +0000)] 
Update.

22 years ago* tests/synclines.at (AT_SYNCLINES_COMPILE): New.
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>.

22 years ago* data/yacc.c: Output the copyright notive in the header.
Akim Demaille [Tue, 9 Jul 2002 09:43:22 +0000 (09:43 +0000)] 
* data/yacc.c: Output the copyright notive in the header.

22 years ago* src/output.c (froms, tos): Are state_number_t.
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.

22 years agoRegen.
Akim Demaille [Wed, 3 Jul 2002 12:50:58 +0000 (12:50 +0000)] 
Regen.

22 years ago* src/lalr.h, src/lalr.c (goto_number_t): New.
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.

22 years ago* src/closure.c (print_fderives): Use rule_rhs_print.
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.

22 years ago* src/output.c (prepare_actions): Free `tally' and `width'.
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.

22 years agoFix some memory leaks, and fix a bug: state 0 was examined twice.
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'.

22 years ago* lib/libiberty.h: New.
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.

22 years agoRegen.
Akim Demaille [Tue, 2 Jul 2002 11:39:04 +0000 (11:39 +0000)] 
Regen.

22 years ago* src/scan-gram.l (<SC_ESCAPED_CHARACTER>): Convert to unsigned
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 $.

22 years ago(<SC_ESCAPED_CHARACTER>): Convert to unsigned char, so that negative
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 $.

22 years agoTypo.
Akim Demaille [Sun, 30 Jun 2002 17:43:22 +0000 (17:43 +0000)] 
Typo.

22 years agoRegen.
Akim Demaille [Sun, 30 Jun 2002 17:37:38 +0000 (17:37 +0000)] 
Regen.

22 years agoHave the GLR tests be `warning' checked, and fix the warnings.
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.

22 years agoWe spend a lot of time in quotearg, in particular when --verbose.
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.

22 years ago* src/state.h (reductions_t): Rename member `nreds' as num.
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.

22 years ago* src/state.h, src/state.c (shift_t, SHIFT_SYMBOL, SHIFT_IS_SHIFT)
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.

22 years ago* src/print.c (print_shifts, print_gotos): Merge into...
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.

22 years agoDisplay items as we display rules.
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.

22 years ago* src/print.c (state_default_rule_compute): New, extracted from...
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.

22 years ago* src/output.c (action_row): Let default_rule be always a rule
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.

22 years ago* src/closure.c (print_firsts, print_fderives, closure):
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.

22 years ago* src/print_graph.c: Use report_flag.
Akim Demaille [Sun, 30 Jun 2002 17:32:02 +0000 (17:32 +0000)] 
* src/print_graph.c: Use report_flag.

22 years ago* src/lalr.c (traverse, digraph, matrix_print, transpose): Move
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.

22 years ago* src/state.h, src/state.c (shifts_to): 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.

22 years ago* src/gram.h (rule_number_t, RULE_NUMBER_MAX, int_of_rule_number)
Akim Demaille [Sun, 30 Jun 2002 17:31:19 +0000 (17:31 +0000)] 
* 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.

22 years ago* src/symtab.c (symbol_new): Initialize the `printer' member.
Akim Demaille [Sun, 30 Jun 2002 17:30:58 +0000 (17:30 +0000)] 
* src/symtab.c (symbol_new): Initialize the `printer' member.

22 years ago* src/LR0.c (save_reductions): Remove, replaced by...
Akim Demaille [Sun, 30 Jun 2002 17:30:46 +0000 (17:30 +0000)] 
* 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.

22 years ago* src/LR0.c (state_list_t, state_list_append): New.
Akim Demaille [Sun, 30 Jun 2002 17:30:29 +0000 (17:30 +0000)] 
* 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.

22 years ago* src/vcg.c (quote): Use slot 2, since we often pass symbol tag
Akim Demaille [Sun, 30 Jun 2002 17:30:09 +0000 (17:30 +0000)] 
* src/vcg.c (quote): Use slot 2, since we often pass symbol tag
escaped in slot 0.

22 years agoUse hash.h for the state hash table.
Akim Demaille [Sun, 30 Jun 2002 17:29:36 +0000 (17:29 +0000)] 
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'.

22 years ago* src/state.h, src/state.c (state_new): New, extracted from...
Akim Demaille [Sun, 30 Jun 2002 17:28:44 +0000 (17:28 +0000)] 
* 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.

22 years ago* src/reader.c (gensym): Rename as...
Akim Demaille [Sun, 30 Jun 2002 17:27:57 +0000 (17:27 +0000)] 
* src/reader.c (gensym): Rename as...
* src/symtab.h, src/symtab.c (dummy_symbol_get): this.
(getsym): Rename as...
(symbol_get): this.

22 years ago* src/state.h (state_number_t, STATE_NUMBER_MAX): New.
Akim Demaille [Sun, 30 Jun 2002 17:27:34 +0000 (17:27 +0000)] 
* 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*.

22 years agoMake the test suite pass with warnings checked.
Akim Demaille [Sun, 30 Jun 2002 17:27:14 +0000 (17:27 +0000)] 
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.

22 years ago* data/glr.c: Correct typo in Emacs-mode directive. Slightly
Paul Hilfinger [Fri, 28 Jun 2002 22:42:58 +0000 (22:42 +0000)] 
* data/glr.c: Correct typo in Emacs-mode directive.  Slightly
  reorganize first lines parallel to yacc.c.

22 years ago* data/c.m4 (b4_copyright, b4_sint_type, b4_uint_type, b4_token_define)
Akim Demaille [Fri, 28 Jun 2002 17:27:29 +0000 (17:27 +0000)] 
* 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.

22 years agoregen.
Akim Demaille [Fri, 28 Jun 2002 17:12:10 +0000 (17:12 +0000)] 
regen.

22 years ago* data/yacc.c (yydestruct, yysymprint): Pacify GCC warnings for
Akim Demaille [Fri, 28 Jun 2002 09:05:11 +0000 (09:05 +0000)] 
* data/yacc.c (yydestruct, yysymprint): Pacify GCC warnings for
unused variables.
* src/output.c (merger_output): static.

22 years ago* src/reader.h: s/grammer_current_rule_merge_set/grammar_.../.
Akim Demaille [Fri, 28 Jun 2002 08:41:45 +0000 (08:41 +0000)] 
* 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.

22 years agoFix small formatting glitch.
Paul Hilfinger [Fri, 28 Jun 2002 02:47:14 +0000 (02:47 +0000)] 
Fix small formatting glitch.

22 years agoInitial check-in introducing experimental GLR parsing. See entry in
Paul Hilfinger [Fri, 28 Jun 2002 02:26:44 +0000 (02:26 +0000)] 
Initial check-in introducing experimental GLR parsing.  See entry in
ChangeLog dated 2002-06-27 from Paul Hilfinger for details.

22 years agoRenamed file from bison.glr.
Paul Hilfinger [Fri, 28 Jun 2002 01:51:33 +0000 (01:51 +0000)] 
Renamed file from bison.glr.

22 years agoRenaming file to glr.c.
Paul Hilfinger [Fri, 28 Jun 2002 01:50:29 +0000 (01:50 +0000)] 
Renaming file to glr.c.

22 years ago* src/options.h, src/options.c: Remove.
Akim Demaille [Thu, 27 Jun 2002 12:19:20 +0000 (12:19 +0000)] 
* src/options.h, src/options.c: Remove.
* src/getargs.c (short_options, long_options): New.

22 years agoUpdate.
Akim Demaille [Thu, 27 Jun 2002 12:18:03 +0000 (12:18 +0000)] 
Update.

22 years ago* data/bison.simple, data/bison.c++: Rename as...
Akim Demaille [Thu, 27 Jun 2002 12:08:20 +0000 (12:08 +0000)] 
* data/bison.simple, data/bison.c++: Rename as...
* data/yacc.c, data/lalr1.cc: these.
* doc/bison.texinfo (Environment Variables): Remove.

22 years agoUpdate.
Akim Demaille [Thu, 27 Jun 2002 11:56:03 +0000 (11:56 +0000)] 
Update.

22 years agoNew file: Tests for GLR parsing.
Paul Hilfinger [Wed, 26 Jun 2002 22:52:27 +0000 (22:52 +0000)] 
New file: Tests for GLR parsing.

22 years agoNew file: skeleton for GLR (Generalized LR) parser.
Paul Hilfinger [Wed, 26 Jun 2002 22:51:51 +0000 (22:51 +0000)] 
New file: skeleton for GLR (Generalized LR) parser.

22 years ago* src/getargs.c (report_argmatch): Initialize strtok().
Akim Demaille [Tue, 25 Jun 2002 12:05:38 +0000 (12:05 +0000)] 
* src/getargs.c (report_argmatch): Initialize strtok().

22 years agoUpdate.
Akim Demaille [Thu, 20 Jun 2002 12:23:54 +0000 (12:23 +0000)] 
Update.

22 years agoUpdate.
Akim Demaille [Thu, 20 Jun 2002 12:19:42 +0000 (12:19 +0000)] 
Update.

22 years ago* data/bison.simple (b4_symbol_actions): New, replaces...
Akim Demaille [Thu, 20 Jun 2002 11:46:59 +0000 (11:46 +0000)] 
* data/bison.simple (b4_symbol_actions): New, replaces...
(b4_symbol_destructor, b4_symbol_printer): these.
(yysymprint): Be sure to call YYPRINT only for tokens, and using
user token numbers.

22 years ago* data/bison.simple (yydestructor): Rename as...
Akim Demaille [Thu, 20 Jun 2002 11:28:33 +0000 (11:28 +0000)] 
* data/bison.simple (yydestructor): Rename as...
(yydestruct): this.

22 years ago* src/symtab.h, src/symtab.c (symbol_type_set)
Akim Demaille [Thu, 20 Jun 2002 11:20:25 +0000 (11:20 +0000)] 
* src/symtab.h, src/symtab.c (symbol_type_set)
(symbol_destructor_set, symbol_precedence_set): The location is
the last argument.
Adjust all callers.

22 years ago* src/parse-gram.y (YYPRINT, yyprint): Don't mess with the parser
Akim Demaille [Thu, 20 Jun 2002 11:10:56 +0000 (11:10 +0000)] 
* src/parse-gram.y (YYPRINT, yyprint): Don't mess with the parser
internals.
* src/reader.h, src/reader.c (grammar_current_rule_prec_set):
Takes a location.
* src/symtab.h, src/symtab.c (symbol_class_set)
(symbol_user_token_number_set): Likewise.
Adjust all callers.
Promote complain_at.
* tests/input.at (Type Clashes): Adjust.

22 years ago* data/bison.simple (YYLEX): Fix the declaration when
Akim Demaille [Thu, 20 Jun 2002 10:29:27 +0000 (10:29 +0000)] 
* data/bison.simple (YYLEX): Fix the declaration when
%pure-parser.

22 years ago* data/bison.simple (yysymprint): Don't print the token number,
Akim Demaille [Thu, 20 Jun 2002 09:47:44 +0000 (09:47 +0000)] 
* data/bison.simple (yysymprint): Don't print the token number,
just its name.
* tests/actions.at (Destructors): Rename as...
(Printers and Destructors): this.
Also exercise %printer.

22 years ago* data/bison.simple (YYDSYMPRINT): New.
Akim Demaille [Thu, 20 Jun 2002 09:22:56 +0000 (09:22 +0000)] 
* data/bison.simple (YYDSYMPRINT): New.
Use it to remove many of the #if YYDEBUG/if (yydebug).

22 years ago* src/symtab.h, src/symtab.c (symbol_t): printer and
Akim Demaille [Thu, 20 Jun 2002 09:08:37 +0000 (09:08 +0000)] 
* src/symtab.h, src/symtab.c (symbol_t): printer and
printer_location are new members.
(symbol_printer_set): New.
* src/parse-gram.y (PERCENT_PRINTER): New token.
Handle its associated rule.
* src/scan-gram.l: Adjust.
(handle_destructor_at, handle_destructor_dollar): Rename as...
(handle_symbol_code_at, handle_symbol_code_dollar): these.
* src/output.c (symbol_printers_output): New.
(output_skeleton): Call it.
* data/bison.simple (yysymprint): New.  Cannot be named yyprint
since there are already many grammar files with a user `yyprint'.
Replace the calls to YYPRINT to calls to yysymprint.
* tests/calc.at: Adjust.
* tests/torture.at (AT_DATA_STACK_TORTURE): Remove YYPRINT: it was
taking advantage of parser very internal details (stack size!).

22 years agoRegen.
Akim Demaille [Thu, 20 Jun 2002 09:05:10 +0000 (09:05 +0000)] 
Regen.

22 years ago* src/scan-gram.l: Complete the scanner with the missing patterns
Akim Demaille [Thu, 20 Jun 2002 07:19:13 +0000 (07:19 +0000)] 
* src/scan-gram.l: Complete the scanner with the missing patterns
to pacify Flex.
Use `quote' and `symbol_tag_get' where appropriate.

22 years ago* tests/actions.at (Destructors): Augment to test locations.
Akim Demaille [Wed, 19 Jun 2002 12:03:22 +0000 (12:03 +0000)] 
* tests/actions.at (Destructors): Augment to test locations.
* data/bison.simple (yydestructor): Pass it the current location
if locations are enabled.
Prototype only when __STDC__ or C++.
Change the argument names to move into the yy name space: there is
user code here.

22 years ago* data/bison.simple (b4_pure_if): New.
Akim Demaille [Wed, 19 Jun 2002 10:00:24 +0000 (10:00 +0000)] 
* data/bison.simple (b4_pure_if): New.
Use it instead of #ifdef YYPURE.

22 years ago* data/bison.simple (m4_location_if): New.
Akim Demaille [Wed, 19 Jun 2002 09:07:36 +0000 (09:07 +0000)] 
* data/bison.simple (m4_location_if): New.
Use it instead of #ifdef YYLSP_NEEDED.

22 years agoRegen.
Akim Demaille [Wed, 19 Jun 2002 09:02:43 +0000 (09:02 +0000)] 
Regen.

22 years agoPrepare @$ in %destructor, but currently don't bind it in the
Akim Demaille [Wed, 19 Jun 2002 08:22:49 +0000 (08:22 +0000)] 
Prepare @$ in %destructor, but currently don't bind it in the
skeleton, as %location use is not cleaned up yet.
* src/scan-gram.l (handle_dollar, handle_destructor_at)
(handle_action_at): New.
(handle_at, handle_action_dollar, handle_destructor_dollar): Take
a braced_code_t and a location as additional arguments.
(handle_destructor_dollar): Instead of requiring `b4_eval', just
unquote one when outputting `b4_dollar_dollar'.
Adjust callers.
* data/bison.simple (b4_eval): Remove.
(b4_symbol_destructor): Adjust.
* tests/input.at (Invalid @n): Adjust.

22 years ago* doc/bison.texinfo: Document ability to have multiple
Akim Demaille [Wed, 19 Jun 2002 07:46:11 +0000 (07:46 +0000)] 
* doc/bison.texinfo: Document ability to have multiple
prologue sections.