X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/fb9c0b3360928887038a296c338025ced68e2d8c..2bde91138d696cd5b05eeea61ebf709695ca695e:/lib/bitset.c?ds=inline diff --git a/lib/bitset.c b/lib/bitset.c index 24bfb879..ef4c6b27 100644 --- a/lib/bitset.c +++ b/lib/bitset.c @@ -1,10 +1,10 @@ /* General bitsets. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 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 +13,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 . */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include + +#include "bitset.h" #include #include -#include "bitset.h" #include "abitset.h" #include "lbitset.h" #include "ebitset.h" @@ -45,6 +43,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 +61,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 +76,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 +90,6 @@ bitset_init (bitset bset, bitset_bindex n_bits, enum bitset_type type) case BITSET_VARRAY: return vbitset_init (bset, n_bits); - - default: - abort (); } } @@ -303,7 +301,7 @@ bitset_print (FILE *file, bitset bset, bool verbose) { if (pos > 70) { - fputc ('\n', file); + fprintf (file, "\n"); pos = 0; } @@ -312,7 +310,7 @@ bitset_print (FILE *file, bitset bset, bool verbose) }; if (verbose) - fputs ("}\n", file); + fprintf (file, "}\n"); } @@ -421,6 +419,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 +436,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);