when using place, default initial-value to place as well

collectors.lisp

@@ -70,7 +70,7 @@ Example:
 FUNCTION and INITIAL-VALUE are passed directly to MAKE-REDUCER."
   (alexandria:with-unique-names (reducer)
     `(let ((,reducer (make-reducer ,function
-                      :initial-value ,initial-value
+                      :initial-value (or ,initial-value ,place)
                       :place-setter ,(when place `(lambda (new) (setf ,place new))))))
       (flet ((,name (&rest items) (apply ,reducer items)))
         ,@body))))
@@ -140,7 +140,7 @@ current list of values."
   "
   (alexandria:with-unique-names (appender)
     `(let ((,appender (make-appender
-                       :initial-value ,initial-value
+                       :initial-value (or ,initial-value ,place)
                        :place-setter ,(when place `(lambda (new) (setf ,place new))))))
        (flet ((,name (&rest items) (apply ,appender items)))
          ,@body))))
@@ -167,7 +167,7 @@ current list of values."
     `(let ((,collector (,(if from-end
                              'make-pusher
                              'make-collector)
-                        :initial-value ,initial-value
+                        :initial-value (or ,initial-value ,place)
                         :collect-nil ,collect-nil
                         :place-setter ,(when place `(lambda (new) (setf ,place new))))))
       (flet ((,name (&rest items)

tests/collectors.lisp

@@ -127,32 +127,32 @@
     (assert-equal '(2 2 4 2 4 6 2 4 6 8) (test))))
 
 (define-test reducer-place (:tags '(place reducer))
-  (let (reduced)
+  (let ((reduced 1))
     (with-reducer (r #'+ :place reduced)
       (r 0)
-      (assert-equal 0 reduced)
-      (assert-equal 1 (r 1))
       (assert-equal 1 reduced)
-      (assert-equal 6 (r 2 3))
-      (assert-equal 6 reduced))))
+      (assert-equal 2 (r 1))
+      (assert-equal 2 reduced)
+      (assert-equal 7 (r 2 3))
+      (assert-equal 7 reduced))))
 
 (define-test appender-place (:tags '(place appender))
-  (let (appended)
+  (let ((appended '(:A)))
     (with-appender (a :place appended)
       (a 0)
-      (assert-equal '(0) appended)
-      (assert-equal '(0 1) (a 1))
-      (assert-equal '(0 1) appended)
-      (assert-equal '(0 1 2 3 4) (a '(2 3) '(4)))
-      (assert-equal '(0 1 2 3 4) appended))))
+      (assert-equal '(:A 0) appended)
+      (assert-equal '(:A 0 1) (a 1))
+      (assert-equal '(:A 0 1) appended)
+      (assert-equal '(:A 0 1 2 3 4) (a '(2 3) '(4)))
+      (assert-equal '(:A 0 1 2 3 4) appended))))
 
 (define-test collector-place (:tags '(place collector))
-  (let (collected)
+  (let ((collected '(:A)))
     (with-collector (c :place collected)
       (c 0)
-      (assert-equal '(0) collected)
-      (assert-equal '(0 1) (c 1))
-      (assert-equal '(0 1) collected)
-      (assert-equal '(0 1 (2 3) (4)) (c '(2 3) '(4)))
-      (assert-equal '(0 1 (2 3) (4)) collected))))
+      (assert-equal '(:a 0) collected)
+      (assert-equal '(:a 0 1) (c 1))
+      (assert-equal '(:a 0 1) collected)
+      (assert-equal '(:a 0 1 (2 3) (4)) (c '(2 3) '(4)))
+      (assert-equal '(:a 0 1 (2 3) (4)) collected))))