(_AT_TEST_GLR_CXXTYPES): Do not include <assert.h>.

[bison.git] / lib / bitset.c

diff --git a/lib/bitset.c b/lib/bitset.c
index 0e8d26c99d713b45b728a18216bf424543500f5c..82517d9edbf3861f9862c689196f01d018f39771 100644 (file)
--- a/lib/bitset.c
+++ b/lib/bitset.c
@@ -28,17 +28,15 @@
 #include "bitset_stats.h"
 #include "obstack.h"
 
 #include "bitset_stats.h"
 #include "obstack.h"
 

-static void bitset_print PARAMS ((FILE *, bitset, int));
+const char * const bitset_type_names[] = BITSET_TYPE_NAMES;

 
 
 /* Return number of bytes required to create a N_BIT bitset
    of TYPE.  The bitset may grow to require more bytes than this.  */
 
 
 /* Return number of bytes required to create a N_BIT bitset
    of TYPE.  The bitset may grow to require more bytes than this.  */

-int
-bitset_bytes (type, n_bits)
-     enum bitset_type type;
-     bitset_bindex n_bits;
+size_t
+bitset_bytes (enum bitset_type type, bitset_bindex n_bits)

 {
 {

-  unsigned int bytes;
+  size_t bytes;

 
   if (bitset_stats_enabled)
     return bitset_stats_bytes ();
 
   if (bitset_stats_enabled)
     return bitset_stats_bytes ();


@@ -67,14 +65,11 @@ bitset_bytes (type, n_bits)
 
 /* Initialise bitset BSET of TYPE for N_BITS.  */
 bitset
 
 /* Initialise bitset BSET of TYPE for N_BITS.  */
 bitset

-bitset_init (bset, n_bits, type)
-     bitset bset;
-     bitset_bindex n_bits;
-     enum bitset_type type;
+bitset_init (bitset bset, bitset_bindex n_bits, enum bitset_type type)

 {
   if (bitset_stats_enabled)
     return bitset_stats_init (bset, n_bits, type);
 {
   if (bitset_stats_enabled)
     return bitset_stats_init (bset, n_bits, type);

-  
+

   switch (type)
     {
     case BITSET_ARRAY:
   switch (type)
     {
     case BITSET_ARRAY:


@@ -96,9 +91,7 @@ bitset_init (bset, n_bits, type)
    specified by ATTR.  For variable size bitsets, N_BITS is only a
    hint and may be zero.  */
 enum bitset_type
    specified by ATTR.  For variable size bitsets, N_BITS is only a
    hint and may be zero.  */
 enum bitset_type

-bitset_type_choose (n_bits, attr)
-     bitset_bindex n_bits ATTRIBUTE_UNUSED;
-     unsigned int attr;
+bitset_type_choose (bitset_bindex n_bits ATTRIBUTE_UNUSED, unsigned int attr)

 {
   enum bitset_type type;
 
 {
   enum bitset_type type;
 


@@ -108,10 +101,8 @@ bitset_type_choose (n_bits, attr)
   if (attr & BITSET_SPARSE && attr & BITSET_DENSE)
     abort ();
 
   if (attr & BITSET_SPARSE && attr & BITSET_DENSE)
     abort ();
 

-  /* Note that sometimes we will be asked for a zero length
-     fixed size bitset.  */
-
-  /* Choose the type of bitset.  */
+  /* Choose the type of bitset. Note that sometimes we will be asked
+  for a zero length fixed size bitset.  */

 
   type = BITSET_ARRAY;
   /* Currently, the simple bitsets do not support a variable size.  */
 
   type = BITSET_ARRAY;
   /* Currently, the simple bitsets do not support a variable size.  */


@@ -128,11 +119,9 @@ bitset_type_choose (n_bits, attr)
 
 /* Create a bitset of N_BITS of type TYPE.  */
 bitset
 
 /* Create a bitset of N_BITS of type TYPE.  */
 bitset

-bitset_alloc (n_bits, type)
-     bitset_bindex n_bits;
-     enum bitset_type type;
+bitset_alloc (bitset_bindex n_bits, enum bitset_type type)

 {
 {

-  unsigned int bytes;
+  size_t bytes;

   bitset bset;
 
   bytes = bitset_bytes (type, n_bits);
   bitset bset;
 
   bytes = bitset_bytes (type, n_bits);


@@ -149,12 +138,10 @@ bitset_alloc (n_bits, type)
 
 /* Create a bitset of N_BITS of type TYPE.  */
 bitset
 
 /* Create a bitset of N_BITS of type TYPE.  */
 bitset

-bitset_obstack_alloc (bobstack, n_bits, type)
-     struct obstack *bobstack;
-     bitset_bindex n_bits;
-     enum bitset_type type;
+bitset_obstack_alloc (struct obstack *bobstack,
+                     bitset_bindex n_bits, enum bitset_type type)

 {
 {

-  unsigned int bytes;
+  size_t bytes;

   bitset bset;
 
   bytes = bitset_bytes (type, n_bits);
   bitset bset;
 
   bytes = bitset_bytes (type, n_bits);


@@ -169,9 +156,7 @@ bitset_obstack_alloc (bobstack, n_bits, type)
 /* Create a bitset of N_BITS and with attribute hints specified by
    ATTR.  */
 bitset
 /* Create a bitset of N_BITS and with attribute hints specified by
    ATTR.  */
 bitset

-bitset_create (n_bits, attr)
-     bitset_bindex n_bits;
-     unsigned int attr;
+bitset_create (bitset_bindex n_bits, unsigned int attr)

 {
   enum bitset_type type;
 
 {
   enum bitset_type type;
 


@@ -183,8 +168,7 @@ bitset_create (n_bits, attr)
 
 /* Free bitset BSET.  */
 void
 
 /* Free bitset BSET.  */
 void

-bitset_free (bset)
-     bitset bset;
+bitset_free (bitset bset)

 {
   BITSET_FREE_ (bset);
   free (bset);
 {
   BITSET_FREE_ (bset);
   free (bset);


@@ -193,8 +177,7 @@ bitset_free (bset)
 
 /* Free bitset BSET allocated on obstack.  */
 void
 
 /* Free bitset BSET allocated on obstack.  */
 void

-bitset_obstack_free (bset)
-     bitset bset;
+bitset_obstack_free (bitset bset)

 {
   BITSET_FREE_ (bset);
 }
 {
   BITSET_FREE_ (bset);
 }


@@ -202,64 +185,69 @@ bitset_obstack_free (bset)
 
 /* Return bitset type.  */
 enum bitset_type
 
 /* Return bitset type.  */
 enum bitset_type

-bitset_type_get (bset)
-   bitset bset;
+bitset_type_get (bitset bset)

 {
    enum bitset_type type;
 
    type = BITSET_TYPE_ (bset);
    if (type != BITSET_STATS)
       return type;
 {
    enum bitset_type type;
 
    type = BITSET_TYPE_ (bset);
    if (type != BITSET_STATS)
       return type;

-   
+

    return bitset_stats_type_get (bset);
 }
 
 
    return bitset_stats_type_get (bset);
 }
 
 

+/* Return name of bitset type.  */
+const char *
+bitset_type_name_get (bitset bset)
+{
+  enum bitset_type type;
+
+  type = bitset_type_get (bset);
+
+  return bitset_type_names[type];
+}
+
+

 /* Find next bit set in SRC starting from and including BITNO.
 /* Find next bit set in SRC starting from and including BITNO.

-   Return -1 if SRC empty.  */
-int
-bitset_next (src, bitno)
-     bitset src;
-     bitset_bindex bitno;
+   Return BITSET_BINDEX_MAX if SRC empty.  */
+bitset_bindex
+bitset_next (bitset src, bitset_bindex bitno)

 {
   bitset_bindex val;
   bitset_bindex next = bitno;
 
   if (!bitset_list (src, &val, 1, &next))
 {
   bitset_bindex val;
   bitset_bindex next = bitno;
 
   if (!bitset_list (src, &val, 1, &next))

-    return -1;
+    return BITSET_BINDEX_MAX;

   return val;
 }
 
 
 /* Find previous bit set in SRC starting from and including BITNO.
   return val;
 }
 
 
 /* Find previous bit set in SRC starting from and including BITNO.

-   Return -1 if SRC empty.  */
-int
-bitset_prev (src, bitno)
-     bitset src;
-     bitset_bindex bitno;
+   Return BITSET_BINDEX_MAX if SRC empty.  */
+bitset_bindex
+bitset_prev (bitset src, bitset_bindex bitno)

 {
   bitset_bindex val;
   bitset_bindex next = bitno;
 
 {
   bitset_bindex val;
   bitset_bindex next = bitno;
 

-  if (!bitset_reverse_list (src, &val, 1, &next))
-    return -1;
+  if (!bitset_list_reverse (src, &val, 1, &next))
+    return BITSET_BINDEX_MAX;

   return val;
 }
 
 
 /* Find first set bit.   */
   return val;
 }
 
 
 /* Find first set bit.   */

-int
-bitset_first (src)
-     bitset src;
+bitset_bindex
+bitset_first (bitset src)

 {
   return bitset_next (src, 0);
 }
 
 
 /* Find last set bit.   */
 {
   return bitset_next (src, 0);
 }
 
 
 /* Find last set bit.   */

-int
-bitset_last (src)
-     bitset src;
+bitset_bindex
+bitset_last (bitset src)

 {
   return bitset_prev (src, 0);
 }
 {
   return bitset_prev (src, 0);
 }


@@ -267,9 +255,7 @@ bitset_last (src)
 
 /* Return non-zero if BITNO in SRC is the only set bit.  */
 int
 
 /* Return non-zero if BITNO in SRC is the only set bit.  */
 int

-bitset_only_set_p (src, bitno)
-     bitset src;
-     bitset_bindex bitno;
+bitset_only_set_p (bitset src, bitset_bindex bitno)

 {
   bitset_bindex val[2];
   bitset_bindex next = 0;
 {
   bitset_bindex val[2];
   bitset_bindex next = 0;


@@ -280,39 +266,17 @@ bitset_only_set_p (src, bitno)
 }
 
 
 }
 
 

-/* Toggle bit BITNO in bitset BSET and return non-zero if now set.  */
-int
-bitset_toggle (bset, bitno)
-    bitset bset;
-    bitset_bindex bitno;
-{
-  /* This routine is for completeness.  It could be optimized if
-     required.  */
-  if (bitset_test (bset, bitno))
-    {
-      bitset_reset (bset, bitno);
-      return 0;
-    }
-  else
-    {
-      bitset_set (bset, bitno);
-      return 1;
-    }
-}
-
-

 /* Print contents of bitset BSET to FILE.   */
 static void
 /* Print contents of bitset BSET to FILE.   */
 static void

-bitset_print (file, bset, verbose)
-     FILE *file;
-     bitset bset;
-     int verbose;
+bitset_print (FILE *file, bitset bset, int verbose)

 {
 {

-  unsigned int i, pos;
+  unsigned int pos;
+  bitset_bindex i;

   bitset_iterator iter;
 
   if (verbose)
   bitset_iterator iter;
 
   if (verbose)

-    fprintf (file, "n_bits = %d, set = {", bitset_size (bset));
+    fprintf (file, "n_bits = %lu, set = {",
+            (unsigned long) bitset_size (bset));

 
   pos = 30;
   BITSET_FOR_EACH (iter, bset, i, 0)
 
   pos = 30;
   BITSET_FOR_EACH (iter, bset, i, 0)


@@ -332,49 +296,53 @@ bitset_print (file, bset, verbose)
 }
 
 
 }
 
 

-/* DST = SRC.  Return non-zero if DST != SRC.  */
-int
-bitset_copy (dst, src)
-     bitset dst;
-     bitset src;
+/* Dump bitset BSET to FILE.  */
+void
+bitset_dump (FILE *file, bitset bset)

 {
 {

-  unsigned int i;
-  bitset_iterator iter;
+  bitset_print (file, bset, 0);
+}

 
 

-  if (BITSET_COMPATIBLE_ (dst, src))
-    return BITSET_COPY_ (dst, src);

 
 

-  /* Convert bitset types.  We assume that the DST bitset
-     is large enough to hold the SRC bitset.  */
-  bitset_zero (dst);
-  BITSET_FOR_EACH (iter, src, i, 0)
-  {
-     bitset_set (dst, i);
-  };

 
 

-  return 1;
+/* Release memory associated with bitsets.  */
+void
+bitset_release_memory (void)
+{
+  lbitset_release_memory ();
+  ebitset_release_memory ();

 }
 
 
 }
 
 

-/* Return size in bits of bitset SRC.  */
+
+/* Toggle bit BITNO in bitset BSET and return non-zero if not set.  */

 int
 int

-bitset_size (src)
-     bitset src;
+bitset_toggle_ (bitset bset, bitset_bindex bitno)

 {
 {

-  return BITSET_SIZE_ (src);
+  /* This routine is for completeness.  It could be optimized if
+     required.  */
+  if (bitset_test (bset, bitno))
+    {
+      bitset_reset (bset, bitno);
+      return 0;
+    }
+  else
+    {
+      bitset_set (bset, bitno);
+      return 1;
+    }

 }
 
 
 /* Return number of bits set in bitset SRC.  */
 }
 
 
 /* Return number of bits set in bitset SRC.  */

-int
-bitset_count (src)
-     bitset src;
+bitset_bindex
+bitset_count_ (bitset src)

 {
   bitset_bindex list[BITSET_LIST_SIZE];
   bitset_bindex next;
 {
   bitset_bindex list[BITSET_LIST_SIZE];
   bitset_bindex next;

-  int num;
-  int count;
-  
+  bitset_bindex num;
+  bitset_bindex count;
+

   /* This could be greatly sped up by adding a count method for each
      bitset implementation that uses a direct technique (based on
      masks) for counting the number of bits set in a word.  */
   /* This could be greatly sped up by adding a count method for each
      bitset implementation that uses a direct technique (based on
      masks) for counting the number of bits set in a word.  */


@@ -383,153 +351,63 @@ bitset_count (src)
   for (count = 0; (num = bitset_list (src, list, BITSET_LIST_SIZE, &next));
        count += num)
     continue;
   for (count = 0; (num = bitset_list (src, list, BITSET_LIST_SIZE, &next));
        count += num)
     continue;

-  
-  return count;
-}
-

 
 

-/* DST = 0.  */
-int
-bitset_zero (dst)
-     bitset dst;
-{
-  return BITSET_ZERO_ (dst);
-}
-
-
-/* DST = ~0.  */
-int
-bitset_ones (dst)
-     bitset dst;
-{
-  return BITSET_ONES_ (dst);
-}
-
-
-/* Return SRC == 0.  */
-int
-bitset_empty_p (src)
-     bitset src;
-{
-  return BITSET_EMPTY_P_ (src);
-}
-
-
-/* Return DST == DST | SRC.  */
-int
-bitset_subset_p (dst, src)
-     bitset dst;
-     bitset src;
-{
-  return BITSET_SUBSET_P_ (dst, src);
-}
-
-
-/* Return DST == SRC.  */
-int
-bitset_equal_p (dst, src)
-     bitset dst;
-     bitset src;
-{
-  return BITSET_EQUAL_P_ (dst, src);
-}
-
-
-/* Return DST & SRC == 0.  */
-int
-bitset_disjoint_p (dst, src)
-     bitset dst;
-     bitset src;
-{
-  return BITSET_DISJOINT_P_ (dst, src);
-}
-
-
-/* DST = ~SRC.  */
-int
-bitset_not (dst, src)
-     bitset dst;
-     bitset src;
-{
-  return BITSET_NOT_ (dst, src);
-}
-
-
-/* DST = SRC1 | SRC2.  Return non-zero if DST != SRC1 | SRC2.  */
-int
-bitset_or (dst, src1, src2)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-{
-  return BITSET_OR_ (dst, src1, src2);
-}
-
-
-/* DST = SRC1 & SRC2.  Return non-zero if DST != SRC1 & SRC2.  */
-int
-bitset_and (dst, src1, src2)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-{
-  return BITSET_AND_ (dst, src1, src2);
+  return count;

 }
 
 
 }
 
 

-/* DST = SRC1 ^ SRC2.  Return non-zero if DST != SRC1 ^ SRC2.  */
+/* DST = SRC.  Return non-zero if DST != SRC.
+   This is a fallback for the case where SRC and DST are different
+   bitset types.  */

 int
 int

-bitset_xor (dst, src1, src2)
-     bitset dst;
-     bitset src1;
-     bitset src2;
+bitset_copy_ (bitset dst, bitset src)

 {
 {

-  return BITSET_XOR_ (dst, src1, src2);
-}
+  bitset_bindex i;
+  bitset_iterator iter;

 
 

+  /* Convert bitset types.  We assume that the DST bitset
+     is large enough to hold the SRC bitset.  */
+  bitset_zero (dst);
+  BITSET_FOR_EACH (iter, src, i, 0)
+  {
+     bitset_set (dst, i);
+  };

 
 

-/* DST = SRC1 & ~SRC2.  Return non-zero if DST != SRC1 & ~SRC2.  */
-int
-bitset_andn (dst, src1, src2)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-{
-  return BITSET_ANDN_ (dst, src1, src2);
+  return 1;

 }
 
 
 /* This is a fallback for implementations that do not support
    four operand operations.  */
 }
 
 
 /* This is a fallback for implementations that do not support
    four operand operations.  */

-int
-bitset_op4 (dst, src1, src2, src3, op)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
-     enum bitset_ops op;
+static inline int
+bitset_op4_cmp (bitset dst, bitset src1, bitset src2, bitset src3,
+               enum bitset_ops op)

 {
   int changed = 0;
 {
   int changed = 0;

+  int stats_enabled_save;

   bitset tmp;
 
   /* Create temporary bitset.  */
   bitset tmp;
 
   /* Create temporary bitset.  */

+  stats_enabled_save = bitset_stats_enabled;
+  bitset_stats_enabled = 0;

   tmp = bitset_alloc (0, bitset_type_get (dst));
   tmp = bitset_alloc (0, bitset_type_get (dst));

+  bitset_stats_enabled = stats_enabled_save;

 
   switch (op)
     {
     case BITSET_OP_OR_AND:
 
   switch (op)
     {
     case BITSET_OP_OR_AND:

-      BITSET_OR_ (tmp, src1, src2);
-      changed = BITSET_AND_ (dst, src3, tmp);
+      bitset_or (tmp, src1, src2);
+      changed = bitset_and_cmp (dst, src3, tmp);

       break;
 
     case BITSET_OP_AND_OR:
       break;
 
     case BITSET_OP_AND_OR:

-      BITSET_AND_ (tmp, src1, src2);
-      changed = BITSET_OR_ (dst, src3, tmp);
+      bitset_and (tmp, src1, src2);
+      changed = bitset_or_cmp (dst, src3, tmp);

       break;
 
     case BITSET_OP_ANDN_OR:
       break;
 
     case BITSET_OP_ANDN_OR:

-      BITSET_ANDN_ (tmp, src1, src2);
-      changed = BITSET_OR_ (dst, src3, tmp);
+      bitset_andn (tmp, src1, src2);
+      changed = bitset_or_cmp (dst, src3, tmp);

       break;
 
     default:
       break;
 
     default:


@@ -541,69 +419,61 @@ bitset_op4 (dst, src1, src2, src3, op)
 }
 
 
 }
 
 

-/* DST = (SRC1 | SRC2) & SRC3.  Return non-zero if
-   DST != (SRC1 | SRC2) & SRC3.  */
-int
-bitset_or_and (dst, src1, src2, src3)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
+/* DST = (SRC1 & SRC2) | SRC3.  */
+void
+bitset_and_or_ (bitset dst, bitset src1, bitset src2, bitset src3)

 {
 {

-  return BITSET_OR_AND_ (dst, src1, src2, src3);
+  bitset_and_or_cmp_ (dst, src1, src2, src3);

 }
 
 
 /* DST = (SRC1 & SRC2) | SRC3.  Return non-zero if
    DST != (SRC1 & SRC2) | SRC3.  */
 int
 }
 
 
 /* DST = (SRC1 & SRC2) | SRC3.  Return non-zero if
    DST != (SRC1 & SRC2) | SRC3.  */
 int

-bitset_and_or (dst, src1, src2, src3)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
+bitset_and_or_cmp_ (bitset dst, bitset src1, bitset src2, bitset src3)

 {
 {

-  return BITSET_AND_OR_ (dst, src1, src2, src3);
+  return bitset_op4_cmp (dst, src1, src2, src3, BITSET_OP_AND_OR);
+}
+
+
+/* DST = (SRC1 & ~SRC2) | SRC3.  */
+void
+bitset_andn_or_ (bitset dst, bitset src1, bitset src2, bitset src3)
+{
+  bitset_andn_or_cmp_ (dst, src1, src2, src3);

 }
 
 
 /* DST = (SRC1 & ~SRC2) | SRC3.  Return non-zero if
    DST != (SRC1 & ~SRC2) | SRC3.  */
 int
 }
 
 
 /* DST = (SRC1 & ~SRC2) | SRC3.  Return non-zero if
    DST != (SRC1 & ~SRC2) | SRC3.  */
 int

-bitset_andn_or (dst, src1, src2, src3)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
+bitset_andn_or_cmp_ (bitset dst, bitset src1, bitset src2, bitset src3)

 {
 {

-  return BITSET_ANDN_OR_ (dst, src1, src2, src3);
+  return bitset_op4_cmp (dst, src1, src2, src3, BITSET_OP_ANDN_OR);

 }
 
 
 }
 
 

-/* Dump bitset BSET to FILE.  */
+/* DST = (SRC1 | SRC2) & SRC3.  */

 void
 void

-bitset_dump (file, bset)
-     FILE *file;
-     bitset bset;
+bitset_or_and_ (bitset dst, bitset src1, bitset src2, bitset src3)

 {
 {

-  bitset_print (file, bset, 0);
+  bitset_or_and_cmp_ (dst, src1, src2, src3);

 }
 
 
 }
 
 

-/* Function to be called from debugger to print bitset.  */
-void
-debug_bitset (bset)
-     bitset bset;
+/* DST = (SRC1 | SRC2) & SRC3.  Return non-zero if
+   DST != (SRC1 | SRC2) & SRC3.  */
+int
+bitset_or_and_cmp_ (bitset dst, bitset src1, bitset src2, bitset src3)

 {
 {

-  if (bset)
-    bitset_print (stderr, bset, 1);
+  return bitset_op4_cmp (dst, src1, src2, src3, BITSET_OP_OR_AND);

 }
 
 
 }
 
 

-/* Release memory associated with bitsets.  */
+/* Function to be called from debugger to print bitset.  */

 void
 void

-bitset_release_memory ()
+debug_bitset (bitset bset)

 {
 {

-  lbitset_release_memory ();
-  ebitset_release_memory ();
+  if (bset)
+    bitset_print (stderr, bset, 1);

 }
 }