~ chicken-core (chicken-5) c243dc497549119cc52aa70f7505ad8e228116b8
commit c243dc497549119cc52aa70f7505ad8e228116b8
Author: Evan Hanson <evhan@foldling.org>
AuthorDate: Tue Jan 26 09:26:45 2016 +1300
Commit: Evan Hanson <evhan@foldling.org>
CommitDate: Tue Mar 8 22:52:34 2016 +1300
Clean up imports and drop unnecessary require-library forms
diff --git a/batch-driver.scm b/batch-driver.scm
index 253c4542..7521ff16 100644
--- a/batch-driver.scm
+++ b/batch-driver.scm
@@ -29,7 +29,7 @@
;; Same goes for "backend" and "platform".
(declare
(unit batch-driver)
- (uses eval extras data-structures files
+ (uses extras data-structures files
support compiler-syntax compiler optimizer
;; TODO: Backend should be configurable
scrutinizer lfa2 c-platform c-backend) )
diff --git a/c-backend.scm b/c-backend.scm
index b2771e86..5622debb 100644
--- a/c-backend.scm
+++ b/c-backend.scm
@@ -40,9 +40,9 @@
(import chicken scheme
chicken.bitwise
chicken.data-structures
- chicken.format
chicken.flonum
chicken.foreign
+ chicken.format
chicken.internal
chicken.time
chicken.compiler.core
diff --git a/chicken-bug.scm b/chicken-bug.scm
index 2c8ffeef..08b74ab4 100644
--- a/chicken-bug.scm
+++ b/chicken-bug.scm
@@ -23,16 +23,17 @@
; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
; POSSIBILITY OF SUCH DAMAGE.
-
-(require-library posix tcp data-structures utils extras)
+(declare (block))
(import chicken.data-structures
+ chicken.files
chicken.foreign
chicken.format
chicken.io
+ chicken.keyword
+ chicken.ports
chicken.posix
- chicken.tcp
- chicken.utils)
+ chicken.time)
(define-constant +bug-report-file+ "chicken-bug-report.~a-~a-~a")
diff --git a/chicken-install.scm b/chicken-install.scm
index 76a1b684..046af215 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -23,10 +23,6 @@
; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
; POSSIBILITY OF SUCH DAMAGE.
-
-(require-library setup-download setup-api)
-(require-library posix data-structures irregex ports extras files)
-
(module main ()
(import scheme chicken)
@@ -548,7 +544,7 @@
(not *host-extension*))) ; host-repo must always take precedence
""
"-setup-mode ")
- "-e \"(require-library setup-api)\" -e \"(import setup-api)\" "
+ "-e \"(import setup-api)\" "
(if *debug-setup*
""
"-e \"(setup-error-handling)\" ")
diff --git a/chicken-profile.scm b/chicken-profile.scm
index 7e70236f..8a3538f4 100644
--- a/chicken-profile.scm
+++ b/chicken-profile.scm
@@ -24,11 +24,7 @@
; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
; POSSIBILITY OF SUCH DAMAGE.
-
-(declare
- (block)
- (uses data-structures
- posix))
+(declare (block))
(import chicken.data-structures
chicken.posix)
diff --git a/chicken-status.scm b/chicken-status.scm
index bff74847..98c95560 100644
--- a/chicken-status.scm
+++ b/chicken-status.scm
@@ -23,12 +23,8 @@
; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
; POSSIBILITY OF SUCH DAMAGE.
-
-(require-library setup-api posix data-structures ports irregex files)
-
-
(module main ()
-
+
(import scheme chicken)
(import setup-api)
(import chicken.data-structures
diff --git a/chicken-uninstall.scm b/chicken-uninstall.scm
index 8717f126..9daf6487 100644
--- a/chicken-uninstall.scm
+++ b/chicken-uninstall.scm
@@ -23,18 +23,14 @@
; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
; POSSIBILITY OF SUCH DAMAGE.
-
-(require-library setup-api posix data-structures ports irregex files)
-
(module main ()
-
+
(import scheme chicken)
(import setup-api)
(import chicken.data-structures
chicken.files
chicken.foreign
chicken.format
- chicken.io
chicken.irregex
chicken.ports
chicken.posix)
diff --git a/chicken.scm b/chicken.scm
index 1b6d3ae4..d8b9c309 100644
--- a/chicken.scm
+++ b/chicken.scm
@@ -27,7 +27,7 @@
(declare
(uses chicken-syntax chicken-ffi-syntax
- srfi-4 utils extras data-structures
+ srfi-4 extras data-structures
lolevel ; unused, but loaded to make foldable bindings available
support compiler optimizer lfa2 compiler-syntax scrutinizer
;; TODO: These three need to be made configurable somehow
diff --git a/csc.scm b/csc.scm
index e67da2e8..bed0073c 100644
--- a/csc.scm
+++ b/csc.scm
@@ -24,14 +24,12 @@
; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
; POSSIBILITY OF SUCH DAMAGE.
-
-(declare
- (block)
- (uses posix data-structures eval utils files extras))
+(declare (block))
(import chicken.posix
chicken.data-structures
chicken.files
+ chicken.foreign
chicken.format
chicken.utils)
diff --git a/csi.scm b/csi.scm
index f72c6656..5466debb 100644
--- a/csi.scm
+++ b/csi.scm
@@ -26,7 +26,6 @@
(declare
- (uses data-structures eval expand extras ports repl)
(usual-integrations)
(disable-interrupts)
(compile-syntax)
@@ -55,8 +54,10 @@ EOF
history-add history-ref history-clear history-show) )
(import chicken.data-structures
+ chicken.foreign
chicken.format
chicken.gc
+ chicken.keyword
chicken.io
chicken.ports
chicken.pretty-print
@@ -292,7 +293,7 @@ EOF
(set! command-table (cons (list name proc help) command-table))))
(##sys#void))
-(set! csi-eval
+(define csi-eval
(let ((eval eval)
(load-noisily load-noisily)
(read read)
diff --git a/rules.make b/rules.make
index c9ab1266..be11fbe7 100644
--- a/rules.make
+++ b/rules.make
@@ -553,10 +553,7 @@ c-platform.c: c-platform.scm mini-srfi-1.scm \
chicken.compiler.optimizer.import.scm \
chicken.compiler.support.import.scm \
chicken.compiler.core.import.scm \
- chicken.data-structures.import.scm \
- chicken.io.import.scm \
- chicken.files.import.scm \
- chicken.foreign.import.scm
+ chicken.data-structures.import.scm
c-backend.c: c-backend.scm mini-srfi-1.scm \
chicken.compiler.c-platform.import.scm \
chicken.compiler.support.import.scm \
@@ -564,7 +561,9 @@ c-backend.c: c-backend.scm mini-srfi-1.scm \
chicken.bitwise.import.scm \
chicken.data-structures.import.scm \
chicken.flonum.import.scm \
+ chicken.foreign.import.scm \
chicken.format.import.scm \
+ chicken.internal.import.scm \
chicken.time.import.scm
core.c: core.scm mini-srfi-1.scm \
chicken.compiler.scrutinizer.import.scm \
@@ -578,9 +577,7 @@ core.c: core.scm mini-srfi-1.scm \
chicken.pretty-print.import.scm
optimizer.c: optimizer.scm mini-srfi-1.scm \
chicken.compiler.support.import.scm \
- chicken.data-structures.import.scm \
- chicken.io.import.scm \
- chicken.foreign.import.scm
+ chicken.data-structures.import.scm
scheduler.c: scheduler.scm \
chicken.format.import.scm
scrutinizer.c: scrutinizer.scm mini-srfi-1.scm \
@@ -618,29 +615,34 @@ support.c: support.scm mini-srfi-1.scm \
modules.c: modules.scm \
chicken.keyword.import.scm
csc.c: csc.scm \
- chicken.posix.import.scm \
chicken.data-structures.import.scm \
chicken.eval.import.scm \
- chicken.utils.import.scm \
chicken.files.import.scm \
chicken.format.import.scm \
+ chicken.posix.import.scm \
chicken.utils.import.scm
csi.c: csi.scm \
chicken.data-structures.import.scm \
+ chicken.foreign.import.scm \
chicken.format.import.scm \
chicken.gc.import.scm \
+ chicken.keyword.import.scm \
chicken.io.import.scm \
chicken.ports.import.scm \
- chicken.pretty-print.import.scm
+ chicken.pretty-print.import.scm \
+ chicken.repl.import.scm
chicken-bug.c: chicken-bug.scm \
- chicken.data-structures.import.scm \
+ chicken.files.import.scm \
chicken.foreign.import.scm \
chicken.format.import.scm \
chicken.io.import.scm \
- chicken.tcp.import.scm \
- chicken.utils.import.scm
+ chicken.keyword.import.scm \
+ chicken.ports.import.scm \
+ chicken.posix.import.scm \
+ chicken.time.import.scm
chicken-profile.c: chicken-profile.scm \
- chicken.data-structures.import.scm
+ chicken.data-structures.import.scm \
+ chicken.posix.import.scm
chicken-status.c: chicken-status.scm \
chicken.data-structures.import.scm \
chicken.files.import.scm \
@@ -661,7 +663,6 @@ chicken-install.c: chicken-install.scm \
chicken.ports.import.scm \
chicken.posix.import.scm \
chicken.pretty-print.import.scm \
- chicken.utils.import.scm \
setup-api.import.scm \
setup-download.import.scm
chicken-uninstall.c: chicken-uninstall.scm \
@@ -669,11 +670,9 @@ chicken-uninstall.c: chicken-uninstall.scm \
chicken.files.import.scm \
chicken.foreign.import.scm \
chicken.format.import.scm \
- chicken.io.import.scm \
chicken.irregex.import.scm \
chicken.ports.import.scm \
chicken.posix.import.scm \
- chicken.utils.import.scm \
setup-api.import.scm
setup-api.c: setup-api.scm \
chicken.data-structures.import.scm \
@@ -682,7 +681,6 @@ setup-api.c: setup-api.scm \
chicken.format.import.scm \
chicken.io.import.scm \
chicken.irregex.import.scm \
- chicken.ports.import.scm \
chicken.posix.import.scm \
chicken.pretty-print.import.scm \
chicken.utils.import.scm
@@ -693,7 +691,6 @@ setup-download.c: setup-download.scm \
chicken.format.import.scm \
chicken.io.import.scm \
chicken.irregex.import.scm \
- chicken.ports.import.scm \
chicken.posix.import.scm \
chicken.tcp.import.scm \
chicken.utils.import.scm \
@@ -746,12 +743,10 @@ tcp.c: tcp.scm \
chicken.time.import.scm
utils.c: utils.scm \
chicken.data-structures.import.scm \
- chicken.io.import.scm \
chicken.files.import.scm \
chicken.foreign.import.scm \
chicken.format.import.scm \
- chicken.posix.import.scm \
- chicken.irregex.import.scm
+ chicken.posix.import.scm
define profile-flags
$(if $(filter $(basename $(1)),$(PROFILE_OBJECTS)),-profile)
diff --git a/scrutinizer.scm b/scrutinizer.scm
index 66331d5e..caeec684 100644
--- a/scrutinizer.scm
+++ b/scrutinizer.scm
@@ -26,7 +26,7 @@
(declare
(unit scrutinizer)
- (uses data-structures eval expand extras ports files support))
+ (uses data-structures expand extras files ports support))
(module chicken.compiler.scrutinizer
(scrutinize load-type-database emit-type-file
diff --git a/setup-api.scm b/setup-api.scm
index 39c5a387..d4cd8763 100644
--- a/setup-api.scm
+++ b/setup-api.scm
@@ -23,9 +23,6 @@
; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
; POSSIBILITY OF SUCH DAMAGE.
-
-(require-library irregex utils posix extras ports data-structures files)
-
; This code is partially quite messy and the API is not overly consistent,
; mainly because it has grown "organically" while the old chicken-setup program
; evolved. The code was extracted and put into this module, without much
@@ -73,7 +70,6 @@
chicken.format
chicken.io
chicken.irregex
- chicken.ports
chicken.posix
chicken.pretty-print
chicken.utils)
diff --git a/setup-download.scm b/setup-download.scm
index e7204b6a..c751fea7 100644
--- a/setup-download.scm
+++ b/setup-download.scm
@@ -23,11 +23,6 @@
; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
; POSSIBILITY OF SUCH DAMAGE.
-
-(require-library extras irregex posix utils setup-api data-structures tcp
- files)
-
-
(module setup-download (retrieve-extension
locate-egg/local
locate-egg/http
diff --git a/srfi-4.scm b/srfi-4.scm
index 80ef73ca..6403f3f4 100644
--- a/srfi-4.scm
+++ b/srfi-4.scm
@@ -29,7 +29,7 @@
(unit srfi-4)
(uses expand extras)
(disable-interrupts)
- (not inline ##sys#user-print-hook ##sys#number-hash-hook)
+ (not inline ##sys#user-print-hook)
(foreign-declare #<<EOF
#define C_copy_subvector(to, from, start_to, start_from, bytes) \
(C_memcpy((C_char *)C_data_pointer(to) + C_unfix(start_to), (C_char *)C_data_pointer(from) + C_unfix(start_from), C_unfix(bytes)), \
diff --git a/tests/import-tests.scm b/tests/import-tests.scm
index 0523ab14..48ed7311 100644
--- a/tests/import-tests.scm
+++ b/tests/import-tests.scm
@@ -1,8 +1,5 @@
;;;; import-tests.scm
-
-(require-library (srfi 4))
-
(module m1 ()
(import scheme (only srfi-4 u8vector?)) u8vector?)
diff --git a/tests/reexport-m1.scm b/tests/reexport-m1.scm
index 2df1e4da..a49fdc58 100644
--- a/tests/reexport-m1.scm
+++ b/tests/reexport-m1.scm
@@ -2,5 +2,4 @@
(module reexport-m1 ()
(import scheme chicken)
- (require-library srfi-4)
(reexport (only srfi-4 u8vector)))
diff --git a/utils.scm b/utils.scm
index e38b852e..fa474387 100644
--- a/utils.scm
+++ b/utils.scm
@@ -27,7 +27,7 @@
(declare
(unit utils)
- (uses data-structures eval extras posix files)
+ (uses data-structures posix files)
(fixnum)
(disable-interrupts) )
Trap