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

Simplify interfaces to scm_TYPEvector_(writable_)elements

Browse source 
Nothing is lost in these since the functions already required true typed
vectors, the extra arguments didn't serve any purpose.

Changing my mind from (vec) to (vec, lenp), though. Will fix
vector/bitvector next.

* libguile/srfi-4.h: scm_TYPEvector_(writable_)elements take (vec, lenp).
* libguile/srfi-4.c: Fix implementation.
* libguile/bitvectors.c: Fix use.
* test-suite/standalone/test-srfi-4.c: Fix old test and write variant
  with full array handle interface.
* doc/ref/srfi-modules.texi: Fix doc for srfi-4
  scm_TYPEvector_(writable_)elements.
This commit is contained in:
Daniel Llorens 2020-02-05 14:40:19 +01:00
parent e3795a39fa
commit 04c80519bf
6 changed files with 106 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

29
libguile/bitvectors.c
View file

@ -607,19 +607,12 @@ SCM_DEFINE (scm_bit_set_star_x, "bit-set*!", 3, 0, 0,
bitset_ (v_bits, v_off+i*v_inc, bit);
}
}
/* FIXME This requires a true u32vector so handle, inc, etc. are superfluous */
else if (scm_is_true (scm_u32vector_p (kv)))
{
scm_t_array_handle kv_handle;
size_t i, kv_len;
ssize_t kv_inc;
const uint32_t *kv_elts;
kv_elts = scm_u32vector_elements (kv, &kv_handle, &kv_len, &kv_inc);
for (i = 0; i < kv_len; i++, kv_elts += kv_inc)
bitset_ (v_bits, v_off+(*kv_elts)*v_inc, bit);
scm_array_handle_release (&kv_handle);
size_t kv_len;
const uint32_t *kv_elts = scm_u32vector_elements (kv, &kv_len);
for (size_t i = 0; i < kv_len; i++)
bitset_ (v_bits, v_off+(kv_elts[i])*v_inc, bit);
}
else
scm_wrong_type_arg_msg (NULL, 0, kv, "bitvector or u32vector");
@ -693,20 +686,14 @@ SCM_DEFINE (scm_bit_count_star, "bit-count*", 3, 0, 0,
/* FIXME This requires a true u32vector so handle, inc, etc. are superfluous */
else if (scm_is_true (scm_u32vector_p (kv)))
{
scm_t_array_handle kv_handle;
size_t i, kv_len;
ssize_t kv_inc;
const uint32_t *kv_elts;
kv_elts = scm_u32vector_elements (kv, &kv_handle, &kv_len, &kv_inc);
for (i = 0; i < kv_len; i++, kv_elts += kv_inc)
size_t kv_len;
const uint32_t *kv_elts = scm_u32vector_elements (kv, &kv_len);
for (size_t i = 0; i < kv_len; i++)
{
bool elt = bitref_ (v_bits, v_off+(*kv_elts)*v_inc);
bool elt = bitref_ (v_bits, v_off+(kv_elts[i])*v_inc);
if ((bit && elt) || (!bit && !elt))
count++;
}
scm_array_handle_release (&kv_handle);
}
else
scm_wrong_type_arg_msg (NULL, 0, kv, "bitvector or u32vector");

21
libguile/srfi-4.c
View file

@ -134,28 +134,21 @@
scm_wrong_type_arg_msg (NULL, 0, h->array, "mutable " #tag "vector"); \
return (ctype *) scm_array_handle_##tag##_elements (h); \
} \
const ctype *scm_##tag##vector_elements (SCM uvec, \
scm_t_array_handle *h, \
size_t *lenp, ssize_t *incp) \
const ctype *scm_##tag##vector_elements (SCM uvec, size_t *lenp) \
{ \
size_t byte_width = width * sizeof (ctype); \
if (!scm_is_bytevector (uvec) \
|| (scm_c_bytevector_length (uvec) % byte_width)) \
scm_wrong_type_arg_msg (NULL, 0, uvec, #tag "vector"); \
scm_array_get_handle (uvec, h); \
if (lenp) \
*lenp = scm_c_bytevector_length (uvec) / byte_width; \
if (incp) \
*incp = 1; \
return ((const ctype *) h->elements); \
*lenp = SCM_BYTEVECTOR_LENGTH (uvec) / byte_width; \
return ((const ctype *) SCM_BYTEVECTOR_CONTENTS(uvec)); \
} \
ctype *scm_##tag##vector_writable_elements (SCM uvec, \
scm_t_array_handle *h, \
size_t *lenp, ssize_t *incp) \
ctype *scm_##tag##vector_writable_elements (SCM uvec, size_t *lenp) \
{ \
const ctype *ret = scm_##tag##vector_elements (uvec, h, lenp, incp);\
if (h->writable_elements != h->elements) \
scm_wrong_type_arg_msg (NULL, 0, h->array, "mutable " #tag "vector"); \
const ctype *ret = scm_##tag##vector_elements (uvec, lenp); \
if (!SCM_MUTABLE_BYTEVECTOR_P (uvec)) \
scm_wrong_type_arg_msg (NULL, 0, uvec, "mutable " #tag "vector"); \
return (ctype *) ret; \
}

111
libguile/srfi-4.h
View file

@ -42,13 +42,8 @@ SCM_API SCM scm_list_to_u8vector (SCM l);
SCM_API SCM scm_any_to_u8vector (SCM obj);
SCM_API const uint8_t *scm_array_handle_u8_elements (scm_t_array_handle *h);
SCM_API uint8_t *scm_array_handle_u8_writable_elements (scm_t_array_handle *h);
SCM_API const uint8_t *scm_u8vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp, ssize_t *incp);
SCM_API uint8_t *scm_u8vector_writable_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API const uint8_t *scm_u8vector_elements (SCM uvec, size_t *lenp);
SCM_API uint8_t *scm_u8vector_writable_elements (SCM uvec, size_t *lenp);
SCM_API SCM scm_s8vector_p (SCM obj);
SCM_API SCM scm_make_s8vector (SCM n, SCM fill);
@ -62,13 +57,8 @@ SCM_API SCM scm_list_to_s8vector (SCM l);
SCM_API SCM scm_any_to_s8vector (SCM obj);
SCM_API const int8_t *scm_array_handle_s8_elements (scm_t_array_handle *h);
SCM_API int8_t *scm_array_handle_s8_writable_elements (scm_t_array_handle *h);
SCM_API const int8_t *scm_s8vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp, ssize_t *incp);
SCM_API int8_t *scm_s8vector_writable_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API const int8_t *scm_s8vector_elements (SCM uvec, size_t *lenp);
SCM_API int8_t *scm_s8vector_writable_elements (SCM uvec, size_t *lenp);
SCM_API SCM scm_u16vector_p (SCM obj);
SCM_API SCM scm_make_u16vector (SCM n, SCM fill);
@ -82,14 +72,8 @@ SCM_API SCM scm_list_to_u16vector (SCM l);
SCM_API SCM scm_any_to_u16vector (SCM obj);
SCM_API const uint16_t *scm_array_handle_u16_elements (scm_t_array_handle *h);
SCM_API uint16_t *scm_array_handle_u16_writable_elements (scm_t_array_handle *h);
SCM_API const uint16_t *scm_u16vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API uint16_t *scm_u16vector_writable_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API const uint16_t *scm_u16vector_elements (SCM uvec, size_t *lenp);
SCM_API uint16_t *scm_u16vector_writable_elements (SCM uvec, size_t *lenp);
SCM_API SCM scm_s16vector_p (SCM obj);
SCM_API SCM scm_make_s16vector (SCM n, SCM fill);
@ -103,13 +87,8 @@ SCM_API SCM scm_list_to_s16vector (SCM l);
SCM_API SCM scm_any_to_s16vector (SCM obj);
SCM_API const int16_t *scm_array_handle_s16_elements (scm_t_array_handle *h);
SCM_API int16_t *scm_array_handle_s16_writable_elements (scm_t_array_handle *h);
SCM_API const int16_t *scm_s16vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp, ssize_t *incp);
SCM_API int16_t *scm_s16vector_writable_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API const int16_t *scm_s16vector_elements (SCM uvec, size_t *lenp);
SCM_API int16_t *scm_s16vector_writable_elements (SCM uvec, size_t *lenp);
SCM_API SCM scm_u32vector_p (SCM obj);
SCM_API SCM scm_make_u32vector (SCM n, SCM fill);
@ -123,14 +102,8 @@ SCM_API SCM scm_list_to_u32vector (SCM l);
SCM_API SCM scm_any_to_u32vector (SCM obj);
SCM_API const uint32_t *scm_array_handle_u32_elements (scm_t_array_handle *h);
SCM_API uint32_t *scm_array_handle_u32_writable_elements (scm_t_array_handle *h);
SCM_API const uint32_t *scm_u32vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API uint32_t *scm_u32vector_writable_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API const uint32_t *scm_u32vector_elements (SCM uvec, size_t *lenp);
SCM_API uint32_t *scm_u32vector_writable_elements (SCM uvec, size_t *lenp);
SCM_API SCM scm_s32vector_p (SCM obj);
SCM_API SCM scm_make_s32vector (SCM n, SCM fill);
@ -144,13 +117,8 @@ SCM_API SCM scm_list_to_s32vector (SCM l);
SCM_API SCM scm_any_to_s32vector (SCM obj);
SCM_API const int32_t *scm_array_handle_s32_elements (scm_t_array_handle *h);
SCM_API int32_t *scm_array_handle_s32_writable_elements (scm_t_array_handle *h);
SCM_API const int32_t *scm_s32vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp, ssize_t *incp);
SCM_API int32_t *scm_s32vector_writable_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API const int32_t *scm_s32vector_elements (SCM uvec, size_t *lenp);
SCM_API int32_t *scm_s32vector_writable_elements (SCM uvec, size_t *lenp);
SCM_API SCM scm_u64vector_p (SCM obj);
SCM_API SCM scm_make_u64vector (SCM n, SCM fill);
@ -165,14 +133,8 @@ SCM_API SCM scm_any_to_u64vector (SCM obj);
SCM_API SCM scm_take_u64vector (uint64_t *data, size_t n);
SCM_API const uint64_t *scm_array_handle_u64_elements (scm_t_array_handle *h);
SCM_API uint64_t *scm_array_handle_u64_writable_elements (scm_t_array_handle *h);
SCM_API const uint64_t *scm_u64vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API uint64_t *scm_u64vector_writable_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API const uint64_t *scm_u64vector_elements (SCM uvec, size_t *lenp);
SCM_API uint64_t *scm_u64vector_writable_elements (SCM uvec, size_t *lenp);
SCM_API SCM scm_s64vector_p (SCM obj);
SCM_API SCM scm_make_s64vector (SCM n, SCM fill);
@ -187,13 +149,8 @@ SCM_API SCM scm_any_to_s64vector (SCM obj);
SCM_API SCM scm_take_s64vector (int64_t *data, size_t n);
SCM_API const int64_t *scm_array_handle_s64_elements (scm_t_array_handle *h);
SCM_API int64_t *scm_array_handle_s64_writable_elements (scm_t_array_handle *h);
SCM_API const int64_t *scm_s64vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp, ssize_t *incp);
SCM_API int64_t *scm_s64vector_writable_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API const int64_t *scm_s64vector_elements (SCM uvec, size_t *lenp);
SCM_API int64_t *scm_s64vector_writable_elements (SCM uvec, size_t *lenp);
SCM_API SCM scm_f32vector_p (SCM obj);
SCM_API SCM scm_make_f32vector (SCM n, SCM fill);
@ -207,13 +164,8 @@ SCM_API SCM scm_list_to_f32vector (SCM l);
SCM_API SCM scm_any_to_f32vector (SCM obj);
SCM_API const float *scm_array_handle_f32_elements (scm_t_array_handle *h);
SCM_API float *scm_array_handle_f32_writable_elements (scm_t_array_handle *h);
SCM_API const float *scm_f32vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp, ssize_t *incp);
SCM_API float *scm_f32vector_writable_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API const float *scm_f32vector_elements (SCM uvec, size_t *lenp);
SCM_API float *scm_f32vector_writable_elements (SCM uvec, size_t *lenp);
SCM_API SCM scm_f64vector_p (SCM obj);
SCM_API SCM scm_make_f64vector (SCM n, SCM fill);
@ -227,13 +179,8 @@ SCM_API SCM scm_list_to_f64vector (SCM l);
SCM_API SCM scm_any_to_f64vector (SCM obj);
SCM_API const double *scm_array_handle_f64_elements (scm_t_array_handle *h);
SCM_API double *scm_array_handle_f64_writable_elements (scm_t_array_handle *h);
SCM_API const double *scm_f64vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp, ssize_t *incp);
SCM_API double *scm_f64vector_writable_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API const double *scm_f64vector_elements (SCM uvec, size_t *lenp);
SCM_API double *scm_f64vector_writable_elements (SCM uvec, size_t *lenp);
SCM_API SCM scm_c32vector_p (SCM obj);
SCM_API SCM scm_make_c32vector (SCM n, SCM fill);
@ -247,13 +194,8 @@ SCM_API SCM scm_list_to_c32vector (SCM l);
SCM_API SCM scm_any_to_c32vector (SCM obj);
SCM_API const float *scm_array_handle_c32_elements (scm_t_array_handle *h);
SCM_API float *scm_array_handle_c32_writable_elements (scm_t_array_handle *h);
SCM_API const float *scm_c32vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp, ssize_t *incp);
SCM_API float *scm_c32vector_writable_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API const float *scm_c32vector_elements (SCM uvec, size_t *lenp);
SCM_API float *scm_c32vector_writable_elements (SCM uvec, size_t *lenp);
SCM_API SCM scm_c64vector_p (SCM obj);
SCM_API SCM scm_make_c64vector (SCM n, SCM fill);
@ -267,13 +209,8 @@ SCM_API SCM scm_list_to_c64vector (SCM l);
SCM_API SCM scm_any_to_c64vector (SCM obj);
SCM_API const double *scm_array_handle_c64_elements (scm_t_array_handle *h);
SCM_API double *scm_array_handle_c64_writable_elements (scm_t_array_handle *h);
SCM_API const double *scm_c64vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp, ssize_t *incp);
SCM_API double *scm_c64vector_writable_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp,
ssize_t *incp);
SCM_API const double *scm_c64vector_elements (SCM uvec, size_t *lenp);
SCM_API double *scm_c64vector_writable_elements (SCM uvec, size_t *lenp);
SCM_INTERNAL void scm_init_srfi_4 (void);