X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fboot.lisp;h=14e6984fc6056d90c80e90d2c94c467de96e674f;hb=bd0ba0f214518e8d72ff2d44de5a1e3e4b02af2c;hp=49edcfe0c8d0a1beaa6d2faba3dd0edda4bf2774;hpb=301bcbc899874437313f4690b0b9d6f9c66b4895;p=sbcl.git

diff --git a/src/pcl/boot.lisp b/src/pcl/boot.lisp
index 49edcfe..14e6984 100644
--- a/src/pcl/boot.lisp
+++ b/src/pcl/boot.lisp
@@ -1747,27 +1747,21 @@ bootstrapping.
 		    (generic-function-name gf)
 		    (!early-gf-name gf))))
       (esetf (gf-precompute-dfun-and-emf-p arg-info)
-	     (let* ((sym (if (atom name) name (cadr name)))
-		    (pkg-list (cons *pcl-package*
-				    (package-use-list *pcl-package*))))
-	       ;; FIXME: given the presence of generalized function
-	       ;; names, this test is broken.  A little
-	       ;; reverse-engineering suggests that this was intended
-	       ;; to prevent precompilation of things on some
-	       ;; PCL-internal automatically-constructed functions
-	       ;; like the old "~A~A standard class ~A reader"
-	       ;; functions.  When the CADR of SB-PCL::SLOT-ACCESSOR
-	       ;; generalized functions was *, this test returned T,
-	       ;; not NIL, and an error was signalled in
-	       ;; MAKE-ACCESSOR-TABLE for (DEFUN FOO (X) (SLOT-VALUE X
-	       ;; 'ASLDKJ)).  Whether the right thing to do is to fix
-	       ;; MAKE-ACCESSOR-TABLE so that it can work in the
-	       ;; presence of slot names that have no classes, or to
-	       ;; restore this test to something more obvious, I don't
-	       ;; know.  -- CSR, 2003-02-14
-	       (and sym (symbolp sym)
-		    (not (null (memq (symbol-package sym) pkg-list)))
-		    (not (find #\space (symbol-name sym))))))))
+	     (cond
+	       ((and (consp name)
+		     (member (car name)
+			     *internal-pcl-generalized-fun-name-symbols*))
+		nil)
+	       (t (let* ((symbol (fun-name-block-name name))
+			 (package (symbol-package symbol)))
+		    (and (or (eq package *pcl-package*)
+			     (memq package (package-use-list *pcl-package*)))
+			 ;; FIXME: this test will eventually be
+			 ;; superseded by the *internal-pcl...* test,
+			 ;; above.  While we are in a process of
+			 ;; transition, however, it should probably
+			 ;; remain.
+			 (not (find #\Space (symbol-name symbol))))))))))
   (esetf (gf-info-fast-mf-p arg-info)
 	 (or (not (eq *boot-state* 'complete))
 	     (let* ((method-class (generic-function-method-class gf))