X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4d1801f1a888fc5687ae103fb76935ef0d24cbaf..0fe9720964da510a2b359af390a3053aace65f9f:/lib/bitset.c?ds=sidebyside diff --git a/lib/bitset.c b/lib/bitset.c index 0cc3ee53..d8b5f092 100644 --- a/lib/bitset.c +++ b/lib/bitset.c @@ -1,10 +1,12 @@ /* General bitsets. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + + Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc. + 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 - 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, @@ -13,16 +15,14 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ + +#include -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "bitset.h" #include #include -#include "bitset.h" #include "abitset.h" #include "lbitset.h" #include "ebitset.h" @@ -45,6 +45,9 @@ bitset_bytes (enum bitset_type type, bitset_bindex n_bits) switch (type) { + default: + abort (); + case BITSET_ARRAY: bytes = abitset_bytes (n_bits); break; @@ -60,9 +63,6 @@ bitset_bytes (enum bitset_type type, bitset_bindex n_bits) case BITSET_VARRAY: bytes = vbitset_bytes (n_bits); break; - - default: - abort (); } return bytes; @@ -78,6 +78,9 @@ bitset_init (bitset bset, bitset_bindex n_bits, enum bitset_type type) switch (type) { + default: + abort (); + case BITSET_ARRAY: return abitset_init (bset, n_bits); @@ -89,9 +92,6 @@ bitset_init (bitset bset, bitset_bindex n_bits, enum bitset_type type) case BITSET_VARRAY: return vbitset_init (bset, n_bits); - - default: - abort (); } } @@ -138,7 +138,7 @@ bitset_alloc (bitset_bindex n_bits, enum bitset_type type) 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 @@ -151,7 +151,7 @@ bitset_alloc (bitset_bindex n_bits, enum bitset_type type) /* Create a bitset of N_BITS of type TYPE. */ bitset bitset_obstack_alloc (struct obstack *bobstack, - bitset_bindex n_bits, enum bitset_type type) + bitset_bindex n_bits, enum bitset_type type) { size_t bytes; bitset bset; @@ -296,15 +296,15 @@ bitset_print (FILE *file, bitset bset, bool verbose) if (verbose) fprintf (file, "n_bits = %lu, set = {", - (unsigned long int) bitset_size (bset)); + (unsigned long int) bitset_size (bset)); pos = 30; BITSET_FOR_EACH (iter, bset, i, 0) { if (pos > 70) { - fprintf (file, "\n"); - pos = 0; + fprintf (file, "\n"); + pos = 0; } fprintf (file, "%lu ", (unsigned long int) i); @@ -407,7 +407,7 @@ bitset_copy_ (bitset dst, bitset src) four operand operations. */ static inline bool bitset_op4_cmp (bitset dst, bitset src1, bitset src2, bitset src3, - enum bitset_ops op) + enum bitset_ops op) { bool changed = false; bool stats_enabled_save; @@ -421,6 +421,9 @@ bitset_op4_cmp (bitset dst, bitset src1, bitset src2, bitset src3, switch (op) { + default: + abort (); + case BITSET_OP_OR_AND: bitset_or (tmp, src1, src2); changed = bitset_and_cmp (dst, src3, tmp); @@ -435,9 +438,6 @@ bitset_op4_cmp (bitset dst, bitset src1, bitset src2, bitset src3, bitset_andn (tmp, src1, src2); changed = bitset_or_cmp (dst, src3, tmp); break; - - default: - abort (); } bitset_free (tmp);