Merge remote-tracking branch 'origin/maint'

[bison.git] / lib / bitset.c

diff --git a/lib/bitset.c b/lib/bitset.c
index 9eb84267f413d03409c4403d7739485450dc4295..d8b5f092563b94fd92fefc33fae499e6b1992f67 100644 (file)
--- a/lib/bitset.c
+++ b/lib/bitset.c
@@ -1,10 +1,12 @@
 /* General bitsets.
 /* General bitsets.

-   Copyright (C) 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc.
+

    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 

-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -13,33 +15,28 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>

 
 

-#include <stdlib.h>

 #include "bitset.h"
 #include "bitset.h"

+
+#include <stdlib.h>
+#include <string.h>

 #include "abitset.h"
 #include "lbitset.h"
 #include "ebitset.h"
 #include "abitset.h"
 #include "lbitset.h"
 #include "ebitset.h"

+#include "vbitset.h"

 #include "bitset_stats.h"
 #include "obstack.h"
 
 const char * const bitset_type_names[] = BITSET_TYPE_NAMES;
 
 #include "bitset_stats.h"
 #include "obstack.h"
 
 const char * const bitset_type_names[] = BITSET_TYPE_NAMES;
 

-static void bitset_print PARAMS ((FILE *, bitset, int));
-static int bitset_op4_cmp PARAMS ((bitset, bitset, bitset, bitset, int));
-

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

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

 {
   size_t bytes;
 
 {
   size_t bytes;
 


@@ -48,6 +45,9 @@ bitset_bytes (type, n_bits)
 
   switch (type)
     {
 
   switch (type)
     {

+    default:
+      abort ();
+

     case BITSET_ARRAY:
       bytes = abitset_bytes (n_bits);
       break;
     case BITSET_ARRAY:
       bytes = abitset_bytes (n_bits);
       break;


@@ -60,8 +60,9 @@ bitset_bytes (type, n_bits)
       bytes = ebitset_bytes (n_bits);
       break;
 
       bytes = ebitset_bytes (n_bits);
       break;
 

-    default:
-      abort ();
+    case BITSET_VARRAY:
+      bytes = vbitset_bytes (n_bits);
+      break;

     }
 
   return bytes;
     }
 
   return bytes;


@@ -70,16 +71,16 @@ 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)
     {
   switch (type)
     {

+    default:
+      abort ();
+

     case BITSET_ARRAY:
       return abitset_init (bset, n_bits);
 
     case BITSET_ARRAY:
       return abitset_init (bset, n_bits);
 


@@ -89,8 +90,8 @@ bitset_init (bset, n_bits, type)
     case BITSET_TABLE:
       return ebitset_init (bset, n_bits);
 
     case BITSET_TABLE:
       return ebitset_init (bset, n_bits);
 

-    default:
-      abort ();
+    case BITSET_VARRAY:
+      return vbitset_init (bset, n_bits);

     }
 }
 
     }
 }
 


@@ -99,46 +100,45 @@ 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;
-

   /* Check attributes.  */
   if (attr & BITSET_FIXED && attr & BITSET_VARIABLE)
     abort ();
   if (attr & BITSET_SPARSE && attr & BITSET_DENSE)
     abort ();
 
   /* Check attributes.  */
   if (attr & BITSET_FIXED && attr & BITSET_VARIABLE)
     abort ();
   if (attr & BITSET_SPARSE && attr & BITSET_DENSE)
     abort ();
 

-  /* Choose the type of bitset. Note that sometimes we will be asked
+  /* Choose the type of bitset.  Note that sometimes we will be asked

   for a zero length fixed size bitset.  */
 
   for a zero length fixed size bitset.  */
 

-  type = BITSET_ARRAY;
-  /* Currently, the simple bitsets do not support a variable size.  */
-  if (attr & BITSET_VARIABLE || attr & BITSET_SPARSE)
-    {
-      type = BITSET_LIST;
-      if (attr & BITSET_DENSE || attr & BITSET_GREEDY)
-       type = BITSET_TABLE;
-    }

 
 

