[Guile-commits] GNU Guile branch, master, updated. release_1-9-11-255-g802b47b

[Julian Graham]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=802b47bdc6232f3726860ce8ae17e4b422061620

The branch, master has been updated
       via  802b47bdc6232f3726860ce8ae17e4b422061620 (commit)
      from  b24b7deb000ee4108c5e3a0a2cb3d7494973a7a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 802b47bdc6232f3726860ce8ae17e4b422061620
Author: Julian Graham <address@hidden>
Date:   Sun Aug 8 20:23:14 2010 -0400

    Explicit definitions for `memp' and `assp' in `(rnrs list)'; the predicate
    argument to Guile's `member' and `assoc' functions has a different expected
    arity.
    
    * module/rnrs/lists.scm (memp, assp): Wrap the predicate function with a
      two-argument wrapper before calling Guile's underlying implemenation.
    * test-suite/Makefile.am: Add test-suite/tests/r6rs-lists.test to
      SCM_TESTS.
    * test-suite/tests/r6rs-lists.test: New file.

-----------------------------------------------------------------------

Summary of changes:
 module/rnrs/lists.scm                              |    4 ++--
 test-suite/Makefile.am                             |    1 +
 .../tests/{r6rs-eval.test => r6rs-lists.test}      |   20 ++++++++++++--------
 3 files changed, 15 insertions(+), 10 deletions(-)
 copy test-suite/tests/{r6rs-eval.test => r6rs-lists.test} (68%)

diff --git a/module/rnrs/lists.scm b/module/rnrs/lists.scm
index c9d913b..812ce5f 100644
--- a/module/rnrs/lists.scm
+++ b/module/rnrs/lists.scm
@@ -44,6 +44,6 @@
   (define (remv obj list) (remp (lambda (elt) (eqv? obj elt)) list))
   (define (remq obj list) (remp (lambda (elt) (eq? obj elt)) list))
 
-  (define (memp pred list) (memp-internal #f list pred))
-  (define (assp pred list) (assp-internal #f list pred))
+  (define (memp pred list) (memp-internal #f list (lambda (x y) (pred y))))
+  (define (assp pred list) (assp-internal #f list (lambda (x y) (pred y))))
 )
diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 078df79..eab1cd5 100644
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -88,6 +88,7 @@ SCM_TESTS = tests/00-initial-env.test         \
            tests/r6rs-exceptions.test          \
            tests/r6rs-files.test               \
            tests/r6rs-hashtables.test          \
+           tests/r6rs-lists.test               \
            tests/r6rs-ports.test               \
            tests/r6rs-records-inspection.test  \
            tests/r6rs-records-procedural.test  \
diff --git a/test-suite/tests/r6rs-eval.test b/test-suite/tests/r6rs-lists.test
similarity index 68%
copy from test-suite/tests/r6rs-eval.test
copy to test-suite/tests/r6rs-lists.test
index 30a2e00..ba645ed 100644
--- a/test-suite/tests/r6rs-eval.test
+++ b/test-suite/tests/r6rs-lists.test
@@ -1,4 +1,4 @@
-;;; r6rs-eval.test --- Test suite for R6RS (rnrs eval)
+;;; r6rs-lists.test --- Test suite for R6RS (rnrs lists)
 
 ;;      Copyright (C) 2010 Free Software Foundation, Inc.
 ;;
@@ -17,12 +17,16 @@
 ;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
-(define-module (test-suite test-rnrs-eval)
-  :use-module ((rnrs eval) :version (6))
+(define-module (test-suite test-r6rs-lists)
+  :use-module ((rnrs lists) :version (6))
   :use-module (test-suite lib))
 
-(with-test-prefix "environment"
-  (pass-if "simple"
-    (eqv? (eval '(eval:car (eval:cons 2 4))
-               (environment '(prefix (only (rnrs base) car cons) eval:)))
-         2)))
+(with-test-prefix "memp"
+  (pass-if "memp simple" 
+    (equal? (memp even? '(3 1 4 1 5 9 2 6 5)) '(4 1 5 9 2 6 5))))
+
+(with-test-prefix "assp"
+  (pass-if "assp simple"
+    (let ((d '((3 a) (1 b) (4 c))))
+      (equal? (assp even? d) '(4 c)))))
+


hooks/post-receive
-- 
GNU Guile