* data/lalr1.cc: Move the body of the ctor and dtor into the

[bison.git] / src / tables.c

diff --git a/src/tables.c b/src/tables.c
index 50dd4535161e200fea1ad87fdb84b17eac8f78d5..02d10f1573d9145f59d8717e62c087b6f3f53207 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -1,7 +1,7 @@
 /* Output the generated parsing program for Bison.
 
 /* Output the generated parsing program for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
+   2005 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,8 +17,8 @@
 
    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
 
    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.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 
 
 #include "system.h"
 
 
 #include "system.h"


@@ -42,13 +42,15 @@
 
    Of course vector_number_t ought to be wide enough to contain
    state_number and symbol_number.  */
 
    Of course vector_number_t ought to be wide enough to contain
    state_number and symbol_number.  */

-typedef short int vector_number;
+typedef int vector_number;

 
 

+#if 0 /* Not currently used.  */

 static inline vector_number
 state_number_to_vector_number (state_number s)
 {
   return s;
 }
 static inline vector_number
 state_number_to_vector_number (state_number s)
 {
   return s;
 }

+#endif

 
 static inline vector_number
 symbol_number_to_vector_number (symbol_number sym)
 
 static inline vector_number
 symbol_number_to_vector_number (symbol_number sym)


@@ -81,11 +83,11 @@ int nvectors;
 #define BASE_MAXIMUM INT_MAX
 #define BASE_MINIMUM INT_MIN
 
 #define BASE_MAXIMUM INT_MAX
 #define BASE_MINIMUM INT_MIN
 

