0.9.4.29:

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

diff --git a/src/pcl/ctor.lisp b/src/pcl/ctor.lisp
index 28637cd..39c1129 100644 (file)
--- a/src/pcl/ctor.lisp
+++ b/src/pcl/ctor.lisp
@@ -109,7 +109,7 @@
 (!defstruct-with-alternate-metaclass ctor
   :slot-names (function-name class-name class initargs)
   :boa-constructor %make-ctor
-  :superclass-name pcl-funcallable-instance
+  :superclass-name funcallable-instance
   :metaclass-name random-pcl-classoid
   :metaclass-constructor make-random-pcl-classoid
   :dd-type funcallable-structure
@@ -245,16 +245,6 @@
     (setf (ctor-class ctor) class)
     (pushnew ctor (plist-value class 'ctors))
     (setf (funcallable-instance-fun ctor)
-          ;; KLUDGE: Gerd here has the equivalent of (COMPILE NIL
-          ;; (CONSTRUCTOR-FUNCTION-FORM)), but SBCL's COMPILE doesn't
-          ;; deal with INSTANCE-LAMBDA expressions, only with LAMBDA
-          ;; expressions.  The below should be equivalent, since we
-          ;; have a compiler-only implementation.
-          ;;
-          ;; (except maybe for optimization qualities? -- CSR,
-          ;; 2004-07-12)
-          ;;
-          ;; FIXME: INSTANCE-LAMBDA is no more.  We could change this.
           (multiple-value-bind (form locations names)
               (constructor-function-form ctor)
             (apply (compile nil `(lambda ,names ,form)) locations)))))
@@ -366,7 +356,7 @@
 (defun optimizing-generator (ctor ii-methods si-methods)
   (multiple-value-bind (locations names body before-method-p)
       (fake-initialization-emf ctor ii-methods si-methods)
-    (values 
+    (values
      `(lambda ,(make-ctor-parameter-list ctor)
        (declare #.*optimize-speed*)
        ,(wrap-in-allocate-forms ctor body before-method-p))
@@ -606,7 +596,7 @@
                                  ,(case type
                                     (constant `',(eval value))
                                     ((param var) `,value)
-                                    (initfn `(funcall ,value)))) 
+                                    (initfn `(funcall ,value))))
                   into class-init-forms
                   finally (return (values names locations class-init-forms)))
           (multiple-value-bind (vars bindings)
@@ -614,8 +604,8 @@
                     collect var into vars
                     collect `(,var (funcall ,initfn)) into bindings
                     finally (return (values vars bindings)))
-            (values locations names 
-                    bindings vars 
+            (values locations names
+                    bindings vars
                     (nreverse defaulting-initargs)
                     `(,@(delete nil instance-init-forms)
                       ,@class-init-forms))))))))