* src/LR0.h (first_shift, first_reduction): Remove.

[bison.git] / src / LR0.c

diff --git a/src/LR0.c b/src/LR0.c
index f8fa5bd0c15b564aee15c7bbd64fdfc6f44b2c95..a969abb456c65fc086d8a1506f5678ee3ecedf05 100644 (file)
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -30,18 +30,17 @@
 #include "complain.h"
 #include "closure.h"
 #include "LR0.h"
 #include "complain.h"
 #include "closure.h"
 #include "LR0.h"

+#include "lalr.h"

 #include "reduce.h"
 
 int nstates;
 int final_state;
 #include "reduce.h"
 
 int nstates;
 int final_state;

-core *first_state = NULL;
+state_t *first_state = NULL;

 shifts *first_shift = NULL;
 shifts *first_shift = NULL;

-reductions *first_reduction = NULL;

 
 

-static core *this_state = NULL;
-static core *last_state = NULL;
+static state_t *this_state = NULL;
+static state_t *last_state = NULL;

 static shifts *last_shift = NULL;
 static shifts *last_shift = NULL;

-static reductions *last_reduction = NULL;

 
 static int nshifts;
 static short *shift_symbol = NULL;
 
 static int nshifts;
 static short *shift_symbol = NULL;


@@ -55,8 +54,8 @@ static short *kernel_items = NULL;
 
 /* hash table for states, to recognize equivalent ones.  */
 
 
 /* hash table for states, to recognize equivalent ones.  */
 

-#define        STATE_TABLE_SIZE        1009
-static core **state_table = NULL;
+#define        STATE_HASH_SIZE 1009
+static state_t **state_hash = NULL;

 
 \f
 static void
 
 \f
 static void


@@ -107,7 +106,7 @@ allocate_storage (void)
 
   shiftset = XCALLOC (short, nsyms);
   redset = XCALLOC (short, nrules + 1);
 
   shiftset = XCALLOC (short, nsyms);
   redset = XCALLOC (short, nrules + 1);

-  state_table = XCALLOC (core *, STATE_TABLE_SIZE);
+  state_hash = XCALLOC (state_t *, STATE_HASH_SIZE);

 }
 
 
 }
 
 


@@ -120,7 +119,7 @@ free_storage (void)
   free (kernel_base);
   free (kernel_size);
   XFREE (kernel_items);
   free (kernel_base);
   free (kernel_size);
   XFREE (kernel_items);

-  free (state_table);
+  free (state_hash);

 }
 
 
 }
 
 


