~ chicken-r7rs (master) 9f2dad3fe812ba08b5e3bf31477a4b99369b3ad1


commit 9f2dad3fe812ba08b5e3bf31477a4b99369b3ad1
Author:     Evan Hanson <evhan@foldling.org>
AuthorDate: Mon Sep 22 18:35:12 2014 +0000
Commit:     Evan Hanson <evhan@foldling.org>
CommitDate: Mon Sep 22 18:35:12 2014 +0000

    Use r7rs's import when building environment modules

diff --git a/scheme.base-interface.scm b/scheme.base-interface.scm
index ec85dc0..1f8d609 100644
--- a/scheme.base-interface.scm
+++ b/scheme.base-interface.scm
@@ -35,7 +35,7 @@
   define
   define-record-type
   define-syntax
-  define-values ; TODO
+  define-values
   denominator numerator
   do
   dynamic-wind
diff --git a/scheme.eval.scm b/scheme.eval.scm
index 4727c01..f221d82 100644
--- a/scheme.eval.scm
+++ b/scheme.eval.scm
@@ -24,9 +24,10 @@
        (lambda ()
 	 ;; create module...
 	 (%eval `(module ,name ()
-		  ,@(map (lambda (spec)
-			   `(import ,(fixup-import/export-spec spec 'environment)))
-			 specs)))
+		   (import r7rs) ; for `import`
+		   ,@(map (lambda (spec)
+			    `(import ,(fixup-import/export-spec spec 'environment)))
+			  specs)))
 	 (let ((mod (##sys#find-module name)))
 	   (##sys#make-structure 'environment
 	    (cons 'import specs)
Trap