[rucksack-cvs] CVS rucksack

[alemmens]

Update of /project/rucksack/cvsroot/rucksack
In directory clnet:/tmp/cvs-serv29471

Modified Files:
	rucksack.asd rucksack.lisp 
Log Message:
Fix a bug in RUCKSACK-DO-SLOT: it didn't work correctly when the
EQUAL argument wasn't supplied.

--- /project/rucksack/cvsroot/rucksack/rucksack.asd	2008/02/19 22:44:06	1.19
+++ /project/rucksack/cvsroot/rucksack/rucksack.asd	2008/03/02 22:29:05	1.20
@@ -1,9 +1,9 @@
-;;; $Id: rucksack.asd,v 1.19 2008/02/19 22:44:06 alemmens Exp $
+;;; $Id: rucksack.asd,v 1.20 2008/03/02 22:29:05 alemmens Exp $
 
 (in-package :cl-user)
 
 (asdf:defsystem :rucksack
-  :version "0.1.17"
+  :version "0.1.18"
   :serial t
   :components ((:file "queue")
                (:file "package")
--- /project/rucksack/cvsroot/rucksack/rucksack.lisp	2008/02/11 12:47:52	1.24
+++ /project/rucksack/cvsroot/rucksack/rucksack.lisp	2008/03/02 22:29:05	1.25
@@ -1,4 +1,4 @@
-;; $Id: rucksack.lisp,v 1.24 2008/02/11 12:47:52 alemmens Exp $
+;; $Id: rucksack.lisp,v 1.25 2008/03/02 22:29:05 alemmens Exp $
 
 (in-package :rucksack)
 
@@ -187,6 +187,7 @@
   INCLUDE-SUBCLASSES defaults to T."))
 
 (defmacro rucksack-do-slot ((instance-var class slot
+                             &rest args
                              &key (rucksack '*rucksack*)
                              equal min max include-min include-max
                              order include-subclasses)
@@ -195,17 +196,12 @@
 specified value. INSTANCE-VAR will be bound successively to each
 instance.  See the documentation of RUCKSACK-MAP-SLOT for more
 details."
+  (declare (ignorable equal min max include-min include-max order
+                      include-subclasses))
   (check-type instance-var symbol)
   `(rucksack-map-slot ,rucksack ,class ,slot
                       (lambda (,instance-var) , at body)
-                      :equal ,equal
-                      :min ,min
-                      :max ,max
-                      :include-min ,include-min
-                      :include-max ,include-max
-                      :order ,order
-                      :include-subclasses ,include-subclasses))
-
+                      ,@(sans args ':rucksack)))
 
 
 #+later