diff --git a/collects/compiler/private/mach-o.ss b/collects/compiler/private/mach-o.ss index 530c2b9b94..284661bec1 100644 --- a/collects/compiler/private/mach-o.ss +++ b/collects/compiler/private/mach-o.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide add-plt-segment get/set-dylib-path) diff --git a/collects/compiler/private/winutf16.ss b/collects/compiler/private/winutf16.ss index 3985a4fa40..82e03b6048 100644 --- a/collects/compiler/private/winutf16.ss +++ b/collects/compiler/private/winutf16.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide bytes->utf-16-bytes utf-16-bytes->bytes) diff --git a/collects/config/main.ss b/collects/config/main.ss index f0dc71125f..535316ba27 100644 --- a/collects/config/main.ss +++ b/collects/config/main.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "config.ss") (provide (all-from-out "config.ss")) diff --git a/collects/gui-debugger/load-sandbox.ss b/collects/gui-debugger/load-sandbox.ss index 0d18ab360c..3112a22146 100644 --- a/collects/gui-debugger/load-sandbox.ss +++ b/collects/gui-debugger/load-sandbox.ss @@ -2,7 +2,7 @@ (require syntax/moddep mzlib/class - scheme/private/namespace + racket/private/namespace mred) (provide eval/annotations diff --git a/collects/mzlib/class-traced.ss b/collects/mzlib/class-traced.ss index 737a06cbe0..cb26623a2f 100644 --- a/collects/mzlib/class-traced.ss +++ b/collects/mzlib/class-traced.ss @@ -2,7 +2,7 @@ ;; All of the implementation is actually in private/class-internal.ss, ;; which provides extra (private) functionality to contract.ss. - (require scheme/private/class-internal) + (require racket/private/class-internal) (provide (rename class-traced class) (rename class*-traced class*) diff --git a/collects/mzlib/class.ss b/collects/mzlib/class.ss index 55e0f0d6ae..4e2e272723 100644 --- a/collects/mzlib/class.ss +++ b/collects/mzlib/class.ss @@ -1,3 +1,3 @@ (module class mzscheme - (require scheme/private/class-internal) + (require racket/private/class-internal) (provide-public-names)) diff --git a/collects/mzlib/contract.ss b/collects/mzlib/contract.ss index 3c6ef88c97..8516d28e81 100644 --- a/collects/mzlib/contract.ss +++ b/collects/mzlib/contract.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; @@ -25,37 +25,37 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; -;; provide everything from the scheme/ implementation +;; provide everything from the racket/ implementation ;; except the arrow contracts ;; -(require scheme/contract/private/base - scheme/contract/private/misc - scheme/contract/private/provide - scheme/contract/private/guts - scheme/contract/private/ds - scheme/contract/private/opt - scheme/contract/private/basic-opters) +(require racket/contract/private/base + racket/contract/private/misc + racket/contract/private/provide + racket/contract/private/guts + racket/contract/private/ds + racket/contract/private/opt + racket/contract/private/basic-opters) (provide opt/c define-opt/c ;(all-from "private/contract-opt.ss") - (except-out (all-from-out scheme/contract/private/ds) + (except-out (all-from-out racket/contract/private/ds) lazy-depth-to-look) - (all-from-out scheme/contract/private/base) - (all-from-out scheme/contract/private/provide) - (except-out (all-from-out scheme/contract/private/misc) + (all-from-out racket/contract/private/base) + (all-from-out racket/contract/private/provide) + (except-out (all-from-out racket/contract/private/misc) check-between/c string-len/c check-unary-between/c) (rename-out [or/c union]) (rename-out [string-len/c string/len]) - (except-out (all-from-out scheme/contract/private/guts) + (except-out (all-from-out racket/contract/private/guts) check-flat-contract check-flat-named-contract)) -;; copied here because not provided by scheme/contract anymore +;; copied here because not provided by racket/contract anymore (define (flat-contract/predicate? pred) (or (flat-contract? pred) (and (procedure? pred) diff --git a/collects/mzlib/etc.ss b/collects/mzlib/etc.ss index c9b28bb194..9add9b9fdc 100644 --- a/collects/mzlib/etc.ss +++ b/collects/mzlib/etc.ss @@ -1,8 +1,8 @@ #lang mzscheme (require setup/main-collects - scheme/local - scheme/bool + racket/local + racket/bool (only scheme/base build-string build-list diff --git a/collects/mzlib/list.ss b/collects/mzlib/list.ss index c8b3a4d086..445733821f 100644 --- a/collects/mzlib/list.ss +++ b/collects/mzlib/list.ss @@ -1,31 +1,13 @@ -#lang mzscheme +#lang racket/base ;; The `first', etc. operations in this library ;; work on pairs, not lists. -(require (only scheme/base - foldl - foldr - - remv - remq - remove - remv* - remq* - remove* - - findf - memf - assf - - filter - - sort) - (only scheme/list - cons? - empty? - empty - last-pair)) +(require (only-in scheme/list + cons? + empty? + empty + last-pair)) (provide first second diff --git a/collects/mzlib/match.ss b/collects/mzlib/match.ss index d38a78ad82..8362e9a912 100644 --- a/collects/mzlib/match.ss +++ b/collects/mzlib/match.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base -(require scheme/match/legacy-match) -(provide (all-from-out scheme/match/legacy-match)) +(require racket/match/legacy-match) +(provide (all-from-out racket/match/legacy-match)) diff --git a/collects/mzlib/plt-match.ss b/collects/mzlib/plt-match.ss index 84e08e6231..add845afab 100644 --- a/collects/mzlib/plt-match.ss +++ b/collects/mzlib/plt-match.ss @@ -1,4 +1,4 @@ #lang scheme/base -(require scheme/match/match) -(provide (all-from-out scheme/match/match)) +(require racket/match/match) +(provide (all-from-out racket/match/match)) diff --git a/collects/mzlib/port.ss b/collects/mzlib/port.ss index 56b12030af..c588143b94 100644 --- a/collects/mzlib/port.ss +++ b/collects/mzlib/port.ss @@ -1,8 +1,7 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) - mzlib/etc - scheme/contract/base +(require (for-syntax racket/base) + racket/contract/base mzlib/list "private/port.ss") @@ -118,13 +117,13 @@ ;; 0 always (which implies that the `read' proc must not return ;; a pipe input port). (define make-input-port/read-to-peek - (opt-lambda (name read fast-peek close - [location-proc #f] - [count-lines!-proc void] - [init-position 1] - [buffer-mode-proc #f] - [buffering? #f] - [on-consumed #f]) + (lambda (name read fast-peek close + [location-proc #f] + [count-lines!-proc void] + [init-position 1] + [buffer-mode-proc #f] + [buffering? #f] + [on-consumed #f]) (define lock-semaphore (make-semaphore 1)) (define commit-semaphore (make-semaphore 1)) (define-values (peeked-r peeked-w) (make-pipe)) @@ -440,7 +439,7 @@ (buffer-mode-proc mode)]))))) (define peeking-input-port - (opt-lambda (orig-in [name (object-name orig-in)] [delta 0]) + (lambda (orig-in [name (object-name orig-in)] [delta 0]) (make-input-port/read-to-peek name (lambda (s) @@ -452,11 +451,11 @@ void))) (define relocate-input-port - (opt-lambda (p line col pos [close? #t]) + (lambda (p line col pos [close? #t]) (transplant-to-relocate transplant-input-port p line col pos close?))) (define transplant-input-port - (opt-lambda (p location-proc pos [close? #t] [count-lines!-proc void]) + (lambda (p location-proc pos [close? #t] [count-lines!-proc void]) (make-input-port (object-name p) (lambda (s) @@ -486,7 +485,7 @@ ;; thread when write evts are active; otherwise, we use a lock semaphore. ;; (Actually, the lock semaphore has to be used all the time, to guard ;; the flag indicating whether the manager thread is running.) - (opt-lambda ([limit (expt 2 64)] [in-name 'pipe] [out-name 'pipe]) + (lambda ([limit (expt 2 64)] [in-name 'pipe] [out-name 'pipe]) (let-values ([(r w) (make-pipe limit)] [(more) null] [(more-last) #f] @@ -724,7 +723,7 @@ (values in out)))) (define input-port-append - (opt-lambda (close-orig? . ports) + (lambda (close-orig? . ports) (make-input-port (map object-name ports) (lambda (str) @@ -815,7 +814,7 @@ (loop half skip))))))) (define make-limited-input-port - (opt-lambda (port limit [close-orig? #t]) + (lambda (port limit [close-orig? #t]) (let ([got 0]) (make-input-port (object-name port) @@ -1208,13 +1207,13 @@ (loop (add1 i) (add1 j))]))))])) (define reencode-input-port - (opt-lambda (port encoding [error-bytes #f] [close? #f] - [name (object-name port)] - [newline-convert? #f] - [decode-error (lambda (msg port) - (error 'reencode-input-port - (format "~a: ~e" msg) - port))]) + (lambda (port encoding [error-bytes #f] [close? #f] + [name (object-name port)] + [newline-convert? #f] + [decode-error (lambda (msg port) + (error 'reencode-input-port + (format "~a: ~e" msg) + port))]) (let ([c (let ([c (bytes-open-converter encoding "UTF-8")]) (if newline-convert? (mcons c #f) c))] [ready-bytes (make-bytes 1024)] @@ -1345,13 +1344,13 @@ ;; -------------------------------------------------- (define reencode-output-port - (opt-lambda (port encoding [error-bytes #f] [close? #f] - [name (object-name port)] - [convert-newlines-to #f] - [decode-error (lambda (msg port) - (error 'reencode-input-port - (format "~a: ~e" msg) - port))]) + (lambda (port encoding [error-bytes #f] [close? #f] + [name (object-name port)] + [convert-newlines-to #f] + [decode-error (lambda (msg port) + (error 'reencode-input-port + (format "~a: ~e" msg) + port))]) (let ([c (bytes-open-converter "UTF-8" encoding)] [ready-bytes (make-bytes 1024)] [ready-start 0] @@ -1664,7 +1663,7 @@ ;; ---------------------------------------- (define dup-output-port - (opt-lambda (p [close? #f]) + (lambda (p [close? #f]) (let ([new (transplant-output-port p (lambda () (port-next-location p)) @@ -1677,7 +1676,7 @@ new))) (define dup-input-port - (opt-lambda (p [close? #f]) + (lambda (p [close? #f]) (let ([new (transplant-input-port p (lambda () (port-next-location p)) diff --git a/collects/mzlib/private/contract-arr-checks.ss b/collects/mzlib/private/contract-arr-checks.ss index 5410d7401f..9bbb341fc1 100644 --- a/collects/mzlib/private/contract-arr-checks.ss +++ b/collects/mzlib/private/contract-arr-checks.ss @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (provide (all-defined-out)) -(require scheme/contract/private/guts) +(require racket/contract/private/guts) (define empty-case-lambda/c (flat-named-contract '(case->) diff --git a/collects/mzlib/private/contract-arr-obj-helpers.ss b/collects/mzlib/private/contract-arr-obj-helpers.ss index cb38466262..5123ffdfb4 100644 --- a/collects/mzlib/private/contract-arr-obj-helpers.ss +++ b/collects/mzlib/private/contract-arr-obj-helpers.ss @@ -4,7 +4,7 @@ (require (for-syntax scheme/base)) (require (for-template scheme/base) - (for-template scheme/contract/private/guts) + (for-template racket/contract/private/guts) (for-template "contract-arr-checks.ss")) (provide make-/proc ->/h ->*/h ->d/h ->d*/h ->r/h diff --git a/collects/mzlib/private/contract-arrow.ss b/collects/mzlib/private/contract-arrow.ss index 2b13878178..038951ae8e 100644 --- a/collects/mzlib/private/contract-arrow.ss +++ b/collects/mzlib/private/contract-arrow.ss @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base -(require scheme/contract/private/guts - scheme/contract/private/opt +(require racket/contract/private/guts + racket/contract/private/opt "contract-arr-checks.ss") -(require (for-syntax scheme/base) - (for-syntax scheme/contract/private/opt-guts) - (for-syntax scheme/contract/private/helpers) +(require (for-syntax racket/base) + (for-syntax racket/contract/private/opt-guts) + (for-syntax racket/contract/private/helpers) (for-syntax "contract-arr-obj-helpers.ss") (for-syntax syntax/stx) (for-syntax syntax/name)) diff --git a/collects/mzlib/private/contract-define.ss b/collects/mzlib/private/contract-define.ss index 4cece1f07b..faad09a30a 100644 --- a/collects/mzlib/private/contract-define.ss +++ b/collects/mzlib/private/contract-define.ss @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base (provide define/contract) -(require (for-syntax scheme/base +(require (for-syntax racket/base unstable/srcloc - (prefix-in a: scheme/contract/private/helpers)) - (only-in scheme/contract/private/base contract)) + (prefix-in a: racket/contract/private/helpers)) + (only-in racket/contract/private/base contract)) ;; First, we have the old define/contract implementation, which ;; is still used in mzlib/contract. diff --git a/collects/mzlib/private/contract-object.ss b/collects/mzlib/private/contract-object.ss index 7b7579fa7b..66cc2c5b36 100644 --- a/collects/mzlib/private/contract-object.ss +++ b/collects/mzlib/private/contract-object.ss @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base (require "contract-arrow.ss" - scheme/contract/private/guts - scheme/private/class-internal + racket/contract/private/guts + racket/private/class-internal "contract-arr-checks.ss") -(require (for-syntax scheme/base - scheme/contract/private/helpers +(require (for-syntax racket/base + racket/contract/private/helpers "contract-arr-obj-helpers.ss")) (provide mixin-contract diff --git a/collects/mzlib/private/port.ss b/collects/mzlib/private/port.ss index 56bf26f2b8..33cde9a312 100644 --- a/collects/mzlib/private/port.ss +++ b/collects/mzlib/private/port.ss @@ -3,15 +3,14 @@ ;; used by contract.ss, which is used by port.ss --- so we ;; break the cycle with this module. -(module port mzscheme - (require "../etc.ss") +(module port racket/base (provide open-output-nowhere relocate-output-port transplant-output-port transplant-to-relocate) (define open-output-nowhere - (opt-lambda ([name 'nowhere] [specials-ok? #t]) + (lambda ([name 'nowhere] [specials-ok? #t]) (make-output-port name always-evt @@ -42,13 +41,13 @@ close?))) (define relocate-output-port - (opt-lambda (p line col pos [close? #t]) + (lambda (p line col pos [close? #t]) (transplant-to-relocate transplant-output-port p line col pos close?))) (define transplant-output-port - (opt-lambda (p location-proc pos [close? #t] [count-lines!-proc void]) + (lambda (p location-proc pos [close? #t] [count-lines!-proc void]) (make-output-port (object-name p) p diff --git a/collects/mzlib/private/unit-compiletime.ss b/collects/mzlib/private/unit-compiletime.ss index f0c2630dc1..c2813b6901 100644 --- a/collects/mzlib/private/unit-compiletime.ss +++ b/collects/mzlib/private/unit-compiletime.ss @@ -7,7 +7,7 @@ (require (for-template scheme/base "unit-keywords.ss" "unit-runtime.ss")) -(require scheme/private/define-struct) +(require racket/private/define-struct) (provide (struct-out var-info) (struct-out signature) diff --git a/collects/mzlib/private/unit-contract.ss b/collects/mzlib/private/unit-contract.ss index 30fde3fdb8..591471fff5 100644 --- a/collects/mzlib/private/unit-contract.ss +++ b/collects/mzlib/private/unit-contract.ss @@ -1,14 +1,14 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base +(require (for-syntax racket/base syntax/boundmap syntax/name syntax/parse "unit-compiletime.ss" "unit-contract-syntax.ss" "unit-syntax.ss") - (for-meta 2 scheme/base) - scheme/contract/base + (for-meta 2 racket/base) + racket/contract/base "unit-utils.ss" "unit-runtime.ss") diff --git a/collects/mzlib/private/unit-utils.ss b/collects/mzlib/private/unit-utils.ss index 7b193aa2be..e9dcb02723 100644 --- a/collects/mzlib/private/unit-utils.ss +++ b/collects/mzlib/private/unit-utils.ss @@ -4,7 +4,7 @@ syntax/boundmap "unit-compiletime.ss" "unit-syntax.ss") - scheme/contract/base) + racket/contract/base) (provide (for-syntax build-key check-duplicate-sigs diff --git a/collects/mzlib/serialize.ss b/collects/mzlib/serialize.ss index ed816f961a..e4550133a9 100644 --- a/collects/mzlib/serialize.ss +++ b/collects/mzlib/serialize.ss @@ -4,13 +4,13 @@ mzlib/etc mzlib/list ;; core [de]serializer: - scheme/private/serialize) + racket/private/serialize) (provide define-serializable-struct define-serializable-struct/versions ;; core [de]serializer: - (all-from scheme/private/serialize)) + (all-from racket/private/serialize)) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; define-serializable-struct diff --git a/collects/mzlib/unit.ss b/collects/mzlib/unit.ss index 5a0d8b5696..3c03679eeb 100644 --- a/collects/mzlib/unit.ss +++ b/collects/mzlib/unit.ss @@ -16,7 +16,7 @@ "private/unit-syntax.ss")) (require mzlib/etc - scheme/contract/base + racket/contract/base scheme/stxparam unstable/location "private/unit-contract.ss" diff --git a/collects/planet/config.ss b/collects/planet/config.ss index a79016fec5..7d6f25b55c 100644 --- a/collects/planet/config.ss +++ b/collects/planet/config.ss @@ -1,4 +1,4 @@ -(module config mzscheme +(module config racket/base (require "private/define-config.ss") (define-parameters (PLANET-SERVER-NAME "planet.plt-scheme.org") diff --git a/collects/planet/private/define-config.ss b/collects/planet/private/define-config.ss index a583ca2b8d..34f2b3bc4d 100644 --- a/collects/planet/private/define-config.ss +++ b/collects/planet/private/define-config.ss @@ -1,4 +1,5 @@ -(module define-config mzscheme +(module define-config racket/base + (require (for-syntax racket/base)) (provide define-parameters) diff --git a/collects/scheme/async-channel.ss b/collects/racket/async-channel.rkt similarity index 100% rename from collects/scheme/async-channel.ss rename to collects/racket/async-channel.rkt diff --git a/collects/racket/base.rkt b/collects/racket/base.rkt new file mode 100644 index 0000000000..1388d4d218 --- /dev/null +++ b/collects/racket/base.rkt @@ -0,0 +1,4 @@ +#lang racket/private + +(require "private/base.rkt") +(provide (all-from-out "private/base.rkt")) diff --git a/collects/racket/base.ss b/collects/racket/base.ss deleted file mode 100644 index ef8f53910c..0000000000 --- a/collects/racket/base.ss +++ /dev/null @@ -1,5 +0,0 @@ -#lang racket/private -(require "private/struct.rkt") - -(provide (all-from-out scheme/base) - struct) diff --git a/collects/scheme/bool.ss b/collects/racket/bool.rkt similarity index 100% rename from collects/scheme/bool.ss rename to collects/racket/bool.rkt diff --git a/collects/racket/class.rkt b/collects/racket/class.rkt new file mode 100644 index 0000000000..9c0a682866 --- /dev/null +++ b/collects/racket/class.rkt @@ -0,0 +1,11 @@ +#lang racket/base + +(require "contract/private/object.rkt") +(provide (all-from-out "contract/private/object.rkt")) + +;; All of the implementation is actually in private/class-internal.rkt, +;; which provides extra (private) functionality to contract.rkt. +(require "private/class-internal.rkt") + +(provide-public-names) +(provide generic?) diff --git a/collects/scheme/cmdline.ss b/collects/racket/cmdline.rkt similarity index 100% rename from collects/scheme/cmdline.ss rename to collects/racket/cmdline.rkt diff --git a/collects/scheme/contract.ss b/collects/racket/contract.rkt similarity index 92% rename from collects/scheme/contract.ss rename to collects/racket/contract.rkt index a0ca0e5209..64f2911732 100644 --- a/collects/scheme/contract.ss +++ b/collects/racket/contract.rkt @@ -9,14 +9,15 @@ differences from v3: |# -(require scheme/contract/exists - scheme/contract/regions - "contract/private/basic-opters.ss" - "contract/base.ss") +(require racket/contract/exists + racket/contract/regions + "contract/private/basic-opters.rkt" + "contract/base.rkt" + "private/define-struct.rkt") -(provide (all-from-out "contract/base.ss") - (except-out (all-from-out scheme/contract/exists) ∃?) - (all-from-out scheme/contract/regions)) +(provide (all-from-out "contract/base.rkt") + (except-out (all-from-out racket/contract/exists) ∃?) + (all-from-out racket/contract/regions)) ;; ====================================================================== ;; The alternate implementation disables contracts. Its useful mainly to diff --git a/collects/scheme/contract/base.ss b/collects/racket/contract/base.ss similarity index 98% rename from collects/scheme/contract/base.ss rename to collects/racket/contract/base.ss index cc331a8588..2a623de02c 100644 --- a/collects/scheme/contract/base.ss +++ b/collects/racket/contract/base.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;; A stripped down version of scheme/contract for use in ;; the PLT code base where appropriate. diff --git a/collects/scheme/contract/exists.ss b/collects/racket/contract/exists.ss similarity index 98% rename from collects/scheme/contract/exists.ss rename to collects/racket/contract/exists.ss index 6529b89ed0..38305b0e98 100644 --- a/collects/scheme/contract/exists.ss +++ b/collects/racket/contract/exists.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "private/guts.ss") diff --git a/collects/scheme/contract/private/arrow.ss b/collects/racket/contract/private/arrow.ss similarity index 99% rename from collects/scheme/contract/private/arrow.ss rename to collects/racket/contract/private/arrow.ss index 62ec6ad5de..8bfd497ebe 100644 --- a/collects/scheme/contract/private/arrow.ss +++ b/collects/racket/contract/private/arrow.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base #| @@ -20,8 +20,8 @@ v4 todo: (require "guts.ss" "opt.ss" - scheme/stxparam) -(require (for-syntax scheme/base) + racket/stxparam) +(require (for-syntax racket/base) (for-syntax "opt-guts.ss") (for-syntax "helpers.ss") (for-syntax syntax/stx) diff --git a/collects/scheme/contract/private/base.ss b/collects/racket/contract/private/base.ss similarity index 94% rename from collects/scheme/contract/private/base.ss rename to collects/racket/contract/private/base.ss index 13a89a2559..293b66f0a1 100644 --- a/collects/scheme/contract/private/base.ss +++ b/collects/racket/contract/private/base.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base #| @@ -13,8 +13,8 @@ improve method arity mismatch contract violation error messages? recursive-contract current-contract-region) -(require (for-syntax scheme/base) - scheme/stxparam +(require (for-syntax racket/base) + racket/stxparam unstable/srcloc unstable/location "guts.ss" diff --git a/collects/scheme/contract/private/basic-opters.ss b/collects/racket/contract/private/basic-opters.ss similarity index 98% rename from collects/scheme/contract/private/basic-opters.ss rename to collects/racket/contract/private/basic-opters.ss index 97a9ef76b5..8b1d4b713b 100644 --- a/collects/scheme/contract/private/basic-opters.ss +++ b/collects/racket/contract/private/basic-opters.ss @@ -1,9 +1,9 @@ -#lang scheme/base +#lang racket/base (require "guts.ss" "opt.ss" "base.ss") -(require (for-syntax scheme/base +(require (for-syntax racket/base "opt-guts.ss")) ;; diff --git a/collects/scheme/contract/private/blame.ss b/collects/racket/contract/private/blame.ss similarity index 98% rename from collects/scheme/contract/private/blame.ss rename to collects/racket/contract/private/blame.ss index 9c917adb34..c6b3cb72a6 100644 --- a/collects/scheme/contract/private/blame.ss +++ b/collects/racket/contract/private/blame.ss @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require unstable/srcloc scheme/pretty) +(require unstable/srcloc racket/pretty) (provide blame? make-blame diff --git a/collects/scheme/contract/private/ds-helpers.ss b/collects/racket/contract/private/ds-helpers.ss similarity index 99% rename from collects/scheme/contract/private/ds-helpers.ss rename to collects/racket/contract/private/ds-helpers.ss index 2c45e7af9e..8bc9ed919c 100644 --- a/collects/scheme/contract/private/ds-helpers.ss +++ b/collects/racket/contract/private/ds-helpers.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide ensure-well-formed build-func-params build-clauses @@ -6,8 +6,7 @@ generate-arglists) (require "opt-guts.ss") -(require (for-template scheme/base) - (for-syntax scheme/base)) +(require (for-template racket/base)) #| diff --git a/collects/scheme/contract/private/ds.ss b/collects/racket/contract/private/ds.ss similarity index 99% rename from collects/scheme/contract/private/ds.ss rename to collects/racket/contract/private/ds.ss index 40a36a6183..0c9ab82d52 100644 --- a/collects/scheme/contract/private/ds.ss +++ b/collects/racket/contract/private/ds.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base #| @@ -18,13 +18,11 @@ it around flattened out. |# (require "guts.ss" - "opt.ss" - mzlib/etc) + "opt.ss") (require (for-syntax scheme/base) (for-syntax "ds-helpers.ss") (for-syntax "helpers.ss") - (for-syntax "opt-guts.ss") - (for-syntax mzlib/etc)) + (for-syntax "opt-guts.ss")) (provide define-contract-struct diff --git a/collects/scheme/contract/private/guts.ss b/collects/racket/contract/private/guts.ss similarity index 99% rename from collects/scheme/contract/private/guts.ss rename to collects/racket/contract/private/guts.ss index bca36b3e19..265a51fd87 100644 --- a/collects/scheme/contract/private/guts.ss +++ b/collects/racket/contract/private/guts.ss @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base (require "helpers.ss" "blame.ss" "prop.ss" - scheme/pretty) + racket/pretty) -(require (for-syntax scheme/base +(require (for-syntax racket/base "helpers.ss")) (provide (except-out (all-from-out "blame.ss") make-blame) diff --git a/collects/scheme/contract/private/helpers.ss b/collects/racket/contract/private/helpers.ss similarity index 99% rename from collects/scheme/contract/private/helpers.ss rename to collects/racket/contract/private/helpers.ss index a1efe65e3b..0c5789113a 100644 --- a/collects/scheme/contract/private/helpers.ss +++ b/collects/racket/contract/private/helpers.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide mangle-id mangle-id-for-maker build-struct-names @@ -9,8 +9,8 @@ known-good-contract?) (require setup/main-collects - scheme/struct-info - (for-template scheme/base)) + racket/struct-info + (for-template racket/base)) ;; lookup-struct-info : syntax -> (union #f (list syntax syntax (listof syntax) ...)) (define (lookup-struct-info stx provide-stx) diff --git a/collects/scheme/contract/private/legacy.ss b/collects/racket/contract/private/legacy.ss similarity index 99% rename from collects/scheme/contract/private/legacy.ss rename to collects/racket/contract/private/legacy.ss index cdf7bee81d..5b80fbbe46 100644 --- a/collects/scheme/contract/private/legacy.ss +++ b/collects/racket/contract/private/legacy.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "guts.ss" "blame.ss" unstable/srcloc) diff --git a/collects/scheme/contract/private/misc.ss b/collects/racket/contract/private/misc.ss similarity index 99% rename from collects/scheme/contract/private/misc.ss rename to collects/racket/contract/private/misc.ss index 1fc43fd6e1..5841e880e3 100644 --- a/collects/scheme/contract/private/misc.ss +++ b/collects/racket/contract/private/misc.ss @@ -1,10 +1,10 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base - scheme/struct-info +(require (for-syntax racket/base + racket/struct-info "helpers.ss" "opt-guts.ss") - scheme/promise + racket/promise "opt.ss" "guts.ss") diff --git a/collects/scheme/contract/private/object.ss b/collects/racket/contract/private/object.ss similarity index 99% rename from collects/scheme/contract/private/object.ss rename to collects/racket/contract/private/object.ss index ea9750098b..750ea43371 100644 --- a/collects/scheme/contract/private/object.ss +++ b/collects/racket/contract/private/object.ss @@ -1,7 +1,7 @@ #lang scheme/base (require "arrow.ss" "guts.ss" - scheme/private/class-internal + racket/private/class-internal scheme/stxparam) (require (for-syntax scheme/base)) diff --git a/collects/scheme/contract/private/opt-guts.ss b/collects/racket/contract/private/opt-guts.ss similarity index 98% rename from collects/scheme/contract/private/opt-guts.ss rename to collects/racket/contract/private/opt-guts.ss index 9e19ee0bbc..76c8cd5180 100644 --- a/collects/scheme/contract/private/opt-guts.ss +++ b/collects/racket/contract/private/opt-guts.ss @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base (require syntax/private/boundmap ;; needs to be the private one, since the public one has contracts - (for-template scheme/base) + (for-template racket/base) (for-template "guts.ss") - (for-syntax scheme/base)) + (for-syntax racket/base)) (provide get-opter reg-opter! opter interleave-lifts diff --git a/collects/scheme/contract/private/opt.ss b/collects/racket/contract/private/opt.ss similarity index 95% rename from collects/scheme/contract/private/opt.ss rename to collects/racket/contract/private/opt.ss index 8b69349574..8de78d6a61 100644 --- a/collects/scheme/contract/private/opt.ss +++ b/collects/racket/contract/private/opt.ss @@ -1,13 +1,12 @@ -#lang scheme/base +#lang racket/base (require "guts.ss" - scheme/stxparam - mzlib/etc) -(require (for-syntax scheme/base) + racket/stxparam) +(require (for-syntax racket/base) (for-syntax "opt-guts.ss") - (for-syntax mzlib/etc) - (for-syntax scheme/stxparam)) + (for-syntax racket/stxparam)) -(provide opt/c define-opt/c define/opter opt-stronger-vars-ref) +(provide opt/c define-opt/c define/opter opt-stronger-vars-ref + begin-lifted) ;; define/opter : id -> syntax ;; @@ -151,6 +150,11 @@ (vector) (begin-lifted (box #f)))))))])) +(define-syntax (begin-lifted stx) + (syntax-case stx () + [(_ expr) + (syntax-local-lift-expression #'expr)])) + (define-syntax-parameter define/opt-recursive-fn #f) (define-syntax (define-opt/c stx) diff --git a/collects/scheme/contract/private/prop.ss b/collects/racket/contract/private/prop.ss similarity index 99% rename from collects/scheme/contract/private/prop.ss rename to collects/racket/contract/private/prop.ss index 3605bd958c..0409af05f8 100644 --- a/collects/scheme/contract/private/prop.ss +++ b/collects/racket/contract/private/prop.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "blame.ss") diff --git a/collects/scheme/contract/private/provide.ss b/collects/racket/contract/private/provide.ss similarity index 99% rename from collects/scheme/contract/private/provide.ss rename to collects/racket/contract/private/provide.ss index ff3ca246fd..76acf4dd06 100644 --- a/collects/scheme/contract/private/provide.ss +++ b/collects/racket/contract/private/provide.ss @@ -1,14 +1,14 @@ -#lang scheme/base +#lang racket/base (provide provide/contract (for-syntax make-provide/contract-transformer)) -(require (for-syntax scheme/base - scheme/list +(require (for-syntax racket/base + racket/list (prefix-in a: "helpers.ss")) "arrow.ss" "base.ss" - scheme/contract/exists + racket/contract/exists "guts.ss" unstable/location unstable/srcloc) diff --git a/collects/scheme/contract/regions.ss b/collects/racket/contract/regions.ss similarity index 99% rename from collects/scheme/contract/regions.ss rename to collects/racket/contract/regions.ss index c1b63445f1..c32063676c 100644 --- a/collects/scheme/contract/regions.ss +++ b/collects/racket/contract/regions.ss @@ -1,19 +1,19 @@ -#lang scheme/base +#lang racket/base (provide define-struct/contract define/contract with-contract) -(require (for-syntax scheme/base - scheme/list - scheme/struct-info +(require (for-syntax racket/base + racket/list + racket/struct-info syntax/define syntax/kerncase syntax/parse unstable/syntax (prefix-in a: "private/helpers.ss")) - scheme/splicing - scheme/stxparam + racket/splicing + racket/stxparam unstable/location "private/arrow.ss" "private/base.ss" diff --git a/collects/scheme/control.ss b/collects/racket/control.rkt similarity index 71% rename from collects/scheme/control.ss rename to collects/racket/control.rkt index 1fdbcf4cb6..541f42dfc2 100644 --- a/collects/scheme/control.ss +++ b/collects/racket/control.rkt @@ -1,4 +1,4 @@ -(module control scheme/base +(module control racket/base (require mzlib/control) (provide (all-from-out mzlib/control))) diff --git a/collects/scheme/date.ss b/collects/racket/date.rkt similarity index 100% rename from collects/scheme/date.ss rename to collects/racket/date.rkt diff --git a/collects/scheme/dict.ss b/collects/racket/dict.rkt similarity index 95% rename from collects/scheme/dict.ss rename to collects/racket/dict.rkt index 78001b4b9a..8a74607b5b 100644 --- a/collects/scheme/dict.ss +++ b/collects/racket/dict.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base)) +(require (for-syntax racket/base)) (provide prop:dict dict? @@ -268,7 +268,7 @@ [else (raise-type-error 'dict-count "dict" d)])) -(define-struct assoc-iter (head pos)) +(struct assoc-iter (head pos)) (define (dict-iterate-first d) (cond @@ -276,7 +276,7 @@ [(vector? d) (if (zero? (vector-length d)) #f 0)] - [(assoc? d) (if (null? d) #f (make-assoc-iter d d))] + [(assoc? d) (if (null? d) #f (assoc-iter d d))] [(dict-struct? d) ((get-dict-iterate-first (dict-struct-ref d)) d)] [else (raise-type-error 'dict-iterate-first "dict" d)])) @@ -302,7 +302,7 @@ (let ([pos (cdr (assoc-iter-pos i))]) (if (null? pos) #f - (make-assoc-iter d pos)))] + (assoc-iter d pos)))] [(dict-struct? d) ((get-dict-iterate-next (dict-struct-ref d)) d i)] [(assoc? d) (raise-mismatch-error @@ -409,7 +409,7 @@ ;; ---------------------------------------- -(define-struct hash-box (key)) +(struct hash-box (key)) (define custom-hash-ref (case-lambda @@ -433,8 +433,8 @@ (let ([table (hash-set (custom-hash-table d) ((custom-hash-make-box d) k) v)]) - (make-immutable-custom-hash table - (custom-hash-make-box d)))) + (immutable-custom-hash table + (custom-hash-make-box d)))) (define (custom-hash-remove! d k) (hash-remove! (custom-hash-table d) @@ -443,8 +443,8 @@ (define (custom-hash-remove d k) (let ([table (hash-remove (custom-hash-table d) ((custom-hash-make-box d) k))]) - (make-immutable-custom-hash table - (custom-hash-make-box d)))) + (immutable-custom-hash table + (custom-hash-make-box d)))) (define (custom-hash-count d) (hash-count (custom-hash-table d))) @@ -461,7 +461,7 @@ (define (custom-hash-iterate-value d i) (hash-iterate-value (custom-hash-table d) i)) -(define-struct custom-hash (table make-box) +(struct custom-hash (table make-box) #:property prop:dict (vector custom-hash-ref custom-hash-set! @@ -482,7 +482,7 @@ (lambda (a recur) (recur (custom-hash-table a))) (lambda (a recur) (recur (custom-hash-table a))))) -(define-struct (immutable-custom-hash custom-hash) () +(struct immutable-custom-hash custom-hash () #:property prop:dict (vector custom-hash-ref #f @@ -510,7 +510,7 @@ (procedure-arity-includes? hash2 1)) (raise-type-error who "procedure (arity 1)" hash2)) (let () - (define-struct (box hash-box) () + (struct box hash-box () #:property prop:equal+hash (list (lambda (a b recur) (=? (hash-box-key a) (hash-box-key b))) @@ -518,16 +518,16 @@ (hash (hash-box-key v))) (lambda (v recur) (hash2 (hash-box-key v))))) - (make-custom-hash table (wrap-make-box make-box))))]) + (make-custom-hash table (wrap-make-box box))))]) (let ([make-custom-hash (lambda (=? hash [hash2 (lambda (v) 10001)]) - (mk hash hash2 =? 'make-custom-hash make-custom-hash (make-hash) values))] + (mk hash hash2 =? 'make-custom-hash custom-hash (make-hash) values))] [make-immutable-custom-hash (lambda (=? hash [hash2 (lambda (v) 10001)]) - (mk hash hash2 =? 'make-immutable-custom-hash make-immutable-custom-hash #hash() values))] + (mk hash hash2 =? 'make-immutable-custom-hash immutable-custom-hash #hash() values))] [make-weak-custom-hash (lambda (=? hash [hash2 (lambda (v) 10001)]) - (mk hash hash2 =? 'make-weak-custom-hash make-custom-hash (make-weak-hash) + (mk hash hash2 =? 'make-weak-custom-hash custom-hash (make-weak-hash) (lambda (make-box) (let ([ht (make-weak-hasheq)]) (lambda (v) diff --git a/collects/scheme/enter.ss b/collects/racket/enter.rkt similarity index 87% rename from collects/scheme/enter.ss rename to collects/racket/enter.rkt index 49af9fbd7b..5e2680b86d 100644 --- a/collects/scheme/enter.ss +++ b/collects/racket/enter.rkt @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (require syntax/modcode - (for-syntax scheme/base)) + (for-syntax racket/base)) (provide enter!) @@ -29,10 +29,10 @@ (enter-require mod) (let ([ns (module->namespace mod)]) (current-namespace ns) - (namespace-require 'scheme/enter))) + (namespace-require 'racket/enter))) (current-namespace orig-namespace))) -(define-struct mod (name timestamp depends)) +(struct mod (name timestamp depends)) (define loaded (make-hash)) @@ -66,13 +66,13 @@ (or (current-load-relative-directory) (current-directory)))))]) ;; Record module timestamp and dependencies: - (let ([mod (make-mod name - (get-timestamp path) - (if code - (apply append - (map cdr (module-compiled-imports code))) - null))]) - (hash-set! loaded path mod)) + (let ([a-mod (mod name + (get-timestamp path) + (if code + (apply append + (map cdr (module-compiled-imports code))) + null))]) + (hash-set! loaded path a-mod)) ;; Evaluate the module: (eval code)) ;; Not a module: diff --git a/collects/scheme/fasl.ss b/collects/racket/fasl.rkt similarity index 97% rename from collects/scheme/fasl.ss rename to collects/racket/fasl.rkt index e996342a1d..7d157b5aeb 100644 --- a/collects/scheme/fasl.ss +++ b/collects/racket/fasl.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide s-exp->fasl fasl->s-exp) diff --git a/collects/scheme/file.ss b/collects/racket/file.rkt similarity index 99% rename from collects/scheme/file.ss rename to collects/racket/file.rkt index 624746de0c..522b93f167 100644 --- a/collects/scheme/file.ss +++ b/collects/racket/file.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide delete-directory/files copy-directory/files @@ -22,7 +22,7 @@ write-to-file display-lines-to-file) -(require "private/portlines.ss") +(require "private/portlines.rkt") ;; utility: sorted dirlist so functions are deterministic (define (sorted-dirlist [dir (current-directory)]) diff --git a/collects/scheme/fixnum.ss b/collects/racket/fixnum.rkt similarity index 100% rename from collects/scheme/fixnum.ss rename to collects/racket/fixnum.rkt diff --git a/collects/scheme/flonum.ss b/collects/racket/flonum.rkt similarity index 100% rename from collects/scheme/flonum.ss rename to collects/racket/flonum.rkt diff --git a/collects/scheme/foreign.ss b/collects/racket/foreign.rkt similarity index 99% rename from collects/scheme/foreign.ss rename to collects/racket/foreign.rkt index 3d7b5b2225..6fc02d0f7d 100644 --- a/collects/scheme/foreign.ss +++ b/collects/racket/foreign.rkt @@ -1,9 +1,9 @@ -#lang scheme/base +#lang racket/base -;; Foreign Scheme interface -(require '#%foreign setup/dirs scheme/unsafe/ops - (for-syntax scheme/base scheme/list syntax/stx - scheme/struct-info)) +;; Foreign Racket interface +(require '#%foreign setup/dirs racket/unsafe/ops + (for-syntax racket/base racket/list syntax/stx + racket/struct-info)) ;; This module is full of unsafe bindings that are not provided to requiring ;; modules. Instead, an `unsafe!' binding is provided that makes these unsafe @@ -70,7 +70,7 @@ _void _int8 _uint8 _int16 _uint16 _int32 _uint32 _int64 _uint64 _fixint _ufixint _fixnum _ufixnum _float _double _double* - _bool _pointer _gcpointer _scheme _fpointer function-ptr + _bool _pointer _gcpointer _scheme (rename-out [_scheme _racket]) _fpointer function-ptr (unsafe memcpy) (unsafe memmove) (unsafe memset) (unsafe malloc-immobile-cell) (unsafe free-immobile-cell)) diff --git a/collects/scheme/function.ss b/collects/racket/function.rkt similarity index 100% rename from collects/scheme/function.ss rename to collects/racket/function.rkt diff --git a/collects/scheme/future/main.ss b/collects/racket/future.rkt similarity index 84% rename from collects/scheme/future/main.ss rename to collects/racket/future.rkt index 4f8a051af2..ac13738a55 100644 --- a/collects/scheme/future/main.ss +++ b/collects/racket/future.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require '#%futures) (provide future? diff --git a/collects/scheme/generator.ss b/collects/racket/generator.rkt similarity index 97% rename from collects/scheme/generator.ss rename to collects/racket/generator.rkt index 6ad3a93259..2db0bd0014 100644 --- a/collects/scheme/generator.ss +++ b/collects/racket/generator.rkt @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) - scheme/control - scheme/stxparam scheme/splicing) +(require (for-syntax racket/base) + racket/control + racket/stxparam racket/splicing) (provide yield generator generator-state in-generator infinite-generator sequence->generator sequence->repeated-generator) diff --git a/collects/racket/gui.rkt b/collects/racket/gui.rkt new file mode 100644 index 0000000000..58531f4786 --- /dev/null +++ b/collects/racket/gui.rkt @@ -0,0 +1,4 @@ +(module gui racket + (require racket/gui/base) + (provide (all-from-out racket) + (all-from-out racket/gui/base))) diff --git a/collects/scheme/gui/base.ss b/collects/racket/gui/base.rkt similarity index 100% rename from collects/scheme/gui/base.ss rename to collects/racket/gui/base.rkt diff --git a/collects/scheme/gui/dynamic.ss b/collects/racket/gui/dynamic.rkt similarity index 100% rename from collects/scheme/gui/dynamic.ss rename to collects/racket/gui/dynamic.rkt diff --git a/collects/scheme/gui/init.ss b/collects/racket/gui/init.rkt similarity index 100% rename from collects/scheme/gui/init.ss rename to collects/racket/gui/init.rkt diff --git a/collects/racket/gui/lang/reader.ss b/collects/racket/gui/lang/reader.ss new file mode 100644 index 0000000000..48151efe84 --- /dev/null +++ b/collects/racket/gui/lang/reader.ss @@ -0,0 +1,2 @@ +#lang s-exp syntax/module-reader +racket/gui diff --git a/collects/racket/gui/lang/reader.ss~ b/collects/racket/gui/lang/reader.ss~ new file mode 100644 index 0000000000..186a775bcc --- /dev/null +++ b/collects/racket/gui/lang/reader.ss~ @@ -0,0 +1,2 @@ +#lang s-exp syntax/module-reader +scheme/gui diff --git a/collects/scheme/help.ss b/collects/racket/help.rkt similarity index 97% rename from collects/scheme/help.ss rename to collects/racket/help.rkt index 60154ee771..c99eb3de6d 100644 --- a/collects/scheme/help.ss +++ b/collects/racket/help.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) scheme/promise) +(require (for-syntax racket/base) racket/promise) (provide help) diff --git a/collects/scheme/include.ss b/collects/racket/include.rkt similarity index 99% rename from collects/scheme/include.ss rename to collects/racket/include.rkt index 72c22ba0c7..78c6022f20 100644 --- a/collects/scheme/include.ss +++ b/collects/racket/include.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base +(require (for-syntax racket/base syntax/stx syntax/path-spec mzlib/private/increader diff --git a/collects/racket/init.ss b/collects/racket/init.rkt similarity index 63% rename from collects/racket/init.ss rename to collects/racket/init.rkt index e7fe38ba60..aa2a545349 100644 --- a/collects/racket/init.ss +++ b/collects/racket/init.rkt @@ -1,7 +1,6 @@ #lang racket -(require scheme/enter - scheme/help - "private/runtime.ss") +(require racket/enter + racket/help) ;; Set the printer: (current-print (let ([pretty-printer @@ -11,5 +10,5 @@ pretty-printer)) (provide (all-from-out racket - scheme/enter - scheme/help)) + racket/enter + racket/help)) diff --git a/collects/scheme/list.ss b/collects/racket/list.rkt similarity index 100% rename from collects/scheme/list.ss rename to collects/racket/list.rkt diff --git a/collects/scheme/load.ss b/collects/racket/load.rkt similarity index 100% rename from collects/scheme/load.ss rename to collects/racket/load.rkt diff --git a/collects/scheme/local.ss b/collects/racket/local.rkt similarity index 100% rename from collects/scheme/local.ss rename to collects/racket/local.rkt diff --git a/collects/racket/main.rkt b/collects/racket/main.rkt new file mode 100644 index 0000000000..c7ff6806d3 --- /dev/null +++ b/collects/racket/main.rkt @@ -0,0 +1,55 @@ +#lang racket/private + +(require racket/base + racket/contract + racket/class + racket/unit + racket/dict + racket/include + racket/pretty + racket/math + racket/match + racket/shared + racket/set + racket/tcp + racket/udp + racket/list + racket/vector + racket/string + racket/function + racket/path + racket/file + racket/port + racket/cmdline + racket/promise + racket/bool + racket/local + racket/nest + (for-syntax racket/base)) + +(provide (all-from-out racket/contract + racket/class + racket/unit + racket/dict + racket/include + racket/pretty + racket/math + racket/match + racket/shared + racket/base + racket/set + racket/tcp + racket/udp + racket/list + racket/vector + racket/string + racket/function + racket/path + racket/file + racket/port + racket/cmdline + racket/promise + racket/bool + racket/local + racket/nest) + (for-syntax (all-from-out racket/base))) diff --git a/collects/racket/main.ss b/collects/racket/main.ss deleted file mode 100644 index 2eccc36ade..0000000000 --- a/collects/racket/main.ss +++ /dev/null @@ -1,8 +0,0 @@ -#lang racket/private -(require (except-in scheme struct struct/ctc) - (only-in mzlib/unit struct~r/ctc) - "private/struct.rkt") - -(provide (all-from-out scheme) - (rename-out [struct~r/ctc struct/ctc]) - struct) diff --git a/collects/scheme/match.ss b/collects/racket/match.rkt similarity index 79% rename from collects/scheme/match.ss rename to collects/racket/match.rkt index cfe1cb2c7c..60c4122df7 100644 --- a/collects/scheme/match.ss +++ b/collects/racket/match.rkt @@ -1,7 +1,7 @@ -#lang scheme/base -(require scheme/match/match - (for-syntax scheme/base)) -(provide (except-out (all-from-out scheme/match/match) +#lang racket/base +(require racket/match/match + (for-syntax racket/base)) +(provide (except-out (all-from-out racket/match/match) define-match-expander) (rename-out [define-match-expander* define-match-expander])) diff --git a/collects/scheme/match/compiler.ss b/collects/racket/match/compiler.ss similarity index 100% rename from collects/scheme/match/compiler.ss rename to collects/racket/match/compiler.ss diff --git a/collects/scheme/match/define-forms.ss b/collects/racket/match/define-forms.ss similarity index 100% rename from collects/scheme/match/define-forms.ss rename to collects/racket/match/define-forms.ss diff --git a/collects/scheme/match/gen-match.ss b/collects/racket/match/gen-match.ss similarity index 100% rename from collects/scheme/match/gen-match.ss rename to collects/racket/match/gen-match.ss diff --git a/collects/scheme/match/legacy-match.ss b/collects/racket/match/legacy-match.ss similarity index 97% rename from collects/scheme/match/legacy-match.ss rename to collects/racket/match/legacy-match.ss index 56910ed05e..527a0dca52 100644 --- a/collects/scheme/match/legacy-match.ss +++ b/collects/racket/match/legacy-match.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require (only-in "runtime.ss" match-equality-test diff --git a/collects/scheme/match/match-expander.ss b/collects/racket/match/match-expander.ss similarity index 100% rename from collects/scheme/match/match-expander.ss rename to collects/racket/match/match-expander.ss diff --git a/collects/scheme/match/match.ss b/collects/racket/match/match.ss similarity index 97% rename from collects/scheme/match/match.ss rename to collects/racket/match/match.ss index d066e23ab3..3ab5265b36 100644 --- a/collects/scheme/match/match.ss +++ b/collects/racket/match/match.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require (only-in "runtime.ss" match-equality-test diff --git a/collects/scheme/match/parse-helper.ss b/collects/racket/match/parse-helper.ss similarity index 100% rename from collects/scheme/match/parse-helper.ss rename to collects/racket/match/parse-helper.ss diff --git a/collects/scheme/match/parse-legacy.ss b/collects/racket/match/parse-legacy.ss similarity index 96% rename from collects/scheme/match/parse-legacy.ss rename to collects/racket/match/parse-legacy.ss index 109fac63cf..6227ffbc4e 100644 --- a/collects/scheme/match/parse-legacy.ss +++ b/collects/racket/match/parse-legacy.ss @@ -1,9 +1,9 @@ -#lang scheme/base +#lang racket/base -(require (for-template scheme/base) +(require (for-template racket/base) syntax/boundmap syntax/stx - scheme/struct-info + racket/struct-info "patterns.ss" "compiler.ss" "parse-helper.ss" diff --git a/collects/scheme/match/parse-quasi.ss b/collects/racket/match/parse-quasi.ss similarity index 100% rename from collects/scheme/match/parse-quasi.ss rename to collects/racket/match/parse-quasi.ss diff --git a/collects/scheme/match/parse.ss b/collects/racket/match/parse.ss similarity index 100% rename from collects/scheme/match/parse.ss rename to collects/racket/match/parse.ss diff --git a/collects/scheme/match/patterns.ss b/collects/racket/match/patterns.ss similarity index 100% rename from collects/scheme/match/patterns.ss rename to collects/racket/match/patterns.ss diff --git a/collects/scheme/match/reorder.ss b/collects/racket/match/reorder.ss similarity index 100% rename from collects/scheme/match/reorder.ss rename to collects/racket/match/reorder.ss diff --git a/collects/scheme/match/runtime.ss b/collects/racket/match/runtime.ss similarity index 90% rename from collects/scheme/match/runtime.ss rename to collects/racket/match/runtime.ss index 6b38c07fbb..2527d0059c 100644 --- a/collects/scheme/match/runtime.ss +++ b/collects/racket/match/runtime.ss @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base -(require scheme/stxparam - (for-syntax scheme/base)) +(require racket/stxparam + (for-syntax racket/base)) (provide match-equality-test exn:misc:match? diff --git a/collects/scheme/match/split-rows.ss b/collects/racket/match/split-rows.ss similarity index 100% rename from collects/scheme/match/split-rows.ss rename to collects/racket/match/split-rows.ss diff --git a/collects/scheme/match/struct.ss b/collects/racket/match/struct.ss similarity index 95% rename from collects/scheme/match/struct.ss rename to collects/racket/match/struct.ss index dc7625a0e9..810c27c25f 100644 --- a/collects/scheme/match/struct.ss +++ b/collects/racket/match/struct.ss @@ -1,9 +1,9 @@ -#lang scheme/base -(require scheme/match/match-expander - (for-syntax scheme/base - scheme/struct-info +#lang racket/base +(require racket/match/match-expander + (for-syntax racket/base + racket/struct-info syntax/boundmap - scheme/list)) + racket/list)) (define-match-expander struct* diff --git a/collects/scheme/math.ss b/collects/racket/math.rkt similarity index 100% rename from collects/scheme/math.ss rename to collects/racket/math.rkt diff --git a/collects/scheme/mpair.ss b/collects/racket/mpair.rkt similarity index 100% rename from collects/scheme/mpair.ss rename to collects/racket/mpair.rkt diff --git a/collects/scheme/nest.ss b/collects/racket/nest.rkt similarity index 100% rename from collects/scheme/nest.ss rename to collects/racket/nest.rkt diff --git a/collects/scheme/package.ss b/collects/racket/package.rkt similarity index 100% rename from collects/scheme/package.ss rename to collects/racket/package.rkt diff --git a/collects/scheme/path.ss b/collects/racket/path.rkt similarity index 100% rename from collects/scheme/path.ss rename to collects/racket/path.rkt diff --git a/collects/scheme/place.ss b/collects/racket/place.rkt similarity index 100% rename from collects/scheme/place.ss rename to collects/racket/place.rkt diff --git a/collects/scheme/port.ss b/collects/racket/port.rkt similarity index 99% rename from collects/scheme/port.ss rename to collects/racket/port.rkt index 030865a589..c59996d298 100644 --- a/collects/scheme/port.ss +++ b/collects/racket/port.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require mzlib/port "private/portlines.ss") diff --git a/collects/scheme/pretty.ss b/collects/racket/pretty.rkt similarity index 94% rename from collects/scheme/pretty.ss rename to collects/racket/pretty.rkt index f471705a96..5682ac6034 100644 --- a/collects/scheme/pretty.ss +++ b/collects/racket/pretty.rkt @@ -9,7 +9,7 @@ ;; require this module and evaluate: ;; (current-print pretty-print-handler) -(module pretty mzscheme +(module pretty racket/base (require mzlib/private/port) (provide pretty-print @@ -64,18 +64,18 @@ (format "length of first list (~a) doesn't match the length of the second list (~a): " (length symbols) (length like-symbols)) like-symbols))) - (let ([ht (if table (pretty-print-style-table-hash table) (make-hash-table))] - [new-ht (make-hash-table)]) - (hash-table-for-each + (let ([ht (if table (pretty-print-style-table-hash table) (make-hasheq))] + [new-ht (make-hasheq)]) + (hash-for-each ht (lambda (key val) - (hash-table-put! new-ht key val))) + (hash-set! new-ht key val))) (for-each (lambda (symbol like-symbol) - (let ((s (hash-table-get ht - like-symbol - (lambda () #f)))) - (hash-table-put! new-ht symbol (or s like-symbol)))) + (let ((s (hash-ref ht + like-symbol + (lambda () #f)))) + (hash-set! new-ht symbol (or s like-symbol)))) symbols like-symbols) (make-pretty-print-style-table new-ht)))) @@ -233,7 +233,7 @@ (define pretty-display (make-pretty-print #t #f)) (define pretty-write (make-pretty-print #f #f)) - (define-struct mark (str def)) + (define-struct mark (str def) #:mutable) (define-struct hide (val)) (define (make-tentative-output-port pport width esc) @@ -323,7 +323,7 @@ void)) p))) - (define printing-ports (make-hash-table 'weak)) + (define printing-ports (make-weak-hasheq)) (define-struct print-port-info (get-content def-box @@ -334,15 +334,15 @@ esc)) (define (register-printing-port p info) - (hash-table-put! printing-ports p (make-ephemeron p info))) + (hash-set! printing-ports p (make-ephemeron p info))) (define (register-printing-port-like p pport) - (hash-table-put! printing-ports p - (make-ephemeron p - (ephemeron-value (hash-table-get printing-ports pport))))) + (hash-set! printing-ports p + (make-ephemeron p + (ephemeron-value (hash-ref printing-ports pport))))) (define (get pport selector) - (let ([e (hash-table-get printing-ports pport (lambda () #f))]) + (let ([e (hash-ref printing-ports pport #f)]) (selector (if e (ephemeron-value e) (make-print-port-info @@ -392,7 +392,8 @@ (begin (write-string " " port) (add-spaces (- n 8) port)) - (write-string " " port 0 n)))) + (write-string " " port 0 n)) + (void))) (define (prefab?! obj v) (let ([d (prefab-struct-key obj)]) @@ -413,7 +414,7 @@ (define mpair-open (if (print-mpair-curly-braces) "{" "(")) (define mpair-close (if (print-mpair-curly-braces) "}" ")")) - (define table (make-hash-table)) ; Hash table for looking for loops + (define table (make-hasheq)) ; Hash table for looking for loops (define show-inexactness? (pretty-print-show-inexactness)) (define exact-as-decimal? (pretty-print-exact-as-decimal)) @@ -459,10 +460,10 @@ (and (custom-write? obj) (not (struct-type? obj))) (and (struct? obj) print-struct?) - (and (hash-table? obj) print-hash-table?)) - (or (hash-table-get table obj (lambda () #f)) + (and (hash? obj) print-hash-table?)) + (or (hash-ref table obj #f) (begin - (hash-table-put! table obj #t) + (hash-set! table obj #t) (let ([cycle (cond [(vector? obj) @@ -485,16 +486,16 @@ [(struct? obj) (ormap loop (vector->list (struct->vector obj)))] - [(hash-table? obj) + [(hash? obj) (let/ec esc - (hash-table-for-each + (hash-for-each obj (lambda (v k) (when (or (loop v) (loop k)) (esc #t)))) #f)])]) - (hash-table-remove! table obj) + (hash-remove! table obj) cycle))))))) (define __dummy__ @@ -508,13 +509,13 @@ (and (custom-write? obj) (not (struct-type? obj))) (and (struct? obj) print-struct?) - (and (hash-table? obj) print-hash-table?)) + (and (hash? obj) print-hash-table?)) ;; A little confusing: use #t for not-found - (let ([p (hash-table-get table obj (lambda () #t))]) + (let ([p (hash-ref table obj #t)]) (when (not (mark? p)) (if p (begin - (hash-table-put! table obj #f) + (hash-set! table obj #f) (cond [(vector? obj) (let ([len (vector-length obj)]) @@ -535,15 +536,16 @@ [(struct? obj) (for-each loop (vector->list (struct->vector obj)))] - [(hash-table? obj) - (hash-table-for-each + [(hash? obj) + (hash-for-each obj (lambda (k v) (loop k) (loop v)))])) (begin - (hash-table-put! table obj - (make-mark #f (box #f))))))))))) + (hash-set! table obj + (make-mark #f (box #f))))))) + (void))))) (define cycle-counter 0) @@ -583,7 +585,7 @@ (lambda (obj pport check? c-k d-k n-k) (let ([ref (and check? found - (hash-table-get found obj (lambda () #f)))]) + (hash-ref found obj #f))]) (if (and ref (unbox (mark-def ref))) (if c-k (c-k (mark-str ref)) @@ -752,7 +754,7 @@ qd))))) (parameterize ([print-struct #f]) ((if display? orig-display orig-write) obj pport)))] - [(hash-table? obj) + [(hash? obj) (if (and print-hash-table? (not (and depth (zero? depth)))) @@ -761,13 +763,13 @@ #f #f (lambda () (let ([qd (to-quoted out qd "`")]) - (out (if (hash-table? obj 'equal) - "#hash" - (if (hash-table? obj 'eqv) + (out (if (hash-eq? obj) + "#hasheq" + (if (hash-eqv? obj) "#hasheqv" - "#hasheq"))) - (wr-lst (hash-table-map obj (lambda (k v) - (cons k (make-hide v)))) + "#hash"))) + (wr-lst (hash-map obj (lambda (k v) + (cons k (make-hide v)))) #f depth pair? car cdr "(" ")" qd)))) (parameterize ([print-hash-table #f]) @@ -840,9 +842,9 @@ (and (custom-write? obj) (not (struct-type? obj))) (and (struct? obj) print-struct?) - (and (hash-table? obj) print-hash-table?)))] + (and (hash? obj) print-hash-table?)))] [graph-ref (if can-multi - (and found (hash-table-get found obj (lambda () #f))) + (and found (hash-ref found obj #f)) #f)] [old-counter cycle-counter]) (if (and can-multi @@ -908,14 +910,14 @@ extra pp-expr #f depth pair? car cdr pair-open pair-close qd)))] - [(hash-table? obj) + [(hash? obj) (let ([qd (to-quoted out qd "`")]) - (out (if (hash-table? obj 'equal) - "#hash" - (if (hash-table? obj 'eqv) + (out (if (hash-eq? obj) + "#hasheq" + (if (hash-eqv? obj) "#hasheqv" - "#hasheq"))) - (pp-list (hash-table-map obj cons) extra pp-expr #f depth + "#hash"))) + (pp-list (hash-map obj cons) extra pp-expr #f depth pair? car cdr pair-open pair-close qd))] [(and (box? obj) print-box?) @@ -931,7 +933,7 @@ qd) (if (and (read-macro? expr apair? acar acdr qd) (equal? open "(") - (not (and found (hash-table-get found (acdr expr) #f)))) + (not (and found (hash-ref found (acdr expr) #f)))) (begin (out (read-macro-prefix expr acar)) (pr (read-macro-body expr acar acdr) @@ -1195,7 +1197,7 @@ (define (no-sharing? expr count apair? acdr) (if (apair? expr) (if (and found - (hash-table-get found (acdr expr) #f)) + (hash-ref found (acdr expr) #f)) #f (or (zero? count) (no-sharing? (acdr expr) (sub1 count) apair? acdr))) @@ -1286,10 +1288,10 @@ (define (look-in-style-table raw-head) (let ([head (do-remap raw-head)]) - (or (hash-table-get (pretty-print-style-table-hash - (pretty-print-current-style-table)) - head - #f) + (or (hash-ref (pretty-print-style-table-hash + (pretty-print-current-style-table)) + head + #f) head))) (define (do-remap raw-head) diff --git a/collects/scheme/base.ss b/collects/racket/private/base.rkt similarity index 63% rename from collects/scheme/base.ss rename to collects/racket/private/base.rkt index 08b90e1867..509a39f2a8 100644 --- a/collects/scheme/base.ss +++ b/collects/racket/private/base.rkt @@ -1,15 +1,16 @@ +(module base "pre-base.rkt" + + (#%require "list.rkt" + "string.rkt" + "stxcase-scheme.rkt" + "qqstx.rkt" + "stx.rkt" + "kw-file.rkt" + "namespace.rkt" + "struct.rkt" + (for-syntax "stxcase-scheme.rkt")) -(module base "private/pre-base.ss" - (#%require "private/list.ss" - "private/string.ss" - "private/stxcase-scheme.ss" - "private/qqstx.ss" - "private/stx.ss" - "private/kw-file.ss" - "private/namespace.ss" - (for-syntax "private/stxcase-scheme.ss")) - - (#%provide (all-from-except "private/pre-base.ss" + (#%provide (all-from-except "pre-base.rkt" open-input-file open-output-file open-input-output-file @@ -18,14 +19,15 @@ with-input-from-file with-output-to-file regexp-replace*) - (all-from "private/list.ss") - (all-from-except "private/string.ss" + struct + (all-from "list.rkt") + (all-from-except "string.rkt" -regexp-replace*) (rename -regexp-replace* regexp-replace*) identifier? - (all-from "private/stxcase-scheme.ss") - (all-from "private/qqstx.ss") - (all-from "private/namespace.ss") + (all-from "stxcase-scheme.rkt") + (all-from "qqstx.rkt") + (all-from "namespace.rkt") (for-syntax syntax-rules syntax-id-rules ... _) (rename -open-input-file open-input-file) (rename -open-output-file open-output-file) @@ -37,7 +39,3 @@ call-with-input-file* call-with-output-file*)) - - - - diff --git a/collects/scheme/private/class-events.ss b/collects/racket/private/class-events.rkt similarity index 96% rename from collects/scheme/private/class-events.ss rename to collects/racket/private/class-events.rkt index 1c049b2f35..d5d0f9a409 100644 --- a/collects/scheme/private/class-events.ss +++ b/collects/racket/private/class-events.rkt @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base - scheme/stxparam)) -(require scheme/stxparam) +(require (for-syntax racket/base + racket/stxparam)) +(require racket/stxparam) (provide current-class-event-handler define-traced diff --git a/collects/scheme/private/class-internal.ss b/collects/racket/private/class-internal.rkt similarity index 99% rename from collects/scheme/private/class-internal.ss rename to collects/racket/private/class-internal.rkt index 7390be0032..e6f495758c 100644 --- a/collects/scheme/private/class-internal.ss +++ b/collects/racket/private/class-internal.rkt @@ -1,14 +1,15 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) +(require (for-syntax racket/base) mzlib/etc - scheme/contract/base - (only-in scheme/contract/private/arrow making-a-method) - scheme/list - scheme/stxparam - "class-events.ss" - "serialize-structs.ss" - (for-syntax scheme/stxparam + racket/contract/base + (only-in racket/contract/private/arrow making-a-method) + racket/list + racket/stxparam + "class-events.rkt" + "serialize-structs.rkt" + "define-struct.rkt" + (for-syntax racket/stxparam syntax/kerncase syntax/stx syntax/name @@ -16,7 +17,7 @@ syntax/define syntax/flatten-begin syntax/private/boundmap - "classidmap.ss")) + "classidmap.rkt")) (define insp (current-inspector)) ; for all opaque structures diff --git a/collects/scheme/private/classidmap.ss b/collects/racket/private/classidmap.rkt similarity index 99% rename from collects/scheme/private/classidmap.ss rename to collects/racket/private/classidmap.rkt index 2ac81a9e92..387400790b 100644 --- a/collects/scheme/private/classidmap.ss +++ b/collects/racket/private/classidmap.rkt @@ -1,8 +1,9 @@ -#lang scheme/base +#lang racket/base (require syntax/stx (for-syntax scheme/base) - (for-template scheme/base "class-events.ss")) + (for-template scheme/base "class-events.rkt") + "define-struct.rkt") (define-values (struct:s!t make-s!t s!t? s!t-ref s!t-set!) (make-struct-type 'set!-transformer #f 2 0 #f null (current-inspector) 0)) diff --git a/collects/scheme/private/cond.ss b/collects/racket/private/cond.rkt similarity index 98% rename from collects/scheme/private/cond.ss rename to collects/racket/private/cond.rkt index f66a9eefdc..6f5a074137 100644 --- a/collects/scheme/private/cond.ss +++ b/collects/racket/private/cond.rkt @@ -3,7 +3,7 @@ ;; cond (module cond '#%kernel - (#%require (for-syntax "stx.ss" "qq-and-or.ss" '#%kernel)) + (#%require (for-syntax "stx.rkt" "qq-and-or.rkt" '#%kernel)) (define-syntaxes (=>) (lambda (stx) diff --git a/collects/scheme/private/define-et-al.ss b/collects/racket/private/define-et-al.rkt similarity index 98% rename from collects/scheme/private/define-et-al.ss rename to collects/racket/private/define-et-al.rkt index ac1e30ded6..1117c763e8 100644 --- a/collects/scheme/private/define-et-al.ss +++ b/collects/racket/private/define-et-al.rkt @@ -3,8 +3,8 @@ ;; -define, when, unless, let/ec, define-struct (module define-et-al '#%kernel - (#%require (for-syntax '#%kernel "stx.ss" "qq-and-or.ss" - "cond.ss")) + (#%require (for-syntax '#%kernel "stx.rkt" "qq-and-or.rkt" + "cond.rkt")) ;; No error checking here, because these macros merely help ;; us write macros before the real define and define-syntax diff --git a/collects/scheme/private/define-struct.ss b/collects/racket/private/define-struct.rkt similarity index 99% rename from collects/scheme/private/define-struct.ss rename to collects/racket/private/define-struct.rkt index c9e06f1e94..5b6046da32 100644 --- a/collects/scheme/private/define-struct.ss +++ b/collects/racket/private/define-struct.rkt @@ -3,11 +3,11 @@ ;; (planet "struct.ss" ("ryanc" "macros.plt" 1 0))) (module define-struct '#%kernel - (#%require "more-scheme.ss" "small-scheme.ss" "define.ss" "../stxparam.ss" - (for-syntax '#%kernel "define.ss" - "stx.ss" "stxcase-scheme.ss" "small-scheme.ss" - "stxloc.ss" "qqstx.ss" - "struct-info.ss")) + (#%require "more-scheme.rkt" "small-scheme.rkt" "define.rkt" "../stxparam.rkt" + (for-syntax '#%kernel "define.rkt" + "stx.rkt" "stxcase-scheme.rkt" "small-scheme.rkt" + "stxloc.rkt" "qqstx.rkt" + "struct-info.rkt")) (#%provide define-struct* define-struct/derived diff --git a/collects/scheme/private/define.ss b/collects/racket/private/define.rkt similarity index 95% rename from collects/scheme/private/define.ss rename to collects/racket/private/define.rkt index 4d0535bc46..9c955c88f3 100644 --- a/collects/scheme/private/define.ss +++ b/collects/racket/private/define.rkt @@ -4,8 +4,8 @@ (module define '#%kernel (#%require (for-syntax '#%kernel - "letstx-scheme.ss" "stxcase-scheme.ss" "stx.ss" "qqstx.ss" - "norm-define.ss")) + "letstx-scheme.rkt" "stxcase-scheme.rkt" "stx.rkt" "qqstx.rkt" + "norm-define.rkt")) (#%provide define define-syntax define-for-syntax begin-for-syntax) diff --git a/collects/scheme/private/ellipses.ss b/collects/racket/private/ellipses.rkt similarity index 100% rename from collects/scheme/private/ellipses.ss rename to collects/racket/private/ellipses.rkt diff --git a/collects/scheme/private/for.ss b/collects/racket/private/for.rkt similarity index 99% rename from collects/scheme/private/for.ss rename to collects/racket/private/for.rkt index 4a58518382..6a95bc7236 100644 --- a/collects/scheme/private/for.ss +++ b/collects/racket/private/for.rkt @@ -1,16 +1,16 @@ (module for '#%kernel - (#%require "more-scheme.ss" - "misc.ss" - "define.ss" - "letstx-scheme.ss" + (#%require "more-scheme.rkt" + "misc.rkt" + "define.rkt" + "letstx-scheme.rkt" '#%unsafe (for-syntax '#%kernel - "stx.ss" - "qqstx.ss" - "define.ss" - "small-scheme.ss" - "stxcase-scheme.ss")) + "stx.rkt" + "qqstx.rkt" + "define.rkt" + "small-scheme.rkt" + "stxcase-scheme.rkt")) (#%provide for/fold for*/fold for for* diff --git a/collects/racket/private/get-info.rkt b/collects/racket/private/get-info.rkt new file mode 100644 index 0000000000..deae59928b --- /dev/null +++ b/collects/racket/private/get-info.rkt @@ -0,0 +1,11 @@ +(module get-info "pre-base.ss" + + (provide get-info) + + (define (get-info data) + (lambda (key default) + (case key + [(configure-runtime) + '(#(racket/private/runtime configure #f))] + [else default])))) + diff --git a/collects/racket/private/get-info.ss b/collects/racket/private/get-info.ss deleted file mode 100644 index 76270ec870..0000000000 --- a/collects/racket/private/get-info.ss +++ /dev/null @@ -1,10 +0,0 @@ -#lang scheme/base - -(provide get-info) - -(define (get-info data) - (lambda (key default) - (case key - [(configure-runtime) - '(#(racket/private/runtime configure #f))] - [else default]))) diff --git a/collects/scheme/private/kernstruct.ss b/collects/racket/private/kernstruct.rkt similarity index 99% rename from collects/scheme/private/kernstruct.ss rename to collects/racket/private/kernstruct.rkt index 37ddcdaf1d..da6e9a620b 100644 --- a/collects/scheme/private/kernstruct.ss +++ b/collects/racket/private/kernstruct.rkt @@ -3,8 +3,8 @@ ;; record for static info produced by structs defined in c (module kernstruct '#%kernel (#%require (for-syntax '#%kernel)) - (#%require "define.ss") - (#%require (for-syntax "struct-info.ss")) + (#%require "define.rkt") + (#%require (for-syntax "struct-info.rkt")) (#%provide (all-defined)) (define-syntax exn (make-struct-info diff --git a/collects/scheme/private/kw-file.ss b/collects/racket/private/kw-file.rkt similarity index 99% rename from collects/scheme/private/kw-file.ss rename to collects/racket/private/kw-file.rkt index 22318e788a..66521ce289 100644 --- a/collects/scheme/private/kw-file.ss +++ b/collects/racket/private/kw-file.rkt @@ -1,5 +1,5 @@ -(module kw-file "pre-base.ss" +(module kw-file "pre-base.rkt" (provide -open-input-file -open-output-file diff --git a/collects/scheme/private/kw.ss b/collects/racket/private/kw.rkt similarity index 99% rename from collects/scheme/private/kw.ss rename to collects/racket/private/kw.rkt index 4d4eb767ca..8febbdb1e9 100644 --- a/collects/scheme/private/kw.ss +++ b/collects/racket/private/kw.rkt @@ -1,15 +1,15 @@ (module kw '#%kernel - (#%require "define.ss" - "small-scheme.ss" - "more-scheme.ss" + (#%require "define.rkt" + "small-scheme.rkt" + "more-scheme.rkt" (for-syntax '#%kernel - "stx.ss" - "small-scheme.ss" - "stxcase-scheme.ss" - "name.ss" - "norm-define.ss" - "qqstx.ss" - "sort.ss")) + "stx.rkt" + "small-scheme.rkt" + "stxcase-scheme.rkt" + "name.rkt" + "norm-define.rkt" + "qqstx.rkt" + "sort.rkt")) (#%provide new-lambda new-λ new-define diff --git a/collects/racket/private/lang/reader.ss b/collects/racket/private/lang/reader.ss index b15c1ae80f..fc10398151 100644 --- a/collects/racket/private/lang/reader.ss +++ b/collects/racket/private/lang/reader.ss @@ -1,5 +1,5 @@ #lang s-exp syntax/module-reader -scheme/base +racket/private/pre-base #:info get-info #:module-info '#(racket/private/get-info get-info #f) diff --git a/collects/scheme/private/letstx-scheme.ss b/collects/racket/private/letstx-scheme.rkt similarity index 83% rename from collects/scheme/private/letstx-scheme.ss rename to collects/racket/private/letstx-scheme.rkt index c29b20a978..5be2e7ab88 100644 --- a/collects/scheme/private/letstx-scheme.ss +++ b/collects/racket/private/letstx-scheme.rkt @@ -3,9 +3,9 @@ ;; #%stxcase-scheme: adds let-syntax, letrec-syntax, etc. (module letstx-scheme '#%kernel - (#%require "small-scheme.ss" "stx.ss" "stxcase.ss" "with-stx.ss" "stxloc.ss" - (for-syntax '#%kernel "small-scheme.ss" "stx.ss" "stxcase.ss" - "with-stx.ss" "stxloc.ss")) + (#%require "small-scheme.rkt" "stx.rkt" "stxcase.rkt" "with-stx.rkt" "stxloc.rkt" + (for-syntax '#%kernel "small-scheme.rkt" "stx.rkt" "stxcase.rkt" + "with-stx.rkt" "stxloc.rkt")) (-define-syntax letrec-syntaxes (lambda (stx) @@ -49,5 +49,5 @@ (let-syntaxes ([(id) expr] ...) body1 body ...))]))) - (#%provide (all-from "small-scheme.ss") - letrec-syntaxes letrec-syntax let-syntaxes let-syntax )) + (#%provide (all-from "small-scheme.rkt") + letrec-syntaxes letrec-syntax let-syntaxes let-syntax)) diff --git a/collects/scheme/private/list.ss b/collects/racket/private/list.rkt similarity index 98% rename from collects/scheme/private/list.ss rename to collects/racket/private/list.rkt index 383e1426b6..a943d07e07 100644 --- a/collects/scheme/private/list.ss +++ b/collects/racket/private/list.rkt @@ -1,5 +1,5 @@ -(module list "pre-base.ss" +(module list "pre-base.rkt" (provide foldl foldr @@ -25,8 +25,8 @@ compose) - (#%require (rename "sort.ss" raw-sort sort) - (for-syntax "stxcase-scheme.ss")) + (#%require (rename "sort.rkt" raw-sort sort) + (for-syntax "stxcase-scheme.rkt")) (provide sort) (define (sort lst less? #:key [getkey #f] #:cache-keys? [cache-keys? #f]) diff --git a/collects/scheme/private/local.ss b/collects/racket/private/local.rkt similarity index 99% rename from collects/scheme/private/local.ss rename to collects/racket/private/local.rkt index 62a4720405..c59cd70e00 100644 --- a/collects/scheme/private/local.ss +++ b/collects/racket/private/local.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require (for-syntax scheme/base) +#lang racket/base +(require (for-syntax racket/base) (for-syntax syntax/context) (for-syntax syntax/kerncase)) (provide (for-syntax do-local)) diff --git a/collects/scheme/private/map.ss b/collects/racket/private/map.rkt similarity index 98% rename from collects/scheme/private/map.ss rename to collects/racket/private/map.rkt index fa19f2edb3..2b163614a7 100644 --- a/collects/scheme/private/map.ss +++ b/collects/racket/private/map.rkt @@ -4,7 +4,7 @@ (module map '#%kernel (#%require '#%utils ; built into mzscheme - "more-scheme.ss" "small-scheme.ss" "define.ss") + "more-scheme.rkt" "small-scheme.rkt" "define.rkt") (#%provide (rename map2 map) (rename for-each2 for-each) diff --git a/collects/scheme/private/misc.ss b/collects/racket/private/misc.rkt similarity index 97% rename from collects/scheme/private/misc.ss rename to collects/racket/private/misc.rkt index 1b7f2049c0..90c2f99542 100644 --- a/collects/scheme/private/misc.ss +++ b/collects/racket/private/misc.rkt @@ -4,8 +4,8 @@ (module misc '#%kernel (#%require '#%utils ; built into mzscheme - "more-scheme.ss" "small-scheme.ss" "define.ss" - (for-syntax '#%kernel "stx.ss" "stxcase-scheme.ss" "stxcase.ss")) + "more-scheme.rkt" "small-scheme.rkt" "define.rkt" + (for-syntax '#%kernel "stx.rkt" "stxcase-scheme.rkt" "stxcase.rkt")) ;; ------------------------------------------------------------------------- diff --git a/collects/scheme/private/modbeg.ss b/collects/racket/private/modbeg.rkt similarity index 100% rename from collects/scheme/private/modbeg.ss rename to collects/racket/private/modbeg.rkt diff --git a/collects/scheme/private/more-scheme.ss b/collects/racket/private/more-scheme.rkt similarity index 98% rename from collects/scheme/private/more-scheme.ss rename to collects/racket/private/more-scheme.rkt index 7b5bcb3bf7..0c32ee0fe0 100644 --- a/collects/scheme/private/more-scheme.ss +++ b/collects/racket/private/more-scheme.rkt @@ -3,8 +3,8 @@ ;; more-scheme : case, do, etc. - remaining syntax (module more-scheme '#%kernel - (#%require "small-scheme.ss" "define.ss" '#%paramz - (for-syntax '#%kernel "stx.ss" "small-scheme.ss" "stxcase-scheme.ss" "qqstx.ss")) + (#%require "small-scheme.rkt" "define.rkt" '#%paramz + (for-syntax '#%kernel "stx.rkt" "small-scheme.rkt" "stxcase-scheme.rkt" "qqstx.rkt")) (define-syntax case-test (lambda (x) diff --git a/collects/scheme/private/name.ss b/collects/racket/private/name.rkt similarity index 93% rename from collects/scheme/private/name.ss rename to collects/racket/private/name.rkt index a597cca7f7..6400d7676c 100644 --- a/collects/scheme/private/name.ss +++ b/collects/racket/private/name.rkt @@ -1,6 +1,6 @@ (module name '#%kernel - (#%require "define.ss" "small-scheme.ss") + (#%require "define.rkt" "small-scheme.rkt") (#%provide syntax-local-infer-name) (define (syntax-local-infer-name stx) diff --git a/collects/scheme/private/namespace.ss b/collects/racket/private/namespace.rkt similarity index 92% rename from collects/scheme/private/namespace.ss rename to collects/racket/private/namespace.rkt index c3d137e56d..c8b87be730 100644 --- a/collects/scheme/private/namespace.ss +++ b/collects/racket/private/namespace.rkt @@ -1,7 +1,7 @@ -(module namespace "pre-base.ss" - (require (for-syntax '#%kernel "define.ss" - "stx.ss" "stxcase-scheme.ss" "small-scheme.ss" - "stxloc.ss")) +(module namespace "pre-base.rkt" + (require (for-syntax '#%kernel "define.rkt" + "stx.rkt" "stxcase-scheme.rkt" "small-scheme.rkt" + "stxloc.rkt")) (provide make-base-empty-namespace make-base-namespace diff --git a/collects/scheme/private/norm-arity.ss b/collects/racket/private/norm-arity.rkt similarity index 98% rename from collects/scheme/private/norm-arity.ss rename to collects/racket/private/norm-arity.rkt index 1d12e4a9db..d1d0e10807 100644 --- a/collects/scheme/private/norm-arity.ss +++ b/collects/racket/private/norm-arity.rkt @@ -1,5 +1,5 @@ (module norm-arity '#%kernel - (#%require "define.ss" "small-scheme.ss" "sort.ss") + (#%require "define.rkt" "small-scheme.rkt" "sort.rkt") (#%provide norm:procedure-arity norm:raise-arity-error normalize-arity) ;; for test suites diff --git a/collects/scheme/private/norm-define.ss b/collects/racket/private/norm-define.rkt similarity index 99% rename from collects/scheme/private/norm-define.ss rename to collects/racket/private/norm-define.rkt index 52ce2ddd4d..cbb835b3f8 100644 --- a/collects/scheme/private/norm-define.ss +++ b/collects/racket/private/norm-define.rkt @@ -1,6 +1,6 @@ (module norm-define '#%kernel - (#%require "small-scheme.ss" "stxcase-scheme.ss" "stx.ss" "qqstx.ss") + (#%require "small-scheme.rkt" "stxcase-scheme.rkt" "stx.rkt" "qqstx.rkt") (#%provide normalize-definition) diff --git a/collects/scheme/private/old-ds.ss b/collects/racket/private/old-ds.rkt similarity index 100% rename from collects/scheme/private/old-ds.ss rename to collects/racket/private/old-ds.rkt diff --git a/collects/scheme/private/old-if.ss b/collects/racket/private/old-if.rkt similarity index 100% rename from collects/scheme/private/old-if.ss rename to collects/racket/private/old-if.rkt diff --git a/collects/scheme/private/old-procs.ss b/collects/racket/private/old-procs.rkt similarity index 96% rename from collects/scheme/private/old-procs.ss rename to collects/racket/private/old-procs.rkt index 7a074fd377..632acb6bbb 100644 --- a/collects/scheme/private/old-procs.ss +++ b/collects/racket/private/old-procs.rkt @@ -1,10 +1,10 @@ (module old-procs '#%kernel - (#%require "small-scheme.ss" - "more-scheme.ss" - "misc.ss" - "stxmz-body.ss" - "define.ss") + (#%require "small-scheme.rkt" + "more-scheme.rkt" + "misc.rkt" + "stxmz-body.rkt" + "define.rkt") (#%provide make-namespace free-identifier=?* diff --git a/collects/scheme/private/old-rp.ss b/collects/racket/private/old-rp.rkt similarity index 96% rename from collects/scheme/private/old-rp.ss rename to collects/racket/private/old-rp.rkt index 2634ece8ff..74f15547f2 100644 --- a/collects/scheme/private/old-rp.ss +++ b/collects/racket/private/old-rp.rkt @@ -1,6 +1,6 @@ (module old-rp '#%kernel - (#%require (for-syntax '#%kernel "stx.ss" "small-scheme.ss" "stxcase-scheme.ss")) + (#%require (for-syntax '#%kernel "stx.rkt" "small-scheme.rkt" "stxcase-scheme.rkt")) (#%provide require require-for-syntax require-for-template require-for-label provide provide-for-syntax provide-for-label) diff --git a/collects/scheme/private/portlines.ss b/collects/racket/private/portlines.rkt similarity index 97% rename from collects/scheme/private/portlines.ss rename to collects/racket/private/portlines.rkt index 9c5fcde121..a9a65a8065 100644 --- a/collects/scheme/private/portlines.ss +++ b/collects/racket/private/portlines.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide port->x-lines check-mode diff --git a/collects/scheme/private/pre-base.ss b/collects/racket/private/pre-base.rkt similarity index 82% rename from collects/scheme/private/pre-base.ss rename to collects/racket/private/pre-base.rkt index 6984f83c59..dfdc37d894 100644 --- a/collects/scheme/private/pre-base.ss +++ b/collects/racket/private/pre-base.rkt @@ -3,18 +3,18 @@ (module pre-base '#%kernel (#%require (for-syntax '#%kernel)) - (#%require "more-scheme.ss" - "misc.ss" - (all-except "define.ss" define) - "letstx-scheme.ss" - "kw.ss" - "define-struct.ss" - "reqprov.ss" - "modbeg.ss" - "for.ss" - "map.ss" ; shadows #%kernel bindings - "kernstruct.ss" - "norm-arity.ss" + (#%require "more-scheme.rkt" + "misc.rkt" + (all-except "define.rkt" define) + "letstx-scheme.rkt" + "kw.rkt" + "define-struct.rkt" + "reqprov.rkt" + "modbeg.rkt" + "for.rkt" + "map.rkt" ; shadows #%kernel bindings + "kernstruct.rkt" + "norm-arity.rkt" '#%builtin) ; so it's attached (define-syntaxes (#%top-interaction) @@ -57,10 +57,10 @@ (keyword-apply proc kws kw-args (apply list* args rest)))) keyword-apply)) - (#%provide (all-from-except "more-scheme.ss" old-case fluid-let) - (all-from "misc.ss") - (all-from "define.ss") - (all-from-except "letstx-scheme.ss" -define -define-syntax -define-struct old-cond) + (#%provide (all-from-except "more-scheme.rkt" old-case fluid-let) + (all-from "misc.rkt") + (all-from "define.rkt") + (all-from-except "letstx-scheme.rkt" -define -define-syntax -define-struct old-cond) (rename new-lambda lambda) (rename new-λ λ) (rename new-define define) @@ -81,9 +81,9 @@ procedure-arity procedure-reduce-arity raise-arity-error procedure->method procedure-rename chaperone-procedure) - (all-from "reqprov.ss") - (all-from "for.ss") - (all-from "kernstruct.ss") + (all-from "reqprov.rkt") + (all-from "for.rkt") + (all-from "kernstruct.rkt") #%top-interaction map for-each andmap ormap diff --git a/collects/scheme/private/promise.ss b/collects/racket/private/promise.rkt similarity index 98% rename from collects/scheme/private/promise.ss rename to collects/racket/private/promise.rkt index f8408c08fb..6b6c5bf697 100644 --- a/collects/scheme/private/promise.ss +++ b/collects/racket/private/promise.rkt @@ -1,9 +1,9 @@ (module promise '#%kernel -(#%require "small-scheme.ss" - "more-scheme.ss" - "define.ss" - (rename "define-struct.ss" define-struct define-struct*) - (for-syntax '#%kernel "stxcase-scheme.ss" "name.ss") +(#%require "small-scheme.rkt" + "more-scheme.rkt" + "define.rkt" + (rename "define-struct.rkt" define-struct define-struct*) + (for-syntax '#%kernel "stxcase-scheme.rkt" "name.rkt") '#%unsafe) (#%provide force promise? promise-forced? promise-running? ;; provided to create extensions diff --git a/collects/scheme/private/qq-and-or.ss b/collects/racket/private/qq-and-or.rkt similarity index 99% rename from collects/scheme/private/qq-and-or.ss rename to collects/racket/private/qq-and-or.rkt index 4cf2ab610c..226dc72022 100644 --- a/collects/scheme/private/qq-and-or.ss +++ b/collects/racket/private/qq-and-or.rkt @@ -3,7 +3,7 @@ ;; quasiquote, and, or (module qq-and-or '#%kernel - (#%require (for-syntax "stx.ss" '#%kernel)) + (#%require (for-syntax "stx.rkt" '#%kernel)) (define-syntaxes (let let* letrec) (let-values ([(lambda-stx) (quote-syntax lambda-stx)] diff --git a/collects/scheme/private/qqstx.ss b/collects/racket/private/qqstx.rkt similarity index 97% rename from collects/scheme/private/qqstx.ss rename to collects/racket/private/qqstx.rkt index d2669d2bc2..d0bcb4dfe9 100644 --- a/collects/scheme/private/qqstx.ss +++ b/collects/racket/private/qqstx.rkt @@ -2,8 +2,8 @@ ;; #%qqstx : quasisyntax (module qqstx '#%kernel - (#%require "small-scheme.ss" "stxcase-scheme.ss" "stx.ss" - (for-syntax '#%kernel "small-scheme.ss" "stxcase-scheme.ss" "stx.ss")) + (#%require "small-scheme.rkt" "stxcase-scheme.rkt" "stx.rkt" + (for-syntax '#%kernel "small-scheme.rkt" "stxcase-scheme.rkt" "stx.rkt")) (#%provide quasisyntax quasisyntax/loc diff --git a/collects/scheme/private/reqprov.ss b/collects/racket/private/reqprov.rkt similarity index 99% rename from collects/scheme/private/reqprov.ss rename to collects/racket/private/reqprov.rkt index bd2c9518d9..180791c81c 100644 --- a/collects/scheme/private/reqprov.ss +++ b/collects/racket/private/reqprov.rkt @@ -1,11 +1,11 @@ (module reqprov '#%kernel - (#%require "more-scheme.ss" "small-scheme.ss" "define.ss" "../stxparam.ss" - (for-syntax '#%kernel "define.ss" - "stx.ss" "stxcase-scheme.ss" "small-scheme.ss" - "stxloc.ss" "qqstx.ss" - "../require-transform.ss" - "../provide-transform.ss" - "struct-info.ss")) + (#%require "more-scheme.rkt" "small-scheme.rkt" "define.rkt" "../stxparam.rkt" + (for-syntax '#%kernel "define.rkt" + "stx.rkt" "stxcase-scheme.rkt" "small-scheme.rkt" + "stxloc.rkt" "qqstx.rkt" + "../require-transform.rkt" + "../provide-transform.rkt" + "struct-info.rkt")) (#%provide lib file planet for-syntax for-template for-label for-meta diff --git a/collects/racket/private/runtime.ss b/collects/racket/private/runtime.rkt similarity index 100% rename from collects/racket/private/runtime.ss rename to collects/racket/private/runtime.rkt diff --git a/collects/scheme/private/sandbox-coverage.ss b/collects/racket/private/sandbox-coverage.rkt similarity index 100% rename from collects/scheme/private/sandbox-coverage.ss rename to collects/racket/private/sandbox-coverage.rkt diff --git a/collects/scheme/private/sc.ss b/collects/racket/private/sc.rkt similarity index 99% rename from collects/scheme/private/sc.ss rename to collects/racket/private/sc.rkt index 04ba3b1dff..9491adca1d 100644 --- a/collects/scheme/private/sc.ss +++ b/collects/racket/private/sc.rkt @@ -3,9 +3,9 @@ ;; based on Shriram's pattern matcher for Zodiac (module sc '#%kernel - (#%require "stx.ss" "small-scheme.ss" + (#%require "stx.rkt" "small-scheme.rkt" (for-template (only '#%kernel set!) - "ellipses.ss")) + "ellipses.rkt")) ;; Checks whether s is "..." (-define (...? s) diff --git a/collects/scheme/private/serialize-structs.ss b/collects/racket/private/serialize-structs.rkt similarity index 61% rename from collects/scheme/private/serialize-structs.ss rename to collects/racket/private/serialize-structs.rkt index 87e87adb12..b2026ddfdd 100644 --- a/collects/scheme/private/serialize-structs.ss +++ b/collects/racket/private/serialize-structs.rkt @@ -1,13 +1,13 @@ -(module serialize-structs mzscheme +(module serialize-structs racket/base ;; Exports just the structre info, which is needed in - ;; "class.ss" (which is, in turn, ultimately required by - ;; "serialize.ss") + ;; "class.rkt" (which is, in turn, ultimately required by + ;; "serialize.rkt") (provide - (protect - (struct serialize-info (vectorizer deserialize-id can-cycle? dir)) - (struct deserialize-info (maker cycle-maker)) + (protect-out + (struct-out serialize-info) + (struct-out deserialize-info) prop:serializable serializable-struct? serializable-info)) (define-struct serialize-info (vectorizer deserialize-id can-cycle? dir)) diff --git a/collects/scheme/private/serialize.ss b/collects/racket/private/serialize.rkt similarity index 99% rename from collects/scheme/private/serialize.ss rename to collects/racket/private/serialize.rkt index bd67fe8879..f52e8b4f3f 100644 --- a/collects/scheme/private/serialize.ss +++ b/collects/racket/private/serialize.rkt @@ -1,4 +1,4 @@ -(module serialize scheme/base +(module serialize racket/base (require syntax/modcollapse "serialize-structs.ss") diff --git a/collects/racket/private/small-scheme.rkt b/collects/racket/private/small-scheme.rkt new file mode 100644 index 0000000000..36c881a617 --- /dev/null +++ b/collects/racket/private/small-scheme.rkt @@ -0,0 +1,11 @@ + +;;---------------------------------------------------------------------- +;; assembles all basic forms we have so far + +(module small-scheme '#%kernel + (#%require "stx.rkt" "qq-and-or.rkt" "cond.rkt" "define-et-al.rkt") + + (#%provide (all-from "qq-and-or.rkt") + (all-from "cond.rkt") + (all-from "define-et-al.rkt"))) + diff --git a/collects/scheme/private/sort.ss b/collects/racket/private/sort.rkt similarity index 98% rename from collects/scheme/private/sort.ss rename to collects/racket/private/sort.rkt index bea358fa20..48457bf1d1 100644 --- a/collects/scheme/private/sort.ss +++ b/collects/racket/private/sort.rkt @@ -1,6 +1,6 @@ (module sort '#%kernel -(#%require "small-scheme.ss" "define.ss" (for-syntax "stxcase-scheme.ss")) +(#%require "small-scheme.rkt" "define.rkt" (for-syntax "stxcase-scheme.rkt")) (#%provide sort) @@ -19,7 +19,7 @@ code. Note that there is no error checking on the arguments -- the `sort' function that this module provide is then wrapped up by a keyworded version in -"scheme/private/list.ss", and that's what everybody sees. The wrapper is +"scheme/private/list.rkt", and that's what everybody sees. The wrapper is doing these checks. |# diff --git a/collects/scheme/private/string.ss b/collects/racket/private/string.rkt similarity index 99% rename from collects/scheme/private/string.ss rename to collects/racket/private/string.rkt index 9b7077b860..784d23ef3d 100644 --- a/collects/scheme/private/string.ss +++ b/collects/racket/private/string.rkt @@ -1,4 +1,4 @@ -(module string "pre-base.ss" +(module string "pre-base.rkt" (provide real->decimal-string regexp-quote @@ -10,7 +10,7 @@ regexp-match-exact? regexp-try-match -regexp-replace*) - (require (for-syntax "stxcase-scheme.ss")) + (require (for-syntax "stxcase-scheme.rkt")) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define (real->decimal-string n [digits 2]) diff --git a/collects/scheme/private/struct-info.ss b/collects/racket/private/struct-info.rkt similarity index 99% rename from collects/scheme/private/struct-info.ss rename to collects/racket/private/struct-info.rkt index 067feef6cb..90954bd2be 100644 --- a/collects/scheme/private/struct-info.ss +++ b/collects/racket/private/struct-info.rkt @@ -3,7 +3,7 @@ ;; record for static info produced by `define-struct' (module struct-info '#%kernel - (#%require "small-scheme.ss") + (#%require "small-scheme.rkt") (#%provide make-struct-info struct-info? diff --git a/collects/racket/private/struct.rkt b/collects/racket/private/struct.rkt index 15a061a5f6..ccb78bb65f 100644 --- a/collects/racket/private/struct.rkt +++ b/collects/racket/private/struct.rkt @@ -1,38 +1,44 @@ -#lang scheme/base -(require (for-syntax scheme/base)) -(provide struct) +(module struct '#%kernel + (#%require "more-scheme.rkt" "small-scheme.rkt" "define.rkt" "../stxparam.rkt" + "define-struct.rkt" + (for-syntax '#%kernel "define.rkt" + "stx.rkt" "stxcase-scheme.rkt" "small-scheme.rkt" + "stxloc.rkt" "qqstx.rkt" + "struct-info.rkt")) -(define-syntax (struct stx) - (define (config-has-name? config) - (cond - [(syntax? config) (config-has-name? (syntax-e config))] - [(pair? config) (or (eq? (syntax-e (car config)) '#:constructor-name) - (config-has-name? (cdr config)))] - [else #f])) - (with-syntax ([orig stx]) - (syntax-case stx () - [(_ id super-id fields . config) - (and (identifier? #'id) - (identifier? #'super-id)) - (if (not (config-has-name? #'config)) - (syntax/loc stx - (define-struct/derived orig (id super-id) fields #:constructor-name id . config)) - (syntax/loc stx - (define-struct/derived orig (id super-id) fields . config)))] - [(_ id fields . config) - (identifier? #'id) - (if (not (config-has-name? #'config)) - (syntax/loc stx - (define-struct/derived orig id fields #:constructor-name id . config)) - (syntax/loc stx - (define-struct/derived orig id fields . config)))] - [(_ id . rest) - (identifier? #'id) - (syntax/loc stx - (define-struct/derived orig id . rest))] - [(_ thing . _) - (raise-syntax-error #f - "expected an identifier for the structure type name" - #'thing - stx)]))) + (#%provide struct) + + (define-syntax (struct stx) + (define (config-has-name? config) + (cond + [(syntax? config) (config-has-name? (syntax-e config))] + [(pair? config) (or (eq? (syntax-e (car config)) '#:constructor-name) + (config-has-name? (cdr config)))] + [else #f])) + (with-syntax ([orig stx]) + (syntax-case stx () + [(_ id super-id fields . config) + (and (identifier? #'id) + (identifier? #'super-id)) + (if (not (config-has-name? #'config)) + (syntax/loc stx + (define-struct/derived orig (id super-id) fields #:constructor-name id . config)) + (syntax/loc stx + (define-struct/derived orig (id super-id) fields . config)))] + [(_ id fields . config) + (identifier? #'id) + (if (not (config-has-name? #'config)) + (syntax/loc stx + (define-struct/derived orig id fields #:constructor-name id . config)) + (syntax/loc stx + (define-struct/derived orig id fields . config)))] + [(_ id . rest) + (identifier? #'id) + (syntax/loc stx + (define-struct/derived orig id . rest))] + [(_ thing . _) + (raise-syntax-error #f + "expected an identifier for the structure type name" + #'thing + stx)])))) diff --git a/collects/scheme/private/stx.ss b/collects/racket/private/stx.rkt similarity index 100% rename from collects/scheme/private/stx.ss rename to collects/racket/private/stx.rkt diff --git a/collects/scheme/private/stxcase-scheme.ss b/collects/racket/private/stxcase-scheme.rkt similarity index 88% rename from collects/scheme/private/stxcase-scheme.ss rename to collects/racket/private/stxcase-scheme.rkt index be7fb0a3dc..585aa4adb5 100644 --- a/collects/scheme/private/stxcase-scheme.ss +++ b/collects/racket/private/stxcase-scheme.rkt @@ -4,9 +4,9 @@ ;; check-duplicate-identifier, and assembles everything we have so far (module stxcase-scheme '#%kernel - (#%require "small-scheme.ss" "stx.ss" "stxcase.ss" "with-stx.ss" "stxloc.ss" - (for-syntax '#%kernel "small-scheme.ss" "stx.ss" "stxcase.ss" "with-stx.ss" - "stxloc.ss")) + (#%require "small-scheme.rkt" "stx.rkt" "stxcase.rkt" "with-stx.rkt" "stxloc.rkt" + (for-syntax '#%kernel "small-scheme.rkt" "stx.rkt" "stxcase.rkt" "with-stx.rkt" + "stxloc.rkt")) (-define (check-duplicate-identifier names) (unless (and (list? names) (andmap identifier? names)) @@ -58,7 +58,7 @@ (pattern (syntax/loc x template)) ...)))))))) - (#%provide syntax (all-from "with-stx.ss") (all-from "stxloc.ss") + (#%provide syntax (all-from "with-stx.rkt") (all-from "stxloc.rkt") check-duplicate-identifier syntax-rules syntax-id-rules (for-syntax syntax-pattern-variable?))) diff --git a/collects/scheme/private/stxcase.ss b/collects/racket/private/stxcase.rkt similarity index 98% rename from collects/scheme/private/stxcase.ss rename to collects/racket/private/stxcase.rkt index 5ca9410a52..1f041ae45b 100644 --- a/collects/scheme/private/stxcase.ss +++ b/collects/racket/private/stxcase.rkt @@ -2,9 +2,9 @@ ;; syntax-case and syntax (module stxcase '#%kernel - (#%require "stx.ss" "small-scheme.ss" '#%paramz - "ellipses.ss" - (for-syntax "stx.ss" "small-scheme.ss" "sc.ss" '#%kernel)) + (#%require "stx.rkt" "small-scheme.rkt" '#%paramz + "ellipses.rkt" + (for-syntax "stx.rkt" "small-scheme.rkt" "sc.rkt" '#%kernel)) (-define (datum->syntax/shape orig datum) (if (syntax? datum) @@ -556,5 +556,5 @@ (cons (quote-syntax list*) r)])))))))))) x))) - (#%provide (all-from "ellipses.ss") syntax-case** syntax + (#%provide (all-from "ellipses.rkt") syntax-case** syntax (for-syntax syntax-pattern-variable?))) diff --git a/collects/scheme/private/stxloc.ss b/collects/racket/private/stxloc.rkt similarity index 94% rename from collects/scheme/private/stxloc.ss rename to collects/racket/private/stxloc.rkt index 0fbb69fa96..9a7f50ecc2 100644 --- a/collects/scheme/private/stxloc.ss +++ b/collects/racket/private/stxloc.rkt @@ -3,8 +3,8 @@ ;; syntax/loc (module stxloc '#%kernel - (#%require "qq-and-or.ss" "stxcase.ss" "define-et-al.ss" - (for-syntax '#%kernel "stxcase.ss" "sc.ss")) + (#%require "qq-and-or.rkt" "stxcase.rkt" "define-et-al.rkt" + (for-syntax '#%kernel "stxcase.rkt" "sc.rkt")) ;; Regular syntax-case (-define-syntax syntax-case* diff --git a/collects/scheme/private/stxmz-body.ss b/collects/racket/private/stxmz-body.rkt similarity index 91% rename from collects/scheme/private/stxmz-body.ss rename to collects/racket/private/stxmz-body.rkt index 8ae50ce800..20e198451e 100644 --- a/collects/scheme/private/stxmz-body.ss +++ b/collects/racket/private/stxmz-body.rkt @@ -2,8 +2,8 @@ ;; mzscheme's `#%module-begin' (module stxmz-body '#%kernel - (#%require "stxcase-scheme.ss" "define.ss" - (for-syntax '#%kernel "stx.ss")) + (#%require "stxcase-scheme.rkt" "define.rkt" + (for-syntax '#%kernel "stx.rkt")) ;; So that expansions print the way the MzScheme programmer expects: (#%require (rename '#%kernel #%plain-module-begin #%module-begin)) diff --git a/collects/scheme/private/stxparam.ss b/collects/racket/private/stxparam.rkt similarity index 82% rename from collects/scheme/private/stxparam.ss rename to collects/racket/private/stxparam.rkt index 0862f4fa49..9a8a372332 100644 --- a/collects/scheme/private/stxparam.ss +++ b/collects/racket/private/stxparam.rkt @@ -1,13 +1,13 @@ (module stxparam '#%kernel - (#%require "more-scheme.ss" - "letstx-scheme.ss" - "define.ss" + (#%require "more-scheme.rkt" + "letstx-scheme.rkt" + "define.rkt" (for-syntax '#%kernel - "../stxparam-exptime.ss" - "stx.ss" "stxcase-scheme.ss" - "small-scheme.ss" - "stxloc.ss" "stxparamkey.ss")) + "../stxparam-exptime.rkt" + "stx.rkt" "stxcase-scheme.rkt" + "small-scheme.rkt" + "stxloc.rkt" "stxparamkey.rkt")) (#%provide (for-syntax do-syntax-parameterize)) diff --git a/collects/scheme/private/stxparamkey.ss b/collects/racket/private/stxparamkey.rkt similarity index 93% rename from collects/scheme/private/stxparamkey.ss rename to collects/racket/private/stxparamkey.rkt index d7adbdee40..a73e33e8be 100644 --- a/collects/scheme/private/stxparamkey.ss +++ b/collects/racket/private/stxparamkey.rkt @@ -1,7 +1,7 @@ (module stxparamkey '#%kernel - (#%require "more-scheme.ss" "small-scheme.ss" "define.ss" - "stxcase.ss" "stxloc.ss" "with-stx.ss") + (#%require "more-scheme.rkt" "small-scheme.rkt" "define.rkt" + "stxcase.rkt" "stxloc.rkt" "with-stx.rkt") (-define-struct wrapped-renamer (renamer)) diff --git a/collects/scheme/private/with-stx.ss b/collects/racket/private/with-stx.rkt similarity index 92% rename from collects/scheme/private/with-stx.ss rename to collects/racket/private/with-stx.rkt index 71bc03b8eb..cb65708160 100644 --- a/collects/scheme/private/with-stx.ss +++ b/collects/racket/private/with-stx.rkt @@ -2,9 +2,9 @@ ;; with-syntax, generate-temporaries (module with-stx '#%kernel - (#%require "stx.ss" "stxloc.ss" "small-scheme.ss" "stxcase.ss" - (for-syntax '#%kernel "stx.ss" "stxcase.ss" "stxloc.ss" - "sc.ss" "qq-and-or.ss" "cond.ss")) + (#%require "stx.rkt" "stxloc.rkt" "small-scheme.rkt" "stxcase.rkt" + (for-syntax '#%kernel "stx.rkt" "stxcase.rkt" "stxloc.rkt" + "sc.rkt" "qq-and-or.rkt" "cond.rkt")) (-define (with-syntax-fail stx) (raise-syntax-error diff --git a/collects/scheme/promise.ss b/collects/racket/promise.rkt similarity index 98% rename from collects/scheme/promise.ss rename to collects/racket/promise.rkt index ab67dd1848..02fce13e0e 100644 --- a/collects/scheme/promise.ss +++ b/collects/racket/promise.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require "private/promise.ss" (for-syntax scheme/base)) +#lang racket/base +(require "private/promise.rkt" (for-syntax racket/base)) (provide delay lazy force promise? promise-forced? promise-running?) ;; ---------------------------------------------------------------------------- diff --git a/collects/scheme/provide-syntax.ss b/collects/racket/provide-syntax.rkt similarity index 100% rename from collects/scheme/provide-syntax.ss rename to collects/racket/provide-syntax.rkt diff --git a/collects/scheme/provide-transform.ss b/collects/racket/provide-transform.rkt similarity index 100% rename from collects/scheme/provide-transform.ss rename to collects/racket/provide-transform.rkt diff --git a/collects/scheme/provide.ss b/collects/racket/provide.rkt similarity index 100% rename from collects/scheme/provide.ss rename to collects/racket/provide.rkt diff --git a/collects/scheme/require-syntax.ss b/collects/racket/require-syntax.rkt similarity index 100% rename from collects/scheme/require-syntax.ss rename to collects/racket/require-syntax.rkt diff --git a/collects/scheme/require-transform.ss b/collects/racket/require-transform.rkt similarity index 100% rename from collects/scheme/require-transform.ss rename to collects/racket/require-transform.rkt diff --git a/collects/scheme/require.ss b/collects/racket/require.rkt similarity index 100% rename from collects/scheme/require.ss rename to collects/racket/require.rkt diff --git a/collects/scheme/runtime-path.ss b/collects/racket/runtime-path.rkt similarity index 100% rename from collects/scheme/runtime-path.ss rename to collects/racket/runtime-path.rkt diff --git a/collects/scheme/sandbox.ss b/collects/racket/sandbox.rkt similarity index 99% rename from collects/scheme/sandbox.ss rename to collects/racket/sandbox.rkt index 9c9547d201..65a6e17dc3 100644 --- a/collects/scheme/sandbox.ss +++ b/collects/racket/sandbox.rkt @@ -545,7 +545,7 @@ (define (evaluate-program program limit-thunk uncovered!) (when uncovered! (parameterize ([current-code-inspector orig-code-inspector]) - (eval `(,#'#%require scheme/private/sandbox-coverage)))) + (eval `(,#'#%require racket/private/sandbox-coverage)))) (let ([ns (syntax-case* program (module) literal-identifier=? [(module mod . body) (identifier? #'mod) diff --git a/collects/scheme/serialize.ss b/collects/racket/serialize.rkt similarity index 98% rename from collects/scheme/serialize.ss rename to collects/racket/serialize.rkt index b413ddefa7..4849b2beec 100644 --- a/collects/scheme/serialize.ss +++ b/collects/racket/serialize.rkt @@ -1,8 +1,8 @@ -(module serialize scheme/base +(module serialize racket/base (require "private/serialize.ss" - (for-syntax scheme/base - scheme/struct-info)) + (for-syntax racket/base + racket/struct-info)) (provide (all-from-out "private/serialize.ss") define-serializable-struct diff --git a/collects/scheme/set.ss b/collects/racket/set.rkt similarity index 100% rename from collects/scheme/set.ss rename to collects/racket/set.rkt diff --git a/collects/scheme/shared.ss b/collects/racket/shared.rkt similarity index 100% rename from collects/scheme/shared.ss rename to collects/racket/shared.rkt diff --git a/collects/scheme/splicing.ss b/collects/racket/splicing.rkt similarity index 100% rename from collects/scheme/splicing.ss rename to collects/racket/splicing.rkt diff --git a/collects/scheme/string.ss b/collects/racket/string.rkt similarity index 100% rename from collects/scheme/string.ss rename to collects/racket/string.rkt diff --git a/collects/scheme/struct-info.ss b/collects/racket/struct-info.rkt similarity index 100% rename from collects/scheme/struct-info.ss rename to collects/racket/struct-info.rkt diff --git a/collects/scheme/stxparam-exptime.ss b/collects/racket/stxparam-exptime.rkt similarity index 100% rename from collects/scheme/stxparam-exptime.ss rename to collects/racket/stxparam-exptime.rkt diff --git a/collects/scheme/stxparam.ss b/collects/racket/stxparam.rkt similarity index 68% rename from collects/scheme/stxparam.ss rename to collects/racket/stxparam.rkt index c9f38e3c9a..d29804154f 100644 --- a/collects/scheme/stxparam.ss +++ b/collects/racket/stxparam.rkt @@ -1,14 +1,14 @@ (module stxparam '#%kernel - (#%require "private/more-scheme.ss" - "private/letstx-scheme.ss" - "private/define.ss" - "private/stxparam.ss" + (#%require "private/more-scheme.rkt" + "private/letstx-scheme.rkt" + "private/define.rkt" + "private/stxparam.rkt" (for-syntax '#%kernel - "stxparam-exptime.ss" - "private/stx.ss" "private/stxcase-scheme.ss" - "private/small-scheme.ss" - "private/stxloc.ss" "private/stxparamkey.ss")) + "stxparam-exptime.rkt" + "private/stx.rkt" "private/stxcase-scheme.rkt" + "private/small-scheme.rkt" + "private/stxloc.rkt" "private/stxparamkey.rkt")) (#%provide define-syntax-parameter syntax-parameterize diff --git a/collects/scheme/surrogate.ss b/collects/racket/surrogate.rkt similarity index 100% rename from collects/scheme/surrogate.ss rename to collects/racket/surrogate.rkt diff --git a/collects/scheme/system.ss b/collects/racket/system.rkt similarity index 100% rename from collects/scheme/system.ss rename to collects/racket/system.rkt diff --git a/collects/scheme/tcp.ss b/collects/racket/tcp.rkt similarity index 100% rename from collects/scheme/tcp.ss rename to collects/racket/tcp.rkt diff --git a/collects/scheme/trace.ss b/collects/racket/trace.rkt similarity index 100% rename from collects/scheme/trace.ss rename to collects/racket/trace.rkt diff --git a/collects/scheme/trait.ss b/collects/racket/trait.rkt similarity index 100% rename from collects/scheme/trait.ss rename to collects/racket/trait.rkt diff --git a/collects/scheme/udp.ss b/collects/racket/udp.rkt similarity index 100% rename from collects/scheme/udp.ss rename to collects/racket/udp.rkt diff --git a/collects/scheme/unit-exptime.ss b/collects/racket/unit-exptime.rkt similarity index 100% rename from collects/scheme/unit-exptime.ss rename to collects/racket/unit-exptime.rkt diff --git a/collects/racket/unit.rkt b/collects/racket/unit.rkt new file mode 100644 index 0000000000..3b465e3037 --- /dev/null +++ b/collects/racket/unit.rkt @@ -0,0 +1,10 @@ + +(module unit racket/base + (require mzlib/unit + racket/contract/base + (for-syntax racket/base + syntax/struct)) + (provide (except-out (all-from-out mzlib/unit) + struct struct/ctc + struct~r struct~r/ctc + struct~s struct~s/ctc))) diff --git a/collects/scheme/unsafe/ops.ss b/collects/racket/unsafe/ops.ss similarity index 100% rename from collects/scheme/unsafe/ops.ss rename to collects/racket/unsafe/ops.ss diff --git a/collects/scheme/vector.ss b/collects/racket/vector.rkt similarity index 99% rename from collects/scheme/vector.ss rename to collects/racket/vector.rkt index 32582f6e00..b1bf40ceb2 100644 --- a/collects/scheme/vector.ss +++ b/collects/racket/vector.rkt @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base (provide vector-copy vector-map vector-map! vector-append vector-take vector-drop vector-split-at vector-take-right vector-drop-right vector-split-at-right vector-filter vector-filter-not vector-count vector-argmin vector-argmax) -(require scheme/unsafe/ops) +(require racket/unsafe/ops) ;; unchecked version of `vector-copy' ;; used at the implementation of many functions in this file @@ -188,7 +188,7 @@ (loop (+ start len) (cdr lens) (cdr vs))))) new-v)) -;; copied from `scheme/list' +;; copied from `racket/list' (define (mk-min cmp name f xs) (unless (and (procedure? f) (procedure-arity-includes? f 1)) diff --git a/collects/scheme/async-channel.rkt b/collects/scheme/async-channel.rkt new file mode 100644 index 0000000000..94fb12ee2a --- /dev/null +++ b/collects/scheme/async-channel.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/async-channel diff --git a/collects/scheme/base.rkt b/collects/scheme/base.rkt new file mode 100644 index 0000000000..4df2ad6ca4 --- /dev/null +++ b/collects/scheme/base.rkt @@ -0,0 +1,3 @@ + +(module base racket/base + (provide (except-out (all-from-out racket/base) struct))) diff --git a/collects/scheme/bool.rkt b/collects/scheme/bool.rkt new file mode 100644 index 0000000000..1443e287b0 --- /dev/null +++ b/collects/scheme/bool.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/bool diff --git a/collects/scheme/class.rkt b/collects/scheme/class.rkt new file mode 100644 index 0000000000..cb278f3b9b --- /dev/null +++ b/collects/scheme/class.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/class diff --git a/collects/scheme/class.ss b/collects/scheme/class.ss deleted file mode 100644 index 55108bbef7..0000000000 --- a/collects/scheme/class.ss +++ /dev/null @@ -1,11 +0,0 @@ -#lang scheme/base - -(require "contract/private/object.ss") -(provide (all-from-out "contract/private/object.ss")) - -;; All of the implementation is actually in private/class-internal.ss, -;; which provides extra (private) functionality to contract.ss. -(require "private/class-internal.ss") - -(provide-public-names) -(provide generic?) diff --git a/collects/scheme/cmdline.rkt b/collects/scheme/cmdline.rkt new file mode 100644 index 0000000000..ce043b9725 --- /dev/null +++ b/collects/scheme/cmdline.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/cmdline diff --git a/collects/scheme/contract.rkt b/collects/scheme/contract.rkt new file mode 100644 index 0000000000..6ea58bc826 --- /dev/null +++ b/collects/scheme/contract.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/contract diff --git a/collects/scheme/control.rkt b/collects/scheme/control.rkt new file mode 100644 index 0000000000..dbdb25f214 --- /dev/null +++ b/collects/scheme/control.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/control diff --git a/collects/scheme/date.rkt b/collects/scheme/date.rkt new file mode 100644 index 0000000000..6bbfcfab83 --- /dev/null +++ b/collects/scheme/date.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/date diff --git a/collects/scheme/dict.rkt b/collects/scheme/dict.rkt new file mode 100644 index 0000000000..bb4e0490e8 --- /dev/null +++ b/collects/scheme/dict.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/dict diff --git a/collects/scheme/enter.rkt b/collects/scheme/enter.rkt new file mode 100644 index 0000000000..68820e4926 --- /dev/null +++ b/collects/scheme/enter.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/enter diff --git a/collects/scheme/exists/lang.ss b/collects/scheme/exists/lang.ss index 9c19ea2c13..e750a8d967 100644 --- a/collects/scheme/exists/lang.ss +++ b/collects/scheme/exists/lang.ss @@ -1,6 +1,6 @@ #lang scheme -(require scheme/contract/exists) +(require racket/contract/exists) ;; this code builds the list of predicates (in case it changes, this may need to be re-run) #; diff --git a/collects/scheme/fasl.rkt b/collects/scheme/fasl.rkt new file mode 100644 index 0000000000..6a982c9584 --- /dev/null +++ b/collects/scheme/fasl.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/fasl diff --git a/collects/scheme/file.rkt b/collects/scheme/file.rkt new file mode 100644 index 0000000000..aaf46487b5 --- /dev/null +++ b/collects/scheme/file.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/file diff --git a/collects/scheme/fixnum.rkt b/collects/scheme/fixnum.rkt new file mode 100644 index 0000000000..58a261c594 --- /dev/null +++ b/collects/scheme/fixnum.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/fixnum diff --git a/collects/scheme/flonum.rkt b/collects/scheme/flonum.rkt new file mode 100644 index 0000000000..96aca4f52e --- /dev/null +++ b/collects/scheme/flonum.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/flonum diff --git a/collects/scheme/foreign.rkt b/collects/scheme/foreign.rkt new file mode 100644 index 0000000000..d3c95b5cba --- /dev/null +++ b/collects/scheme/foreign.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/foreign diff --git a/collects/scheme/function.rkt b/collects/scheme/function.rkt new file mode 100644 index 0000000000..65826b61b8 --- /dev/null +++ b/collects/scheme/function.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/function diff --git a/collects/scheme/future.rkt b/collects/scheme/future.rkt new file mode 100644 index 0000000000..7ff7325e5f --- /dev/null +++ b/collects/scheme/future.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/future diff --git a/collects/scheme/future.ss b/collects/scheme/future.ss deleted file mode 100644 index 56c24aefd8..0000000000 --- a/collects/scheme/future.ss +++ /dev/null @@ -1,3 +0,0 @@ -#lang scheme -(require "future/main.ss") -(provide (all-from-out "future/main.ss")) diff --git a/collects/scheme/generator.rkt b/collects/scheme/generator.rkt new file mode 100644 index 0000000000..2e2faee090 --- /dev/null +++ b/collects/scheme/generator.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/generator diff --git a/collects/scheme/gui.ss b/collects/scheme/gui.rkt similarity index 100% rename from collects/scheme/gui.ss rename to collects/scheme/gui.rkt diff --git a/collects/scheme/gui/base.rkt b/collects/scheme/gui/base.rkt new file mode 100644 index 0000000000..25deaa3701 --- /dev/null +++ b/collects/scheme/gui/base.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/gui/base diff --git a/collects/scheme/gui/dynamic.rkt b/collects/scheme/gui/dynamic.rkt new file mode 100644 index 0000000000..1451364144 --- /dev/null +++ b/collects/scheme/gui/dynamic.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/gui/dynamic diff --git a/collects/scheme/gui/init.rkt b/collects/scheme/gui/init.rkt new file mode 100644 index 0000000000..c56704037d --- /dev/null +++ b/collects/scheme/gui/init.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/gui/init diff --git a/collects/scheme/help.rkt b/collects/scheme/help.rkt new file mode 100644 index 0000000000..b4e17a4a76 --- /dev/null +++ b/collects/scheme/help.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/help diff --git a/collects/scheme/include.rkt b/collects/scheme/include.rkt new file mode 100644 index 0000000000..154d7ddb4f --- /dev/null +++ b/collects/scheme/include.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/include diff --git a/collects/scheme/init.ss b/collects/scheme/init.rkt similarity index 100% rename from collects/scheme/init.ss rename to collects/scheme/init.rkt diff --git a/collects/scheme/list.rkt b/collects/scheme/list.rkt new file mode 100644 index 0000000000..0b334aa833 --- /dev/null +++ b/collects/scheme/list.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/list diff --git a/collects/scheme/load.rkt b/collects/scheme/load.rkt new file mode 100644 index 0000000000..c3a870df30 --- /dev/null +++ b/collects/scheme/load.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/load diff --git a/collects/scheme/local.rkt b/collects/scheme/local.rkt new file mode 100644 index 0000000000..1078d68b54 --- /dev/null +++ b/collects/scheme/local.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/local diff --git a/collects/scheme/main.ss b/collects/scheme/main.rkt similarity index 100% rename from collects/scheme/main.ss rename to collects/scheme/main.rkt diff --git a/collects/scheme/match.rkt b/collects/scheme/match.rkt new file mode 100644 index 0000000000..164a3349e5 --- /dev/null +++ b/collects/scheme/match.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/match diff --git a/collects/scheme/math.rkt b/collects/scheme/math.rkt new file mode 100644 index 0000000000..a7802130d5 --- /dev/null +++ b/collects/scheme/math.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/math diff --git a/collects/scheme/mpair.rkt b/collects/scheme/mpair.rkt new file mode 100644 index 0000000000..fd74621737 --- /dev/null +++ b/collects/scheme/mpair.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/mpair diff --git a/collects/scheme/mzscheme.ss b/collects/scheme/mzscheme.rkt similarity index 76% rename from collects/scheme/mzscheme.ss rename to collects/scheme/mzscheme.rkt index fff161e0c4..43e5bc9f4a 100644 --- a/collects/scheme/mzscheme.ss +++ b/collects/scheme/mzscheme.rkt @@ -2,43 +2,43 @@ ;; mzscheme: provide everything (module mzscheme '#%kernel - (#%require "private/more-scheme.ss" - "private/misc.ss" - "private/letstx-scheme.ss" - "private/stxcase-scheme.ss" - "private/stx.ss" - "private/stxmz-body.ss" - "private/qqstx.ss" - "private/define.ss" - "private/old-ds.ss" - "private/old-rp.ss" - "private/old-if.ss" - "private/old-procs.ss" - "private/map.ss" ; shadows #%kernel bindings - "private/kernstruct.ss" - "private/promise.ss" - (only "private/cond.ss" old-cond) - "tcp.ss" - "udp.ss" + (#%require racket/private/more-scheme + racket/private/misc + racket/private/letstx-scheme + racket/private/stxcase-scheme + racket/private/stx + racket/private/stxmz-body + racket/private/qqstx + racket/private/define + racket/private/old-ds + racket/private/old-rp + racket/private/old-if + racket/private/old-procs + racket/private/map ; shadows #%kernel bindings + racket/private/kernstruct + racket/private/promise + (only racket/private/cond old-cond) + racket/tcp + racket/udp '#%builtin) ; so it's attached (#%provide require require-for-syntax require-for-template require-for-label provide provide-for-syntax provide-for-label - (all-from-except "private/more-scheme.ss" case old-case + (all-from-except racket/private/more-scheme case old-case log-fatal log-error log-warning log-info log-debug hash-update hash-update!) (rename old-case case) - (all-from "private/misc.ss") - (all-from-except "private/stxcase-scheme.ss" _) - (all-from-except "private/letstx-scheme.ss" + (all-from racket/private/misc) + (all-from-except racket/private/stxcase-scheme _) + (all-from-except racket/private/letstx-scheme -define -define-syntax -define-struct cond old-cond else =>) (rename old-cond cond) define-struct let-struct - identifier? ;; from "private/stx.ss" - (all-from "private/qqstx.ss") - (all-from "private/define.ss") - (all-from "private/kernstruct.ss") + identifier? ;; from racket/private/stx + (all-from racket/private/qqstx) + (all-from racket/private/define) + (all-from racket/private/kernstruct) force delay promise? (all-from-except '#%kernel #%module-begin #%datum if make-empty-namespace @@ -95,5 +95,5 @@ (rename #%module-begin #%plain-module-begin) (rename lambda #%plain-lambda) (rename #%app #%plain-app) - (all-from "tcp.ss") - (all-from "udp.ss"))) + (all-from racket/tcp) + (all-from racket/udp))) diff --git a/collects/scheme/nest.rkt b/collects/scheme/nest.rkt new file mode 100644 index 0000000000..6a8caf2fe8 --- /dev/null +++ b/collects/scheme/nest.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/nest diff --git a/collects/scheme/package.rkt b/collects/scheme/package.rkt new file mode 100644 index 0000000000..332c173eda --- /dev/null +++ b/collects/scheme/package.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/package diff --git a/collects/scheme/path.rkt b/collects/scheme/path.rkt new file mode 100644 index 0000000000..6e4662f94c --- /dev/null +++ b/collects/scheme/path.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/path diff --git a/collects/scheme/place.rkt b/collects/scheme/place.rkt new file mode 100644 index 0000000000..4b8b03a5dd --- /dev/null +++ b/collects/scheme/place.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/place diff --git a/collects/scheme/port.rkt b/collects/scheme/port.rkt new file mode 100644 index 0000000000..4291124e20 --- /dev/null +++ b/collects/scheme/port.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/port diff --git a/collects/scheme/pretty.rkt b/collects/scheme/pretty.rkt new file mode 100644 index 0000000000..43ca9c3233 --- /dev/null +++ b/collects/scheme/pretty.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/pretty diff --git a/collects/scheme/private/provider/lang.ss b/collects/scheme/private/provider/lang.ss new file mode 100644 index 0000000000..509fdee928 --- /dev/null +++ b/collects/scheme/private/provider/lang.ss @@ -0,0 +1,7 @@ +#lang racket/base +(provide (rename-out [module-begin #%module-begin])) + +(define-syntax-rule (module-begin mod) + (#%plain-module-begin + (require mod) + (provide (all-from-out mod)))) diff --git a/collects/scheme/private/provider/lang/reader.ss b/collects/scheme/private/provider/lang/reader.ss new file mode 100644 index 0000000000..d6be5751f2 --- /dev/null +++ b/collects/scheme/private/provider/lang/reader.ss @@ -0,0 +1,2 @@ +#lang s-exp syntax/module-reader +scheme/private/provider/lang diff --git a/collects/scheme/private/small-scheme.ss b/collects/scheme/private/small-scheme.ss deleted file mode 100644 index bf4c79f506..0000000000 --- a/collects/scheme/private/small-scheme.ss +++ /dev/null @@ -1,11 +0,0 @@ - -;;---------------------------------------------------------------------- -;; assembles all basic forms we have so far - -(module small-scheme '#%kernel - (#%require "stx.ss" "qq-and-or.ss" "cond.ss" "define-et-al.ss") - - (#%provide (all-from "qq-and-or.ss") - (all-from "cond.ss") - (all-from "define-et-al.ss"))) - diff --git a/collects/scheme/promise.rkt b/collects/scheme/promise.rkt new file mode 100644 index 0000000000..7a87b7a2a6 --- /dev/null +++ b/collects/scheme/promise.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/promise diff --git a/collects/scheme/provide-syntax.rkt b/collects/scheme/provide-syntax.rkt new file mode 100644 index 0000000000..da9b1342ce --- /dev/null +++ b/collects/scheme/provide-syntax.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/provide-syntax diff --git a/collects/scheme/provide-transform.rkt b/collects/scheme/provide-transform.rkt new file mode 100644 index 0000000000..76d501d927 --- /dev/null +++ b/collects/scheme/provide-transform.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/provide-transform diff --git a/collects/scheme/provide.rkt b/collects/scheme/provide.rkt new file mode 100644 index 0000000000..3e29329b94 --- /dev/null +++ b/collects/scheme/provide.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/provide diff --git a/collects/scheme/require-syntax.rkt b/collects/scheme/require-syntax.rkt new file mode 100644 index 0000000000..2753a72a67 --- /dev/null +++ b/collects/scheme/require-syntax.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/require-syntax diff --git a/collects/scheme/require-transform.rkt b/collects/scheme/require-transform.rkt new file mode 100644 index 0000000000..c172cbb51e --- /dev/null +++ b/collects/scheme/require-transform.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/require-transform diff --git a/collects/scheme/require.rkt b/collects/scheme/require.rkt new file mode 100644 index 0000000000..9b258ef21e --- /dev/null +++ b/collects/scheme/require.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/require diff --git a/collects/scheme/runtime-path.rkt b/collects/scheme/runtime-path.rkt new file mode 100644 index 0000000000..1f37b548fa --- /dev/null +++ b/collects/scheme/runtime-path.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/runtime-path diff --git a/collects/scheme/sandbox.rkt b/collects/scheme/sandbox.rkt new file mode 100644 index 0000000000..dead2ecec8 --- /dev/null +++ b/collects/scheme/sandbox.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/sandbox diff --git a/collects/scheme/serialize.rkt b/collects/scheme/serialize.rkt new file mode 100644 index 0000000000..5c356f9d58 --- /dev/null +++ b/collects/scheme/serialize.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/serialize diff --git a/collects/scheme/set.rkt b/collects/scheme/set.rkt new file mode 100644 index 0000000000..eca23dab4b --- /dev/null +++ b/collects/scheme/set.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/set diff --git a/collects/scheme/shared.rkt b/collects/scheme/shared.rkt new file mode 100644 index 0000000000..9a254e619c --- /dev/null +++ b/collects/scheme/shared.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/shared diff --git a/collects/scheme/splicing.rkt b/collects/scheme/splicing.rkt new file mode 100644 index 0000000000..69baca6211 --- /dev/null +++ b/collects/scheme/splicing.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/splicing diff --git a/collects/scheme/string.rkt b/collects/scheme/string.rkt new file mode 100644 index 0000000000..d8bce3d1cc --- /dev/null +++ b/collects/scheme/string.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/string diff --git a/collects/scheme/struct-info.rkt b/collects/scheme/struct-info.rkt new file mode 100644 index 0000000000..c6400e0862 --- /dev/null +++ b/collects/scheme/struct-info.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/struct-info diff --git a/collects/scheme/stxparam-exptime.rkt b/collects/scheme/stxparam-exptime.rkt new file mode 100644 index 0000000000..bed9d51c53 --- /dev/null +++ b/collects/scheme/stxparam-exptime.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/stxparam-exptime diff --git a/collects/scheme/stxparam.rkt b/collects/scheme/stxparam.rkt new file mode 100644 index 0000000000..922695ec8b --- /dev/null +++ b/collects/scheme/stxparam.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/stxparam diff --git a/collects/scheme/surrogate.rkt b/collects/scheme/surrogate.rkt new file mode 100644 index 0000000000..7f79d42c88 --- /dev/null +++ b/collects/scheme/surrogate.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/surrogate diff --git a/collects/scheme/system.rkt b/collects/scheme/system.rkt new file mode 100644 index 0000000000..00eb4e8d5b --- /dev/null +++ b/collects/scheme/system.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/system diff --git a/collects/scheme/tcp.rkt b/collects/scheme/tcp.rkt new file mode 100644 index 0000000000..9a864b8be3 --- /dev/null +++ b/collects/scheme/tcp.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/tcp diff --git a/collects/scheme/trace.rkt b/collects/scheme/trace.rkt new file mode 100644 index 0000000000..35b5e34657 --- /dev/null +++ b/collects/scheme/trace.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/trace diff --git a/collects/scheme/trait.rkt b/collects/scheme/trait.rkt new file mode 100644 index 0000000000..f182a19659 --- /dev/null +++ b/collects/scheme/trait.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/trait diff --git a/collects/scheme/udp.rkt b/collects/scheme/udp.rkt new file mode 100644 index 0000000000..499aa40b21 --- /dev/null +++ b/collects/scheme/udp.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/udp diff --git a/collects/scheme/unit-exptime.rkt b/collects/scheme/unit-exptime.rkt new file mode 100644 index 0000000000..40c3a1ff7c --- /dev/null +++ b/collects/scheme/unit-exptime.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/unit-exptime diff --git a/collects/scheme/unit.ss b/collects/scheme/unit.rkt similarity index 68% rename from collects/scheme/unit.ss rename to collects/scheme/unit.rkt index 342b5812c7..a32063b198 100644 --- a/collects/scheme/unit.ss +++ b/collects/scheme/unit.rkt @@ -1,11 +1,12 @@ -(module unit scheme/base +(module unit racket/base (require mzlib/unit - scheme/contract/base - (for-syntax scheme/base + racket/contract/base + (for-syntax racket/base syntax/struct)) (provide (except-out (all-from-out mzlib/unit) struct struct/ctc + struct~s struct~s/ctc struct~r struct~r/ctc) (rename-out [struct~s struct] [struct~s/ctc struct/ctc]))) diff --git a/collects/scheme/unsafe/ops.rkt b/collects/scheme/unsafe/ops.rkt new file mode 100644 index 0000000000..33af963a7f --- /dev/null +++ b/collects/scheme/unsafe/ops.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/unsafe/ops diff --git a/collects/scheme/vector.rkt b/collects/scheme/vector.rkt new file mode 100644 index 0000000000..4cbf935a38 --- /dev/null +++ b/collects/scheme/vector.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/vector diff --git a/collects/scribblings/reference/class.scrbl b/collects/scribblings/reference/class.scrbl index 0ddebd3cad..0fa70a1852 100644 --- a/collects/scribblings/reference/class.scrbl +++ b/collects/scribblings/reference/class.scrbl @@ -77,7 +77,7 @@ @guideintro["classes"]{classes and objects} -@note-lib[scheme/class #:use-sources (scheme/private/class-internal)] +@note-lib[scheme/class #:use-sources (racket/private/class-internal)] A @deftech{class} specifies diff --git a/collects/scribblings/reference/contracts.scrbl b/collects/scribblings/reference/contracts.scrbl index 01ef221321..343bd3bdf5 100644 --- a/collects/scribblings/reference/contracts.scrbl +++ b/collects/scribblings/reference/contracts.scrbl @@ -17,11 +17,11 @@ another. Programmers specify the behavior of a module exports via @scheme[provide/contract] and the contract system enforces those constraints. -@note-lib[scheme/contract #:use-sources (scheme/contract/private/ds - scheme/contract/private/base - scheme/contract/private/guts - scheme/contract/private/misc - scheme/contract/private/provide)] +@note-lib[scheme/contract #:use-sources (racket/contract/private/ds + racket/contract/private/base + racket/contract/private/guts + racket/contract/private/misc + racket/contract/private/provide)] @deftech{Contracts} come in two forms: those constructed by the various operations listed in this section of the manual, and various diff --git a/collects/scribblings/reference/reference.scrbl b/collects/scribblings/reference/reference.scrbl index 85c2385518..8413d4971a 100644 --- a/collects/scribblings/reference/reference.scrbl +++ b/collects/scribblings/reference/reference.scrbl @@ -37,14 +37,14 @@ language. @defmodulelang*[(scheme/base scheme) ;; Use sources for overlap with `mzscheme': #:use-sources ('#%kernel - scheme/private/more-scheme - scheme/private/misc - scheme/private/qqstx - scheme/private/stxcase-scheme - scheme/private/letstx-scheme - scheme/private/define - scheme/private/stx - scheme/private/map)]{ + racket/private/more-scheme + racket/private/misc + racket/private/qqstx + racket/private/stxcase-scheme + racket/private/letstx-scheme + racket/private/define + racket/private/stx + racket/private/map)]{ Unless otherwise noted, the bindings defined in this manual are exported by the @schememodname[scheme/base] and @schememodname[scheme] diff --git a/collects/scribblings/reference/serialization.scrbl b/collects/scribblings/reference/serialization.scrbl index 7d71d274e1..1361df1d72 100644 --- a/collects/scribblings/reference/serialization.scrbl +++ b/collects/scribblings/reference/serialization.scrbl @@ -8,7 +8,7 @@ @title[#:tag "serialization"]{Serialization} -@note-lib-only[scheme/serialize #:use-sources (scheme/private/serialize)] +@note-lib-only[scheme/serialize #:use-sources (racket/private/serialize)] @defproc[(serializable? [v any/c]) boolean?]{ diff --git a/collects/setup/configtab.ss b/collects/setup/configtab.ss index 27d49d03d5..e60c9162dd 100644 --- a/collects/setup/configtab.ss +++ b/collects/setup/configtab.ss @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base ;; Defines a language to be used by the "config.ss" file -(require scheme/promise - (for-syntax scheme/base)) +(require racket/promise + (for-syntax racket/base)) (provide (rename-out [config-module-begin #%module-begin]) define diff --git a/collects/setup/dirs.ss b/collects/setup/dirs.ss index 12c6bee788..050ecf143e 100644 --- a/collects/setup/dirs.ss +++ b/collects/setup/dirs.ss @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require scheme/promise +(require racket/promise (prefix-in config: config) compiler/private/winutf16 compiler/private/mach-o @@ -184,7 +184,7 @@ (cond [(not rel) #f] ; no framework reference found!? [(regexp-match - #rx#"^(@executable_path/)?(.*?)PLT_M(?:rEd|zScheme).framework" + #rx#"^(@executable_path/)?(.*?)G?Racket.framework" rel) => (lambda (m) (let ([b (caddr m)]) diff --git a/collects/setup/main-collects.ss b/collects/setup/main-collects.ss index b37c0f0d1d..83edc40546 100644 --- a/collects/setup/main-collects.ss +++ b/collects/setup/main-collects.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "dirs.ss" "path-relativize.ss") (provide path->main-collects-relative diff --git a/collects/setup/path-relativize.ss b/collects/setup/path-relativize.ss index d611591e9d..e7364a3541 100644 --- a/collects/setup/path-relativize.ss +++ b/collects/setup/path-relativize.ss @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/promise) +#lang racket/base +(require racket/promise) (provide make-relativize) diff --git a/collects/syntax/define.ss b/collects/syntax/define.ss index 9e56cd349f..844d376b79 100644 --- a/collects/syntax/define.ss +++ b/collects/syntax/define.ss @@ -1,5 +1,5 @@ (module define scheme/base - (require scheme/private/norm-define) + (require racket/private/norm-define) (provide normalize-definition)) diff --git a/collects/syntax/id-table.ss b/collects/syntax/id-table.ss index 0e1f89972e..95ac8b05ed 100644 --- a/collects/syntax/id-table.ss +++ b/collects/syntax/id-table.ss @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (require (for-syntax scheme/base) - scheme/contract/base - scheme/dict + racket/contract/base + racket/dict "private/id-table.ss") #| (provide id-table-position?) diff --git a/collects/syntax/kerncase.ss b/collects/syntax/kerncase.ss index 612c595e62..f03b3b1b8c 100644 --- a/collects/syntax/kerncase.ss +++ b/collects/syntax/kerncase.ss @@ -1,7 +1,7 @@ -(module kerncase scheme/base - (require (for-syntax scheme/base) - (for-template scheme/base)) +(module kerncase racket/base + (require (for-syntax racket/base) + (for-template racket/base)) (define-syntax kernel-syntax-case-internal (lambda (stx) diff --git a/collects/syntax/keyword.ss b/collects/syntax/keyword.ss index f3dfcffbf3..15c8334ea5 100644 --- a/collects/syntax/keyword.ss +++ b/collects/syntax/keyword.ss @@ -1,6 +1,6 @@ -#lang scheme/base -(require scheme/contract/base - scheme/dict +#lang racket/base +(require racket/contract/base + racket/dict "private/keyword.ss") (define optstx (or/c syntax? false/c)) diff --git a/collects/syntax/modcollapse.ss b/collects/syntax/modcollapse.ss index 9a94d274cd..dfab94b126 100644 --- a/collects/syntax/modcollapse.ss +++ b/collects/syntax/modcollapse.ss @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require scheme/contract/base +(require racket/contract/base "private/modcollapse-noctc.ss") (define simple-rel-to-module-path-v/c diff --git a/collects/syntax/modresolve.ss b/collects/syntax/modresolve.ss index 690c640bf2..51da712840 100644 --- a/collects/syntax/modresolve.ss +++ b/collects/syntax/modresolve.ss @@ -1,6 +1,5 @@ - -#lang scheme/base -(require scheme/contract/base +#lang racket/base +(require racket/contract/base "private/modhelp.ss") (define (force-relto relto dir?) diff --git a/collects/syntax/module-reader.ss b/collects/syntax/module-reader.ss index f9dd48aa2e..92aa5d3050 100644 --- a/collects/syntax/module-reader.ss +++ b/collects/syntax/module-reader.ss @@ -1,12 +1,11 @@ -(module module-reader scheme/base - (require syntax/readerr) +(module module-reader racket/private/base + (require syntax/readerr + (for-syntax racket/private/base)) (provide (rename-out [provide-module-reader #%module-begin] [wrap wrap-read-all]) make-meta-reader - (except-out (all-from-out scheme/base) #%module-begin)) - - (require (for-syntax scheme/base)) + (except-out (all-from-out racket/private/base) #%module-begin)) (define ar? procedure-arity-includes?) diff --git a/collects/syntax/name.ss b/collects/syntax/name.ss index cbb7937edb..b03bd2dab7 100644 --- a/collects/syntax/name.ss +++ b/collects/syntax/name.ss @@ -1,4 +1,4 @@ -(module name scheme/base - (require scheme/private/name) +(module name racket/base + (require racket/private/name) (provide syntax-local-infer-name)) diff --git a/collects/syntax/private/boundmap.ss b/collects/syntax/private/boundmap.ss index 4886eb005a..6c41d692ff 100644 --- a/collects/syntax/private/boundmap.ss +++ b/collects/syntax/private/boundmap.ss @@ -1,6 +1,6 @@ -(module boundmap mzscheme - (require mzlib/etc) +(module boundmap racket/base + (require (for-syntax racket/base)) (define-syntax (make-mapping-code stx) (syntax-case stx () @@ -25,31 +25,31 @@ (let ([make-identifier-mapping (lambda () (make-identifier-mapping - (make-hash-table)))]) + (make-hasheq)))]) make-identifier-mapping)) (define identifier-mapping-get - (opt-lambda (bi id [fail (lambda () - (error 'identifier-mapping-get - "no mapping for ~e" - id))]) + (lambda (bi id [fail (lambda () + (error 'identifier-mapping-get + "no mapping for ~e" + id))]) (let ([i (ormap (lambda (i) (and (identifier=? (car i) id) i)) - (hash-table-get (identifier-mapping-ht bi) - (identifier->symbol id) - null))]) + (hash-ref (identifier-mapping-ht bi) + (identifier->symbol id) + null))]) (if i (cdr i) (fail))))) (define identifier-mapping-put! (lambda (bi id v) - (let ([l (hash-table-get + (let ([l (hash-ref (identifier-mapping-ht bi) (identifier->symbol id) null)]) - (hash-table-put! + (hash-set! (identifier-mapping-ht bi) (identifier->symbol id) (let loop ([l l]) @@ -61,11 +61,11 @@ (define identifier-mapping-for-each (lambda (bi f) - (hash-table-for-each (identifier-mapping-ht bi) - (lambda (k v) - (for-each (lambda (i) - (f (car i) (cdr i))) - v))))) + (hash-for-each (identifier-mapping-ht bi) + (lambda (k v) + (for-each (lambda (i) + (f (car i) (cdr i))) + v))))) (define identifier-mapping-map (lambda (bi f) @@ -76,7 +76,7 @@ (set! r (cons (f k v) r)))) (reverse r)))) - (provide (rename mk-identifier-mapping make-identifier-mapping)) + (provide (rename-out [mk-identifier-mapping make-identifier-mapping])) (provide identifier-mapping? identifier-mapping-get identifier-mapping-put! @@ -121,4 +121,4 @@ module-identifier-mapping-put! module-identifier-mapping-for-each module-identifier-mapping-map - module-identifier=?)) + free-identifier=?)) diff --git a/collects/syntax/private/modcollapse-noctc.ss b/collects/syntax/private/modcollapse-noctc.ss index 6285cb3d69..b7724c1806 100644 --- a/collects/syntax/private/modcollapse-noctc.ss +++ b/collects/syntax/private/modcollapse-noctc.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base #| @@ -8,8 +8,8 @@ Use syntax/modcollapse instead. |# -(require scheme/string - scheme/list +(require racket/string + racket/list "modhelp.ss") (define (collapse-module-path s relto-mp) diff --git a/collects/syntax/private/modhelp.ss b/collects/syntax/private/modhelp.ss index fe82aa6d18..d9a2d39fa5 100644 --- a/collects/syntax/private/modhelp.ss +++ b/collects/syntax/private/modhelp.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide explode-relpath-string module-path-v? diff --git a/collects/syntax/private/stxparse/lib.ss b/collects/syntax/private/stxparse/lib.ss index f67c58a9b9..859b0ce874 100644 --- a/collects/syntax/private/stxparse/lib.ss +++ b/collects/syntax/private/stxparse/lib.ss @@ -1,15 +1,15 @@ -#lang scheme/base +#lang racket/base (require "sc.ss" "../util.ss" syntax/stx - scheme/struct-info + racket/struct-info unstable/srcloc - (for-syntax scheme/base + (for-syntax racket/base "rep.ss" (only-in "rep-data.ss" make-literalset)) - (for-template scheme/base - scheme/contract/base)) + (for-template racket/base + racket/contract/base)) (provide identifier boolean diff --git a/collects/syntax/private/stxparse/minimatch.ss b/collects/syntax/private/stxparse/minimatch.ss index bd177143b0..9ebfe9165c 100644 --- a/collects/syntax/private/stxparse/minimatch.ss +++ b/collects/syntax/private/stxparse/minimatch.ss @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base (require unstable/struct - (for-syntax scheme/base scheme/struct-info unstable/struct)) + (for-syntax racket/base racket/struct-info unstable/struct)) (provide match make) (define-syntax (match stx) diff --git a/collects/syntax/private/stxparse/parse.ss b/collects/syntax/private/stxparse/parse.ss index ec5f70cc05..3bb3e9e959 100644 --- a/collects/syntax/private/stxparse/parse.ss +++ b/collects/syntax/private/stxparse/parse.ss @@ -1,6 +1,6 @@ #lang scheme/base (require (for-syntax scheme/base - scheme/private/sc + racket/private/sc syntax/stx syntax/id-table syntax/keyword diff --git a/collects/syntax/private/stxparse/rep-attrs.ss b/collects/syntax/private/stxparse/rep-attrs.ss index 12a2de45eb..4b1a85643e 100644 --- a/collects/syntax/private/stxparse/rep-attrs.ss +++ b/collects/syntax/private/stxparse/rep-attrs.ss @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/contract/base +#lang racket/base +(require racket/contract/base syntax/stx syntax/id-table "../util.ss") diff --git a/collects/syntax/private/stxparse/rep-data.ss b/collects/syntax/private/stxparse/rep-data.ss index 17469b36e6..1f99826c31 100644 --- a/collects/syntax/private/stxparse/rep-data.ss +++ b/collects/syntax/private/stxparse/rep-data.ss @@ -1,6 +1,6 @@ -#lang scheme/base -(require scheme/contract/base - scheme/dict +#lang racket/base +(require racket/contract/base + racket/dict syntax/stx syntax/id-table "../util.ss" diff --git a/collects/syntax/private/stxparse/rep.ss b/collects/syntax/private/stxparse/rep.ss index 0e055c1709..fcabc96e9e 100644 --- a/collects/syntax/private/stxparse/rep.ss +++ b/collects/syntax/private/stxparse/rep.ss @@ -1,9 +1,9 @@ -#lang scheme/base -(require (for-template scheme/base) +#lang racket/base +(require (for-template racket/base) (for-template "runtime.ss") - scheme/contract/base + racket/contract/base "minimatch.ss" - scheme/dict + racket/dict syntax/id-table syntax/stx syntax/keyword diff --git a/collects/syntax/private/stxparse/runtime-prose.ss b/collects/syntax/private/stxparse/runtime-prose.ss index 18bbd221f3..3e1b0eb9ed 100644 --- a/collects/syntax/private/stxparse/runtime-prose.ss +++ b/collects/syntax/private/stxparse/runtime-prose.ss @@ -1,12 +1,12 @@ -#lang scheme/base -(require scheme/contract/base - scheme/list +#lang racket/base +(require racket/contract/base + racket/list "minimatch.ss" - scheme/stxparam + racket/stxparam syntax/stx - (for-syntax scheme/base) + (for-syntax racket/base) (for-syntax syntax/stx) - (for-syntax scheme/private/sc) + (for-syntax racket/private/sc) (for-syntax "rep-data.ss") (for-syntax "../util.ss") "runtime.ss") diff --git a/collects/syntax/private/stxparse/runtime.ss b/collects/syntax/private/stxparse/runtime.ss index 53bcb283a7..38f2389794 100644 --- a/collects/syntax/private/stxparse/runtime.ss +++ b/collects/syntax/private/stxparse/runtime.ss @@ -1,12 +1,12 @@ -#lang scheme/base -(require scheme/contract/base - scheme/stxparam - scheme/list +#lang racket/base +(require racket/contract/base + racket/stxparam + racket/list unstable/struct "minimatch.ss" - (for-syntax scheme/base + (for-syntax racket/base syntax/stx - scheme/private/sc + racket/private/sc "rep-data.ss" "rep-attrs.ss" "../util.ss")) diff --git a/collects/syntax/private/stxparse/sc.ss b/collects/syntax/private/stxparse/sc.ss index 2a50158235..d1e20e55d9 100644 --- a/collects/syntax/private/stxparse/sc.ss +++ b/collects/syntax/private/stxparse/sc.ss @@ -1,12 +1,12 @@ -#lang scheme/base -(require (for-syntax scheme/base - scheme/private/sc +#lang racket/base +(require (for-syntax racket/base + racket/private/sc unstable/syntax unstable/struct "minimatch.ss" "rep-data.ss" "rep.ss") - scheme/list + racket/list syntax/stx "parse.ss" "runtime.ss" diff --git a/collects/syntax/readerr.ss b/collects/syntax/readerr.ss index e62cb216ee..8e352aa382 100644 --- a/collects/syntax/readerr.ss +++ b/collects/syntax/readerr.ss @@ -1,5 +1,5 @@ ; Don't change this module to #lang, since it's used by syntax/module-reader -(module readerr mzscheme +(module readerr racket/private/base (provide raise-read-error raise-read-eof-error) diff --git a/collects/syntax/stx.ss b/collects/syntax/stx.ss index 42d658babf..d57371eee3 100644 --- a/collects/syntax/stx.ss +++ b/collects/syntax/stx.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;; These utilities facilitate operations on syntax objects. ;; A syntax object that represents a parenthesized sequence diff --git a/collects/tests/mzscheme/basic.ss b/collects/tests/mzscheme/basic.ss index 5efd3875a7..0027dd32ac 100644 --- a/collects/tests/mzscheme/basic.ss +++ b/collects/tests/mzscheme/basic.ss @@ -4,7 +4,7 @@ (Section 'basic) (require scheme/flonum - scheme/private/norm-arity) + racket/private/norm-arity) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/collects/tests/mzscheme/contract-test.ss b/collects/tests/mzscheme/contract-test.ss index 6c92ad3761..32bc840fcc 100644 --- a/collects/tests/mzscheme/contract-test.ss +++ b/collects/tests/mzscheme/contract-test.ss @@ -11,7 +11,7 @@ (namespace-require '(for-syntax scheme/base)) (namespace-require '(for-template scheme/base)) (namespace-require 'scheme/contract) - (namespace-require '(only scheme/contract/private/arrow procedure-accepts-and-more?)) + (namespace-require '(only racket/contract/private/arrow procedure-accepts-and-more?)) (namespace-require 'scheme/class) (namespace-require 'scheme/promise)) n)) diff --git a/collects/tests/mzscheme/sandbox.ss b/collects/tests/mzscheme/sandbox.ss index 1a3abd0e8f..31ed64392f 100644 --- a/collects/tests/mzscheme/sandbox.ss +++ b/collects/tests/mzscheme/sandbox.ss @@ -286,8 +286,8 @@ (let* ([tmp (make-temporary-file "sandboxtest~a" 'directory)] [strpath (lambda xs (path->string (apply build-path xs)))] [schemelib (strpath (collection-path "scheme"))] - [list-lib (strpath schemelib "list.ss")] - [list-zo (strpath schemelib "compiled" "list_ss.zo")] + [list-lib (strpath schemelib "list.rkt")] + [list-zo (strpath schemelib "compiled" "list_rkt.zo")] [test-lib (strpath tmp "sandbox-test.ss")] [test-zo (strpath tmp "compiled" "sandbox-test_ss.zo")] [test2-lib (strpath tmp "sandbox-test2.ss")] diff --git a/collects/tests/mzscheme/stx.ss b/collects/tests/mzscheme/stx.ss index 04c2a2054a..3054b366e7 100644 --- a/collects/tests/mzscheme/stx.ss +++ b/collects/tests/mzscheme/stx.ss @@ -479,7 +479,7 @@ (test '('#%kernel case-lambda (lib "scheme/init") case-lambda 0 0 0) identifier-binding* #'case-lambda) -(test '("private/promise.ss" delay* (lib "scheme/init") delay 0 0 0) +(test '("private/promise.rkt" delay* (lib "scheme/init") delay 0 0 0) identifier-binding* #'delay) (test '('#%kernel #%module-begin (lib "scheme/init") #%plain-module-begin 0 0 0) identifier-binding* #'#%plain-module-begin) diff --git a/collects/typed-scheme/private/base-env-indexing-abs.ss b/collects/typed-scheme/private/base-env-indexing-abs.ss index 1676ca26bd..44587b1cf6 100644 --- a/collects/typed-scheme/private/base-env-indexing-abs.ss +++ b/collects/typed-scheme/private/base-env-indexing-abs.ss @@ -12,7 +12,7 @@ (only-in '#%kernel [apply kernel:apply]) scheme/promise scheme/system (only-in string-constants/private/only-once maybe-print-message) - (only-in scheme/match/runtime match:error matchable? match-equality-test) + (only-in racket/match/runtime match:error matchable? match-equality-test) (for-template scheme) (rename-in (types abbrev) [-Number N] [-Boolean B] [-Symbol Sym] [-Nat -Nat*])) diff --git a/collects/typed-scheme/private/base-env-numeric.ss b/collects/typed-scheme/private/base-env-numeric.ss index a7eb9b6326..8790a1e882 100644 --- a/collects/typed-scheme/private/base-env-numeric.ss +++ b/collects/typed-scheme/private/base-env-numeric.ss @@ -11,7 +11,7 @@ (only-in '#%kernel [apply kernel:apply]) scheme/promise scheme/system (only-in string-constants/private/only-once maybe-print-message) - (only-in scheme/match/runtime match:error matchable? match-equality-test) + (only-in racket/match/runtime match:error matchable? match-equality-test) (for-syntax (only-in (types abbrev) [-Number N] [-Boolean B] [-Symbol Sym] [-Real R] [-ExactPositiveInteger -Pos]))) (define-for-syntax all-num-types (list -Pos -Nat -Integer -ExactRational -Flonum -Real N)) diff --git a/collects/typed-scheme/private/base-env.ss b/collects/typed-scheme/private/base-env.ss index 959ea1fb1c..0cab853adb 100644 --- a/collects/typed-scheme/private/base-env.ss +++ b/collects/typed-scheme/private/base-env.ss @@ -12,7 +12,7 @@ scheme/promise scheme/system (only-in string-constants/private/only-once maybe-print-message) (only-in mzscheme make-namespace) - (only-in scheme/match/runtime match:error matchable? match-equality-test) + (only-in racket/match/runtime match:error matchable? match-equality-test) (for-syntax (only-in (types abbrev) [-Number N] [-Boolean B] [-Symbol Sym]) (only-in (rep type-rep) make-HashtableTop make-MPairTop make-BoxTop make-VectorTop))) diff --git a/collects/typed-scheme/private/base-special-env.ss b/collects/typed-scheme/private/base-special-env.ss index b631a4d78c..4ead72b0b9 100644 --- a/collects/typed-scheme/private/base-special-env.ss +++ b/collects/typed-scheme/private/base-special-env.ss @@ -7,7 +7,7 @@ (only-in scheme/list cons? take drop add-between last filter-map) (only-in rnrs/lists-6 fold-left) '#%paramz - (only-in scheme/match/runtime match:error) + (only-in racket/match/runtime match:error) scheme/promise string-constants/string-constant ;(prefix-in ce: test-engine/scheme-tests) diff --git a/collects/typed-scheme/private/with-types.ss b/collects/typed-scheme/private/with-types.ss index 06c550b647..9e0c85dd6d 100644 --- a/collects/typed-scheme/private/with-types.ss +++ b/collects/typed-scheme/private/with-types.ss @@ -9,7 +9,7 @@ "extra-procs.ss" "prims.ss" "base-types.ss" - scheme/contract/regions scheme/contract/base + racket/contract/regions racket/contract/base (for-syntax "base-types-extra.ss" unstable/debug diff --git a/collects/typed-scheme/typecheck/provide-handling.ss b/collects/typed-scheme/typecheck/provide-handling.ss index ecfc7a925e..88eb112698 100644 --- a/collects/typed-scheme/typecheck/provide-handling.ss +++ b/collects/typed-scheme/typecheck/provide-handling.ss @@ -9,7 +9,7 @@ (private typed-renaming) (rep type-rep) (utils tc-utils) - scheme/contract/private/provide unstable/list + racket/contract/private/provide unstable/list unstable/debug unstable/syntax scheme/struct-info scheme/match "def-binding.ss" syntax/parse) diff --git a/collects/typed-scheme/typecheck/tc-app.ss b/collects/typed-scheme/typecheck/tc-app.ss index 75c04c3681..aacdd16277 100644 --- a/collects/typed-scheme/typecheck/tc-app.ss +++ b/collects/typed-scheme/typecheck/tc-app.ss @@ -7,7 +7,7 @@ unstable/sequence ;; fixme - don't need to be bound in this phase - only to make syntax/parse happy scheme/bool - (only-in scheme/private/class-internal make-object do-make-object) + (only-in racket/private/class-internal make-object do-make-object) (only-in '#%kernel [apply k:apply]) ;; end fixme (for-syntax syntax/parse scheme/base (utils tc-utils)) @@ -21,7 +21,7 @@ (for-template (only-in '#%kernel [apply k:apply]) "internal-forms.ss" scheme/base scheme/bool - (only-in scheme/private/class-internal make-object do-make-object))) + (only-in racket/private/class-internal make-object do-make-object))) (import tc-expr^ tc-lambda^ tc-dots^ tc-let^) (export tc-app^) diff --git a/collects/typed-scheme/typecheck/tc-expr-unit.ss b/collects/typed-scheme/typecheck/tc-expr-unit.ss index dbe0f184f4..834aa68f5c 100644 --- a/collects/typed-scheme/typecheck/tc-expr-unit.ss +++ b/collects/typed-scheme/typecheck/tc-expr-unit.ss @@ -12,11 +12,11 @@ (except-in (utils tc-utils stxclass-util)) (env lexical-env) (only-in (env type-environments) lookup current-tvars extend-env) - scheme/private/class-internal + racket/private/class-internal (except-in syntax/parse id) (only-in srfi/1 split-at)) -(require (for-template scheme/base scheme/private/class-internal)) +(require (for-template scheme/base racket/private/class-internal)) (import tc-if^ tc-lambda^ tc-app^ tc-let^ check-subforms^) (export tc-expr^) diff --git a/collects/unstable/dirs.ss b/collects/unstable/dirs.ss index 4ce8a4ea83..9e984c98f5 100644 --- a/collects/unstable/dirs.ss +++ b/collects/unstable/dirs.ss @@ -1,9 +1,9 @@ -#lang scheme/base +#lang racket/base ;; Unstable library by: Carl Eastlund -;; intended for use in scheme/contract, so don't try to add contracts! +;; intended for use in racket/contract, so don't try to add contracts! -(require scheme/dict +(require racket/dict setup/path-relativize setup/dirs (only-in planet/config [CACHE-DIR find-planet-dir])) diff --git a/collects/unstable/location.ss b/collects/unstable/location.ss index 028b820b4d..472aa5aa89 100644 --- a/collects/unstable/location.ss +++ b/collects/unstable/location.ss @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (require unstable/srcloc - (for-syntax scheme/base + (for-syntax racket/base unstable/srcloc unstable/dirs)) diff --git a/collects/unstable/srcloc.ss b/collects/unstable/srcloc.ss index f83d80835a..e48fc8f5cf 100644 --- a/collects/unstable/srcloc.ss +++ b/collects/unstable/srcloc.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;; Unstable library by: Carl Eastlund ;; intended for use in scheme/contract, so don't try to add contracts! diff --git a/collects/unstable/struct.ss b/collects/unstable/struct.ss index 1640c56e77..c6c8ce605f 100644 --- a/collects/unstable/struct.ss +++ b/collects/unstable/struct.ss @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base ;; owner: ryanc -(require (for-syntax scheme/base - scheme/struct-info)) +(require (for-syntax racket/base + racket/struct-info)) (provide make struct->list (for-syntax get-struct-info)) diff --git a/collects/unstable/syntax.ss b/collects/unstable/syntax.ss index 0ad94ddeb0..e9bdaf3190 100644 --- a/collects/unstable/syntax.ss +++ b/collects/unstable/syntax.ss @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base ;; owner: ryanc (require syntax/kerncase syntax/stx unstable/struct - (for-syntax scheme/base - scheme/private/sc) - (for-template scheme/base)) + (for-syntax racket/base + racket/private/sc) + (for-template racket/base)) (provide unwrap-syntax diff --git a/src/racket/src/makeexn b/src/racket/src/makeexn index 562cc93e4a..2ab689797e 100755 --- a/src/racket/src/makeexn +++ b/src/racket/src/makeexn @@ -172,8 +172,8 @@ Not an exception in the above sense: (define (gen-kernstruct filename) (define preamble '(module kernstruct '#%kernel (#%require (for-syntax '#%kernel)) - (#%require "define.ss") - (#%require (for-syntax "struct-info.ss")) + (#%require "define.rkt") + (#%require (for-syntax "struct-info.rkt")) (#%provide (all-defined))))