-  return type;
+  /* If no attributes selected, choose a good compromise.  */
+  if (!attr)
+    return BITSET_VARRAY;
+
+  if (attr & BITSET_SPARSE)
+    return BITSET_LIST;
+
+  if (attr & BITSET_FIXED)
+    return BITSET_ARRAY;
+
+  if (attr & BITSET_GREEDY)
+    return BITSET_TABLE;
+
+  return BITSET_VARRAY;

 }
 
 
 /* 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)

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

-  bset = (bitset) xcalloc (1, bytes);
+  bset = xcalloc (1, bytes);

 
   /* The cache is disabled until some elements are allocated.  If we
      have variable length arrays, then we may need to allocate a dummy
 
   /* The cache is disabled until some elements are allocated.  If we
      have variable length arrays, then we may need to allocate a dummy


@@ -150,10 +150,8 @@ 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)

 {
   size_t bytes;
   bitset bset;
 {
   size_t bytes;
   bitset bset;


@@ -170,9 +168,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;
 


@@ -184,8 +180,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);


@@ -194,8 +189,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);
 }


@@ -203,23 +197,21 @@ 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 name of bitset type.  */
 const char *
    return bitset_stats_type_get (bset);
 }
 
 
 /* Return name of bitset type.  */
 const char *

-bitset_type_name_get (bset)
-     bitset bset;
+bitset_type_name_get (bitset bset)

 {
   enum bitset_type type;
 
 {
   enum bitset_type type;
 


@@ -232,9 +224,7 @@ bitset_type_name_get (bset)
 /* Find next bit set in SRC starting from and including BITNO.
    Return BITSET_BINDEX_MAX if SRC empty.  */
 bitset_bindex
 /* Find next bit set in SRC starting from and including BITNO.
    Return BITSET_BINDEX_MAX if SRC empty.  */
 bitset_bindex

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

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


@@ -245,12 +235,18 @@ bitset_next (src, bitno)
 }
 
 
 }
 
 

+/* Return true if both bitsets are of the same type and size.  */
+extern bool
+bitset_compatible_p (bitset bset1, bitset bset2)
+{
+    return BITSET_COMPATIBLE_ (bset1, bset2);
+}
+
+

 /* Find previous bit set in SRC starting from and including BITNO.
    Return BITSET_BINDEX_MAX if SRC empty.  */
 bitset_bindex
 /* Find previous bit set in SRC starting from and including BITNO.
    Return BITSET_BINDEX_MAX if SRC empty.  */
 bitset_bindex

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

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


@@ -263,8 +259,7 @@ bitset_prev (src, bitno)
 
 /* Find first set bit.   */
 bitset_bindex
 
 /* Find first set bit.   */
 bitset_bindex

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

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


@@ -272,34 +267,28 @@ bitset_first (src)
 
 /* Find last set bit.   */
 bitset_bindex
 
 /* Find last set bit.   */
 bitset_bindex

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

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

-/* Return non-zero if BITNO in SRC is the only set bit.  */
-int
-bitset_only_set_p (src, bitno)
-     bitset src;
-     bitset_bindex bitno;
+/* Is BITNO in SRC the only set bit?  */
+bool
+bitset_only_set_p (bitset src, bitset_bindex bitno)

 {
   bitset_bindex val[2];
   bitset_bindex next = 0;
 
   if (bitset_list (src, val, 2, &next) != 1)
 {
   bitset_bindex val[2];
   bitset_bindex next = 0;
 
   if (bitset_list (src, val, 2, &next) != 1)

-    return 0;
+    return false;

   return val[0] == bitno;
 }
 
 
 /* Print contents of bitset BSET to FILE.   */
 static void
   return val[0] == bitno;
 }
 
 
 /* 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, bool verbose)

 {
   unsigned int pos;
   bitset_bindex i;
 {
   unsigned int pos;
   bitset_bindex i;


@@ -307,18 +296,18 @@ bitset_print (file, bset, verbose)
 
   if (verbose)
     fprintf (file, "n_bits = %lu, set = {",
 
   if (verbose)
     fprintf (file, "n_bits = %lu, set = {",

-            (unsigned long) bitset_size (bset));
+             (unsigned long int) bitset_size (bset));

 
   pos = 30;
   BITSET_FOR_EACH (iter, bset, i, 0)
   {
     if (pos > 70)
       {
 
   pos = 30;
   BITSET_FOR_EACH (iter, bset, i, 0)
   {
     if (pos > 70)
       {

-       fprintf (file, "\n");
-       pos = 0;
+        fprintf (file, "\n");
+        pos = 0;

       }
 
       }
 

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

     pos += 1 + (i >= 10) + (i >= 100);
   };
 
     pos += 1 + (i >= 10) + (i >= 100);
   };
 


@@ -329,56 +318,57 @@ bitset_print (file, bset, verbose)
 
 /* Dump bitset BSET to FILE.  */
 void
 
 /* Dump bitset BSET to FILE.  */
 void

