Changeset 12741

Timestamp:

06/06/10 22:02:34 (13 years ago)

Author:

astalla

Message:

Fixed regression: correctly set slot-allocation-class for effective slot definitions.

File:

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

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

@@ -263 +263 @@
 
 (defun init-slot-definition (slot &key name
-            (initargs ())
-            (initform nil)
-            (initfunction nil)
-            (readers ())
-            (writers ())
-            (allocation :instance)
+           (initargs ())
+           (initform nil)
+           (initfunction nil)
+           (readers ())
+           (writers ())
+           (allocation :instance)
+           (allocation-class nil)
             &allow-other-keys)
   (set-slot-definition-name slot name)
@@ -277 +278 @@
   (set-slot-definition-writers slot writers)
   (set-slot-definition-allocation slot allocation)
+  (set-slot-definition-allocation-class slot allocation-class)
   slot)
 
@@ -283 +285 @@
     (if (eq slot-class +the-direct-slot-definition-class+)
   (let ((slot (make-slot-definition +the-direct-slot-definition-class+)))
-    (apply #'init-slot-definition slot args)
-    (set-slot-definition-allocation-class slot class)
+    (apply #'init-slot-definition slot :allocation-class class args)
     slot)
   (progn
-    (let ((slot (apply #'make-instance slot-class args)))
-      (set-slot-definition-allocation-class slot class)
+    (let ((slot (apply #'make-instance slot-class :allocation-class class
+           args)))
       slot)))))
 
@@ -296 +297 @@
   (let ((slot (make-slot-definition +the-effective-slot-definition-class+)))
     (apply #'init-slot-definition slot args)
-    (set-slot-definition-allocation-class slot class)
     slot)
   (progn
     (let ((slot (apply #'make-instance slot-class args)))
-      (set-slot-definition-allocation-class slot class)
       slot)))))