X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fmacros.lisp;h=296aeb422b4eca6a47eaacf59ddbd510f95dd8a5;hb=f3f677703e37f5a335b3be7fa64f7748ad969517;hp=8dd2df772798b772807cedee219d233813c14c48;hpb=95345bb533def44122ad6a1f61f06c3a0be3e9e3;p=sbcl.git

diff --git a/src/pcl/macros.lisp b/src/pcl/macros.lisp
index 8dd2df7..296aeb4 100644
--- 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))
@@ -165,18 +162,26 @@
 			  (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)
+                        (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")