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

diff --git a/src/code/interr.lisp b/src/code/interr.lisp
index 4ee10ee..2ca9050 100644
--- a/src/code/interr.lisp
+++ b/src/code/interr.lisp
@@ -103,16 +103,6 @@
 	 :datum object
 	 :expected-type 'simple-string))
 
-(deferr object-not-simple-bit-vector-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type 'simple-bit-vector))
-
-(deferr object-not-simple-vector-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type 'simple-vector))
-
 (deferr object-not-fixnum-error (object)
   (error 'type-error
 	 :datum object
@@ -128,6 +118,11 @@
 	 :datum object
 	 :expected-type 'string))
 
+(deferr object-not-base-string-error (object)
+  (error 'type-error
+	 :datum object
+	 :expected-type 'base-string))
+
 (deferr object-not-bit-vector-error (object)
   (error 'type-error
 	 :datum object
@@ -222,6 +217,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 +237,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,76 +271,23 @@
 	 :datum object
 	 :expected-type '(unsigned-byte 32)))
 
-(deferr object-not-simple-array-unsigned-byte-2-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array (unsigned-byte 2) (*))))
-
-(deferr object-not-simple-array-unsigned-byte-4-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array (unsigned-byte 4) (*))))
-
-(deferr object-not-simple-array-unsigned-byte-8-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array (unsigned-byte 8) (*))))
-
-(deferr object-not-simple-array-unsigned-byte-16-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array (unsigned-byte 16) (*))))
-
-(deferr object-not-simple-array-unsigned-byte-32-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array (unsigned-byte 32) (*))))
-
-(deferr object-not-simple-array-signed-byte-8-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array (signed-byte 8) (*))))
-
-(deferr object-not-simple-array-signed-byte-16-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array (signed-byte 16) (*))))
-
-(deferr object-not-simple-array-signed-byte-30-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array (signed-byte 30) (*))))
-
-(deferr object-not-simple-array-signed-byte-32-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array (signed-byte 32) (*))))
-
-(deferr object-not-simple-array-single-float-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array single-float (*))))
-
-(deferr object-not-simple-array-double-float-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array double-float (*))))
-
-(deferr object-not-simple-array-complex-single-float-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array (complex single-float) (*))))
-
-(deferr object-not-simple-array-complex-double-float-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array (complex double-float) (*))))
-
-#!+long-float
-(deferr object-not-simple-array-complex-long-float-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type '(simple-array (complex long-float) (*))))
+(macrolet
+    ((define-simple-array-internal-errors ()
+	 `(progn
+	   ,@(map 'list
+		  (lambda (saetp)
+		    `(deferr ,(symbolicate
+			       "OBJECT-NOT-"
+			       (sb!vm:saetp-primitive-type-name saetp)
+			       "-ERROR")
+		              (object)
+		      (error 'type-error
+		             :datum object
+		             :expected-type '(simple-array
+					      ,(sb!vm:saetp-specifier saetp)
+					      (*)))))
+		  sb!vm:*specialized-array-element-type-properties*))))
+  (define-simple-array-internal-errors))
 
 (deferr object-not-complex-error (object)
   (error 'type-error