Use 'short int' rather than 'short', and similarly for 'long', 'unsigned', etc.

[bison.git] / lib / bitsetv.c

diff --git a/lib/bitsetv.c b/lib/bitsetv.c
index 7fd8226820883081622ad4a1affd6be8abfed35f..42e0a3d79185e4b0833bdce2f7970f353f454102 100644 (file)
--- a/lib/bitsetv.c
+++ b/lib/bitsetv.c
@@ -1,5 +1,5 @@
 /* Bitset vectors.
 /* Bitset vectors.

-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.

 
 This file is part of GCC.
 
 
 This file is part of GCC.
 


@@ -29,100 +29,144 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 /* Create a vector of N_VECS bitsets, each of N_BITS, and of
    type TYPE.  */
 bitset *
 /* Create a vector of N_VECS bitsets, each of N_BITS, and of
    type TYPE.  */
 bitset *

-bitsetv_alloc (n_vecs, n_bits, type)
-    unsigned int n_vecs;
-    unsigned int n_bits;
-    enum bitset_type type;
+bitsetv_alloc (bitset_bindex n_vecs, bitset_bindex n_bits,
+              enum bitset_type type)

 {
 {

-    unsigned int vector_bytes;
-    unsigned int bytes;
-    bitset *bsetv;
-    unsigned int i;
+  size_t vector_bytes;
+  size_t bytes;
+  bitset *bsetv;
+  bitset_bindex i;

 
 

-    /* Determine number of bytes for each set.  */
-    bytes = bitset_bytes (type, n_bits);
+  /* Determine number of bytes for each set.  */
+  bytes = bitset_bytes (type, n_bits);

 
 

-    /* Allocate vector table at head of bitset array.  */
-    vector_bytes = n_vecs * sizeof (bitset);
-    bsetv = (bitset *) xmalloc (vector_bytes + bytes * n_vecs);
+  /* If size calculation overflows, memory is exhausted.  */
+  if (BITSET_SIZE_MAX / (sizeof (bitset) + bytes) <= n_vecs)
+    xalloc_die ();

 
 

-    for (i = 0; i < n_vecs; i++)
+  /* Allocate vector table at head of bitset array.  */
+  vector_bytes = (n_vecs + 1) * sizeof (bitset) + bytes - 1;
+  vector_bytes -= vector_bytes % bytes;
+  bsetv = (bitset *) xcalloc (1, vector_bytes + bytes * n_vecs);
+
+  for (i = 0; i < n_vecs; i++)

     {
     {

-      bsetv[i] = (bitset)((char *)bsetv + vector_bytes + i * bytes);
+      bsetv[i] = (bitset) (void *) ((char *) bsetv + vector_bytes + i * bytes);

 
       bitset_init (bsetv[i], n_bits, type);
     }
 
       bitset_init (bsetv[i], n_bits, type);
     }

-    return bsetv;
+
+  /* Null terminate table.  */
+  bsetv[i] = 0;
+  return bsetv;

 }
 
 
 /* Create a vector of N_VECS bitsets, each of N_BITS, and with
    attribute hints specified by ATTR.  */
 bitset *
 }
 
 
 /* Create a vector of N_VECS bitsets, each of N_BITS, and with
    attribute hints specified by ATTR.  */
 bitset *

-bitsetv_create (n_vecs, n_bits, attr)
-    unsigned int n_vecs;
-    unsigned int n_bits;
-    unsigned int attr;
+bitsetv_create (bitset_bindex n_vecs, bitset_bindex n_bits, unsigned int attr)

 {
 {

-    enum bitset_type type;
+  enum bitset_type type;

 
 

-    type = bitset_type_choose (n_bits, attr);
-    return bitsetv_alloc (n_vecs, n_bits, type);
+  type = bitset_type_choose (n_bits, attr);
+  return bitsetv_alloc (n_vecs, n_bits, type);

 }
 
 
 /* Free bitset vector BSETV.  */
 void
 }
 
 
 /* Free bitset vector BSETV.  */
 void