-bitset_dump (file, bset)
-     FILE *file;
-     bitset bset;
+bitset_dump (FILE *file, bitset bset)

 {
 {

-  bitset_print (file, bset, 0);
+  bitset_print (file, bset, false);

 }
 
 
 }
 
 

-

 /* Release memory associated with bitsets.  */
 void
 /* Release memory associated with bitsets.  */
 void

-bitset_release_memory ()
+bitset_release_memory (void)

 {
   lbitset_release_memory ();
   ebitset_release_memory ();
 }
 
 
 {
   lbitset_release_memory ();
   ebitset_release_memory ();
 }
 
 

-
-/* Toggle bit BITNO in bitset BSET and return non-zero if not set.  */
-int
-bitset_toggle_ (bset, bitno)
-    bitset bset;
-    bitset_bindex bitno;
+/* Toggle bit BITNO in bitset BSET and the new value of the bit.  */
+bool
+bitset_toggle_ (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);
 {
   /* This routine is for completeness.  It could be optimized if
      required.  */
   if (bitset_test (bset, bitno))
     {
       bitset_reset (bset, bitno);

-      return 0;
+      return false;

     }
   else
     {
       bitset_set (bset, bitno);
     }
   else
     {
       bitset_set (bset, bitno);

-      return 1;
+      return true;

     }
 }
 
 
     }
 }
 
 

+/* Return number of bits in bitset SRC.  */
+bitset_bindex
+bitset_size_ (bitset src)
+{
+    return BITSET_NBITS_ (src);
+}
+
+

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

-bitset_count_ (src)
-     bitset src;
+bitset_count_ (bitset src)

 {
   bitset_bindex list[BITSET_LIST_SIZE];
   bitset_bindex next;
   bitset_bindex num;
   bitset_bindex count;
 {
   bitset_bindex list[BITSET_LIST_SIZE];
   bitset_bindex next;
   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.  */


@@ -387,18 +377,16 @@ 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;
 }
 
 
   return count;
 }
 
 

-/* DST = SRC.  Return non-zero if DST != SRC. 
+/* DST = SRC.  Return true if DST != SRC.

    This is a fallback for the case where SRC and DST are different
    bitset types.  */
    This is a fallback for the case where SRC and DST are different
    bitset types.  */

-int
-bitset_copy_ (dst, src)
-     bitset dst;
-     bitset src;
+bool
+bitset_copy_ (bitset dst, bitset src)

 {
   bitset_bindex i;
   bitset_iterator iter;
 {
   bitset_bindex i;
   bitset_iterator iter;


@@ -411,32 +399,31 @@ bitset_copy_ (dst, src)
      bitset_set (dst, i);
   };
 
      bitset_set (dst, i);
   };
 

