diff options
author | Marius Vollmer <mvo@zagadka.de> | 2005-01-09 22:06:56 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2005-01-09 22:06:56 +0000 |
commit | 4ea4bc4c403d7113dd93034d13230fb80cd2b3a9 (patch) | |
tree | 846cb743c34da89747ec5b2e815a677cc18079a1 /libguile/srfi-4.c | |
parent | 9598a4060a558e70675ac3321597b68d914c6148 (diff) | |
download | guile-4ea4bc4c403d7113dd93034d13230fb80cd2b3a9.tar.gz |
* srfi-4.h, srfi-4.c, srfi-4.i.c (scm_i_uniform_vector_ref_proc,
scm_i_uniform_vector_set_proc): New.
(u8ref, u8set, s8ref, s8set, etc): New.
(uvec_reffers, uvec_setters): New.
(uvec_to_list): Use generic scm_array_handle_ref instead of
uvec_fast_ref since scm_array_handle_ref should be faster now.
More changes like this are upcoming.
Diffstat (limited to 'libguile/srfi-4.c')
-rw-r--r-- | libguile/srfi-4.c | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c index 71f649644..2b8a589fd 100644 --- a/libguile/srfi-4.c +++ b/libguile/srfi-4.c @@ -408,12 +408,10 @@ uvec_to_list (int type, SCM uvec) SCM res = SCM_EOL; elts = uvec_elements (type, uvec, &handle, &len, &inc); - if (type < 0) - type = uvec_type (&handle); for (i = len*inc; i > 0;) { i -= inc; - res = scm_cons (uvec_fast_ref (type, elts, i), res); + res = scm_cons (scm_array_handle_ref (&handle, i), res); } scm_array_handle_release (&handle); return res; @@ -1001,6 +999,36 @@ SCM_DEFINE (scm_uniform_vector_write, "uniform-vector-write", 1, 3, 0, #define CTYPE double #include "libguile/srfi-4.i.c" +static scm_i_t_array_ref uvec_reffers[12] = { + u8ref, s8ref, + u16ref, s16ref, + u32ref, s32ref, + u64ref, s64ref, + f32ref, f64ref, + c32ref, c64ref +}; + +static scm_i_t_array_set uvec_setters[12] = { + u8set, s8set, + u16set, s16set, + u32set, s32set, + u64set, s64set, + f32set, f64set, + c32set, c64set +}; + +scm_i_t_array_ref +scm_i_uniform_vector_ref_proc (SCM uvec) +{ + return uvec_reffers[SCM_UVEC_TYPE(uvec)]; +} + +scm_i_t_array_set +scm_i_uniform_vector_set_proc (SCM uvec) +{ + return uvec_setters[SCM_UVEC_TYPE(uvec)]; +} + void scm_init_srfi_4 (void) { |