* src/reduce.c (reduce_print): Use ngettext.

[bison.git] / src / lalr.h

diff --git a/src/lalr.h b/src/lalr.h
index 8f031cdad4b39d64057119b57052ae207afc357f..f9941afacddeacd38104d7ba8432c71f1868900b 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,15 +66,35 @@ extern short *LAruleno;
    it is a conflict.  */
 
 extern unsigned *LA;
+#define LA(Rule) (LA + (Rule) * tokensetsize)
 
 
-extern int tokensetsize;
-extern short *lookaheads;
-extern short *accessing_symbol;
-extern core **state_table;
-extern shifts **shift_table;
-extern reductions **reduction_table;
+/* A structure decorating a state, with additional information. */
+typedef struct state_s
+{
+  /* A state.  */
+  core *state;
+
+  /* Its accessing symbol. */
+  short accessing_symbol;
 
+  shifts *shift_table;
+  reductions *reduction_table;
 
+  /* 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:
+   there is a state_TABLE in LR0.c, but it is different and static.
+   */
+extern state_t *state_table;
+
+extern int tokensetsize;
 
+/* The number of lookaheads. */
+extern size_t nlookaheads;
 #endif /* !LALR_H_ */