summaryrefslogtreecommitdiff
path: root/libguile
diff options
context:
space:
mode:
authorDaniel Llorens <daniel.llorens@bluewin.ch>2013-04-25 18:49:14 +0200
committerAndy Wingo <wingo@pobox.com>2014-01-27 21:48:02 +0100
commit3ee4c7645386d56e2bfd9d94aa13d5c7ccff8509 (patch)
tree239c1327c0c6273e439e4def5c604bd218c6c6cb /libguile
parent2bd96d9ecd73b71b3666c7d1931ec3e33e5f49fb (diff)
downloadguile-3ee4c7645386d56e2bfd9d94aa13d5c7ccff8509.tar.gz
Fix scm_ramapc bugs with 0-inc arrays
* libguile/array-map.c: (scm_ramapc): Cannot flag empty on the product inc * dim * dim ... Check every dim. * test-suite/tests/ramap.test: Tests the 0-inc, non empty case for both array-map! and array-copy!.
Diffstat (limited to 'libguile')
-rw-r--r--libguile/array-map.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libguile/array-map.c b/libguile/array-map.c
index 70e3e676f..7d3aced22 100644
--- a/libguile/array-map.c
+++ b/libguile/array-map.c
@@ -130,18 +130,19 @@ scm_ramapc (void *cproc_ptr, SCM data, SCM ra0, SCM lra, const char *what)
{
ssize_t inc = SCM_I_ARRAY_DIMS (ra0)[k].inc;
do {
- inc *= (UBND (ra0, k) - LBND (ra0, k) + 1);
+ ssize_t dim = (UBND (ra0, k) - LBND (ra0, k) + 1);
+ empty = empty || (0 == dim);
+ inc *= dim;
--k;
} while (k >= 0 && inc == SCM_I_ARRAY_DIMS (ra0)[k].inc);
kroll = k+1;
- empty = 0 == inc;
}
else
kroll = 0;
/* Check emptiness of not-unrolled axes. */
- for (; k>=0 && !empty; --k)
- empty = (0 == (UBND (ra0, k) - LBND (ra0, k) + 1));
+ for (; k>=0; --k)
+ empty = empty || (0 == (UBND (ra0, k) - LBND (ra0, k) + 1));
}
else
{