~ chicken-core (chicken-5) 91e5c146dcd3ad8b5d5aa7151eaf10af265ac2b5
commit 91e5c146dcd3ad8b5d5aa7151eaf10af265ac2b5
Author: Peter Bex <peter@more-magic.net>
AuthorDate: Sun Mar 11 14:42:01 2018 +0100
Commit: Evan Hanson <evhan@foldling.org>
CommitDate: Mon Mar 12 19:14:57 2018 +1300
Remove the "chicken" module
Any remaining uses of it have now been removed as well.
Signed-off-by: Evan Hanson <evhan@foldling.org>
diff --git a/README b/README
index 5b1a6afe..2d5fca31 100644
--- a/README
+++ b/README
@@ -277,7 +277,6 @@ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/_/
|-- lib
| |-- chicken
| | `-- 9
- | | |-- chicken.import.so
| | |-- chicken.base.import.so
| | |-- chicken.bitwise.import.so
| | |-- chicken.blob.import.so
diff --git a/batch-driver.scm b/batch-driver.scm
index 691e85d1..ef1a8c5b 100644
--- a/batch-driver.scm
+++ b/batch-driver.scm
@@ -35,8 +35,6 @@
(module chicken.compiler.batch-driver
(compile-source-file)
-(import (only chicken case-sensitive keyword-style parentheses-synonyms symbol-escape))
-
(import scheme
chicken.base
chicken.fixnum
diff --git a/c-backend.scm b/c-backend.scm
index d6eeb466..babb2ac3 100644
--- a/c-backend.scm
+++ b/c-backend.scm
@@ -35,7 +35,6 @@
foreign-type-declaration)
(import scheme
- chicken ;; for string ports
chicken.base
chicken.bitwise
chicken.fixnum
diff --git a/chicken-install.scm b/chicken-install.scm
index 7195d3fb..a34de3dc 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -27,7 +27,6 @@
(module main ()
(import (scheme))
-(import (chicken)) ;; for string ports
(import (chicken base))
(import (chicken condition))
(import (chicken foreign))
diff --git a/chicken-uninstall.scm b/chicken-uninstall.scm
index b7f06873..bc5e2aa9 100644
--- a/chicken-uninstall.scm
+++ b/chicken-uninstall.scm
@@ -27,7 +27,6 @@
(module main ()
(import (scheme)
- (chicken) ;; for string ports
(chicken base)
(chicken file)
(chicken fixnum)
diff --git a/chicken.import.scm b/chicken.import.scm
deleted file mode 100644
index 7976d168..00000000
--- a/chicken.import.scm
+++ /dev/null
@@ -1,156 +0,0 @@
-;;;; chicken.import.scm - import library for "chicken" module
-;
-; Copyright (c) 2008-2018, The CHICKEN Team
-; All rights reserved.
-;
-; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
-; conditions are met:
-;
-; Redistributions of source code must retain the above copyright notice, this list of conditions and the following
-; disclaimer.
-; Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
-; disclaimer in the documentation and/or other materials provided with the distribution.
-; Neither the name of the author nor the names of its contributors may be used to endorse or promote
-; products derived from this software without specific prior written permission.
-;
-; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
-; OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-; AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-; POSSIBILITY OF SUCH DAMAGE.
-
-(##sys#register-primitive-module
- 'chicken
- '((abort . chicken.condition#abort)
- (add1 . chicken.base#add1)
- (bignum? . chicken.base#bignum?)
- (build-platform . chicken.platform#build-platform)
- (call/cc . chicken.base#call/cc)
- (case-sensitive . chicken.base#case-sensitive)
- (char-name . chicken.base#char-name)
- (chicken-home . chicken.platform#chicken-home)
- (chicken-version . chicken.platform#chicken-version)
- (condition-predicate . chicken.condition#condition-predicate)
- (condition-property-accessor . chicken.condition#condition-property-accessor)
- (condition? . chicken.condition#condition?)
- (condition->list . chicken.condition#condition->list)
- (cplxnum? . chicken.base#cplxnum?)
- (current-error-port . chicken.base#current-error-port)
- (current-exception-handler . chicken.condition#current-exception-handler)
- (dynamic-load-libraries . chicken.load#dynamic-load-libraries)
- (enable-warnings . chicken.base#enable-warnings)
- (equal=? . chicken.base#equal=?)
- (er-macro-transformer . chicken.syntax#er-macro-transformer)
- (error . chicken.base#error)
- (eval-handler . chicken.eval#eval-handler)
- (exact-integer? . chicken.base#exact-integer?)
- (exact-integer-sqrt . chicken.base#exact-integer-sqrt)
- (exact-integer-nth-root . chicken.base#exact-integer-nth-root)
- (exit . chicken.base#exit)
- (exit-handler . chicken.base#exit-handler)
- (expand . chicken.syntax#expand)
- (feature? . chicken.platform#feature?)
- (features . chicken.platform#features)
- (finite? . chicken.base#finite?)
- (fixnum-bits . chicken.fixnum#fixnum-bits)
- (fixnum-precision . chicken.fixnum#fixnum-precision)
- (fixnum? . chicken.base#fixnum?)
- (flonum? . chicken.base#flonum?)
- (flush-output . chicken.base#flush-output)
- (foldl . chicken.base#foldl)
- (foldr . chicken.base#foldr)
- (force-finalizers . chicken.gc#force-finalizers)
- (fx- . chicken.fixnum#fx-)
- (fx* . chicken.fixnum#fx*)
- (fx/ . chicken.fixnum#fx/)
- (fx+ . chicken.fixnum#fx+)
- (fx< . chicken.fixnum#fx<)
- (fx<= . chicken.fixnum#fx<=)
- (fx= . chicken.fixnum#fx=)
- (fx> . chicken.fixnum#fx>)
- (fx>= . chicken.fixnum#fx>=)
- (fxand . chicken.fixnum#fxand)
- (fxeven? . chicken.fixnum#fxeven?)
- (fxgcd . chicken.fixnum#fxgcd)
- (fxior . chicken.fixnum#fxior)
- (fxlen . chicken.fixnum#fxlen)
- (fxmax . chicken.fixnum#fxmax)
- (fxmin . chicken.fixnum#fxmin)
- (fxmod . chicken.fixnum#fxmod)
- (fxneg . chicken.fixnum#fxneg)
- (fxnot . chicken.fixnum#fxnot)
- (fxodd? . chicken.fixnum#fxodd?)
- (fxrem . chicken.fixnum#fxrem)
- (fxshl . chicken.fixnum#fxshl)
- (fxshr . chicken.fixnum#fxshr)
- (fxxor . chicken.fixnum#fxxor)
- (fxlen . chicken.fixnum#fxlen)
- (gensym . chicken.base#gensym)
- (get-call-chain . chicken.base#get-call-chain)
- (get-condition-property . chicken.condition#get-condition-property)
- (get-line-number . chicken.syntax#get-line-number)
- (get-output-string . chicken.base#get-output-string)
- (getter-with-setter . chicken.base#getter-with-setter)
- (implicit-exit-handler . chicken.base#implicit-exit-handler)
- (infinite? . chicken.base#infinite?)
- (installation-repository . chicken.platform#installation-repository)
- (ir-macro-transformer . chicken.syntax#ir-macro-transformer)
- (keyword-style . chicken.base#keyword-style)
- (load-library . chicken.load#load-library)
- (load-noisily . chicken.load#load-noisily)
- (load-relative . chicken.load#load-relative)
- (load-verbose . chicken.load#load-verbose)
- (open-input-string . chicken.base#open-input-string)
- (open-output-string . chicken.base#open-output-string)
- (port? . chicken.base#port?)
- (machine-byte-order . chicken.platform#machine-byte-order)
- (machine-type . chicken.platform#machine-type)
- (make-composite-condition . chicken.condition#make-composite-condition)
- (make-parameter . chicken.base#make-parameter)
- (make-promise . chicken.base#make-promise)
- (make-property-condition . chicken.condition#make-property-condition)
- (most-negative-fixnum . chicken.fixnum#most-negative-fixnum)
- (most-positive-fixnum . chicken.fixnum#most-positive-fixnum)
- (nan? . chicken.base#nan?)
- (notice . chicken.base#notice)
- (on-exit . chicken.base#on-exit)
- (parentheses-synonyms . chicken.base#parentheses-synonyms)
- (provide . chicken.load#provide)
- (provided? . chicken.load#provided?)
- (print . chicken.base#print)
- (print-call-chain . chicken.base#print-call-chain)
- (print* . chicken.base#print*)
- (procedure-information . chicken.base#procedure-information)
- (promise? . chicken.base#promise?)
- (quotient&modulo . chicken.base#quotient&modulo)
- (quotient&remainder . chicken.base#quotient&remainder)
- (ratnum? . chicken.base#ratnum?)
- (register-feature! . chicken.platform#register-feature!)
- (repository-path . chicken.platform#repository-path)
- (require . chicken.load#require)
- (return-to-host . chicken.platform#return-to-host)
- (setter . chicken.base#setter)
- (signal . chicken.condition#signal)
- (signum . chicken.base#signum)
- (sleep . chicken.base#sleep)
- (software-type . chicken.platform#software-type)
- (software-version . chicken.platform#software-version)
- (string->uninterned-symbol . chicken.base#string->uninterned-symbol)
- (strip-syntax . chicken.syntax#strip-syntax)
- (sub1 . chicken.base#sub1)
- (subvector . chicken.base#subvector)
- (symbol-append . chicken.base#symbol-append)
- (symbol-escape . chicken.base#symbol-escape)
- (syntax-error . chicken.syntax#syntax-error)
- (system . chicken.process#system)
- (unregister-feature! . chicken.platform#unregister-feature!)
- (vector-copy! . chicken.base#vector-copy!)
- (vector-resize . chicken.base#vector-resize)
- (void . chicken.base#void)
- (warning . chicken.base#warning)
- (with-exception-handler . chicken.condition#with-exception-handler))
- ##sys#chicken-macro-environment) ;XXX incorrect - won't work in compiled executable that does expansion
diff --git a/core.scm b/core.scm
index f9014c4b..69822b98 100644
--- a/core.scm
+++ b/core.scm
@@ -322,7 +322,6 @@
line-number-database-size)
(import scheme
- chicken ;; for string ports
chicken.base
chicken.condition
chicken.compiler.scrutinizer
diff --git a/csi.scm b/csi.scm
index a994bdb6..474f526a 100644
--- a/csi.scm
+++ b/csi.scm
@@ -44,8 +44,6 @@ EOF
(module chicken.csi
(editor-command toplevel-command set-describer!)
-(import chicken) ; parentheses-synonyms case-sensitive symbol-escape keyword-style and string ports
-
(import scheme
chicken.base
chicken.condition
diff --git a/data-structures.scm b/data-structures.scm
index c0d2e91d..3cdcf6b8 100644
--- a/data-structures.scm
+++ b/data-structures.scm
@@ -38,7 +38,6 @@
substring-index substring-index-ci)
(import scheme)
-(import chicken) ;; for string ports
(import chicken.base)
(import chicken.condition)
(import chicken.fixnum)
diff --git a/defaults.make b/defaults.make
index 5c33f10e..f9f460d9 100644
--- a/defaults.make
+++ b/defaults.make
@@ -262,7 +262,7 @@ CHICKEN_PROGRAM_OPTIONS += $(if $(PROFILE_OBJECTS),-profile)
# import libraries
-PRIMITIVE_IMPORT_LIBRARIES = chicken chicken.base chicken.condition \
+PRIMITIVE_IMPORT_LIBRARIES = chicken.base chicken.condition \
chicken.csi chicken.foreign chicken.syntax chicken.time
DYNAMIC_IMPORT_LIBRARIES = srfi-4
DYNAMIC_CHICKEN_IMPORT_LIBRARIES = bitwise blob errno file.posix \
diff --git a/distribution/manifest b/distribution/manifest
index 7a818fc2..2db385d4 100644
--- a/distribution/manifest
+++ b/distribution/manifest
@@ -13,7 +13,6 @@ c-platform.c
chicken.compiler.c-platform.import.scm
chicken-profile.c
chicken.c
-chicken.import.scm
core.c
chicken.compiler.core.import.scm
csc.c
@@ -266,8 +265,6 @@ modules.c
chicken-syntax.scm
chicken-syntax.c
common-declarations.scm
-chicken.import.scm
-chicken.import.c
chicken.base.import.scm
chicken.base.import.c
chicken.bitwise.import.scm
diff --git a/eval-modules.scm b/eval-modules.scm
index 56d81e47..e05e2bd3 100644
--- a/eval-modules.scm
+++ b/eval-modules.scm
@@ -54,7 +54,6 @@
(,%include ,(string-append (symbol->string name)
".import.scm"))))))))
-(defmod chicken)
(defmod chicken.bitwise)
(defmod chicken.blob)
(defmod chicken.foreign)
diff --git a/eval.scm b/eval.scm
index 8df126ef..8dfbee9d 100644
--- a/eval.scm
+++ b/eval.scm
@@ -48,7 +48,6 @@
(eval-handler module-environment)
(import scheme
- chicken ;; for string ports
chicken.base
chicken.blob
chicken.fixnum
@@ -886,7 +885,6 @@
provide provided? require)
(import scheme
- chicken ; string ports
chicken.base
chicken.eval
chicken.fixnum
@@ -909,10 +907,6 @@
'((chicken.foreign
. (##core#require-for-syntax chicken-ffi-syntax))
(chicken.condition
- . (##core#begin
- (##core#require-for-syntax chicken-syntax)
- (##core#require library)))
- (chicken
. (##core#begin
(##core#require-for-syntax chicken-syntax)
(##core#require library)))))
@@ -1387,7 +1381,6 @@
;;; Simple invocation API:
-(import chicken) ; for string ports (can be removed after bootstrapping)
(import scheme chicken.base chicken.condition chicken.eval chicken.fixnum chicken.load)
(declare
diff --git a/expand.scm b/expand.scm
index accfdd4a..c33b547e 100644
--- a/expand.scm
+++ b/expand.scm
@@ -42,8 +42,6 @@
er-macro-transformer
ir-macro-transformer)
-(import chicken) ;; assert and string ports
-
(import scheme
chicken.base
chicken.condition
diff --git a/extras.scm b/extras.scm
index c99919e0..bc04f161 100644
--- a/extras.scm
+++ b/extras.scm
@@ -34,7 +34,6 @@
read-lines read-string read-string! read-token
write-byte write-line write-string)
-(import chicken) ;; for string ports
(import scheme chicken.base chicken.fixnum)
(include "common-declarations.scm")
@@ -249,7 +248,7 @@
(module chicken.pretty-print
(pp pretty-print pretty-print-width)
-(import scheme chicken chicken.base chicken.fixnum chicken.string)
+(import scheme chicken.base chicken.fixnum chicken.string)
(define generic-write
(lambda (obj display? width output)
@@ -564,7 +563,7 @@
(module chicken.format
(format fprintf printf sprintf)
-(import scheme chicken chicken.base chicken.fixnum chicken.platform)
+(import scheme chicken.base chicken.fixnum chicken.platform)
(define fprintf0
(lambda (loc port msg args)
diff --git a/internal.scm b/internal.scm
index 60d6e60d..4594f23e 100644
--- a/internal.scm
+++ b/internal.scm
@@ -56,7 +56,6 @@
;; Modules that are made available to code by default
default-imports default-syntax-imports)
-(import chicken) ;; for string ports
(import scheme chicken.base chicken.fixnum)
(include "common-declarations.scm")
diff --git a/irregex.scm b/irregex.scm
index 15eacb1f..86f8a4b8 100644
--- a/irregex.scm
+++ b/irregex.scm
@@ -59,9 +59,7 @@
glob->sre sre->string irregex-opt irregex-quote)
-(import chicken); For assume, define-compiler-syntax, and string ports
-
-(import scheme chicken.base chicken.fixnum chicken.syntax)
+(import scheme chicken.base chicken.fixnum chicken.syntax chicken.type)
(import-for-syntax chicken.fixnum)
diff --git a/library.scm b/library.scm
index eaa2ce05..f8dd3b26 100644
--- a/library.scm
+++ b/library.scm
@@ -1085,7 +1085,6 @@ EOF
(import scheme)
(import (only (chicken module) reexport))
-(reexport (only chicken time))
(define (current-milliseconds)
(##core#inline_allocate ("C_a_i_current_milliseconds" 7) #f))
diff --git a/pathname.scm b/pathname.scm
index 8f42a5da..d61a0eca 100644
--- a/pathname.scm
+++ b/pathname.scm
@@ -48,7 +48,6 @@
pathname-strip-extension)
(import scheme
- chicken ;; for string ports
chicken.base
chicken.fixnum
chicken.irregex
diff --git a/port.scm b/port.scm
index 234562b3..8639e5ba 100644
--- a/port.scm
+++ b/port.scm
@@ -63,7 +63,6 @@
with-error-output-to-string)
(import scheme
- chicken ;; for string ports
chicken.base
chicken.fixnum
chicken.foreign
diff --git a/posix.scm b/posix.scm
index 6b631964..4f969541 100644
--- a/posix.scm
+++ b/posix.scm
@@ -83,8 +83,6 @@
time->string user-information
utc-time->seconds with-input-from-pipe with-output-to-pipe)
-(import chicken) ; for "select" and string ports
-
(import scheme
chicken.base
chicken.bitwise
diff --git a/repl.scm b/repl.scm
index 8e30421d..a2a81437 100644
--- a/repl.scm
+++ b/repl.scm
@@ -33,7 +33,6 @@
(quit repl repl-prompt reset reset-handler)
(import scheme
- chicken ;; for string ports
chicken.base
chicken.eval
chicken.foreign
diff --git a/support.scm b/support.scm
index f4f81848..9136c35c 100644
--- a/support.scm
+++ b/support.scm
@@ -77,7 +77,6 @@
number-type unsafe)
(import scheme
- chicken ;; for string ports
chicken.base
chicken.bitwise
chicken.blob
diff --git a/tests/breadth-first.scm b/tests/breadth-first.scm
index ad144bd2..98048ad6 100644
--- a/tests/breadth-first.scm
+++ b/tests/breadth-first.scm
@@ -5,7 +5,7 @@
(functor (breadth-first (Q QUEUE)) (search)
- (import scheme chicken Q)
+ (import scheme (chicken base) Q)
(define (enqlist q xs)
(foldl (lambda (q x) (enqueue q x)) q xs))
diff --git a/tests/compiler-tests.scm b/tests/compiler-tests.scm
index 9832b5e6..b3ab13ed 100644
--- a/tests/compiler-tests.scm
+++ b/tests/compiler-tests.scm
@@ -148,7 +148,7 @@
;; Unused arguments in foreign callback wrappers are not optimized away (#584)
(module bla (foo)
-(import scheme (only chicken assert) chicken.base chicken.foreign)
+(import scheme chicken.base chicken.foreign)
(define-external
(blabla (int a) (c-string b) (int c) (int d) (c-string e) (int f))
diff --git a/tests/functor-tests.scm b/tests/functor-tests.scm
index ebc40a5d..6771802f 100644
--- a/tests/functor-tests.scm
+++ b/tests/functor-tests.scm
@@ -102,7 +102,7 @@
;; list-style library names
-(functor ((double printer) ((P (chicken)) (print))) (print-twice)
+(functor ((double printer) ((P (chicken base)) (print))) (print-twice)
(import (scheme) P)
(define (print-twice x) (print x) (print x)))
diff --git a/tests/import-library-test2.scm b/tests/import-library-test2.scm
index fe449297..fb61aee5 100644
--- a/tests/import-library-test2.scm
+++ b/tests/import-library-test2.scm
@@ -1,7 +1,7 @@
(require-library import-library-test1)
(module bar (xcase)
- (import scheme chicken foo)
+ (import scheme (chicken base) foo)
(assert (equal? '(123) (foo)))
(assert (= 2 (xcase 1 ((1) 2)))))
diff --git a/tests/import-tests.scm b/tests/import-tests.scm
index 48ed7311..bd0eeb0e 100644
--- a/tests/import-tests.scm
+++ b/tests/import-tests.scm
@@ -8,7 +8,7 @@
(handle-exceptions ex #t
(eval '
(module m2 ()
-(import scheme chicken (only (srfi 4) u8vector?))
+(import scheme (only (srfi 4) u8vector?))
s8vector?)) #f))
(module m3 ()
@@ -16,6 +16,6 @@ s8vector?)) #f))
u8v?)
(module m4 ()
-(import scheme chicken)
+(import scheme (chicken base))
(require-extension (prefix (srfi 4) s4:))
s4:f32vector)
diff --git a/tests/messages-test.scm b/tests/messages-test.scm
index e41e82fc..9760e7a5 100644
--- a/tests/messages-test.scm
+++ b/tests/messages-test.scm
@@ -3,7 +3,7 @@
(define var 42))
(module foo *
- (import scheme chicken boo)
+ (import scheme (chicken base) boo)
(define-syntax bar
(syntax-rules ()))
(set! bar 42) ;; set!-ing a macro
diff --git a/tests/module-tests-2.scm b/tests/module-tests-2.scm
index b2fdb610..2fc33f23 100644
--- a/tests/module-tests-2.scm
+++ b/tests/module-tests-2.scm
@@ -38,7 +38,7 @@
)
(module mtest ()
- (import scheme m chicken oo)
+ (import scheme m (chicken base) oo)
(assert (string=? "f1\n" (output-of (f1))))
(assert (string=? "f1\n" (output-of (f1))))
(assert (string=? "f2\n" (output-of (f2))))
@@ -66,7 +66,7 @@
)
(module mtest2 (f3 f4)
- (import (except scheme lambda) m1 (only chicken assert) oo)
+ (import (except scheme lambda) m1 (chicken base) oo)
(define (f3) ; standard lambda
(display 'f3)
@@ -91,7 +91,7 @@
(module m3 ()
(import (rename scheme (define s:define)))
- (import (only chicken assert))
+ (import (only (chicken base) assert))
(define-syntax define
(syntax-rules ()
((_) (display 'oink))))
diff --git a/tests/module-tests.scm b/tests/module-tests.scm
index 7eb852f4..83f142d0 100644
--- a/tests/module-tests.scm
+++ b/tests/module-tests.scm
@@ -69,7 +69,7 @@
((_ x) (gna 'x)))))
(module m2 (run)
- (import scheme chicken m1)
+ (import scheme (chicken base) m1)
(define-syntax baz
(syntax-rules ()
((_ x) (list 'goo 'x))))
@@ -80,7 +80,7 @@
(test-equal "indirect imports" (run) '(gna 99))
(module m1 ((s1 f1))
- (import scheme chicken)
+ (import scheme (chicken base))
(define (f1) (print "f1") 'f1)
(define-syntax s1
(syntax-rules ()
@@ -172,7 +172,7 @@
;;; import-forms in `require-extension':
(module m15 ()
- (import scheme chicken)
+ (import scheme (chicken base))
(import (prefix (rename srfi-4 (u8vector u)) 99:))
(print 99:u))
@@ -181,13 +181,13 @@
(module m16 (foo-module)
-(import scheme chicken)
+(import scheme)
(define-syntax foo-module
(syntax-rules ()
((_ name)
(module name (maker definer)
- (import scheme chicken)
+ (import scheme)
(define (maker) 'name)
(define-syntax definer
(syntax-rules ()
@@ -282,7 +282,7 @@
(test-equal
"handle star-exporting module with reexport"
(module m28 ()
- (import scheme chicken)
+ (import scheme (chicken base))
(import (prefix m26 b/))
(import (prefix m27 c/))
(print b/foo)
diff --git a/tests/record-rename-test.scm b/tests/record-rename-test.scm
index f416af48..bca849a7 100644
--- a/tests/record-rename-test.scm
+++ b/tests/record-rename-test.scm
@@ -8,7 +8,7 @@
(x get-x))
(module m1 (make-foo make-bar foo? bar?)
-(import scheme chicken)
+(import scheme (chicken base))
(define-record foo a b)
diff --git a/tests/reexport-m2.scm b/tests/reexport-m2.scm
index f3b5ad25..b2cc0a11 100644
--- a/tests/reexport-m2.scm
+++ b/tests/reexport-m2.scm
@@ -1,5 +1,5 @@
;;;; module importing from module that reexports core binding
(module foo ()
- (import scheme chicken reexport-m1)
+ (import scheme (chicken base) reexport-m1)
(print (cons 1 2)))
diff --git a/tests/reexport-tests.scm b/tests/reexport-tests.scm
index 22af72e7..8b5b6a13 100644
--- a/tests/reexport-tests.scm
+++ b/tests/reexport-tests.scm
@@ -28,7 +28,7 @@
(reexport imp ...)))))
(compound-module big-chicken
- chicken
+ chicken.base
chicken.file
chicken.port
chicken.pretty-print
diff --git a/tests/reverser/tags/1.0/reverser.scm b/tests/reverser/tags/1.0/reverser.scm
index 130b7df4..077bc7f3 100644
--- a/tests/reverser/tags/1.0/reverser.scm
+++ b/tests/reverser/tags/1.0/reverser.scm
@@ -1,5 +1,5 @@
(module reverser *
- (import scheme chicken)
+ (import scheme (chicken base))
(define rev-version 1.0)
(define (string-reverse s)
diff --git a/tests/reverser/tags/1.1/reverser.scm b/tests/reverser/tags/1.1/reverser.scm
index ceb1932b..93f23b39 100644
--- a/tests/reverser/tags/1.1/reverser.scm
+++ b/tests/reverser/tags/1.1/reverser.scm
@@ -1,5 +1,5 @@
(module reverser *
- (import scheme chicken)
+ (import scheme (chicken base))
(define rev-version 1.1)
(define (string-reverse s)
diff --git a/tests/specialization-test-1.scm b/tests/specialization-test-1.scm
index 50d6aee3..52f72c30 100644
--- a/tests/specialization-test-1.scm
+++ b/tests/specialization-test-1.scm
@@ -2,7 +2,7 @@
(module foo (foo bar)
-(import scheme chicken chicken.foreign)
+(import scheme chicken.base chicken.foreign chicken.type)
#>
static int inlined(int i) {
diff --git a/tests/specialization-test-2.scm b/tests/specialization-test-2.scm
index 3fed2efc..2b83dba4 100644
--- a/tests/specialization-test-2.scm
+++ b/tests/specialization-test-2.scm
@@ -2,7 +2,7 @@
(module main ()
-(import scheme chicken chicken.foreign)
+(import scheme chicken.base chicken.foreign)
(import-syntax foo) ; note: does not load foo!
#>
diff --git a/tests/srfi-4-tests.scm b/tests/srfi-4-tests.scm
index dcea9ecf..10f3ce7c 100644
--- a/tests/srfi-4-tests.scm
+++ b/tests/srfi-4-tests.scm
@@ -2,7 +2,7 @@
(import (srfi 4) (chicken port))
-(import-for-syntax (chicken))
+(import-for-syntax (chicken base))
(define-syntax test1
(er-macro-transformer
diff --git a/tests/syntax-tests.scm b/tests/syntax-tests.scm
index b3ba18ee..b119ee84 100644
--- a/tests/syntax-tests.scm
+++ b/tests/syntax-tests.scm
@@ -488,7 +488,7 @@
;;; incorrect lookup for keyword variables in DSSSL llists
(module broken-keyword-var ()
- (import scheme (only chicken assert))
+ (import scheme (chicken base))
((lambda (#!key string) (assert (not string))))) ; refered to R5RS `string'
;;; Missing check for keyword and optional variable types in DSSSL llists
@@ -516,7 +516,7 @@
(define x 99)
(module primitive-assign ()
- (import scheme (only chicken assert setter))
+ (import scheme (chicken base))
(let ((x 100)) (set! x 20) (assert (= x 20)))
(set! setter 123))
@@ -774,8 +774,8 @@
;;; redefining definition forms (disabled, since we can not catch this error easily)
#|
-(module m0a () (import chicken) (reexport (only scheme define)))
-(module m0b () (import chicken) (reexport (only scheme define-syntax)))
+(module m0a () (import chicken.module) (reexport (only scheme define)))
+(module m0b () (import chicken.module) (reexport (only scheme define-syntax)))
(module m1 ()
(import (prefix scheme s:) (prefix m0b m:))
@@ -1107,7 +1107,7 @@
;; an identifier to something imported for the runtime environment
(module foonumbers (+)
- (import (except scheme +) (only chicken error))
+ (import (except scheme +) (only (chicken base) error))
(define (+ . _) (error "failed.")))
(import foonumbers)
@@ -1134,7 +1134,7 @@ other-eval
;; #805: case-lambda is unhygienic (see 4706afb4 and bc5cc698)
(module case-lambda-and-ensure-hygiene ()
- (import (prefix chicken c/) (prefix scheme s/))
+ (import (prefix (chicken base) c/) (prefix scheme s/))
(c/case-lambda ((a) a)))
diff --git a/tests/test-queue.scm b/tests/test-queue.scm
index 278a3e2d..fbc03609 100644
--- a/tests/test-queue.scm
+++ b/tests/test-queue.scm
@@ -5,7 +5,7 @@
(functor (test-queue (Q QUEUE)) *
- (import scheme chicken Q)
+ (import scheme (chicken base) Q)
(define (list->queue lst)
(foldl (lambda (q x) (enqueue q x)) empty-queue lst))
Trap