diff options
author | Marius Vollmer <mvo@zagadka.de> | 2005-01-02 20:06:08 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2005-01-02 20:06:08 +0000 |
commit | 6e708ef2b1897c3ea4d5ac47720974078d50e9e4 (patch) | |
tree | 3dde367b768213b4693cc586b2adf23074f15667 /libguile/srfi-4.h | |
parent | 9c6e33c62acc203792053b6d5a579bdc22827eec (diff) | |
download | guile-6e708ef2b1897c3ea4d5ac47720974078d50e9e4.tar.gz |
* weaks.c: Use new vector elements API or simple vector
API, as appropriate.
* srfi-4.h, srfi-4.c, srfi-4.i.c (scm_array_handle_uniform_elements,
scm_array_handle_uniform_writable_elements,
scm_uniform_vector_elements, scm_uniform_vector_writable_elements):
(scm_<foo>vector_elements, scm_<foo>vector_writable_elements): Use
scm_t_array_handle, deliver length and increment.
(scm_array_handle_<foo>_elements,
scm_array_handle_<foo>_writable_elements): New.
* unif.h, unif.c (scm_t_array_handle, scm_array_get_handle,
scm_array_handle_rank, scm_array_handle_dims, scm_array_handle_ref
scm_array_handle_set, scm_array_handle_elements
scm_array_handle_writable_elements, scm_vector_get_handle): New.
(scm_make_uve, scm_array_prototype, scm_list_to_uniform_array,
scm_dimensions_to_uniform_array): Deprecated for real. (scm_array_p,
scm_i_array_p): Use latter for SCM_DEFINE since snarfing wont allow a
mismatch between C and Scheme arglists. (scm_make_shared_array,
scm_enclose_array): Correctly use scm_c_generalized_vector_length
instead of scm_uniform_vector_length.
* weaks.h, weaks.c: Use new internal weak vector API from
vectors.h.
* Makefile.am (libguile_la_SOURCES, DOT_X_FILES, DOT_DOC_FILES,
EXTRA_libguile_la_SOURCES): Changed ramap.c and unif.c from being
'extra' to being regular sources.
(noinst_HEADERS): Added quicksort.i.c.
* quicksort.i.c: New file.
* vectors.h, vector.c (SCM_VECTORP, SCM_VECTOR_LENGTH, SCM_VELTS,
SCM_WRITABLE_VELTS, SCM_VECTOR_REF, SCM_VECTOR_SET): Deprecated and
reimplemented. Replaced all uses with scm_vector_elements,
scm_vector_writable_elements, or SCM_SIMPLE_VECTOR_*, as appropriate.
(scm_is_simple_vector, SCM_SIMPLE_VECTOR_LENGTH,
SCM_SIMPLE_VECTOR_REF, SCM_SIMPLE_VECTOR_SET, SCM_SIMPLE_VECTOR_LOC):
New. (SCM_VECTOR_BASE, SCM_SET_VECTOR_BASE, SCM_VECTOR_MAX_LENGTH,
SCM_MAKE_VECTOR_TAG, SCM_SET_VECTOR_LENGTH, SCM_VELTS_AS_STACKITEMS,
SCM_SETVELTS, SCM_GC_WRITABLE_VELTS): Removed. (scm_vector_copy):
New. (scm_vector_elements, scm_vector_writable_elements): Use
scm_t_array_handle, deliver length and increment. Moved to
unif.h. Changed all uses. (scm_vector_release_elements,
scm_vector_release_writable_elements,
(scm_frame_vector_release_elements,
scm_frame_vector_release_writable_elements): Removed.
(SCM_I_IS_VECTOR, SCM_I_VECTOR_ELTS, SCM_I_VECTOR_WELTS,
SCM_I_VECTOR_LENGTH, scm_i_vector_free): New internal API.
(SCM_I_WVECTP SCM_I_WVECT_LENGTH SCM_I_WVECT_VELTS
SCM_I_WVECT_GC_WVELTS SCM_I_WVECT_TYPE SCM_I_WVECT_GC_CHAIN
SCM_I_SET_WVECT_GC_CHAIN, scm_i_allocate_weak_vector): New, for weak
vectors.
Diffstat (limited to 'libguile/srfi-4.h')
-rw-r--r-- | libguile/srfi-4.h | 154 |
1 files changed, 122 insertions, 32 deletions
diff --git a/libguile/srfi-4.h b/libguile/srfi-4.h index 1733a7f5c..a04148dac 100644 --- a/libguile/srfi-4.h +++ b/libguile/srfi-4.h @@ -21,6 +21,7 @@ #include "libguile/__scm.h" +#include "libguile/unif.h" /* Generic procedures. */ @@ -40,14 +41,16 @@ SCM_API size_t scm_c_uniform_vector_length (SCM v); SCM_API size_t scm_c_uniform_vector_size (SCM v); SCM_API SCM scm_c_uniform_vector_ref (SCM v, size_t idx); SCM_API void scm_c_uniform_vector_set_x (SCM v, size_t idx, SCM val); - -SCM_API size_t scm_uniform_vector_element_size (SCM uvec); -SCM_API const void *scm_uniform_vector_elements (SCM uvec); -SCM_API void scm_uniform_vector_release_elements (SCM uvec); -SCM_API void scm_frame_uniform_vector_release_elements (SCM uvec); -SCM_API void *scm_uniform_vector_writable_elements (SCM uvec); -SCM_API void scm_uniform_vector_release_writable_elements (SCM uvec); -SCM_API void scm_frame_uniform_vector_release_writable_elements (SCM uvec); +SCM_API size_t scm_uniform_vector_element_size (SCM v); +SCM_API const void *scm_array_handle_uniform_elements (scm_t_array_handle *h); +SCM_API void *scm_array_handle_uniform_writable_elements (scm_t_array_handle *h); +SCM_API const void *scm_uniform_vector_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, ssize_t *incp); +SCM_API void *scm_uniform_vector_writable_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, + ssize_t *incp); /* Specific procedures. */ @@ -62,8 +65,15 @@ SCM_API SCM scm_u8vector_set_x (SCM uvec, SCM index, SCM value); SCM_API SCM scm_u8vector_to_list (SCM uvec); SCM_API SCM scm_list_to_u8vector (SCM l); SCM_API SCM scm_any_to_u8vector (SCM obj); -SCM_API const scm_t_uint8 *scm_u8vector_elements (SCM uvec); -SCM_API scm_t_uint8 *scm_u8vector_writable_elements (SCM uvec); +SCM_API const scm_t_uint8 *scm_array_handle_u8_elements (scm_t_array_handle *h); +SCM_API scm_t_uint8 *scm_array_handle_u8_writable_elements (scm_t_array_handle *h); +SCM_API const scm_t_uint8 *scm_u8vector_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, ssize_t *incp); +SCM_API scm_t_uint8 *scm_u8vector_writable_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, + ssize_t *incp); SCM_API SCM scm_s8vector_p (SCM obj); SCM_API SCM scm_make_s8vector (SCM n, SCM fill); @@ -75,8 +85,15 @@ SCM_API SCM scm_s8vector_set_x (SCM uvec, SCM index, SCM value); SCM_API SCM scm_s8vector_to_list (SCM uvec); SCM_API SCM scm_list_to_s8vector (SCM l); SCM_API SCM scm_any_to_s8vector (SCM obj); -SCM_API const scm_t_int8 *scm_s8vector_elements (SCM uvec); -SCM_API scm_t_int8 *scm_s8vector_writable_elements (SCM uvec); +SCM_API const scm_t_int8 *scm_array_handle_s8_elements (scm_t_array_handle *h); +SCM_API scm_t_int8 *scm_array_handle_s8_writable_elements (scm_t_array_handle *h); +SCM_API const scm_t_int8 *scm_s8vector_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, ssize_t *incp); +SCM_API scm_t_int8 *scm_s8vector_writable_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, + ssize_t *incp); SCM_API SCM scm_u16vector_p (SCM obj); SCM_API SCM scm_make_u16vector (SCM n, SCM fill); @@ -88,8 +105,16 @@ SCM_API SCM scm_u16vector_set_x (SCM uvec, SCM index, SCM value); SCM_API SCM scm_u16vector_to_list (SCM uvec); SCM_API SCM scm_list_to_u16vector (SCM l); SCM_API SCM scm_any_to_u16vector (SCM obj); -SCM_API const scm_t_uint16 *scm_u16vector_elements (SCM uvec); -SCM_API scm_t_uint16 *scm_u16vector_writable_elements (SCM uvec); +SCM_API const scm_t_uint16 *scm_array_handle_u16_elements (scm_t_array_handle *h); +SCM_API scm_t_uint16 *scm_array_handle_u16_writable_elements (scm_t_array_handle *h); +SCM_API const scm_t_uint16 *scm_u16vector_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, + ssize_t *incp); +SCM_API scm_t_uint16 *scm_u16vector_writable_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, + ssize_t *incp); SCM_API SCM scm_s16vector_p (SCM obj); SCM_API SCM scm_make_s16vector (SCM n, SCM fill); @@ -101,8 +126,15 @@ SCM_API SCM scm_s16vector_set_x (SCM uvec, SCM index, SCM value); SCM_API SCM scm_s16vector_to_list (SCM uvec); SCM_API SCM scm_list_to_s16vector (SCM l); SCM_API SCM scm_any_to_s16vector (SCM obj); -SCM_API const scm_t_int16 *scm_s16vector_elements (SCM uvec); -SCM_API scm_t_int16 *scm_s16vector_writable_elements (SCM uvec); +SCM_API const scm_t_int16 *scm_array_handle_s16_elements (scm_t_array_handle *h); +SCM_API scm_t_int16 *scm_array_handle_s16_writable_elements (scm_t_array_handle *h); +SCM_API const scm_t_int16 *scm_s16vector_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, ssize_t *incp); +SCM_API scm_t_int16 *scm_s16vector_writable_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, + ssize_t *incp); SCM_API SCM scm_u32vector_p (SCM obj); SCM_API SCM scm_make_u32vector (SCM n, SCM fill); @@ -114,8 +146,16 @@ SCM_API SCM scm_u32vector_set_x (SCM uvec, SCM index, SCM value); SCM_API SCM scm_u32vector_to_list (SCM uvec); SCM_API SCM scm_list_to_u32vector (SCM l); SCM_API SCM scm_any_to_u32vector (SCM obj); -SCM_API const scm_t_uint32 *scm_u32vector_elements (SCM uvec); -SCM_API scm_t_uint32 *scm_u32vector_writable_elements (SCM uvec); +SCM_API const scm_t_uint32 *scm_array_handle_u32_elements (scm_t_array_handle *h); +SCM_API scm_t_uint32 *scm_array_handle_u32_writable_elements (scm_t_array_handle *h); +SCM_API const scm_t_uint32 *scm_u32vector_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, + ssize_t *incp); +SCM_API scm_t_uint32 *scm_u32vector_writable_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, + ssize_t *incp); SCM_API SCM scm_s32vector_p (SCM obj); SCM_API SCM scm_make_s32vector (SCM n, SCM fill); @@ -127,8 +167,15 @@ SCM_API SCM scm_s32vector_set_x (SCM uvec, SCM index, SCM value); SCM_API SCM scm_s32vector_to_list (SCM uvec); SCM_API SCM scm_list_to_s32vector (SCM l); SCM_API SCM scm_any_to_s32vector (SCM obj); -SCM_API const scm_t_int32 *scm_s32vector_elements (SCM uvec); -SCM_API scm_t_int32 *scm_s32vector_writable_elements (SCM uvec); +SCM_API const scm_t_int32 *scm_array_handle_s32_elements (scm_t_array_handle *h); +SCM_API scm_t_int32 *scm_array_handle_s32_writable_elements (scm_t_array_handle *h); +SCM_API const scm_t_int32 *scm_s32vector_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, ssize_t *incp); +SCM_API scm_t_int32 *scm_s32vector_writable_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, + ssize_t *incp); SCM_API SCM scm_u64vector_p (SCM obj); SCM_API SCM scm_make_u64vector (SCM n, SCM fill); @@ -140,8 +187,16 @@ SCM_API SCM scm_u64vector_set_x (SCM uvec, SCM index, SCM value); SCM_API SCM scm_u64vector_to_list (SCM uvec); SCM_API SCM scm_list_to_u64vector (SCM l); SCM_API SCM scm_any_to_u64vector (SCM obj); -SCM_API const scm_t_uint64 *scm_u64vector_elements (SCM uvec); -SCM_API scm_t_uint64 *scm_u64vector_writable_elements (SCM uvec); +SCM_API const scm_t_uint64 *scm_array_handle_u64_elements (scm_t_array_handle *h); +SCM_API scm_t_uint64 *scm_array_handle_u64_writable_elements (scm_t_array_handle *h); +SCM_API const scm_t_uint64 *scm_u64vector_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, + ssize_t *incp); +SCM_API scm_t_uint64 *scm_u64vector_writable_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, + ssize_t *incp); SCM_API SCM scm_s64vector_p (SCM obj); SCM_API SCM scm_make_s64vector (SCM n, SCM fill); @@ -153,8 +208,15 @@ SCM_API SCM scm_s64vector_set_x (SCM uvec, SCM index, SCM value); SCM_API SCM scm_s64vector_to_list (SCM uvec); SCM_API SCM scm_list_to_s64vector (SCM l); SCM_API SCM scm_any_to_s64vector (SCM obj); -SCM_API const scm_t_int64 *scm_s64vector_elements (SCM uvec); -SCM_API scm_t_int64 *scm_s64vector_writable_elements (SCM uvec); +SCM_API const scm_t_int64 *scm_array_handle_s64_elements (scm_t_array_handle *h); +SCM_API scm_t_int64 *scm_array_handle_s64_writable_elements (scm_t_array_handle *h); +SCM_API const scm_t_int64 *scm_s64vector_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, ssize_t *incp); +SCM_API scm_t_int64 *scm_s64vector_writable_elements (SCM uvec, + scm_t_array_handle *h, + size_t *lenp, + ssize_t *incp); SCM_API SCM scm_f32vector_p (SCM obj); SCM_API SCM scm_make_f32vector (SCM n, SCM fill); @@ -166,8 +228,15 @@ SCM_API SCM scm_f32vector_set_x (SCM uvec, SCM index, SCM value); SCM_API SCM scm_f32vector_to_list (SCM uvec); SCM_API SCM scm_list_to_f32vector (SCM l); SCM_API SCM scm_any_to_f32vector (SCM obj); -SCM_API const float *scm_f32vector_elements (SCM uvec); -SCM_API float *scm_f32vector_writable_elements (SCM uvec); +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 SCM scm_f64vector_p (SCM obj); SCM_API SCM scm_make_f64vector (SCM n, SCM fill); @@ -179,8 +248,15 @@ SCM_API SCM scm_f64vector_set_x (SCM uvec, SCM index, SCM value); SCM_API SCM scm_f64vector_to_list (SCM uvec); SCM_API SCM scm_list_to_f64vector (SCM l); SCM_API SCM scm_any_to_f64vector (SCM obj); -SCM_API const double *scm_f64vector_elements (SCM uvec); -SCM_API double *scm_f64vector_writable_elements (SCM uvec); +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 SCM scm_c32vector_p (SCM obj); SCM_API SCM scm_make_c32vector (SCM n, SCM fill); @@ -192,8 +268,15 @@ SCM_API SCM scm_c32vector_set_x (SCM uvec, SCM index, SCM value); SCM_API SCM scm_c32vector_to_list (SCM uvec); SCM_API SCM scm_list_to_c32vector (SCM l); SCM_API SCM scm_any_to_c32vector (SCM obj); -SCM_API const float *scm_c32vector_elements (SCM uvec); -SCM_API float *scm_c32vector_writable_elements (SCM uvec); +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 SCM scm_c64vector_p (SCM obj); SCM_API SCM scm_make_c64vector (SCM n, SCM fill); @@ -205,8 +288,15 @@ SCM_API SCM scm_c64vector_set_x (SCM uvec, SCM index, SCM value); SCM_API SCM scm_c64vector_to_list (SCM uvec); SCM_API SCM scm_list_to_c64vector (SCM l); SCM_API SCM scm_any_to_c64vector (SCM obj); -SCM_API const double *scm_c64vector_elements (SCM uvec); -SCM_API double *scm_c64vector_writable_elements (SCM uvec); +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 SCM scm_i_generalized_vector_type (SCM vec); SCM_API const char *scm_i_uniform_vector_tag (SCM uvec); |