Changeset 13980


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/clos.lisp

    r13978 r13980  
    332332             (push-on-end `(setf ,(cadr olist)) writers))
    333333            (t
    334              (push-on-end `(quote ,(car olist)) non-std-options)
    335              (push-on-end `(quote ,(cadr olist)) non-std-options))))
     334             (push-on-end (cadr olist) (getf non-std-options (car olist))))))
    336335        `(list
    337336          :name ',name
     
    353352          ,@(when documentation `(:documentation ',documentation))
    354353          ,@other-options
    355     ,@non-std-options))))
     354          ,@(mapcar #'(lambda (opt) (if (or (atom opt) (/= 1 (length opt)))
     355                                        `',opt
     356                                        `',(car opt)))
     357                    non-std-options)))))
    356358
    357359(defun maybe-note-name-defined (name)
Note: See TracChangeset for help on using the changeset viewer.