diff options
author | Marius Vollmer <mvo@zagadka.de> | 2004-12-29 18:21:55 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2004-12-29 18:21:55 +0000 |
commit | f301dbf34a32e982f671b7b86ac39f3a880cac7b (patch) | |
tree | 6a6ed3a054f591f3f7e1cc1bc1455ad4fea57baf /libguile/unif.h | |
parent | 55088b6a628bfe9ab8180641cd359f72d4ab814f (diff) | |
download | guile-f301dbf34a32e982f671b7b86ac39f3a880cac7b.tar.gz |
* srfi-4.h (scm_i_proc_make_u8vector, scm_i_proc_make_s8vector,
scm_i_proc_make_u16vector, scm_i_proc_make_s16vector,
scm_i_proc_make_u32vector, scm_i_proc_make_s32vector,
scm_i_proc_make_u64vector, scm_i_proc_make_s64vector,
scm_i_proc_make_f32vector, scm_i_proc_make_f64vector,
scm_i_proc_make_c32vector, scm_i_proc_make_c64vector,
uvec_proc_vars): Removed.
(scm_i_generalized_vector_creator): Removed.
(scm_i_generalized_vector_type): New.
* unif.h, unif.c (scm_typed_array_p, scm_make_array,
scm_make_typed_array, scm_array_type, scm_list_to_array,
scm_list_to_typed_array, scm_is_array, scm_is_typed_array): New.
(scm_array_creator): Removed.
(scm_array_p): Deprecated second PROT argument.
(scm_dimensions_to_uniform_array, scm_list_to_uniform_array):
Deprecated, reimplemented in terms of scm_make_typed_array and
scm_list_to_typed_array.
(scm_i_proc_make_vector, scm_i_proc_make_string,
scm_i_proc_make_bitvector): Removed.
(type_creator_table, init_type_creator_table, type_to_creator,
make_typed_vector): New.
(scm_i_convert_old_prototype): Removed.
(prototype_to_type): New.
(scm_make_uve): Deprecated, reimplemented using make_typed_vector.
(scm_array_dimensions): Use scm_list_1 instead of scm_cons for
minor added clarity.
(scm_make_shared_array, scm_ra2contig): Use make_typed_vector
instead of scm_make_uve.
(tag_creator_table, scm_i_tag_to_creator): Removed.
(tag_to_type): New.
(scm_i_read_array): Use scm_list_to_typed_array instead of
scm_list_to_uniform_array.
Diffstat (limited to 'libguile/unif.h')
-rw-r--r-- | libguile/unif.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libguile/unif.h b/libguile/unif.h index 5acd5e599..83325f7d6 100644 --- a/libguile/unif.h +++ b/libguile/unif.h @@ -76,6 +76,9 @@ SCM_API scm_t_bits scm_tc16_enclosed_array; #define SCM_ARRAY_DIMS(a) ((scm_t_array_dim *)((char *) SCM_ARRAY_MEM (a) + sizeof (scm_t_array))) SCM_API SCM scm_array_p (SCM v, SCM prot); +SCM_API SCM scm_typed_array_p (SCM v, SCM type); +SCM_API SCM scm_make_array (SCM fill, SCM bounds); +SCM_API SCM scm_make_typed_array (SCM type, SCM fill, SCM bounds); SCM_API SCM scm_array_rank (SCM ra); SCM_API SCM scm_array_dimensions (SCM ra); SCM_API SCM scm_shared_array_root (SCM ra); @@ -93,7 +96,12 @@ SCM_API SCM scm_uniform_array_read_x (SCM ra, SCM port_or_fd, SCM_API SCM scm_uniform_array_write (SCM v, SCM port_or_fd, SCM start, SCM end); SCM_API SCM scm_array_to_list (SCM v); -SCM_API SCM scm_array_creator (SCM ra); +SCM_API SCM scm_list_to_array (SCM ndim, SCM lst); +SCM_API SCM scm_list_to_typed_array (SCM type, SCM ndim, SCM lst); +SCM_API SCM scm_array_type (SCM ra); + +SCM_API int scm_is_array (SCM obj); +SCM_API int scm_is_typed_array (SCM obj, SCM type); SCM_API SCM scm_i_read_array (SCM port, int c); @@ -143,9 +151,6 @@ SCM_API SCM scm_shap2ra (SCM args, const char *what); SCM_API SCM scm_dimensions_to_uniform_array (SCM dims, SCM prot, SCM fill); SCM_API SCM scm_ra2contig (SCM ra, int copy); -SCM_API SCM scm_i_proc_make_vector; -SCM_API SCM scm_i_proc_make_string; -SCM_API SCM scm_i_proc_make_bitvector; SCM_API SCM scm_i_cvref (SCM v, size_t p, int enclosed); SCM_API void scm_init_unif (void); |