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 4c60a271268689937b0a60b0b254926d128552cf..f7244b4b17cd11d8f6805ba8ceb3eda1c4f7d93a 100644 (file)
--- a/src/state.h
+++ b/src/state.h
@@ -1,5 +1,5 @@
 /* Type definitions for nondeterministic finite state machine for bison,
 /* Type definitions for nondeterministic finite state machine for bison,

-   Copyright 1984, 1989, 2000 Free Software Foundation, Inc.
+   Copyright 1984, 1989, 2000, 2001 Free Software Foundation, Inc.

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


@@ -88,59 +88,117 @@
 #ifndef STATE_H_
 # define STATE_H_
 
 #ifndef STATE_H_
 # define STATE_H_
 

-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
 {
 
 typedef struct shifts
 {

-  struct shifts *next;

   short number;
   short nshifts;
   short shifts[1];
   short number;
   short nshifts;
   short shifts[1];

-}
-shifts;
+} shifts;
+

 
 #define SHIFTS_ALLOC(Nshifts)                                          \
   (shifts *) xcalloc ((unsigned) (sizeof (shifts)                      \
                                   + (Nshifts - 1) * sizeof (short)), 1)
 
 
 #define SHIFTS_ALLOC(Nshifts)                                          \
   (shifts *) xcalloc ((unsigned) (sizeof (shifts)                      \
                                   + (Nshifts - 1) * sizeof (short)), 1)
 

+shifts * shifts_new PARAMS ((int n));
+
+
+/* What is the symbol which is shifted by SHIFTS->shifts[Shift]?  Can
+   be a token (amongst which the error token), or non terminals in
+   case of gotos.  */
+
+#define SHIFT_SYMBOL(Shifts, Shift) \
+  (state_table[Shifts->shifts[Shift]]->accessing_symbol)
+
+/* Is the SHIFTS->shifts[Shift] a real shift? (as opposed to gotos.) */
+
+#define SHIFT_IS_SHIFT(Shifts, Shift) \
+  (ISTOKEN (SHIFT_SYMBOL (Shifts, Shift)))
+
+/* Is the SHIFTS->shifts[Shift] a goto?. */
+
+#define SHIFT_IS_GOTO(Shifts, Shift) \
+  (!SHIFT_IS_SHIFT (Shifts, Shift))
+
+/* Is the SHIFTS->shifts[Shift] then handling of the error token?. */
+
+#define SHIFT_IS_ERROR(Shifts, Shift) \
+  (SHIFT_SYMBOL (Shifts, Shift) == error_token_number)
+
+/* When resolving a SR conflicts, if the reduction wins, the shift is
+   disabled.  */
+
+#define SHIFT_DISABLE(Shifts, Shift) \
+  (Shifts->shifts[Shift] = 0)
+
+#define SHIFT_IS_DISABLED(Shifts, Shift) \
+  (Shifts->shifts[Shift] == 0)
+
+
+/*-------.
+| Errs.  |
+`-------*/

 
 typedef struct errs
 {
   short nerrs;
   short errs[1];
 
 typedef struct errs
 {
   short nerrs;
   short errs[1];

-}
-errs;
+} errs;

 
 #define ERRS_ALLOC(Nerrs)                                              \
   (errs *) xcalloc ((unsigned) (sizeof (errs)                          \
                                   + (Nerrs - 1) * sizeof (short)), 1)
 
 
 
 #define ERRS_ALLOC(Nerrs)                                              \
   (errs *) xcalloc ((unsigned) (sizeof (errs)                          \
                                   + (Nerrs - 1) * sizeof (short)), 1)
 
 

+/*-------------.
+| Reductions.  |
+`-------------*/

 
 typedef struct reductions
 {
 
 typedef struct reductions
 {

-  struct reductions *next;
-  short number;

   short nreds;
   short rules[1];
   short nreds;
   short rules[1];

-}
-reductions;
+} reductions;

 
 #define REDUCTIONS_ALLOC(Nreductions)                                  \
   (reductions *) xcalloc ((unsigned) (sizeof (reductions)              \
                                   + (Nreductions - 1) * sizeof (short)), 1)
 
 
 #define REDUCTIONS_ALLOC(Nreductions)                                  \
   (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_ */
 #endif /* !STATE_H_ */