summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Graham <julian.graham@aya.yale.edu>2010-08-08 19:32:23 -0400
committerJulian Graham <julian.graham@aya.yale.edu>2010-08-08 19:32:23 -0400
commitb24b7deb000ee4108c5e3a0a2cb3d7494973a7a4 (patch)
tree41dd47b92696103dcadb939d9938166f8b5c3ad2
parent58daadd9825bf1db3e8958a8b41f6316ec3db7fd (diff)
downloadguile-b24b7deb000ee4108c5e3a0a2cb3d7494973a7a4.tar.gz
Explicit definitions for `vector-for-each' and `vector-map'; Guile's SRFI-1
`for-each' and `map' implementations do not operate on lists and vectors interchangeably. * module/rnrs/base.scm (vector-for-each, vector-map): New functions. * test-suite/Makefile.am: Add test-suite/tests/r6rs-base.test to SCM_TESTS. * test-suite/tests/r6rs-base.test: New file.
-rw-r--r--module/rnrs/base.scm7
-rw-r--r--test-suite/Makefile.am1
-rw-r--r--test-suite/tests/r6rs-base.test33
3 files changed, 39 insertions, 2 deletions
diff --git a/module/rnrs/base.scm b/module/rnrs/base.scm
index 728afe457..e92089e1d 100644
--- a/module/rnrs/base.scm
+++ b/module/rnrs/base.scm
@@ -72,10 +72,13 @@
syntax-rules identifier-syntax)
(import (rename (guile) (quotient div) (modulo mod))
- (rename (only (guile) for-each map)
- (for-each vector-for-each) (map vector-map))
(srfi srfi-11))
+ (define (vector-for-each proc . vecs)
+ (apply for-each (cons proc (map vector->list vecs))))
+ (define (vector-map proc . vecs)
+ (list->vector (apply map (cons proc (map vector->list vecs)))))
+
(define (div-and-mod x y) (let ((q (div x y)) (r (mod x y))) (values q r)))
(define (div0 x y)
diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 9b52e3b99..078df792f 100644
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -80,6 +80,7 @@ SCM_TESTS = tests/00-initial-env.test \
tests/r6rs-arithmetic-bitwise.test \
tests/r6rs-arithmetic-fixnums.test \
tests/r6rs-arithmetic-flonums.test \
+ tests/r6rs-base.test \
tests/r6rs-conditions.test \
tests/r6rs-control.test \
tests/r6rs-enums.test \
diff --git a/test-suite/tests/r6rs-base.test b/test-suite/tests/r6rs-base.test
new file mode 100644
index 000000000..05d5802b9
--- /dev/null
+++ b/test-suite/tests/r6rs-base.test
@@ -0,0 +1,33 @@
+;;; r6rs-base.test --- Test suite for R6RS (rnrs base)
+
+;; Copyright (C) 2010 Free Software Foundation, Inc.
+;;
+;; This library is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU Lesser General Public
+;; License as published by the Free Software Foundation; either
+;; version 3 of the License, or (at your option) any later version.
+;;
+;; This library is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; Lesser General Public License for more details.
+;;
+;; You should have received a copy of the GNU Lesser General Public
+;; License along with this library; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+(define-module (test-suite test-r6rs-base)
+ :use-module ((rnrs base) :version (6))
+ :use-module (test-suite lib))
+
+(with-test-prefix "vector-for-each"
+ (pass-if "vector-for-each simple"
+ (let ((sum 0))
+ (vector-for-each (lambda (x) (set! sum (+ sum x))) '#(1 2 3))
+ (eqv? sum 6))))
+
+(with-test-prefix "vector-map"
+ (pass-if "vector-map simple"
+ (equal? '#(3 2 1) (vector-map (lambda (x) (- 4 x)) '#(1 2 3)))))
+