X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Farray.pure.lisp;h=7f5c11f70258a3b214142bd9df60643da24909b1;hb=aa0ed5a420ea5295d586b3f323b5375d3b506860;hp=9919eb75b09bdfe0de063964527b417022d8cb50;hpb=138316f3ffc98856be1f63ad29f8b28b7e89547f;p=sbcl.git

diff --git a/tests/array.pure.lisp b/tests/array.pure.lisp
index 9919eb7..7f5c11f 100644
--- a/tests/array.pure.lisp
+++ b/tests/array.pure.lisp
@@ -210,7 +210,7 @@
                            'bit-vector)
           do (assert (bit-vector-equal r1 r2)))))
 
-(with-test (:name (adjust-array fill-pointer)) 
+(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
@@ -226,3 +226,38 @@
   (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)))))))