* tests/regression.at, tests/torture.at, tests/calc.at: Adjust to

[bison.git] / src / lalr.h

diff --git a/src/lalr.h b/src/lalr.h
index c2444883e49cac72ba9d13bb36747236e8ae0e98..55e01d8f79b03e92232bc5dad27406c0e53fb95a 100644 (file)
--- a/src/lalr.h
+++ b/src/lalr.h
@@ -66,6 +66,7 @@ extern short *LAruleno;
    it is a conflict.  */
 
 extern unsigned *LA;
+#define LA(Rule) (LA + (Rule) * tokensetsize)
 
 
 /* A structure decorating a state, with additional information. */
@@ -77,12 +78,15 @@ typedef struct state_s
   /* Its accessing symbol. */
   short accessing_symbol;
 
-  shifts *shift_table;
-  reductions *reduction_table;
+  shifts     *shifts;
+  reductions *reductions;
+  errs       *errs;
 
   /* Nonzero if no lookahead is needed to decide what to do in state
      S.  */
   char consistent;
+
+  short lookaheads;
 } state_t;
 
 /* All the decorated states, indexed by the state number.  Warning:
@@ -91,9 +95,7 @@ typedef struct state_s
 extern state_t *state_table;
 
 extern int tokensetsize;
-extern short *lookaheads;
-
-
-
 
+/* The number of lookaheads. */
+extern size_t nlookaheads;
 #endif /* !LALR_H_ */