From 95dd38abd3f6bb4508d6c1b732af16d6630fe82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= <daniel@turtleware.eu>
Date: Fri, 22 Feb 2019 16:30:27 +0100
Subject: [PATCH] defclass: make sure that defclass option "NIL" errors

This is as for CLHS section 7.1.2. Error was caused by the fact that
unknown-key was a flag, so if the initarg was NIL, we were assigning
it value NIL, what is also a boolean false. Right now we collect all
invalid initargs in a list, so in case of NIL we'll get (NIL) what is
a generalized boolean true value. Closes #474.

Also add cosmetic fixes with declarations.
---
 src/clos/standard.lsp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/clos/standard.lsp b/src/clos/standard.lsp
index 225960428..10d52978c 100644
--- a/src/clos/standard.lsp
+++ b/src/clos/standard.lsp
@@ -164,7 +164,6 @@
     (finalize-inheritance class)))
 
 (defmethod initialize-instance ((class class) &rest initargs &key direct-slots direct-superclasses)
-  (declare (ignore sealedp))
   ;; convert the slots from lists to direct slots
   (apply #'call-next-method class
          :direct-slots
@@ -220,7 +219,7 @@
 (defmethod shared-initialize ((class std-class) slot-names &rest initargs &key
                               (optimize-slot-access (list *optimize-slot-access*))
                               sealedp)
-  (declare (ignore initargs slot-names))
+  (declare (ignore slot-names))
   (setf (slot-value class 'optimize-slot-access) (first optimize-slot-access)
         (slot-value class 'sealedp) (and sealedp t))
   (setf class (call-next-method))
@@ -632,11 +631,11 @@ because it contains a reference to the undefined class~%  ~A"
     (do* ((name-loc initargs (cddr name-loc))
           (allow-other-keys nil)
           (allow-other-keys-found nil)
-          (unknown-key nil))
+          (unknown-key-names nil))
          ((null name-loc)
-          (when (and (not allow-other-keys) unknown-key)
-            (simple-program-error "Unknown initialization option ~S for class ~A"
-                                  unknown-key class)))
+          (when (and (not allow-other-keys) unknown-key-names)
+            (simple-program-error "Unknown initialization options ~S for class ~A."
+                                  (nreverse unknown-key-names) class)))
       (let ((name (first name-loc)))
         (cond ((null (cdr name-loc))
                (simple-program-error "No value supplied for the init-name ~S." name))
@@ -652,7 +651,7 @@ because it contains a reference to the undefined class~%  ~A"
               ((member name cached-keywords))
               ((and methods (member name methods :test #'member :key #'method-keywords)))
               (t
-               (setf unknown-key name)))))))
+               (push name unknown-key-names)))))))
 
 ;;; ----------------------------------------------------------------------
 ;;; Methods