X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Finterr.lisp;h=60959dad505cc3c69f25f7df4f0dfe0ee9514bd0;hb=f1407e424f1063203af07d2e61ceef58515a4797;hp=4ee10eef89819d77785c7aca40d462273a925071;hpb=e43ebe3057bd62a58987b22f53c386ca7f5740f8;p=sbcl.git

diff --git a/src/code/interr.lisp b/src/code/interr.lisp
index 4ee10ee..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
@@ -272,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