Changeset 14153

Timestamp:

09/19/12 14:34:44 (9 years ago)

Author:

rschlatte

Message:

Initialize shared slots upon class finalization.

• Slots with :allocation :class can now be read without creating an instance beforehand.

• Reported by Pascal Costanza

File:

• trunk/abcl/src/org/armedbear/lisp/clos.lisp (modified) (1 diff)

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

@@ -549 +549 @@
          (unless (slot-definition-location slot)
            (let ((allocation-class (slot-definition-allocation-class slot)))
-             (setf (slot-definition-location slot)
-                   (if (eq allocation-class class)
-                       (cons (slot-definition-name slot) +slot-unbound+)
+             (if (eq allocation-class class)
+                 ;; We initialize class slots here so they can be
+                 ;; accessed without creating a dummy instance.
+                 (let ((initfunction (slot-definition-initfunction slot)))
+                   (setf (slot-definition-location slot)
+                         (cons (slot-definition-name slot)
+                               (if initfunction
+                                   (funcall initfunction)
+                                   +slot-unbound+))))
+                 (setf (slot-definition-location slot)
                        (slot-location allocation-class (slot-definition-name slot))))))
          (push (slot-definition-location slot) shared-slots))))