projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.7.11.10:
[sbcl.git]
/
src
/
compiler
/
generic
/
interr.lisp
diff --git
a/src/compiler/generic/interr.lisp
b/src/compiler/generic/interr.lisp
index
a76e6b3
..
ea88a91
100644
(file)
--- a/
src/compiler/generic/interr.lisp
+++ b/
src/compiler/generic/interr.lisp
@@
-20,11
+20,16
@@
;;; 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
;;; 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)
(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")))
(cons (symbolicate (first x) "-ERROR")
(second x))
'(nil . "unused")))
@@
-37,7
+42,7
@@
(define-internal-errors
(unknown
"unknown system lossage")
(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.")
"Object is not of type FUNCTION.")
(object-not-list
"Object is not of type LIST.")
@@
-60,8
+65,6
@@
"Object is not of type SIMPLE-VECTOR.")
(object-not-fixnum
"Object is not of type FIXNUM.")
"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
(object-not-vector
"Object is not of type VECTOR.")
(object-not-string
@@
-84,21
+87,16
@@
"Object is not of type CONS.")
(object-not-symbol
"Object is not of type SYMBOL.")
"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.")
;; 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")
"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.")
"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
(object-not-sap
"Object is not a System Area Pointer (SAP).")
(invalid-unwind
@@
-109,12
+107,10
@@
"division by zero")
(object-not-type
"Object is of the wrong type.")
"division by zero")
(object-not-type
"Object is of the wrong type.")
- (odd-key-arguments
+ (odd-key-args
"odd number of &KEY arguments")
"odd number of &KEY arguments")
- (unknown-key-argument
+ (unknown-key-arg
"unknown &KEY argument")
"unknown &KEY argument")
- nil
- nil
(invalid-array-index
"invalid array index")
(wrong-number-of-indices
(invalid-array-index
"invalid array index")
(wrong-number-of-indices
@@
-176,9
+172,9
@@
"Object is not a INSTANCE.")
(object-not-base-char
"Object is not of type BASE-CHAR.")
"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
"A function with declared result type NIL returned.")
(layout-invalid
- "invalid layout (indicates obsolete instance)")
+ "Object layout is invalid. (indicates obsolete instance)")
(object-not-complex-vector
"Object is not a complex (non-SIMPLE-ARRAY) vector."))
(object-not-complex-vector
"Object is not a complex (non-SIMPLE-ARRAY) vector."))