~ chicken-r7rs (master) 799c4f0f17f3bbc5b61c6a027013697edc73627f

commit 799c4f0f17f3bbc5b61c6a027013697edc73627f
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Tue May 29 20:43:30 2018 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Tue May 29 20:43:30 2018 +0200

    add dep, try to reorder imports/exports, simplify

diff --git a/r7rs.egg b/r7rs.egg
index 4316291..7783a1d 100644
--- a/r7rs.egg
+++ b/r7rs.egg
@@ -7,7 +7,8 @@
  (components
    (extension r7rs 
      (component-dependencies r7rs-compile-time)
-     (source-dependencies "synrules.scm"))
+     (source-dependencies "synrules.scm" 
+                          "scheme.base-interface.scm"))
    (extension r7rs-support)
    (extension r7rs-library)
    (extension r7rs-compile-time
diff --git a/scheme.base-interface.scm b/scheme.base-interface.scm
index a9a9c83..25cdb04 100644
--- a/scheme.base-interface.scm
+++ b/scheme.base-interface.scm
@@ -47,19 +47,15 @@
   error-object?
   even? odd?
   exact inexact
-  #|
   exact-integer-sqrt
   exact-integer?
-  |#
   exact? inexact?
   exp
   expt
   features
   file-error?
   floor
-  #|
   floor/ floor-quotient floor-remainder
-  |#
   flush-output-port
   for-each
   gcd lcm
@@ -113,9 +109,7 @@
   quotient remainder
   raise raise-continuable
   rational?
-  #|
   rationalize
-  |#
   read-bytevector read-bytevector!
   read-char
   read-error?
@@ -152,9 +146,7 @@
   |#
   textual-port?
   truncate
-  #|
   truncate/ truncate-quotient truncate-remainder
-  |#
   u8-ready?
   unless
   #|
diff --git a/scheme.base.scm b/scheme.base.scm
index bc64abd..39f8b9f 100644
--- a/scheme.base.scm
+++ b/scheme.base.scm
@@ -24,21 +24,16 @@
                 (make-u8vector make-bytevector)
                 (write-u8vector write-bytevector)))
 
-(include "scheme.base-interface.scm")
-
 ;; For syntax definition helpers.
 (import-for-syntax r7rs-support)
 (import-for-syntax r7rs-compile-time)
 (import r7rs-support)
 (import chicken.type)
 (import (only chicken.base exact-integer? exact-integer-sqrt
-              quotient&remainder
+              quotient&remainder error
               error foldl cut optional when case-lambda unless receive))
 
-(export exact-integer? exact-integer-sqrt)
-(export floor/ floor-quotient floor-remainder)
-(export rationalize)
-(export truncate truncate/ truncate-quotient truncate-remainder)
+(include "scheme.base-interface.scm")
 
 ;; read/write-string/line/byte
 (import (prefix (only chicken.io read-string write-string) %))