From 8a13b472e3e0c7579bf928d74d81b2c2a12a216a Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 2 Nov 2016 09:40:58 +0100
Subject: [PATCH] test: More values, call-with-values tests.

* tests/cwv.test: New file.
* GNUmakefile (TESTS): Add it.
* tests/scm.test: Remove value and call-with-values tests.
---
 GNUmakefile    |  1 +
 tests/cwv.test | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/scm.test |  7 -----
 3 files changed, 77 insertions(+), 7 deletions(-)
 create mode 100755 tests/cwv.test

diff --git a/GNUmakefile b/GNUmakefile
index 4b5a4801..23e0ec2e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -49,6 +49,7 @@ TESTS:=\
  tests/let.test\
  tests/vector.test\
  tests/scm.test\
+ tests/cwv.test\
  tests/record.test\
  tests/let-syntax.test\
  tests/psyntax.test\
diff --git a/tests/cwv.test b/tests/cwv.test
new file mode 100755
index 00000000..113645e6
--- /dev/null
+++ b/tests/cwv.test
@@ -0,0 +1,76 @@
+#! /bin/sh
+# -*-scheme-*-
+echo ' ()' | cat $($(dirname $0)/../scripts/include.mes $0) $0 /dev/stdin | $(dirname $0)/../scripts/mes "$@"
+#paredit:||
+exit $?
+!#
+
+;;; -*-scheme-*-
+
+;;; Mes --- Maxwell Equations of Software
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;
+;;; scm.test: This file is part of Mes.
+;;;
+;;; Mes is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; Mes 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 General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with Mes.  If not, see <http://www.gnu.org/licenses/>.
+
+(mes-use-module (mes base-0))
+(mes-use-module (mes base))
+(mes-use-module (mes quasiquote))
+(mes-use-module (mes let))
+(mes-use-module (srfi srfi-0))
+(mes-use-module (mes scm))
+(mes-use-module (mes test))
+
+(if guile?
+  (use-modules (srfi srfi-1)))
+
+(pass-if "values" (seq? (values 0 1) 0))
+(pass-if "values 2" (seq? ((lambda (x) x) (values 1 2 3)) 1))
+(pass-if "values 3" (seq? 1 ((lambda (x) x) (values 1 2 3))))
+(pass-if "call-with-values" (seq? (call-with-values (lambda () (values 1 2 3))
+                                    (lambda (a b c) (+ a b c)))
+                                  6))
+
+(pass-if-equal "values 5"
+    '(1 2 3 4 5)
+    (call-with-values
+     (lambda ()
+       (values 1 2 3 4 5))
+   (lambda (one two three four five)
+     (list one two three four five))))
+
+(pass-if-equal "values rests"
+    1
+    (call-with-values
+     (lambda ()
+       (values 1 2 3 4 5))
+     (lambda (one . rest)
+       one)))
+
+(pass-if-equal "values 4a 4b"
+    '(1 2 3 four-a 5)
+ ((lambda (one two three four five)
+    (append
+     (list one two three)
+     (call-with-values
+         (lambda () four)
+       (lambda (4a . 4b)
+         ;;(cons 4a 4b) FIXME: non-compliancy?
+         (list 4a)
+))
+     (list five)))
+  1 2 3 (values 'four-a 'four-b) 5))
+
+(result 'report)
diff --git a/tests/scm.test b/tests/scm.test
index 751b14ee..8388f1b7 100755
--- a/tests/scm.test
+++ b/tests/scm.test
@@ -99,13 +99,6 @@ exit $?
 (pass-if "assq-set! 2" (sequal? (assq-set! '((a . 0)) 'a 1) '((a . 1))))
 (pass-if "assoc" (sequal? (assoc '(a . 0) '((a . 0) (b . 1) ((a . 0) aa))) '((a . 0) aa)))
 
-(pass-if "values" (seq? (values 0 1) 0))
-(pass-if "values 2" (seq? ((lambda (x) x) (values 1 2 3)) 1))
-(pass-if "values 3" (seq? 1 ((lambda (x) x) (values 1 2 3))))
-(pass-if "call-with-values" (seq? (call-with-values (lambda () (values 1 2 3))
-                                    (lambda (a b c) (+ a b c)))
-                                  6))
-
 (pass-if "builtin? car" (builtin? car))
 (pass-if "builtin? cdr" (builtin? cdr))
 (pass-if "builtin? cons" (builtin? cons))