summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Llorens <daniel.llorens@bluewin.ch>2013-04-24 17:13:56 +0200
committerAndy Wingo <wingo@pobox.com>2014-01-27 21:48:02 +0100
commit7c78a99f80642c0340faaa3ee45a07637f2bf351 (patch)
treef4b03a32a69dabcb33604eb8ec37f87a1baabd58
parentebe19774eaa2b3d3bb5610f4ba3fdbf9a87ca8c8 (diff)
downloadguile-7c78a99f80642c0340faaa3ee45a07637f2bf351.tar.gz
Check more cases of array-contents
* libguile/arrays.c: (scm_array_contents): fix comment. * test-suite/tests/arrays.test: add cases that depend on correct setting of CONTIGUOUS_FLAG.
-rw-r--r--libguile/arrays.c4
-rw-r--r--test-suite/tests/arrays.test12
2 files changed, 13 insertions, 3 deletions
diff --git a/libguile/arrays.c b/libguile/arrays.c
index e86a620ae..54c354683 100644
--- a/libguile/arrays.c
+++ b/libguile/arrays.c
@@ -547,8 +547,8 @@ SCM_DEFINE (scm_transpose_array, "transpose-array", 1, 0, 1,
/* attempts to unroll an array into a one-dimensional array.
returns the unrolled array or #f if it can't be done. */
- /* if strict is not SCM_UNDEFINED, return #f if returned array
- wouldn't have contiguous elements. */
+/* if strict is true, return #f if returned array
+ wouldn't have contiguous elements. */
SCM_DEFINE (scm_array_contents, "array-contents", 1, 1, 0,
(SCM ra, SCM strict),
"If @var{ra} may be @dfn{unrolled} into a one dimensional shared\n"
diff --git a/test-suite/tests/arrays.test b/test-suite/tests/arrays.test
index ce0b4a1b2..9ea123b73 100644
--- a/test-suite/tests/arrays.test
+++ b/test-suite/tests/arrays.test
@@ -350,7 +350,17 @@
(pass-if "broadcast vector -> empty"
(let* ((a (make-array 0 4))
(b (make-shared-array a (lambda (i j k) (list k)) 0 1 4)))
- (if #f #f))))
+ (if #f #f)))
+
+ (pass-if "broadcast 2-rank I"
+ (let* ((a #2((1 2 3) (4 5 6)))
+ (b (make-shared-array a (lambda (i j) (list 0 j)) 2 3)))
+ (not (array-contents b))))
+
+ (pass-if "broadcast 2-rank I"
+ (let* ((a #2((1 2 3) (4 5 6)))
+ (b (make-shared-array a (lambda (i j) (list i 0)) 2 3)))
+ (not (array-contents b)))))
;;;
;;; shared-array-root