mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-15 02:00:22 +02:00
Code Activity

Require vector argument to scm_vector_elements, scm_vector_writable_elements

Browse source 
* libguile/vectors.c (scm_vector_elements, scm_vector_writable_elements): As
  stated.
* libguile/sort.c: Fix usage of scm_vector_elements on possibly non-vector
  array.
* doc/ref/api-data.texi (scm_vector_elements): Remove mention of non-vector
  arrays.
This commit is contained in:
Daniel Llorens 2020-02-03 13:04:13 +01:00
parent fa19f702f6
commit 996bbb47f2
3 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libguile/vectors.c
View file

@ -64,34 +64,42 @@ scm_is_simple_vector (SCM obj)
const SCM *
scm_vector_elements (SCM vec, scm_t_array_handle *h,
size_t *lenp, ssize_t *incp)
#define FUNC_NAME "scm_vector_elements"
{
SCM_VALIDATE_VECTOR (1, vec);
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 array of Scheme values");
}
if (lenp)
{
scm_t_array_dim *dim = scm_array_handle_dims (h);
*lenp = dim->ubnd - dim->lbnd + 1;
*incp = dim->inc;
}
if (incp)
*incp = 1;
return scm_array_handle_elements (h);
}
#undef FUNC_NAME
SCM *
scm_vector_writable_elements (SCM vec, scm_t_array_handle *h,
size_t *lenp, ssize_t *incp)
#define FUNC_NAME "scm_vector_writable_elements"
{
const SCM *ret = scm_vector_elements (vec, h, lenp, incp);
if (h->writable_elements != h->elements)
scm_wrong_type_arg_msg (NULL, 0, vec, "mutable vector");
return (SCM *) ret;
SCM_VALIDATE_MUTABLE_VECTOR (1, vec);
scm_array_get_handle (vec, h);
if (lenp)
{
scm_t_array_dim *dim = scm_array_handle_dims (h);
*lenp = dim->ubnd - dim->lbnd + 1;
}
if (incp)
*incp = 1;
return scm_array_handle_writable_elements (h);
}
#undef FUNC_NAME
SCM_DEFINE (scm_vector_p, "vector?", 1, 0, 0,
(SCM obj),