mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-20 10:40:19 +02:00
Code Activity

Simplify interfaces to scm_bitvector_elements and scm_bitvector_writable_elements

Browse source 
Doc fixes & tests TBD.

* libguile/bitvector.h: As stated.
* libguile/bitvector.c: Fix uses of scm_bitvector_elements,
  scm_bitvector_writable_elements.
* libguile/array-handle.c: scm_array1_bit_elements,
  scm_array1_bit_writable_elements: New functions.
* libguile/array-handle.h: Publish the new functions.
* libguile/posix.c: Fix use of scm_bitvector_elements.
This commit is contained in:
Daniel Llorens 2020-02-05 12:44:58 +01:00
parent eb2d2c1a41
commit ef0579492a
6 changed files with 173 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

66
libguile/array-handle.c
View file

@ -351,6 +351,72 @@ scm_array_handle_writable_elements (scm_t_array_handle *h)
return (SCM *) scm_array_handle_elements (h);
}
// -----------------------------------------------
// FIXME adding scm_array1_xxx_(writable_)elements
// -----------------------------------------------
const uint32_t *
scm_array1_bit_elements (SCM vec, size_t *lenp, ssize_t *incp, size_t *offp)
{
scm_t_array_handle h;
scm_array_get_handle (vec, &h);
if (1 != scm_array_handle_rank (&h))
{
scm_array_handle_release (&h);
scm_wrong_type_arg_msg (NULL, 0, vec, "rank 1 bit array");
}
else if (scm_is_bitvector (h.array))
{
scm_t_array_dim *dim = scm_array_handle_dims (&h);
if (offp)
*offp = scm_array_handle_bit_elements_offset (&h);
if (lenp)
*lenp = dim->ubnd - dim->lbnd + 1;
if (incp)
*incp = dim->inc;
const uint32_t * val = ((const uint32_t *) h.elements) + h.base/32;
scm_array_handle_release (&h);
return val;
}
else
{
scm_array_handle_release (&h);
scm_wrong_type_arg_msg (NULL, 0, vec, "rank 1 bit array");
}
}
uint32_t *
scm_array1_bit_writable_elements (SCM vec, size_t *lenp, ssize_t *incp, size_t *offp)
{
scm_t_array_handle h;
scm_array_get_handle (vec, &h);
if (1 != scm_array_handle_rank (&h))
{
scm_array_handle_release (&h);
scm_wrong_type_arg_msg (NULL, 0, vec, "rank 1 mutable bit array");
}
else if (scm_i_is_mutable_bitvector (h.array))
{
scm_t_array_dim *dim = scm_array_handle_dims (&h);
if (offp)
*offp = scm_array_handle_bit_elements_offset (&h);
if (lenp)
*lenp = dim->ubnd - dim->lbnd + 1;
if (incp)
*incp = dim->inc;
uint32_t * val = ((uint32_t *) h.elements) + h.base/32;
scm_array_handle_release (&h);
return val;
}
else
{
scm_array_handle_release (&h);
scm_wrong_type_arg_msg (NULL, 0, vec, "rank 1 mutable bit array");
}
}
void
scm_init_array_handle (void)
{