Fix make-array transforms.

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

diff --git a/tests/array.pure.lisp b/tests/array.pure.lisp
index 5141d41..b775bbd 100644 (file)
--- a/tests/array.pure.lisp
+++ b/tests/array.pure.lisp
@@ -164,16 +164,18 @@
 ;;;  reported by Bruno Haible sbcl-devel "various SBCL bugs" from CLISP
 ;;;  test suite.
 (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)))
-        (handler-case
-            (adjust-array x '(5))
-          (error (e)
-            (assert (typep e 'sb-int:simple-reference-error))
-            (assert (equal '((:ansi-cl function adjust-array))
-                           (sb-int:reference-condition-references e)))))))
+  (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
@@ -223,12 +225,12 @@
                 (type-error ()
                   :good)))))
 
-(with-test (:name (adjust-array multidimensional))
+(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)
+(with-test (:name :%set-fill-pointer/error)
   (let ((v (make-array 3 :fill-pointer 0)))
     (handler-case
         (progn
@@ -251,7 +253,7 @@
                   (sb-ext::array-storage-vector
                    (make-array 5 :fill-pointer 4)))))))
 
-(with-test (:name invalid-array-index-error)
+(with-test (:name :invalid-array-index-error)
   (let ((array (make-array '(3 3 3))))
     (assert
      (eq :right
@@ -275,3 +277,24 @@
                              (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))))