-  return 1;
+  return true;

 }
 
 
 /* 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.  */

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

 {
 {

-  int changed = 0;
-  int stats_enabled_save;
+  bool changed = false;
+  bool stats_enabled_save;

   bitset tmp;
 
   /* Create temporary bitset.  */
   stats_enabled_save = bitset_stats_enabled;
   bitset tmp;
 
   /* Create temporary bitset.  */
   stats_enabled_save = bitset_stats_enabled;

-  bitset_stats_enabled = 0;
+  bitset_stats_enabled = false;

   tmp = bitset_alloc (0, bitset_type_get (dst));
   bitset_stats_enabled = stats_enabled_save;
 
   switch (op)
     {
   tmp = bitset_alloc (0, bitset_type_get (dst));
   bitset_stats_enabled = stats_enabled_save;
 
   switch (op)
     {

+    default:
+      abort ();
+

     case BITSET_OP_OR_AND:
       bitset_or (tmp, src1, src2);
       changed = bitset_and_cmp (dst, src3, tmp);
     case BITSET_OP_OR_AND:
       bitset_or (tmp, src1, src2);
       changed = bitset_and_cmp (dst, src3, tmp);


@@ -451,9 +438,6 @@ bitset_op4_cmp (dst, src1, src2, src3, op)
       bitset_andn (tmp, src1, src2);
       changed = bitset_or_cmp (dst, src3, tmp);
       break;
       bitset_andn (tmp, src1, src2);
       changed = bitset_or_cmp (dst, src3, tmp);
       break;

-
-    default:
-      abort ();

     }
 
   bitset_free (tmp);
     }
 
   bitset_free (tmp);


@@ -463,11 +447,7 @@ bitset_op4_cmp (dst, src1, src2, src3, op)
 
 /* DST = (SRC1 & SRC2) | SRC3.  */
 void
 
 /* DST = (SRC1 & SRC2) | SRC3.  */
 void

-bitset_and_or_ (dst, src1, src2, src3)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
+bitset_and_or_ (bitset dst, bitset src1, bitset src2, bitset src3)

 {
   bitset_and_or_cmp_ (dst, src1, src2, src3);
 }
 {
   bitset_and_or_cmp_ (dst, src1, src2, src3);
 }


@@ -475,12 +455,8 @@ bitset_and_or_ (dst, src1, src2, src3)
 
 /* DST = (SRC1 & SRC2) | SRC3.  Return non-zero if
    DST != (SRC1 & SRC2) | SRC3.  */
 
 /* DST = (SRC1 & SRC2) | SRC3.  Return non-zero if
    DST != (SRC1 & SRC2) | SRC3.  */

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

 {
   return bitset_op4_cmp (dst, src1, src2, src3, BITSET_OP_AND_OR);
 }
 {
   return bitset_op4_cmp (dst, src1, src2, src3, BITSET_OP_AND_OR);
 }


@@ -488,11 +464,7 @@ bitset_and_or_cmp_ (dst, src1, src2, src3)
 
 /* DST = (SRC1 & ~SRC2) | SRC3.  */
 void
 
 /* DST = (SRC1 & ~SRC2) | SRC3.  */
 void

-bitset_andn_or_ (dst, src1, src2, src3)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
+bitset_andn_or_ (bitset dst, bitset src1, bitset src2, bitset src3)

 {
   bitset_andn_or_cmp_ (dst, src1, src2, src3);
 }
 {
   bitset_andn_or_cmp_ (dst, src1, src2, src3);
 }


@@ -500,12 +472,8 @@ bitset_andn_or_ (dst, src1, src2, src3)
 
 /* DST = (SRC1 & ~SRC2) | SRC3.  Return non-zero if
    DST != (SRC1 & ~SRC2) | SRC3.  */
 
 /* DST = (SRC1 & ~SRC2) | SRC3.  Return non-zero if
    DST != (SRC1 & ~SRC2) | SRC3.  */

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

 {
   return bitset_op4_cmp (dst, src1, src2, src3, BITSET_OP_ANDN_OR);
 }
 {
   return bitset_op4_cmp (dst, src1, src2, src3, BITSET_OP_ANDN_OR);
 }


@@ -513,11 +481,7 @@ bitset_andn_or_cmp_ (dst, src1, src2, src3)
 
 /* DST = (SRC1 | SRC2) & SRC3.  */
 void
 
 /* DST = (SRC1 | SRC2) & SRC3.  */
 void

-bitset_or_and_ (dst, src1, src2, src3)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
+bitset_or_and_ (bitset dst, bitset src1, bitset src2, bitset src3)

 {
   bitset_or_and_cmp_ (dst, src1, src2, src3);
 }
 {
   bitset_or_and_cmp_ (dst, src1, src2, src3);
 }


@@ -525,12 +489,8 @@ bitset_or_and_ (dst, src1, src2, src3)
 
 /* DST = (SRC1 | SRC2) & SRC3.  Return non-zero if
    DST != (SRC1 | SRC2) & SRC3.  */
 
 /* DST = (SRC1 | SRC2) & SRC3.  Return non-zero if
    DST != (SRC1 | SRC2) & SRC3.  */

-int
-bitset_or_and_cmp_ (dst, src1, src2, src3)
-     bitset dst;
-     bitset src1;
-     bitset src2;
-     bitset src3;
+bool
+bitset_or_and_cmp_ (bitset dst, bitset src1, bitset src2, bitset src3)

 {
   return bitset_op4_cmp (dst, src1, src2, src3, BITSET_OP_OR_AND);
 }
 {
   return bitset_op4_cmp (dst, src1, src2, src3, BITSET_OP_OR_AND);
 }


@@ -538,9 +498,8 @@ bitset_or_and_cmp_ (dst, src1, src2, src3)
 
 /* Function to be called from debugger to print bitset.  */
 void
 
 /* Function to be called from debugger to print bitset.  */
 void

-debug_bitset (bset)
-     bitset bset;
+debug_bitset (bitset bset)

 {
   if (bset)
 {
   if (bset)

-    bitset_print (stderr, bset, 1);
+    bitset_print (stderr, bset, true);

 }
 }