X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fbraid.lisp;h=776822fec7c6f4b661dd44619a2539332807da3a;hb=8977ab898eab890a11eb9b4bab72c42561f0dc22;hp=a3cabbb1f8005ec675b75f6ffe847413899b1c26;hpb=3a5eefac8a65dfd36729031f0a9b9dd8c022b7f2;p=sbcl.git

diff --git a/src/pcl/braid.lisp b/src/pcl/braid.lisp
index a3cabbb..776822f 100644
--- a/src/pcl/braid.lisp
+++ b/src/pcl/braid.lisp
@@ -67,7 +67,7 @@
                                              (get-instance-hash-code))))
     (set-funcallable-instance-function
      fin
-     #'(instance-lambda (&rest args)
+     #'(lambda (&rest args)
          (declare (ignore args))
          (error "The function of the funcallable-instance ~S has not been set."
                 fin)))
@@ -113,7 +113,6 @@
 
 (defun !bootstrap-meta-braid ()
   (let* ((*create-classes-from-internal-structure-definitions-p* nil)
-         std-class-wrapper std-class
          standard-class-wrapper standard-class
          funcallable-standard-class-wrapper funcallable-standard-class
          slot-class-wrapper slot-class
@@ -128,7 +127,7 @@
          standard-generic-function-wrapper standard-generic-function)
     (!initial-classes-and-wrappers
      standard-class funcallable-standard-class
-     slot-class built-in-class structure-class condition-class std-class
+     slot-class built-in-class structure-class condition-class
      standard-direct-slot-definition standard-effective-slot-definition
      class-eq-specializer standard-generic-function)
     ;; First, make a class metaobject for each of the early classes. For
@@ -139,7 +138,6 @@
              (meta (ecd-metaclass definition))
              (wrapper (ecase meta
                         (slot-class slot-class-wrapper)
-                        (std-class std-class-wrapper)
                         (standard-class standard-class-wrapper)
                         (funcallable-standard-class
                          funcallable-standard-class-wrapper)
@@ -163,8 +161,6 @@
             (let* ((class (find-class name))
                    (wrapper (cond ((eq class slot-class)
                                    slot-class-wrapper)
-                                  ((eq class std-class)
-                                   std-class-wrapper)
                                   ((eq class standard-class)
                                    standard-class-wrapper)
                                   ((eq class funcallable-standard-class)
@@ -214,7 +210,7 @@
                      standard-effective-slot-definition-wrapper t))
 
               (case meta
-                ((std-class standard-class funcallable-standard-class)
+                ((standard-class funcallable-standard-class)
                  (!bootstrap-initialize-class
                   meta
                   class name class-eq-specializer-wrapper source
@@ -302,7 +298,7 @@
                        `(default-initargs ,default-initargs))))
     (when (memq metaclass-name '(standard-class funcallable-standard-class
                                  structure-class condition-class
-                                 slot-class std-class))
+                                 slot-class))
       (set-slot 'direct-slots direct-slots)
       (set-slot 'slots slots))