X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fdfun.lisp;h=ae44d78bce72d529198bc89c2e71f1ae5e84eeac;hb=5e92e9ed61903658015c2a75c79a32ad41dbd29d;hp=51bcea83eba4f71149b4f616cd44f09582037d56;hpb=92c8db80e039f60623e53a0b9355cf0a9ec49f3d;p=sbcl.git diff --git a/src/pcl/dfun.lisp b/src/pcl/dfun.lisp index 51bcea8..ae44d78 100644 --- a/src/pcl/dfun.lisp +++ b/src/pcl/dfun.lisp @@ -1261,7 +1261,7 @@ Except see also BREAK-VICIOUS-METACIRCLE. -- CSR, 2003-05-28 (if (consp meth) (and (early-method-standard-accessor-p meth) (early-method-standard-accessor-slot-name meth)) - (and (member *the-class-std-object* + (and (member *the-class-standard-object* (if early-p (early-class-precedence-list accessor-class) @@ -1311,7 +1311,7 @@ Except see also BREAK-VICIOUS-METACIRCLE. -- CSR, 2003-05-28 (early-class-precedence-list specl) (and (class-finalized-p specl) (class-precedence-list specl)))) - (so-p (member *the-class-std-object* specl-cpl)) + (so-p (member *the-class-standard-object* specl-cpl)) (slot-name (if (consp method) (and (early-method-standard-accessor-p method) (early-method-standard-accessor-slot-name @@ -1326,7 +1326,8 @@ Except see also BREAK-VICIOUS-METACIRCLE. -- CSR, 2003-05-28 (class-precedence-list class)))) (when (memq specl cpl) (unless (and (or so-p - (member *the-class-std-object* cpl)) + (member *the-class-standard-object* + cpl)) (or early-p (slot-accessor-std-p slotd type))) (return-from make-accessor-table nil))