07-state-list.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * src/LR0.c (state_list_t, state_list_append): New.
        (first_state, last_state): Now symbol_list_t.
        (this_state): Remove.
        (new_itemsets, append_states, save_reductions): Take a state_t as
        argument.
        (set_states, generate_states): Adjust.
        (save_shifts): Remove, replaced by...
        * src/state.h, src/state.c (state_shifts_set): New.
        (shifts): Rename as...
        (shifts_t): this.
        Adjust all dependencies.
        * src/state.h (state_t): Remove the `next' member.
        
        
Index: src/LR0.c
--- src/LR0.c Sat, 29 Jun 2002 12:41:10 +0200 akim
+++ src/LR0.c Sat, 29 Jun 2002 13:36:47 +0200 akim
@@ -37,10 +37,28 @@
 #include "lalr.h"
 #include "reduce.h"
 
-static state_t *first_state = NULL;
+typedef struct state_list_s
+{
+  struct state_list_s *next;
+  state_t *state;
+} state_list_t;
+
+static state_list_t *first_state = NULL;
+static state_list_t *last_state = NULL;
 
-static state_t *this_state = NULL;
-static state_t *last_state = NULL;
+static void
+state_list_append (state_t *state)
+{
+  state_list_t *node = XMALLOC (state_list_t, 1);
+  node->next = NULL;
+  node->state = state;
+
+  if (!first_state)
+    first_state = node;
+  if (last_state)
+    last_state->next = node;
+  last_state = node;
+}
 
 static int nshifts;
 static symbol_number_t *shift_symbol = NULL;
@@ -122,25 +140,25 @@
 
 
 
-/*----------------------------------------------------------------.
-| Find which symbols can be shifted in the current state, and for |
-| each one record which items would be active after that shift.   |
-| Uses the contents of itemset.                                   |
-|                                                                 |
-| shift_symbol is set to a vector of the symbols that can be      |
-| shifted.  For each symbol in the grammar, kernel_base[symbol]   |
-| points to a vector of item numbers activated if that symbol is  |
-| shifted, and kernel_size[symbol] is their numbers.              |
-`----------------------------------------------------------------*/
+/*---------------------------------------------------------------.
+| Find which symbols can be shifted in STATE, and for each one   |
+| record which items would be active after that shift.  Uses the |
+| contents of itemset.                                           |
+|                                                                |
+| shift_symbol is set to a vector of the symbols that can be     |
+| shifted.  For each symbol in the grammar, kernel_base[symbol]  |
+| points to a vector of item numbers activated if that symbol is |
+| shifted, and kernel_size[symbol] is their numbers.             |
+`---------------------------------------------------------------*/
 
 static void
-new_itemsets (void)
+new_itemsets (state_t *state)
 {
   int i;
 
   if (trace_flag)
     fprintf (stderr, "Entering new_itemsets, state = %d\n",
-            this_state->number);
+            state->number);
 
   for (i = 0; i < nsyms; i++)
     kernel_size[i] = 0;
@@ -187,12 +205,7 @@
   if (symbol == 0 && first_state)
     final_state = res;
 
-  if (!first_state)
-    first_state = res;
-  if (last_state)
-    last_state->next = res;
-  last_state = res;
-
+  state_list_append (res);
   return res;
 }
 
@@ -209,9 +222,8 @@
   state_t *sp;
 
   if (trace_flag)
-    fprintf (stderr, "Entering get_state, state = %d, symbol = %d (%s)\n",
-            this_state->number, symbol,
-            symbol_tag_get (symbols[symbol]));
+    fprintf (stderr, "Entering get_state, symbol = %d (%s)\n",
+            symbol, symbol_tag_get (symbols[symbol]));
 
   sp = state_hash_lookup (core_size, core);
   if (!sp)
@@ -225,13 +237,13 @@
 
 /*------------------------------------------------------------------.
 | Use the information computed by new_itemsets to find the state    |
-| numbers reached by each shift transition from the current state.  |
+| numbers reached by each shift transition from STATE.              |
 |                                                                   |
-| shiftset is set up as a vector of state numbers of those states.  |
+| SHIFTSET is set up as a vector of state numbers of those states.  |
 `------------------------------------------------------------------*/
 
 static void
-append_states (void)
+append_states (state_t *state)
 {
   int i;
   int j;
@@ -239,7 +251,7 @@
 
   if (trace_flag)
     fprintf (stderr, "Entering append_states, state = %d\n",
-            this_state->number);
+            state->number);
 
   /* first sort shift_symbol into increasing order */
 
@@ -270,22 +282,10 @@
   /* The 0 at the lhs is the index of the item of this initial rule.  */
   kernel_base[0][0] = 0;
   kernel_size[0] = 1;
