Don't apply the default %destructor or %printer to the error token,

[bison.git] / src / lalr.c

diff --git a/src/lalr.c b/src/lalr.c
index 4e59d0ad4ac3f5571b1ab7a77b13b35aa7d1e763..e7f514556217906c87e407cfe67fcb3b686d84aa 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,7 +1,7 @@
-/* Compute look-ahead criteria for Bison.
+/* Compute lookahead criteria for Bison.

 
 

-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -17,14 +17,15 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to

-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

 
 
 /* Compute how to make the finite state machine deterministic; find
    which rules need lookahead in each state, and which lookahead
    tokens they accept.  */
 
 
 
 /* Compute how to make the finite state machine deterministic; find
    which rules need lookahead in each state, and which lookahead
    tokens they accept.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <bitset.h>
 #include "system.h"
 
 #include <bitset.h>


@@ -42,10 +43,10 @@
 #include "relation.h"
 #include "symtab.h"
 
 #include "relation.h"
 #include "symtab.h"
 

-goto_number *goto_map = NULL;
-static goto_number ngotos = 0;
-state_number *from_state = NULL;
-state_number *to_state = NULL;
+goto_number *goto_map;
+static goto_number ngotos;
+state_number *from_state;
+state_number *to_state;

 
 /* Linked list of goto numbers.  */
 typedef struct goto_list
 
 /* Linked list of goto numbers.  */
 typedef struct goto_list


@@ -80,8 +81,8 @@ set_goto_map (void)
   state_number s;
   goto_number *temp_map;
 
   state_number s;
   goto_number *temp_map;
 

-  CALLOC (goto_map, nvars + 1);
-  CALLOC (temp_map, nvars + 1);
+  goto_map = xcalloc (nvars + 1, sizeof *goto_map);
+  temp_map = xnmalloc (nvars + 1, sizeof *temp_map);

 
   ngotos = 0;
   for (s = 0; s < nstates; ++s)
 
   ngotos = 0;
   for (s = 0; s < nstates; ++s)


@@ -90,15 +91,17 @@ set_goto_map (void)
       int i;
       for (i = sp->num - 1; i >= 0 && TRANSITION_IS_GOTO (sp, i); --i)
        {
       int i;
       for (i = sp->num - 1; i >= 0 && TRANSITION_IS_GOTO (sp, i); --i)
        {

-         if (ngotos >= GOTO_NUMBER_MAXIMUM)
-           abort ();

          ngotos++;
          ngotos++;

+
+         /* Abort if (ngotos + 1) would overflow.  */
+         assert (ngotos != GOTO_NUMBER_MAXIMUM);
+

          goto_map[TRANSITION_SYMBOL (sp, i) - ntokens]++;
        }
     }
 
   {
          goto_map[TRANSITION_SYMBOL (sp, i) - ntokens]++;
        }
     }
 
   {

-    int k = 0;
+    goto_number k = 0;

     int i;
     for (i = ntokens; i < nsyms; i++)
       {
     int i;
     for (i = ntokens; i < nsyms; i++)
       {


@@ -113,8 +116,8 @@ set_goto_map (void)
     temp_map[nsyms - ntokens] = ngotos;
   }
 
     temp_map[nsyms - ntokens] = ngotos;
   }
 

-  CALLOC (from_state, ngotos);
-  CALLOC (to_state, ngotos);
+  from_state = xcalloc (ngotos, sizeof *from_state);
+  to_state = xcalloc (ngotos, sizeof *to_state);

 
   for (s = 0; s < nstates; ++s)
     {
 
   for (s = 0; s < nstates; ++s)
     {


@@ -122,13 +125,13 @@ set_goto_map (void)
       int i;
       for (i = sp->num - 1; i >= 0 && TRANSITION_IS_GOTO (sp, i); --i)
        {
       int i;
       for (i = sp->num - 1; i >= 0 && TRANSITION_IS_GOTO (sp, i); --i)
        {

-         int k = temp_map[TRANSITION_SYMBOL (sp, i) - ntokens]++;
+         goto_number k = temp_map[TRANSITION_SYMBOL (sp, i) - ntokens]++;

          from_state[k] = s;
          to_state[k] = sp->states[i]->number;
        }
     }
 
          from_state[k] = s;
          to_state[k] = sp->states[i]->number;
        }
     }
 

-  XFREE (temp_map);
+  free (temp_map);

 }
 
 
 }
 
 


