mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

Use underlying vector implementation directly in array handles

Browse source 
* libguile/array-handle.c
  - scm_array_get_handle: if the object is an array, point impl to
    the underlying vector instead of array impl, then fix the axes. Avoid
    calling scm_i_array_implementation_for_obj twice.
* libguile/arrays.c
  - array_handle_ref, array_handle_set, array_get_handle: remove.
* libguile/bitvectors.c, libguile/bytevectors.c, libguile/strings.c,
  libguile/vectors.c: fix base = 0 in the array handle.
* libguile/vectors.c: (vector_handle_set, vector_handle_ref): do not
  use h->dims.
This commit is contained in:
Daniel Llorens 2013-04-12 17:50:09 +02:00 • committed by Andy Wingo
parent ba7e018b61
commit a70333d296
6 changed files with 33 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

39
libguile/array-handle.c
View file

@ -62,19 +62,32 @@ scm_i_array_implementation_for_obj (SCM obj)
void
scm_array_get_handle (SCM array, scm_t_array_handle *h)
{
scm_t_array_implementation *impl = scm_i_array_implementation_for_obj (array);
if (!impl)
scm_wrong_type_arg_msg (NULL, 0, array, "array");
h->array = array;
h->impl = impl;
h->base = 0;
h->ndims = 0;
h->dims = NULL;
h->element_type = SCM_ARRAY_ELEMENT_TYPE_SCM; /* have to default to
something... */
h->elements = NULL;
h->writable_elements = NULL;
h->impl->get_handle (array, h);
scm_t_array_implementation *impl;
if (SCM_I_ARRAYP (array))
{
SCM v = SCM_I_ARRAY_V (array);
impl = scm_i_array_implementation_for_obj (v);
h->impl = impl;
h->impl->get_handle (v, h);
/* this works because the v's impl NEVER uses dims/ndims/base */
h->dims = SCM_I_ARRAY_DIMS (array);
h->ndims = SCM_I_ARRAY_NDIM (array);
h->base = SCM_I_ARRAY_BASE (array);
}
else
{
impl = scm_i_array_implementation_for_obj (array);
if (impl)
{
h->impl = impl;
/* see bitvector_get_handle, string_get_handle,
bytevector_get_handle, vector_get_handle, only ever called
from here */
h->impl->get_handle (array, h);
}
else
scm_wrong_type_arg_msg (NULL, 0, array, "array");
}
}
ssize_t