Made the COUNT clause in PS LOOP evaluate its term before counting (and skip nil)

 like CL does.

diff --git a/src/lib/ps-loop.lisp b/src/lib/ps-loop.lisp
index 38ea78c..2dd5ef7 100644 (file)
--- a/src/lib/ps-loop.lisp
+++ b/src/lib/ps-loop.lisp
@@ -80,7 +80,7 @@
                    (pushnew `(var ,var ,initial) prologue :key #'second))
                  (case kind
                    (:sum `(incf ,var ,term))
-                   (:count `(incf ,var))
+                   (:count `(unless (null ,term) (incf ,var)))
                    (:minimize `(setf ,var (if (null ,var) ,term (min ,var ,term))))
                    (:maximize `(setf ,var (if (null ,var) ,term (max ,var ,term))))
                    (:collect `((@ ,var :push) ,term))))