0.8.12.7: Merge package locks, AKA "what can go wrong with a 3783 line patch?"

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

diff --git a/src/pcl/macros.lisp b/src/pcl/macros.lisp
index 3c98492..156d1e4 100644 (file)
--- a/src/pcl/macros.lisp
+++ b/src/pcl/macros.lisp
@@ -87,9 +87,6 @@
 (defmacro find-class-cell-predicate (cell)
   `(cadr ,cell))
 
-(defmacro find-class-cell-make-instance-function-keys (cell)
-  `(cddr ,cell))
-
 (defmacro make-find-class-cell (class-name)
   (declare (ignore class-name))
   '(list* nil #'constantly-nil nil))
@@ -108,8 +105,8 @@
 (defun find-class-from-cell (symbol cell &optional (errorp t))
   (or (find-class-cell-class cell)
       (and *create-classes-from-internal-structure-definitions-p*
-          (structure-type-p symbol)
-          (find-structure-class symbol))
+          (or (structure-type-p symbol) (condition-type-p symbol))
+          (ensure-non-standard-class symbol))
       (cond ((null errorp) nil)
            ((legal-class-name-p symbol)
             (error "There is no class named ~S." symbol))
@@ -165,18 +162,25 @@
                          (find-class-from-cell ',symbol ,class-cell nil))))))
       form))
 
-(defun (setf find-class) (new-value symbol)
-  (if (legal-class-name-p symbol)
-      (let ((cell (find-class-cell symbol)))
-       (setf (find-class-cell-class cell) new-value)
-       (when (or (eq *boot-state* 'complete)
-                 (eq *boot-state* 'braid))
-         (when (and new-value (class-wrapper new-value))
-           (setf (find-class-cell-predicate cell)
-                 (fdefinition (class-predicate-name new-value))))
-         (update-ctors 'setf-find-class :class new-value :name symbol))
-       new-value)
-      (error "~S is not a legal class name." symbol)))
+(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 ~
+                           (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))
+          (when (or (eq *boot-state* 'complete)
+                    (eq *boot-state* 'braid))
+            (when (and new-value (class-wrapper 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")