(version): Happy new year; update overall

[bison.git] / src / lalr.h

diff --git a/src/lalr.h b/src/lalr.h
index 31cf806983a072b90d78f5f0abd07a67fab371b1..1d6eeb4c313f8e9ccb5398902527aac5853a3d70 100644 (file)
--- a/src/lalr.h
+++ b/src/lalr.h
@@ -1,5 +1,7 @@
 /* Compute look-ahead criteria for bison,
-   Copyright 1984, 1986, 1989, 2000 Free Software Foundation, Inc.
+
+   Copyright (C) 1984, 1986, 1989, 2000, 2002, 2004 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -21,16 +23,25 @@
 #ifndef LALR_H_
 # define LALR_H_
 
+# include <bitset.h>
+# include <bitsetv.h>
 
-/* Import the definition of CORE, SHIFTS and REDUCTIONS. */
-# include "state.h"
+/* Import the definition of RULE_T. */
+# include "gram.h"
 
+/* Import the definition of CORE, TRANSITIONS and REDUCTIONS. */
+# include "state.h"
 
 /* Compute how to make the finite state machine deterministic; find
-   which rules need lookahead in each state, and which lookahead
+   which rules need look-ahead in each state, and which look-ahead
    tokens they accept.  */
 
-void lalr PARAMS ((void));
+void lalr (void);
+
+/* Release the information related to look-ahead tokens.  Can be performed
+   once the action tables are computed.  */
+
+void lalr_free (void);
 
 
 /* lalr() builds these data structures. */
@@ -45,33 +56,12 @@ void lalr PARAMS ((void));
    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;
-
-/* 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;
-#define LA(Rule) (LA + (Rule) * tokensetsize)
-
+typedef size_t goto_number;
+# define GOTO_NUMBER_MAXIMUM ((goto_number) -1)
 
-/* All the states, indexed by the state number.  */
-extern state_t **state_table;
+extern goto_number *goto_map;
+extern state_number *from_state;
+extern state_number *to_state;
 
-extern int tokensetsize;
 
 #endif /* !LALR_H_ */