-static base_number **froms = NULL;
-static base_number **tos = NULL;
-static unsigned int **conflict_tos = NULL;
-static short int *tally = NULL;
-static base_number *width = NULL;
+static base_number **froms;
+static base_number **tos;
+static unsigned int **conflict_tos;
+static int *tally;
+static base_number *width;

 
 
 /* For a given state, N = ACTROW[SYMBOL]:
 
 
 /* For a given state, N = ACTROW[SYMBOL]:


@@ -94,15 +96,15 @@ static base_number *width = NULL;
    If N = MIN, stands for `raise a syntax error'.
    If N > 0, stands for `shift SYMBOL and go to n'.
    If N < 0, stands for `reduce -N'.  */
    If N = MIN, stands for `raise a syntax error'.
    If N > 0, stands for `shift SYMBOL and go to n'.
    If N < 0, stands for `reduce -N'.  */

-typedef short int action_number;
-#define ACTION_NUMBER_MINIMUM SHRT_MIN
+typedef int action_number;
+#define ACTION_NUMBER_MINIMUM INT_MIN

 
 

-static action_number *actrow = NULL;
+static action_number *actrow;

 
 /* FROMS and TOS are reordered to be compressed.  ORDER[VECTOR] is the
    new vector number of VECTOR.  We skip `empty' vectors (i.e.,
    TALLY[VECTOR] = 0), and call these `entries'.  */
 
 /* FROMS and TOS are reordered to be compressed.  ORDER[VECTOR] is the
    new vector number of VECTOR.  We skip `empty' vectors (i.e.,
    TALLY[VECTOR] = 0), and call these `entries'.  */

-static vector_number *order = NULL;
+static vector_number *order;

 static int nentries;
 
 base_number *base = NULL;
 static int nentries;
 
 base_number *base = NULL;


@@ -112,9 +114,9 @@ base_number *base = NULL;
 base_number base_ninf = 0;
 static base_number *pos = NULL;
 
 base_number base_ninf = 0;
 static base_number *pos = NULL;
 

-static unsigned int *conflrow = NULL;
-unsigned int *conflict_table = NULL;
-unsigned int *conflict_list = NULL;
+static unsigned int *conflrow;
+unsigned int *conflict_table;
+unsigned int *conflict_list;

 int conflict_list_cnt;
 static int conflict_list_free;
 
 int conflict_list_cnt;
 static int conflict_list_free;
 


@@ -122,8 +124,8 @@ static int conflict_list_free;
    with more or less the original hard-coded value (which was
    SHRT_MAX).  */
 static int table_size = 32768;
    with more or less the original hard-coded value (which was
    SHRT_MAX).  */
 static int table_size = 32768;

-base_number *table = NULL;
-base_number *check = NULL;
+base_number *table;
+base_number *check;

 /* The value used in TABLE to denote explicit syntax errors
    (%nonassoc), a negative infinite.  First defaults to ACTION_NUMBER_MININUM,
    but in order to keep small tables, renumbered as TABLE_ERROR, which
 /* The value used in TABLE to denote explicit syntax errors
    (%nonassoc), a negative infinite.  First defaults to ACTION_NUMBER_MININUM,
    but in order to keep small tables, renumbered as TABLE_ERROR, which


@@ -153,13 +155,15 @@ table_grow (int desired)
     fprintf (stderr, "growing table and check from: %d to %d\n",
             old_size, table_size);
 
     fprintf (stderr, "growing table and check from: %d to %d\n",
             old_size, table_size);
 

-  REALLOC (table, table_size);
-  REALLOC (check, table_size);
-  REALLOC (conflict_table, table_size);
+  table = xnrealloc (table, table_size, sizeof *table);
+  conflict_table = xnrealloc (conflict_table, table_size,
+                             sizeof *conflict_table);
+  check = xnrealloc (check, table_size, sizeof *check);

 
   for (/* Nothing. */; old_size < table_size; ++old_size)
     {
       table[old_size] = 0;
 
   for (/* Nothing. */; old_size < table_size; ++old_size)
     {
       table[old_size] = 0;

+      conflict_table[old_size] = 0;

       check[old_size] = -1;
     }
 }
       check[old_size] = -1;
     }
 }


@@ -169,7 +173,7 @@ table_grow (int desired)
 
 /*-------------------------------------------------------------------.
 | For GLR parsers, for each conflicted token in S, as indicated      |
 
 /*-------------------------------------------------------------------.
 | For GLR parsers, for each conflicted token in S, as indicated      |

-| by non-zero entries in CONFLROW, create a list of possible        |
+| by non-zero entries in CONFLROW, create a list of possible        |

 | reductions that are alternatives to the shift or reduction        |
 | currently recorded for that token in S.  Store the alternative     |
 | reductions followed by a 0 in CONFLICT_LIST, updating                     |
 | reductions that are alternatives to the shift or reduction        |
 | currently recorded for that token in S.  Store the alternative     |
 | reductions followed by a 0 in CONFLICT_LIST, updating                     |


@@ -208,6 +212,7 @@ conflict_row (state *s)
        /* Leave a 0 at the end.  */
        if (conflict_list_free <= 0)
          abort ();
        /* Leave a 0 at the end.  */
        if (conflict_list_free <= 0)
          abort ();

+       conflict_list[conflict_list_cnt] = 0;

        conflict_list_cnt += 1;
        conflict_list_free -= 1;
       }
        conflict_list_cnt += 1;
        conflict_list_free -= 1;
       }


@@ -373,7 +378,7 @@ save_row (state_number s)
   base_number *sp;
   base_number *sp1;
   base_number *sp2;
   base_number *sp;
   base_number *sp1;
   base_number *sp2;

-  unsigned int *sp3 IF_LINT (= NULL);
+  unsigned int *sp3;

 
   /* Number of non default actions in S.  */
   count = 0;
 
   /* Number of non default actions in S.  */
   count = 0;


@@ -385,9 +390,10 @@ save_row (state_number s)
     return;
 
   /* Allocate non defaulted actions.  */
     return;
 
   /* Allocate non defaulted actions.  */

-  froms[s] = sp = CALLOC (sp1, count);
-  tos[s] = CALLOC (sp2, count);
-  conflict_tos[s] = nondeterministic_parser ? CALLOC (sp3, count) : NULL;
+  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++)
 
   /* Store non defaulted actions.  */
   for (i = 0; i < ntokens; i++)


@@ -421,12 +427,12 @@ token_actions (void)
 
   int nconflict = nondeterministic_parser ? conflicts_total_count () : 0;
 
 
   int nconflict = nondeterministic_parser ? conflicts_total_count () : 0;
 

-  CALLOC (yydefact, nstates);
+  yydefact = xnmalloc (nstates, sizeof *yydefact);

 
 

-  CALLOC (actrow, ntokens);
-  CALLOC (conflrow, ntokens);
+  actrow = xnmalloc (ntokens, sizeof *actrow);
+  conflrow = xnmalloc (ntokens, sizeof *conflrow);

 
 

-  CALLOC (conflict_list, 1 + 2 * nconflict);
+  conflict_list = xnmalloc (1 + 2 * nconflict, sizeof *conflict_list);

   conflict_list_free = 2 * nconflict;
   conflict_list_cnt = 1;
 
   conflict_list_free = 2 * nconflict;
   conflict_list_cnt = 1;
 


@@ -471,7 +477,7 @@ token_actions (void)
 static void
 save_column (symbol_number sym, state_number default_state)
 {
 static void
 save_column (symbol_number sym, state_number default_state)
 {

-  int i;
+  goto_number i;

   base_number *sp;
   base_number *sp1;
   base_number *sp2;
   base_number *sp;
   base_number *sp1;
   base_number *sp2;


@@ -491,8 +497,8 @@ save_column (symbol_number sym, state_number default_state)
     return;
 
   /* Allocate room for non defaulted gotos.  */
     return;
 
   /* Allocate room for non defaulted gotos.  */

-  froms[symno] = sp = CALLOC (sp1, count);
-  tos[symno] = CALLOC (sp2, count);
+  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++)
 
   /* Store the state numbers of the non defaulted gotos.  */
   for (i = begin; i < end; i++)


@@ -512,14 +518,14 @@ save_column (symbol_number sym, state_number default_state)
 `-------------------------------------------------------------*/
 
 static state_number
 `-------------------------------------------------------------*/
 
 static state_number

-default_goto (symbol_number sym, short int state_count[])
+default_goto (symbol_number sym, size_t state_count[])

 {
   state_number s;
 {
   state_number s;

-  int i;
+  goto_number i;

   goto_number m = goto_map[sym - ntokens];
   goto_number n = goto_map[sym - ntokens + 1];
   state_number default_state = -1;
   goto_number m = goto_map[sym - ntokens];
   goto_number n = goto_map[sym - ntokens + 1];
   state_number default_state = -1;

-  int max = 0;
+  size_t max = 0;

 
   if (m == n)
     return -1;
 
   if (m == n)
     return -1;


@@ -554,8 +560,8 @@ static void
 goto_actions (void)
 {
   symbol_number i;
 goto_actions (void)
 {
   symbol_number i;

-  short int *state_count = CALLOC (state_count, nstates);
-  MALLOC (yydefgoto, nvars);
+  size_t *state_count = xnmalloc (nstates, sizeof *state_count);
+  yydefgoto = xnmalloc (nvars, sizeof *yydefgoto);

 
   /* For a given nterm I, STATE_COUNT[S] is the number of times there
      is a GOTO to S on I.  */
 
   /* For a given nterm I, STATE_COUNT[S] is the number of times there
      is a GOTO to S on I.  */


@@ -751,11 +757,11 @@ pack_table (void)
 {
   int i;
 
 {
   int i;
 

-  CALLOC (base, nvectors);
-  CALLOC (pos, nentries);
-  CALLOC (table, table_size);
-  CALLOC (conflict_table, table_size);
-  CALLOC (check, table_size);
+  base = xnmalloc (nvectors, sizeof *base);
+  pos = xnmalloc (nentries, sizeof *pos);
+  table = xcalloc (table_size, sizeof *table);
+  conflict_table = xcalloc (table_size, sizeof *conflict_table);
+  check = xnmalloc (table_size, sizeof *check);

 
   lowzero = 0;
   high = 0;
 
   lowzero = 0;
   high = 0;


@@ -804,17 +810,16 @@ tables_generate (void)
   /* This is a poor way to make sure the sizes are properly
      correlated.  In particular the signedness is not taken into
      account.  But it's not useless.  */
   /* This is a poor way to make sure the sizes are properly
      correlated.  In particular the signedness is not taken into
      account.  But it's not useless.  */

-  verify (sizes_are_properly_correlated,
-         (sizeof nstates <= sizeof nvectors
-          && sizeof nvars <= sizeof nvectors));
+  verify (sizeof nstates <= sizeof nvectors
+         && sizeof nvars <= sizeof nvectors);

 
   nvectors = state_number_as_int (nstates) + nvars;
 
 
   nvectors = state_number_as_int (nstates) + nvars;
 

-  CALLOC (froms, nvectors);
-  CALLOC (tos, nvectors);
-  CALLOC (conflict_tos, nvectors);
-  CALLOC (tally, nvectors);
-  CALLOC (width, nvectors);
+  froms = xcalloc (nvectors, sizeof *froms);
+  tos = xcalloc (nvectors, sizeof *tos);
+  conflict_tos = xcalloc (nvectors, sizeof *conflict_tos);
+  tally = xcalloc (nvectors, sizeof *tally);
+  width = xnmalloc (nvectors, sizeof *width);

 
   token_actions ();
 
 
   token_actions ();
 


@@ -823,7 +828,7 @@ tables_generate (void)
   free (from_state);
   free (to_state);
 
   free (from_state);
   free (to_state);
 

-  CALLOC (order, nvectors);
+  order = xcalloc (nvectors, sizeof *order);

   sort_actions ();
   pack_table ();
   free (order);
   sort_actions ();
   pack_table ();
   free (order);


@@ -835,7 +840,7 @@ tables_generate (void)
     {
       free (froms[i]);
       free (tos[i]);
     {
       free (froms[i]);
       free (tos[i]);

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

     }
 
   free (froms);
     }
 
   free (froms);