-  this_state = new_state (0, kernel_size[0], kernel_base[0]);
+  state_list_append (new_state (0, kernel_size[0], kernel_base[0]));
 }
 
 
-/*------------------------------------------------------------.
-| Save the NSHIFTS of SHIFTSET into the current linked list.  |
-`------------------------------------------------------------*/
-
-static void
-save_shifts (void)
-{
-  shifts *p = shifts_new (nshifts);
-  memcpy (p->shifts, shiftset, nshifts * sizeof (shiftset[0]));
-  this_state->shifts = p;
-}
-
 
 /*----------------------------------------------------------------.
 | Find which rules can be used for reduction transitions from the |
@@ -294,14 +294,14 @@
 `----------------------------------------------------------------*/
 
 static void
-save_reductions (void)
+save_reductions (state_t *state)
 {
   int count = 0;
   int i;
 
   /* If this is the final state, we want it to have no reductions at
      all, although it has one for `START_SYMBOL EOF .'.  */
-  if (final_state && this_state->number == final_state->number)
+  if (final_state && state->number == final_state->number)
     return;
 
   /* Find and count the active items that represent ends of rules. */
@@ -313,8 +313,8 @@
     }
 
   /* Make a reductions structure and copy the data into it.  */
-  this_state->reductions = reductions_new (count);
-  memcpy (this_state->reductions->rules, redset, count * sizeof (redset[0]));
+  state->reductions = reductions_new (count);
+  memcpy (state->reductions->rules, redset, count * sizeof (redset[0]));
 }
 
 
@@ -325,23 +325,30 @@
 static void
 set_states (void)
 {
-  state_t *sp;
   states = XCALLOC (state_t *, nstates);
 
-  for (sp = first_state; sp; sp = sp->next)
+  while (first_state)
     {
+      state_list_t *this = first_state;
+
       /* Pessimization, but simplification of the code: make sure all
         the states have a shifts, errs, and reductions, even if
         reduced to 0.  */
-      if (!sp->shifts)
-       sp->shifts = shifts_new (0);
-      if (!sp->errs)
-       sp->errs = errs_new (0);
-      if (!sp->reductions)
-       sp->reductions = reductions_new (0);
+      state_t *state = this->state;
+      if (!state->shifts)
+       state_shifts_set (state, 0, 0);
+      if (!state->errs)
+       state->errs = errs_new (0);
+      if (!state->reductions)
+       state->reductions = reductions_new (0);
 
-      states[sp->number] = sp;
+      states[state->number] = state;
+
+      first_state = this->next;
+      free (this);
     }
+  first_state = NULL;
+  last_state = NULL;
 }
 
 
@@ -353,34 +360,38 @@
 void
 generate_states (void)
 {
+  state_list_t *list = NULL;
   allocate_storage ();
   new_closure (nritems);
   new_states ();
+  list = first_state;
 
-  while (this_state)
+  while (list)
     {
+      state_t *state = list->state;
       if (trace_flag)
        fprintf (stderr, "Processing state %d (reached by %s)\n",
-                this_state->number,
-                symbol_tag_get (symbols[this_state->accessing_symbol]));
+                state->number,
+                symbol_tag_get (symbols[state->accessing_symbol]));
       /* Set up ruleset and itemset for the transitions out of this
          state.  ruleset gets a 1 bit for each rule that could reduce
          now.  itemset gets a vector of all the items that could be
          accepted next.  */
-      closure (this_state->items, this_state->nitems);
-      /* record the reductions allowed out of this state */
-      save_reductions ();
-      /* find the itemsets of the states that shifts can reach */
-      new_itemsets ();
-      /* find or create the core structures for those states */
-      append_states ();
-
-      /* create the shifts structures for the shifts to those states,
-         now that the state numbers transitioning to are known */
-      save_shifts ();
-
-      /* states are queued when they are created; process them all */
-      this_state = this_state->next;
+      closure (state->items, state->nitems);
+      /* Record the reductions allowed out of this state.  */
+      save_reductions (state);
+      /* Find the itemsets of the states that shifts can reach.  */
+      new_itemsets (state);
+      /* Find or create the core structures for those states.  */
+      append_states (state);
+
+      /* Create the shifts structures for the shifts to those states,
+        now that the state numbers transitioning to are known.  */
+      state_shifts_set (state, nshifts, shiftset);
+
+      /* States are queued when they are created; process them all.
+        */
+      list = list->next;
     }
 
   /* discard various storage */
