X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Finterr.lisp;h=6fcae7542a3377e1a1fcf834a39e25964caccdcf;hb=5930ee54090c03d242c70716683b12b95d74a089;hp=b9814bbf5c7f67afbc7c88891f3cee9e5bc734ca;hpb=80304981972c91c1b3f3fca75f36dacf1fecf307;p=sbcl.git

diff --git a/src/compiler/generic/interr.lisp b/src/compiler/generic/interr.lisp
index b9814bb..6fcae75 100644
--- a/src/compiler/generic/interr.lisp
+++ b/src/compiler/generic/interr.lisp
@@ -25,6 +25,10 @@
 (eval-when (:compile-toplevel :execute)
   (def!macro define-internal-errors (&rest errors)
 	     (let ((info (mapcar (lambda (x)
+                                   ;; FIXME: We shouldn't need placeholder
+                                   ;; NIL entries any more now that we
+                                   ;; pass our magic numbers cleanly
+                                   ;; through sbcl.h.
 				   (if x
 				       (cons (symbolicate (first x) "-ERROR")
 					     (second x))
@@ -83,21 +87,16 @@
    "Object is not of type CONS.")
   (object-not-symbol
    "Object is not of type SYMBOL.")
-  (undefined-symbol
+  (undefined-fun
    ;; FIXME: Isn't this used for calls to unbound (SETF FOO) too? If so, revise
    ;; the name.
    "An attempt was made to use an undefined FDEFINITION.")
-  (object-not-coerceable-to-fun
-   "Object is not coerceable to type FUNCTION.")
   (invalid-arg-count
    "invalid argument count")
   (bogus-arg-to-values-list
    "bogus argument to VALUES-LIST")
   (unbound-symbol
    "An attempt was made to use an undefined SYMBOL-VALUE.")
-  ;; FIXME: We shouldn't need these placeholder NIL entries any more
-  ;; now that we pass our magic numbers cleanly through sbcl.h.
-  nil 
   (object-not-sap
    "Object is not a System Area Pointer (SAP).")
   (invalid-unwind
@@ -112,8 +111,6 @@
    "odd number of &KEY arguments")
   (unknown-key-arg
    "unknown &KEY argument")
-  nil
-  nil
   (invalid-array-index
    "invalid array index")
   (wrong-number-of-indices
@@ -124,6 +121,8 @@
    "Object is not of type (SIGNED-BYTE 32).")
   (object-not-unsigned-byte-32
    "Object is not of type (UNSIGNED-BYTE 32).")
+  (object-not-simple-array-nil
+   "Object is not of type (SIMPLE-ARRAY NIL (*)).")
   (object-not-simple-array-unsigned-byte-2
    "Object is not of type (SIMPLE-ARRAY (UNSIGNED-BYTE 2) (*)).")
   (object-not-simple-array-unsigned-byte-4
@@ -177,6 +176,8 @@
    "Object is not of type BASE-CHAR.")
   (nil-fun-returned
    "A function with declared result type NIL returned.")
+  (nil-array-accessed
+   "An array with element-type NIL was accessed.")
   (layout-invalid
    "Object layout is invalid. (indicates obsolete instance)")
   (object-not-complex-vector