X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fmacros.lisp;h=3060a0648022dcf2602b5c73eecc5f0ce0b7633b;hb=ebc0f0ebf9efd39519ab86ba28c33abdb25443e0;hp=4aa875b45305a9c6d847e26e34ad401b7f5f7b92;hpb=81ce38f2e03e4f569d7a95bb18efb25bb16fc269;p=sbcl.git

diff --git a/src/pcl/macros.lisp b/src/pcl/macros.lisp
index 4aa875b..3060a06 100644
--- a/src/pcl/macros.lisp
+++ b/src/pcl/macros.lisp
@@ -113,11 +113,6 @@
             (t
              (error "~S is not a legal class name." symbol)))))
 
-(defun find-class-predicate-from-cell (symbol cell &optional (errorp t))
-  (unless (find-class-cell-class cell)
-    (find-class-from-cell symbol cell errorp))
-  (find-class-cell-predicate cell))
-
 (defun legal-class-name-p (x)
   (symbolp x))
 
@@ -127,11 +122,6 @@
                         (find-class-cell symbol errorp)
                         errorp))
 
-(defun find-class-predicate (symbol &optional (errorp t) environment)
-  (declare (ignore environment))
-  (find-class-predicate-from-cell symbol
-                                  (find-class-cell symbol errorp)
-                                  errorp))
 
 ;;; This DEFVAR was originally in defs.lisp, now moved here.
 ;;;
@@ -147,11 +137,10 @@
                                    symbol &optional (errorp t) environment)
   (declare (ignore environment))
   (if (and (constantp symbol)
-           (legal-class-name-p (eval symbol))
+           (legal-class-name-p (setf symbol (constant-form-value symbol)))
            (constantp errorp)
            (member *boot-state* '(braid complete)))
-      (let ((symbol (eval symbol))
-            (errorp (not (null (eval errorp))))
+      (let ((errorp (not (null (constant-form-value errorp))))
             (class-cell (make-symbol "CLASS-CELL")))
         `(let ((,class-cell (load-time-value (find-class-cell ',symbol))))
            (or (find-class-cell-class ,class-cell)
@@ -174,10 +163,6 @@
              (setf (find-classoid name) nil))
            (when (or (eq *boot-state* 'complete)
                      (eq *boot-state* 'braid))
-             (when (and new-value (class-wrapper new-value)
-                        (class-predicate-name new-value))
-               (setf (find-class-cell-predicate cell)
-                     (fdefinition (class-predicate-name new-value))))
              (update-ctors 'setf-find-class :class new-value :name name))
            new-value))
         (t
@@ -185,12 +170,6 @@
 
 (/show "pcl/macros.lisp 230")
 
-(defun (setf find-class-predicate)
-       (new-value symbol)
-  (if (legal-class-name-p symbol)
-    (setf (find-class-cell-predicate (find-class-cell symbol)) new-value)
-    (error "~S is not a legal class name." symbol)))
-
 (defun find-wrapper (symbol)
   (class-wrapper (find-class symbol)))