X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Finterr.lisp;h=60959dad505cc3c69f25f7df4f0dfe0ee9514bd0;hb=310d5f86d736ecf9525711b087b04797c549879c;hp=0e7cde62eb5542aed3614ce00671fd5a8697f4c8;hpb=8ac4c19014a23665e5842d0a989cb9d22d1592ed;p=sbcl.git

diff --git a/src/code/interr.lisp b/src/code/interr.lisp
index 0e7cde6..60959da 100644
--- a/src/code/interr.lisp
+++ b/src/code/interr.lisp
@@ -222,6 +222,10 @@
 	 "A function with declared result type NIL returned:~%  ~S"
 	 :format-arguments (list function)))
 
+(deferr nil-array-accessed-error (array)
+  (error 'nil-array-accessed-error
+	 :datum array :expected-type '(not (array nil))))
+
 (deferr division-by-zero-error (this that)
   (error 'division-by-zero
 	 :operation 'division
@@ -238,7 +242,7 @@
 (deferr layout-invalid-error (object layout)
   (error 'layout-invalid
 	 :datum object
-	 :expected-type (layout-class layout)))
+	 :expected-type (layout-classoid layout)))
 
 (deferr odd-key-args-error ()
   (error 'simple-program-error
@@ -250,10 +254,12 @@
 	 :format-arguments (list key-name)))
 
 (deferr invalid-array-index-error (array bound index)
-  (error 'simple-error
+  (error 'simple-type-error
 	 :format-control
 	 "invalid array index ~W for ~S (should be nonnegative and <~W)"
-	 :format-arguments (list index array bound)))
+	 :format-arguments (list index array bound)
+	 :datum index
+	 :expected-type `(integer 0 (,bound))))
 
 (deferr object-not-simple-array-error (object)
   (error 'type-error
@@ -270,6 +276,11 @@
 	 :datum object
 	 :expected-type '(unsigned-byte 32)))
 
+(deferr object-not-simple-array-nil-error (object)
+  (error 'type-error
+	 :datum object
+	 :expected-type '(simple-array nil (*))))
+
 (deferr object-not-simple-array-unsigned-byte-2-error (object)
   (error 'type-error
 	 :datum object