* src/bison.simple: Remove YYERROR_VERBOSE using.

[bison.git] / src / LR0.c

diff --git a/src/LR0.c b/src/LR0.c
index b67bd78b0b948819ffbdeff7bec0b4aea67ed5d5..06ee51f6d3940e8cae26c63132a902306d60ecd2 100644 (file)
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -50,7 +50,7 @@ static short *redset = NULL;
 static short *shiftset = NULL;
 
 static short **kernel_base = NULL;
 static short *shiftset = NULL;
 
 static short **kernel_base = NULL;

-static short **kernel_end = NULL;
+static int *kernel_size = NULL;

 static short *kernel_items = NULL;
 
 /* hash table for states, to recognize equivalent ones.  */
 static short *kernel_items = NULL;
 
 /* hash table for states, to recognize equivalent ones.  */


@@ -94,7 +94,7 @@ allocate_itemsets (void)
     }
 
   shift_symbol = symbol_count;
     }
 
   shift_symbol = symbol_count;

-  kernel_end = XCALLOC (short *, nsyms);
+  kernel_size = XCALLOC (int, nsyms);

 }
 
 
 }
 
 


@@ -116,7 +116,7 @@ free_storage (void)
   XFREE (redset);
   XFREE (shiftset);
   XFREE (kernel_base);
   XFREE (redset);
   XFREE (shiftset);
   XFREE (kernel_base);

-  XFREE (kernel_end);
+  XFREE (kernel_size);

   XFREE (kernel_items);
   XFREE (state_table);
 }
   XFREE (kernel_items);
   XFREE (state_table);
 }


@@ -132,8 +132,7 @@ free_storage (void)
 | 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  |
 | 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_end[symbol] points after the end of that    |
-| vector.                                                         |
+| shifted, and kernel_size[symbol] is their numbers.              |

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


@@ -147,26 +146,23 @@ new_itemsets (void)
             this_state->number);
 
   for (i = 0; i < nsyms; i++)
             this_state->number);
 
   for (i = 0; i < nsyms; i++)

-    kernel_end[i] = NULL;
+    kernel_size[i] = 0;

 
   shiftcount = 0;
 
 
   shiftcount = 0;
 

-  for (i = 0; i < itemsetend - itemset; ++i)
+  for (i = 0; i < itemsetsize; ++i)

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

-         short *ksp = kernel_end[symbol];
-
-         if (!ksp)
+         if (!kernel_size[symbol])

            {
              shift_symbol[shiftcount] = symbol;
            {
              shift_symbol[shiftcount] = symbol;

-             ksp = kernel_base[symbol];

              shiftcount++;
            }
 
              shiftcount++;
            }
 

-         *ksp++ = itemset[i] + 1;
-         kernel_end[symbol] = ksp;
+         kernel_base[symbol][kernel_size[symbol]] = itemset[i] + 1;
+         kernel_size[symbol]++;

        }
     }
 
        }
     }
 


@@ -183,7 +179,6 @@ new_itemsets (void)
 static core *
 new_state (int symbol)
 {
 static core *
 new_state (int symbol)
 {

-  int n;

   core *p;
 
   if (trace_flag)
   core *p;
 
   if (trace_flag)


@@ -193,14 +188,12 @@ new_state (int symbol)
   if (nstates >= MAXSHORT)
     fatal (_("too many states (max %d)"), MAXSHORT);
 
   if (nstates >= MAXSHORT)
     fatal (_("too many states (max %d)"), MAXSHORT);
 

-  n = kernel_end[symbol] - kernel_base[symbol];
-
-  p = CORE_ALLOC (n);
+  p = CORE_ALLOC (kernel_size[symbol]);

   p->accessing_symbol = symbol;
   p->number = nstates;
   p->accessing_symbol = symbol;
   p->number = nstates;

-  p->nitems = n;
+  p->nitems = kernel_size[symbol];

 
 

-  shortcpy (p->items, kernel_base[symbol], n);
+  shortcpy (p->items, kernel_base[symbol], kernel_size[symbol]);

 
   last_state->next = p;
   last_state = p;
 
   last_state->next = p;
   last_state = p;


@@ -220,12 +213,9 @@ static int
 get_state (int symbol)
 {
   int key;
 get_state (int symbol)
 {
   int key;

-  short *isp2;

   int i;
   core *sp;
 
   int i;
   core *sp;
 

-  int n = kernel_end[symbol] - kernel_base[symbol];
-

   if (trace_flag)
     fprintf (stderr, "Entering get_state, state = %d, symbol = %d (%s)\n",
             this_state->number, symbol, tags[symbol]);
   if (trace_flag)
     fprintf (stderr, "Entering get_state, state = %d, symbol = %d (%s)\n",
             this_state->number, symbol, tags[symbol]);


@@ -233,7 +223,7 @@ get_state (int symbol)
   /* Add up the target state's active item numbers to get a hash key.
      */
   key = 0;
   /* Add up the target state's active item numbers to get a hash key.
      */
   key = 0;

-  for (i = 0; i < n; ++i)
+  for (i = 0; i < kernel_size[symbol]; ++i)

     key += kernel_base[symbol][i];
   key = key % STATE_TABLE_SIZE;
   sp = state_table[key];
     key += kernel_base[symbol][i];
   key = key % STATE_TABLE_SIZE;
   sp = state_table[key];


@@ -243,11 +233,10 @@ get_state (int symbol)
       int found = 0;
       while (!found)
        {
       int found = 0;
       while (!found)
        {

-         if (sp->nitems == n)
+         if (sp->nitems == kernel_size[symbol])

            {
            {

-             int i;

              found = 1;
              found = 1;

-             for (i = 0; i < n; ++i)
+             for (i = 0; i < kernel_size[symbol]; ++i)

                if (kernel_base[symbol][i] != sp->items[i])
                  found = 0;
            }
                if (kernel_base[symbol][i] != sp->items[i])
                  found = 0;
            }


@@ -553,19 +542,15 @@ augment_automaton (void)
 static void
 save_reductions (void)
 {
 static void
 save_reductions (void)
 {

-  short *isp;
-  int item;

   int count;
   int count;

-  reductions *p;
-
-  short *rend;
+  int i;

 
   /* 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 (isp = itemset; isp < itemsetend; isp++)
+  for (i = 0; i < itemsetsize; ++i)

     {
     {

-      item = ritem[*isp];
+      int item = ritem[itemset[i]];

       if (item < 0)
        redset[count++] = -item;
     }
       if (item < 0)
        redset[count++] = -item;
     }


@@ -574,7 +559,7 @@ save_reductions (void)
 
   if (count)
     {
 
   if (count)
     {

-      p = REDUCTIONS_ALLOC (count);
+      reductions *p = REDUCTIONS_ALLOC (count);

 
       p->number = this_state->number;
       p->nreds = count;
 
       p->number = this_state->number;
       p->nreds = count;