From e0e496707beaea694fa79b4ca291dbc67abdc328 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Wed, 27 Oct 2004 18:11:14 +0000 Subject: * srfi-4.h, srfi-4.i.c (scm_u8vector_elements, etc): New. * srfi-4.h, srfi-4.c (scm_uniform_vector_p, scm_uniform_vector_ref, scm_uniform_vector_set_x, scm_uniform_vector_to_list, scm_is_uniform_vector, scm_c_uniform_vector_lengths, scm_c_uniform_vector_size, scm_uniform_vector_elements, scm_uniform_vector_element_size, scm_uniform_vector_release): New. (scm_i_uniform_vector_prototype, scm_i_uniform_vector_tag): New. (scm_uniform_element_size, scm_uniform_vector_length): Moved here from unif.h, unif.c and extended to handle both the old and new uniform vectors. * unif.h, unif.c (scm_uniform_vector_ref, scm_array_ref): Renamed the former to the latter. (scm_uniform_vector_length, scm_uniform_element_size): Moved to srfi-4.h, srfi-4.c. (scm_make_uve): Call scm_make_s8vector for #\nul prototype. (scm_array_p, scm_array_rank, scm_array_dimensions, scm_transpose_array, scm_enclose_array, scm_array_ref, scm_cvref, scm_array_set_x, scm_array_contents, scm_uniform_array_read_x, scm_array_to_list, scm_array_prototype): Handle srfi-4 uniform vectors. Removed code for scm_tc7_byvect. (scm_dimensions_to_uniform_array): Fill array with 0 when prototype is #\nul. (scm_i_print_array_dimension, scm_i_legacy_tag, scm_i_print_array): New. (scm_raprin1): Call scm_i_print_array for arrays. Removed code for scm_tc7_byvect. --- libguile/unif.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libguile/unif.h') diff --git a/libguile/unif.h b/libguile/unif.h index 80eaa674e..197cfb91f 100644 --- a/libguile/unif.h +++ b/libguile/unif.h @@ -85,9 +85,7 @@ SCM_API scm_t_bits scm_tc16_array; -SCM_API size_t scm_uniform_element_size (SCM obj); SCM_API SCM scm_make_uve (long k, SCM prot); -SCM_API SCM scm_uniform_vector_length (SCM v); SCM_API SCM scm_array_p (SCM v, SCM prot); SCM_API SCM scm_array_rank (SCM ra); SCM_API SCM scm_array_dimensions (SCM ra); @@ -103,7 +101,7 @@ SCM_API SCM scm_make_shared_array (SCM oldra, SCM mapfunc, SCM dims); SCM_API SCM scm_transpose_array (SCM ra, SCM args); SCM_API SCM scm_enclose_array (SCM ra, SCM axes); SCM_API SCM scm_array_in_bounds_p (SCM v, SCM args); -SCM_API SCM scm_uniform_vector_ref (SCM v, SCM args); +SCM_API SCM scm_array_ref (SCM v, SCM args); SCM_API SCM scm_cvref (SCM v, unsigned long pos, SCM last); SCM_API SCM scm_array_set_x (SCM v, SCM obj, SCM args); SCM_API SCM scm_array_contents (SCM ra, SCM strict); -- cgit v1.2.3