1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
guile/libguile/uniform.c
Andy Wingo fb7dd00169 Deprecate general "uniform-vector" interface
* libguile/uniform.h:
* libguile/uniform.c (scm_is_uniform_vector, scm_uniform_vector_p)
  (scm_c_uniform_vector_length, scm_uniform_vector_length)
  (scm_uniform_vector_element_type, scm_uniform_vector_element_size)
  (scm_c_uniform_vector_ref, scm_uniform_vector_ref):
  (scm_c_uniform_vector_set_x, scm_uniform_vector_set_x):
  (scm_uniform_vector_to_list)
  (scm_uniform_vector_elements, scm_uniform_vector_writable_elements):
  Deprecate.  This interface lacked both generality and specificity.
  The general replacement is array-length, array-ref, and friends on the
  scheme side, or the array handle interface on the C side.  On the
  specific side of things, there are the specific bytevector, srfi-4,
  and bitvector interfaces.

* test-suite/tests/arrays.test:
* test-suite/tests/bitvectors.test:
* test-suite/tests/ports.test:
* test-suite/tests/srfi-4.test: Update to use array interfaces.

* doc/ref/api-foreign.texi (Void Pointers and Byte Access):
* doc/ref/srfi-modules.texi (SRFI-4): Update.
2014-02-08 14:28:07 +01:00

303 lines
8.2 KiB
C
Raw Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006, 2009, 2010, 2013, 2014 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
#define SCM_BUILDING_DEPRECATED_CODE
#include "libguile/_scm.h"
#include "libguile/__scm.h"
#include "libguile/uniform.h"
#include "libguile/deprecation.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
};
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 if (ret)
scm_wrong_type_arg_msg (NULL, 0, h->array, "byte-aligned uniform array");
else
scm_wrong_type_arg_msg (NULL, 0, h->array, "uniform array");
}
size_t
scm_array_handle_uniform_element_bit_size (scm_t_array_handle *h)
{
size_t ret = scm_i_array_element_type_sizes[h->element_type];
if (ret)
return ret;
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;
}
#if SCM_ENABLE_DEPRECATED
int
scm_is_uniform_vector (SCM obj)
{
scm_t_array_handle h;
int ret = 0;
scm_c_issue_deprecation_warning
("scm_is_uniform_vector is deprecated. "
"Use scm_is_bytevector || scm_is_bitvector instead.");
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_c_issue_deprecation_warning
("scm_c_uniform_vector_length is deprecated. "
"Use scm_c_array_length instead.");
if (!scm_is_uniform_vector (uvec))
scm_wrong_type_arg_msg ("uniform-vector-length", 1, uvec,
"uniform vector");
return scm_c_generalized_vector_length (uvec);
}
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
{
scm_c_issue_deprecation_warning
("uniform-vector? is deprecated. Use bytevector? and bitvector?, or "
"use array-type and array-rank instead.");
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 type of the elements in the uniform vector, @var{v}.")
#define FUNC_NAME s_scm_uniform_vector_element_type
{
scm_t_array_handle h;
SCM ret;
scm_c_issue_deprecation_warning
("uniform-vector-element-type is deprecated. Use array-type instead.");
if (!scm_is_uniform_vector (v))
scm_wrong_type_arg_msg (FUNC_NAME, SCM_ARG1, v, "uniform vector");
scm_array_get_handle (v, &h);
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_c_issue_deprecation_warning
("uniform-vector-element-size is deprecated. Instead, treat the "
"uniform vector as a bytevector.");
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_c_issue_deprecation_warning
("scm_c_uniform_vector_ref is deprecated. Use scm_c_array_ref_1 instead.");
if (!scm_is_uniform_vector (v))
scm_wrong_type_arg_msg (NULL, 0, v, "uniform vector");
return scm_c_generalized_vector_ref (v, idx);
}
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"
"homogeneous numeric vector @var{v}.")
#define FUNC_NAME s_scm_uniform_vector_ref
{
scm_c_issue_deprecation_warning
("uniform-vector-ref is deprecated. Use array-ref instead.");
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_c_issue_deprecation_warning
("scm_c_uniform_vector_set_x is deprecated. Instead, use "
"scm_c_array_set_1_x, but note the change in the order of the arguments.");
if (!scm_is_uniform_vector (v))
scm_wrong_type_arg_msg (NULL, 0, v, "uniform vector");
scm_c_generalized_vector_set_x (v, idx, val);
}
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"
"homogeneous numeric vector @var{v} to @var{val}.")
#define FUNC_NAME s_scm_uniform_vector_set_x
{
scm_c_issue_deprecation_warning
("uniform-vector-set! is deprecated. Instead, use array-set!, "
"but note the change in the order of the arguments.");
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_c_issue_deprecation_warning
("uniform-vector->list is deprecated. Use array->list instead.");
if (!scm_is_uniform_vector (uvec))
scm_wrong_type_arg_msg (FUNC_NAME, SCM_ARG1, uvec, "uniform vector");
return scm_array_to_list (uvec);
}
#undef FUNC_NAME
const void *
scm_uniform_vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp, ssize_t *incp)
{
scm_c_issue_deprecation_warning
("scm_uniform_vector_elements is deprecated. Use "
"scm_array_handle_uniform_elements instead.");
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_c_issue_deprecation_warning
("scm_uniform_vector_writable_elements is deprecated. Use "
"scm_array_handle_uniform_writable_elements instead.");
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
{
scm_c_issue_deprecation_warning
("uniform-vector-length is deprecated. Use array-length instead.");
return scm_from_size_t (scm_c_uniform_vector_length (v));
}
#undef FUNC_NAME
#endif /* SCM_ENABLE_DEPRECATED */
void
scm_init_uniform (void)
{
#include "libguile/uniform.x"
}
/*
Local Variables:
c-file-style: "gnu"
End:
*/