X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Farray.pure.lisp;h=a44193b5cc692b50deaf88277f6cd622d1fe1995;hb=8ade1fa8b1ddc95478d2287b4593a80d314b6bd3;hp=d3dc6cd2eb0ee172e2396d759c4252db4a6cd9ce;hpb=f846a7a310d630cf538811959916492a28a75fb1;p=sbcl.git diff --git a/tests/array.pure.lisp b/tests/array.pure.lisp index d3dc6cd..a44193b 100644 --- a/tests/array.pure.lisp +++ b/tests/array.pure.lisp @@ -4,7 +4,7 @@ ;;;; While most of SBCL is derived from the CMU CL system, the test ;;;; files (like this one) were written from scratch after the fork ;;;; from CMU CL. -;;;; +;;;; ;;;; This software is in the public domain and is provided with ;;;; absolutely no warranty. See the COPYING and CREDITS files for ;;;; more information. @@ -14,78 +14,78 @@ ;;; Array initialization has complicated defaulting for :ELEMENT-TYPE, ;;; and both compile-time and run-time logic takes a whack at it. (let ((testcases '(;; Bug 126, confusion between high-level default string - ;; initial element #\SPACE and low-level default array - ;; element #\NULL, is gone. - (#\null (make-array 11 :element-type 'character) simple-string) - (#\space (make-string 11 :initial-element #\space) string) - (#\* (make-string 11 :initial-element #\*)) - (#\null (make-string 11)) - (#\null (make-string 11 :initial-element #\null)) - (#\x (make-string 11 :initial-element #\x)) - ;; And the other tweaks made when fixing bug 126 didn't - ;; mess things up too badly either. - (0 (make-array 11) simple-vector) - (nil (make-array 11 :initial-element nil)) - (12 (make-array 11 :initial-element 12)) - (0 (make-array 11 :element-type '(unsigned-byte 4)) (simple-array (unsigned-byte 4) (*))) - (12 (make-array 11 - :element-type '(unsigned-byte 4) - :initial-element 12))))) + ;; initial element #\SPACE and low-level default array + ;; element #\NULL, is gone. + (#\null (make-array 11 :element-type 'character) simple-string) + (#\space (make-string 11 :initial-element #\space) string) + (#\* (make-string 11 :initial-element #\*)) + (#\null (make-string 11)) + (#\null (make-string 11 :initial-element #\null)) + (#\x (make-string 11 :initial-element #\x)) + ;; And the other tweaks made when fixing bug 126 didn't + ;; mess things up too badly either. + (0 (make-array 11) simple-vector) + (nil (make-array 11 :initial-element nil)) + (12 (make-array 11 :initial-element 12)) + (0 (make-array 11 :element-type '(unsigned-byte 4)) (simple-array (unsigned-byte 4) (*))) + (12 (make-array 11 + :element-type '(unsigned-byte 4) + :initial-element 12))))) (dolist (testcase testcases) (destructuring-bind (expected-result form &optional type) testcase (unless (eql expected-result (aref (eval form) 3)) (error "expected ~S in EVAL ~S" expected-result form)) (unless (eql expected-result - (aref (funcall (compile nil `(lambda () ,form))) 3)) + (aref (funcall (compile nil `(lambda () ,form))) 3)) (error "expected ~S in FUNCALL COMPILE ~S" expected-result form)) ;; also do some testing of compilation and verification that ;; errors are thrown appropriately. (unless (eql expected-result - (funcall (compile nil `(lambda () (aref ,form 3))))) - (error "expected ~S in COMPILED-AREF ~S" expected-result form)) + (funcall (compile nil `(lambda () (aref ,form 3))))) + (error "expected ~S in COMPILED-AREF ~S" expected-result form)) (when type - (unless (eql expected-result - (funcall (compile nil `(lambda () (let ((x ,form)) - (declare (type ,type x)) - (aref x 3)))))) - (error "expected ~S in COMPILED-DECLARED-AREF ~S" expected-result form))) + (unless (eql expected-result + (funcall (compile nil `(lambda () (let ((x ,form)) + (declare (type ,type x)) + (aref x 3)))))) + (error "expected ~S in COMPILED-DECLARED-AREF ~S" expected-result form))) (when (ignore-errors (aref (eval form) 12)) - (error "error not thrown in EVAL ~S" form)) + (error "error not thrown in EVAL ~S" form)) (when (ignore-errors (aref (funcall (compile nil `(lambda () ,form))) 12)) - (error "error not thrown in FUNCALL COMPILE ~S")) + (error "error not thrown in FUNCALL COMPILE ~S")) (when (ignore-errors (funcall (compile nil `(lambda () (aref ,form 12))))) - (error "error not thrown in COMPILED-AREF ~S" form)) + (error "error not thrown in COMPILED-AREF ~S" form)) (when type - (when (ignore-errors (funcall - (compile nil `(lambda () (let ((x ,form)) - (declare (type ,type x)) - (aref x 12)))))) - (error "error not thrown in COMPILED-DECLARED-AREF ~S" form)))))) + (when (ignore-errors (funcall + (compile nil `(lambda () (let ((x ,form)) + (declare (type ,type x)) + (aref x 12)))))) + (error "error not thrown in COMPILED-DECLARED-AREF ~S" form)))))) ;;; On the SPARC, until sbcl-0.7.7.20, there was a bug in array ;;; references for small vector elements (spotted by Raymond Toy); the ;;; bug persisted on the PPC until sbcl-0.7.8.20. (let (vector) (loop for i below 64 - for list = (make-list 64 :initial-element 1) - do (setf (nth i list) 0) - do (setf vector (make-array 64 :element-type 'bit - :initial-contents list)) - do (assert (= (funcall - (compile nil - `(lambda (rmdr) - (declare (type (simple-array bit (*)) rmdr) - (optimize (speed 3) (safety 0))) - (aref rmdr ,i))) - vector) - 0)))) + for list = (make-list 64 :initial-element 1) + do (setf (nth i list) 0) + do (setf vector (make-array 64 :element-type 'bit + :initial-contents list)) + do (assert (= (funcall + (compile nil + `(lambda (rmdr) + (declare (type (simple-array bit (*)) rmdr) + (optimize (speed 3) (safety 0))) + (aref rmdr ,i))) + vector) + 0)))) ;;; Following refactoring of sequence functions to detect bad type ;;; specifiers, REVERSE was left broken on vectors with fill pointers. (let ((a (make-array 10 - :fill-pointer 5 - :element-type 'character - :initial-contents "abcdefghij"))) + :fill-pointer 5 + :element-type 'character + :initial-contents "abcdefghij"))) (assert (string= (reverse a) "edcba"))) ;;; ARRAY-IN-BOUNDS-P should work when given non-INDEXes as its @@ -139,7 +139,7 @@ ;; an array with more than 2^24 elements, since that was a symptom ;; from the CLISP and OpenMCL hosts. (let ((big-array (opaque-identity - (make-array (expt 2 26) :element-type 'bit)))) + (make-array (expt 2 26) :element-type 'bit)))) (assert (= (length big-array) (expt 2 26))))) ;;; Bug reported by Kalle Olavi Niemitalo for CMUCL through Debian BTS @@ -147,13 +147,13 @@ (assert (eql (aref array) nil))) (let ((f (compile nil '(lambda () - (let ((a (make-array '(4) - :element-type 'base-char - :initial-element #\z))) - (setf (aref a 0) #\a) - (setf (aref a 1) #\b) - (setf (aref a 2) #\c) - a))))) + (let ((a (make-array '(4) + :element-type 'base-char + :initial-element #\z))) + (setf (aref a 0) #\a) + (setf (aref a 1) #\b) + (setf (aref a 2) #\c) + a))))) (assert (= (length (funcall f)) 4))) (let ((x (make-array nil :initial-element 'foo))) @@ -166,12 +166,12 @@ (multiple-value-bind (val err) (ignore-errors (locally (declare (optimize (safety 3) (speed 0))) - (let* ((x (make-array 10 :fill-pointer 4 :element-type 'character - :initial-element #\space :adjustable t)) - (y (make-array 10 :fill-pointer 4 :element-type 'character - :displaced-to x))) - (adjust-array x '(5)) - (char y 5)))) + (let* ((x (make-array 10 :fill-pointer 4 :element-type 'character + :initial-element #\space :adjustable t)) + (y (make-array 10 :fill-pointer 4 :element-type 'character + :displaced-to x))) + (adjust-array x '(5)) + (char y 5)))) (assert (and (not val) (typep err 'sb-kernel:displaced-to-array-too-small-error)))) ;;; MISC.527: bit-vector bitwise operations used LENGTH to get a size @@ -181,10 +181,14 @@ (equal (array-dimension v1 0) (array-dimension v2 0)) (loop for i below (array-dimension v1 0) always (eql (aref v1 i) (aref v2 i)))))) - (let ((v1 (make-array 4 :element-type 'bit :fill-pointer 0 - :initial-contents '(0 0 1 1))) - (v2 (make-array 4 :element-type 'bit :fill-pointer 1 - :initial-contents '(0 0 1 1)))) + (let* ((length 1024) + (v1 (make-array length :element-type 'bit :fill-pointer 0)) + (v2 (make-array length :element-type 'bit :fill-pointer 1))) + (loop for i from 0 below length + for x1 in '#1=(0 0 1 1 . #1#) + and x2 in '#2=(0 1 0 1 . #2#) + do (setf (aref v1 i) x1) + do (setf (aref v2 i) x2)) (loop for (bf lf) in '((bit-and logand) (bit-andc1 logandc1) (bit-andc2 logandc2) @@ -201,7 +205,7 @@ (declare (optimize (speed 3) (safety 0))) (,bf v ,v2))) for r1 = (funcall fun v1) - and r2 = (coerce (loop for i below 4 + and r2 = (coerce (loop for i below length collect (logand 1 (funcall lf (aref v1 i) (aref v2 i)))) 'bit-vector) do (assert (bit-vector-equal r1 r2)))))