X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fcompiler-error.lisp;h=aa597ce10a81481e281f431130854bed8dba2ef1;hb=49e8403800426f37a54d9b87353a31af36e7af40;hp=a9b6ef5d263314b857f6ff530bb93aea132a5a4c;hpb=4fe24806cb00efee6bbd64f6575eadb3cedcb224;p=sbcl.git diff --git a/src/compiler/compiler-error.lisp b/src/compiler/compiler-error.lisp index a9b6ef5..aa597ce 100644 --- a/src/compiler/compiler-error.lisp +++ b/src/compiler/compiler-error.lisp @@ -82,7 +82,7 @@ ;;; CSR, 2003-05-13 (define-condition compiler-error (encapsulated-condition) () (:report (lambda (condition stream) - (print-object (encapsulated-condition condition) stream)))) + (print-object (encapsulated-condition condition) stream)))) ;;; Signal the appropriate condition. COMPILER-ERROR calls the bailout ;;; function so that it never returns (but compilation continues). @@ -100,14 +100,12 @@ (signal-error () (error condition))))) -(declaim (ftype (function (string &rest t) (values)) - compiler-warn compiler-style-warn)) -(defun compiler-warn (format-string &rest format-args) - (apply #'warn format-string format-args) +(defun compiler-warn (datum &rest arguments) + (apply #'warn datum arguments) (values)) -(defun compiler-style-warn (format-string &rest format-args) - (apply #'style-warn format-string format-args) +(defun compiler-style-warn (datum &rest arguments) + (apply #'style-warn datum arguments) (values)) (defun make-compiler-error-form (condition source) @@ -140,13 +138,13 @@ (;; the position where the bad READ began, or NIL if unavailable, ;; redundant, or irrelevant (position :reader input-error-in-compile-file-position - :initarg :position - :initform nil)) + :initarg :position + :initform nil)) (:report (lambda (condition stream) (format stream - "~@<~S failure in ~S~@[ at character ~W~]: ~2I~_~A~:>" - 'read - 'compile-file - (input-error-in-compile-file-position condition) - (encapsulated-condition condition))))) + "~@<~S failure in ~S~@[ at character ~W~]: ~2I~_~A~:>" + 'read + 'compile-file + (input-error-in-compile-file-position condition) + (encapsulated-condition condition)))))