Changeset 15135

Timestamp:

Dec 13, 2011, 1:11:22 PM (13 years ago)

Author:

R. Matthew Emerson

Message:

Don't warn about the same initarg appearing in more than one slot.

The standard allows this:
​http://www.lispworks.com/documentation/HyperSpec/Body/07_ad.htm

"A given initialization argument can be used to initialize more than
one slot if the same initialization argument name appears in more than
one :initarg slot option."

(This undoes r11735).

File:

• trunk/source/lib/macros.lisp (modified) (3 diffs)

trunk/source/lib/macros.lisp

@@ -1980 +1980 @@
     (let* ((options-seen ())
            (signatures ())
-           (slot-names ())
-           (slot-initargs ()))
+           (slot-names ()))
       (flet ((canonicalize-defclass-option (option)
                (let* ((option-name (car option)))
@@ -2056 +2055 @@
                           (push setf-name writers))))
                      (:initarg
-                      (let* ((initarg (require-type (cadr options) 'symbol))
-                             (other (position initarg slot-initargs :test #'memq)))
-                        (when other
-                          (warn "Initarg ~s occurs in both ~s and ~s slots"
-                                initarg (nth (1+ other) slot-names) slot-name))
-                        (push initarg initargs)))
+                      (push (require-type (cadr options) 'symbol) initargs))
                      (:type
                       (if type-p
@@ -2095 +2089 @@
                                        (car (push (list (car options)) other-options)))))
                         (push (cadr options) (cdr pair))))))
-                 (push initargs slot-initargs)
                  `(list :name ',slot-name
                    ,@(when allocation `(:allocation ',allocation))