@@ -137,12 +140,12 @@ set_goto_map (void)
 | Map a state/symbol pair into its numeric representation.  |
 `----------------------------------------------------------*/
 
 | Map a state/symbol pair into its numeric representation.  |
 `----------------------------------------------------------*/
 

-static int
+static goto_number

 map_goto (state_number s0, symbol_number sym)
 {
 map_goto (state_number s0, symbol_number sym)
 {

-  int high;
-  int low;
-  int middle;
+  goto_number high;
+  goto_number low;
+  goto_number middle;

   state_number s;
 
   low = goto_map[sym - ntokens];
   state_number s;
 
   low = goto_map[sym - ntokens];


@@ -150,8 +153,7 @@ map_goto (state_number s0, symbol_number sym)
 
   for (;;)
     {
 
   for (;;)
     {

-      if (high < low)
-       abort ();
+      assert (low <= high);

       middle = (low + high) / 2;
       s = from_state[middle];
       if (s == s0)
       middle = (low + high) / 2;
       s = from_state[middle];
       if (s == s0)


@@ -167,11 +169,11 @@ map_goto (state_number s0, symbol_number sym)
 static void
 initialize_F (void)
 {
 static void
 initialize_F (void)
 {

-  goto_number **reads = CALLOC (reads, ngotos);
-  goto_number *edge = CALLOC (edge, ngotos + 1);
-  int nedges = 0;
+  goto_number **reads = xnmalloc (ngotos, sizeof *reads);
+  goto_number *edge = xnmalloc (ngotos + 1, sizeof *edge);
+  goto_number nedges = 0;

 
 

-  int i;
+  goto_number i;

 
   F = bitsetv_create (ngotos, ntokens, BITSET_FIXED);
 
 
   F = bitsetv_create (ngotos, ntokens, BITSET_FIXED);
 


@@ -191,11 +193,13 @@ initialize_F (void)
            edge[nedges++] = map_goto (stateno, sym);
        }
 
            edge[nedges++] = map_goto (stateno, sym);
        }
 

-      if (nedges)
+      if (nedges == 0)
+       reads[i] = NULL;
+      else

        {
        {

-         CALLOC (reads[i], nedges + 1);
-         memcpy (reads[i], edge, nedges * sizeof (edge[0]));
-         reads[i][nedges] = -1;
+         reads[i] = xnmalloc (nedges + 1, sizeof reads[i][0]);
+         memcpy (reads[i], edge, nedges * sizeof edge[0]);
+         reads[i][nedges] = END_NODE;

          nedges = 0;
        }
     }
          nedges = 0;
        }
     }


@@ -203,21 +207,21 @@ initialize_F (void)
   relation_digraph (reads, ngotos, &F);
 
   for (i = 0; i < ngotos; i++)
   relation_digraph (reads, ngotos, &F);
 
   for (i = 0; i < ngotos; i++)

-    XFREE (reads[i]);
+    free (reads[i]);

 
 

-  XFREE (reads);
-  XFREE (edge);
+  free (reads);
+  free (edge);

 }
 
 
 static void
 }
 
 
 static void

-add_lookback_edge (state *s, rule *r, int gotono)
+add_lookback_edge (state *s, rule *r, goto_number gotono)

 {
   int ri = state_reduction_find (s, r);
 {
   int ri = state_reduction_find (s, r);

-  goto_list *sp = MALLOC (sp, 1);
-  sp->next = lookback[(s->reductions->lookaheads - LA) + ri];
+  goto_list *sp = xmalloc (sizeof *sp);
+  sp->next = lookback[(s->reductions->lookahead_tokens - LA) + ri];

   sp->value = gotono;
   sp->value = gotono;

-  lookback[(s->reductions->lookaheads - LA) + ri] = sp;
+  lookback[(s->reductions->lookahead_tokens - LA) + ri] = sp;

 }
 
 
 }
 
 


