From d175c3949c602672d61734b3fc54750da1d57f89 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 27 Aug 2013 12:34:29 -0600 Subject: [PATCH] move "scheme" collection to a "scheme-lib" package Also, move remaining "srfi" libraries to "srfi-lite-lib". In principle, "base" should depend on "scheme-lib" and "srfi-lite-lib", and a new "base2" package would represent the new, smaller base. But I don't think the window has yet closed on determining the initial "base" package. The "srfi" libraries moved to "srfi-lite-lib", instead of "srfi-lib", to avoid creating many extra dependencies on "srfi-lib" and all of its dependencies. The SRFIs in "srfi-lite-lib" depend only on "base", and they are used relatively widely. --- pkgs/gui-pkgs/gui-lib/info.rkt | 1 + .../racket-test/tests/racket/basic.rktl | 2 +- .../racket-test/tests/racket/macro.rktl | 20 +- .../racket-test/tests/racket/module.rktl | 314 +++++++++--------- .../racket-test/tests/racket/read.rktl | 12 +- .../racket-test/tests/racket/readtable.rktl | 2 +- .../racket-test/tests/racket/stx.rktl | 128 +++---- .../racket-test/tests/racket/syntax.rktl | 11 +- pkgs/scheme-lib/info.rkt | 9 + .../scheme-lib}/scheme/async-channel.rkt | 0 .../scheme-lib}/scheme/base.rkt | 0 .../scheme-lib}/scheme/base/lang/reader.rkt | 0 .../scheme-lib}/scheme/bool.rkt | 0 .../scheme-lib}/scheme/class.rkt | 0 .../scheme-lib}/scheme/cmdline.rkt | 0 .../scheme-lib}/scheme/contract.rkt | 0 .../scheme-lib}/scheme/control.rkt | 0 .../scheme-lib}/scheme/date.rkt | 0 .../scheme-lib}/scheme/dict.rkt | 0 .../scheme-lib}/scheme/enter.rkt | 0 .../scheme-lib}/scheme/exists/lang.rkt | 0 .../scheme-lib}/scheme/exists/lang/reader.rkt | 0 .../scheme-lib}/scheme/fasl.rkt | 0 .../scheme-lib}/scheme/file.rkt | 0 .../scheme-lib}/scheme/fixnum.rkt | 0 .../scheme-lib}/scheme/flonum.rkt | 0 .../scheme-lib}/scheme/foreign.rkt | 0 .../scheme-lib}/scheme/function.rkt | 0 .../scheme-lib}/scheme/future.rkt | 0 .../scheme-lib}/scheme/generator.rkt | 0 .../scheme-lib}/scheme/gui/dynamic.rkt | 0 .../scheme-lib}/scheme/help.rkt | 0 .../scheme-lib}/scheme/include.rkt | 0 .../scheme-lib}/scheme/init.rkt | 0 .../scheme-lib}/scheme/lang/reader.rkt | 0 .../scheme-lib}/scheme/language-info.rkt | 0 .../scheme-lib}/scheme/list.rkt | 0 pkgs/scheme-lib/scheme/load.rkt | 37 +++ .../scheme-lib}/scheme/load/lang/reader.rkt | 0 .../scheme-lib}/scheme/local.rkt | 0 .../scheme-lib}/scheme/main.rkt | 0 .../scheme-lib}/scheme/match.rkt | 0 .../scheme-lib}/scheme/math.rkt | 0 .../scheme-lib}/scheme/nest.rkt | 0 .../scheme-lib}/scheme/path.rkt | 0 .../scheme-lib}/scheme/place.rkt | 0 .../scheme-lib}/scheme/port.rkt | 0 .../scheme-lib}/scheme/pretty.rkt | 0 .../scheme-lib}/scheme/private/namespace.rkt | 0 .../scheme/private/provider/lang.rkt | 0 .../scheme/private/provider/lang/reader.rkt | 0 .../scheme-lib}/scheme/promise.rkt | 0 .../scheme-lib}/scheme/provide-syntax.rkt | 0 .../scheme-lib}/scheme/provide-transform.rkt | 0 .../scheme-lib}/scheme/provide.rkt | 0 .../scheme-lib}/scheme/require-syntax.rkt | 0 .../scheme-lib}/scheme/require-transform.rkt | 0 .../scheme-lib}/scheme/require.rkt | 0 .../scheme-lib}/scheme/runtime-config.rkt | 0 .../scheme-lib}/scheme/runtime-path.rkt | 0 .../scheme-lib}/scheme/serialize.rkt | 0 .../scheme-lib}/scheme/set.rkt | 0 .../scheme-lib}/scheme/shared.rkt | 0 .../scheme/signature/lang/reader.rkt | 0 .../scheme-lib}/scheme/splicing.rkt | 0 .../scheme-lib}/scheme/string.rkt | 0 .../scheme-lib}/scheme/struct-info.rkt | 0 .../scheme-lib}/scheme/stxparam-exptime.rkt | 0 .../scheme-lib}/scheme/stxparam.rkt | 0 .../scheme-lib}/scheme/surrogate.rkt | 0 .../scheme-lib}/scheme/system.rkt | 0 .../scheme-lib}/scheme/tcp.rkt | 0 .../scheme-lib}/scheme/trace.rkt | 0 .../scheme-lib}/scheme/trait.rkt | 0 .../scheme-lib}/scheme/udp.rkt | 0 .../scheme-lib}/scheme/unit-exptime.rkt | 0 .../scheme-lib}/scheme/unit.rkt | 0 .../scheme-lib}/scheme/unit/lang.rkt | 0 .../scheme-lib}/scheme/unit/lang/reader.rkt | 0 .../scheme-lib}/scheme/unsafe/ops.rkt | 0 .../scheme-lib}/scheme/vector.rkt | 0 pkgs/srfi-pkgs/srfi-lib/info.rkt | 3 + pkgs/srfi-pkgs/srfi-lite-lib/info.rkt | 9 + .../srfi-pkgs/srfi-lite-lib}/srfi/1.rkt | 0 .../srfi-pkgs/srfi-lite-lib}/srfi/1/alist.rkt | 2 +- .../srfi-pkgs/srfi-lite-lib}/srfi/1/cons.rkt | 4 +- .../srfi-lite-lib}/srfi/1/delete.rkt | 2 +- .../srfi-lite-lib}/srfi/1/filter.rkt | 2 +- .../srfi-pkgs/srfi-lite-lib}/srfi/1/fold.rkt | 2 +- .../srfi-pkgs/srfi-lite-lib}/srfi/1/list.rkt | 2 +- .../srfi-pkgs/srfi-lite-lib}/srfi/1/lset.rkt | 2 +- .../srfi-pkgs/srfi-lite-lib}/srfi/1/misc.rkt | 4 +- .../srfi-lite-lib}/srfi/1/predicate.rkt | 2 +- .../srfi-lite-lib}/srfi/1/search.rkt | 2 +- .../srfi-lite-lib}/srfi/1/selector.rkt | 4 +- .../srfi-pkgs/srfi-lite-lib}/srfi/1/util.rkt | 2 +- .../srfi-pkgs/srfi-lite-lib}/srfi/13.rkt | 0 .../srfi-lite-lib}/srfi/13/string.rkt | 0 .../srfi-pkgs/srfi-lite-lib}/srfi/14.rkt | 0 .../srfi-lite-lib}/srfi/14/char-set.rkt | 0 .../srfi-pkgs/srfi-lite-lib}/srfi/19.rkt | 0 .../srfi-pkgs/srfi-lite-lib}/srfi/19/time.rkt | 0 .../srfi-pkgs/srfi-lite-lib}/srfi/29.rkt | 0 .../srfi-lite-lib}/srfi/29/bundles/es/srfi-19 | 0 .../srfi-lite-lib}/srfi/29/bundles/srfi-19 | 0 .../srfi-lite-lib}/srfi/29/localization.rkt | 0 .../srfi-pkgs/srfi-lite-lib}/srfi/8.rkt | 0 .../srfi-lite-lib}/srfi/8/receive.rkt | 2 +- .../srfi-lite-lib}/srfi/optional.rkt | 4 +- .../srfi-lite-lib}/srfi/provider.rkt | 6 +- racket/collects/compiler/compiler-unit.rkt | 6 +- racket/collects/compiler/distribute.rkt | 6 +- racket/collects/compiler/embed-unit.rkt | 12 +- racket/collects/compiler/embed.rkt | 4 +- racket/collects/dynext/compile-unit.rkt | 2 +- racket/collects/dynext/file-unit.rkt | 4 +- racket/collects/dynext/filename-version.rkt | 2 +- racket/collects/dynext/link-unit.rkt | 2 +- racket/collects/dynext/main.rkt | 2 +- racket/collects/dynext/private/cmdargs.rkt | 2 +- racket/collects/ffi/unsafe/try-atomic.rkt | 2 +- racket/collects/file/md5.rkt | 4 +- .../collects/file/private/octree-quantize.rkt | 6 +- racket/collects/file/tar.rkt | 4 +- racket/collects/launcher/launcher-sig.rkt | 2 +- racket/collects/launcher/launcher.rkt | 4 +- racket/collects/launcher/main.rkt | 2 +- racket/collects/openssl/main.rkt | 2 +- .../collects/planet/private/planet-shared.rkt | 4 +- racket/collects/racket/load.rkt | 4 +- racket/collects/racket/match/compiler.rkt | 256 +++++++------- racket/collects/racket/match/gen-match.rkt | 116 ++++--- racket/collects/racket/signature/lang.rkt | 26 +- racket/collects/raco/all-tools.rkt | 2 +- racket/collects/reader/lang/reader.rkt | 2 +- racket/collects/scheme/load.rkt | 2 - racket/collects/setup/commands/link.rkt | 2 +- racket/collects/setup/getinfo.rkt | 6 +- racket/collects/setup/link.rkt | 2 +- racket/collects/setup/main-doc.rkt | 2 +- racket/collects/setup/option-sig.rkt | 2 +- racket/collects/setup/option-unit.rkt | 4 +- racket/collects/setup/pack.rkt | 8 +- racket/collects/setup/private/lib-roots.rkt | 4 +- .../collects/setup/private/omitted-paths.rkt | 4 +- racket/collects/setup/private/path-utils.rkt | 2 +- racket/collects/setup/setup-go.rkt | 2 +- racket/collects/setup/variant.rkt | 4 +- racket/collects/setup/winvers-change.rkt | 2 +- racket/collects/setup/winvers.rkt | 2 +- racket/collects/syntax/moddep.rkt | 2 +- racket/collects/version/check.rkt | 2 +- racket/src/mac/rename-app.rkt | 3 +- racket/src/racket/gc2/setup.rkt | 3 - 154 files changed, 587 insertions(+), 539 deletions(-) create mode 100644 pkgs/scheme-lib/info.rkt rename {racket/collects => pkgs/scheme-lib}/scheme/async-channel.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/base.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/base/lang/reader.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/bool.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/class.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/cmdline.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/contract.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/control.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/date.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/dict.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/enter.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/exists/lang.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/exists/lang/reader.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/fasl.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/file.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/fixnum.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/flonum.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/foreign.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/function.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/future.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/generator.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/gui/dynamic.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/help.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/include.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/init.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/lang/reader.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/language-info.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/list.rkt (100%) create mode 100644 pkgs/scheme-lib/scheme/load.rkt rename {racket/collects => pkgs/scheme-lib}/scheme/load/lang/reader.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/local.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/main.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/match.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/math.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/nest.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/path.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/place.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/port.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/pretty.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/private/namespace.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/private/provider/lang.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/private/provider/lang/reader.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/promise.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/provide-syntax.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/provide-transform.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/provide.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/require-syntax.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/require-transform.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/require.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/runtime-config.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/runtime-path.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/serialize.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/set.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/shared.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/signature/lang/reader.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/splicing.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/string.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/struct-info.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/stxparam-exptime.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/stxparam.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/surrogate.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/system.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/tcp.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/trace.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/trait.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/udp.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/unit-exptime.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/unit.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/unit/lang.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/unit/lang/reader.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/unsafe/ops.rkt (100%) rename {racket/collects => pkgs/scheme-lib}/scheme/vector.rkt (100%) create mode 100644 pkgs/srfi-pkgs/srfi-lite-lib/info.rkt rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/1.rkt (100%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/1/alist.rkt (98%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/1/cons.rkt (97%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/1/delete.rkt (99%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/1/filter.rkt (99%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/1/fold.rkt (99%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/1/list.rkt (99%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/1/lset.rkt (99%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/1/misc.rkt (98%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/1/predicate.rkt (99%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/1/search.rkt (99%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/1/selector.rkt (97%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/1/util.rkt (99%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/13.rkt (100%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/13/string.rkt (100%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/14.rkt (100%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/14/char-set.rkt (100%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/19.rkt (100%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/19/time.rkt (100%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/29.rkt (100%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/29/bundles/es/srfi-19 (100%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/29/bundles/srfi-19 (100%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/29/localization.rkt (100%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/8.rkt (100%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/8/receive.rkt (97%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/optional.rkt (99%) rename {racket/collects => pkgs/srfi-pkgs/srfi-lite-lib}/srfi/provider.rkt (93%) delete mode 100644 racket/collects/scheme/load.rkt diff --git a/pkgs/gui-pkgs/gui-lib/info.rkt b/pkgs/gui-pkgs/gui-lib/info.rkt index ace6b1df30..0fc55f6178 100644 --- a/pkgs/gui-pkgs/gui-lib/info.rkt +++ b/pkgs/gui-pkgs/gui-lib/info.rkt @@ -10,6 +10,7 @@ "snip-lib" "wxme-lib" "pict-lib" + "scheme-lib" "scribble-lib" "string-constants-lib" "unstable-list-lib" ; for class-iop diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/basic.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/basic.rktl index 2d6e52c6df..48fe246b9c 100644 --- a/pkgs/racket-pkgs/racket-test/tests/racket/basic.rktl +++ b/pkgs/racket-pkgs/racket-test/tests/racket/basic.rktl @@ -3,7 +3,7 @@ (Section 'basic) -(require scheme/flonum +(require racket/flonum racket/function) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/macro.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/macro.rktl index 2795305a2d..640b0723ff 100644 --- a/pkgs/racket-pkgs/racket-test/tests/racket/macro.rktl +++ b/pkgs/racket-pkgs/racket-test/tests/racket/macro.rktl @@ -272,7 +272,7 @@ ;; ---------------------------------------- -(require (for-syntax scheme/struct-info)) +(require (for-syntax racket/struct-info)) (define-syntax (et-struct-info stx) (syntax-case stx () @@ -375,7 +375,7 @@ ;; ---------------------------------------- -(require (only-in mzlib/etc begin-with-definitions)) +(require racket/block) (define-syntax (def stx) (syntax-case stx () @@ -394,13 +394,13 @@ (look foo))) (test 50 'look - (begin-with-definitions + (block (def foo) (look foo))) (test #t 'bwd-struct (let () - (begin-with-definitions + (block (define-struct a (x y)) (define-struct (b a) (z)) (b? (make-b 1 2 3))))) @@ -425,7 +425,7 @@ (x))) (test 75 'bwd - (begin-with-definitions + (block (define-syntax foo (syntax-rules () [(_ id) (begin @@ -505,8 +505,8 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(module rename-transformer-tests scheme/base - (require (for-syntax scheme/base)) +(module rename-transformer-tests racket/base + (require (for-syntax racket/base)) (define x 12) (define-syntax bar (let ([x 10]) @@ -563,8 +563,8 @@ (12 (mpi x mpi x 0 0 0) #t)) values accum)) -(module rename-transformer-tests:m scheme/base - (require (for-syntax scheme/base)) +(module rename-transformer-tests:m racket/base + (require (for-syntax racket/base)) (define-syntax x 1) (define-syntax x* (make-rename-transformer #'x)) (define-syntax x** (make-rename-transformer (syntax-property #'x 'not-free-identifier=? #t))) @@ -574,7 +574,7 @@ #`#,(free-identifier=? #'i #'x)])) (provide get x* x**)) -(module rename-transformer-tests:n scheme +(module rename-transformer-tests:n racket (require 'rename-transformer-tests:m) (provide go) (define (go) diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/module.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/module.rktl index 19d1e58c4c..d7c65edc77 100644 --- a/pkgs/racket-pkgs/racket-test/tests/racket/module.rktl +++ b/pkgs/racket-pkgs/racket-test/tests/racket/module.rktl @@ -5,12 +5,12 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(module n mzscheme +(module n racket/base (define n 'n) - (define-struct s (field1 field2)) + (define-struct s (field1 field2) #:mutable) (provide n - (struct s (field1 field2)) - (rename n m))) + (struct-out s) + (rename-out [n m]))) (require 'n) (test 'n 'required-n n) @@ -35,103 +35,103 @@ (syntax-test #'(module)) (syntax-test #'(module m)) -(syntax-test #'(module 5 mzscheme)) +(syntax-test #'(module 5 racket/base)) (syntax-test #'(module m 5)) -(syntax-test #'(module m mzscheme . 1)) +(syntax-test #'(module m racket/base . 1)) (syntax-test #'(#%module-begin)) (syntax-test #'(+ (#%module-begin) 2)) -(syntax-test #'(module n+ mzscheme (#%module-begin (#%module-begin (define n+ 'n+) (provide n+))))) -(syntax-test #'(module n+ mzscheme (define n+ 'n+) (#%module-begin (provide n+)))) -(syntax-test #'(module n+ mzscheme (define n+ 'n+) (#%module-begin) (provide n+))) -(syntax-test #'(module n+ mzscheme (#%module-begin) (define n+ 'n+) (provide n+))) -(module n+ mzscheme (#%module-begin (define n+ 'n+) (provide n+))) +(syntax-test #'(module n+ racket/base (#%module-begin (#%module-begin (define n+ 'n+) (provide n+))))) +(syntax-test #'(module n+ racket/base (define n+ 'n+) (#%module-begin (provide n+)))) +(syntax-test #'(module n+ racket/base (define n+ 'n+) (#%module-begin) (provide n+))) +(syntax-test #'(module n+ racket/base (#%module-begin) (define n+ 'n+) (provide n+))) +(module n+ racket/base (#%module-begin (define n+ 'n+) (provide n+))) -(syntax-test #'(provide)) -(syntax-test #'(provide . x)) -(syntax-test #'(provide y . x)) -(syntax-test #'(module m mzscheme (define x 10) (provide . x))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide y . x))) -(syntax-test #'(module m mzscheme (define x 10) (provide 1))) -(syntax-test #'(module m mzscheme (define x 10) (provide "bad"))) -(syntax-test #'(module m mzscheme (define x 10) (provide not-here))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide x (rename y x)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide x z))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide x y (rename x y)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (rename)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (rename x)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (rename x y z)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (rename not-here x)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (rename x 1)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (rename 1 x)))) -(syntax-test #'(module m mzscheme (define-struct x (y)) (provide (struct)))) -(syntax-test #'(module m mzscheme (define-struct x (y)) (provide (struct . x)))) -(syntax-test #'(module m mzscheme (define-struct x (y)) (provide (struct x)))) -(syntax-test #'(module m mzscheme (define-struct x (y)) (provide (struct x (y) z)))) -(syntax-test #'(module m mzscheme (define-struct x (y)) (provide (struct x (y) . z)))) -(syntax-test #'(module m mzscheme (define-struct x (y)) (provide (struct 1 ())))) -(syntax-test #'(module m mzscheme (define-struct x (y)) (provide (struct x (1))))) -(syntax-test #'(module m mzscheme (define-struct x (y)) (provide (struct x (y . 1))))) -;; (syntax-test #'(module m mzscheme (define-struct x (y)) (provide (struct x (y y))))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-from)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-from . mzscheme)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-from 1)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-from xxxx)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-from mzscheme x)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-from-except)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-from-except . mzscheme)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-from-except 1)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-from-except mzscheme + . -)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-from-except mzscheme 1)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-from-except xxxx +)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-from-except mzscheme no)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-from-except mzscheme + no)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-defined x)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-defined . x)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-defined 1)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-defined-except . x)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-defined-except 1)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-defined-except x 1)))) -(syntax-test #'(module m mzscheme (define x 10) (define y 11) (provide (all-defined-except no)))) +(syntax-test #'(#%provide)) +(syntax-test #'(#%provide . x)) +(syntax-test #'(#%provide y . x)) +(syntax-test #'(module m racket/base (define x 10) (#%provide . x))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide y . x))) +(syntax-test #'(module m racket/base (define x 10) (#%provide 1))) +(syntax-test #'(module m racket/base (define x 10) (#%provide "bad"))) +(syntax-test #'(module m racket/base (define x 10) (#%provide not-here))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide x (rename y x)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide x z))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide x y (rename x y)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (rename)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (rename x)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (rename x y z)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (rename not-here x)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (rename x 1)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (rename 1 x)))) +(syntax-test #'(module m racket/base (define-struct x (y)) (#%provide (struct)))) +(syntax-test #'(module m racket/base (define-struct x (y)) (#%provide (struct . x)))) +(syntax-test #'(module m racket/base (define-struct x (y)) (#%provide (struct x)))) +(syntax-test #'(module m racket/base (define-struct x (y)) (#%provide (struct x (y) z)))) +(syntax-test #'(module m racket/base (define-struct x (y)) (#%provide (struct x (y) . z)))) +(syntax-test #'(module m racket/base (define-struct x (y)) (#%provide (struct 1 ())))) +(syntax-test #'(module m racket/base (define-struct x (y)) (#%provide (struct x (1))))) +(syntax-test #'(module m racket/base (define-struct x (y)) (#%provide (struct x (y . 1))))) +;; (syntax-test #'(module m racket/base (define-struct x (y)) (#%provide (struct x (y y))))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-from)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-from . racket/base)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-from 1)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-from xxxx)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-from racket/base x)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-from-except)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-from-except . racket/base)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-from-except 1)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-from-except racket/base + . -)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-from-except racket/base 1)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-from-except xxxx +)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-from-except racket/base no)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-from-except racket/base + no)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-defined x)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-defined . x)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-defined 1)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-defined-except . x)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-defined-except 1)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-defined-except x 1)))) +(syntax-test #'(module m racket/base (define x 10) (define y 11) (#%provide (all-defined-except no)))) -(syntax-test #'(require . x)) -(syntax-test #'(require m . x)) -(syntax-test #'(module m mzscheme (require n . x))) -(syntax-test #'(module m mzscheme (require (prefix)))) -(syntax-test #'(module m mzscheme (require (prefix n)))) -(syntax-test #'(module m mzscheme (require (prefix . pre:)))) -(syntax-test #'(module m mzscheme (require (prefix pre: . n)))) -(syntax-test #'(module m mzscheme (require (prefix 1 n)))) -(syntax-test #'(module m mzscheme (require (prefix pre: n more)))) -(syntax-test #'(module m mzscheme (require (prefix pre: n . more)))) -(syntax-test #'(module m mzscheme (require (all-except)))) -(syntax-test #'(module m mzscheme (require (all-except . n)))) -(syntax-test #'(module m mzscheme (require (all-except n 1)))) -(syntax-test #'(module m mzscheme (require (all-except n . n)))) -(syntax-test #'(module m mzscheme (require (rename)))) -(syntax-test #'(module m mzscheme (require (rename . n)))) -(syntax-test #'(module m mzscheme (require (rename n)))) -(syntax-test #'(module m mzscheme (require (rename n . n)))) -(syntax-test #'(module m mzscheme (require (rename n n)))) -(syntax-test #'(module m mzscheme (require (rename n n . m)))) -(syntax-test #'(module m mzscheme (require (rename n 1 m)))) -(syntax-test #'(module m mzscheme (require (rename n n 1)))) -(syntax-test #'(module m mzscheme (require (rename n n not-there)))) -(syntax-test #'(module m mzscheme (require (rename n n m extra)))) +(syntax-test #'(#%require . x)) +(syntax-test #'(#%require m . x)) +(syntax-test #'(module m racket/base (#%require n . x))) +(syntax-test #'(module m racket/base (#%require (prefix)))) +(syntax-test #'(module m racket/base (#%require (prefix n)))) +(syntax-test #'(module m racket/base (#%require (prefix . pre:)))) +(syntax-test #'(module m racket/base (#%require (prefix pre: . n)))) +(syntax-test #'(module m racket/base (#%require (prefix 1 n)))) +(syntax-test #'(module m racket/base (#%require (prefix pre: n more)))) +(syntax-test #'(module m racket/base (#%require (prefix pre: n . more)))) +(syntax-test #'(module m racket/base (#%require (all-except)))) +(syntax-test #'(module m racket/base (#%require (all-except . n)))) +(syntax-test #'(module m racket/base (#%require (all-except n 1)))) +(syntax-test #'(module m racket/base (#%require (all-except n . n)))) +(syntax-test #'(module m racket/base (#%require (rename)))) +(syntax-test #'(module m racket/base (#%require (rename . n)))) +(syntax-test #'(module m racket/base (#%require (rename n)))) +(syntax-test #'(module m racket/base (#%require (rename n . n)))) +(syntax-test #'(module m racket/base (#%require (rename n n)))) +(syntax-test #'(module m racket/base (#%require (rename n n . m)))) +(syntax-test #'(module m racket/base (#%require (rename n 1 m)))) +(syntax-test #'(module m racket/base (#%require (rename n n 1)))) +(syntax-test #'(module m racket/base (#%require (rename n n not-there)))) +(syntax-test #'(module m racket/base (#%require (rename n n m extra)))) -(syntax-test #'(module m mzscheme (require mzscheme) (define car 5))) -(syntax-test #'(module m mzscheme (define x 6) (define x 5))) -(syntax-test #'(module m mzscheme (define x 10) (define-syntax x 10))) -(syntax-test #'(module m mzscheme (define-syntax x 10) (define x 10))) +(syntax-test #'(module m racket/base (#%require racket/base) (define car 5))) +(syntax-test #'(module m racket/base (define x 6) (define x 5))) +(syntax-test #'(module m racket/base (define x 10) (define-syntax x 10))) +(syntax-test #'(module m racket/base (define-syntax x 10) (define x 10))) ;; Cyclic re-def of n: -(syntax-test #'(module n n 10)) +(syntax-test #'(module n 'n 10)) ;; It's now ok to shadow the initial import: -(module _shadow_ mzscheme +(module _shadow_ racket/base (define car 5) (provide car)) @@ -140,47 +140,43 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Check namespace-attach-module: -(require (only-in scheme/base) - (only-in mzscheme)) - (let* ([n (make-empty-namespace)] [l null] [here (lambda (v) (set! l (cons v l)))]) - (namespace-attach-module (current-namespace) 'scheme/base n) - (namespace-attach-module (current-namespace) 'mzscheme n) + (namespace-attach-module (current-namespace) 'racket/base n) (parameterize ([current-namespace n]) - (namespace-require 'mzscheme) - (eval `(module a mzscheme + (namespace-require 'racket/base) + (eval `(module a racket/base (define a 1) (,here 'a) (provide a))) (test null values l) - (eval `(module b mzscheme - (require-for-template 'a) + (eval `(module b racket/base + (require (for-template 'a)) (define b 1) (,here 'b) (provide b))) (test null values l) - (eval `(module c mzscheme - (require-for-template 'b) + (eval `(module c racket/base + (require (for-template 'b)) (define c 1) (,here 'c) (provide c))) (test null values l) - (eval `(module d mzscheme - (require-for-syntax 'c) + (eval `(module d racket/base + (require (for-syntax 'c)) (define d 1) (,here 'd) (provide d))) (test '(c) values l) - (eval `(module e mzscheme - (require-for-syntax 'd) + (eval `(module e racket/base + (require (for-syntax 'd)) (define e 1) (,here 'e) (provide e))) (test '(d b c) values l) - (eval `(module f mzscheme + (eval `(module f racket/base (,here 'f) (require 'e 'b))) (test '(d b d b c) values l) @@ -192,7 +188,7 @@ (parameterize ([current-namespace (make-empty-namespace)]) (namespace-attach-module n ''f) (test finished values l) - (namespace-require 'scheme/base) + (namespace-require 'racket/base) (eval `(require 'a)) (eval `(require 'f)) (test (list* 'd 'b finished) values l))))) @@ -234,41 +230,41 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Check redundant import and re-provide -(module m_cr mzscheme +(module m_cr racket/base (provide x_cr y_cr z_cr w_cr) (define x_cr 12) (define y_cr 14) (define z_cr 16) (define w_cr 18)) -(syntax-test #'(module n_cr mzscheme +(syntax-test #'(module n_cr racket/base (require 'm_cr) - (provide (all-from-except 'm_cr no-such-var)))) -(syntax-test #'(module n_cr mzscheme + (#%provide (all-from-except 'm_cr no-such-var)))) +(syntax-test #'(module n_cr racket/base (require 'm_cr) - (provide (all-from-except 'm_cr cons)))) + (#%provide (all-from-except 'm_cr cons)))) -(module n_cr mzscheme +(module n_cr racket/base (require 'm_cr) - (provide (all-from-except 'm_cr x_cr))) + (#%provide (all-from-except 'm_cr x_cr))) -(module p_cr mzscheme +(module p_cr racket/base (require 'n_cr 'm_cr) - (provide (all-from 'm_cr))) + (#%provide (all-from 'm_cr))) (require 'p_cr) (test 14 values y_cr) -(module p2_cr mzscheme +(module p2_cr racket/base (require 'm_cr 'n_cr) - (provide (all-from 'm_cr))) + (#%provide (all-from 'm_cr))) (require 'p2_cr) (test 16 values z_cr) -(module p3_cr mzscheme +(module p3_cr racket/base (require 'm_cr 'n_cr) - (provide (all-from 'n_cr))) + (#%provide (all-from 'n_cr))) (require 'p3_cr) (test 18 values w_cr) @@ -276,12 +272,13 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Test `require' scoping -(module fake-prefix-in scheme - (require scheme/require-syntax) +(module fake-prefix-in racket/base + (require (for-syntax racket/base) + racket/require-syntax) (define-require-syntax (pseudo-+ stx) (syntax-case stx () [(_ id) - #'(only-in scheme [+ id])])) + #'(only-in racket/base [+ id])])) (provide pseudo-+)) (require 'fake-prefix-in @@ -296,46 +293,49 @@ (test (void) eval '(begin - (module mod_beg2 mzscheme - (provide (all-from-except mzscheme #%module-begin)) - (provide (rename mb #%module-begin)) - (define-syntax (mb stx) - (syntax-case stx () - [(_ . forms) - #`(#%plain-module-begin - #,(datum->syntax-object stx '(require-for-syntax mzscheme)) - . forms)]))) + (module mod_beg2 racket/base + (require (for-syntax racket/base)) + (#%provide (all-from-except racket/base #%module-begin)) + (#%provide (rename mb #%module-begin)) + (define-syntax (mb stx) + (syntax-case stx () + [(_ . forms) + #`(#%plain-module-begin + #,(datum->syntax stx '(require (for-syntax racket/base))) + . forms)]))) (module m 'mod_beg2 - 3))) + 3))) (test (void) eval '(begin - (module mod_beg2 mzscheme - (provide (all-from-except mzscheme #%module-begin)) - (provide (rename mb #%module-begin)) - (define-syntax (mb stx) - (syntax-case stx () - [(_ . forms) - #`(#%plain-module-begin - #,(datum->syntax-object stx '(require-for-syntax mzscheme)) - . forms)]))) + (module mod_beg2 racket/base + (require (for-syntax racket/base)) + (#%provide (all-from-except racket/base #%module-begin)) + (#%provide (rename mb #%module-begin)) + (define-syntax (mb stx) + (syntax-case stx () + [(_ . forms) + #`(#%plain-module-begin + #,(datum->syntax stx '(require (for-syntax racket/base))) + . forms)]))) (module m 'mod_beg2 - 3 4))) + 3 4))) (test (void) eval '(begin - (module mod_beg2 mzscheme - (provide (all-from-except mzscheme #%module-begin)) - (provide (rename mb #%module-begin)) - (define-syntax (mb stx) - (syntax-case stx () - [(mb . forms) - #`(#%plain-module-begin - #,(datum->syntax-object #'mb '(require-for-syntax mzscheme)) - . forms)]))) + (module mod_beg2 racket/base + (require (for-syntax racket/base)) + (#%provide (all-from-except racket/base #%module-begin)) + (#%provide (rename mb #%module-begin)) + (define-syntax (mb stx) + (syntax-case stx () + [(mb . forms) + #`(#%plain-module-begin + #,(datum->syntax #'mb '(require (for-syntax racket/base))) + . forms)]))) (module m 'mod_beg2 - 3))) + 3))) (define expand-test-use-toplevel? #f) @@ -352,11 +352,11 @@ (with-output-to-file f1 #:exists 'truncate/replace (lambda () - (write `(module ,(string->symbol (path->string tmp1)) mzscheme (require (file ,(path->string f2))))))) + (write `(module ,(string->symbol (path->string tmp1)) racket/base (require (file ,(path->string f2))))))) (with-output-to-file f2 #:exists 'truncate/replace (lambda () - (write `(module ,(string->symbol (path->string tmp2)) mzscheme (require (file ,(path->string f1))))))) + (write `(module ,(string->symbol (path->string tmp2)) racket/base (require (file ,(path->string f1))))))) (err/rt-test (dynamic-require f1 #f) exn:fail-cycle?) (err/rt-test (dynamic-require f2 #f) exn:fail-cycle?) (delete-file f1) @@ -535,13 +535,13 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Check shadowing of initial imports: -(let ([m-code '(module m scheme/base (define-syntax-rule (lambda . _) 5) (provide lambda))] - [n-code '(module n scheme/base +(let ([m-code '(module m racket/base (define-syntax-rule (lambda . _) 5) (provide lambda))] + [n-code '(module n racket/base (require 'm) (define five (lambda (x) x)) (define five-stx #'lambda) (provide five five-stx))] - [p-code '(module p scheme/base + [p-code '(module p racket/base (require 'n) (define same? (free-identifier=? #'lambda five-stx)) (provide same?))]) @@ -586,7 +586,7 @@ (test #t regexp-match? #rx"namespace 'scheme/base) s) + (print (module->namespace 'racket/base) s) (test #t regexp-match? #rx"namespace ''n) s) @@ -605,7 +605,7 @@ (err/rt-test (expand '(module m racket (require racket/require) - (require (filtered-in (lambda (n) foo) scheme)))) + (require (filtered-in (lambda (n) foo) racket)))) exn:fail:contract:variable?) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/read.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/read.rktl index 11b974447b..9b5ab77885 100644 --- a/pkgs/racket-pkgs/racket-test/tests/racket/read.rktl +++ b/pkgs/racket-pkgs/racket-test/tests/racket/read.rktl @@ -732,7 +732,7 @@ (test a-special cadr v) (test b-special caddr v)) -(require (only-in mzlib/port [relocate-input-port relocate-input-port])) +(require (only-in racket/port [relocate-input-port relocate-input-port])) (define (shift-port p count-lines? deltas) (let ([p (relocate-input-port p (add1 (car deltas)) @@ -958,18 +958,18 @@ ;; Test #reader (err/rt-test (parameterize ([read-accept-reader #f]) - (read (open-input-string "#reader mzscheme 10"))) + (read (open-input-string "#reader racket/base 10"))) exn:fail:read?) (test 10 'ten (parameterize ([read-accept-reader #t]) - (read (open-input-string "#reader mzscheme 10")))) + (read (open-input-string "#reader racket/base 10")))) -(module reader-test-module mzscheme +(module reader-test-module racket/base (define (my-read port) `(READ ,(read port))) (define (my-read-syntax name port) `(READ-SYNTAX ,(read-syntax name port))) - (provide (rename my-read read) - (rename my-read-syntax read-syntax))) + (provide (rename-out [my-read read] + [my-read-syntax read-syntax]))) (test `(READ 10) 'ten (parameterize ([read-accept-reader #t]) diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/readtable.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/readtable.rktl index 586312f7c5..cd50c8fcf6 100644 --- a/pkgs/racket-pkgs/racket-test/tests/racket/readtable.rktl +++ b/pkgs/racket-pkgs/racket-test/tests/racket/readtable.rktl @@ -3,7 +3,7 @@ (Section 'readtable) -(require (only-in mzlib/port +(require (only-in racket/port [relocate-input-port relocate-input-port])) (define (shift-rt-port p deltas) (let ([p (relocate-input-port p diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/stx.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/stx.rktl index 2ebaa5a9cb..bcd22aaebd 100644 --- a/pkgs/racket-pkgs/racket-test/tests/racket/stx.rktl +++ b/pkgs/racket-pkgs/racket-test/tests/racket/stx.rktl @@ -345,19 +345,19 @@ ;; Test free-identifier=? on different phases via syntax-case* ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(module mta scheme/base +(module mta racket/base (define mtax 10) (provide mtax)) -(module mtb scheme/base +(module mtb racket/base (define mtby 10) (provide mtby)) -(module mt1 scheme/base +(module mt1 racket/base (require (prefix-in a: 'mta)) (require (for-syntax (prefix-in b: 'mtb) - scheme/base)) - (require (prefix-in mz: scheme/base)) + racket/base)) + (require (prefix-in mz: racket/base)) (define-syntax ck (lambda (stx) @@ -489,13 +489,13 @@ identifier-binding* #'delay) (test '('#%kernel #%module-begin (lib "racket/init") #%plain-module-begin 0 0 0) identifier-binding* #'#%plain-module-begin) -(require (only-in scheme/base [#%plain-module-begin #%pmb])) -(test '('#%kernel #%module-begin scheme/base #%plain-module-begin 0 0 0) +(require (only-in racket/base [#%plain-module-begin #%pmb])) +(test '('#%kernel #%module-begin racket/base #%plain-module-begin 0 0 0) identifier-binding* #'#%pmb) (let ([b (identifier-binding (syntax-case (expand #'(module m racket/base - (require (only-in scheme/base [make-base-namespace s-mbn])) + (require (only-in racket/base [make-base-namespace s-mbn])) s-mbn)) () [(mod m mz (#%mod-beg run-conf req (app call-with-values (lambda () make-base-namespace) print))) (let ([s (syntax make-base-namespace)]) @@ -503,13 +503,13 @@ s)]))]) (let-values ([(real real-base) (module-path-index-split (car b))] [(nominal nominal-base) (module-path-index-split (caddr b))]) - (test '"private/namespace.rkt" values real) + (test '"namespace.rkt" values real) (test 'make-base-namespace cadr b) - (test 'scheme/base values nominal) + (test 'racket/base values nominal) (test 'make-base-namespace cadddr b))) (let ([b (identifier-binding - (syntax-case (expand #'(module m scheme/base + (syntax-case (expand #'(module m racket/base make-base-namespace)) () [(mod m beg (#%mod-beg run-conf (app call-w-vals (lam () make-base-namespace) prnt))) (let ([s (syntax make-base-namespace)]) @@ -517,9 +517,9 @@ s)]))]) (let-values ([(real real-base) (module-path-index-split (car b))] [(nominal nominal-base) (module-path-index-split (caddr b))]) - (test '"private/namespace.rkt" values real) + (test '"namespace.rkt" values real) (test 'make-base-namespace cadr b) - (test 'scheme/base values nominal) + (test 'racket/base values nominal) (test 'make-base-namespace cadddr b))) (let () @@ -699,20 +699,20 @@ ;; The define-struct macro expands to begin, (test #t has-stx-property? (expand #'(define-struct x (a))) 'begin 'define-struct 'origin) -(test #t has-stx-property? (expand #'(module m scheme/base (define-struct x (a)))) 'define-values 'define-struct 'origin) -(test #t has-stx-property? (expand #'(module m scheme/base (define-struct x (a)))) 'define-syntaxes 'define-struct 'origin) +(test #t has-stx-property? (expand #'(module m racket/base (define-struct x (a)))) 'define-values 'define-struct 'origin) +(test #t has-stx-property? (expand #'(module m racket/base (define-struct x (a)))) 'define-syntaxes 'define-struct 'origin) ;; The s macro also expands to begin: -(test #t has-stx-property? (expand #'(module m scheme/base - (require (for-syntax scheme/base)) +(test #t has-stx-property? (expand #'(module m racket/base + (require (for-syntax racket/base)) (define-syntax (s stx) #'(begin (+ 1 10) 14)) s)) '#%app 's 'origin) -(test #t has-stx-property? (expand #'(module m scheme/base - (require (for-syntax scheme/base)) +(test #t has-stx-property? (expand #'(module m racket/base + (require (for-syntax racket/base)) (define-syntax (s stx) #'(begin (+ 1 10) @@ -895,13 +895,13 @@ ;; ---------------------------------------- -(module ++m scheme/base - (require (for-syntax scheme/base)) +(module ++m racket/base + (require (for-syntax racket/base)) (define ++x 10) (define-syntax (++xm stx) (syntax-protect #'100)) (provide (protect-out ++x ++xm))) -(module ++n scheme/base - (require (for-syntax scheme/base) +(module ++n racket/base + (require (for-syntax racket/base) '++m) (define ++y ++x) (define-syntax (++y-macro stx) (syntax-protect #'++x)) @@ -934,7 +934,7 @@ (parameterize ([current-code-inspector i] [current-namespace n2]) - (namespace-require 'scheme/base) + (namespace-require 'racket/base) (teval '(require '++n)) (test 10 teval '++y) @@ -951,15 +951,15 @@ (err/rt-test (teval '++xm) exn:fail:syntax?) (err/rt-test (teval '++y-macro2) exn:fail:syntax?) - (teval '(module zrt scheme/base + (teval '(module zrt racket/base (require '++n) (define (vy) ++y) (define (vy2) ++y-macro) (define (vu) ++u-macro) (define (vu2) ++u2) (provide vy vy2 vu vu2))) - (teval '(module zct scheme/base - (require (for-syntax scheme/base + (teval '(module zct racket/base + (require (for-syntax racket/base '++n)) (define-syntax (wy stx) (datum->syntax #'here ++y)) (let-syntax ([goo ++y-macro]) 10) @@ -991,8 +991,8 @@ (test 10 teval '++y-macro2))) -(module ++/n scheme/base - (require (for-syntax scheme/base)) +(module ++/n racket/base + (require (for-syntax racket/base)) (provide ++/get-foo) (define-syntax foo #'10) (define-syntax (++/get-foo stx) @@ -1000,8 +1000,8 @@ (require '++/n) (test 10 values ++/get-foo) -(module ++//n scheme/base - (require (for-syntax scheme/base)) +(module ++//n racket/base + (require (for-syntax racket/base)) (provide ++//def) (define-syntax foo #'17) (define-syntax ++//def @@ -1049,8 +1049,8 @@ (test (list "lifted!" (void)) eval (expand #'(@@goo))) (test (list "lifted!" (void)) eval (expand-to-top-form #'(@@goo))) -(module @@n scheme/base - (require (for-syntax scheme/base)) +(module @@n racket/base + (require (for-syntax racket/base)) (define-syntax (@@foo stx) (syntax-case stx () [(_ n) @@ -1092,8 +1092,8 @@ (begin-for-syntax (@@foo 1)) (test (void) eval (expand #'(begin-for-syntax (@@foo 1)))) -(module @@p scheme/base - (require (for-syntax scheme/base +(module @@p racket/base + (require (for-syntax racket/base '@@n)) (provide @@goo) (define-syntax (@@goo stx) #`#,(@@foo 10))) @@ -1101,8 +1101,8 @@ (require '@@p) (test 10 '@@goo (@@goo)) -(module @@m scheme/base - (require (for-syntax scheme/base)) +(module @@m racket/base + (require (for-syntax racket/base)) (define-for-syntax prev-ctx #f) (define-syntax (@@foo stx) (syntax-case stx () @@ -1193,8 +1193,8 @@ (let ([go-once (lambda (eval) (parameterize ([current-namespace (make-base-namespace)]) - (eval '(module mm scheme/base - (require (for-syntax scheme/base)) + (eval '(module mm racket/base + (require (for-syntax racket/base)) (define-syntax (define$ stx) (syntax-case stx () [(_ id val) @@ -1214,8 +1214,8 @@ (test '(1 2 7 8) eval '(list a b c d))) (parameterize ([current-namespace (make-base-namespace)]) - (eval '(module mm scheme/base - (require (for-syntax scheme/base)) + (eval '(module mm racket/base + (require (for-syntax racket/base)) (define-syntax (define$ stx) (syntax-case stx () [(_ id val) @@ -1248,8 +1248,8 @@ (list x1 x2)))) (m))) -(module @!$m scheme/base - (require (for-syntax scheme/base)) +(module @!$m racket/base + (require (for-syntax racket/base)) (define-syntax (d stx) (syntax-case stx () [(_ id) @@ -1297,14 +1297,14 @@ (test #f 'load-ok load?)) (make-resolved-module-path 'a)) (old name base stx load?))])]) - (let ([a-code '(module a scheme/base + (let ([a-code '(module a racket/base (provide x y) (define x 1) (define y #'x))]) (eval a-code) (let ([b-code (let ([p (open-output-bytes)]) (write (compile - '(module b scheme/base + '(module b racket/base (require "a") (provide f) (define (f) #'x))) @@ -1326,7 +1326,7 @@ (test #t eval '(free-identifier=? (f) #'x)) (test #t eval `(free-identifier=? (f) (quote-syntax ,x-id))) (parameterize ([current-namespace (make-base-namespace)]) - (eval '(module a scheme/base + (eval '(module a racket/base (provide y) (define y 3))) (set! load-ok? #t) @@ -1344,8 +1344,8 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; certification example from the manual -(module @-m scheme/base - (require (for-syntax scheme/base)) +(module @-m racket/base + (require (for-syntax racket/base)) (provide def-go) (define (unchecked-go n x) (+ n 17)) @@ -1357,7 +1357,7 @@ [(_ x) #'(unchecked-go 8 x)]))]))) -(module @-n scheme/base +(module @-n racket/base (require '@-m) (def-go go) (go 10)) ; access to unchecked-go is allowed @@ -1368,8 +1368,8 @@ ;; Propagating inactive certificates through a transparent macro-expansion ;; result: -(module @!m scheme/base - (require (for-syntax scheme/base)) +(module @!m racket/base + (require (for-syntax racket/base)) (provide define-x) (define-syntax (define-x stx) @@ -1384,7 +1384,7 @@ [(_ id v) (define id v)]))) -(module @!n scheme/base +(module @!n racket/base (require '@!m) (define-x def-y) (def-y)) @@ -1394,13 +1394,13 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Check that the free-identifier=? cache doesn't kick in too eagerly. -(module @w@ scheme/base +(module @w@ racket/base (define add '+) (provide (rename-out [add plus]))) -(module @q@ scheme/base - (require (for-syntax scheme/base)) +(module @q@ racket/base + (require (for-syntax racket/base)) (provide result) (define-for-syntax a #'plus) @@ -1432,13 +1432,13 @@ ;; Test namespace-attach with phase-levels -2 and 2 -(module tn scheme/base - (require scheme/file) +(module tn racket/base + (require racket/file) (define tmp10 (make-temporary-file)) (provide tmp10) ) -(module @!a scheme/base +(module @!a racket/base (require 'tn) (provide x) (with-output-to-file tmp10 @@ -1447,16 +1447,16 @@ (printf "a\n"))) (define x 5)) -(module @!b scheme/base +(module @!b racket/base (provide get-x) (require (for-meta -2 '@!a)) (define (get-x) #'x)) -(module @!c scheme/base +(module @!c racket/base (require 'tn) (require (for-meta 2 '@!b) - (for-syntax scheme/base - (for-syntax scheme/base))) + (for-syntax racket/base + (for-syntax racket/base))) (define-syntax (foo stx) (let-syntax ([ref-x (lambda (stx) #`(quote-syntax #,(get-x)))]) @@ -1493,9 +1493,9 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Make sure post-ex renames aren't simplied away too soon: -(module @simp@ scheme/base +(module @simp@ racket/base - (require (for-syntax scheme/base)) + (require (for-syntax racket/base)) (define-syntax-rule (foo) (begin diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/syntax.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/syntax.rktl index f37d808624..5a449592a9 100644 --- a/pkgs/racket-pkgs/racket-test/tests/racket/syntax.rktl +++ b/pkgs/racket-pkgs/racket-test/tests/racket/syntax.rktl @@ -1317,9 +1317,10 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Check #%top-interaction -(module quoting-top-interaction mzscheme - (provide (all-from-except mzscheme #%top-interaction) - (rename top-interaction #%top-interaction)) +(module quoting-top-interaction racket/base + (require (for-syntax racket/base)) + (provide (except-out (all-from-out racket/base) #%top-interaction) + (rename-out [top-interaction #%top-interaction])) (define-syntax top-interaction (syntax-rules () [(_ . e) (quote e)]))) @@ -1347,7 +1348,7 @@ (test '(+ 1 2) 'repl-top (parameterize ([current-namespace ns]) (load tmp-file))) - (with-output-to-file tmp-file (lambda () (display `(module ,tmp1 mzscheme (provide x) (define x 12)))) + (with-output-to-file tmp-file (lambda () (display `(module ,tmp1 racket/base (provide x) (define x 12)))) #:exists 'truncate/replace) (test 12 'module (parameterize ([current-namespace ns]) @@ -1389,7 +1390,7 @@ ((cadr procs) 'x10 'z10)))) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(require scheme/splicing) +(require racket/splicing) (define abcdefg 10) (test 12 'splicing-letrec-syntax (splicing-letrec-syntax ([abcdefg (syntax-rules () diff --git a/pkgs/scheme-lib/info.rkt b/pkgs/scheme-lib/info.rkt new file mode 100644 index 0000000000..ea9c9b877c --- /dev/null +++ b/pkgs/scheme-lib/info.rkt @@ -0,0 +1,9 @@ +#lang info + +(define collection 'multi) + +(define deps '("base")) + +(define pkg-desc "Legacy (Scheme) libraries") + +(define pkg-authors '(mflatt)) diff --git a/racket/collects/scheme/async-channel.rkt b/pkgs/scheme-lib/scheme/async-channel.rkt similarity index 100% rename from racket/collects/scheme/async-channel.rkt rename to pkgs/scheme-lib/scheme/async-channel.rkt diff --git a/racket/collects/scheme/base.rkt b/pkgs/scheme-lib/scheme/base.rkt similarity index 100% rename from racket/collects/scheme/base.rkt rename to pkgs/scheme-lib/scheme/base.rkt diff --git a/racket/collects/scheme/base/lang/reader.rkt b/pkgs/scheme-lib/scheme/base/lang/reader.rkt similarity index 100% rename from racket/collects/scheme/base/lang/reader.rkt rename to pkgs/scheme-lib/scheme/base/lang/reader.rkt diff --git a/racket/collects/scheme/bool.rkt b/pkgs/scheme-lib/scheme/bool.rkt similarity index 100% rename from racket/collects/scheme/bool.rkt rename to pkgs/scheme-lib/scheme/bool.rkt diff --git a/racket/collects/scheme/class.rkt b/pkgs/scheme-lib/scheme/class.rkt similarity index 100% rename from racket/collects/scheme/class.rkt rename to pkgs/scheme-lib/scheme/class.rkt diff --git a/racket/collects/scheme/cmdline.rkt b/pkgs/scheme-lib/scheme/cmdline.rkt similarity index 100% rename from racket/collects/scheme/cmdline.rkt rename to pkgs/scheme-lib/scheme/cmdline.rkt diff --git a/racket/collects/scheme/contract.rkt b/pkgs/scheme-lib/scheme/contract.rkt similarity index 100% rename from racket/collects/scheme/contract.rkt rename to pkgs/scheme-lib/scheme/contract.rkt diff --git a/racket/collects/scheme/control.rkt b/pkgs/scheme-lib/scheme/control.rkt similarity index 100% rename from racket/collects/scheme/control.rkt rename to pkgs/scheme-lib/scheme/control.rkt diff --git a/racket/collects/scheme/date.rkt b/pkgs/scheme-lib/scheme/date.rkt similarity index 100% rename from racket/collects/scheme/date.rkt rename to pkgs/scheme-lib/scheme/date.rkt diff --git a/racket/collects/scheme/dict.rkt b/pkgs/scheme-lib/scheme/dict.rkt similarity index 100% rename from racket/collects/scheme/dict.rkt rename to pkgs/scheme-lib/scheme/dict.rkt diff --git a/racket/collects/scheme/enter.rkt b/pkgs/scheme-lib/scheme/enter.rkt similarity index 100% rename from racket/collects/scheme/enter.rkt rename to pkgs/scheme-lib/scheme/enter.rkt diff --git a/racket/collects/scheme/exists/lang.rkt b/pkgs/scheme-lib/scheme/exists/lang.rkt similarity index 100% rename from racket/collects/scheme/exists/lang.rkt rename to pkgs/scheme-lib/scheme/exists/lang.rkt diff --git a/racket/collects/scheme/exists/lang/reader.rkt b/pkgs/scheme-lib/scheme/exists/lang/reader.rkt similarity index 100% rename from racket/collects/scheme/exists/lang/reader.rkt rename to pkgs/scheme-lib/scheme/exists/lang/reader.rkt diff --git a/racket/collects/scheme/fasl.rkt b/pkgs/scheme-lib/scheme/fasl.rkt similarity index 100% rename from racket/collects/scheme/fasl.rkt rename to pkgs/scheme-lib/scheme/fasl.rkt diff --git a/racket/collects/scheme/file.rkt b/pkgs/scheme-lib/scheme/file.rkt similarity index 100% rename from racket/collects/scheme/file.rkt rename to pkgs/scheme-lib/scheme/file.rkt diff --git a/racket/collects/scheme/fixnum.rkt b/pkgs/scheme-lib/scheme/fixnum.rkt similarity index 100% rename from racket/collects/scheme/fixnum.rkt rename to pkgs/scheme-lib/scheme/fixnum.rkt diff --git a/racket/collects/scheme/flonum.rkt b/pkgs/scheme-lib/scheme/flonum.rkt similarity index 100% rename from racket/collects/scheme/flonum.rkt rename to pkgs/scheme-lib/scheme/flonum.rkt diff --git a/racket/collects/scheme/foreign.rkt b/pkgs/scheme-lib/scheme/foreign.rkt similarity index 100% rename from racket/collects/scheme/foreign.rkt rename to pkgs/scheme-lib/scheme/foreign.rkt diff --git a/racket/collects/scheme/function.rkt b/pkgs/scheme-lib/scheme/function.rkt similarity index 100% rename from racket/collects/scheme/function.rkt rename to pkgs/scheme-lib/scheme/function.rkt diff --git a/racket/collects/scheme/future.rkt b/pkgs/scheme-lib/scheme/future.rkt similarity index 100% rename from racket/collects/scheme/future.rkt rename to pkgs/scheme-lib/scheme/future.rkt diff --git a/racket/collects/scheme/generator.rkt b/pkgs/scheme-lib/scheme/generator.rkt similarity index 100% rename from racket/collects/scheme/generator.rkt rename to pkgs/scheme-lib/scheme/generator.rkt diff --git a/racket/collects/scheme/gui/dynamic.rkt b/pkgs/scheme-lib/scheme/gui/dynamic.rkt similarity index 100% rename from racket/collects/scheme/gui/dynamic.rkt rename to pkgs/scheme-lib/scheme/gui/dynamic.rkt diff --git a/racket/collects/scheme/help.rkt b/pkgs/scheme-lib/scheme/help.rkt similarity index 100% rename from racket/collects/scheme/help.rkt rename to pkgs/scheme-lib/scheme/help.rkt diff --git a/racket/collects/scheme/include.rkt b/pkgs/scheme-lib/scheme/include.rkt similarity index 100% rename from racket/collects/scheme/include.rkt rename to pkgs/scheme-lib/scheme/include.rkt diff --git a/racket/collects/scheme/init.rkt b/pkgs/scheme-lib/scheme/init.rkt similarity index 100% rename from racket/collects/scheme/init.rkt rename to pkgs/scheme-lib/scheme/init.rkt diff --git a/racket/collects/scheme/lang/reader.rkt b/pkgs/scheme-lib/scheme/lang/reader.rkt similarity index 100% rename from racket/collects/scheme/lang/reader.rkt rename to pkgs/scheme-lib/scheme/lang/reader.rkt diff --git a/racket/collects/scheme/language-info.rkt b/pkgs/scheme-lib/scheme/language-info.rkt similarity index 100% rename from racket/collects/scheme/language-info.rkt rename to pkgs/scheme-lib/scheme/language-info.rkt diff --git a/racket/collects/scheme/list.rkt b/pkgs/scheme-lib/scheme/list.rkt similarity index 100% rename from racket/collects/scheme/list.rkt rename to pkgs/scheme-lib/scheme/list.rkt diff --git a/pkgs/scheme-lib/scheme/load.rkt b/pkgs/scheme-lib/scheme/load.rkt new file mode 100644 index 0000000000..609e33150f --- /dev/null +++ b/pkgs/scheme-lib/scheme/load.rkt @@ -0,0 +1,37 @@ +#lang scheme +(require syntax/strip-context) + +;; FIXME: copied from `racket/load' + +(provide (rename-out [module-begin #%module-begin] + [top-interaction #%top-interaction])) + +(define-syntax-rule (module-begin form ...) + (#%plain-module-begin (top-interaction . (#%top-interaction . form)) ...)) + +(define-syntax-rule (top-interaction . form) + (strip-context-and-eval (quote-syntax form))) + +(define-namespace-anchor a) +(define namespace (namespace-anchor->empty-namespace a)) +(parameterize ([current-namespace namespace]) + (namespace-require 'scheme)) + +(define (strip-context-and-eval e) + (let ([ns (current-namespace)]) + (dynamic-wind + (lambda () + (current-namespace namespace)) + (lambda () + (call-with-continuation-prompt + (lambda () + (eval-syntax (namespace-syntax-introduce + (strip-context e)))) + (default-continuation-prompt-tag) + (lambda args + (apply abort-current-continuation + (default-continuation-prompt-tag) + args)))) + (lambda () + (set! namespace (current-namespace)) + (current-namespace ns))))) diff --git a/racket/collects/scheme/load/lang/reader.rkt b/pkgs/scheme-lib/scheme/load/lang/reader.rkt similarity index 100% rename from racket/collects/scheme/load/lang/reader.rkt rename to pkgs/scheme-lib/scheme/load/lang/reader.rkt diff --git a/racket/collects/scheme/local.rkt b/pkgs/scheme-lib/scheme/local.rkt similarity index 100% rename from racket/collects/scheme/local.rkt rename to pkgs/scheme-lib/scheme/local.rkt diff --git a/racket/collects/scheme/main.rkt b/pkgs/scheme-lib/scheme/main.rkt similarity index 100% rename from racket/collects/scheme/main.rkt rename to pkgs/scheme-lib/scheme/main.rkt diff --git a/racket/collects/scheme/match.rkt b/pkgs/scheme-lib/scheme/match.rkt similarity index 100% rename from racket/collects/scheme/match.rkt rename to pkgs/scheme-lib/scheme/match.rkt diff --git a/racket/collects/scheme/math.rkt b/pkgs/scheme-lib/scheme/math.rkt similarity index 100% rename from racket/collects/scheme/math.rkt rename to pkgs/scheme-lib/scheme/math.rkt diff --git a/racket/collects/scheme/nest.rkt b/pkgs/scheme-lib/scheme/nest.rkt similarity index 100% rename from racket/collects/scheme/nest.rkt rename to pkgs/scheme-lib/scheme/nest.rkt diff --git a/racket/collects/scheme/path.rkt b/pkgs/scheme-lib/scheme/path.rkt similarity index 100% rename from racket/collects/scheme/path.rkt rename to pkgs/scheme-lib/scheme/path.rkt diff --git a/racket/collects/scheme/place.rkt b/pkgs/scheme-lib/scheme/place.rkt similarity index 100% rename from racket/collects/scheme/place.rkt rename to pkgs/scheme-lib/scheme/place.rkt diff --git a/racket/collects/scheme/port.rkt b/pkgs/scheme-lib/scheme/port.rkt similarity index 100% rename from racket/collects/scheme/port.rkt rename to pkgs/scheme-lib/scheme/port.rkt diff --git a/racket/collects/scheme/pretty.rkt b/pkgs/scheme-lib/scheme/pretty.rkt similarity index 100% rename from racket/collects/scheme/pretty.rkt rename to pkgs/scheme-lib/scheme/pretty.rkt diff --git a/racket/collects/scheme/private/namespace.rkt b/pkgs/scheme-lib/scheme/private/namespace.rkt similarity index 100% rename from racket/collects/scheme/private/namespace.rkt rename to pkgs/scheme-lib/scheme/private/namespace.rkt diff --git a/racket/collects/scheme/private/provider/lang.rkt b/pkgs/scheme-lib/scheme/private/provider/lang.rkt similarity index 100% rename from racket/collects/scheme/private/provider/lang.rkt rename to pkgs/scheme-lib/scheme/private/provider/lang.rkt diff --git a/racket/collects/scheme/private/provider/lang/reader.rkt b/pkgs/scheme-lib/scheme/private/provider/lang/reader.rkt similarity index 100% rename from racket/collects/scheme/private/provider/lang/reader.rkt rename to pkgs/scheme-lib/scheme/private/provider/lang/reader.rkt diff --git a/racket/collects/scheme/promise.rkt b/pkgs/scheme-lib/scheme/promise.rkt similarity index 100% rename from racket/collects/scheme/promise.rkt rename to pkgs/scheme-lib/scheme/promise.rkt diff --git a/racket/collects/scheme/provide-syntax.rkt b/pkgs/scheme-lib/scheme/provide-syntax.rkt similarity index 100% rename from racket/collects/scheme/provide-syntax.rkt rename to pkgs/scheme-lib/scheme/provide-syntax.rkt diff --git a/racket/collects/scheme/provide-transform.rkt b/pkgs/scheme-lib/scheme/provide-transform.rkt similarity index 100% rename from racket/collects/scheme/provide-transform.rkt rename to pkgs/scheme-lib/scheme/provide-transform.rkt diff --git a/racket/collects/scheme/provide.rkt b/pkgs/scheme-lib/scheme/provide.rkt similarity index 100% rename from racket/collects/scheme/provide.rkt rename to pkgs/scheme-lib/scheme/provide.rkt diff --git a/racket/collects/scheme/require-syntax.rkt b/pkgs/scheme-lib/scheme/require-syntax.rkt similarity index 100% rename from racket/collects/scheme/require-syntax.rkt rename to pkgs/scheme-lib/scheme/require-syntax.rkt diff --git a/racket/collects/scheme/require-transform.rkt b/pkgs/scheme-lib/scheme/require-transform.rkt similarity index 100% rename from racket/collects/scheme/require-transform.rkt rename to pkgs/scheme-lib/scheme/require-transform.rkt diff --git a/racket/collects/scheme/require.rkt b/pkgs/scheme-lib/scheme/require.rkt similarity index 100% rename from racket/collects/scheme/require.rkt rename to pkgs/scheme-lib/scheme/require.rkt diff --git a/racket/collects/scheme/runtime-config.rkt b/pkgs/scheme-lib/scheme/runtime-config.rkt similarity index 100% rename from racket/collects/scheme/runtime-config.rkt rename to pkgs/scheme-lib/scheme/runtime-config.rkt diff --git a/racket/collects/scheme/runtime-path.rkt b/pkgs/scheme-lib/scheme/runtime-path.rkt similarity index 100% rename from racket/collects/scheme/runtime-path.rkt rename to pkgs/scheme-lib/scheme/runtime-path.rkt diff --git a/racket/collects/scheme/serialize.rkt b/pkgs/scheme-lib/scheme/serialize.rkt similarity index 100% rename from racket/collects/scheme/serialize.rkt rename to pkgs/scheme-lib/scheme/serialize.rkt diff --git a/racket/collects/scheme/set.rkt b/pkgs/scheme-lib/scheme/set.rkt similarity index 100% rename from racket/collects/scheme/set.rkt rename to pkgs/scheme-lib/scheme/set.rkt diff --git a/racket/collects/scheme/shared.rkt b/pkgs/scheme-lib/scheme/shared.rkt similarity index 100% rename from racket/collects/scheme/shared.rkt rename to pkgs/scheme-lib/scheme/shared.rkt diff --git a/racket/collects/scheme/signature/lang/reader.rkt b/pkgs/scheme-lib/scheme/signature/lang/reader.rkt similarity index 100% rename from racket/collects/scheme/signature/lang/reader.rkt rename to pkgs/scheme-lib/scheme/signature/lang/reader.rkt diff --git a/racket/collects/scheme/splicing.rkt b/pkgs/scheme-lib/scheme/splicing.rkt similarity index 100% rename from racket/collects/scheme/splicing.rkt rename to pkgs/scheme-lib/scheme/splicing.rkt diff --git a/racket/collects/scheme/string.rkt b/pkgs/scheme-lib/scheme/string.rkt similarity index 100% rename from racket/collects/scheme/string.rkt rename to pkgs/scheme-lib/scheme/string.rkt diff --git a/racket/collects/scheme/struct-info.rkt b/pkgs/scheme-lib/scheme/struct-info.rkt similarity index 100% rename from racket/collects/scheme/struct-info.rkt rename to pkgs/scheme-lib/scheme/struct-info.rkt diff --git a/racket/collects/scheme/stxparam-exptime.rkt b/pkgs/scheme-lib/scheme/stxparam-exptime.rkt similarity index 100% rename from racket/collects/scheme/stxparam-exptime.rkt rename to pkgs/scheme-lib/scheme/stxparam-exptime.rkt diff --git a/racket/collects/scheme/stxparam.rkt b/pkgs/scheme-lib/scheme/stxparam.rkt similarity index 100% rename from racket/collects/scheme/stxparam.rkt rename to pkgs/scheme-lib/scheme/stxparam.rkt diff --git a/racket/collects/scheme/surrogate.rkt b/pkgs/scheme-lib/scheme/surrogate.rkt similarity index 100% rename from racket/collects/scheme/surrogate.rkt rename to pkgs/scheme-lib/scheme/surrogate.rkt diff --git a/racket/collects/scheme/system.rkt b/pkgs/scheme-lib/scheme/system.rkt similarity index 100% rename from racket/collects/scheme/system.rkt rename to pkgs/scheme-lib/scheme/system.rkt diff --git a/racket/collects/scheme/tcp.rkt b/pkgs/scheme-lib/scheme/tcp.rkt similarity index 100% rename from racket/collects/scheme/tcp.rkt rename to pkgs/scheme-lib/scheme/tcp.rkt diff --git a/racket/collects/scheme/trace.rkt b/pkgs/scheme-lib/scheme/trace.rkt similarity index 100% rename from racket/collects/scheme/trace.rkt rename to pkgs/scheme-lib/scheme/trace.rkt diff --git a/racket/collects/scheme/trait.rkt b/pkgs/scheme-lib/scheme/trait.rkt similarity index 100% rename from racket/collects/scheme/trait.rkt rename to pkgs/scheme-lib/scheme/trait.rkt diff --git a/racket/collects/scheme/udp.rkt b/pkgs/scheme-lib/scheme/udp.rkt similarity index 100% rename from racket/collects/scheme/udp.rkt rename to pkgs/scheme-lib/scheme/udp.rkt diff --git a/racket/collects/scheme/unit-exptime.rkt b/pkgs/scheme-lib/scheme/unit-exptime.rkt similarity index 100% rename from racket/collects/scheme/unit-exptime.rkt rename to pkgs/scheme-lib/scheme/unit-exptime.rkt diff --git a/racket/collects/scheme/unit.rkt b/pkgs/scheme-lib/scheme/unit.rkt similarity index 100% rename from racket/collects/scheme/unit.rkt rename to pkgs/scheme-lib/scheme/unit.rkt diff --git a/racket/collects/scheme/unit/lang.rkt b/pkgs/scheme-lib/scheme/unit/lang.rkt similarity index 100% rename from racket/collects/scheme/unit/lang.rkt rename to pkgs/scheme-lib/scheme/unit/lang.rkt diff --git a/racket/collects/scheme/unit/lang/reader.rkt b/pkgs/scheme-lib/scheme/unit/lang/reader.rkt similarity index 100% rename from racket/collects/scheme/unit/lang/reader.rkt rename to pkgs/scheme-lib/scheme/unit/lang/reader.rkt diff --git a/racket/collects/scheme/unsafe/ops.rkt b/pkgs/scheme-lib/scheme/unsafe/ops.rkt similarity index 100% rename from racket/collects/scheme/unsafe/ops.rkt rename to pkgs/scheme-lib/scheme/unsafe/ops.rkt diff --git a/racket/collects/scheme/vector.rkt b/pkgs/scheme-lib/scheme/vector.rkt similarity index 100% rename from racket/collects/scheme/vector.rkt rename to pkgs/scheme-lib/scheme/vector.rkt diff --git a/pkgs/srfi-pkgs/srfi-lib/info.rkt b/pkgs/srfi-pkgs/srfi-lib/info.rkt index 2b7c25b917..a45679822d 100644 --- a/pkgs/srfi-pkgs/srfi-lib/info.rkt +++ b/pkgs/srfi-pkgs/srfi-lib/info.rkt @@ -3,10 +3,13 @@ (define collection 'multi) (define deps '("base" + "srfi-lite-lib" "r5rs-lib" "r6rs-lib" "compatibility-lib")) +(define implies '("srfi-lite-lib")) + (define pkg-desc "implementation (no documentation) part of \"srfi\"") (define pkg-authors '(mflatt noel chongkai jay)) diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/info.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/info.rkt new file mode 100644 index 0000000000..09e03421f5 --- /dev/null +++ b/pkgs/srfi-pkgs/srfi-lite-lib/info.rkt @@ -0,0 +1,9 @@ +#lang info + +(define collection 'multi) + +(define deps '("base")) + +(define pkg-desc "implementation of the most widely used \"srfi\" libraries") + +(define pkg-authors '(mflatt)) diff --git a/racket/collects/srfi/1.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1.rkt similarity index 100% rename from racket/collects/srfi/1.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/1.rkt diff --git a/racket/collects/srfi/1/alist.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/alist.rkt similarity index 98% rename from racket/collects/srfi/1/alist.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/alist.rkt index 1a85afe980..4583677f5d 100644 --- a/racket/collects/srfi/1/alist.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/alist.rkt @@ -23,7 +23,7 @@ ;; Olin Shivers verified that he is fine with redistributing this code ;; under the LGPL. (Verified personally by Eli Barzilay.) -#lang scheme/base +#lang racket/base (require (only-in "search.rkt" find)) diff --git a/racket/collects/srfi/1/cons.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/cons.rkt similarity index 97% rename from racket/collects/srfi/1/cons.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/cons.rkt index 2a8b4b0929..d80a68faf8 100644 --- a/racket/collects/srfi/1/cons.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/cons.rkt @@ -23,10 +23,10 @@ ;; Olin Shivers verified that he is fine with redistributing this code ;; under the LGPL. (Verified personally by Eli Barzilay.) -#lang scheme/base +#lang racket/base (require srfi/optional "selector.rkt" - (only-in scheme/list [make-list make-list*])) + (only-in racket/list [make-list make-list*])) (provide xcons make-list diff --git a/racket/collects/srfi/1/delete.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/delete.rkt similarity index 99% rename from racket/collects/srfi/1/delete.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/delete.rkt index 014f13bae1..507059658f 100644 --- a/racket/collects/srfi/1/delete.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/delete.rkt @@ -24,7 +24,7 @@ ;; Olin Shivers verified that he is fine with redistributing this code ;; under the LGPL. (Verified personally by Eli Barzilay.) -#lang scheme/base +#lang racket/base (require srfi/optional "predicate.rkt") diff --git a/racket/collects/srfi/1/filter.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/filter.rkt similarity index 99% rename from racket/collects/srfi/1/filter.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/filter.rkt index c6252aec63..c5d35baf2d 100644 --- a/racket/collects/srfi/1/filter.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/filter.rkt @@ -23,7 +23,7 @@ ;; Olin Shivers verified that he is fine with redistributing this code ;; under the LGPL. (Verified personally by Eli Barzilay.) -#lang scheme/base +#lang racket/base (require srfi/optional "predicate.rkt") diff --git a/racket/collects/srfi/1/fold.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/fold.rkt similarity index 99% rename from racket/collects/srfi/1/fold.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/fold.rkt index 443d918d1e..5303b5c28f 100644 --- a/racket/collects/srfi/1/fold.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/fold.rkt @@ -23,7 +23,7 @@ ;; Olin Shivers verified that he is fine with redistributing this code ;; under the LGPL. (Verified personally by Eli Barzilay.) -#lang scheme/base +#lang racket/base (require srfi/optional "predicate.rkt" diff --git a/racket/collects/srfi/1/list.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/list.rkt similarity index 99% rename from racket/collects/srfi/1/list.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/list.rkt index e43fed8182..5efc65f0c5 100644 --- a/racket/collects/srfi/1/list.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/list.rkt @@ -215,7 +215,7 @@ ;; with an s: to avoid colliding with racket. The wrapper 1.rkt ;; changes their names back to the non-prefixed form. -#lang scheme/base +#lang racket/base (require "cons.rkt" "selector.rkt" diff --git a/racket/collects/srfi/1/lset.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/lset.rkt similarity index 99% rename from racket/collects/srfi/1/lset.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/lset.rkt index 3495d36dbe..0ad483d729 100644 --- a/racket/collects/srfi/1/lset.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/lset.rkt @@ -23,7 +23,7 @@ ;; Olin Shivers verified that he is fine with redistributing this code ;; under the LGPL. (Verified personally by Eli Barzilay.) -#lang scheme/base +#lang racket/base (require srfi/optional (rename-in "search.rkt" [member s:member]) diff --git a/racket/collects/srfi/1/misc.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/misc.rkt similarity index 98% rename from racket/collects/srfi/1/misc.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/misc.rkt index 052a79677d..3554e9bc88 100644 --- a/racket/collects/srfi/1/misc.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/misc.rkt @@ -23,7 +23,7 @@ ;; Olin Shivers verified that he is fine with redistributing this code ;; under the LGPL. (Verified personally by Eli Barzilay.) -#lang scheme/base +#lang racket/base (require srfi/optional "predicate.rkt" @@ -31,7 +31,7 @@ "util.rkt" (only-in "fold.rkt" reduce-right) (rename-in "fold.rkt" [map s:map] [for-each s:for-each]) - (only-in scheme/list count append*)) + (only-in racket/list count append*)) (provide length+ (rename-out [append* concatenate] [append* concatenate!]) diff --git a/racket/collects/srfi/1/predicate.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/predicate.rkt similarity index 99% rename from racket/collects/srfi/1/predicate.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/predicate.rkt index 6dbc70f8dc..2c49667bb6 100644 --- a/racket/collects/srfi/1/predicate.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/predicate.rkt @@ -24,7 +24,7 @@ ;; under the LGPL. (Verified personally by Eli Barzilay.) -#lang scheme/base +#lang racket/base (provide pair? null? diff --git a/racket/collects/srfi/1/search.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/search.rkt similarity index 99% rename from racket/collects/srfi/1/search.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/search.rkt index 8040e069e8..e66ef2e201 100644 --- a/racket/collects/srfi/1/search.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/search.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;;; ;;; ---- List searching functions diff --git a/racket/collects/srfi/1/selector.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/selector.rkt similarity index 97% rename from racket/collects/srfi/1/selector.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/selector.rkt index 90570d8817..c82da2876c 100644 --- a/racket/collects/srfi/1/selector.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/selector.rkt @@ -23,10 +23,10 @@ ;; Olin Shivers verified that he is fine with redistributing this code ;; under the LGPL. (Verified personally by Eli Barzilay.) -#lang scheme/base +#lang racket/base (require srfi/optional - (only-in scheme/list take drop take-right drop-right split-at)) + (only-in racket/list take drop take-right drop-right split-at)) (provide first second third fourth diff --git a/racket/collects/srfi/1/util.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/util.rkt similarity index 99% rename from racket/collects/srfi/1/util.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/util.rkt index 0499c23ea4..1ef7d7e820 100644 --- a/racket/collects/srfi/1/util.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/util.rkt @@ -23,7 +23,7 @@ ;; Olin Shivers verified that he is fine with redistributing this code ;; under the LGPL. (Verified personally by Eli Barzilay.) -#lang scheme/base +#lang racket/base (require "predicate.rkt" "selector.rkt") diff --git a/racket/collects/srfi/13.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/13.rkt similarity index 100% rename from racket/collects/srfi/13.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/13.rkt diff --git a/racket/collects/srfi/13/string.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/13/string.rkt similarity index 100% rename from racket/collects/srfi/13/string.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/13/string.rkt diff --git a/racket/collects/srfi/14.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/14.rkt similarity index 100% rename from racket/collects/srfi/14.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/14.rkt diff --git a/racket/collects/srfi/14/char-set.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/14/char-set.rkt similarity index 100% rename from racket/collects/srfi/14/char-set.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/14/char-set.rkt diff --git a/racket/collects/srfi/19.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/19.rkt similarity index 100% rename from racket/collects/srfi/19.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/19.rkt diff --git a/racket/collects/srfi/19/time.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/19/time.rkt similarity index 100% rename from racket/collects/srfi/19/time.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/19/time.rkt diff --git a/racket/collects/srfi/29.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29.rkt similarity index 100% rename from racket/collects/srfi/29.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/29.rkt diff --git a/racket/collects/srfi/29/bundles/es/srfi-19 b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/bundles/es/srfi-19 similarity index 100% rename from racket/collects/srfi/29/bundles/es/srfi-19 rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/bundles/es/srfi-19 diff --git a/racket/collects/srfi/29/bundles/srfi-19 b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/bundles/srfi-19 similarity index 100% rename from racket/collects/srfi/29/bundles/srfi-19 rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/bundles/srfi-19 diff --git a/racket/collects/srfi/29/localization.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/localization.rkt similarity index 100% rename from racket/collects/srfi/29/localization.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/localization.rkt diff --git a/racket/collects/srfi/8.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/8.rkt similarity index 100% rename from racket/collects/srfi/8.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/8.rkt diff --git a/racket/collects/srfi/8/receive.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/8/receive.rkt similarity index 97% rename from racket/collects/srfi/8/receive.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/8/receive.rkt index 17c0ef7fe0..e09498d558 100644 --- a/racket/collects/srfi/8/receive.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/8/receive.rkt @@ -10,7 +10,7 @@ ;;; ;;; oh well, there is no such comment. -#lang scheme/base +#lang racket/base (provide receive) ;; (receive vars producer . body) diff --git a/racket/collects/srfi/optional.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/optional.rkt similarity index 99% rename from racket/collects/srfi/optional.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/optional.rkt index 7c0bd34dd3..0e20082a1b 100644 --- a/racket/collects/srfi/optional.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/optional.rkt @@ -45,9 +45,9 @@ ;; macros. :-) ;; -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base)) +(require (for-syntax racket/base)) (provide :optional let-optionals* check-arg) diff --git a/racket/collects/srfi/provider.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/provider.rkt similarity index 93% rename from racket/collects/srfi/provider.rkt rename to pkgs/srfi-pkgs/srfi-lite-lib/srfi/provider.rkt index ab802383c6..720873156b 100644 --- a/racket/collects/srfi/provider.rkt +++ b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/provider.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base scheme/provide-transform)) +(require (for-syntax racket/base racket/provide-transform)) ;; This is a utility for many srfi/N.rkt files that simply reprovide stuff from ;; some other file. It is used as a module, for example, the "srfi/1.rkt" @@ -8,7 +8,7 @@ ;; #lang s-exp srfi/provider srfi/1/list #:unprefix s: ;; which makes it require `srfi/1/list', then reprovide everything from there, ;; removing any `s:' prefixes that it uses (since `srfi/1/list' does not -;; collide with `scheme/base'). It is used in most files here, and the +;; collide with `racket/base'). It is used in most files here, and the ;; unprefix facility is used in a few similar situations. You can add a ;; `#:debug' flag to have the unprefixer print its renamings, to check that you ;; get the right bindings. diff --git a/racket/collects/compiler/compiler-unit.rkt b/racket/collects/compiler/compiler-unit.rkt index a02c29f0ee..d91ea2f08a 100644 --- a/racket/collects/compiler/compiler-unit.rkt +++ b/racket/collects/compiler/compiler-unit.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;; Main compilation procedures ;; (c) 1997-2013 PLT Design Inc. @@ -7,7 +7,7 @@ ;; compiler collections. -(require scheme/unit +(require racket/unit "sig.rkt" dynext/file-sig @@ -17,7 +17,7 @@ syntax/toplevel syntax/moddep - scheme/file + racket/file compiler/compile-file compiler/cm setup/getinfo diff --git a/racket/collects/compiler/distribute.rkt b/racket/collects/compiler/distribute.rkt index ec2fd3df91..266a893982 100644 --- a/racket/collects/compiler/distribute.rkt +++ b/racket/collects/compiler/distribute.rkt @@ -1,6 +1,6 @@ -(module distribute scheme/base - (require scheme/file - scheme/path +(module distribute racket/base + (require racket/file + racket/path setup/dirs racket/list setup/variant diff --git a/racket/collects/compiler/embed-unit.rkt b/racket/collects/compiler/embed-unit.rkt index 5d49807efb..0c1ace3346 100644 --- a/racket/collects/compiler/embed-unit.rkt +++ b/racket/collects/compiler/embed-unit.rkt @@ -1,9 +1,9 @@ -(module embed-unit scheme/base - (require scheme/unit - scheme/path - scheme/file - scheme/port - scheme/promise +(module embed-unit racket/base + (require racket/unit + racket/path + racket/file + racket/port + racket/promise racket/list syntax/moddep syntax/modcollapse diff --git a/racket/collects/compiler/embed.rkt b/racket/collects/compiler/embed.rkt index c8ff6b7e20..814b1481b6 100644 --- a/racket/collects/compiler/embed.rkt +++ b/racket/collects/compiler/embed.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require scheme/unit - scheme/contract) +(require racket/unit + racket/contract) (require "sig.rkt") diff --git a/racket/collects/dynext/compile-unit.rkt b/racket/collects/dynext/compile-unit.rkt index 131b3ce220..ab785fe5a7 100644 --- a/racket/collects/dynext/compile-unit.rkt +++ b/racket/collects/dynext/compile-unit.rkt @@ -1,4 +1,4 @@ -(module compile-unit scheme/base +(module compile-unit racket/base (require racket/unit racket/system "private/dirs.rkt" diff --git a/racket/collects/dynext/file-unit.rkt b/racket/collects/dynext/file-unit.rkt index 6ac7bb3c42..39e50627fa 100644 --- a/racket/collects/dynext/file-unit.rkt +++ b/racket/collects/dynext/file-unit.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require scheme/unit "file-sig.rkt") +(require racket/unit "file-sig.rkt") (provide dynext:file@) diff --git a/racket/collects/dynext/filename-version.rkt b/racket/collects/dynext/filename-version.rkt index 1639685e85..e94a6e7be1 100644 --- a/racket/collects/dynext/filename-version.rkt +++ b/racket/collects/dynext/filename-version.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;; This module provides the string that should replace xxxxxxx's in ;; file names. The version number is combined into a single integer, diff --git a/racket/collects/dynext/link-unit.rkt b/racket/collects/dynext/link-unit.rkt index 85b47620f9..610c785d19 100644 --- a/racket/collects/dynext/link-unit.rkt +++ b/racket/collects/dynext/link-unit.rkt @@ -1,4 +1,4 @@ -(module link-unit scheme/base +(module link-unit racket/base (require racket/unit racket/system "private/dirs.rkt" diff --git a/racket/collects/dynext/main.rkt b/racket/collects/dynext/main.rkt index f046f8200f..6c752661a1 100644 --- a/racket/collects/dynext/main.rkt +++ b/racket/collects/dynext/main.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "dynext.rkt") (provide (all-from-out "dynext.rkt")) diff --git a/racket/collects/dynext/private/cmdargs.rkt b/racket/collects/dynext/private/cmdargs.rkt index 2d506406b8..7f0f6824ac 100644 --- a/racket/collects/dynext/private/cmdargs.rkt +++ b/racket/collects/dynext/private/cmdargs.rkt @@ -1,4 +1,4 @@ -(module cmdargs scheme/base +(module cmdargs racket/base (provide split-command-line-args) diff --git a/racket/collects/ffi/unsafe/try-atomic.rkt b/racket/collects/ffi/unsafe/try-atomic.rkt index c0c860e45d..792db8a8b0 100644 --- a/racket/collects/ffi/unsafe/try-atomic.rkt +++ b/racket/collects/ffi/unsafe/try-atomic.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require ffi/unsafe ffi/unsafe/atomic) diff --git a/racket/collects/file/md5.rkt b/racket/collects/file/md5.rkt index 1aed2bbd57..5d9739f55e 100644 --- a/racket/collects/file/md5.rkt +++ b/racket/collects/file/md5.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide md5) @@ -72,7 +72,7 @@ ;; - moved from mzlib/md5 to file/md5 ;; - made it work on strings again -(require (for-syntax scheme/base)) +(require (for-syntax racket/base)) ;;; Word arithmetic (32 bit) ;; Terminology diff --git a/racket/collects/file/private/octree-quantize.rkt b/racket/collects/file/private/octree-quantize.rkt index b85d54d11e..7678a5f89c 100644 --- a/racket/collects/file/private/octree-quantize.rkt +++ b/racket/collects/file/private/octree-quantize.rkt @@ -1,6 +1,6 @@ -#lang scheme/base -(require scheme/class - scheme/contract) +#lang racket/base +(require racket/class + racket/contract) ;; This is an implementation of the Octree Quantization algorithm. This implementation ;; follows the sketch in: diff --git a/racket/collects/file/tar.rkt b/racket/collects/file/tar.rkt index 09914c3d35..7192aec60a 100644 --- a/racket/collects/file/tar.rkt +++ b/racket/collects/file/tar.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require file/gzip scheme/file) +#lang racket/base +(require file/gzip racket/file) (define tar-block-size 512) (define tar-name-length 100) diff --git a/racket/collects/launcher/launcher-sig.rkt b/racket/collects/launcher/launcher-sig.rkt index 9a2007b19f..5554889de1 100644 --- a/racket/collects/launcher/launcher-sig.rkt +++ b/racket/collects/launcher/launcher-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature make-gracket-launcher make-racket-launcher diff --git a/racket/collects/launcher/launcher.rkt b/racket/collects/launcher/launcher.rkt index e557157d56..288d47e701 100644 --- a/racket/collects/launcher/launcher.rkt +++ b/racket/collects/launcher/launcher.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require scheme/unit +(require racket/unit "launcher-sig.rkt" "launcher-unit.rkt") diff --git a/racket/collects/launcher/main.rkt b/racket/collects/launcher/main.rkt index e113c15ffc..7c2b99c56a 100644 --- a/racket/collects/launcher/main.rkt +++ b/racket/collects/launcher/main.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "launcher.rkt") (provide (all-from-out "launcher.rkt")) diff --git a/racket/collects/openssl/main.rkt b/racket/collects/openssl/main.rkt index 50234b1a8b..b2667a652a 100644 --- a/racket/collects/openssl/main.rkt +++ b/racket/collects/openssl/main.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "mzssl.rkt") (provide (all-from-out "mzssl.rkt")) diff --git a/racket/collects/planet/private/planet-shared.rkt b/racket/collects/planet/private/planet-shared.rkt index 4ae982701d..76fc34c50a 100644 --- a/racket/collects/planet/private/planet-shared.rkt +++ b/racket/collects/planet/private/planet-shared.rkt @@ -8,8 +8,8 @@ Various common pieces of code that both the client and server need to access (require (only-in racket/path path-only) racket/port racket/file + racket/list setup/getinfo - (prefix-in srfi1: srfi/1) "../config.rkt" "data.rkt") @@ -317,7 +317,7 @@ Various common pieces of code that both the client and server need to access (define out-links (with-hard-link-lock (λ () - (let-values ([(in-links out-links) (srfi1:partition f (get-hard-link-table/internal))]) + (let-values ([(in-links out-links) (partition f (get-hard-link-table/internal))]) (save-hard-link-table in-links) out-links)))) (for-each on-delete out-links)) diff --git a/racket/collects/racket/load.rkt b/racket/collects/racket/load.rkt index 4a742dc50c..d322436551 100644 --- a/racket/collects/racket/load.rkt +++ b/racket/collects/racket/load.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require syntax/strip-context) (provide (rename-out [module-begin #%module-begin] @@ -21,7 +21,7 @@ (define-namespace-anchor a) (define namespace (namespace-anchor->empty-namespace a)) (parameterize ([current-namespace namespace]) - (namespace-require 'scheme)) + (namespace-require 'racket)) (define (strip-context-and-eval e) (let ([ns (current-namespace)]) diff --git a/racket/collects/racket/match/compiler.rkt b/racket/collects/racket/match/compiler.rkt index 12fed0217c..0044029b71 100644 --- a/racket/collects/racket/match/compiler.rkt +++ b/racket/collects/racket/match/compiler.rkt @@ -7,7 +7,6 @@ "split-rows.rkt" "reorder.rkt" racket/stxparam - scheme/nest racket/syntax) (provide compile*) @@ -79,37 +78,34 @@ ;; vectors are handled specially ;; because each arity is like a different constructor [(eq? 'vector k) - (nest - ([let ()] - [let ([ht (hash-on (lambda (r) - (length (Vector-ps (Row-first-pat r)))) rows)])] - [with-syntax - ([(clauses ...) - (hash-map - ht - (lambda (arity rows) - (define ns (build-list arity values)) - (with-syntax ([(tmps ...) (generate-temporaries ns)]) - (with-syntax ([body - (compile* - (append (syntax->list #'(tmps ...)) xs) - (map (lambda (row) - (define-values (p1 ps) - (Row-split-pats row)) - (make-Row (append (Vector-ps p1) ps) - (Row-rhs row) - (Row-unmatch row) - (Row-vars-seen row))) - rows) - esc)] - [(n ...) ns]) - #`[(#,arity) - (let ([tmps (unsafe-vector-ref #,x n)] ...) - body)]))))])]) - #`[(vector? #,x) - (case (unsafe-vector-length #,x) - clauses ... - [else (#,esc)])])] + (let ([ht (hash-on (lambda (r) + (length (Vector-ps (Row-first-pat r)))) rows)]) + (with-syntax ([(clauses ...) + (hash-map + ht + (lambda (arity rows) + (define ns (build-list arity values)) + (with-syntax ([(tmps ...) (generate-temporaries ns)]) + (with-syntax ([body + (compile* + (append (syntax->list #'(tmps ...)) xs) + (map (lambda (row) + (define-values (p1 ps) + (Row-split-pats row)) + (make-Row (append (Vector-ps p1) ps) + (Row-rhs row) + (Row-unmatch row) + (Row-vars-seen row))) + rows) + esc)] + [(n ...) ns]) + #`[(#,arity) + (let ([tmps (unsafe-vector-ref #,x n)] ...) + body)]))))]) + #`[(vector? #,x) + (case (unsafe-vector-length #,x) + clauses ... + [else (#,esc)])]))] ;; it's a structure [(box? k) ;; all the rows are structures with the same predicate @@ -308,105 +304,103 @@ #`(cond [(pred? #,x) body] [else (#,esc)]))] ;; Generalized sequences... slightly tested [(GSeq? first) - (nest - ([let* ([headss (GSeq-headss first)] - [mins (GSeq-mins first)] - [maxs (GSeq-maxs first)] - [onces? (GSeq-onces? first)] - [tail (GSeq-tail first)] - [mutable? (GSeq-mutable? first)] - [make-Pair (if mutable? make-MPair make-Pair)] - [k (Row-rhs (car block))] - [xvar (car (generate-temporaries (list #'x)))] - [complete-heads-pattern - (lambda (ps) - (define (loop ps pat) - (if (pair? ps) - (make-Pair (car ps) (loop (cdr ps) pat)) - pat)) - (loop ps (make-Var xvar)))] - [heads - (for/list ([ps headss]) - (complete-heads-pattern ps))] - [head-idss - (for/list ([heads headss]) - (apply append (map bound-vars heads)))] - [hid-argss (map generate-temporaries head-idss)] - [head-idss* (map generate-temporaries head-idss)] - [hid-args (apply append hid-argss)] - [reps (generate-temporaries (for/list ([head heads]) 'rep))])] - [with-syntax - ([x xvar] - [var0 (car vars)] - [((hid ...) ...) head-idss] - [((hid* ...) ...) head-idss*] - [((hid-arg ...) ...) hid-argss] - [(rep ...) reps] - [(maxrepconstraint ...) - ;; FIXME: move to side condition to appropriate pattern - (for/list ([repvar reps] [maxrep maxs]) - (if maxrep #`(< #,repvar #,maxrep) #`#t))] - [(minrepclause ...) - (for/list ([repvar reps] [minrep mins] #:when minrep) - #`[(< #,repvar #,minrep) (fail)])] - [((hid-rhs ...) ...) - (for/list ([hid-args hid-argss] [once? onces?]) - (for/list ([hid-arg hid-args]) - (if once? - #`(car (reverse #,hid-arg)) - #`(reverse #,hid-arg))))] - [(parse-loop failkv fail-tail) - (generate-temporaries #'(parse-loop failkv fail-tail))])] - [with-syntax ([(rhs ...) - #`[(let ([hid-arg (cons hid* hid-arg)] ...) - (if maxrepconstraint - (let ([rep (add1 rep)]) - (parse-loop x #,@hid-args #,@reps fail)) - (begin (fail)))) - ...]] - [tail-rhs - #`(cond minrepclause ... - [else - (let ([hid hid-rhs] ... ... - [fail-tail fail]) - #,(compile* - (cdr vars) - (list (make-Row rest-pats k - (Row-unmatch (car block)) - (Row-vars-seen - (car block)))) - #'fail-tail))])])] - [parameterize ([current-renaming - (for/fold ([ht (copy-mapping (current-renaming))]) - ([id (apply append head-idss)] - [id* (apply append head-idss*)]) - (free-identifier-mapping-put! ht id id*) - (free-identifier-mapping-for-each - ht - (lambda (k v) - (when (free-identifier=? v id) - (free-identifier-mapping-put! ht k id*)))) - ht)])]) - #`(let parse-loop ([x var0] - [hid-arg null] ... ... - [rep 0] ... - [failkv #,esc]) - #,(compile* (list #'x) - (append - (map (lambda (pats rhs) - (make-Row pats - rhs - (Row-unmatch (car block)) - (Row-vars-seen - (car block)))) - (map list heads) - (syntax->list #'(rhs ...))) - (list (make-Row (list tail) - #`tail-rhs - (Row-unmatch (car block)) - (Row-vars-seen - (car block))))) - #'failkv)))] + (let* ([headss (GSeq-headss first)] + [mins (GSeq-mins first)] + [maxs (GSeq-maxs first)] + [onces? (GSeq-onces? first)] + [tail (GSeq-tail first)] + [mutable? (GSeq-mutable? first)] + [make-Pair (if mutable? make-MPair make-Pair)] + [k (Row-rhs (car block))] + [xvar (car (generate-temporaries (list #'x)))] + [complete-heads-pattern + (lambda (ps) + (define (loop ps pat) + (if (pair? ps) + (make-Pair (car ps) (loop (cdr ps) pat)) + pat)) + (loop ps (make-Var xvar)))] + [heads + (for/list ([ps headss]) + (complete-heads-pattern ps))] + [head-idss + (for/list ([heads headss]) + (apply append (map bound-vars heads)))] + [hid-argss (map generate-temporaries head-idss)] + [head-idss* (map generate-temporaries head-idss)] + [hid-args (apply append hid-argss)] + [reps (generate-temporaries (for/list ([head heads]) 'rep))]) + (with-syntax ([x xvar] + [var0 (car vars)] + [((hid ...) ...) head-idss] + [((hid* ...) ...) head-idss*] + [((hid-arg ...) ...) hid-argss] + [(rep ...) reps] + [(maxrepconstraint ...) + ;; FIXME: move to side condition to appropriate pattern + (for/list ([repvar reps] [maxrep maxs]) + (if maxrep #`(< #,repvar #,maxrep) #`#t))] + [(minrepclause ...) + (for/list ([repvar reps] [minrep mins] #:when minrep) + #`[(< #,repvar #,minrep) (fail)])] + [((hid-rhs ...) ...) + (for/list ([hid-args hid-argss] [once? onces?]) + (for/list ([hid-arg hid-args]) + (if once? + #`(car (reverse #,hid-arg)) + #`(reverse #,hid-arg))))] + [(parse-loop failkv fail-tail) + (generate-temporaries #'(parse-loop failkv fail-tail))]) + (with-syntax ([(rhs ...) + #`[(let ([hid-arg (cons hid* hid-arg)] ...) + (if maxrepconstraint + (let ([rep (add1 rep)]) + (parse-loop x #,@hid-args #,@reps fail)) + (begin (fail)))) + ...]] + [tail-rhs + #`(cond minrepclause ... + [else + (let ([hid hid-rhs] ... ... + [fail-tail fail]) + #,(compile* + (cdr vars) + (list (make-Row rest-pats k + (Row-unmatch (car block)) + (Row-vars-seen + (car block)))) + #'fail-tail))])]) + (parameterize ([current-renaming + (for/fold ([ht (copy-mapping (current-renaming))]) + ([id (apply append head-idss)] + [id* (apply append head-idss*)]) + (free-identifier-mapping-put! ht id id*) + (free-identifier-mapping-for-each + ht + (lambda (k v) + (when (free-identifier=? v id) + (free-identifier-mapping-put! ht k id*)))) + ht)]) + #`(let parse-loop ([x var0] + [hid-arg null] ... ... + [rep 0] ... + [failkv #,esc]) + #,(compile* (list #'x) + (append + (map (lambda (pats rhs) + (make-Row pats + rhs + (Row-unmatch (car block)) + (Row-vars-seen + (car block)))) + (map list heads) + (syntax->list #'(rhs ...))) + (list (make-Row (list tail) + #`tail-rhs + (Row-unmatch (car block)) + (Row-vars-seen + (car block))))) + #'failkv))))))] [else (error 'compile "unsupported pattern: ~a\n" first)])) (define (compile* vars rows esc [reorder? #t]) diff --git a/racket/collects/racket/match/gen-match.rkt b/racket/collects/racket/match/gen-match.rkt index 4d4c4364f9..6c1ab8bb5b 100644 --- a/racket/collects/racket/match/gen-match.rkt +++ b/racket/collects/racket/match/gen-match.rkt @@ -1,7 +1,7 @@ #lang racket/base (require "patterns.rkt" "compiler.rkt" - syntax/stx scheme/nest syntax/parse + syntax/stx syntax/parse (for-template racket/base (only-in "runtime.rkt" match:error))) (provide go go/one) @@ -23,61 +23,59 @@ (define (go parse stx exprs clauses) (syntax-case clauses () [([pats . rhs] ...) - (nest - ([parameterize ([orig-stx stx])] - [begin (unless (syntax->list exprs) - (raise-syntax-error - 'match* - "expected a sequence of expressions to match" - exprs))] - [let ([len (length (syntax->list exprs))] - [srcloc-list (list - #`(quote #,(syntax-source stx)) - #`(quote #,(syntax-line stx)) - #`(quote #,(syntax-column stx)) - #`(quote #,(syntax-position stx)) - #`(quote #,(syntax-span stx)))])] - [with-syntax ([(xs ...) (generate-temporaries exprs)] - [(exprs ...) exprs] - [(fail) (generate-temporaries #'(fail))])] - [with-syntax - ([body - (compile* - (syntax->list #'(xs ...)) - (for/list ([clause (syntax->list clauses)] - [pats (syntax->list #'(pats ...))] - [rhs (syntax->list #'(rhs ...))]) - (unless (syntax->list pats) - (raise-syntax-error - 'match* - "expected a sequence of patterns" - pats)) - (let ([lp (length (syntax->list pats))]) - (when (null? (syntax->list rhs)) - (raise-syntax-error - 'match - "expected at least one expression on the right-hand side" - clause)) - (unless (= len lp) - (raise-syntax-error - 'match - (format - "wrong number of match clauses, expected ~a and got ~a" - len lp) - pats)) - (let ([mk (lambda (unm rhs) - (make-Row (for/list ([p (syntax->list pats)]) - (parse p)) - #`(let-values () . #,rhs) unm null))]) - (syntax-case* rhs (=>) - (lambda (x y) (eq? (syntax-e x) (syntax-e y))) - [((=> unm) . rhs) (mk #'unm #'rhs)] - [_ (mk #f rhs)])))) - #'fail)] - [orig-expr - (if (= 1 len) (stx-car #'(xs ...)) #'(list xs ...))])]) - (quasisyntax/loc stx - (let ([xs exprs] ...) - (let ([fail (lambda () - #,(quasisyntax/loc stx (match:error orig-expr (list (srcloc #,@srcloc-list)))))]) - body))))])) + (parameterize ([orig-stx stx]) + (unless (syntax->list exprs) + (raise-syntax-error + 'match* + "expected a sequence of expressions to match" + exprs))) + (let ([len (length (syntax->list exprs))] + [srcloc-list (list + #`(quote #,(syntax-source stx)) + #`(quote #,(syntax-line stx)) + #`(quote #,(syntax-column stx)) + #`(quote #,(syntax-position stx)) + #`(quote #,(syntax-span stx)))]) + (with-syntax ([(xs ...) (generate-temporaries exprs)] + [(exprs ...) exprs] + [(fail) (generate-temporaries #'(fail))]) + (with-syntax ([body + (compile* + (syntax->list #'(xs ...)) + (for/list ([clause (syntax->list clauses)] + [pats (syntax->list #'(pats ...))] + [rhs (syntax->list #'(rhs ...))]) + (unless (syntax->list pats) + (raise-syntax-error + 'match* + "expected a sequence of patterns" + pats)) + (let ([lp (length (syntax->list pats))]) + (when (null? (syntax->list rhs)) + (raise-syntax-error + 'match + "expected at least one expression on the right-hand side" + clause)) + (unless (= len lp) + (raise-syntax-error + 'match + (format + "wrong number of match clauses, expected ~a and got ~a" + len lp) + pats)) + (let ([mk (lambda (unm rhs) + (make-Row (for/list ([p (syntax->list pats)]) + (parse p)) + #`(let-values () . #,rhs) unm null))]) + (syntax-case* rhs (=>) + (lambda (x y) (eq? (syntax-e x) (syntax-e y))) + [((=> unm) . rhs) (mk #'unm #'rhs)] + [_ (mk #f rhs)])))) + #'fail)] + [orig-expr + (if (= 1 len) (stx-car #'(xs ...)) #'(list xs ...))]) + (quasisyntax/loc stx + (let ([xs exprs] ...) + (let ([fail (lambda () + #,(quasisyntax/loc stx (match:error orig-expr (list (srcloc #,@srcloc-list)))))]) + body))))))])) diff --git a/racket/collects/racket/signature/lang.rkt b/racket/collects/racket/signature/lang.rkt index 3f845168b6..532ed95b54 100644 --- a/racket/collects/racket/signature/lang.rkt +++ b/racket/collects/racket/signature/lang.rkt @@ -1,24 +1,26 @@ -#lang scheme/base +#lang racket/base -(require scheme/unit - scheme/contract - (for-syntax scheme/base +(require (except-in racket/unit struct/ctc) + racket/contract + (submod racket/unit compat) + (for-syntax racket/base racket/private/unit-compiletime racket/private/unit-syntax)) -(provide (rename-out [module-begin #%module-begin]) - (except-out (all-from-out scheme/base) #%module-begin) - (all-from-out scheme/unit) - (all-from-out scheme/contract) - (for-syntax (all-from-out scheme/base))) +(provide (rename-out [module-begin #%module-begin] + [struct~s struct]) + (except-out (all-from-out racket/base) #%module-begin) + (all-from-out racket/unit) + (all-from-out racket/contract) + (for-syntax (all-from-out racket/base))) (define-for-syntax (make-name s) (string->symbol (string-append (regexp-replace "-sig$" (symbol->string s) "") "^"))) -;; Recognizes scheme require forms. -(define-for-syntax split-scheme-requires +;; Recognizes racket require forms. +(define-for-syntax split-racket-requires (split-requires* (list #'require #'#%require))) (define-syntax (module-begin stx) @@ -27,7 +29,7 @@ (syntax-case stx () ((_ . x) (with-syntax ((((reqs ...) . (body ...)) - (split-scheme-requires (checked-syntax->list #'x)))) + (split-racket-requires (checked-syntax->list #'x)))) (datum->syntax stx (syntax-e #'(#%module-begin diff --git a/racket/collects/raco/all-tools.rkt b/racket/collects/raco/all-tools.rkt index f4b48a021f..8b91238753 100644 --- a/racket/collects/raco/all-tools.rkt +++ b/racket/collects/raco/all-tools.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require setup/getinfo) (provide all-tools) diff --git a/racket/collects/reader/lang/reader.rkt b/racket/collects/reader/lang/reader.rkt index 1473e045f9..dd8f82b34b 100644 --- a/racket/collects/reader/lang/reader.rkt +++ b/racket/collects/reader/lang/reader.rkt @@ -1,4 +1,4 @@ -(module reader scheme/base +(module reader racket/base (require syntax/module-reader) (provide (rename-out [-read read] diff --git a/racket/collects/scheme/load.rkt b/racket/collects/scheme/load.rkt deleted file mode 100644 index c3a870df30..0000000000 --- a/racket/collects/scheme/load.rkt +++ /dev/null @@ -1,2 +0,0 @@ -#lang scheme/private/provider -racket/load diff --git a/racket/collects/setup/commands/link.rkt b/racket/collects/setup/commands/link.rkt index 4c05d76a0e..44767b3ef8 100644 --- a/racket/collects/setup/commands/link.rkt +++ b/racket/collects/setup/commands/link.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require racket/cmdline raco/command-name setup/dirs diff --git a/racket/collects/setup/getinfo.rkt b/racket/collects/setup/getinfo.rkt index 214f5c1746..88846ce128 100644 --- a/racket/collects/setup/getinfo.rkt +++ b/racket/collects/setup/getinfo.rkt @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base -(require scheme/match - scheme/contract +(require racket/match + racket/contract planet/cachepath syntax/modread "dirs.rkt" diff --git a/racket/collects/setup/link.rkt b/racket/collects/setup/link.rkt index e9a809030b..4f2e128a40 100644 --- a/racket/collects/setup/link.rkt +++ b/racket/collects/setup/link.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require racket/file racket/path setup/dirs) diff --git a/racket/collects/setup/main-doc.rkt b/racket/collects/setup/main-doc.rkt index 6771a16683..e548a08fd9 100644 --- a/racket/collects/setup/main-doc.rkt +++ b/racket/collects/setup/main-doc.rkt @@ -1,4 +1,4 @@ -#lang s-exp scheme/base +#lang s-exp racket/base (require "dirs.rkt" "path-relativize.rkt") (provide path->main-doc-relative diff --git a/racket/collects/setup/option-sig.rkt b/racket/collects/setup/option-sig.rkt index 2900009479..5308450163 100644 --- a/racket/collects/setup/option-sig.rkt +++ b/racket/collects/setup/option-sig.rkt @@ -1,4 +1,4 @@ -(module option-sig scheme/base +(module option-sig racket/base (require racket/unit) (provide setup-option^) diff --git a/racket/collects/setup/option-unit.rkt b/racket/collects/setup/option-unit.rkt index 31f74de427..f0959e42e8 100644 --- a/racket/collects/setup/option-unit.rkt +++ b/racket/collects/setup/option-unit.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/unit +#lang racket/base +(require racket/unit racket/future "option-sig.rkt") diff --git a/racket/collects/setup/pack.rkt b/racket/collects/setup/pack.rkt index 889f084e30..eeea2e4ecf 100644 --- a/racket/collects/setup/pack.rkt +++ b/racket/collects/setup/pack.rkt @@ -1,10 +1,10 @@ ;; Utilities for creating a .plt package -(module pack scheme/base +(module pack racket/base (require file/gzip net/base64 - scheme/system - scheme/port - scheme/file + racket/system + racket/port + racket/file setup/getinfo) (provide pack diff --git a/racket/collects/setup/private/lib-roots.rkt b/racket/collects/setup/private/lib-roots.rkt index 1c92326440..bd54fe11a2 100644 --- a/racket/collects/setup/private/lib-roots.rkt +++ b/racket/collects/setup/private/lib-roots.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require (prefix-in planet: planet/config) scheme/path scheme/list) +(require (prefix-in planet: planet/config) racket/path racket/list) ;; `library-roots' is an alist of root-path, and the number of levels ;; below that which indicates a "library". This is hard-wired now to diff --git a/racket/collects/setup/private/omitted-paths.rkt b/racket/collects/setup/private/omitted-paths.rkt index 2856e98987..2c7c9e58be 100644 --- a/racket/collects/setup/private/omitted-paths.rkt +++ b/racket/collects/setup/private/omitted-paths.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;; `omitted-paths' returns a list of omitted file and subdirectory names for a ;; given directory, or 'all if the directory is completely omitted. Considers @@ -9,7 +9,7 @@ (provide omitted-paths) -(require scheme/path scheme/list scheme/promise "../dirs.rkt" "lib-roots.rkt") +(require racket/path racket/list racket/promise "../dirs.rkt" "lib-roots.rkt") ;; An entry for each collections root that holds a hash table. The hash table ;; maps a reversed list of subpath elements to the exploded omitted-paths diff --git a/racket/collects/setup/private/path-utils.rkt b/racket/collects/setup/private/path-utils.rkt index 416e0e056c..a54b4d2e5c 100644 --- a/racket/collects/setup/private/path-utils.rkt +++ b/racket/collects/setup/private/path-utils.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require setup/dirs setup/main-collects) diff --git a/racket/collects/setup/setup-go.rkt b/racket/collects/setup/setup-go.rkt index 5b75237c74..58cdf3f6c6 100644 --- a/racket/collects/setup/setup-go.rkt +++ b/racket/collects/setup/setup-go.rkt @@ -1,4 +1,4 @@ -(module setup-go scheme/base +(module setup-go racket/base (require "setup-cmdline.rkt" racket/unit diff --git a/racket/collects/setup/variant.rkt b/racket/collects/setup/variant.rkt index d2de7b7615..a8424e6036 100644 --- a/racket/collects/setup/variant.rkt +++ b/racket/collects/setup/variant.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require setup/dirs scheme/promise) +(require setup/dirs racket/promise) (provide variant-suffix) diff --git a/racket/collects/setup/winvers-change.rkt b/racket/collects/setup/winvers-change.rkt index 4f5198099c..ab229abb05 100644 --- a/racket/collects/setup/winvers-change.rkt +++ b/racket/collects/setup/winvers-change.rkt @@ -8,7 +8,7 @@ ;; running Racket.exe on Windows -- "winvers.rkt" uses a trick of making a copy ;; of the binary and restarting that copy for the actual change. -#lang scheme/base +#lang racket/base (define verbose? #t) (define binary-extensions '("exe" "dll" "lib" "so" "def" "exp" #|"obj" "o"|#)) diff --git a/racket/collects/setup/winvers.rkt b/racket/collects/setup/winvers.rkt index 0c8a96e43d..5063aa0562 100644 --- a/racket/collects/setup/winvers.rkt +++ b/racket/collects/setup/winvers.rkt @@ -1,7 +1,7 @@ ;; This is a wrapper around "winvers-change.rkt" to patch binary files with the ;; current version number. -#lang scheme/base +#lang racket/base (require racket/file "main-collects.rkt" "dirs.rkt") diff --git a/racket/collects/syntax/moddep.rkt b/racket/collects/syntax/moddep.rkt index 94c2b17609..c0f3fe4fb1 100644 --- a/racket/collects/syntax/moddep.rkt +++ b/racket/collects/syntax/moddep.rkt @@ -1,4 +1,4 @@ -(module moddep scheme/base +(module moddep racket/base (require "modread.rkt" "modcode.rkt" "modcollapse.rkt" diff --git a/racket/collects/version/check.rkt b/racket/collects/version/check.rkt index f08d5756dd..c63b3eb0a0 100644 --- a/racket/collects/version/check.rkt +++ b/racket/collects/version/check.rkt @@ -1,4 +1,5 @@ #lang racket/base +(require racket/tcp) (define version-url "http://download.racket-lang.org/version.txt") (define timeout 30) @@ -11,7 +12,6 @@ ;; (require net/url) ;; (define (url->port url) (get-pure-port (string->url url))) -(require scheme/tcp) (define (url->port url) (define-values [host path] (apply values (cdr (regexp-match #rx"^http://([^/:@]+)(/.*)$" url)))) diff --git a/racket/src/mac/rename-app.rkt b/racket/src/mac/rename-app.rkt index 3d622a4e42..eb574ccd7e 100644 --- a/racket/src/mac/rename-app.rkt +++ b/racket/src/mac/rename-app.rkt @@ -1,5 +1,4 @@ - -#lang scheme/base +#lang racket/base (current-directory (build-path 'up)) diff --git a/racket/src/racket/gc2/setup.rkt b/racket/src/racket/gc2/setup.rkt index 8b695e74a1..b1939b80fe 100644 --- a/racket/src/racket/gc2/setup.rkt +++ b/racket/src/racket/gc2/setup.rkt @@ -85,10 +85,7 @@ ;; Readers: (map (lambda (r) (go r #f #f)) '(s-exp/lang/reader - scheme/base/lang/reader - scheme/private/provider/lang/reader racket/base/lang/reader - scheme/runtime-config racket/runtime-config)) (current-library-collection-paths