mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-24 12:20:20 +02:00
Fix R6RS `fold-left' so the accumulator is the first argument.
* module/rnrs/lists.scm (fold-left): New procedure. * module/rnrs/records/syntactic.scm (define-record-type): Fix to use corrected `fold-left'. * test-suite/tests/r6rs-lists.test: Add tests. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
parent
2be3feb17e
commit
d825841db0
3 changed files with 37 additions and 5 deletions
|
@ -22,8 +22,7 @@
|
|||
remv remq memp member memv memq assp assoc assv assq cons*)
|
||||
(import (rnrs base (6))
|
||||
(only (guile) filter member memv memq assoc assv assq cons*)
|
||||
(rename (only (srfi srfi-1) fold
|
||||
any
|
||||
(rename (only (srfi srfi-1) any
|
||||
every
|
||||
remove
|
||||
member
|
||||
|
@ -32,7 +31,6 @@
|
|||
partition
|
||||
fold-right
|
||||
filter-map)
|
||||
(fold fold-left)
|
||||
(any exists)
|
||||
(every for-all)
|
||||
(remove remp)
|
||||
|
@ -40,6 +38,14 @@
|
|||
(member memp-internal)
|
||||
(assoc assp-internal)))
|
||||
|
||||
(define (fold-left combine nil list . lists)
|
||||
(define (fold nil lists)
|
||||
(if (exists null? lists)
|
||||
nil
|
||||
(fold (apply combine nil (map car lists))
|
||||
(map cdr lists))))
|
||||
(fold nil (cons list lists)))
|
||||
|
||||
(define (remove obj list) (remp (lambda (elt) (equal? obj elt)) list))
|
||||
(define (remv obj list) (remp (lambda (elt) (eqv? obj elt)) list))
|
||||
(define (remq obj list) (remp (lambda (elt) (eq? obj elt)) list))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue