diff options
author | Daniel Llorens <lloda@sarc.name> | 2021-08-16 15:26:24 +0200 |
---|---|---|
committer | Daniel Llorens <lloda@sarc.name> | 2021-08-16 15:39:21 +0200 |
commit | c2cf685b65ee652600ecd914d86e8a00e750b4da (patch) | |
tree | 1b1f70f48b552ccf1c6d1638800631c46e8fa767 /libguile/vectors.c | |
parent | b4a80f4239b19fea4d2cc3e9d197f24b809f0624 (diff) | |
download | guile-c2cf685b65ee652600ecd914d86e8a00e750b4da.tar.gz |
Remove the 'simple vector' concept
* Deprecate scm_is_simple_vector.
* libguile/vectors.c (scm_vector_elements,
scm_vector_writable_elements): These functions take an array; reword
to make this clear.
* libguile/print.h: Remove reference to 'simple vector'.
* doc/ref/api-data.texi: Remove documentation for scm_is_simple_vector.
Remove references to 'simple vector'.
Fix documentation for scm_vector_elements,
scm_vector_writable_elements.
* test-suite/tests/arrays.test:
* test-suite/tests/vectors.test: Remove references to 'simple vector'.
Diffstat (limited to 'libguile/vectors.c')
-rw-r--r-- | libguile/vectors.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/libguile/vectors.c b/libguile/vectors.c index 40e80ddd2..a71f51e28 100644 --- a/libguile/vectors.c +++ b/libguile/vectors.c @@ -55,21 +55,15 @@ scm_is_vector (SCM obj) return SCM_I_IS_VECTOR (obj); } -int -scm_is_simple_vector (SCM obj) -{ - return SCM_I_IS_VECTOR (obj); -} - const SCM * -scm_vector_elements (SCM vec, scm_t_array_handle *h, +scm_vector_elements (SCM array, scm_t_array_handle *h, size_t *lenp, ssize_t *incp) { - scm_array_get_handle (vec, h); + scm_array_get_handle (array, 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"); + scm_wrong_type_arg_msg (NULL, 0, array, "rank 1 array of Scheme values"); } if (lenp) @@ -82,13 +76,13 @@ scm_vector_elements (SCM vec, scm_t_array_handle *h, } SCM * -scm_vector_writable_elements (SCM vec, scm_t_array_handle *h, +scm_vector_writable_elements (SCM array, scm_t_array_handle *h, size_t *lenp, ssize_t *incp) { - const SCM *ret = scm_vector_elements (vec, h, lenp, incp); + const SCM *ret = scm_vector_elements (array, h, lenp, incp); if (h->writable_elements != h->elements) - scm_wrong_type_arg_msg (NULL, 0, vec, "mutable vector"); + scm_wrong_type_arg_msg (NULL, 0, array, "mutable rank 1 array of Scheme values"); return (SCM *) ret; } |