* src/lalr.h: New file.

Propagate its inclusion instead of prototypes and `extern'.
* src/lalr.c: Formatting changes, topological sorting etc.

ChangeLog

@@ -1,3 +1,10 @@
+2000-10-02  Akim Demaille  <akim@epita.fr>
+
+	* src/lalr.h: New file.
+	Propagate its inclusion instead of prototypes and `extern'.
+	* src/lalr.c: Formatting changes, topological sorting etc.
+
+	
 2000-10-02  Akim Demaille  <akim@epita.fr>
 
 	* src/output.c (token_actions): Introduce a temporary array,

src/Makefile.am

@@ -20,7 +20,7 @@ EXTRA_bison_SOURCES = vmsgetargs.c
 
 noinst_HEADERS = alloc.h closure.h complain.h \
  derives.h \
- files.h getargs.h gram.h lex.h \
+ files.h getargs.h gram.h lalr.h lex.h \
  output.h state.h	\
  symtab.h system.h types.h
 

src/conflicts.c

@@ -24,16 +24,9 @@
 #include "files.h"
 #include "gram.h"
 #include "state.h"
-
+#include "lalr.h"
 
 extern char **tags;
-extern int tokensetsize;
-extern char *consistent;
-extern short *accessing_symbol;
-extern shifts **shift_table;
-extern unsigned *LA;
-extern short *LAruleno;
-extern short *lookaheads;
 extern int fixed_outfiles;
 
 extern void initialize_conflicts PARAMS ((void));

src/lalr.h

@@ -0,0 +1,80 @@
+/* Compute look-ahead criteria for bison,
+   Copyright (C) 1984, 1986, 1989 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 LALR_H_
+# define LALR_H_
+
+/* Compute how to make the finite state machine deterministic; find
+   which rules need lookahead in each state, and which lookahead
+   tokens they accept.  */
+
+void lalr PARAMS ((void));
+
+
+/* lalr() builds these data structures. */
+
+/* goto_map, from_state and to_state --record each shift transition
+   which accepts a variable (a nonterminal).
+
+   from_state[t] is the state number which a transition leads from and
+   to_state[t] is the state number it leads to.  All the transitions
+   that accept a particular variable are grouped together and
+   goto_map[i - ntokens] is the index in from_state and to_state of
+   the first of them.  */
+
+extern short *goto_map;
+extern short *from_state;
+extern short *to_state;
+
+/* CONSISTENT[S] is nonzero if no lookahead is needed to decide what
+   to do in state S.  */
+
+extern char *consistent;
+
+
+/* LARULENO is a vector which records the rules that need lookahead in
+   various states.  The elements of LARULENO that apply to state S are
+   those from LOOKAHEADS[S] through LOOKAHEADS[S+1]-1.  Each element
+   of LARULENO is a rule number.
+
+   If LR is the length of LAruleno, then a number from 0 to LR-1 can
+   specify both a rule and a state where the rule might be applied.
+   */
+
+extern short *LAruleno;
+
+/* LA is a lr by ntokens matrix of bits.  LA[l, i] is 1 if the rule
+   LAruleno[l] is applicable in the appropriate state when the next
+   token is symbol i.  If LA[l, i] and LA[l, j] are both 1 for i != j,
+   it is a conflict.  */
+
+extern unsigned *LA;
+
+
+extern int tokensetsize;
+extern short *lookaheads;
+extern short *accessing_symbol;
+extern core **state_table;
+extern shifts **shift_table;
+extern reductions **reduction_table;
+
+
+
+#endif /* !LALR_H_ */

src/output.c

@@ -98,25 +98,14 @@
 #include "state.h"
 #include "complain.h"
 #include "output.h"
+#include "lalr.h"
 
 extern void berror PARAMS((const char *));
 
 extern char **tags;
 extern short *user_toknums;
-extern int tokensetsize;
 extern int final_state;
-extern core **state_table;
-extern shifts **shift_table;
 extern errs **err_table;
-extern reductions **reduction_table;
-extern short *accessing_symbol;
-extern unsigned *LA;
-extern short *LAruleno;
-extern short *lookaheads;
-extern char *consistent;
-extern short *goto_map;
-extern short *from_state;
-extern short *to_state;
 
 extern void reader_output_yylsp PARAMS ((FILE *));
 

src/print.c

@@ -24,16 +24,11 @@
 #include "files.h"
 #include "gram.h"
 #include "state.h"
-
+#include "lalr.h"
 
 extern char **tags;
 extern int nstates;
-extern short *accessing_symbol;
-extern core **state_table;
-extern shifts **shift_table;
 extern errs **err_table;
-extern reductions **reduction_table;
-extern char *consistent;
 extern char any_conflicts;
 extern char *conflicts;
 extern int final_state;