summaryrefslogtreecommitdiff
path: root/module/rnrs
diff options
context:
space:
mode:
authorJulian Graham <julian.graham@aya.yale.edu>2010-03-30 14:27:00 -0400
committerJulian Graham <julian.graham@aya.yale.edu>2010-05-20 21:18:03 -0400
commitbc4db0905f84680572f1528a7911fcee33d2f304 (patch)
tree55a2cc08028c9828e5340babd0a1d9989b8a5f11 /module/rnrs
parentace75ab775e0eb0eebd4943a5c709ee36fe492eb (diff)
downloadguile-bc4db0905f84680572f1528a7911fcee33d2f304.tar.gz
Fix syntax and consolidate imports for (rnrs lists).
* module/rnrs/6/lists.scm: Import syntax is `(only (import-set) id-1 ...)', not `(only (import-set) (id-1 ...))'; use `rename' form as wrapper instead of creating separate custom interface on SRFI-1.
Diffstat (limited to 'module/rnrs')
-rw-r--r--module/rnrs/6/lists.scm27
1 files changed, 18 insertions, 9 deletions
diff --git a/module/rnrs/6/lists.scm b/module/rnrs/6/lists.scm
index 7544a7346..c9d913b29 100644
--- a/module/rnrs/6/lists.scm
+++ b/module/rnrs/6/lists.scm
@@ -21,15 +21,24 @@
(export find for-all exists filter partition fold-left fold-right remp remove
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*))
- (only (srfi srfi-1) (find partition fold-right filter-map))
- (rename (srfi srfi-1) (fold fold-left)
- (any exists)
- (every for-all)
- (remove remp)
-
- (member memp-internal)
- (assoc assp-internal)))
+ (only (guile) filter member memv memq assoc assv assq cons*)
+ (rename (only (srfi srfi-1) fold
+ any
+ every
+ remove
+ member
+ assoc
+ find
+ partition
+ fold-right
+ filter-map)
+ (fold fold-left)
+ (any exists)
+ (every for-all)
+ (remove remp)
+
+ (member memp-internal)
+ (assoc assp-internal)))
(define (remove obj list) (remp (lambda (elt) (equal? obj elt)) list))
(define (remv obj list) (remp (lambda (elt) (eqv? obj elt)) list))