Regen.

[bison.git] / src / state.h

diff --git a/src/state.h b/src/state.h
index de7ec08ccbe4f464efdbd84c20ffe86b3413939f..95b716d89c3e10f2be650d6db6e9f5568cd373dc 100644 (file)
--- a/src/state.h
+++ b/src/state.h
@@ -41,10 +41,10 @@
    the last thing accepted to reach that state.  It is the
    accessing_symbol of the core.
 
    the last thing accepted to reach that state.  It is the
    accessing_symbol of the core.
 

-   Each core contains a vector of nitems items which are the indices
+   Each core contains a vector of NITEMS items which are the indices

    in the ritems vector of the items that are selected in this state.
 
    in the ritems vector of the items that are selected in this state.
 

-   The link field is used for chaining buckets that hash states by
+   The link field is used for chaining symbols that hash states by

    their itemsets.  This is for recognizing equivalent states and
    combining them when the states are generated.
 
    their itemsets.  This is for recognizing equivalent states and
    combining them when the states are generated.
 


@@ -99,12 +99,7 @@ typedef struct shifts
   short shifts[1];
 } shifts;
 
   short shifts[1];
 } shifts;
 

-
-#define SHIFTS_ALLOC(Nshifts)                                          \
-  (shifts *) xcalloc ((unsigned) (sizeof (shifts)                      \
-                                  + (Nshifts - 1) * sizeof (short)), 1)
-
-shifts * shifts_new PARAMS ((int n));
+shifts *shifts_new PARAMS ((int n));

 
 
 /* What is the symbol which is shifted by SHIFTS->shifts[Shift]?  Can
 
 
 /* What is the symbol which is shifted by SHIFTS->shifts[Shift]?  Can


@@ -112,7 +107,7 @@ shifts * shifts_new PARAMS ((int n));
    case of gotos.  */
 
 #define SHIFT_SYMBOL(Shifts, Shift) \
    case of gotos.  */
 
 #define SHIFT_SYMBOL(Shifts, Shift) \

-  (state_table[Shifts->shifts[Shift]]->accessing_symbol)
+  (states[Shifts->shifts[Shift]]->accessing_symbol)

 
 /* Is the SHIFTS->shifts[Shift] a real shift? (as opposed to gotos.) */
 
 
 /* Is the SHIFTS->shifts[Shift] a real shift? (as opposed to gotos.) */
 


@@ -127,7 +122,7 @@ shifts * shifts_new PARAMS ((int n));
 /* Is the SHIFTS->shifts[Shift] then handling of the error token?. */
 
 #define SHIFT_IS_ERROR(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)
+  (SHIFT_SYMBOL (Shifts, Shift) == errtoken->number)

 
 /* When resolving a SR conflicts, if the reduction wins, the shift is
    disabled.  */
 
 /* When resolving a SR conflicts, if the reduction wins, the shift is
    disabled.  */


@@ -149,9 +144,8 @@ typedef struct errs
   short errs[1];
 } errs;
 
   short errs[1];
 } errs;
 

-#define ERRS_ALLOC(Nerrs)                                              \
-  (errs *) xcalloc ((unsigned) (sizeof (errs)                          \
-                                  + (Nerrs - 1) * sizeof (short)), 1)
+errs *errs_new PARAMS ((int n));
+errs *errs_dup PARAMS ((errs *src));

 
 
 /*-------------.
 
 
 /*-------------.


@@ -164,10 +158,7 @@ typedef struct reductions
   short rules[1];
 } reductions;
 
   short rules[1];
 } reductions;
 

-#define REDUCTIONS_ALLOC(Nreductions)                                  \
-  (reductions *) xcalloc ((unsigned) (sizeof (reductions)              \
-                                  + (Nreductions - 1) * sizeof (short)), 1)
-
+reductions *reductions_new PARAMS ((int n));

 
 
 /*----------.
 
 
 /*----------.


@@ -180,7 +171,7 @@ typedef struct state_s
   struct state_s *link;
 
   short number;
   struct state_s *link;
 
   short number;

-  short accessing_symbol;
+  symbol_number_t accessing_symbol;

   shifts     *shifts;
   reductions *reductions;
   errs       *errs;
   shifts     *shifts;
   reductions *reductions;
   errs       *errs;


@@ -189,15 +180,22 @@ typedef struct state_s
   char consistent;
 
   /* Used in LALR, not LR(0). */
   char consistent;
 
   /* Used in LALR, not LR(0). */

-  short lookaheads;
-
-  /* Its items. */
-  short nitems;
-  short items[1];
+  /* Pseudo pointer into LA. */
+  short lookaheadsp;
+  int nlookaheads;
+
+  /* If some conflicts were solved thanks to precedence/associativity,
+     a human readable description of the resolution.  */
+  const char *solved_conflicts;
+
+  /* Its items.  Must be last, since ITEMS can be arbitrarily large.
+     */
+  unsigned short nitems;
+  item_number_t items[1];

 } state_t;
 
 #define STATE_ALLOC(Nitems)                                            \
   (state_t *) xcalloc ((unsigned) (sizeof (state_t)                    \
 } state_t;
 
 #define STATE_ALLOC(Nitems)                                            \
   (state_t *) xcalloc ((unsigned) (sizeof (state_t)                    \

-                                  + (Nitems - 1) * sizeof (short)), 1)
+                                  + (Nitems - 1) * sizeof (item_number_t)), 1)

 
 #endif /* !STATE_H_ */
 
 #endif /* !STATE_H_ */