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

diff --git a/src/pcl/macros.lisp b/src/pcl/macros.lisp
index 4aa875b..a9a657f 100644
--- a/src/pcl/macros.lisp
+++ b/src/pcl/macros.lisp
@@ -79,59 +79,33 @@
 
 (/show "pcl/macros.lisp 119")
 
-(defvar *find-class* (make-hash-table :test 'eq))
-
-(defmacro find-class-cell-class (cell)
-  `(car ,cell))
-
-(defmacro find-class-cell-predicate (cell)
-  `(cadr ,cell))
-
-(defmacro make-find-class-cell (class-name)
-  (declare (ignore class-name))
-  '(list* nil #'constantly-nil nil))
-
-(defun find-class-cell (symbol &optional dont-create-p)
-  (or (gethash symbol *find-class*)
-      (unless dont-create-p
-        (unless (legal-class-name-p symbol)
-          (error "~S is not a legal class name." symbol))
-        (setf (gethash symbol *find-class*) (make-find-class-cell symbol)))))
-
-(/show "pcl/macros.lisp 157")
+(declaim (inline legal-class-name-p))
+(defun legal-class-name-p (x)
+  (symbolp x))
 
 (defvar *create-classes-from-internal-structure-definitions-p* t)
 
 (defun find-class-from-cell (symbol cell &optional (errorp t))
-  (or (find-class-cell-class cell)
-      (and *create-classes-from-internal-structure-definitions-p*
-           (or (structure-type-p symbol) (condition-type-p symbol))
-           (ensure-non-standard-class symbol))
+  (or (when cell
+        (or (classoid-cell-pcl-class cell)
+            (when *create-classes-from-internal-structure-definitions-p*
+              (let ((classoid (classoid-cell-classoid cell)))
+                (when (and classoid
+                           (or (condition-classoid-p classoid)
+                               (defstruct-classoid-p classoid)))
+                  (ensure-non-standard-class symbol classoid))))))
       (cond ((null errorp) nil)
             ((legal-class-name-p symbol)
              (error "There is no class named ~S." symbol))
             (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))
-
 (defun find-class (symbol &optional (errorp t) environment)
   (declare (ignore environment))
   (find-class-from-cell symbol
-                        (find-class-cell symbol errorp)
+                        (find-classoid-cell symbol)
                         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,53 +121,45 @@
                                    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))))
-            (class-cell (make-symbol "CLASS-CELL")))
-        `(let ((,class-cell (load-time-value (find-class-cell ',symbol))))
-           (or (find-class-cell-class ,class-cell)
+      (let ((errorp (not (null (constant-form-value errorp))))
+            (cell (make-symbol "CLASSOID-CELL")))
+        `(let ((,cell (load-time-value (find-classoid-cell ',symbol :create t))))
+           (or (classoid-cell-pcl-class ,cell)
                ,(if errorp
-                    `(find-class-from-cell ',symbol ,class-cell t)
-                    `(and (classoid-cell-classoid
-                           ',(find-classoid-cell symbol))
-                          (find-class-from-cell ',symbol ,class-cell nil))))))
+                    `(find-class-from-cell ',symbol ,cell t)
+                    `(when (classoid-cell-classoid ,cell)
+                       (find-class-from-cell ',symbol ,cell nil))))))
       form))
 
+(declaim (inline class-classoid))
+(defun class-classoid (class)
+  (layout-classoid (class-wrapper class)))
+
 (defun (setf find-class) (new-value name &optional errorp environment)
   (declare (ignore errorp environment))
   (cond ((legal-class-name-p name)
          (with-single-package-locked-error
-             (:symbol name "using ~A as the class-name argument in ~
+             (:symbol name "Using ~A as the class-name argument in ~
                            (SETF FIND-CLASS)"))
-         (let ((cell (find-class-cell name)))
-           (setf (find-class-cell-class cell) new-value)
-           (when (and (eq *boot-state* 'complete) (null new-value))
-             (setf (find-classoid name) nil))
+         (let ((cell (find-classoid-cell name :create new-value)))
+           (cond (new-value
+                  (setf (classoid-cell-pcl-class cell) new-value)
+                  (when (eq *boot-state* 'complete)
+                    (let ((classoid (class-classoid new-value)))
+                      (setf (find-classoid name) classoid)
+                      (set-class-type-translation new-value classoid))))
+                 (cell
+                  (clear-classoid name cell)))
            (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
          (error "~S is not a legal class name." name))))
 
-(/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)))
-
 (/show "pcl/macros.lisp 241")
 
 (defmacro function-funcall (form &rest args)