Minor code cleanup.

[bison.git] / lib / bitset.h

diff --git a/lib/bitset.h b/lib/bitset.h
index c0e9decd2069edd74516a51bfb53d17942d5886e..07e1d9d62bf9e0faa850dd784254d8b0aba5df40 100644 (file)
--- a/lib/bitset.h
+++ b/lib/bitset.h
@@ -1,20 +1,19 @@
 /* Generic bitsets.
 /* Generic bitsets.

-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2009 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
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   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
+   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,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #ifndef _BITSET_H
 #define _BITSET_H
 
 #ifndef _BITSET_H
 #define _BITSET_H


@@ -23,19 +22,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    Only use the functions and macros defined in this file.  */
 
 #include "bbitset.h"
    Only use the functions and macros defined in this file.  */
 
 #include "bbitset.h"

-
-/* obstack.h tries to be portable to K&R compilers, but its
-   __INT_TO_PTR macro generates diagnostics on compilers like Tru64 cc
-   that define __STDC__ to 0 when not in strict ANSI mode.  The bitset
-   code assumes C89 or later, so it can avoid these glitches by
-   defining __INT_TO_PTR appropriately for C89 or later.  */
-#ifndef __INT_TO_PTR
-# define __INT_TO_PTR(P) ((void *) ((P) + (char *) 0))
-#endif

 #include "obstack.h"
 #include "obstack.h"

-

 #include <stdio.h>
 
 #include <stdio.h>
 

+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+

 /* Attributes used to select a bitset implementation.  */
 enum bitset_attr {BITSET_FIXED = 1,    /* Bitset size fixed.  */
                  BITSET_VARIABLE = 2, /* Bitset size variable.  */
 /* Attributes used to select a bitset implementation.  */
 enum bitset_attr {BITSET_FIXED = 1,    /* Bitset size fixed.  */
                  BITSET_VARIABLE = 2, /* Bitset size variable.  */


@@ -54,12 +47,11 @@ union bitset_union
 {
   /* This must be the first member of every other structure that is a
      member of this union.  */
 {
   /* This must be the first member of every other structure that is a
      member of this union.  */

-  struct bbitset_struct b;
+  struct bbitset_struct b;             /* Base bitset data.  */

 
   struct abitset_struct
   {
     struct bbitset_struct b;
 
   struct abitset_struct
   {
     struct bbitset_struct b;

-    bitset_bindex n_bits;              /* Number of bits.  */

     bitset_word words[1];              /* The array of bits.  */
   } a;
 
     bitset_word words[1];              /* The array of bits.  */
   } a;
 


@@ -82,6 +74,13 @@ union bitset_union
     struct bbitset_struct b;
     bitset bset;
   } s;
     struct bbitset_struct b;
     bitset bset;
   } s;

+
+  struct vbitset_struct
+  {
+    struct bbitset_struct b;
+    bitset_windex size;                        /* Allocated size of array.  */
+  } v;
+

 };
 
 
 };
 
 


@@ -97,38 +96,37 @@ typedef struct
 
 
 /* Return bytes required for bitset of desired type and size.  */
 
 
 /* Return bytes required for bitset of desired type and size.  */

-extern size_t bitset_bytes PARAMS ((enum bitset_type, bitset_bindex));
+extern size_t bitset_bytes (enum bitset_type, bitset_bindex);

 
 /* Initialise a bitset with desired type and size.  */
 
 /* Initialise a bitset with desired type and size.  */

-extern bitset bitset_init PARAMS ((bitset, bitset_bindex, enum bitset_type));
+extern bitset bitset_init (bitset, bitset_bindex, enum bitset_type);

 
 /* Select an implementation type based on the desired bitset size
    and attributes.  */
 
 /* Select an implementation type based on the desired bitset size
    and attributes.  */

-extern enum bitset_type bitset_type_choose PARAMS ((bitset_bindex,
-                                                   bitset_attrs));
+extern enum bitset_type bitset_type_choose (bitset_bindex, bitset_attrs);

 
 /* Create a bitset of desired type and size.  The bitset is zeroed.  */
 
 /* Create a bitset of desired type and size.  The bitset is zeroed.  */

-extern bitset bitset_alloc PARAMS ((bitset_bindex, enum bitset_type));
+extern bitset bitset_alloc (bitset_bindex, enum bitset_type);

 
 /* Free bitset.  */
 
 /* Free bitset.  */

-extern void bitset_free PARAMS ((bitset));
+extern void bitset_free (bitset);

 
 /* Create a bitset of desired type and size using an obstack.  The
    bitset is zeroed.  */
 
 /* Create a bitset of desired type and size using an obstack.  The
    bitset is zeroed.  */

-extern bitset bitset_obstack_alloc PARAMS ((struct obstack *bobstack,
-                                           bitset_bindex, enum bitset_type));
+extern bitset bitset_obstack_alloc (struct obstack *bobstack,
+                                   bitset_bindex, enum bitset_type);

 
 /* Free bitset allocated on obstack.  */
 
 /* Free bitset allocated on obstack.  */

