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

vref, vset members of scm_t_array_handle

Browse source 
* libguile/array-handle.h (scm_t_array_ref, scm_t_array_set): Rename
  from scm_i_t_array_ref, scm_i_t_array_set.
  (scm_t_array_handle): Copy vref and vset from impl to handle.
  (scm_array_handle_ref, scm_array_handle_set):

* libguile/array-map.c (racp, ramap, rafe, rafill, array_index_map_1):
* libguile/array-handle.c (scm_array_get_handle): Adapt.
This commit is contained in:
Andy Wingo 2014-02-08 21:02:48 +01:00
parent d747313100
commit 7070f12b9d
4 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libguile/array-map.c
View file

@ -336,7 +336,7 @@ rafill (SCM dst, SCM fill)
inc = SCM_I_ARRAY_DIMS (dst)->inc;
for (; n-- > 0; i += inc)
h.impl->vset (&h, i, fill);
h.vset (&h, i, fill);
scm_array_handle_release (&h);
return 1;
@ -372,7 +372,7 @@ racp (SCM src, SCM dst)
inc_d = SCM_I_ARRAY_DIMS (dst)->inc;
for (; n-- > 0; i_s += inc_s, i_d += inc_d)
h_d.impl->vset (&h_d, i_d, h_s.impl->vref (&h_s, i_s));
h_d.vset (&h_d, i_d, h_s.vref (&h_s, i_s));
scm_array_handle_release (&h_d);
scm_array_handle_release (&h_s);
@ -674,7 +674,7 @@ ramap (SCM ra0, SCM proc, SCM ras)
i0end = i0 + n*inc0;
if (scm_is_null (ras))
for (; i0 < i0end; i0 += inc0)
h0.impl->vset (&h0, i0, scm_call_0 (proc));
h0.vset (&h0, i0, scm_call_0 (proc));
else
{
SCM ra1 = SCM_CAR (ras);
@ -687,7 +687,7 @@ ramap (SCM ra0, SCM proc, SCM ras)
ras = SCM_CDR (ras);
if (scm_is_null (ras))
for (; i0 < i0end; i0 += inc0, i1 += inc1)
h0.impl->vset (&h0, i0, scm_call_1 (proc, h1.impl->vref (&h1, i1)));
h0.vset (&h0, i0, scm_call_1 (proc, h1.vref (&h1, i1)));
else
{
ras = scm_vector (ras);
@ -697,7 +697,7 @@ ramap (SCM ra0, SCM proc, SCM ras)
unsigned long k;
for (k = scm_c_vector_length (ras); k--;)
args = scm_cons (AREF (scm_c_vector_ref (ras, k), i), args);
h0.impl->vset (&h0, i0, scm_apply_1 (proc, h1.impl->vref (&h1, i1), args));
h0.vset (&h0, i0, scm_apply_1 (proc, h1.vref (&h1, i1), args));
}
}
scm_array_handle_release (&h1);
@ -747,7 +747,7 @@ rafe (SCM ra0, SCM proc, SCM ras)
i0end = i0 + n*inc0;
if (scm_is_null (ras))
for (; i0 < i0end; i0 += inc0)
scm_call_1 (proc, h0.impl->vref (&h0, i0));
scm_call_1 (proc, h0.vref (&h0, i0));
else
{
ras = scm_vector (ras);
@ -757,7 +757,7 @@ rafe (SCM ra0, SCM proc, SCM ras)
unsigned long k;
for (k = scm_c_vector_length (ras); k--;)
args = scm_cons (AREF (scm_c_vector_ref (ras, k), i), args);
scm_apply_1 (proc, h0.impl->vref (&h0, i0), args);
scm_apply_1 (proc, h0.vref (&h0, i0), args);
}
}
scm_array_handle_release (&h0);
@ -788,7 +788,7 @@ array_index_map_1 (SCM ra, SCM proc)
v = h.array;
inc = h.dims[0].inc;
for (i = h.dims[0].lbnd, p = h.base; i <= h.dims[0].ubnd; ++i, p += inc)
h.impl->vset (&h, p, scm_call_1 (proc, scm_from_ulong (i)));
h.vset (&h, p, scm_call_1 (proc, scm_from_ulong (i)));
scm_array_handle_release (&h);
}