0.7.12.18:

[sbcl.git] / src / compiler / generic / interr.lisp

diff --git a/src/compiler/generic/interr.lisp b/src/compiler/generic/interr.lisp
index b48d836..ea88a91 100644 (file)
--- a/src/compiler/generic/interr.lisp
+++ b/src/compiler/generic/interr.lisp
@@ -24,8 +24,12 @@
 ;;; functions as closures instead of DEFUNs?
 (eval-when (:compile-toplevel :execute)
   (def!macro define-internal-errors (&rest errors)
-            (let ((info (mapcar #'(lambda (x)
-                                    (if x
+            (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))
                                       '(nil . "unused")))
@@ -38,7 +42,7 @@
 (define-internal-errors
   (unknown
    "unknown system lossage")
-  (object-not-function
+  (object-not-fun
    "Object is not of type FUNCTION.")
   (object-not-list
    "Object is not of type LIST.")
@@ -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-function
-   "Object is not coerceable to type FUNCTION.")
-  (invalid-argument-count
+  (invalid-arg-count
    "invalid argument count")
-  (bogus-argument-to-values-list
+  (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
@@ -108,12 +107,10 @@
    "division by zero")
   (object-not-type
    "Object is of the wrong type.")
-  (odd-key-arguments
+  (odd-key-args
    "odd number of &KEY arguments")
-  (unknown-key-argument
+  (unknown-key-arg
    "unknown &KEY argument")
-  nil
-  nil
   (invalid-array-index
    "invalid array index")
   (wrong-number-of-indices
@@ -175,7 +172,7 @@
    "Object is not a INSTANCE.")
   (object-not-base-char
    "Object is not of type BASE-CHAR.")
-  (nil-function-returned
+  (nil-fun-returned
    "A function with declared result type NIL returned.")
   (layout-invalid
    "Object layout is invalid. (indicates obsolete instance)")