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.

1 files changed, 52 insertions, 0 deletions

diff --git a/src/tables.h b/src/tables.h
new file mode 100644
index 00000000..937c3ffd
--- /dev/null
+++ b/src/tables.h
@@ -0,0 +1,52 @@
+/* Prepare the LALR and GLR parser tables.
+   Copyright (C) 2002  Free Software Foundation, Inc.
+
+   This file is part of Bison, the GNU Compiler Compiler.
+
+   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.
+
+   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 Bison; see the file COPYING.  If not, write to the Free
+   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
+
+#ifndef TABLES_H_
+# define TABLES_H_
+
+# include "state.h"
+
+extern int nvectors;
+
+typedef int base_t;
+extern base_t *base;
+/* A distinguished value of BASE, negative infinite.  During the
+   computation equals to BASE_MIN, later mapped to BASE_NINF to
+   keep parser tables small.  */
+extern base_t base_ninf;
+
+extern unsigned int *conflict_table;
+extern unsigned int *conflict_list;
+extern int conflict_list_cnt;
+
+extern base_t *table;
+extern base_t *check;
+/* The value used in TABLE to denote explicit parse errors
+   (%nonassoc), a negative infinite.  */
+extern base_t table_ninf;
+
+extern state_number_t *yydefgoto;
+extern rule_number_t *yydefact;
+extern int high;
+
+void tables_generate PARAMS ((void));
+void tables_free PARAMS ((void));
+
+#endif /* !TABLES_H_ */