(GOTO_NUMBER_MAX): INT_MAX -> SHRT_MAX.

[bison.git] / src / lalr.h

diff --git a/src/lalr.h b/src/lalr.h
index 9731563df84110c04f690f3fcfe2887f544155a9..c0ca461ce089eca508d0b2bc8e1fd98e2edb4775 100644 (file)
--- a/src/lalr.h
+++ b/src/lalr.h
@@ -21,9 +21,10 @@
 #ifndef LALR_H_
 # define LALR_H_
 
-#include "bitset.h"
+# include "bitset.h"
+# include "bitsetv.h"
 
-/* Import the definition of CORE, SHIFTS and REDUCTIONS. */
+/* Import the definition of CORE, TRANSITIONS and REDUCTIONS. */
 # include "state.h"
 
 /* Import the definition of RULE_T. */
@@ -35,6 +36,11 @@
 
 void lalr PARAMS ((void));
 
+/* Release the information related to lookaheads.  Can be performed
+   once the action tables are computed.  */
+
+void lalr_free PARAMS ((void));
+
 
 /* lalr() builds these data structures. */
 
@@ -48,29 +54,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;
-
-/* LARULE is a vector which records the rules that need lookahead in
-   various states.  The elements of LARULE that apply to state S are
-   those from LOOKAHEADS[S] through LOOKAHEADS[S+1]-1.
-
-   If LR is the length of LArule, then a number from 0 to LR-1 can
-   specify both a rule and a state where the rule might be applied.
-   */
-
-extern rule_t **LArule;
-
-/* 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 bitset *LA;
+typedef short goto_number_t;
+# define GOTO_NUMBER_MAX ((goto_number_t) SHRT_MAX)
 
+extern goto_number_t *goto_map;
+extern state_number_t *from_state;
+extern state_number_t *to_state;
 
-/* All the states, indexed by the state number.  */
-extern state_t **states;
 
 #endif /* !LALR_H_ */