diff options
author | Marius Vollmer <mvo@zagadka.de> | 2005-01-11 16:55:38 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2005-01-11 16:55:38 +0000 |
commit | 04b87de561cb0fdc41098713e4141916316c1d50 (patch) | |
tree | bd9980b32edb8dd057696d5afa721a3d1b416656 /libguile/srfi-4.c | |
parent | 1f366ef7f04cccb99ef26489153a6e3db37cd7fa (diff) | |
download | guile-04b87de561cb0fdc41098713e4141916316c1d50.tar.gz |
(SCM_ARRAYP, SCM_I_ARRAYP): Renamed former to latter internal
version. Changed all uses.
(scm_tc16_array, scm_i_tc16_array,
scm_tc16_enclosed_array, scm_i_tc16_enclosed_array,
SCM_ARRAY_FLAG_CONTIGUOUS, SCM_I_ARRAY_FLAG_CONTIGUOUS,
SCM_ENCLOSE_ARRAYP, SCM_I_ENCLOSE_ARRAYP,
SCM_ARRAY_NDIM, SCM_I_ARRAY_NDIM,
SCM_ARRAY_CONTP, SCM_I_ARRAY_CONTP,
SCM_ARRAY_MEM, SCM_I_ARRAY_MEM,
SCM_ARRAY_V, SCM_I_ARRAY_V,
SCM_ARRAY_BASE, SCM_I_ARRAY_BASE,
SCM_ARRAY_DIMS, SCM_I_ARRAY_DIMS,
scm_t_array, scm_i_t_array): Likewise.
(SCM_SET_ARRAY_CONTIGUOUS_FLAG, SCM_CLR_ARRAY_CONTIGUOUS_FLAG):
Moved from unif.h to unif.c.
(scm_c_array_rank): New.
(scm_array_rank): Reimplement using it.
Diffstat (limited to 'libguile/srfi-4.c')
-rw-r--r-- | libguile/srfi-4.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c index 14f8311bd..2ee65166e 100644 --- a/libguile/srfi-4.c +++ b/libguile/srfi-4.c @@ -237,9 +237,9 @@ is_uvec (int type, SCM obj) { if (SCM_IS_UVEC (obj)) return SCM_UVEC_TYPE (obj) == type; - if (SCM_ARRAYP (obj) && SCM_ARRAY_NDIM (obj) == 1) + if (SCM_I_ARRAYP (obj) && SCM_I_ARRAY_NDIM (obj) == 1) { - SCM v = SCM_ARRAY_V (obj); + SCM v = SCM_I_ARRAY_V (obj); return SCM_IS_UVEC (v) && SCM_UVEC_TYPE (v) == type; } return 0; @@ -374,8 +374,8 @@ uvec_writable_elements (int type, SCM uvec, scm_t_array_handle *handle, if (type >= 0) { SCM v = uvec; - if (SCM_ARRAYP (v)) - v = SCM_ARRAY_V (v); + if (SCM_I_ARRAYP (v)) + v = SCM_I_ARRAY_V (v); uvec_assert (type, v); } @@ -393,8 +393,8 @@ static int uvec_type (scm_t_array_handle *h) { SCM v = h->array; - if (SCM_ARRAYP (v)) - v = SCM_ARRAY_V (v); + if (SCM_I_ARRAYP (v)) + v = SCM_I_ARRAY_V (v); return SCM_UVEC_TYPE (v); } @@ -531,9 +531,9 @@ scm_is_uniform_vector (SCM obj) { if (SCM_IS_UVEC (obj)) return 1; - if (SCM_ARRAYP (obj) && SCM_ARRAY_NDIM (obj) == 1) + if (SCM_I_ARRAYP (obj) && SCM_I_ARRAY_NDIM (obj) == 1) { - SCM v = SCM_ARRAY_V (obj); + SCM v = SCM_I_ARRAY_V (obj); return SCM_IS_UVEC (v); } return 0; @@ -659,8 +659,8 @@ size_t scm_array_handle_uniform_element_size (scm_t_array_handle *h) { SCM vec = h->array; - if (SCM_ARRAYP (vec)) - vec = SCM_ARRAY_V (vec); + if (SCM_I_ARRAYP (vec)) + vec = SCM_I_ARRAY_V (vec); if (scm_is_uniform_vector (vec)) return uvec_sizes[SCM_UVEC_TYPE(vec)]; scm_wrong_type_arg_msg (NULL, 0, h->array, "uniform array"); @@ -695,8 +695,8 @@ void * scm_array_handle_uniform_writable_elements (scm_t_array_handle *h) { SCM vec = h->array; - if (SCM_ARRAYP (vec)) - vec = SCM_ARRAY_V (vec); + if (SCM_I_ARRAYP (vec)) + vec = SCM_I_ARRAY_V (vec); if (SCM_IS_UVEC (vec)) { size_t size = uvec_sizes[SCM_UVEC_TYPE(vec)]; |