@@ -225,11 +229,11 @@ add_lookback_edge (state *s, rule *r, int gotono)
 static void
 build_relations (void)
 {
 static void
 build_relations (void)
 {

-  goto_number *edge = CALLOC (edge, ngotos + 1);
-  state_number *states1 = CALLOC (states1, ritem_longest_rhs () + 1);
-  int i;
+  goto_number *edge = xnmalloc (ngotos + 1, sizeof *edge);
+  state_number *states1 = xnmalloc (ritem_longest_rhs () + 1, sizeof *states1);
+  goto_number i;

 
 

-  CALLOC (includes, ngotos);
+  includes = xnmalloc (ngotos, sizeof *includes);

 
   for (i = 0; i < ngotos; i++)
     {
 
   for (i = 0; i < ngotos; i++)
     {


@@ -239,13 +243,13 @@ build_relations (void)
 
       for (rulep = derives[symbol1 - ntokens]; *rulep; rulep++)
        {
 
       for (rulep = derives[symbol1 - ntokens]; *rulep; rulep++)
        {

-         int done;
+         bool done;

          int length = 1;
          int length = 1;

-         item_number *rp;
+         item_number const *rp;

          state *s = states[from_state[i]];
          states1[0] = s->number;
 
          state *s = states[from_state[i]];
          states1[0] = s->number;
 

-         for (rp = (*rulep)->rhs; *rp >= 0; rp++)
+         for (rp = (*rulep)->rhs; ! item_number_is_rule_number (*rp); rp++)

            {
              s = transitions_to (s->transitions,
                                  item_number_as_symbol_number (*rp));
            {
              s = transitions_to (s->transitions,
                                  item_number_as_symbol_number (*rp));


@@ -256,35 +260,39 @@ build_relations (void)
            add_lookback_edge (s, *rulep, i);
 
          length--;
            add_lookback_edge (s, *rulep, i);
 
          length--;

-         done = 0;
+         done = false;

          while (!done)
            {
          while (!done)
            {

-             done = 1;
+             done = true;
+             /* Each rhs ends in an item number, and there is a
+                sentinel before the first rhs, so it is safe to
+                decrement RP here.  */

              rp--;
              rp--;

-             /* JF added rp>=ritem &&   I hope to god its right! */
-             if (rp >= ritem && ISVAR (*rp))
+             if (ISVAR (*rp))

                {
                  /* Downcasting from item_number to symbol_number.  */
                  edge[nedges++] = map_goto (states1[--length],
                                             item_number_as_symbol_number (*rp));
                  if (nullable[*rp - ntokens])
                {
                  /* Downcasting from item_number to symbol_number.  */
                  edge[nedges++] = map_goto (states1[--length],
                                             item_number_as_symbol_number (*rp));
                  if (nullable[*rp - ntokens])

-                   done = 0;
+                   done = false;

                }
            }
        }
 
                }
            }
        }
 

-      if (nedges)
+      if (nedges == 0)
+       includes[i] = NULL;
+      else

        {
          int j;
        {
          int j;

-         CALLOC (includes[i], nedges + 1);
+         includes[i] = xnmalloc (nedges + 1, sizeof includes[i][0]);

          for (j = 0; j < nedges; j++)
            includes[i][j] = edge[j];
          for (j = 0; j < nedges; j++)
            includes[i][j] = edge[j];

-         includes[i][nedges] = -1;
+         includes[i][nedges] = END_NODE;

        }
     }
 
        }
     }
 

-  XFREE (edge);
-  XFREE (states1);
+  free (edge);
+  free (states1);

 
   relation_transpose (&includes, ngotos);
 }
 
   relation_transpose (&includes, ngotos);
 }


@@ -294,19 +302,19 @@ build_relations (void)
 static void
 compute_FOLLOWS (void)
 {
 static void
 compute_FOLLOWS (void)
 {

-  int i;
+  goto_number i;

 
   relation_digraph (includes, ngotos, &F);
 
   for (i = 0; i < ngotos; i++)
 
   relation_digraph (includes, ngotos, &F);
 
   for (i = 0; i < ngotos; i++)

-    XFREE (includes[i]);
+    free (includes[i]);

 
 

-  XFREE (includes);
+  free (includes);

 }
 
 
 static void
 }
 
 
 static void

-compute_lookaheads (void)
+compute_lookahead_tokens (void)

 {
   size_t i;
   goto_list *sp;
 {
   size_t i;
   goto_list *sp;


@@ -319,21 +327,21 @@ compute_lookaheads (void)
   for (i = 0; i < nLA; i++)
     LIST_FREE (goto_list, lookback[i]);
 
   for (i = 0; i < nLA; i++)
     LIST_FREE (goto_list, lookback[i]);
 

-  XFREE (lookback);
+  free (lookback);

   bitsetv_free (F);
 }
 
 
   bitsetv_free (F);
 }
 
 

-/*-----------------------------------------------------------.
-| Count the number of lookaheads required for S (NLOOKAHEADS |
-| member).                                                   |
-`-----------------------------------------------------------*/
+/*----------------------------------------------------.
+| Count the number of lookahead tokens required for S |
+| (N_LOOKAHEAD_TOKENS member).                        |
+`----------------------------------------------------*/

 
 static int
 
 static int

-state_lookaheads_count (state *s)
+state_lookahead_tokens_count (state *s)

 {
   int k;
 {
   int k;

-  int nlookaheads = 0;
+  int n_lookahead_tokens = 0;

   reductions *rp = s->reductions;
   transitions *sp = s->transitions;
 
   reductions *rp = s->reductions;
   transitions *sp = s->transitions;
 


@@ -344,7 +352,7 @@ state_lookaheads_count (state *s)
   if (rp->num > 1
       || (rp->num == 1 && sp->num &&
          !TRANSITION_IS_DISABLED (sp, 0) && TRANSITION_IS_SHIFT (sp, 0)))
   if (rp->num > 1
       || (rp->num == 1 && sp->num &&
          !TRANSITION_IS_DISABLED (sp, 0) && TRANSITION_IS_SHIFT (sp, 0)))

-    nlookaheads += rp->num;
+    n_lookahead_tokens += rp->num;

   else
     s->consistent = 1;
 
   else
     s->consistent = 1;
 


@@ -355,13 +363,13 @@ state_lookaheads_count (state *s)
        break;
       }
 
        break;
       }
 

-  return nlookaheads;
+  return n_lookahead_tokens;

 }
 
 
 }
 
 

