tables: scope reduction

[bison.git] / src / tables.c

diff --git a/src/tables.c b/src/tables.c
index 9a4c652722dc538bf916df4cf782582bfab35946..f99f07b234f0fd487245403fc337f9fe9e8b5f87 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -1,6 +1,6 @@
 /* Output the generated parsing program for Bison.
 
 /* Output the generated parsing program for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2011 Free
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2012 Free

    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -22,7 +22,6 @@
 #include "system.h"
 
 #include <bitsetv.h>
 #include "system.h"
 
 #include <bitsetv.h>

-#include <quotearg.h>

 
 #include "complain.h"
 #include "conflicts.h"
 
 #include "complain.h"
 #include "conflicts.h"


@@ -85,7 +84,7 @@ int nvectors;
 static base_number **froms;
 static base_number **tos;
 static unsigned int **conflict_tos;
 static base_number **froms;
 static base_number **tos;
 static unsigned int **conflict_tos;

-static int *tally;
+static size_t *tally;

 static base_number *width;
 
 
 static base_number *width;
 
 


@@ -136,11 +135,11 @@ int high;
 state_number *yydefgoto;
 rule_number *yydefact;
 
 state_number *yydefgoto;
 rule_number *yydefact;
 

-/*----------------------------------------------------------------.
-| If TABLE (and CHECK) appear to be small to be addressed at      |
-| DESIRED, grow them.  Note that TABLE[DESIRED] is to be used, so |
-| the desired size is at least DESIRED + 1.                       |
-`----------------------------------------------------------------*/
+/*-------------------------------------------------------------------.
+| If TABLE, CONFLICT_TABLE, and CHECK are too small to be addressed  |
+| at DESIRED, grow them.  TABLE[DESIRED] can be used, so the desired |
+| size is at least DESIRED + 1.                                      |
+`-------------------------------------------------------------------*/

 
 static void
 table_grow (int desired)
 
 static void
 table_grow (int desired)


@@ -309,8 +308,8 @@ action_row (state *s)
      labeled as consistent.  */
   {
     char *default_reductions =
      labeled as consistent.  */
   {
     char *default_reductions =

-      muscle_percent_define_get ("lr.default-reductions");
-    if (0 != strcmp (default_reductions, "most") && !s->consistent)
+      muscle_percent_define_get ("lr.default-reduction");
+    if (STRNEQ (default_reductions, "most") && !s->consistent)

       nodefault = true;
     free (default_reductions);
   }
       nodefault = true;
     free (default_reductions);
   }


@@ -383,39 +382,34 @@ static void
 save_row (state_number s)
 {
   symbol_number i;
 save_row (state_number s)
 {
   symbol_number i;

-  int count;
-  base_number *sp;
-  base_number *sp1;
-  base_number *sp2;
-  unsigned int *sp3;

 
   /* Number of non default actions in S.  */
 
   /* Number of non default actions in S.  */

-  count = 0;
+  size_t count = 0;

   for (i = 0; i < ntokens; i++)
     if (actrow[i] != 0)
       count++;
 
   for (i = 0; i < ntokens; i++)
     if (actrow[i] != 0)
       count++;
 

-  if (count == 0)
-    return;
-
-  /* Allocate non defaulted actions.  */
-  froms[s] = sp = sp1 = xnmalloc (count, sizeof *sp1);
-  tos[s] = sp2 = xnmalloc (count, sizeof *sp2);
-  conflict_tos[s] = sp3 =
-    nondeterministic_parser ? xnmalloc (count, sizeof *sp3) : NULL;
-
-  /* Store non defaulted actions.  */
-  for (i = 0; i < ntokens; i++)
-    if (actrow[i] != 0)
-      {
-        *sp1++ = i;
-        *sp2++ = actrow[i];
-        if (nondeterministic_parser)
-          *sp3++ = conflrow[i];
-      }
-
-  tally[s] = count;
-  width[s] = sp1[-1] - sp[0] + 1;
+  if (count)
+    {
+      /* Allocate non defaulted actions.  */
+      base_number *sp1 = froms[s] = xnmalloc (count, sizeof *sp1);
+      base_number *sp2 = tos[s] = xnmalloc (count, sizeof *sp2);
+      unsigned int *sp3 = conflict_tos[s] =
+        nondeterministic_parser ? xnmalloc (count, sizeof *sp3) : NULL;;
+
+      /* Store non defaulted actions.  */
+      for (i = 0; i < ntokens; i++)
+        if (actrow[i] != 0)
+          {
+            *sp1++ = i;
+            *sp2++ = actrow[i];
+            if (nondeterministic_parser)
+              *sp3++ = conflrow[i];
+          }
+
+      tally[s] = count;
+      width[s] = sp1[-1] - froms[s][0] + 1;
+    }

 }
 
 
 }
 
 


