summaryrefslogtreecommitdiffstats
path: root/collect.scm
diff options
context:
space:
mode:
authorThomas Bushnell, BSG <tb@debian.org>2007-12-28 16:25:32 -0800
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:39 -0800
commitd8ae23691ed6392b7f320f5fa7d4dd78ae52c10e (patch)
treeb20b8bc02e854c4c86d39ee22a0638a8b06e01af /collect.scm
parentedd1ebef3ad774e7cbcc2f5918d555bfb0b44091 (diff)
parent64f037d91e0c9296dcaef9a0ff3eb33b19a2ed34 (diff)
downloadslib-d8ae23691ed6392b7f320f5fa7d4dd78ae52c10e.tar.gz
slib-d8ae23691ed6392b7f320f5fa7d4dd78ae52c10e.zip
Import Debian changes 3a5-1debian/3a5-1
slib (3a5-1) unstable; urgency=low * New upstream release. * slib.texi (Library Catalogs): Repeat change from 3a3-3. * Makefile: Repeat $(htmldir)slib_toc.html changes from 3a2-1. * guile.init: (library-vicinity): Repeat change from 3a4-2. * debian/rules (binary-indep): Don't hide .init files in a separate subdirectory, thus conforming better to the usual slib practice. Put a symlink in place to ease transitions. (Closes: #407370).
Diffstat (limited to 'collect.scm')
-rw-r--r--collect.scm31
1 files changed, 17 insertions, 14 deletions
diff --git a/collect.scm b/collect.scm
index 05bc2cf..d4ccb6f 100644
--- a/collect.scm
+++ b/collect.scm
@@ -117,20 +117,23 @@
)
;@
(define (reduce <proc> <seed> . <collections>)
- (let ( (max+1 (collect:size (car <collections>)))
- (generators (map collect:gen-elts <collections>))
- )
- (let loop ( (count 0) )
- (cond
- ((< count max+1)
- (set! <seed>
- (apply <proc> <seed> (map (lambda (g) (g)) generators)))
- (loop (collect:add1 count))
- )
- (else <seed>)
- ) )
-) )
-
+ (define (reduce-init pred? init lst)
+ (if (null? lst)
+ init
+ (reduce-init pred? (pred? init (car lst)) (cdr lst))))
+ (if (null? <collections>)
+ (cond ((null? <seed>) <seed>)
+ ((null? (cdr <seed>)) (car <seed>))
+ (else (reduce-init <proc> (car <seed>) (cdr <seed>))))
+ (let ((max+1 (collect:size (car <collections>)))
+ (generators (map collect:gen-elts <collections>)))
+ (let loop ((count 0))
+ (cond
+ ((< count max+1)
+ (set! <seed>
+ (apply <proc> <seed> (map (lambda (g) (g)) generators)))
+ (loop (collect:add1 count)))
+ (else <seed>))))))
;;@ pred true for every elt?