Renaming file to glr.c.

[bison.git] / src / state.h

diff --git a/src/state.h b/src/state.h
index 95b716d89c3e10f2be650d6db6e9f5568cd373dc..1877ec48bfeef941dd3d6f12bc8f2639cf8280a5 100644 (file)
--- a/src/state.h
+++ b/src/state.h
@@ -30,19 +30,19 @@
    state.  These symbols at these items are the allowable inputs that
    can follow now.
 
    state.  These symbols at these items are the allowable inputs that
    can follow now.
 

-   A core represents one state.  States are numbered in the number
+   A core represents one state.  States are numbered in the NUMBER

    field.  When generate_states is finished, the starting state is
    field.  When generate_states is finished, the starting state is

-   state 0 and nstates is the number of states.  (A transition to a
-   state whose state number is nstates indicates termination.)  All
-   the cores are chained together and first_state points to the first
-   one (state 0).
+   state 0 and NSTATES is the number of states.  (FIXME: This sentence
+   is no longer true: A transition to a state whose state number is
+   NSTATES indicates termination.)  All the cores are chained together
+   and FIRST_STATE points to the first one (state 0).

 
    For each state there is a particular symbol which must have been
    the last thing accepted to reach that state.  It is the
 
    For each state there is a particular symbol which must have been
    the last thing accepted to reach that state.  It is the

-   accessing_symbol of the core.
+   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 symbols that hash states by
    their itemsets.  This is for recognizing equivalent states and
 
    The link field is used for chaining symbols that hash states by
    their itemsets.  This is for recognizing equivalent states and


@@ -88,6 +88,7 @@
 #ifndef STATE_H_
 # define STATE_H_
 
 #ifndef STATE_H_
 # define STATE_H_
 

+# include "bitsetv.h"

 
 /*---------.
 | Shifts.  |
 
 /*---------.
 | Shifts.  |


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

-  /* Pseudo pointer into LA. */
-  short lookaheadsp;

   int nlookaheads;
   int nlookaheads;

+  bitsetv lookaheads;
+  rule_t **lookaheads_rule;

 
   /* If some conflicts were solved thanks to precedence/associativity,
      a human readable description of the resolution.  */
 
   /* If some conflicts were solved thanks to precedence/associativity,
      a human readable description of the resolution.  */


@@ -198,4 +199,10 @@ typedef struct state_s
   (state_t *) xcalloc ((unsigned) (sizeof (state_t)                    \
                                   + (Nitems - 1) * sizeof (item_number_t)), 1)
 
   (state_t *) xcalloc ((unsigned) (sizeof (state_t)                    \
                                   + (Nitems - 1) * sizeof (item_number_t)), 1)
 

+/* Print on OUT all the lookaheads such that this STATE wants to
+   reduce this RULE.  */
+
+void state_rule_lookaheads_print PARAMS ((state_t *state, rule_t *rule,
+                                         FILE *out));
+

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