0.7.9.33:

[sbcl.git] / src / code / condition.lisp

diff --git a/src/code/condition.lisp b/src/code/condition.lisp
index cc7420a..d6cfa9d 100644 (file)
--- a/src/code/condition.lisp
+++ b/src/code/condition.lisp
@@ -1,8 +1,6 @@
 ;;;; stuff originally from CMU CL's error.lisp which can or should
 ;;;; come late (mostly related to the CONDITION class itself)
 ;;;;
-;;;; FIXME: should perhaps be called condition.lisp, or moved into
-;;;; classes.lisp
 
 ;;;; This software is part of the SBCL system. See the README file for
 ;;;; more information.
@@ -499,10 +497,6 @@
          (t
           (error "unknown option: ~S" (first option)))))
 
-      (when (all-writers)
-       (warn "Condition slot setters probably not allowed in ANSI CL:~%  ~S"
-             (all-writers)))
-
       `(progn
         (eval-when (:compile-toplevel :load-toplevel :execute)
           (%compiler-define-condition ',name ',parent-types ',layout))
@@ -588,15 +582,7 @@
   ((pathname :reader file-error-pathname :initarg :pathname))
   (:report
    (lambda (condition stream)
-     (format stream
-            "~@<error on file ~_~S: ~2I~:_~?~:>"
-            (file-error-pathname condition)
-            ;; FIXME: ANSI's FILE-ERROR doesn't have FORMAT-CONTROL and 
-            ;; FORMAT-ARGUMENTS, and the inheritance here doesn't seem
-            ;; to give us FORMAT-CONTROL or FORMAT-ARGUMENTS either.
-            ;; So how does this work?
-            (serious-condition-format-control condition)
-            (serious-condition-format-arguments condition)))))
+     (format stream "error on file ~S" (file-error-pathname condition)))))
 
 (define-condition package-error (error)
   ((package :reader package-error-package :initarg :package)))
@@ -618,6 +604,13 @@
             "The function ~S is undefined."
             (cell-error-name condition)))))
 
+(define-condition special-form-function (undefined-function) ()
+  (:report
+   (lambda (condition stream)
+     (format stream
+            "Cannot FUNCALL the SYMBOL-FUNCTION of special operator ~S."
+            (cell-error-name condition)))))
+
 (define-condition arithmetic-error (error)
   ((operation :reader arithmetic-error-operation
              :initarg :operation
@@ -703,6 +696,21 @@
             "The index ~S is too large."
             (type-error-datum condition)))))
 
+;;; Out-of-range &KEY END arguments are similar to, but off by one
+;;; from out-of-range indices into the sequence.
+;;;
+;;; FIXME: Uh, but it isn't used for &KEY END things -- in fact, this
+;;; is only used in one place, in SUBSEQ.  Is it really necessary?  Is
+;;; it here so that we can actually go round seq.lisp decorating all
+;;; the sequence functions with extra checks?  -- CSR, 2002-11-01
+(define-condition end-too-large-error (type-error)
+  ()
+  (:report
+   (lambda (condition stream)
+     (format stream
+            "The end-of-sequence specifier ~S is too large."
+            (type-error-datum condition)))))
+
 (define-condition io-timeout (stream-error)
   ((direction :reader io-timeout-direction :initarg :direction))
   (:report
@@ -739,6 +747,17 @@
             "unexpected end of file on ~S ~A"
             (stream-error-stream condition)
             (reader-eof-error-context condition)))))
+
+(define-condition reader-impossible-number-error (reader-error)
+  ((error :reader reader-impossible-number-error-error :initarg :error))
+  (:report
+   (lambda (condition stream)
+     (let ((error-stream (stream-error-stream condition)))
+       (format stream "READER-ERROR ~@[at ~W ~]on ~S:~%~?~%Original error: ~A"
+              (file-position error-stream) error-stream
+              (reader-error-format-control condition)
+              (reader-error-format-arguments condition)
+              (reader-impossible-number-error-error condition))))))
 \f
 ;;;; special SBCL extension conditions
 
@@ -767,8 +786,8 @@
               alien code or from unsafe Lisp code; or there might be a bug ~
               in the OS or hardware that SBCL is running on.) If it seems to ~
               be a bug in SBCL itself, the maintainers would like to know ~
-              how to exercise the bug so it can be fixed. Bug reports are ~
-              welcome on the SBCL mailing lists, which you can find at ~
+              about it. Bug reports are welcome on the SBCL ~
+              mailing lists, which you can find at ~
               <http://sbcl.sourceforge.net/>.~:@>"
             '((fmakunbound 'compile))))))
 (defun bug (format-control &rest format-arguments)