Index: src/conflicts.c
--- src/conflicts.c Sat, 29 Jun 2002 10:18:41 +0200 akim
+++ src/conflicts.c Sat, 29 Jun 2002 13:42:11 +0200 akim
@@ -139,7 +139,7 @@
 static void
 flush_shift (state_t *state, int token)
 {
-  shifts *shiftp = state->shifts;
+  shifts_t *shiftp = state->shifts;
   int i;
 
   bitset_reset (lookaheadset, token);
@@ -249,7 +249,7 @@
 set_conflicts (state_t *state)
 {
   int i;
-  shifts *shiftp;
+  shifts_t *shiftp;
 
   if (state->consistent)
     return;
@@ -308,7 +308,7 @@
 {
   int i;
   int src_count = 0;
-  shifts *shiftp = state->shifts;
+  shifts_t *shiftp = state->shifts;
 
   if (!shiftp)
     return 0;
Index: src/lalr.c
--- src/lalr.c Sat, 29 Jun 2002 12:41:10 +0200 akim
+++ src/lalr.c Sat, 29 Jun 2002 13:42:11 +0200 akim
@@ -163,7 +163,7 @@
   ngotos = 0;
   for (state = 0; state < nstates; ++state)
     {
-      shifts *sp = states[state]->shifts;
+      shifts_t *sp = states[state]->shifts;
       int i;
       for (i = sp->nshifts - 1; i >= 0 && SHIFT_IS_GOTO (sp, i); --i)
        {
@@ -196,7 +196,7 @@
 
   for (state = 0; state < nstates; ++state)
     {
-      shifts *sp = states[state]->shifts;
+      shifts_t *sp = states[state]->shifts;
       int i;
       for (i = sp->nshifts - 1; i >= 0 && SHIFT_IS_GOTO (sp, i); --i)
        {
@@ -258,7 +258,7 @@
   for (i = 0; i < ngotos; i++)
     {
       state_number_t stateno = to_state[i];
-      shifts *sp = states[stateno]->shifts;
+      shifts_t *sp = states[stateno]->shifts;
 
       int j;
       for (j = 0; j < sp->nshifts && SHIFT_IS_SHIFT (sp, j); j++)
@@ -420,7 +420,7 @@
 
          for (rp = rules[*rulep].rhs; *rp >= 0; rp++)
            {
-             shifts *sp = state->shifts;
+             shifts_t *sp = state->shifts;
              int j;
              for (j = 0; j < sp->nshifts; j++)
                {
@@ -522,7 +522,7 @@
       int k;
       int nlookaheads = 0;
       reductions *rp = states[i]->reductions;
-      shifts *sp = states[i]->shifts;
+      shifts_t *sp = states[i]->shifts;
 
       /* We need a lookahead either to distinguish different
         reductions (i.e., there are two or more), or to distinguish a
Index: src/output.c
--- src/output.c Sat, 29 Jun 2002 12:41:10 +0200 akim
+++ src/output.c Sat, 29 Jun 2002 13:42:11 +0200 akim
@@ -430,7 +430,7 @@
   int i;
   int default_rule = 0;
   reductions *redp = state->reductions;
-  shifts *shiftp = state->shifts;
+  shifts_t *shiftp = state->shifts;
   errs *errp = state->errs;
   /* set nonzero to inhibit having any default reduction */
   int nodefault = 0;
Index: src/print.c
--- src/print.c Sat, 29 Jun 2002 10:18:41 +0200 akim
+++ src/print.c Sat, 29 Jun 2002 13:42:11 +0200 akim
@@ -108,7 +108,7 @@
 print_shifts (FILE *out, state_t *state)
 {
   int i;
-  shifts *shiftp = state->shifts;
+  shifts_t *shiftp = state->shifts;
 
   for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
     if (!SHIFT_IS_DISABLED (shiftp, i))
@@ -145,7 +145,7 @@
 print_gotos (FILE *out, state_t *state)
 {
   int i;
-  shifts *shiftp = state->shifts;
+  shifts_t *shiftp = state->shifts;
 
   for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
     /* Skip token shifts.  */;
@@ -169,7 +169,7 @@
 print_reductions (FILE *out, state_t *state)
 {
   int i;
-  shifts *shiftp = state->shifts;
+  shifts_t *shiftp = state->shifts;
   reductions *redp = state->reductions;
   errs *errp = state->errs;
   int nodefault = 0;
@@ -305,7 +305,7 @@
 print_actions (FILE *out, state_t *state)
 {
   reductions *redp = state->reductions;
-  shifts *shiftp = state->shifts;
+  shifts_t *shiftp = state->shifts;
 
   if (shiftp->nshifts == 0 && redp->nreds == 0)
     {
Index: src/print_graph.c
--- src/print_graph.c Sat, 29 Jun 2002 10:18:41 +0200 akim
+++ src/print_graph.c Sat, 29 Jun 2002 13:42:11 +0200 akim
@@ -123,7 +123,7 @@
 {
   int i;
 
-  shifts   *shiftp = state->shifts;
+  shifts_t   *shiftp = state->shifts;
   reductions *redp = state->reductions;
 
   static char buff[10];
Index: src/reader.c
--- src/reader.c Sat, 29 Jun 2002 10:43:11 +0200 akim
+++ src/reader.c Sat, 29 Jun 2002 13:09:35 +0200 akim
@@ -162,7 +162,7 @@
 
 
 /*-------------------------------------------------------------------.
-| Parse the input grammar into a one symbol_list_t structure.  Each    |
+| Parse the input grammar into a one symbol_list_t structure.  Each  |
 | rule is represented by a sequence of symbols: the left hand side   |
 | followed by the contents of the right hand side, followed by a     |
 | null pointer instead of a symbol to terminate the rule.  The next  |
Index: src/state.c
--- src/state.c Sat, 29 Jun 2002 12:41:10 +0200 akim
+++ src/state.c Sat, 29 Jun 2002 13:42:28 +0200 akim
@@ -36,14 +36,15 @@
 `---------------------------------------*/
 
 #define SHIFTS_ALLOC(Nshifts)                                          \
-  (shifts *) xcalloc ((unsigned) (sizeof (shifts)                      \
-                                  + (Nshifts - 1) * sizeof (short)), 1)
+  (shifts_t *) xcalloc ((unsigned) (sizeof (shifts_t)                  \
+                                  + (Nshifts - 1) * sizeof (state_number_t)), 
1)
 
-shifts *
-shifts_new (int n)
+static shifts_t *
+shifts_new (int nshifts, state_number_t *shifts)
 {
-  shifts *res = SHIFTS_ALLOC (n);
-  res->nshifts = n;
+  shifts_t *res = SHIFTS_ALLOC (nshifts);
+  res->nshifts = nshifts;
+  memcpy (res->shifts, shifts, nshifts * sizeof (shifts[0]));
   return res;
 }
 
@@ -145,6 +146,18 @@
 
   return res;
 }
+
+
+/*--------------------------.
+| Set the shifts of STATE.  |
+`--------------------------*/
+
+void
+state_shifts_set (state_t *state, int nshifts, state_number_t *shifts)
+{
+  state->shifts = shifts_new (nshifts, shifts);
+}
+
 
 
 /*--------------------------------------------------------------.
Index: src/state.h
--- src/state.h Sat, 29 Jun 2002 12:41:10 +0200 akim
+++ src/state.h Sat, 29 Jun 2002 13:40:10 +0200 akim
@@ -101,13 +101,11 @@
 | Shifts.  |
 `---------*/
 
-typedef struct shifts
+typedef struct shifts_s
 {
   short nshifts;
   state_number_t shifts[1];
-} shifts;
-
-shifts *shifts_new PARAMS ((int n));
+} shifts_t;
 
 
 /* What is the symbol which is shifted by SHIFTS->shifts[Shift]?  Can
@@ -175,11 +173,9 @@
 
 typedef struct state_s
 {
-  struct state_s *next;
-
   state_number_t number;
   symbol_number_t accessing_symbol;
-  shifts     *shifts;
+  shifts_t     *shifts;
   reductions *reductions;
   errs       *errs;
 
@@ -205,13 +201,15 @@
 extern state_t *final_state;
 
 /* Create a new state with ACCESSING_SYMBOL for those items.  */
-
 state_t *state_new PARAMS ((symbol_number_t accessing_symbol,
                            size_t core_size, item_number_t *core));
 
+/* Set the shifts of STATE.  */
+void state_shifts_set PARAMS ((state_t *state,
+                              int nshifts, state_number_t *shifts));
+
 /* 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));
 
Index: src/symlist.h
--- src/symlist.h Fri, 28 Jun 2002 21:50:19 +0200 akim
+++ src/symlist.h Sat, 29 Jun 2002 13:09:26 +0200 akim
@@ -43,12 +43,10 @@
 /* Create a list containing SYMBOL at LOCATION.  */
 symbol_list_t *symbol_list_new PARAMS ((symbol_t *sym, location_t location));
 
-
 /* Prepend SYMBOL at LOCATION to the LIST.  */
 symbol_list_t * symbol_list_prepend PARAMS ((symbol_list_t *list,
                                             symbol_t *symbol,
                                             location_t location));
-
 
 /* Free the LIST, but not the symbols it contains.  */
 void symbol_list_free PARAMS ((symbol_list_t *list));