mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-29 19:30:36 +02:00
uniform vector functions to their own file
* 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
parent
f332e95717
commit
476b894c71
9 changed files with 343 additions and 247 deletions
|
|
@ -106,6 +106,7 @@ extern "C" {
|
|||
#include "libguile/symbols.h"
|
||||
#include "libguile/tags.h"
|
||||
#include "libguile/throw.h"
|
||||
#include "libguile/uniform.h"
|
||||
#include "libguile/validate.h"
|
||||
#include "libguile/values.h"
|
||||
#include "libguile/variable.h"
|
||||
|
|
|
|||
|
|
@ -200,6 +200,7 @@ libguile_la_SOURCES = \
|
|||
symbols.c \
|
||||
threads.c \
|
||||
throw.c \
|
||||
uniform.c \
|
||||
values.c \
|
||||
variable.c \
|
||||
vectors.c \
|
||||
|
|
@ -305,6 +306,7 @@ DOT_X_FILES = \
|
|||
symbols.x \
|
||||
threads.x \
|
||||
throw.x \
|
||||
uniform.x \
|
||||
values.x \
|
||||
variable.x \
|
||||
vectors.x \
|
||||
|
|
@ -353,7 +355,7 @@ DOT_DOC_FILES = \
|
|||
gc.doc \
|
||||
gettext.doc \
|
||||
generalized-arrays.doc \
|
||||
generalized-vectos.doc \
|
||||
generalized-vectors.doc \
|
||||
goops.doc \
|
||||
gsubr.doc \
|
||||
guardians.doc \
|
||||
|
|
@ -405,6 +407,7 @@ DOT_DOC_FILES = \
|
|||
symbols.doc \
|
||||
threads.doc \
|
||||
throw.doc \
|
||||
uniform.doc \
|
||||
values.doc \
|
||||
variable.doc \
|
||||
vectors.doc \
|
||||
|
|
@ -563,6 +566,7 @@ modinclude_HEADERS = \
|
|||
threads.h \
|
||||
throw.h \
|
||||
validate.h \
|
||||
uniform.h \
|
||||
values.h \
|
||||
variable.h \
|
||||
vectors.h \
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@
|
|||
#include "libguile/arrays.h"
|
||||
#include "libguile/generalized-arrays.h"
|
||||
#include "libguile/generalized-vectors.h"
|
||||
#include "libguile/uniform.h"
|
||||
#include "libguile/array-map.h"
|
||||
#include "libguile/print.h"
|
||||
#include "libguile/read.h"
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
#include "libguile/ieee-754.h"
|
||||
#include "libguile/arrays.h"
|
||||
#include "libguile/array-handle.h"
|
||||
#include "libguile/uniform.h"
|
||||
#include "libguile/srfi-4.h"
|
||||
|
||||
#include <byteswap.h>
|
||||
|
|
|
|||
|
|
@ -128,6 +128,7 @@
|
|||
#include "libguile/weaks.h"
|
||||
#include "libguile/guardians.h"
|
||||
#include "libguile/extensions.h"
|
||||
#include "libguile/uniform.h"
|
||||
#include "libguile/srfi-4.h"
|
||||
#include "libguile/discouraged.h"
|
||||
#include "libguile/deprecated.h"
|
||||
|
|
@ -546,6 +547,7 @@ scm_i_init_guile (SCM_STACKITEM *base)
|
|||
scm_init_array_handle ();
|
||||
scm_init_generalized_arrays ();
|
||||
scm_init_generalized_vectors ();
|
||||
scm_init_uniform ();
|
||||
scm_init_bitvectors ();
|
||||
scm_init_array_map ();
|
||||
scm_init_arrays ();
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#define SCM_SRFI_4_H
|
||||
/* srfi-4.c --- Homogeneous numeric vector datatypes.
|
||||
*
|
||||
* Copyright (C) 2001, 2004, 2006, 2008 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2001, 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public License
|
||||
|
|
@ -22,35 +22,6 @@
|
|||
|
||||
|
||||
#include "libguile/__scm.h"
|
||||
#include "libguile/arrays.h"
|
||||
|
||||
/* Generic procedures.
|
||||
*/
|
||||
|
||||
SCM_API SCM scm_uniform_vector_p (SCM v);
|
||||
SCM_API SCM scm_uniform_vector_length (SCM v);
|
||||
SCM_API SCM scm_uniform_vector_ref (SCM v, SCM idx);
|
||||
SCM_API SCM scm_uniform_vector_set_x (SCM v, SCM idx, SCM val);
|
||||
SCM_API SCM scm_uniform_vector_to_list (SCM v);
|
||||
SCM_API SCM scm_uniform_vector_read_x (SCM v, SCM port_or_fd,
|
||||
SCM start, SCM end);
|
||||
SCM_API SCM scm_uniform_vector_write (SCM v, SCM port_or_fd,
|
||||
SCM start, SCM end);
|
||||
|
||||
SCM_API int scm_is_uniform_vector (SCM obj);
|
||||
SCM_API size_t scm_c_uniform_vector_length (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 size_t scm_array_handle_uniform_element_size (scm_t_array_handle *h);
|
||||
SCM_API const void *scm_array_handle_uniform_elements (scm_t_array_handle *h);
|
||||
SCM_API void *scm_array_handle_uniform_writable_elements (scm_t_array_handle *h);
|
||||
SCM_API const void *scm_uniform_vector_elements (SCM uvec,
|
||||
scm_t_array_handle *h,
|
||||
size_t *lenp, ssize_t *incp);
|
||||
SCM_API void *scm_uniform_vector_writable_elements (SCM uvec,
|
||||
scm_t_array_handle *h,
|
||||
size_t *lenp,
|
||||
ssize_t *incp);
|
||||
|
||||
/* Specific procedures.
|
||||
*/
|
||||
|
|
|
|||
254
libguile/uniform.c
Normal file
254
libguile/uniform.c
Normal file
|
|
@ -0,0 +1,254 @@
|
|||
/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006, 2009 Free Software Foundation, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public License
|
||||
* as published by the Free Software Foundation; either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
* 02110-1301 USA
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
#include "libguile/_scm.h"
|
||||
#include "libguile/__scm.h"
|
||||
|
||||
#include "libguile/uniform.h"
|
||||
|
||||
|
||||
const size_t scm_i_array_element_type_sizes[SCM_ARRAY_ELEMENT_TYPE_LAST + 1] = {
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
8,
|
||||
8, 8,
|
||||
16, 16,
|
||||
32, 32,
|
||||
64, 64,
|
||||
32, 64,
|
||||
64, 128
|
||||
};
|
||||
|
||||
/* FIXME: return bit size instead of byte size? */
|
||||
size_t
|
||||
scm_array_handle_uniform_element_size (scm_t_array_handle *h)
|
||||
{
|
||||
size_t ret = scm_i_array_element_type_sizes[h->element_type];
|
||||
if (ret && ret % 8 == 0)
|
||||
return ret / 8;
|
||||
else
|
||||
scm_wrong_type_arg_msg (NULL, 0, h->array, "uniform array");
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
size_t esize;
|
||||
scm_t_uint8 *ret;
|
||||
|
||||
esize = scm_array_handle_uniform_element_size (h);
|
||||
ret = ((scm_t_uint8*) h->writable_elements) + h->base * esize;
|
||||
return ret;
|
||||
}
|
||||
|
||||
int
|
||||
scm_is_uniform_vector (SCM obj)
|
||||
{
|
||||
scm_t_array_handle h;
|
||||
int ret = 0;
|
||||
|
||||
if (scm_is_generalized_vector (obj))
|
||||
{
|
||||
scm_generalized_vector_get_handle (obj, &h);
|
||||
ret = SCM_ARRAY_ELEMENT_TYPE_IS_UNBOXED (h.element_type);
|
||||
scm_array_handle_release (&h);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
size_t
|
||||
scm_c_uniform_vector_length (SCM uvec)
|
||||
{
|
||||
scm_t_array_handle h;
|
||||
size_t len;
|
||||
ssize_t inc;
|
||||
|
||||
scm_uniform_vector_elements (uvec, &h, &len, &inc);
|
||||
scm_array_handle_release (&h);
|
||||
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_DEFINE (scm_uniform_vector_element_type, "uniform-vector-element-type", 1, 0, 0,
|
||||
(SCM v),
|
||||
"Return the number of elements in the uniform vector, @var{v}.")
|
||||
#define FUNC_NAME s_scm_uniform_vector_element_type
|
||||
{
|
||||
scm_t_array_handle h;
|
||||
size_t len;
|
||||
ssize_t inc;
|
||||
SCM ret;
|
||||
scm_uniform_vector_elements (v, &h, &len, &inc);
|
||||
ret = scm_array_handle_element_type (&h);
|
||||
scm_array_handle_release (&h);
|
||||
return ret;
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
SCM_DEFINE (scm_uniform_vector_element_size, "uniform-vector-element-size", 1, 0, 0,
|
||||
(SCM v),
|
||||
"Return the number of bytes allocated to each element in the\n"
|
||||
"uniform vector, @var{v}.")
|
||||
#define FUNC_NAME s_scm_uniform_vector_element_size
|
||||
{
|
||||
scm_t_array_handle h;
|
||||
size_t len;
|
||||
ssize_t inc;
|
||||
SCM ret;
|
||||
scm_uniform_vector_elements (v, &h, &len, &inc);
|
||||
ret = scm_from_size_t (scm_array_handle_uniform_element_size (&h));
|
||||
scm_array_handle_release (&h);
|
||||
return ret;
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
SCM
|
||||
scm_c_uniform_vector_ref (SCM v, size_t idx)
|
||||
{
|
||||
SCM ret;
|
||||
scm_t_array_handle h;
|
||||
size_t len;
|
||||
ssize_t inc;
|
||||
|
||||
scm_uniform_vector_elements (v, &h, &len, &inc);
|
||||
ret = scm_array_handle_ref (&h, idx*inc);
|
||||
scm_array_handle_release (&h);
|
||||
return ret;
|
||||
}
|
||||
|
||||
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
|
||||
{
|
||||
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 h;
|
||||
size_t len;
|
||||
ssize_t inc;
|
||||
|
||||
scm_uniform_vector_elements (v, &h, &len, &inc);
|
||||
scm_array_handle_set (&h, idx*inc, val);
|
||||
scm_array_handle_release (&h);
|
||||
}
|
||||
|
||||
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
|
||||
{
|
||||
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
|
||||
{
|
||||
SCM ret;
|
||||
scm_t_array_handle h;
|
||||
size_t len;
|
||||
ssize_t inc;
|
||||
|
||||
scm_uniform_vector_elements (uvec, &h, &len, &inc);
|
||||
ret = scm_generalized_vector_to_list (uvec);
|
||||
scm_array_handle_release (&h);
|
||||
return ret;
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
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)
|
||||
{
|
||||
void *ret;
|
||||
scm_generalized_vector_get_handle (uvec, h);
|
||||
/* FIXME nonlocal exit */
|
||||
ret = scm_array_handle_uniform_writable_elements (h);
|
||||
if (lenp)
|
||||
{
|
||||
scm_t_array_dim *dim = scm_array_handle_dims (h);
|
||||
*lenp = dim->ubnd - dim->lbnd + 1;
|
||||
*incp = dim->inc;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
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 scm_from_size_t (scm_c_uniform_vector_length (v));
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
|
||||
void
|
||||
scm_init_uniform (void)
|
||||
{
|
||||
#include "libguile/uniform.x"
|
||||
}
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
c-file-style: "gnu"
|
||||
End:
|
||||
*/
|
||||
77
libguile/uniform.h
Normal file
77
libguile/uniform.h
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
/* classes: h_files */
|
||||
|
||||
#ifndef SCM_UNIFORM_H
|
||||
#define SCM_UNIFORM_H
|
||||
|
||||
/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public License
|
||||
* as published by the Free Software Foundation; either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
* 02110-1301 USA
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#include "libguile/__scm.h"
|
||||
#include "libguile/generalized-vectors.h"
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Uniform vectors contain unboxed values. They are not necessarily contiguous.
|
||||
*/
|
||||
|
||||
SCM_INTERNAL const size_t scm_i_array_element_type_sizes[];
|
||||
#define SCM_ARRAY_ELEMENT_TYPE_IS_UNBOXED(t) \
|
||||
(scm_i_array_element_type_sizes[(t)] != 0)
|
||||
|
||||
/* returns type size in bits */
|
||||
SCM_API size_t scm_array_handle_uniform_element_size (scm_t_array_handle *h);
|
||||
|
||||
SCM_API const void *scm_array_handle_uniform_elements (scm_t_array_handle *h);
|
||||
SCM_API void *scm_array_handle_uniform_writable_elements (scm_t_array_handle *h);
|
||||
|
||||
SCM_API SCM scm_uniform_vector_p (SCM v);
|
||||
SCM_API SCM scm_uniform_vector_length (SCM v);
|
||||
SCM_API SCM scm_uniform_vector_element_type (SCM v);
|
||||
SCM_API SCM scm_uniform_vector_element_size (SCM v);
|
||||
SCM_API SCM scm_uniform_vector_ref (SCM v, SCM idx);
|
||||
SCM_API SCM scm_uniform_vector_set_x (SCM v, SCM idx, SCM val);
|
||||
SCM_API SCM scm_uniform_vector_to_list (SCM v);
|
||||
SCM_API SCM scm_uniform_vector_read_x (SCM v, SCM port_or_fd,
|
||||
SCM start, SCM end);
|
||||
SCM_API SCM scm_uniform_vector_write (SCM v, SCM port_or_fd,
|
||||
SCM start, SCM end);
|
||||
|
||||
SCM_API int scm_is_uniform_vector (SCM obj);
|
||||
SCM_API size_t scm_c_uniform_vector_length (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 const void *scm_uniform_vector_elements (SCM uvec,
|
||||
scm_t_array_handle *h,
|
||||
size_t *lenp, ssize_t *incp);
|
||||
SCM_API void *scm_uniform_vector_writable_elements (SCM uvec,
|
||||
scm_t_array_handle *h,
|
||||
size_t *lenp,
|
||||
ssize_t *incp);
|
||||
|
||||
SCM_INTERNAL void scm_init_uniform (void);
|
||||
|
||||
#endif /* SCM_UNIFORM_H */
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
c-file-style: "gnu"
|
||||
End:
|
||||
*/
|
||||
Loading…
Add table
Add a link
Reference in a new issue