dmbcs/guile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uniform vector functions to their own file

Browse source 
* libguile/uniform.c:
* libguile/uniform.h:
* libguile/srfi-4.c:
* libguile/srfi-4.h:
* libguile/Makefile.am: Move uniform vector funcs out of srfi-4 to their
  own file.

* libguile.h:
* libguile/arrays.c:
* libguile/bytevectors.c: Update includers.
This commit is contained in:
Andy Wingo 2009-07-18 12:18:15 +02:00
commit 476b894c71
9 changed files with 343 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

217
libguile/srfi-4.c
View file

@ -32,6 +32,7 @@
#include "libguile/bitvectors.h"
#include "libguile/bytevectors.h"
#include "libguile/generalized-vectors.h"
#include "libguile/uniform.h"
#include "libguile/error.h"
#include "libguile/read.h"
#include "libguile/ports.h"
@ -615,222 +616,6 @@ scm_i_generalized_vector_type (SCM v)
return SCM_BOOL_F;
}
int
scm_is_uniform_vector (SCM obj)
{
if (SCM_IS_UVEC (obj))
return 1;
if (SCM_I_ARRAYP (obj) && SCM_I_ARRAY_NDIM (obj) == 1)
{
SCM v = SCM_I_ARRAY_V (obj);
return SCM_IS_UVEC (v);
}
return 0;
}
size_t
scm_c_uniform_vector_length (SCM uvec)
{
/* scm_generalized_vector_get_handle will ultimately call us to get
the length of uniform vectors, so we can't use uvec_elements for
naked vectors.
*/
if (SCM_IS_UVEC (uvec))
return SCM_UVEC_LENGTH (uvec);
else
{
scm_t_array_handle handle;
size_t len;
ssize_t inc;
uvec_elements (-1, uvec, &handle, &len, &inc);
scm_array_handle_release (&handle);
return len;
}
}
SCM_DEFINE (scm_uniform_vector_p, "uniform-vector?", 1, 0, 0,
(SCM obj),
"Return @code{#t} if @var{obj} is a uniform vector.")
#define FUNC_NAME s_scm_uniform_vector_p
{
return scm_from_bool (scm_is_uniform_vector (obj));
}
#undef FUNC_NAME
SCM
scm_c_uniform_vector_ref (SCM v, size_t idx)
{
scm_t_array_handle handle;
size_t len;
ssize_t inc;
SCM res;
uvec_elements (-1, v, &handle, &len, &inc);
if (idx >= len)
scm_out_of_range (NULL, scm_from_size_t (idx));
res = scm_array_handle_ref (&handle, idx*inc);
scm_array_handle_release (&handle);
return res;
}
SCM_DEFINE (scm_uniform_vector_ref, "uniform-vector-ref", 2, 0, 0,
(SCM v, SCM idx),
"Return the element at index @var{idx} of the\n"
"homogenous numeric vector @var{v}.")
#define FUNC_NAME s_scm_uniform_vector_ref
{
#if SCM_ENABLE_DEPRECATED
/* Support old argument convention.
*/
if (scm_is_pair (idx))
{
scm_c_issue_deprecation_warning
("Using a list as the index to uniform-vector-ref is deprecated.");
if (!scm_is_null (SCM_CDR (idx)))
scm_wrong_num_args (NULL);
idx = SCM_CAR (idx);
}
#endif
return scm_c_uniform_vector_ref (v, scm_to_size_t (idx));
}
#undef FUNC_NAME
void
scm_c_uniform_vector_set_x (SCM v, size_t idx, SCM val)
{
scm_t_array_handle handle;
size_t len;
ssize_t inc;
uvec_writable_elements (-1, v, &handle, &len, &inc);
if (idx >= len)
scm_out_of_range (NULL, scm_from_size_t (idx));
scm_array_handle_set (&handle, idx*inc, val);
scm_array_handle_release (&handle);
}
SCM_DEFINE (scm_uniform_vector_set_x, "uniform-vector-set!", 3, 0, 0,
(SCM v, SCM idx, SCM val),
"Set the element at index @var{idx} of the\n"
"homogenous numeric vector @var{v} to @var{val}.")
#define FUNC_NAME s_scm_uniform_vector_set_x
{
#if SCM_ENABLE_DEPRECATED
/* Support old argument convention.
*/
if (scm_is_pair (idx))
{
scm_c_issue_deprecation_warning
("Using a list as the index to uniform-vector-set! is deprecated.");
if (!scm_is_null (SCM_CDR (idx)))
scm_wrong_num_args (NULL);
idx = SCM_CAR (idx);
}
#endif
scm_c_uniform_vector_set_x (v, scm_to_size_t (idx), val);
return SCM_UNSPECIFIED;
}
#undef FUNC_NAME
SCM_DEFINE (scm_uniform_vector_to_list, "uniform-vector->list", 1, 0, 0,
(SCM uvec),
"Convert the uniform numeric vector @var{uvec} to a list.")
#define FUNC_NAME s_scm_uniform_vector_to_list
{
return uvec_to_list (-1, uvec);
}
#undef FUNC_NAME
size_t
scm_array_handle_uniform_element_size (scm_t_array_handle *h)
{
SCM vec = h->array;
if (SCM_I_ARRAYP (vec))
vec = SCM_I_ARRAY_V (vec);
if (scm_is_uniform_vector (vec))
return uvec_sizes[SCM_UVEC_TYPE(vec)];
if (scm_is_bytevector (vec))
return 1U;
scm_wrong_type_arg_msg (NULL, 0, h->array, "uniform array");
}
#if SCM_ENABLE_DEPRECATED
/* return the size of an element in a uniform array or 0 if type not
found. */
size_t
scm_uniform_element_size (SCM obj)
{
scm_c_issue_deprecation_warning
("scm_uniform_element_size is deprecated. "
"Use scm_array_handle_uniform_element_size instead.");
if (SCM_IS_UVEC (obj))
return uvec_sizes[SCM_UVEC_TYPE(obj)];
else
return 0;
}
#endif
const void *
scm_array_handle_uniform_elements (scm_t_array_handle *h)
{
return scm_array_handle_uniform_writable_elements (h);
}
void *
scm_array_handle_uniform_writable_elements (scm_t_array_handle *h)
{
SCM vec = h->array;
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)];
char *elts = SCM_UVEC_BASE (vec);
return (void *) (elts + size*h->base);
}
if (scm_is_bytevector (vec))
return SCM_BYTEVECTOR_CONTENTS (vec);
scm_wrong_type_arg_msg (NULL, 0, h->array, "uniform array");
}
const void *
scm_uniform_vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp, ssize_t *incp)
{
return scm_uniform_vector_writable_elements (uvec, h, lenp, incp);
}
void *
scm_uniform_vector_writable_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp, ssize_t *incp)
{
scm_generalized_vector_get_handle (uvec, h);
if (lenp)
{
scm_t_array_dim *dim = scm_array_handle_dims (h);
*lenp = dim->ubnd - dim->lbnd + 1;
*incp = dim->inc;
}
return scm_array_handle_uniform_writable_elements (h);
}
SCM_DEFINE (scm_uniform_vector_length, "uniform-vector-length", 1, 0, 0,
(SCM v),
"Return the number of elements in the uniform vector @var{v}.")
#define FUNC_NAME s_scm_uniform_vector_length
{
return uvec_length (-1, v);
}
#undef FUNC_NAME
SCM_DEFINE (scm_uniform_vector_read_x, "uniform-vector-read!", 1, 3, 0,
(SCM uvec, SCM port_or_fd, SCM start, SCM end),
"Fill the elements of @var{uvec} by reading\n"