Changeset 13980

Timestamp:

06/19/12 15:01:37 (9 years ago)

Author:

rschlatte

Message:

Pass multiply-specified slot option as a list to direct-slot-definition-class.

File:

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

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

@@ -332 +332 @@
              (push-on-end `(setf ,(cadr olist)) writers))
             (t
-             (push-on-end `(quote ,(car olist)) non-std-options)
-             (push-on-end `(quote ,(cadr olist)) non-std-options))))
+             (push-on-end (cadr olist) (getf non-std-options (car olist))))))
         `(list
           :name ',name
@@ -353 +352 @@
           ,@(when documentation `(:documentation ',documentation))
           ,@other-options
-    ,@non-std-options))))
+          ,@(mapcar #'(lambda (opt) (if (or (atom opt) (/= 1 (length opt)))
+                                        `',opt
+                                        `',(car opt)))
+                    non-std-options)))))
 
 (defun maybe-note-name-defined (name)