* data/yacc.c: (b4_lex_param): Corrected for the case where

[bison.git] / src / lalr.h

diff --git a/src/lalr.h b/src/lalr.h
index 609310527230c4a35934bb6df2cc24b96d11f89b..7912a089d46b19316daf98609b2262104c514d26 100644 (file)
--- a/src/lalr.h
+++ b/src/lalr.h
@@ -21,20 +21,25 @@
 #ifndef LALR_H_
 # define LALR_H_
 
 #ifndef LALR_H_
 # define LALR_H_
 

-#include "bitset.h"
-#include "bitsetv.h"
-
-/* Import the definition of CORE, SHIFTS and REDUCTIONS. */
-# include "state.h"
+# include <bitset.h>
+# include <bitsetv.h>

 
 /* Import the definition of RULE_T. */
 # include "gram.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
    tokens they accept.  */
 
 /* 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));
+void lalr (void);
+
+/* Release the information related to lookaheads.  Can be performed
+   once the action tables are computed.  */
+
+void lalr_free (void);

 
 
 /* lalr() builds these data structures. */
 
 
 /* lalr() builds these data structures. */


@@ -49,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.  */
 
    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 bitsetv LA;
+typedef short goto_number;
+# define GOTO_NUMBER_MAXIMUM SHRT_MAX

 
 

+extern goto_number *goto_map;
+extern state_number *from_state;
+extern state_number *to_state;

 
 

-/* All the states, indexed by the state number.  */
-extern state_t **states;

 
 #endif /* !LALR_H_ */
 
 #endif /* !LALR_H_ */