diff options
author | Andy Wingo <wingo@pobox.com> | 2014-02-09 12:31:59 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2014-02-09 12:48:21 +0100 |
commit | cf64dca65c4ee4d845a73e7d7c15ab7583aff15b (patch) | |
tree | 690ecc2fd6357077f0e736df9bf4637bce6b0aa6 /libguile/arrays.c | |
parent | 8269f0be18c046d94f01f83dcff80794e97e6c27 (diff) | |
download | guile-cf64dca65c4ee4d845a73e7d7c15ab7583aff15b.tar.gz |
Remove array impl. registry; instead, hard-code array handle creation
* libguile/array-handle.h (scm_t_vector_ref, scm_t_vector_set): Rename
from scm_t_array_ref, scm_t_array_set. These were named
scm_i_t_array_ref and scm_i_t_array_set in 1.8 and 2.0. Change to
take the vector directly, instead of the array handle. In this way,
generic array handles are layered on top of specific implementations
of backing stores.
Remove scm_t_array_implementation, introduced in 2.0 but never
documented. It was a failed attempt to layer the array implementation
that actually introduced too many layers, as it prevented the "vref"
and "vset" members of scm_t_array_handle (called "ref" and "set" in
1.8, not present in 2.0) from specializing on array backing stores.
(scm_i_register_array_implementation) (scm_i_array_implementation_for_obj):
Remove these internal interfaces.
(scm_t_array_handle): Adapt to scm_t_vector_ref / scm_t_vector_set
change.
(scm_array_handle_ref, scm_array_handle_set): Adapt to change in
vref/vset prototype.
* libguile/array-handle.c (scm_array_get_handle): Inline all the
necessary initializations here for all specific array types.
* libguile/array-map.c (rafill, racp, ramap, rafe, array_index_map_1):
* libguile/arrays.c: Remove array implementation code.
* libguile/bitvectors.h:
* libguile/bitvectors.c: Remove array implementation code.
(scm_i_bitvector_bits): New internal interface.
* libguile/bytevectors.c: Remove array implementation code.
* libguile/srfi-4.h: Remove declarations for internal procedures that
don't exist (!).
* libguile/strings.c: Remove array implementation code.
* libguile/vectors.c: Remove array implementation code.
Diffstat (limited to 'libguile/arrays.c')
-rw-r--r-- | libguile/arrays.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/libguile/arrays.c b/libguile/arrays.c index a771739ad..84d0f71fb 100644 --- a/libguile/arrays.c +++ b/libguile/arrays.c @@ -819,40 +819,6 @@ scm_i_print_array (SCM array, SCM port, scm_print_state *pstate) return scm_i_print_array_dimension (&h, 0, 0, port, pstate); } -static SCM -array_handle_ref (scm_t_array_handle *hh, size_t pos) -{ - return scm_c_array_ref_1 (SCM_I_ARRAY_V (hh->array), pos); -} - -static void -array_handle_set (scm_t_array_handle *hh, size_t pos, SCM val) -{ - scm_c_array_set_1_x (SCM_I_ARRAY_V (hh->array), val, pos); -} - -/* FIXME: should be handle for vect? maybe not, because of dims */ -static void -array_get_handle (SCM array, scm_t_array_handle *h) -{ - scm_t_array_handle vh; - scm_array_get_handle (SCM_I_ARRAY_V (array), &vh); - assert (vh.dims[0].inc == 1 && vh.dims[0].lbnd == 0 && vh.base == 0); - h->element_type = vh.element_type; - h->elements = vh.elements; - h->writable_elements = vh.writable_elements; - scm_array_handle_release (&vh); - - h->dims = SCM_I_ARRAY_DIMS (array); - h->ndims = SCM_I_ARRAY_NDIM (array); - h->base = SCM_I_ARRAY_BASE (array); -} - -SCM_ARRAY_IMPLEMENTATION (scm_tc7_array, - 0x7f, - array_handle_ref, array_handle_set, - array_get_handle) - void scm_init_arrays () { |