X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Farray.pure.lisp;h=513a6d8b5cf964abe7357eb65481696b0ac47b6c;hb=3aaed55326303bb377c4821c5e83b2e4e9c538fc;hp=d25d97c490441629eec0063266f7fa0b6e44a1e1;hpb=416152f084604094445a758ff399871132dff2bd;p=sbcl.git

diff --git a/tests/array.pure.lisp b/tests/array.pure.lisp
index d25d97c..513a6d8 100644
--- a/tests/array.pure.lisp
+++ b/tests/array.pure.lisp
@@ -11,31 +11,71 @@
 
 (in-package :cl-user)
 
-;;; FIXME: Bug 126 isn't dead yet..
-#|
 ;;; 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.
-		   (#\space (make-array 11 :element-type 'character))
-		   (#\space (make-string 11 :initial-element #\space))
-		   (#\space (make-string 11))
+		   (#\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.
-		   (nil (make-array 11))
+		   (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)))
+		   (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) testcase
+    (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 form)) 3))
-        (error "expected ~S in FUNCALL COMPILE ~S" expected-result form)))))
-|#
\ No newline at end of file
+      (unless (eql expected-result
+		   (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))
+      (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)))
+      (when (ignore-errors (aref (eval form) 12))
+	(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"))
+      (when (ignore-errors (funcall (compile nil `(lambda () (aref ,form 12)))))
+	(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))))))
+
+;;; 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))))