(scm_uniform_vector_elements,

scm_u8vector_elements, etc): Made return value "const".
(scm_uniform_vector_writable_elements,
scm_u8vector_writable_elements, etc): New.
(scm_uniform_vector_release, scm_uniform_vector_release_elements):
Renamed former to latter.  Added explicit call to
scm_remember_upto_here_1.
(scm_frame_uniform_vector_release,
scm_frame_uniform_vector_release_elements): Renamed former to latter.
(scm_uniform_vector_release_writable_elements,
scm_frame_uniform_vector_release_writable_elements): New. Takes
crown of longest identifier yet.
Changed all uses as required by the changes above.

1 files changed, 30 insertions, 15 deletions

diff --git a/libguile/srfi-4.h b/libguile/srfi-4.h
index de426a00d..503e12292 100644
--- a/libguile/srfi-4.h
+++ b/libguile/srfi-4.h
@@ -41,10 +41,13 @@ 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 void *scm_uniform_vector_elements (SCM uvec);
 SCM_API size_t scm_uniform_vector_element_size (SCM uvec);
-SCM_API void scm_uniform_vector_release (SCM uvec);
-SCM_API void scm_frame_uniform_vector_release (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);
 
 /* Specific procedures.
  */
@@ -59,7 +62,8 @@ 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 scm_t_uint8 *scm_u8vector_elements (SCM uvec);
+SCM_API const scm_t_uint8 *scm_u8vector_elements (SCM uvec);
+SCM_API scm_t_uint8 *scm_u8vector_writable_elements (SCM uvec);
 
 SCM_API SCM scm_s8vector_p (SCM obj);
 SCM_API SCM scm_make_s8vector (SCM n, SCM fill);
@@ -71,7 +75,8 @@ 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 scm_t_int8 *scm_s8vector_elements (SCM uvec);
+SCM_API const scm_t_int8 *scm_s8vector_elements (SCM uvec);
+SCM_API scm_t_int8 *scm_s8vector_writable_elements (SCM uvec);
 
 SCM_API SCM scm_u16vector_p (SCM obj);
 SCM_API SCM scm_make_u16vector (SCM n, SCM fill);
@@ -83,7 +88,8 @@ 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 scm_t_uint16 *scm_u16vector_elements (SCM uvec);
+SCM_API const scm_t_uint16 *scm_u16vector_elements (SCM uvec);
+SCM_API scm_t_uint16 *scm_u16vector_writable_elements (SCM uvec);
 
 SCM_API SCM scm_s16vector_p (SCM obj);
 SCM_API SCM scm_make_s16vector (SCM n, SCM fill);
@@ -95,7 +101,8 @@ 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 scm_t_int16 *scm_s16vector_elements (SCM uvec);
+SCM_API const scm_t_int16 *scm_s16vector_elements (SCM uvec);
+SCM_API scm_t_int16 *scm_s16vector_writable_elements (SCM uvec);
 
 SCM_API SCM scm_u32vector_p (SCM obj);
 SCM_API SCM scm_make_u32vector (SCM n, SCM fill);
@@ -107,7 +114,8 @@ 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 scm_t_uint32 *scm_u32vector_elements (SCM uvec);
+SCM_API const scm_t_uint32 *scm_u32vector_elements (SCM uvec);
+SCM_API scm_t_uint32 *scm_u32vector_writable_elements (SCM uvec);
 
 SCM_API SCM scm_s32vector_p (SCM obj);
 SCM_API SCM scm_make_s32vector (SCM n, SCM fill);
@@ -119,7 +127,8 @@ 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 scm_t_int32 *scm_s32vector_elements (SCM uvec);
+SCM_API const scm_t_int32 *scm_s32vector_elements (SCM uvec);
+SCM_API scm_t_int32 *scm_s32vector_writable_elements (SCM uvec);
 
 SCM_API SCM scm_u64vector_p (SCM obj);
 SCM_API SCM scm_make_u64vector (SCM n, SCM fill);
@@ -131,7 +140,8 @@ 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 scm_t_uint64 *scm_u64vector_elements (SCM uvec);
+SCM_API const scm_t_uint64 *scm_u64vector_elements (SCM uvec);
+SCM_API scm_t_uint64 *scm_u64vector_writable_elements (SCM uvec);
 
 SCM_API SCM scm_s64vector_p (SCM obj);
 SCM_API SCM scm_make_s64vector (SCM n, SCM fill);
@@ -143,7 +153,8 @@ 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 scm_t_int64 *scm_s64vector_elements (SCM uvec);
+SCM_API const scm_t_int64 *scm_s64vector_elements (SCM uvec);
+SCM_API scm_t_int64 *scm_s64vector_writable_elements (SCM uvec);
 
 SCM_API SCM scm_f32vector_p (SCM obj);
 SCM_API SCM scm_make_f32vector (SCM n, SCM fill);
@@ -155,7 +166,8 @@ 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 float *scm_f32vector_elements (SCM uvec);
+SCM_API const float *scm_f32vector_elements (SCM uvec);
+SCM_API float *scm_f32vector_writable_elements (SCM uvec);
 
 SCM_API SCM scm_f64vector_p (SCM obj);
 SCM_API SCM scm_make_f64vector (SCM n, SCM fill);
@@ -167,7 +179,8 @@ 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 double *scm_f64vector_elements (SCM uvec);
+SCM_API const double *scm_f64vector_elements (SCM uvec);
+SCM_API double *scm_f64vector_writable_elements (SCM uvec);
 
 SCM_API SCM scm_c32vector_p (SCM obj);
 SCM_API SCM scm_make_c32vector (SCM n, SCM fill);
@@ -179,7 +192,8 @@ 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 float *scm_c32vector_elements (SCM uvec);
+SCM_API const float *scm_c32vector_elements (SCM uvec);
+SCM_API float *scm_c32vector_writable_elements (SCM uvec);
 
 SCM_API SCM scm_c64vector_p (SCM obj);
 SCM_API SCM scm_make_c64vector (SCM n, SCM fill);
@@ -191,7 +205,8 @@ 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 double *scm_c64vector_elements (SCM uvec);
+SCM_API const double *scm_c64vector_elements (SCM uvec);
+SCM_API double *scm_c64vector_writable_elements (SCM uvec);
 
 SCM_API SCM scm_i_generalized_vector_creator (SCM uvec);
 SCM_API const char *scm_i_uniform_vector_tag (SCM uvec);