From 15ce5cafbc30062b94da2f30d4c39e16ea48de1f Mon Sep 17 00:00:00 2001
From: Julian Graham <julian.graham@aya.yale.edu>
Date: Tue, 30 Mar 2010 14:38:27 -0400
Subject: [PATCH] Implementation and test case for R6RS (rnrs eval) library.

* module/Makefile.am: Add rnrs/6/eval.scm to RNRS_SOURCES.
* module/rnrs/6/eval.scm: New file
* test-suite/Makefile.am: Add tests/r6rs-eval.test to SCM_TESTS.
* test-suite/tests/r6rs-eval.test: New file.
---
 module/Makefile.am              |  1 +
 module/rnrs/6/eval.scm          | 39 +++++++++++++++++++++++++++++++++
 test-suite/Makefile.am          |  1 +
 test-suite/tests/r6rs-eval.test | 28 +++++++++++++++++++++++
 4 files changed, 69 insertions(+)
 create mode 100644 module/rnrs/6/eval.scm
 create mode 100644 test-suite/tests/r6rs-eval.test

diff --git a/module/Makefile.am b/module/Makefile.am
index b498a915d..45161200f 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -260,6 +260,7 @@ RNRS_SOURCES =					\
   rnrs/6/conditions.scm				\
   rnrs/6/control.scm				\
   rnrs/6/enums.scm				\
+  rnrs/6/eval.scm				\
   rnrs/6/exceptions.scm				\
   rnrs/6/files.scm				\
   rnrs/6/hashtables.scm				\
diff --git a/module/rnrs/6/eval.scm b/module/rnrs/6/eval.scm
new file mode 100644
index 000000000..d58f87768
--- /dev/null
+++ b/module/rnrs/6/eval.scm
@@ -0,0 +1,39 @@
+;;; eval.scm --- The R6RS `eval' library
+
+;;      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
+
+
+(library (rnrs eval (6))
+  (export eval environment)
+  (import (only (guile) eval 
+		        make-module 
+			module-uses
+			beautify-user-module! 
+			set-module-uses!)
+	  (rnrs base (6))
+	  (rnrs io simple (6))
+	  (rnrs lists (6)))
+
+  (define (environment . import-specs)
+    (let ((module (make-module))
+	  (needs-purify? (not (member '(guile) import-specs))))
+      (beautify-user-module! module)
+      (for-each (lambda (import-spec) (eval (list 'import import-spec) module))
+		import-specs)
+      (if needs-purify? (set-module-uses! module (cdr (module-uses module))))
+      module))
+)
diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 6ca980aaf..cde33d42c 100644
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -80,6 +80,7 @@ SCM_TESTS = tests/00-initial-env.test		\
 	    tests/r6rs-conditions.test		\
 	    tests/r6rs-control.test		\
 	    tests/r6rs-enums.test		\
+	    tests/r6rs-eval.test		\
 	    tests/r6rs-exceptions.test		\
 	    tests/r6rs-files.test		\
 	    tests/r6rs-hashtables.test		\
diff --git a/test-suite/tests/r6rs-eval.test b/test-suite/tests/r6rs-eval.test
new file mode 100644
index 000000000..cfc4b6ba8
--- /dev/null
+++ b/test-suite/tests/r6rs-eval.test
@@ -0,0 +1,28 @@
+;;; r6rs-eval.test --- Test suite for R6RS (rnrs eval)
+
+;;      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 Lice6nse, 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-rnrs-eval)
+  :use-module ((rnrs eval) :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)))