@@ -141,7 +140,6 @@ static void
 new_itemsets (void)
 {
   int i;
 new_itemsets (void)
 {
   int i;

-  int shiftcount;

 
   if (trace_flag)
     fprintf (stderr, "Entering new_itemsets, state = %d\n",
 
   if (trace_flag)
     fprintf (stderr, "Entering new_itemsets, state = %d\n",


@@ -151,25 +149,23 @@ new_itemsets (void)
     kernel_size[i] = 0;
 
   shift_symbol = XCALLOC (short, nsyms);
     kernel_size[i] = 0;
 
   shift_symbol = XCALLOC (short, nsyms);

-  shiftcount = 0;
+  nshifts = 0;

 
 

-  for (i = 0; i < itemsetsize; ++i)
+  for (i = 0; i < nitemset; ++i)

     {
       int symbol = ritem[itemset[i]];
       if (symbol > 0)
        {
          if (!kernel_size[symbol])
            {
     {
       int symbol = ritem[itemset[i]];
       if (symbol > 0)
        {
          if (!kernel_size[symbol])
            {

-             shift_symbol[shiftcount] = symbol;
-             shiftcount++;
+             shift_symbol[nshifts] = symbol;
+             nshifts++;

            }
 
          kernel_base[symbol][kernel_size[symbol]] = itemset[i] + 1;
          kernel_size[symbol]++;
        }
     }
            }
 
          kernel_base[symbol][kernel_size[symbol]] = itemset[i] + 1;
          kernel_size[symbol]++;
        }
     }

-
-  nshifts = shiftcount;

 }
 
 
 }
 
 


@@ -179,10 +175,10 @@ new_itemsets (void)
 | necessary.                                                       |
 `-----------------------------------------------------------------*/
 
 | necessary.                                                       |
 `-----------------------------------------------------------------*/
 

-static core *
+static state_t *

 new_state (int symbol)
 {
 new_state (int symbol)
 {

-  core *p;
+  state_t *p;

 
   if (trace_flag)
     fprintf (stderr, "Entering new_state, state = %d, symbol = %d (%s)\n",
 
   if (trace_flag)
     fprintf (stderr, "Entering new_state, state = %d, symbol = %d (%s)\n",


@@ -191,7 +187,7 @@ new_state (int symbol)
   if (nstates >= MAXSHORT)
     fatal (_("too many states (max %d)"), MAXSHORT);
 
   if (nstates >= MAXSHORT)
     fatal (_("too many states (max %d)"), MAXSHORT);
 

-  p = CORE_ALLOC (kernel_size[symbol]);
+  p = STATE_ALLOC (kernel_size[symbol]);

   p->accessing_symbol = symbol;
   p->number = nstates;
   p->nitems = kernel_size[symbol];
   p->accessing_symbol = symbol;
   p->number = nstates;
   p->nitems = kernel_size[symbol];


@@ -217,7 +213,7 @@ get_state (int symbol)
 {
   int key;
   int i;
 {
   int key;
   int i;

-  core *sp;
+  state_t *sp;

 
   if (trace_flag)
     fprintf (stderr, "Entering get_state, state = %d, symbol = %d (%s)\n",
 
   if (trace_flag)
     fprintf (stderr, "Entering get_state, state = %d, symbol = %d (%s)\n",


@@ -228,8 +224,8 @@ get_state (int symbol)
   key = 0;
   for (i = 0; i < kernel_size[symbol]; ++i)
     key += kernel_base[symbol][i];
   key = 0;
   for (i = 0; i < kernel_size[symbol]; ++i)
     key += kernel_base[symbol][i];

-  key = key % STATE_TABLE_SIZE;
-  sp = state_table[key];
+  key = key % STATE_HASH_SIZE;
+  sp = state_hash[key];

 
   if (sp)
     {
 
   if (sp)
     {


@@ -260,7 +256,7 @@ get_state (int symbol)
     }
   else                         /* bucket is empty */
     {
     }
   else                         /* bucket is empty */
     {

-      state_table[key] = sp = new_state (symbol);
+      state_hash[key] = sp = new_state (symbol);

     }
 
   if (trace_flag)
     }
 
   if (trace_flag)


@@ -309,7 +305,7 @@ append_states (void)
 static void
 new_states (void)
 {
 static void
 new_states (void)
 {

-  first_state = last_state = this_state = CORE_ALLOC (0);
+  first_state = last_state = this_state = STATE_ALLOC (0);

   nstates = 1;
 }
 
   nstates = 1;
 }
 


@@ -324,8 +320,8 @@ save_shifts (void)
   shifts *p = shifts_new (nshifts);
 
   p->number = this_state->number;
   shifts *p = shifts_new (nshifts);
 
   p->number = this_state->number;

-

   shortcpy (p->shifts, shiftset, nshifts);
   shortcpy (p->shifts, shiftset, nshifts);

+  this_state->shifts = p;

 
   if (last_shift)
     last_shift->next = p;
 
   if (last_shift)
     last_shift->next = p;


@@ -338,16 +334,26 @@ save_shifts (void)
 /*------------------------------------------------------------------.
 | Subroutine of augment_automaton.  Create the next-to-final state, |
 | to which a shift has already been made in the initial state.      |
 /*------------------------------------------------------------------.
 | Subroutine of augment_automaton.  Create the next-to-final state, |
 | to which a shift has already been made in the initial state.      |

+|                                                                   |
+| The task of this state consists in shifting (actually, it's a     |
+| goto, but shifts and gotos are both stored in SHIFTS) the start   |
+| symbols, hence the name.                                          |

 `------------------------------------------------------------------*/
 
 static void
 `------------------------------------------------------------------*/
 
 static void

-insert_start_shift (void)
+insert_start_shifting_state (void)

 {
 {

-  core *statep;
+  state_t *statep;

   shifts *sp;
 
   shifts *sp;
 

-  statep = CORE_ALLOC (0);
+  statep = STATE_ALLOC (0);

   statep->number = nstates;
   statep->number = nstates;

+
+  /* The distinctive feature of this state from the
+     eof_shifting_state, is that it is labeled as post-start-symbol
+     shifting.  I fail to understand why this state, and the
+     post-start-start can't be merged into one.  But it does fail if
+     you try. --akim */

   statep->accessing_symbol = start_symbol;
 
   last_state->next = statep;
   statep->accessing_symbol = start_symbol;
 
   last_state->next = statep;


@@ -355,6 +361,39 @@ insert_start_shift (void)
 
   /* Make a shift from this state to (what will be) the final state.  */
   sp = shifts_new (1);
 
   /* Make a shift from this state to (what will be) the final state.  */
   sp = shifts_new (1);

+  statep->shifts = sp;
+  sp->number = nstates++;
+  sp->shifts[0] = nstates;
+
+  last_shift->next = sp;
+  last_shift = sp;
+}
+
+
+/*-----------------------------------------------------------------.
+| Subroutine of augment_automaton.  Create the final state, which  |
+| shifts `0', the end of file.  The initial state shifts the start |
+| symbol, and goes to here.                                        |
+`-----------------------------------------------------------------*/
+
+static void
+insert_eof_shifting_state (void)
+{
+  state_t *statep;
+  shifts *sp;
+
+  /* Make the final state--the one that follows a shift from the
+     next-to-final state.
+     The symbol for that shift is 0 (end-of-file).  */
+  statep = STATE_ALLOC (0);
+  statep->number = nstates;
+
+  last_state->next = statep;
+  last_state = statep;
+
+  /* Make the shift from the final state to the termination state.  */
+  sp = shifts_new (1);
+  statep->shifts = sp;

   sp->number = nstates++;
   sp->shifts[0] = nstates;
 
   sp->number = nstates++;
   sp->shifts[0] = nstates;
 


@@ -363,6 +402,30 @@ insert_start_shift (void)
 }
 
 
 }
 
 

+/*---------------------------------------------------------------.
+| Subroutine of augment_automaton.  Create the accepting state.  |
+`---------------------------------------------------------------*/
+
+static void
+insert_accepting_state (void)
+{
+  state_t *statep;
+
+   /* Note that the variable `final_state' refers to what we sometimes
+      call the termination state.  */
+  final_state = nstates;
+
+  /* Make the termination state.  */
+  statep = STATE_ALLOC (0);
+  statep->number = nstates++;
+  last_state->next = statep;
+  last_state = statep;
+}
+
+
+
+
+

 /*------------------------------------------------------------------.
 | Make sure that the initial state has a shift that accepts the     |
 | grammar's start symbol and goes to the next-to-final state, which |
 /*------------------------------------------------------------------.
 | Make sure that the initial state has a shift that accepts the     |
 | grammar's start symbol and goes to the next-to-final state, which |


@@ -374,18 +437,13 @@ insert_start_shift (void)
 static void
 augment_automaton (void)
 {
 static void
 augment_automaton (void)
 {

-  core *statep;
-  shifts *sp;
-  shifts *sp1 = NULL;
-
-  sp = first_shift;
-
-  if (!sp->nshifts)
+  if (!first_shift->nshifts)

     {
       /* There are no shifts for any state.  Make one shift, from the
         initial state to the next-to-final state.  */
 
     {
       /* There are no shifts for any state.  Make one shift, from the
         initial state to the next-to-final state.  */
 

-      sp = shifts_new (1);
+      shifts *sp = shifts_new (1);
+      first_state->shifts = sp;

       sp->shifts[0] = nstates;
 
       /* Initialize the chain of shifts with sp.  */
       sp->shifts[0] = nstates;
 
       /* Initialize the chain of shifts with sp.  */


@@ -394,15 +452,16 @@ augment_automaton (void)
 
       /* Create the next-to-final state, with shift to
          what will be the final state.  */
 
       /* Create the next-to-final state, with shift to
          what will be the final state.  */

-      insert_start_shift ();
+      insert_start_shifting_state ();

     }
     }

-  else if (sp->number == 0)
+  else if (first_shift->number == 0)

     {
     {

-      statep = first_state->next;
-
+      state_t *statep = first_state->next;
+      shifts *sp = first_shift;
+      shifts *sp1 = NULL;

       /* The states reached by shifts from FIRST_STATE are numbered
         1..(SP->NSHIFTS).  Look for one reached by START_SYMBOL.  */
       /* The states reached by shifts from FIRST_STATE are numbered
         1..(SP->NSHIFTS).  Look for one reached by START_SYMBOL.  */

-      while (statep->accessing_symbol < start_symbol
+      while (statep->accessing_symbol != start_symbol

             && statep->number < sp->nshifts)
        statep = statep->next;
 
             && statep->number < sp->nshifts)
        statep = statep->next;
 


@@ -421,6 +480,7 @@ augment_automaton (void)
              int i;
              shifts *sp2 = shifts_new (sp->nshifts + 1);
              sp2->number = statep->number;
              int i;
              shifts *sp2 = shifts_new (sp->nshifts + 1);
              sp2->number = statep->number;

+             statep->shifts = sp2;

              sp2->shifts[0] = nstates;
              for (i = sp->nshifts; i > 0; i--)
                sp2->shifts[i] = sp->shifts[i - 1];
              sp2->shifts[0] = nstates;
              for (i = sp->nshifts; i > 0; i--)
                sp2->shifts[i] = sp->shifts[i - 1];


@@ -437,6 +497,7 @@ augment_automaton (void)
            {
              shifts *sp2 = shifts_new (1);
              sp2->number = statep->number;
            {
              shifts *sp2 = shifts_new (1);
              sp2->number = statep->number;

+             statep->shifts = sp2;

              sp2->shifts[0] = nstates;
 
              /* Patch sp2 into the chain of shifts between sp1 and sp.  */
              sp2->shifts[0] = nstates;
 
              /* Patch sp2 into the chain of shifts between sp1 and sp.  */


@@ -450,14 +511,13 @@ augment_automaton (void)
        {
          int i, k;
          shifts *sp2;
        {
          int i, k;
          shifts *sp2;

+         sp = first_shift;

 
          /* There is no next-to-final state as yet.  */
          /* Add one more shift in first_shift,
             going to the next-to-final state (yet to be made).  */
 
          /* There is no next-to-final state as yet.  */
          /* Add one more shift in first_shift,
             going to the next-to-final state (yet to be made).  */

-         sp = first_shift;
-

          sp2 = shifts_new (sp->nshifts + 1);
          sp2 = shifts_new (sp->nshifts + 1);

-
+         first_state->shifts = sp2;

          /* Stick this shift into the vector at the proper place.  */
          statep = first_state->next;
          for (k = 0, i = 0; i < sp->nshifts; k++, i++)
          /* Stick this shift into the vector at the proper place.  */
          statep = first_state->next;
          for (k = 0, i = 0; i < sp->nshifts; k++, i++)


@@ -481,14 +541,15 @@ augment_automaton (void)
 
          /* Create the next-to-final state, with shift to
             what will be the final state.  */
 
          /* Create the next-to-final state, with shift to
             what will be the final state.  */

-         insert_start_shift ();
+         insert_start_shifting_state ();

        }
     }
   else
     {
       /* The initial state didn't even have any shifts.
         Give it one shift, to the next-to-final state.  */
        }
     }
   else
     {
       /* The initial state didn't even have any shifts.
         Give it one shift, to the next-to-final state.  */

-      sp = shifts_new (1);
+      shifts *sp = shifts_new (1);
+      first_state->shifts = sp;

       sp->shifts[0] = nstates;
 
       /* Patch sp into the chain of shifts at the beginning.  */
       sp->shifts[0] = nstates;
 
       /* Patch sp into the chain of shifts at the beginning.  */


@@ -497,33 +558,11 @@ augment_automaton (void)
 
       /* Create the next-to-final state, with shift to
         what will be the final state.  */
 
       /* Create the next-to-final state, with shift to
         what will be the final state.  */

-      insert_start_shift ();
+      insert_start_shifting_state ();

     }
 
     }
 

-  /* Make the final state--the one that follows a shift from the
-     next-to-final state.
-     The symbol for that shift is 0 (end-of-file).  */
-  statep = CORE_ALLOC (0);
-  statep->number = nstates;
-  last_state->next = statep;
-  last_state = statep;
-
-  /* Make the shift from the final state to the termination state.  */
-  sp = shifts_new (1);
-  sp->number = nstates++;
-  sp->shifts[0] = nstates;
-  last_shift->next = sp;
-  last_shift = sp;
-
-  /* Note that the variable `final_state' refers to what we sometimes call
-     the termination state.  */
-  final_state = nstates;
-
-  /* Make the termination state.  */
-  statep = CORE_ALLOC (0);
-  statep->number = nstates++;
-  last_state->next = statep;
-  last_state = statep;
+  insert_eof_shifting_state ();
+  insert_accepting_state ();

 }
 
 
 }
 
 


@@ -542,7 +581,7 @@ save_reductions (void)
   /* Find and count the active items that represent ends of rules. */
 
   count = 0;
   /* Find and count the active items that represent ends of rules. */
 
   count = 0;

-  for (i = 0; i < itemsetsize; ++i)
+  for (i = 0; i < nitemset; ++i)

     {
       int item = ritem[itemset[i]];
       if (item < 0)
     {
       int item = ritem[itemset[i]];
       if (item < 0)


@@ -554,17 +593,10 @@ save_reductions (void)
   if (count)
     {
       reductions *p = REDUCTIONS_ALLOC (count);
   if (count)
     {
       reductions *p = REDUCTIONS_ALLOC (count);

-
-      p->number = this_state->number;

       p->nreds = count;
       p->nreds = count;

-

       shortcpy (p->rules, redset, count);
 
       shortcpy (p->rules, redset, count);
 

-      if (last_reduction)
-       last_reduction->next = p;
-      else
-       first_reduction = p;
-      last_reduction = p;
+      this_state->reductions = p;

     }
 }
 
     }
 }