-/*----------------------------------------------.
-| Compute LA, NLA, and the lookaheads members.  |
-`----------------------------------------------*/
+/*----------------------------------------------------.
+| Compute LA, NLA, and the lookahead_tokens members.  |
+`----------------------------------------------------*/

 
 static void
 initialize_LA (void)
 
 static void
 initialize_LA (void)


@@ -372,62 +380,62 @@ initialize_LA (void)
   /* Compute the total number of reductions requiring a lookahead.  */
   nLA = 0;
   for (i = 0; i < nstates; i++)
   /* Compute the total number of reductions requiring a lookahead.  */
   nLA = 0;
   for (i = 0; i < nstates; i++)

-    nLA += state_lookaheads_count (states[i]);
+    nLA += state_lookahead_tokens_count (states[i]);

   /* Avoid having to special case 0.  */
   if (!nLA)
     nLA = 1;
 
   pLA = LA = bitsetv_create (nLA, ntokens, BITSET_FIXED);
   /* Avoid having to special case 0.  */
   if (!nLA)
     nLA = 1;
 
   pLA = LA = bitsetv_create (nLA, ntokens, BITSET_FIXED);

-  CALLOC (lookback, nLA);
+  lookback = xcalloc (nLA, sizeof *lookback);

 
 

-  /* Initialize the members LOOKAHEADS for each state which reductions
-     require lookaheads.  */
+  /* Initialize the members LOOKAHEAD_TOKENS for each state whose reductions
+     require lookahead tokens.  */

   for (i = 0; i < nstates; i++)
     {
   for (i = 0; i < nstates; i++)
     {

-      int count = state_lookaheads_count (states[i]);
+      int count = state_lookahead_tokens_count (states[i]);

       if (count)
        {
       if (count)
        {

-         states[i]->reductions->lookaheads = pLA;
+         states[i]->reductions->lookahead_tokens = pLA;

          pLA += count;
        }
     }
 }
 
 
          pLA += count;
        }
     }
 }
 
 

