0.pre7.141:

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

diff --git a/src/compiler/generic/interr.lisp b/src/compiler/generic/interr.lisp
index f0fe072..b9814bb 100644 (file)
--- a/src/compiler/generic/interr.lisp
+++ b/src/compiler/generic/interr.lisp
@@ -20,11 +20,12 @@
 ;;; FIXME: Having each of these error handlers be a full, named function
 ;;; seems to contribute a noticeable amount of bloat and little value.
 ;;; Perhaps we could just make a single error-handling function with a
-;;; big CASE statement inside it?
+;;; big CASE statement inside it? Or at least implement the error handling
+;;; 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)
+                                  (if x
                                       (cons (symbolicate (first x) "-ERROR")
                                             (second x))
                                       '(nil . "unused")))
@@ -37,7 +38,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.")
@@ -60,8 +61,6 @@
    "Object is not of type SIMPLE-VECTOR.")
   (object-not-fixnum
    "Object is not of type FIXNUM.")
-  (object-not-function-or-symbol
-   "Object is not of type FUNCTION or SYMBOL.")
   (object-not-vector
    "Object is not of type VECTOR.")
   (object-not-string
@@ -88,11 +87,11 @@
    ;; 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-not-coerceable-to-fun
    "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.")
@@ -109,9 +108,9 @@
    "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
@@ -176,7 +175,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)")