projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.9.10.4: better CONSTANTP
[sbcl.git]
/
src
/
code
/
condition.lisp
diff --git
a/src/code/condition.lisp
b/src/code/condition.lisp
index
ae93468
..
8c19059
100644
(file)
--- a/
src/code/condition.lisp
+++ b/
src/code/condition.lisp
@@
-529,8
+529,8
@@
:initform-p ',initform-p
:documentation ',documentation
:initform
:initform-p ',initform-p
:documentation ',documentation
:initform
- ,(if (constantp initform)
- `',(eval initform)
+ ,(if (sb!xc:constantp initform)
+ `',(constant-form-value initform)
`#'(lambda () ,initform)))))))
(dolist (option options)
`#'(lambda () ,initform)))))))
(dolist (option options)
@@
-553,8
+553,8
@@
(let ((val (second initargs)))
(setq default-initargs
(list* `',(first initargs)
(let ((val (second initargs)))
(setq default-initargs
(list* `',(first initargs)
- (if (constantp val)
- `',(eval val)
+ (if (sb!xc:constantp val)
+ `',(constant-form-value val)
`#'(lambda () ,val))
default-initargs)))))
(t
`#'(lambda () ,val))
default-initargs)))))
(t