Changeset 13958 for trunk/abcl/src/org/armedbear/lisp/clos.lisp

Timestamp:

06/11/12 11:47:06 (9 years ago)

Author:

rschlatte

Message:

Implement compute-default-initargs

File:

• trunk/abcl/src/org/armedbear/lisp/clos.lisp (modified) (3 diffs)

trunk/abcl/src/org/armedbear/lisp/clos.lisp

@@ -503 +503 @@
 ;;; finalize-inheritance
 
-(defun std-compute-class-default-initargs (class)
+(declaim (notinline compute-default-initargs))
+(defun compute-default-initargs (class)
+  (std-compute-default-initargs class))
+
+(defun std-compute-default-initargs (class)
   (delete-duplicates
    (mapcan #'(lambda (c)
@@ -556 +560 @@
           (make-layout class (nreverse instance-slots) (nreverse shared-slots))))
   (setf (class-default-initargs class)
-        (std-compute-class-default-initargs class))
+        (compute-default-initargs class))
   (setf (class-finalized-p class) t))
 
@@ -3630 +3634 @@
        (std-finalize-inheritance class)))
 
+;;; Default initargs
+
+;;; AMOP pg. 174
+(atomic-defgeneric compute-default-initargs (class)
+  (:method ((class standard-class))
+    (std-compute-default-initargs class))
+  (:method ((class funcallable-standard-class))
+    (std-compute-default-initargs class)))
+
 ;;; Class precedence lists