0.9.5.58:

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

diff --git a/src/pcl/dfun.lisp b/src/pcl/dfun.lisp
index 39f0b5c..ae44d78 100644 (file)
--- a/src/pcl/dfun.lisp
+++ b/src/pcl/dfun.lisp
@@ -615,7 +615,7 @@ Except see also BREAK-VICIOUS-METACIRCLE.  -- CSR, 2003-05-28
 
 (defun use-dispatch-dfun-p (gf &optional (caching-p (use-caching-dfun-p gf)))
   (when (eq *boot-state* 'complete)
-    (unless (or caching-p 
+    (unless (or caching-p
                 (gf-requires-emf-keyword-checks gf))
       ;; This should return T when almost all dispatching is by
       ;; eql specializers or built-in classes. In other words,
@@ -789,7 +789,7 @@ Except see also BREAK-VICIOUS-METACIRCLE.  -- CSR, 2003-05-28
 
 (defun make-initial-dfun (gf)
   (let ((initial-dfun
-         #'(instance-lambda (&rest args)
+         #'(lambda (&rest args)
              (initial-dfun gf args))))
     (multiple-value-bind (dfun cache info)
         (cond
@@ -834,17 +834,17 @@ Except see also BREAK-VICIOUS-METACIRCLE.  -- CSR, 2003-05-28
   (let* ((methods (early-gf-methods gf))
          (slot-name (early-method-standard-accessor-slot-name (car methods))))
     (ecase type
-      (reader #'(instance-lambda (instance)
+      (reader #'(lambda (instance)
                   (let* ((class (class-of instance))
                          (class-name (!bootstrap-get-slot 'class class 'name)))
                     (!bootstrap-get-slot class-name instance slot-name))))
-      (boundp #'(instance-lambda (instance)
+      (boundp #'(lambda (instance)
                   (let* ((class (class-of instance))
                          (class-name (!bootstrap-get-slot 'class class 'name)))
                     (not (eq +slot-unbound+
                              (!bootstrap-get-slot class-name
                                                   instance slot-name))))))
-      (writer #'(instance-lambda (new-value instance)
+      (writer #'(lambda (new-value instance)
                   (let* ((class (class-of instance))
                          (class-name (!bootstrap-get-slot 'class class 'name)))
                     (!bootstrap-set-slot class-name instance slot-name new-value)))))))
@@ -938,7 +938,7 @@ Except see also BREAK-VICIOUS-METACIRCLE.  -- CSR, 2003-05-28
         specls all-same-p)
     (cond ((null methods)
            (values
-            #'(instance-lambda (&rest args)
+            #'(lambda (&rest args)
                 (apply #'no-applicable-method gf args))
             nil
             (no-methods-dfun-info)))
@@ -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))
@@ -1670,7 +1671,7 @@ Except see also BREAK-VICIOUS-METACIRCLE.  -- CSR, 2003-05-28
       (if function-p
           (lambda (method-alist wrappers)
             (declare (ignore method-alist wrappers))
-            #'(instance-lambda (&rest args)
+            #'(lambda (&rest args)
                 (apply #'no-applicable-method gf args)))
           (lambda (method-alist wrappers)
             (declare (ignore method-alist wrappers))