@@ -430,10 +424,6 @@ save_row (state_number s)
 static void
 token_actions (void)
 {
 static void
 token_actions (void)
 {

-  state_number i;
-  symbol_number j;
-  rule_number r;
-

   int nconflict = nondeterministic_parser ? conflicts_total_count () : 0;
 
   yydefact = xnmalloc (nstates, sizeof *yydefact);
   int nconflict = nondeterministic_parser ? conflicts_total_count () : 0;
 
   yydefact = xnmalloc (nstates, sizeof *yydefact);


@@ -447,28 +437,34 @@ token_actions (void)
 
   /* Find the rules which are reduced.  */
   if (!nondeterministic_parser)
 
   /* Find the rules which are reduced.  */
   if (!nondeterministic_parser)

-    for (r = 0; r < nrules; ++r)
-      rules[r].useful = false;
-
-  for (i = 0; i < nstates; ++i)

     {
     {

-      rule *default_reduction = action_row (states[i]);
-      yydefact[i] = default_reduction ? default_reduction->number + 1 : 0;
-      save_row (i);
-
-      /* Now that the parser was computed, we can find which rules are
-         really reduced, and which are not because of SR or RR
-         conflicts.  */
-      if (!nondeterministic_parser)
-        {
-          for (j = 0; j < ntokens; ++j)
-            if (actrow[j] < 0 && actrow[j] != ACTION_NUMBER_MINIMUM)
-              rules[item_number_as_rule_number (actrow[j])].useful = true;
-          if (yydefact[i])
-            rules[yydefact[i] - 1].useful = true;
-        }
+      rule_number r;
+      for (r = 0; r < nrules; ++r)
+        rules[r].useful = false;

     }
 
     }
 

+  {
+    state_number i;
+    for (i = 0; i < nstates; ++i)
+      {
+        rule *default_reduction = action_row (states[i]);
+        yydefact[i] = default_reduction ? default_reduction->number + 1 : 0;
+        save_row (i);
+
+        /* Now that the parser was computed, we can find which rules are
+           really reduced, and which are not because of SR or RR
+           conflicts.  */
+        if (!nondeterministic_parser)
+          {
+            symbol_number j;
+            for (j = 0; j < ntokens; ++j)
+              if (actrow[j] < 0 && actrow[j] != ACTION_NUMBER_MINIMUM)
+                rules[item_number_as_rule_number (actrow[j])].useful = true;
+            if (yydefact[i])
+              rules[yydefact[i] - 1].useful = true;
+          }
+      }
+  }

   free (actrow);
   free (conflrow);
 }
   free (actrow);
   free (conflrow);
 }


@@ -487,38 +483,33 @@ static void
 save_column (symbol_number sym, state_number default_state)
 {
   goto_number i;
 save_column (symbol_number sym, state_number default_state)
 {
   goto_number i;

-  base_number *sp;
-  base_number *sp1;
-  base_number *sp2;
-  int count;
-  vector_number symno = symbol_number_to_vector_number (sym);
-

   goto_number begin = goto_map[sym - ntokens];
   goto_number end = goto_map[sym - ntokens + 1];
 
   /* Number of non default GOTO.  */
   goto_number begin = goto_map[sym - ntokens];
   goto_number end = goto_map[sym - ntokens + 1];
 
   /* Number of non default GOTO.  */

-  count = 0;
+  size_t count = 0;

   for (i = begin; i < end; i++)
     if (to_state[i] != default_state)
       count++;
 
   for (i = begin; i < end; i++)
     if (to_state[i] != default_state)
       count++;
 

-  if (count == 0)
-    return;
-
-  /* Allocate room for non defaulted gotos.  */
-  froms[symno] = sp = sp1 = xnmalloc (count, sizeof *sp1);
-  tos[symno] = sp2 = xnmalloc (count, sizeof *sp2);
-
-  /* Store the state numbers of the non defaulted gotos.  */
-  for (i = begin; i < end; i++)
-    if (to_state[i] != default_state)
-      {
-        *sp1++ = from_state[i];
-        *sp2++ = to_state[i];
-      }
-
-  tally[symno] = count;
-  width[symno] = sp1[-1] - sp[0] + 1;
+  if (count)
+    {
+      /* Allocate room for non defaulted gotos.  */
+      vector_number symno = symbol_number_to_vector_number (sym);
+      base_number *sp1 = froms[symno] = xnmalloc (count, sizeof *sp1);
+      base_number *sp2 = tos[symno] = xnmalloc (count, sizeof *sp2);
+
+      /* Store the state numbers of the non defaulted gotos.  */
+      for (i = begin; i < end; i++)
+        if (to_state[i] != default_state)
+          {
+            *sp1++ = from_state[i];
+            *sp2++ = to_state[i];
+          }
+
+      tally[symno] = count;
+      width[symno] = sp1[-1] - froms[symno][0] + 1;
+    }

 }
 
 
 }
 
 


@@ -597,17 +588,17 @@ sort_actions (void)
   nentries = 0;
 
   for (i = 0; i < nvectors; i++)
   nentries = 0;
 
   for (i = 0; i < nvectors; i++)

