~ chicken-r7rs (master) b403922ac4f30d7942d9c3ce39a09bf7b76e2c05

commit b403922ac4f30d7942d9c3ce39a09bf7b76e2c05
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Tue May 29 20:09:17 2018 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Tue May 29 20:09:17 2018 +0200

    PUSHED!

diff --git a/r7rs.egg b/r7rs.egg
index 9630b35..4316291 100644
--- a/r7rs.egg
+++ b/r7rs.egg
@@ -2,7 +2,7 @@
  (author "The Chicken Team")
  (category lang-exts)
  (license "BSD")
- (dependencies matchable)
+ (dependencies matchable srfi-13)
  (test-dependencies test)
  (components
    (extension r7rs 
@@ -26,7 +26,8 @@
    (extension scheme.lazy (types-file))
    (extension scheme.load (types-file))
    (extension scheme.process-context (types-file))
-   (extension scheme.r5rs (types-file))
+   (extension scheme.r5rs (types-file) 
+              (component-dependencies scheme.eval))
    (extension scheme.read (types-file))
    (extension scheme.repl (types-file))
    (extension scheme.time (types-file))
diff --git a/r7rs.meta b/r7rs.meta
deleted file mode 100644
index 93a34d7..0000000
--- a/r7rs.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-((synopsis "R7RS compatibility")
- (author "The Chicken Team")
- (category lang-exts)
- (license "BSD")
- (depends matchable make (numbers "2.9"))
- (test-depends test)
- (foreign-depends))
diff --git a/scheme.base.scm b/scheme.base.scm
index d0d8964..31d5f23 100644
--- a/scheme.base.scm
+++ b/scheme.base.scm
@@ -3,7 +3,7 @@
 (import (rename chicken.platform
                 (features feature-keywords)))
 (import (except chicken.condition with-exception-handler))
-
+(import chicken.module)
 (import (except scheme syntax-rules assoc member list-tail
                        char=? char<? char>? char<=? char>=?
                        string=? string<? string>? string<=? string>=?
@@ -29,10 +29,12 @@
 ;; For syntax definition helpers.
 (import-for-syntax r7rs-support)
 (import-for-syntax r7rs-compile-time)
-(begin-for-syntax
-  (require-library r7rs-compile-time))
 (import r7rs-support)
-(import (only chicken.type :))
+(import chicken.type)
+(import (only chicken.base exact-integer? exact-integer-sqrt
+              floor/ floor-quotient floor-remainder truncate/
+              truncate-quotient truncate-remainder error
+              foldl cut optional when case-lambda unless))
 
 (export exact-integer? exact-integer-sqrt)
 (export floor/ floor-quotient floor-remainder)
@@ -40,14 +42,15 @@
 (export truncate truncate/ truncate-quotient truncate-remainder)
 
 ;; read/write-string/line/byte
-(require-library extras)
 (import (prefix (only chicken.io read-string write-string) %))
 (import (rename (only chicken.io read-line read-byte write-byte)
                 (read-byte read-u8)
                 (write-byte write-u8)))
 
+(import chicken.fixnum)
+
 ;; flush-output
-(import (rename (only chicken.base flush-output case-lambda)
+(import (rename (only chicken.base flush-output)
                 (flush-output flush-output-port)))
 
 ;; u8-ready?
@@ -55,7 +58,6 @@
                 (char-ready? u8-ready?)))
 
 ;; Non-R5RS string-*
-(require-library srfi-13)
 (import (prefix (only srfi-13 string-for-each string-map) %))
 (import (only srfi-13 string-copy string-copy! string-fill! string->list))
 
@@ -690,6 +692,9 @@
 ;;; 6.13. Input and Output
 ;;;
 
+(import (only chicken.base get-output-string open-output-string
+              port-closed? receive port?))
+
 (: binary-port? (* --> boolean : port?))
 (: call-with-port (port (port -> . *) -> . *))
 (: close-port (port -> void))
diff --git a/scheme.r5rs.scm b/scheme.r5rs.scm
index 3dc003b..4e5ca11 100644
--- a/scheme.r5rs.scm
+++ b/scheme.r5rs.scm
@@ -1,11 +1,13 @@
 (module scheme.r5rs ()
 
-  (import chicken.base
-          (only chicken.type :))
   (import
    (rename scheme
 	   (null-environment %null-environment)
 	   (scheme-report-environment %scheme-report-environment)))
+  (import chicken.base chicken.module chicken.module 
+          chicken.syntax
+          (only chicken.type :))
+  (import scheme.eval)
 
   (export angle make-polar make-rectangular rationalize)
   (export null-environment scheme-report-environment)