3 Commits

Author	SHA1	Message	Date
Akim Demaille	cd08e51eda	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.	2002-08-01 18:14:30 +00:00
Akim Demaille	3325ddc49c	* 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.	2002-08-01 18:12:11 +00:00
Akim Demaille	c6f1a33c06	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.	2002-07-31 21:52:00 +00:00