Copy BYacc's nice way to report the grammar.

[bison.git] / src / LR0.c

diff --git a/src/LR0.c b/src/LR0.c
index 72448d735de8915721a9e1241fc992d6af878f3c..95200d53d8b27f1f5869cece72912e4bbd42f17c 100644 (file)
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -52,7 +52,7 @@ static state_t *this_state = NULL;
 static state_t *last_state = NULL;
 
 static int nshifts;
-static token_number_t *shift_symbol = NULL;
+static symbol_number_t *shift_symbol = NULL;
 
 static short *redset = NULL;
 static short *shiftset = NULL;
@@ -117,7 +117,7 @@ allocate_storage (void)
   shiftset = XCALLOC (short, nsyms);
   redset = XCALLOC (short, nrules + 1);
   state_hash = XCALLOC (state_t *, STATE_HASH_SIZE);
-  shift_symbol = XCALLOC (token_number_t, nsyms);
+  shift_symbol = XCALLOC (symbol_number_t, nsyms);
 }
 
 
@@ -164,8 +164,8 @@ new_itemsets (void)
   for (i = 0; i < nritemset; ++i)
     if (ritem[itemset[i]] >= 0)
       {
-       token_number_t symbol
-         = item_number_as_token_number (ritem[itemset[i]]);
+       symbol_number_t symbol
+         = item_number_as_symbol_number (ritem[itemset[i]]);
        if (!kernel_size[symbol])
          {
            shift_symbol[nshifts] = symbol;
@@ -185,14 +185,13 @@ new_itemsets (void)
 `-----------------------------------------------------------------*/
 
 static state_t *
-new_state (token_number_t symbol, size_t core_size, item_number_t *core)
+new_state (symbol_number_t symbol, size_t core_size, item_number_t *core)
 {
   state_t *p;
 
   if (trace_flag)
     fprintf (stderr, "Entering new_state, state = %d, symbol = %d (%s)\n",
-            nstates, symbol, quotearg_style (escape_quoting_style,
-                                             symbols[symbol]->tag));
+            nstates, symbol, symbol_tag_get (symbols[symbol]));
 
   if (nstates >= SHRT_MAX)
     fatal (_("too many states (max %d)"), SHRT_MAX);
@@ -200,8 +199,9 @@ new_state (token_number_t symbol, size_t core_size, item_number_t *core)
   p = STATE_ALLOC (core_size);
   p->accessing_symbol = symbol;
   p->number = nstates;
-  p->nitems = core_size;
+  p->solved_conflicts = NULL;
 
+  p->nitems = core_size;
   memcpy (p->items, core, core_size * sizeof (core[0]));
 
   /* If this is the eoftoken, and this is not the initial state, then
@@ -228,16 +228,16 @@ new_state (token_number_t symbol, size_t core_size, item_number_t *core)
 `--------------------------------------------------------------*/
 
 static int
-get_state (token_number_t symbol, size_t core_size, item_number_t *core)
+get_state (symbol_number_t symbol, size_t core_size, item_number_t *core)
 {
   int key;
-  int i;
+  size_t i;
   state_t *sp;
 
   if (trace_flag)
     fprintf (stderr, "Entering get_state, state = %d, symbol = %d (%s)\n",
-            this_state->number, symbol, quotearg_style (escape_quoting_style,
-                                             symbols[symbol]->tag));
+            this_state->number, symbol,
+            symbol_tag_get (symbols[symbol]));
 
   /* Add up the target state's active item numbers to get a hash key.
      */
@@ -297,7 +297,7 @@ append_states (void)
 {
   int i;
   int j;
-  token_number_t symbol;
+  symbol_number_t symbol;
 
   if (trace_flag)
     fprintf (stderr, "Entering append_states, state = %d\n",
@@ -423,8 +423,7 @@ generate_states (void)
       if (trace_flag)
        fprintf (stderr, "Processing state %d (reached by %s)\n",
                 this_state->number,
-                quotearg_style (escape_quoting_style,
-                                symbols[this_state->accessing_symbol]->tag));
+                symbol_tag_get (symbols[this_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