X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Finterr.lisp;h=f119356e26a0e24cc48a04f3c2b3ac835b5c083a;hb=d40a76606c86722b0aef8179155f9f2840739b72;hp=f0fe0726b2223e2ba66530dcdc03c9dce184dbe5;hpb=a4d2556c02207a7b04ec497155f52e4f21d2795c;p=sbcl.git

diff --git a/src/compiler/generic/interr.lisp b/src/compiler/generic/interr.lisp
index f0fe072..f119356 100644
--- 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,7 +87,7 @@
    ;; 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 argument count")
@@ -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)")