Changeset 453

Timestamp:

Feb 1, 2004, 8:50:05 AM (21 years ago)

Author:

beer

Message:

REMOVE-SLOT-INITARGS was dropping the last KEY/VALUE pair

File:

• trunk/ccl/examples/objc-clos.lisp (modified) (1 diff)

trunk/ccl/examples/objc-clos.lisp

@@ -698 +698 @@
     (apply #'initialize-instance instance initargs)))
 
+
 (defun remove-slot-initargs (class initargs)
   (let* ((slot-initargs (class-slot-initargs class))) ; cache this, maybe
-    (collect ((non-slot-initargs))
-      (do* ((key (pop initargs) (pop initargs))
-            (val (pop initargs) (pop initargs)))
-           ((null initargs) (non-slot-initargs))
-        (unless (member key slot-initargs :test #'eq)
-          (non-slot-initargs key)
-          (non-slot-initargs val))))))
+    (loop for l = initargs then (cddr l)
+          when (null l) do (return-from remove-slot-initargs new-initargs)
+          unless (member (first l)  slot-initargs :test #'eq)
+            append (list (first l) (second l))  into new-initargs)))
 
 (defmethod allocate-instance ((class objc:objc-class) &rest initargs &key &allow-other-keys)