projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a typo in the block comment on encoding/decoding universal times
[sbcl.git]
/
src
/
compiler
/
compiler-error.lisp
diff --git
a/src/compiler/compiler-error.lisp
b/src/compiler/compiler-error.lisp
index
f3b5426
..
ac0a366
100644
(file)
--- a/
src/compiler/compiler-error.lisp
+++ b/
src/compiler/compiler-error.lisp
@@
-91,14
+91,13
@@
(let ((condition (coerce-to-condition datum arguments
'simple-program-error 'compiler-error)))
(restart-case
(let ((condition (coerce-to-condition datum arguments
'simple-program-error 'compiler-error)))
(restart-case
- (progn
- (cerror "Replace form with call to ERROR."
- 'compiler-error
- :condition condition)
- (funcall *compiler-error-bailout* condition)
- (bug "Control returned from *COMPILER-ERROR-BAILOUT*."))
+ (cerror "Replace form with call to ERROR."
+ 'compiler-error
+ :condition condition)
(signal-error ()
(signal-error ()
- (error condition)))))
+ (error condition)))
+ (funcall *compiler-error-bailout* condition)
+ (bug "Control returned from *COMPILER-ERROR-BAILOUT*.")))
(defun compiler-warn (datum &rest arguments)
(apply #'warn datum arguments)
(defun compiler-warn (datum &rest arguments)
(apply #'warn datum arguments)
@@
-108,10
+107,15
@@
(apply #'style-warn datum arguments)
(values))
(apply #'style-warn datum arguments)
(values))
+(defun source-to-string (source)
+ (write-to-string source
+ :escape t :readably nil :pretty t
+ :circle t :array nil))
+
(defun make-compiler-error-form (condition source)
`(error 'compiled-program-error
:message ,(princ-to-string condition)
(defun make-compiler-error-form (condition source)
`(error 'compiled-program-error
:message ,(princ-to-string condition)
- :source ,(princ-to-string source)))
+ :source ,(source-to-string source)))
;;; Fatal compiler errors. We export FATAL-COMPILER-ERROR as an
;;; interface for errors that kill the compiler dead
;;; Fatal compiler errors. We export FATAL-COMPILER-ERROR as an
;;; interface for errors that kill the compiler dead