-/*---------------------------------------.
-| Output the lookaheads for each state.  |
-`---------------------------------------*/
+/*---------------------------------------------.
+| Output the lookahead tokens for each state.  |
+`---------------------------------------------*/

 
 static void
 
 static void

-lookaheads_print (FILE *out)
+lookahead_tokens_print (FILE *out)

 {
   state_number i;
   int j, k;
 {
   state_number i;
   int j, k;

-  fprintf (out, "Lookaheads: BEGIN\n");
+  fprintf (out, "Lookahead tokens: BEGIN\n");

   for (i = 0; i < nstates; ++i)
     {
       reductions *reds = states[i]->reductions;
       bitset_iterator iter;
   for (i = 0; i < nstates; ++i)
     {
       reductions *reds = states[i]->reductions;
       bitset_iterator iter;

-      int nlookaheads = 0;
+      int n_lookahead_tokens = 0;

 
 

-      if (reds->lookaheads)
+      if (reds->lookahead_tokens)

        for (k = 0; k < reds->num; ++k)
        for (k = 0; k < reds->num; ++k)

-         if (reds->lookaheads[k])
-           ++nlookaheads;
+         if (reds->lookahead_tokens[k])
+           ++n_lookahead_tokens;

 
 

-      fprintf (out, "State %d: %d lookaheads\n",
-              i, nlookaheads);
+      fprintf (out, "State %d: %d lookahead tokens\n",
+              i, n_lookahead_tokens);

 
 

-      if (reds->lookaheads)
+      if (reds->lookahead_tokens)

        for (j = 0; j < reds->num; ++j)
        for (j = 0; j < reds->num; ++j)

-         BITSET_FOR_EACH (iter, reds->lookaheads[j], k, 0)
+         BITSET_FOR_EACH (iter, reds->lookahead_tokens[j], k, 0)

          {
            fprintf (out, "   on %d (%s) -> rule %d\n",
                     k, symbols[k]->tag,
                     reds->rules[j]->number);
          };
     }
          {
            fprintf (out, "   on %d (%s) -> rule %d\n",
                     k, symbols[k]->tag,
                     reds->rules[j]->number);
          };
     }

-  fprintf (out, "Lookaheads: END\n");
+  fprintf (out, "Lookahead tokens: END\n");

 }
 
 void
 }
 
 void


@@ -438,10 +446,10 @@ lalr (void)
   initialize_F ();
   build_relations ();
   compute_FOLLOWS ();
   initialize_F ();
   build_relations ();
   compute_FOLLOWS ();

-  compute_lookaheads ();
+  compute_lookahead_tokens ();

 
   if (trace_flag & trace_sets)
 
   if (trace_flag & trace_sets)

-    lookaheads_print (stderr);
+    lookahead_tokens_print (stderr);

 }
 
 
 }
 
 


@@ -450,6 +458,6 @@ lalr_free (void)
 {
   state_number s;
   for (s = 0; s < nstates; ++s)
 {
   state_number s;
   for (s = 0; s < nstates; ++s)

-    states[s]->reductions->lookaheads = NULL;
+    states[s]->reductions->lookahead_tokens = NULL;

   bitsetv_free (LA);
 }
   bitsetv_free (LA);
 }