X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Ffngen.lisp;h=8491082171dffbfadd6ba1d13cde1e18700d100c;hb=22a6702974b7d6ff4e8f2b3b7b5ff446fc632de0;hp=0017ce04065fdefdf17696e526dc79524e2d91ac;hpb=3a5eefac8a65dfd36729031f0a9b9dd8c022b7f2;p=sbcl.git

diff --git a/src/pcl/fngen.lisp b/src/pcl/fngen.lisp
index 0017ce0..8491082 100644
--- 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))
 
 ;;; *FGENS* is a list of all the function generators we have so far. Each