* data/bison.c++: Merge the two generated headers. Insert a copyright

[bison.git] / src / lalr.h

diff --git a/src/lalr.h b/src/lalr.h
index c803edd2196d64cdd7f79b4b8a53a28864c58513..77a5d9df7d4a461c1fb1e824cd3ebb8f2d84490e 100644 (file)
--- a/src/lalr.h
+++ b/src/lalr.h
@@ -49,12 +49,6 @@ 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
@@ -72,28 +66,12 @@ extern short *LAruleno;
    it is a conflict.  */
 
 extern unsigned *LA;
+#define LA(Rule) (LA + (Rule) * tokensetsize)
 
 
-/* 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;
+/* All the states, indexed by the state number.  */
+extern state_t **states;
 
 extern int tokensetsize;
-extern short *lookaheads;
-extern shifts **shift_table;
-extern reductions **reduction_table;
-
-
 
 #endif /* !LALR_H_ */