Now that states have a complete set of members, the linked list of

[bison.git] / src / state.h

diff --git a/src/state.h b/src/state.h
index 8e60058ebaa364587bbb7cdecccb411d657b5a20..f7244b4b17cd11d8f6805ba8ceb3eda1c4f7d93a 100644 (file)
--- a/src/state.h
+++ b/src/state.h
@@ -89,31 +89,12 @@
 # define STATE_H_
 
 
-/*-------.
-| Core.  |
-`-------*/
-
-typedef struct core
-{
-  struct core *next;
-  struct core *link;
-  short number;
-  short accessing_symbol;
-  short nitems;
-  short items[1];
-} core;
-
-#define CORE_ALLOC(Nitems)                                             \
-  (core *) xcalloc ((unsigned) (sizeof (core)                          \
-                                + (Nitems - 1) * sizeof (short)), 1)
-
 /*---------.
 | Shifts.  |
 `---------*/
 
 typedef struct shifts
 {
-  struct shifts *next;
   short number;
   short nshifts;
   short shifts[1];
@@ -132,7 +113,7 @@ shifts * shifts_new PARAMS ((int n));
    case of gotos.  */
 
 #define SHIFT_SYMBOL(Shifts, Shift) \
-  (state_table[Shifts->shifts[Shift]].accessing_symbol)
+  (state_table[Shifts->shifts[Shift]]->accessing_symbol)
 
 /* Is the SHIFTS->shifts[Shift] a real shift? (as opposed to gotos.) */
 
@@ -180,8 +161,6 @@ typedef struct errs
 
 typedef struct reductions
 {
-  struct reductions *next;
-  short number;
   short nreds;
   short rules[1];
 } reductions;
@@ -190,4 +169,36 @@ typedef struct reductions
   (reductions *) xcalloc ((unsigned) (sizeof (reductions)              \
                                   + (Nreductions - 1) * sizeof (short)), 1)
 
+
+
+/*----------.
+| State_t.  |
+`----------*/
+
+typedef struct state_s
+{
+  struct state_s *next;
+  struct state_s *link;
+
+  short number;
+  short accessing_symbol;
+  shifts     *shifts;
+  reductions *reductions;
+  errs       *errs;
+
+  /* Nonzero if no lookahead is needed to decide what to do in state S.  */
+  char consistent;
+
+  /* Used in LALR, not LR(0). */
+  short lookaheads;
+
+  /* Its items. */
+  short nitems;
+  short items[1];
+} state_t;
+
+#define STATE_ALLOC(Nitems)                                            \
+  (state_t *) xcalloc ((unsigned) (sizeof (state_t)                    \
+                                  + (Nitems - 1) * sizeof (short)), 1)
+
 #endif /* !STATE_H_ */