mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 20:00:19 +02:00
* libguile/generalized-arrays.h: * libguile/generalized-arrays.c (scm_c_array_length): (scm_array_length): New functions. * module/ice-9/deprecated.scm: * libguile/generalized-vectors.c: * libguile/generalized-vectors.h: * libguile/deprecated.h: * libguile/deprecated.c (scm_generalized_vector_p) (scm_generalized_vector_length, scm_generalized_vector_ref) (scm_generalized_vector_set_x, scm_generalized_vector_to_list): Deprecate. * libguile/uniform.c (scm_uniform_vector_to_list): Use scm_array_to_list. * module/ice-9/boot-9.scm (case): Arrays are generalized vectors. * module/srfi/srfi-4/gnu.scm (define-any->vector): Use the array functions instead of the generalized-vector functions. * test-suite/tests/arrays.test: Remove generalized-vector->list test; covered by array->list test. * test-suite/tests/bitvectors.test: * test-suite/tests/bytevectors.test: * test-suite/tests/srfi-4.test: Adapt to test using array interfaces instead of generalized-vector interfaces. * doc/ref/api-compound.texi: Remove generalized vector docs. * doc/ref/api-data.texi: * doc/ref/srfi-modules.texi: Adapt.
146 lines
3.7 KiB
C
146 lines
3.7 KiB
C
/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004,
|
||
* 2005, 2006, 2009, 2010, 2011, 2012, 2013 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 "libguile/_scm.h"
|
||
#include "libguile/__scm.h"
|
||
|
||
#include "libguile/array-handle.h"
|
||
#include "libguile/generalized-arrays.h"
|
||
#include "libguile/generalized-vectors.h"
|
||
|
||
|
||
struct scm_t_vector_ctor
|
||
{
|
||
SCM tag;
|
||
SCM (*ctor)(SCM, SCM);
|
||
};
|
||
|
||
#define VECTOR_CTORS_N_STATIC_ALLOC 20
|
||
static struct scm_t_vector_ctor vector_ctors[VECTOR_CTORS_N_STATIC_ALLOC];
|
||
static int num_vector_ctors_registered = 0;
|
||
|
||
void
|
||
scm_i_register_vector_constructor (SCM type, SCM (*ctor)(SCM, SCM))
|
||
{
|
||
if (num_vector_ctors_registered >= VECTOR_CTORS_N_STATIC_ALLOC)
|
||
/* need to increase VECTOR_CTORS_N_STATIC_ALLOC, buster */
|
||
abort ();
|
||
else
|
||
{
|
||
vector_ctors[num_vector_ctors_registered].tag = type;
|
||
vector_ctors[num_vector_ctors_registered].ctor = ctor;
|
||
num_vector_ctors_registered++;
|
||
}
|
||
}
|
||
|
||
SCM_DEFINE (scm_make_generalized_vector, "make-generalized-vector", 2, 1, 0,
|
||
(SCM type, SCM len, SCM fill),
|
||
"Make a generalized vector")
|
||
#define FUNC_NAME s_scm_make_generalized_vector
|
||
{
|
||
int i;
|
||
for (i = 0; i < num_vector_ctors_registered; i++)
|
||
if (scm_is_eq (vector_ctors[i].tag, type))
|
||
return vector_ctors[i].ctor(len, fill);
|
||
scm_wrong_type_arg_msg (FUNC_NAME, SCM_ARG1, type, "array type");
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
int
|
||
scm_is_generalized_vector (SCM obj)
|
||
{
|
||
int ret = 0;
|
||
if (scm_is_array (obj))
|
||
{
|
||
scm_t_array_handle h;
|
||
scm_array_get_handle (obj, &h);
|
||
ret = scm_array_handle_rank (&h) == 1;
|
||
scm_array_handle_release (&h);
|
||
}
|
||
return ret;
|
||
}
|
||
|
||
#define SCM_VALIDATE_VECTOR_WITH_HANDLE(pos, val, handle) \
|
||
scm_generalized_vector_get_handle (val, handle)
|
||
|
||
|
||
void
|
||
scm_generalized_vector_get_handle (SCM vec, scm_t_array_handle *h)
|
||
{
|
||
scm_array_get_handle (vec, h);
|
||
if (scm_array_handle_rank (h) != 1)
|
||
{
|
||
scm_array_handle_release (h);
|
||
scm_wrong_type_arg_msg (NULL, 0, vec, "vector");
|
||
}
|
||
}
|
||
|
||
size_t
|
||
scm_c_generalized_vector_length (SCM v)
|
||
{
|
||
scm_t_array_handle h;
|
||
size_t ret;
|
||
scm_generalized_vector_get_handle (v, &h);
|
||
ret = h.dims[0].ubnd - h.dims[0].lbnd + 1;
|
||
scm_array_handle_release (&h);
|
||
return ret;
|
||
}
|
||
|
||
SCM
|
||
scm_c_generalized_vector_ref (SCM v, size_t idx)
|
||
{
|
||
scm_t_array_handle h;
|
||
size_t pos;
|
||
SCM ret;
|
||
scm_generalized_vector_get_handle (v, &h);
|
||
pos = h.base + h.dims[0].lbnd + idx * h.dims[0].inc;
|
||
ret = h.impl->vref (&h, pos);
|
||
scm_array_handle_release (&h);
|
||
return ret;
|
||
}
|
||
|
||
void
|
||
scm_c_generalized_vector_set_x (SCM v, size_t idx, SCM val)
|
||
{
|
||
scm_t_array_handle h;
|
||
size_t pos;
|
||
scm_generalized_vector_get_handle (v, &h);
|
||
pos = h.base + h.dims[0].lbnd + idx * h.dims[0].inc;
|
||
h.impl->vset (&h, pos, val);
|
||
scm_array_handle_release (&h);
|
||
}
|
||
|
||
void
|
||
scm_init_generalized_vectors ()
|
||
{
|
||
#include "libguile/generalized-vectors.x"
|
||
}
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|