X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fmacros.lisp;h=156d1e428dccacc03e6b3467e0f83d8e103c7135;hb=ff92598854bf7cae8d57fe49cef4d9a98e1ab345;hp=3c984929e42bf856b817e92c47938be077c4bd6d;hpb=a736ac10b709b2d40305f0a6e3764afd246a8ef5;p=sbcl.git

diff --git a/src/pcl/macros.lisp b/src/pcl/macros.lisp
index 3c98492..156d1e4 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))
@@ -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")