Fix make-array transforms.

[sbcl.git] / tests / array.pure.lisp

diff --git a/tests/array.pure.lisp b/tests/array.pure.lisp
index 5068878..b775bbd 100644 (file)
--- 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.
 ;;;; 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.
 ;;;; 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
 ;;; 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
   (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
         (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
       (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))
       (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))
       (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)))))
       (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 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
 
 ;;; 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
 
 ;;; 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
   (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
   ;; 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
     (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 ()
   (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)))
   (assert (= (length (funcall f)) 4)))
 
 (let ((x (make-array nil :initial-element 'foo)))

@@ -163,16 +163,19 @@
 ;;; BUG 315: "no bounds check for access to displaced array"
 ;;;  reported by Bruno Haible sbcl-devel "various SBCL bugs" from CLISP
 ;;;  test suite.
 ;;; BUG 315: "no bounds check for access to displaced array"
 ;;;  reported by Bruno Haible sbcl-devel "various SBCL bugs" from CLISP
 ;;;  test suite.

-(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))))
-  (assert (and (not val) (typep err 'sb-kernel:displaced-to-array-too-small-error))))
+(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)))
+    (assert (eq x (adjust-array x '(5))))
+    (assert (eq :error (handler-case
+                           (char y 0)
+                         (sb-int:invalid-array-error (e)
+                           (assert (eq y (type-error-datum e)))
+                           (assert (equal `(vector character 10)
+                                          (type-error-expected-type e)))
+                           :error))))))

 
 ;;; MISC.527: bit-vector bitwise operations used LENGTH to get a size
 ;;; of a vector
 
 ;;; MISC.527: bit-vector bitwise operations used LENGTH to get a size
 ;;; of a vector

@@ -209,3 +212,89 @@
                                  collect (logand 1 (funcall lf (aref v1 i) (aref v2 i))))
                            'bit-vector)
           do (assert (bit-vector-equal r1 r2)))))
                                  collect (logand 1 (funcall lf (aref v1 i) (aref v2 i))))
                            'bit-vector)
           do (assert (bit-vector-equal r1 r2)))))

+
+(with-test (:name (adjust-array fill-pointer))
+  ;; CLHS, ADJUST-ARRAY: An error of type error is signaled if
+  ;; fill-pointer is supplied and non-nil but array has no fill pointer.
+  (assert (eq :good
+              (handler-case
+                  (let ((array (make-array 12)))
+                    (assert (not (array-has-fill-pointer-p array)))
+                    (adjust-array array 12 :fill-pointer t)
+                    array)
+                (type-error ()
+                  :good)))))
+
+(with-test (:name (adjust-array :multidimensional))
+  (let ((ary (make-array '(2 2))))
+    ;; SBCL used to give multidimensional arrays a bogus fill-pointer
+    (assert (not (array-has-fill-pointer-p (adjust-array ary '(2 2)))))))
+
+(with-test (:name :%set-fill-pointer/error)
+  (let ((v (make-array 3 :fill-pointer 0)))
+    (handler-case
+        (progn
+          (setf (fill-pointer v) 12)
+          (error "WTF"))
+      (error (e)
+        (assert (eql 12 (type-error-datum e)))
+        (assert (equal '(integer 0 3) (type-error-expected-type e)))))))
+
+(with-test (:name array-storage-vector)
+  (let ((vec (vector 1 2 3)))
+    (assert (eq vec (sb-ext:array-storage-vector vec)))
+    (assert (equalp (vector 1 2 3 4)
+                    (sb-ext:array-storage-vector
+                     (make-array '(2 2) :initial-contents '((1 2) (3 4))))))
+    (assert (eq 'fixnum (array-element-type
+                         (sb-ext:array-storage-vector (make-array '(3 4 5)
+                                                                 :element-type 'fixnum)))))
+    (assert (not (array-has-fill-pointer-p
+                  (sb-ext::array-storage-vector
+                   (make-array 5 :fill-pointer 4)))))))
+
+(with-test (:name :invalid-array-index-error)
+  (let ((array (make-array '(3 3 3))))
+    (assert
+     (eq :right
+         (handler-case
+             (eval `(aref ,array 0 1 3))
+           (sb-int:invalid-array-index-error (e)
+             (when (and (eq array (sb-kernel::invalid-array-index-error-array e))
+                        (= 3 (type-error-datum e))
+                        (equal '(integer 0 (3)) (type-error-expected-type e)))
+               :right)))))))
+
+(with-test (:name :out-of-bounds-error-details)
+  (assert (eq :good
+              (handler-case
+                  (flet ((test (array i)
+                           (aref array i)))
+                    (test (eval '(vector 0 1 2 3)) 6))
+                (sb-int:invalid-array-index-error (e)
+                  (when (and (equal '(integer 0 (4))
+                                    (type-error-expected-type e))
+                             (eql 6 (type-error-datum e)))
+                    :good))))))
+
+(with-test (:name :odd-keys-for-make-array)
+  (assert (eq :good
+              (handler-case
+                  (compile nil '(lambda (m) (make-array m 1)))
+                (simple-warning () :good)))))
+
+
+(with-test (:name :bug-1096359)
+  (let ((a (make-array 1 :initial-element 5)))
+    (assert (equalp (adjust-array a 2 :initial-element 10)
+                    #(5 10)))))
+
+(with-test (:name (:make-array-transform-unknown-type :bug-1156095))
+  (assert
+   (handler-case
+       (compile nil `(lambda () (make-array '(1 2)
+                                            :element-type ',(gensym))))
+     (style-warning ()
+       t)
+     (:no-error (&rest args)
+       nil))))