-    if (tally[i] > 0)
+    if (0 < tally[i])

       {
         int k;
       {
         int k;

-        int t = tally[i];
+        size_t t = tally[i];

         int w = width[i];
         int j = nentries - 1;
 
         int w = width[i];
         int j = nentries - 1;
 

-        while (j >= 0 && (width[order[j]] < w))
+        while (0 <= j && width[order[j]] < w)

           j--;
 
           j--;
 

-        while (j >= 0 && (width[order[j]] == w) && (tally[order[j]] < t))
+        while (0 <= j && width[order[j]] == w && tally[order[j]] < t)

           j--;
 
         for (k = nentries - 1; k > j; k--)
           j--;
 
         for (k = nentries - 1; k > j; k--)


@@ -619,7 +610,7 @@ sort_actions (void)
 }
 
 
 }
 
 

-/* If VECTOR is a state which actions (reflected by FROMS, TOS, TALLY
+/* If VECTOR is a state whose actions (reflected by FROMS, TOS, TALLY

    and WIDTH of VECTOR) are common to a previous state, return this
    state number.
 
    and WIDTH of VECTOR) are common to a previous state, return this
    state number.
 


@@ -629,7 +620,7 @@ static state_number
 matching_state (vector_number vector)
 {
   vector_number i = order[vector];
 matching_state (vector_number vector)
 {
   vector_number i = order[vector];

-  int t;
+  size_t t;

   int w;
   int prev;
 
   int w;
   int prev;
 


@@ -661,7 +652,8 @@ matching_state (vector_number vector)
         return -1;
 
       for (k = 0; match && k < t; k++)
         return -1;
 
       for (k = 0; match && k < t; k++)

-        if (tos[j][k] != tos[i][k] || froms[j][k] != froms[i][k]
+        if (tos[j][k] != tos[i][k]
+            || froms[j][k] != froms[i][k]

             || (conflict_tos[j] != NULL && conflict_tos[j][k] != 0))
           match = 0;
 
             || (conflict_tos[j] != NULL && conflict_tos[j][k] != 0))
           match = 0;
 


@@ -676,42 +668,44 @@ matching_state (vector_number vector)
 static base_number
 pack_vector (vector_number vector)
 {
 static base_number
 pack_vector (vector_number vector)
 {

+  base_number res;

   vector_number i = order[vector];
   vector_number i = order[vector];

-  int j;
-  int t = tally[i];
-  int loc = 0;
+  size_t t = tally[i];

   base_number *from = froms[i];
   base_number *to = tos[i];
   unsigned int *conflict_to = conflict_tos[i];
 
   aver (t != 0);
 
   base_number *from = froms[i];
   base_number *to = tos[i];
   unsigned int *conflict_to = conflict_tos[i];
 
   aver (t != 0);
 

-  for (j = lowzero - from[0]; ; j++)
+  for (res = lowzero - from[0]; ; res++)

     {
     {

-      int k;

       bool ok = true;
       bool ok = true;

-
-      aver (j < table_size);
-
-      for (k = 0; ok && k < t; k++)
-        {
-          loc = j + state_number_as_int (from[k]);
-          if (table_size <= loc)
-            table_grow (loc);
-
-          if (table[loc] != 0)
-            ok = false;
-        }
-
-      for (k = 0; ok && k < vector; k++)
-        if (pos[k] == j)
-          ok = false;
+      aver (res < table_size);
+      {
+        int k;
+        for (k = 0; ok && k < t; k++)
+          {
+            int loc = res + state_number_as_int (from[k]);
+            if (table_size <= loc)
+              table_grow (loc);
+
+            if (table[loc] != 0)
+              ok = false;
+          }
+
+        if (ok)
+          for (k = 0; k < vector; k++)
+            if (pos[k] == res)
+              ok = false;
+      }

 
       if (ok)
         {
 
       if (ok)
         {

+          int loc;
+          int k;

           for (k = 0; k < t; k++)
             {
           for (k = 0; k < t; k++)
             {

-              loc = j + from[k];
+              loc = res + state_number_as_int (from[k]);

               table[loc] = to[k];
               if (nondeterministic_parser && conflict_to != NULL)
                 conflict_table[loc] = conflict_to[k];
               table[loc] = to[k];
               if (nondeterministic_parser && conflict_to != NULL)
                 conflict_table[loc] = conflict_to[k];


@@ -721,11 +715,11 @@ pack_vector (vector_number vector)
           while (table[lowzero] != 0)
             lowzero++;
 
           while (table[lowzero] != 0)
             lowzero++;
 

-          if (loc > high)
+          if (high < loc)

             high = loc;
 
             high = loc;
 

-          aver (BASE_MINIMUM <= j && j <= BASE_MAXIMUM);
-          return j;
+          aver (BASE_MINIMUM <= res && res <= BASE_MAXIMUM);
+          return res;

         }
     }
 }
         }
     }
 }