Point to an official beta.

[bison.git] / src / lalr.h

diff --git a/src/lalr.h b/src/lalr.h
index c803edd2196d64cdd7f79b4b8a53a28864c58513..609310527230c4a35934bb6df2cc24b96d11f89b 100644 (file)
--- a/src/lalr.h
+++ b/src/lalr.h
@@ -1,5 +1,5 @@
 /* Compute look-ahead criteria for bison,
 /* Compute look-ahead criteria for bison,

-   Copyright 1984, 1986, 1989, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000, 2002 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -21,10 +21,14 @@
 #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"
 
 
 /* Import the definition of CORE, SHIFTS and REDUCTIONS. */
 # include "state.h"
 

+/* Import the definition of RULE_T. */
+# include "gram.h"

 
 /* Compute how to make the finite state machine deterministic; find
    which rules need lookahead in each state, and which lookahead
 
 /* Compute how to make the finite state machine deterministic; find
    which rules need lookahead in each state, and which lookahead


@@ -49,51 +53,25 @@ extern short *goto_map;
 extern short *from_state;
 extern short *to_state;
 
 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.  */
+/* 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.

 
 

-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
+   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.
    */
 
    specify both a rule and a state where the rule might be applied.
    */
 

-extern short *LAruleno;
+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.  */
 
 
 /* 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;
-
-
-/* A structure decorating a state, with additional information. */
-typedef struct state_s
-{
-  /* A state.  */
-  core *state;
-
-  /* Its accessing symbol. */
-  short accessing_symbol;
-} state_t;
-
-/* All the decorated states, indexed by the state number.  Warning:
-   there is a state_TABLE in LR0.c, but it is different and static.
-   */
-extern state_t *state_table;
-
-extern int tokensetsize;
-extern short *lookaheads;
-extern shifts **shift_table;
-extern reductions **reduction_table;
+extern bitsetv LA;

 
 
 
 

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

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