From b0d9b0744a6bfadbf172a90ed3b5b788555ca11d Mon Sep 17 00:00:00 2001 From: Daniel Llorens Date: Fri, 19 Apr 2013 10:42:40 +0200 Subject: Fix empty array bug in array-index-map! * libguile/array-map.c: (scm_array_index_map_x): bail out if any one of the axes is empty. * test-suite/tests/ramap.test: add tests for empty array-case of array-index-map!. The 'f64 case with not-last emtpy axis is broken in 2.0.9. --- libguile/array-map.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'libguile/array-map.c') diff --git a/libguile/array-map.c b/libguile/array-map.c index 83f3a9949..057a0e5af 100644 --- a/libguile/array-map.c +++ b/libguile/array-map.c @@ -783,9 +783,7 @@ array_index_map_1 (SCM ra, SCM proc) scm_t_array_handle h; ssize_t i, inc; size_t p; - SCM v; scm_array_get_handle (ra, &h); - 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.vset (&h, p, scm_call_1 (proc, scm_from_ulong (i))); @@ -806,7 +804,11 @@ array_index_map_n (SCM ra, SCM proc) indices_gc_hint); for (k = 0; k <= kmax; k++) - vinds[k] = SCM_I_ARRAY_DIMS (ra)[k].lbnd; + { + vinds[k] = SCM_I_ARRAY_DIMS (ra)[k].lbnd; + if (vinds[k] > SCM_I_ARRAY_DIMS (ra)[k].ubnd) + return; + } k = kmax; do { @@ -822,16 +824,17 @@ array_index_map_n (SCM ra, SCM proc) i += SCM_I_ARRAY_DIMS (ra)[k].inc; } k--; - continue; } - if (vinds[k] < SCM_I_ARRAY_DIMS (ra)[k].ubnd) + else if (vinds[k] < SCM_I_ARRAY_DIMS (ra)[k].ubnd) { vinds[k]++; k++; - continue; } - vinds[k] = SCM_I_ARRAY_DIMS (ra)[k].lbnd - 1; - k--; + else + { + vinds[k] = SCM_I_ARRAY_DIMS (ra)[k].lbnd - 1; + k--; + } } while (k >= 0); } -- cgit v1.2.3