-bitsetv_free (bsetv)
-    bitset *bsetv;
+bitsetv_free (bitsetv bsetv)

 {
 {

-    free (bsetv);
+  bitset_bindex i;
+
+  for (i = 0; bsetv[i]; i++)
+      BITSET_FREE_ (bsetv[i]);
+  free (bsetv);

 }
 
 
 }
 
 

-/* Zero a vector of N_VECS bitsets.  */
+/* Zero a vector of bitsets.  */

 void
 void

-bitsetv_zero (bsetv, n_vecs)
-     struct bitset_struct **bsetv;
-     unsigned int n_vecs;
+bitsetv_zero (bitsetv bsetv)

 {
 {

-  unsigned int i;
+  bitset_bindex i;

 
 

-  for (i = 0; i < n_vecs; i++)
-      bitset_zero (bsetv[i]);
+  for (i = 0; bsetv[i]; i++)
+    bitset_zero (bsetv[i]);

 }
 
 
 }
 
 

-/* Set a vector of N_VECS bitsets to ones.  */
+/* Set a vector of bitsets to ones.  */

 void
 void

-bitsetv_ones (bsetv, n_vecs)
-     bitset *bsetv;
-     unsigned int n_vecs;
+bitsetv_ones (bitsetv bsetv)

 {
 {

-  unsigned int i;
+  bitset_bindex i;

 
 

-  for (i = 0; i < n_vecs; i++)
+  for (i = 0; bsetv[i]; i++)

     bitset_ones (bsetv[i]);
 }
 
 
     bitset_ones (bsetv[i]);
 }
 
 

+/* Given a vector BSETV of N bitsets of size N, modify its contents to
+   be the transitive closure of what was given.  */
+void
+bitsetv_transitive_closure (bitsetv bsetv)
+{
+  bitset_bindex i;
+  bitset_bindex j;
+
+  for (i = 0; bsetv[i]; i++)
+    for (j = 0; bsetv[j]; j++)
+      if (bitset_test (bsetv[j], i))
+       bitset_or (bsetv[j], bsetv[j], bsetv[i]);
+}
+
+
+/* Given a vector BSETV of N bitsets of size N, modify its contents to
+   be the reflexive transitive closure of what was given.  This is
+   the same as transitive closure but with all bits on the diagonal
+   of the bit matrix set.  */
+void
+bitsetv_reflexive_transitive_closure (bitsetv bsetv)
+{
+  bitset_bindex i;
+
+  bitsetv_transitive_closure (bsetv);
+  for (i = 0; bsetv[i]; i++)
+    bitset_set (bsetv[i], i);
+}
+
+

 /* Dump the contents of a bitset vector BSETV with N_VECS elements to
    FILE.  */
 void
 /* Dump the contents of a bitset vector BSETV with N_VECS elements to
    FILE.  */
 void

-bitsetv_dump (file, title, subtitle, bsetv, n_vecs)
-     FILE *file;
-     const char *title, *subtitle;
-     bitset *bsetv;
-     unsigned int n_vecs;
+bitsetv_dump (FILE *file, char const *title, char const *subtitle,
+             bitsetv bsetv)

 {
 {

-  unsigned int i;
+  bitset_windex i;

 
   fprintf (file, "%s\n", title);
 
   fprintf (file, "%s\n", title);

-  for (i = 0; i < n_vecs; i++)
+  for (i = 0; bsetv[i]; i++)

     {
     {

-      fprintf (file, "%s %d\n", subtitle, i);
+      fprintf (file, "%s %lu\n", subtitle, (unsigned long int) i);

       bitset_dump (file, bsetv[i]);
     }
 
   fprintf (file, "\n");
 }
       bitset_dump (file, bsetv[i]);
     }
 
   fprintf (file, "\n");
 }

+
+
+void
+debug_bitsetv (bitsetv bsetv)
+{
+  bitset_windex i;
+
+  for (i = 0; bsetv[i]; i++)
+    {
+      fprintf (stderr, "%lu: ", (unsigned long int) i);
+      debug_bitset (bsetv[i]);
+    }
+
+  fprintf (stderr, "\n");
+}