0.9.14.8:

[sbcl.git] / src / pcl / fngen.lisp

diff --git a/src/pcl/fngen.lisp b/src/pcl/fngen.lisp
index 0017ce0..8491082 100644 (file)
--- a/src/pcl/fngen.lisp
+++ b/src/pcl/fngen.lisp
@@ -60,8 +60,7 @@
           (compute-constants lambda constant-converter)))
 
 (defun default-constantp (form)
-  (and (constantp form)
-       (not (typep (eval form) '(or symbol fixnum)))))
+  (constant-typep form '(not (or symbol fixnum))))
 
 (defun default-test-converter (form)
   (if (default-constantp form)
@@ -75,7 +74,7 @@
 
 (defun default-constant-converter (form)
   (if (default-constantp form)
-      (list (eval form))
+      (list (constant-form-value form))
       nil))
 \f
 ;;; *FGENS* is a list of all the function generators we have so far. Each