mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-02 04:40:29 +02:00
Code Activity

(coerce_to_uvec, scm_c_uniform_vector_ref,

Browse source 
scm_c_uniform_vector_set_x): Use generic scm_array_handle_ref/set
instead of uvec_fast_ref/set since scm_array_handle_ref should be
faster now.
This commit is contained in:
Marius Vollmer 2005-01-09 22:37:50 +00:00
parent 4475d3febd
commit 4e8ad32394
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libguile/srfi-4.c
View file

@ -494,11 +494,14 @@ coerce_to_uvec (int type, SCM obj)
return list_to_uvec (type, obj); return list_to_uvec (type, obj);
else if (scm_is_generalized_vector (obj)) else if (scm_is_generalized_vector (obj))
{ {
scm_t_array_handle handle;
size_t len = scm_c_generalized_vector_length (obj), i; size_t len = scm_c_generalized_vector_length (obj), i;
SCM uvec = alloc_uvec (type, len); SCM uvec = alloc_uvec (type, len);
void *base = SCM_UVEC_BASE (uvec); scm_array_get_handle (uvec, &handle);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
uvec_fast_set_x (type, base, i, scm_c_generalized_vector_ref (obj, i)); scm_array_handle_set (&handle, i,
scm_c_generalized_vector_ref (obj, i));
scm_array_handle_release (&handle);
return uvec; return uvec;
} }
else else
@ -570,17 +573,14 @@ SCM
scm_c_uniform_vector_ref (SCM v, size_t idx) scm_c_uniform_vector_ref (SCM v, size_t idx)
{ {
scm_t_array_handle handle; scm_t_array_handle handle;
const void *elts;
size_t len; size_t len;
ssize_t inc; ssize_t inc;
SCM res; SCM res;
int type;
elts = uvec_elements (-1, v, &handle, &len, &inc); uvec_elements (-1, v, &handle, &len, &inc);
type = uvec_type (&handle);
if (idx >= len) if (idx >= len)
scm_out_of_range (NULL, scm_from_size_t (idx)); scm_out_of_range (NULL, scm_from_size_t (idx));
res = uvec_fast_ref (type, elts, idx*inc); res = scm_array_handle_ref (&handle, idx*inc);
scm_array_handle_release (&handle); scm_array_handle_release (&handle);
return res; return res;
} }
@ -612,16 +612,13 @@ void
scm_c_uniform_vector_set_x (SCM v, size_t idx, SCM val) scm_c_uniform_vector_set_x (SCM v, size_t idx, SCM val)
{ {
scm_t_array_handle handle; scm_t_array_handle handle;
void *elts;
size_t len; size_t len;
ssize_t inc; ssize_t inc;
int type;
elts = uvec_writable_elements (-1, v, &handle, &len, &inc); uvec_writable_elements (-1, v, &handle, &len, &inc);
type = uvec_type (&handle);
if (idx >= len) if (idx >= len)
scm_out_of_range (NULL, scm_from_size_t (idx)); scm_out_of_range (NULL, scm_from_size_t (idx));
uvec_fast_set_x (type, elts, idx*inc, val); scm_array_handle_set (&handle, idx*inc, val);
scm_array_handle_release (&handle); scm_array_handle_release (&handle);
} }