Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-19 01:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

bitset: clean up ebitset.c

Browse Source 
* lib/ebitset.c: Reduce scopes, etc.
This commit is contained in:
Akim Demaille
2018-10-27 18:46:59 +02:00
parent 9f6013a0fd
commit 5d5f12fb0d
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/ebitset.c
View File

@@ -22,10 +22,11 @@
#include "ebitset.h" #include "ebitset.h"
#include "obstack.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "obstack.h"
/* This file implements expandable bitsets. These bitsets can be of /* This file implements expandable bitsets. These bitsets can be of
arbitrary length and are more efficient than arrays of bits for arbitrary length and are more efficient than arrays of bits for
large sparse sets. large sparse sets.
@@ -73,7 +74,7 @@ typedef ebitset_elt *ebitset_elts;
/* Number of elements to initially allocate. */ /* Number of elements to initially allocate. */
#ifndef EBITSET_INITIAL_SIZE #ifndef EBITSET_INITIAL_SIZE
#define EBITSET_INITIAL_SIZE 2 # define EBITSET_INITIAL_SIZE 2
#endif #endif
@@ -131,8 +132,6 @@ ebitset_resize (bitset src, bitset_bindex n_bits)
if (oldsize < newsize) if (oldsize < newsize)
{ {
bitset_windex size;
/* The bitset needs to grow. If we already have enough memory /* The bitset needs to grow. If we already have enough memory
allocated, then just zero what we need. */ allocated, then just zero what we need. */
if (newsize > EBITSET_ASIZE (src)) if (newsize > EBITSET_ASIZE (src))
@@ -142,11 +141,7 @@ ebitset_resize (bitset src, bitset_bindex n_bits)
grow the bitset 25% larger than requested to reduce grow the bitset 25% larger than requested to reduce
number of reallocations. */ number of reallocations. */
if (oldsize == 0) bitset_windex size = oldsize == 0 ? newsize : newsize + newsize / 4;
size = newsize;
else
size = newsize + newsize / 4;
EBITSET_ELTS (src) EBITSET_ELTS (src)
= realloc (EBITSET_ELTS (src), size * sizeof (ebitset_elt *)); = realloc (EBITSET_ELTS (src), size * sizeof (ebitset_elt *));
EBITSET_ASIZE (src) = size; EBITSET_ASIZE (src) = size;
@@ -274,7 +269,6 @@ ebitset_elt_zero_p (ebitset_elt *elt)
for (int i = 0; i < EBITSET_ELT_WORDS; i++) for (int i = 0; i < EBITSET_ELT_WORDS; i++)
if (EBITSET_WORDS (elt)[i]) if (EBITSET_WORDS (elt)[i])
return false; return false;
return true; return true;
} }
@@ -378,7 +372,6 @@ ebitset_zero (bitset bset)
for (bitset_windex j = 0; j < EBITSET_SIZE (bset); j++) for (bitset_windex j = 0; j < EBITSET_SIZE (bset); j++)
{ {
ebitset_elt *elt = elts[j]; ebitset_elt *elt = elts[j];
if (elt) if (elt)
ebitset_elt_remove (bset, j); ebitset_elt_remove (bset, j);
} }
@@ -439,7 +432,6 @@ ebitset_copy_ (bitset dst, bitset src)
for (bitset_windex j = 0; j < EBITSET_SIZE (src); j++) for (bitset_windex j = 0; j < EBITSET_SIZE (src); j++)
{ {
ebitset_elt *selt = selts[j]; ebitset_elt *selt = selts[j];
if (selt) if (selt)
{ {
ebitset_elt *tmp = ebitset_elt_alloc (); ebitset_elt *tmp = ebitset_elt_alloc ();