-extern void bitset_obstack_free PARAMS ((bitset));
+extern void bitset_obstack_free (bitset);

 
 /* Create a bitset of desired size and attributes.  The bitset is zeroed.  */
 
 /* Create a bitset of desired size and attributes.  The bitset is zeroed.  */

-extern bitset bitset_create PARAMS ((bitset_bindex, bitset_attrs));
+extern bitset bitset_create (bitset_bindex, bitset_attrs);

 
 /* Return bitset type.  */
 
 /* Return bitset type.  */

-extern enum bitset_type bitset_type_get PARAMS ((bitset));
+extern enum bitset_type bitset_type_get (bitset);

 
 /* Return bitset type name.  */
 
 /* Return bitset type name.  */

-extern const char *bitset_type_name_get PARAMS ((bitset));
+extern const char *bitset_type_name_get (bitset);

 
 
 /* Set bit BITNO in bitset BSET.  */
 
 
 /* Set bit BITNO in bitset BSET.  */


@@ -160,7 +158,7 @@ bitset_reset (bitset bset, bitset_bindex bitno)
 
 
 /* Test bit BITNO in bitset BSET.  */
 
 
 /* Test bit BITNO in bitset BSET.  */

-static inline int
+static inline bool

 bitset_test (bitset bset, bitset_bindex bitno)
 {
   bitset_windex windex = bitno / BITSET_WORD_BITS;
 bitset_test (bitset bset, bitset_bindex bitno)
 {
   bitset_windex windex = bitno / BITSET_WORD_BITS;


@@ -179,6 +177,9 @@ bitset_test (bitset bset, bitset_bindex bitno)
 /* Return size in bits of bitset SRC.  */
 #define bitset_size(SRC) BITSET_SIZE_ (SRC)
 
 /* Return size in bits of bitset SRC.  */
 #define bitset_size(SRC) BITSET_SIZE_ (SRC)
 

+/* Change size of bitset.  */
+extern void bitset_resize (bitset, bitset_bindex);
+

 /* Return number of bits set in bitset SRC.  */
 #define bitset_count(SRC) BITSET_COUNT_ (SRC)
 
 /* Return number of bits set in bitset SRC.  */
 #define bitset_count(SRC) BITSET_COUNT_ (SRC)
 


@@ -276,26 +277,28 @@ bitset_test (bitset bset, bitset_bindex bitno)
 #define bitset_list_reverse(BSET, LIST, NUM, NEXT) \
  BITSET_LIST_REVERSE_ (BSET, LIST, NUM, NEXT)
 
 #define bitset_list_reverse(BSET, LIST, NUM, NEXT) \
  BITSET_LIST_REVERSE_ (BSET, LIST, NUM, NEXT)
 

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

 
 

-/* Find next set bit.  */
-extern bitset_bindex bitset_next PARAMS ((bitset, bitset_bindex));
+/* Find next set bit from the given bit index.  */
+extern bitset_bindex bitset_next (bitset, bitset_bindex);

 
 

-/* Find previous set bit.  */
-extern bitset_bindex bitset_prev PARAMS ((bitset, bitset_bindex));
+/* Find previous set bit from the given bit index.  */
+extern bitset_bindex bitset_prev (bitset, bitset_bindex);

 
 /* Find first set bit.  */
 
 /* Find first set bit.  */

-extern bitset_bindex bitset_first PARAMS ((bitset));
+extern bitset_bindex bitset_first (bitset);

 
 /* Find last set bit.  */
 
 /* Find last set bit.  */

-extern bitset_bindex bitset_last PARAMS ((bitset));
+extern bitset_bindex bitset_last (bitset);

 
 /* Return nonzero if this is the only set bit.  */
 
 /* Return nonzero if this is the only set bit.  */

-extern int bitset_only_set_p PARAMS ((bitset, bitset_bindex));
+extern bool bitset_only_set_p (bitset, bitset_bindex);

 
 /* Dump bitset.  */
 
 /* Dump bitset.  */

-extern void bitset_dump PARAMS ((FILE *, bitset));
+extern void bitset_dump (FILE *, bitset);

 
 

-/* Loop over all elements of BSET, starting with MIN, setting BIT
+/* Loop over all elements of BSET, starting with MIN, setting INDEX

    to the index of each set bit.  For example, the following will print
    the bits set in a bitset:
 
    to the index of each set bit.  For example, the following will print
    the bits set in a bitset:
 


@@ -304,21 +307,21 @@ extern void bitset_dump PARAMS ((FILE *, bitset));
 
    BITSET_FOR_EACH (iter, src, i, 0)
    {
 
    BITSET_FOR_EACH (iter, src, i, 0)
    {

-      printf ("%ld ", i);
+      printf ("%lu ", (unsigned long int) i);

    };
 */
    };
 */

-#define BITSET_FOR_EACH(ITER, BSET, BIT, MIN)                                \
+#define BITSET_FOR_EACH(ITER, BSET, INDEX, MIN)                                      \

   for (ITER.next = (MIN), ITER.num = BITSET_LIST_SIZE;                       \
   for (ITER.next = (MIN), ITER.num = BITSET_LIST_SIZE;                       \

-       (ITER.num == BITSET_LIST_SIZE)                                        \
-       && (ITER.num = bitset_list (BSET, ITER.list,                          \
+       (ITER.num == BITSET_LIST_SIZE)                                        \
+       && (ITER.num = bitset_list (BSET, ITER.list,                          \

                                   BITSET_LIST_SIZE, &ITER.next));)           \
     for (ITER.i = 0;                                                         \
                                   BITSET_LIST_SIZE, &ITER.next));)           \
     for (ITER.i = 0;                                                         \

-        ITER.i < ITER.num && ((BIT) = ITER.list[ITER.i], 1);                 \
+        ITER.i < ITER.num && ((INDEX) = ITER.list[ITER.i], 1);               \

         ITER.i++)
 
 
 /* Loop over all elements of BSET, in reverse order starting with
         ITER.i++)
 
 
 /* Loop over all elements of BSET, in reverse order starting with

-   MIN,  setting BIT to the index of each set bit. For example, the
+   MIN, setting INDEX to the index of each set bit.  For example, the

    following will print the bits set in a bitset in reverse order:
 
    bitset_bindex i;
    following will print the bits set in a bitset in reverse order:
 
    bitset_bindex i;


@@ -326,16 +329,16 @@ extern void bitset_dump PARAMS ((FILE *, bitset));
 
    BITSET_FOR_EACH_REVERSE (iter, src, i, 0)
    {
 
    BITSET_FOR_EACH_REVERSE (iter, src, i, 0)
    {

-      printf ("%ld ", i);
+      printf ("%lu ", (unsigned long int) i);

    };
 */
    };
 */

-#define BITSET_FOR_EACH_REVERSE(ITER, BSET, BIT, MIN)                        \
+#define BITSET_FOR_EACH_REVERSE(ITER, BSET, INDEX, MIN)                              \

   for (ITER.next = (MIN), ITER.num = BITSET_LIST_SIZE;                       \
   for (ITER.next = (MIN), ITER.num = BITSET_LIST_SIZE;                       \

-       (ITER.num == BITSET_LIST_SIZE)                                        \
+       (ITER.num == BITSET_LIST_SIZE)                                        \

        && (ITER.num = bitset_list_reverse (BSET, ITER.list,                  \
        && (ITER.num = bitset_list_reverse (BSET, ITER.list,                  \

-                                         BITSET_LIST_SIZE, &ITER.next));)    \
+                                          BITSET_LIST_SIZE, &ITER.next));)   \

     for (ITER.i = 0;                                                         \
     for (ITER.i = 0;                                                         \

-        ITER.i < ITER.num && ((BIT) = ITER.list[ITER.i], 1);                 \
+        ITER.i < ITER.num && ((INDEX) = ITER.list[ITER.i], 1);               \

         ITER.i++)
 
 
         ITER.i++)
 
 


@@ -361,30 +364,28 @@ extern void bitset_dump PARAMS ((FILE *, bitset));
   bitset_andn_or_cmp (DST, SRC1, SRC2, SRC3)
 
 
   bitset_andn_or_cmp (DST, SRC1, SRC2, SRC3)
 
 

-

 /* Release any memory tied up with bitsets.  */
 /* Release any memory tied up with bitsets.  */

-extern void bitset_release_memory PARAMS ((void));
+extern void bitset_release_memory (void);

 
 /* Enable bitset stats gathering.  */
 
 /* Enable bitset stats gathering.  */

-extern void bitset_stats_enable PARAMS ((void));
+extern void bitset_stats_enable (void);

 
 /* Disable bitset stats gathering.  */
 
 /* Disable bitset stats gathering.  */

-extern void bitset_stats_disable PARAMS ((void));
+extern void bitset_stats_disable (void);

 
 /* Read bitset stats file of accummulated stats.  */
 
 /* Read bitset stats file of accummulated stats.  */

-void bitset_stats_read PARAMS ((const char *filename));
+void bitset_stats_read (const char *file_name);

 
 /* Write bitset stats file of accummulated stats.  */
 
 /* Write bitset stats file of accummulated stats.  */

-void bitset_stats_write PARAMS ((const char *filename));
+void bitset_stats_write (const char *file_name);

 
 /* Dump bitset stats.  */
 
 /* Dump bitset stats.  */

-extern void bitset_stats_dump PARAMS ((FILE *));
+extern void bitset_stats_dump (FILE *);

 
 /* Function to debug bitset from debugger.  */
 
 /* Function to debug bitset from debugger.  */

-extern void debug_bitset PARAMS ((bitset));
+extern void debug_bitset (bitset);

 
 /* Function to debug bitset stats from debugger.  */
 
 /* Function to debug bitset stats from debugger.  */

-extern void debug_bitset_stats PARAMS ((void));
+extern void debug_bitset_stats (void);

 
 #endif /* _BITSET_H  */
 
 #endif /* _BITSET_H  */

-