diff --git a/collects/tests/typed-racket/unit-tests/typecheck-tests.rkt b/collects/tests/typed-racket/unit-tests/typecheck-tests.rkt index 3b740d5f..ab6754e3 100644 --- a/collects/tests/typed-racket/unit-tests/typecheck-tests.rkt +++ b/collects/tests/typed-racket/unit-tests/typecheck-tests.rkt @@ -1,8 +1,8 @@ #lang racket/base (require "test-utils.rkt" - (for-syntax scheme/base) - (for-template scheme/base)) + (for-syntax racket/base) + (for-template racket/base)) (require (private type-annotation parse-type) (except-in (base-env prims diff --git a/collects/typed-racket/base-env/base-env-numeric.rkt b/collects/typed-racket/base-env/base-env-numeric.rkt index fb58fab6..95c15cd1 100644 --- a/collects/typed-racket/base-env/base-env-numeric.rkt +++ b/collects/typed-racket/base-env/base-env-numeric.rkt @@ -1812,7 +1812,7 @@ (varop (Un -PosReal -NegReal) -PosReal) (varop -Real -NonNegReal))] -;; scheme/math +;; racket/math [sgn (cl->* (-Zero . -> . -Zero) (-PosRat . -> . -One) @@ -1937,7 +1937,7 @@ (-val #f)) (-> -Real B))] -;; scheme/fixnum +;; racket/fixnum [fx+ (fx+-type)] [fx- (fx--type)] [fx* (fx*-type)] diff --git a/collects/typed-racket/base-env/base-env.rkt b/collects/typed-racket/base-env/base-env.rkt index bbef85be..1f5a1496 100644 --- a/collects/typed-racket/base-env/base-env.rkt +++ b/collects/typed-racket/base-env/base-env.rkt @@ -13,7 +13,7 @@ (only-in '#%kernel [apply kernel:apply] [reverse kernel:reverse] [memq kernel:memq] [memv kernel:memv] [member kernel:member]) (only-in racket/private/pre-base new-apply-proc) - scheme/promise scheme/system + racket/promise racket/system racket/function racket/mpair racket/base @@ -235,7 +235,7 @@ [prop:equal+hash -Struct-Type-Property] -;; scheme/bool +;; racket/bool [true (-val #t)] [false (-val #f)] [boolean=? (B B . -> . B)] @@ -1353,7 +1353,7 @@ |# -;; scheme/function +;; racket/function [identity (-poly (a) (->acc (list a) a null))] [const (-poly (a) (-> a (->* '() Univ a)))] [negate (-polydots (b) (-> ((list) [b b] . ->... . Univ) @@ -1362,7 +1362,7 @@ (primitive-closure? (-> Univ B)) -;; scheme/cmdline +;; racket/cmdline [parse-command-line (let ([mode-sym (one-of/c 'once-each 'once-any 'multi 'final 'help-labels)]) @@ -1374,7 +1374,7 @@ (-lst -String) . -> . b))))] -;; scheme/list +;; racket/list [filter-map (-polydots (c a b) ((list ((list a) (b b) . ->... . (-opt c)) @@ -1463,7 +1463,7 @@ -;; scheme/path +;; racket/path [explode-path (-SomeSystemPathlike . -> . (-lst (Un -SomeSystemPath (one-of/c 'up 'same))))] [simple-form-path (-Pathlike . -> . -Path)] @@ -1492,7 +1492,7 @@ (->* (list (-lst a)) (-lst a))))] -;; scheme/vector +;; racket/vector [vector-count (-polydots (a b) ((list ((list a) (b b) . ->... . Univ) diff --git a/collects/typed-racket/base-env/colon.rkt b/collects/typed-racket/base-env/colon.rkt index 459806aa..e8f04605 100644 --- a/collects/typed-racket/base-env/colon.rkt +++ b/collects/typed-racket/base-env/colon.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base syntax/parse "internal.rkt" "../utils/tc-utils.rkt") +(require (for-syntax racket/base syntax/parse "internal.rkt" "../utils/tc-utils.rkt") "../typecheck/internal-forms.rkt" (prefix-in t: "base-types-extra.rkt")) diff --git a/collects/typed-racket/base-env/env-lang.rkt b/collects/typed-racket/base-env/env-lang.rkt index 781ec29c..93425065 100644 --- a/collects/typed-racket/base-env/env-lang.rkt +++ b/collects/typed-racket/base-env/env-lang.rkt @@ -2,7 +2,7 @@ (require (rename-in "../utils/utils.rkt" [infer r:infer])) -(require (for-syntax scheme/base syntax/parse) +(require (for-syntax racket/base syntax/parse) (utils tc-utils) (env init-envs) (r:infer infer) diff --git a/collects/typed-racket/env/global-env.rkt b/collects/typed-racket/env/global-env.rkt index 3bb25776..47b851e0 100644 --- a/collects/typed-racket/env/global-env.rkt +++ b/collects/typed-racket/env/global-env.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;; Top-level type environment ;; maps identifiers to their types, updated by mutation diff --git a/collects/typed-racket/env/lexical-env.rkt b/collects/typed-racket/env/lexical-env.rkt index 91c4cec7..391c9406 100644 --- a/collects/typed-racket/env/lexical-env.rkt +++ b/collects/typed-racket/env/lexical-env.rkt @@ -1,9 +1,9 @@ -#lang scheme/base +#lang racket/base ;; this environment maps *lexical* variables to types ;; it also contains the proposition environment -;; these environments are unified in "Logical Types for Scheme" +;; these environments are unified in "Logical Types for Untyped Languages" ;; but split here for performance (require "../utils/utils.rkt" @@ -13,7 +13,7 @@ syntax/id-table racket/keyword-transform racket/list (for-syntax syntax/parse syntax/parse/experimental/contract racket/base) - (only-in scheme/contract ->* -> or/c any/c listof cons/c) + (only-in racket/contract ->* -> or/c any/c listof cons/c) (utils tc-utils mutated-vars) (only-in (rep type-rep) Type/c) (typecheck tc-metafunctions) diff --git a/collects/typed-racket/env/type-alias-env.rkt b/collects/typed-racket/env/type-alias-env.rkt index 1550e556..5d40bfb0 100644 --- a/collects/typed-racket/env/type-alias-env.rkt +++ b/collects/typed-racket/env/type-alias-env.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "../utils/utils.rkt" syntax/boundmap diff --git a/collects/typed-racket/env/type-env-structs.rkt b/collects/typed-racket/env/type-env-structs.rkt index 2b346992..fbf1d8a2 100644 --- a/collects/typed-racket/env/type-env-structs.rkt +++ b/collects/typed-racket/env/type-env-structs.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require scheme/contract unstable/sequence racket/dict syntax/id-table +(require racket/contract unstable/sequence racket/dict syntax/id-table (prefix-in r: "../utils/utils.rkt") racket/match (r:rep filter-rep rep-utils type-rep) unstable/struct (except-in (r:utils tc-utils) make-env)) diff --git a/collects/typed-racket/env/type-name-env.rkt b/collects/typed-racket/env/type-name-env.rkt index d763f392..a1811661 100644 --- a/collects/typed-racket/env/type-name-env.rkt +++ b/collects/typed-racket/env/type-name-env.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "../utils/utils.rkt") (require syntax/boundmap diff --git a/collects/typed-racket/infer/constraint-structs.rkt b/collects/typed-racket/infer/constraint-structs.rkt index 6f7d43c5..f2207d6e 100644 --- a/collects/typed-racket/infer/constraint-structs.rkt +++ b/collects/typed-racket/infer/constraint-structs.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require "../utils/utils.rkt" (rep type-rep) scheme/contract racket/match (for-syntax scheme/base syntax/parse)) +(require "../utils/utils.rkt" (rep type-rep) racket/contract racket/match (for-syntax racket/base syntax/parse)) ;; S, T types ;; X a var diff --git a/collects/typed-racket/infer/constraints.rkt b/collects/typed-racket/infer/constraints.rkt index b7051c38..a811159b 100644 --- a/collects/typed-racket/infer/constraints.rkt +++ b/collects/typed-racket/infer/constraints.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require "../utils/utils.rkt" (types convenience utils union subtype) diff --git a/collects/typed-racket/infer/dmap.rkt b/collects/typed-racket/infer/dmap.rkt index 96db2b2d..54771f85 100644 --- a/collects/typed-racket/infer/dmap.rkt +++ b/collects/typed-racket/infer/dmap.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require "../utils/utils.rkt" "signatures.rkt" "constraint-structs.rkt" diff --git a/collects/typed-racket/infer/promote-demote.rkt b/collects/typed-racket/infer/promote-demote.rkt index 12696a47..60c79b43 100644 --- a/collects/typed-racket/infer/promote-demote.rkt +++ b/collects/typed-racket/infer/promote-demote.rkt @@ -1,10 +1,10 @@ -#lang scheme/unit +#lang racket/unit (require "../utils/utils.rkt") (require (rep type-rep rep-utils) (types convenience union utils) "signatures.rkt" - scheme/list racket/match) + racket/list racket/match) (import) (export promote-demote^) diff --git a/collects/typed-racket/infer/restrict.rkt b/collects/typed-racket/infer/restrict.rkt index 2592eb87..0800ca5c 100644 --- a/collects/typed-racket/infer/restrict.rkt +++ b/collects/typed-racket/infer/restrict.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require "../utils/utils.rkt") (require (rep type-rep) diff --git a/collects/typed-racket/optimizer/apply.rkt b/collects/typed-racket/optimizer/apply.rkt index 81925601..6b2de4f0 100644 --- a/collects/typed-racket/optimizer/apply.rkt +++ b/collects/typed-racket/optimizer/apply.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base (require syntax/parse - (for-template scheme/unsafe/ops racket/base (prefix-in k: '#%kernel)) + (for-template racket/unsafe/ops racket/base (prefix-in k: '#%kernel)) "../utils/utils.rkt" (utils tc-utils) (optimizer utils logging)) diff --git a/collects/typed-racket/optimizer/box.rkt b/collects/typed-racket/optimizer/box.rkt index a5e15b5b..2aa95aa7 100644 --- a/collects/typed-racket/optimizer/box.rkt +++ b/collects/typed-racket/optimizer/box.rkt @@ -1,9 +1,9 @@ -#lang scheme/base +#lang racket/base (require syntax/parse unstable/syntax racket/match "../utils/utils.rkt" - (for-template scheme/base scheme/unsafe/ops) + (for-template racket/base racket/unsafe/ops) (utils tc-utils) (rep type-rep) (types type-table utils) diff --git a/collects/typed-racket/optimizer/dead-code.rkt b/collects/typed-racket/optimizer/dead-code.rkt index da14192d..bd514255 100644 --- a/collects/typed-racket/optimizer/dead-code.rkt +++ b/collects/typed-racket/optimizer/dead-code.rkt @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (require syntax/parse - (for-template scheme/base racket/flonum racket/fixnum) + (for-template racket/base racket/flonum racket/fixnum) "../utils/utils.rkt" (types type-table) (utils tc-utils) diff --git a/collects/typed-racket/optimizer/fixnum.rkt b/collects/typed-racket/optimizer/fixnum.rkt index 0bfa01dd..9046ab64 100644 --- a/collects/typed-racket/optimizer/fixnum.rkt +++ b/collects/typed-racket/optimizer/fixnum.rkt @@ -1,8 +1,8 @@ -#lang scheme +#lang racket/base -(require syntax/parse +(require syntax/parse racket/dict "../utils/utils.rkt" - (for-template scheme/base scheme/fixnum scheme/unsafe/ops) + (for-template racket/base racket/fixnum racket/unsafe/ops) (utils tc-utils) (types numeric-tower) (optimizer utils logging)) diff --git a/collects/typed-racket/optimizer/float-complex.rkt b/collects/typed-racket/optimizer/float-complex.rkt index 0ce34696..b05872be 100644 --- a/collects/typed-racket/optimizer/float-complex.rkt +++ b/collects/typed-racket/optimizer/float-complex.rkt @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base -(require syntax/parse syntax/id-table scheme/dict unstable/syntax +(require syntax/parse syntax/id-table racket/dict unstable/syntax "../utils/utils.rkt" racket/unsafe/ops - (for-template scheme/base scheme/math racket/flonum scheme/unsafe/ops) + (for-template racket/base racket/math racket/flonum racket/unsafe/ops) (utils tc-utils) (types numeric-tower) (optimizer utils numeric-utils logging float)) diff --git a/collects/typed-racket/optimizer/float.rkt b/collects/typed-racket/optimizer/float.rkt index 49149030..e1e1b8ec 100644 --- a/collects/typed-racket/optimizer/float.rkt +++ b/collects/typed-racket/optimizer/float.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require syntax/parse racket/dict racket/flonum diff --git a/collects/typed-racket/optimizer/number.rkt b/collects/typed-racket/optimizer/number.rkt index 3aecb681..7267d264 100644 --- a/collects/typed-racket/optimizer/number.rkt +++ b/collects/typed-racket/optimizer/number.rkt @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (require syntax/parse - (for-template scheme/base) + (for-template racket/base) "../utils/utils.rkt" (utils tc-utils) (optimizer utils logging)) diff --git a/collects/typed-racket/optimizer/optimizer.rkt b/collects/typed-racket/optimizer/optimizer.rkt index 66bd56b2..17f5bfa5 100644 --- a/collects/typed-racket/optimizer/optimizer.rkt +++ b/collects/typed-racket/optimizer/optimizer.rkt @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base (require syntax/parse unstable/syntax racket/pretty - (for-template scheme/base) + (for-template racket/base) "../utils/utils.rkt" (optimizer utils logging number fixnum float float-complex vector string list pair diff --git a/collects/typed-racket/optimizer/pair.rkt b/collects/typed-racket/optimizer/pair.rkt index 24d2bccd..b500cb84 100644 --- a/collects/typed-racket/optimizer/pair.rkt +++ b/collects/typed-racket/optimizer/pair.rkt @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base (require syntax/parse unstable/syntax racket/match - (for-template scheme/base scheme/unsafe/ops racket/list) + (for-template racket/base racket/unsafe/ops racket/list) "../utils/utils.rkt" (utils tc-utils) (rep type-rep) diff --git a/collects/typed-racket/optimizer/sequence.rkt b/collects/typed-racket/optimizer/sequence.rkt index 71c99363..08241833 100644 --- a/collects/typed-racket/optimizer/sequence.rkt +++ b/collects/typed-racket/optimizer/sequence.rkt @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base (require syntax/parse racket/match - (for-template scheme/base scheme/unsafe/ops) + (for-template racket/base racket/unsafe/ops) "../utils/utils.rkt" "../utils/tc-utils.rkt" (rep type-rep) (types abbrev type-table utils) diff --git a/collects/typed-racket/optimizer/string.rkt b/collects/typed-racket/optimizer/string.rkt index 974180ec..04f2d259 100644 --- a/collects/typed-racket/optimizer/string.rkt +++ b/collects/typed-racket/optimizer/string.rkt @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (require syntax/parse - (for-template scheme/base scheme/unsafe/ops) + (for-template racket/base racket/unsafe/ops) "../utils/utils.rkt" (utils tc-utils) (types abbrev) diff --git a/collects/typed-racket/optimizer/struct.rkt b/collects/typed-racket/optimizer/struct.rkt index 394d19c6..c0f9a031 100644 --- a/collects/typed-racket/optimizer/struct.rkt +++ b/collects/typed-racket/optimizer/struct.rkt @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (require syntax/parse unstable/syntax - (for-template scheme/base scheme/unsafe/ops) + (for-template racket/base racket/unsafe/ops) "../utils/utils.rkt" (utils tc-utils) (types type-table) diff --git a/collects/typed-racket/optimizer/unboxed-let.rkt b/collects/typed-racket/optimizer/unboxed-let.rkt index 6ffcdb80..a8047563 100644 --- a/collects/typed-racket/optimizer/unboxed-let.rkt +++ b/collects/typed-racket/optimizer/unboxed-let.rkt @@ -1,10 +1,10 @@ -#lang scheme/base +#lang racket/base (require syntax/parse unstable/syntax - scheme/list scheme/dict racket/match + racket/list racket/dict racket/match "../utils/utils.rkt" "../utils/tc-utils.rkt" - (for-template scheme/base) + (for-template racket/base) (types numeric-tower utils type-table) (rep type-rep) (optimizer utils logging float-complex)) diff --git a/collects/typed-racket/optimizer/vector.rkt b/collects/typed-racket/optimizer/vector.rkt index db97e249..cd048278 100644 --- a/collects/typed-racket/optimizer/vector.rkt +++ b/collects/typed-racket/optimizer/vector.rkt @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base (require syntax/parse unstable/syntax racket/match racket/flonum - (for-template scheme/base racket/flonum scheme/unsafe/ops) + (for-template racket/base racket/flonum racket/unsafe/ops) "../utils/utils.rkt" (utils tc-utils) (rep type-rep) diff --git a/collects/typed-racket/private/parse-type.rkt b/collects/typed-racket/private/parse-type.rkt index b74b1d8f..7ac86a9d 100644 --- a/collects/typed-racket/private/parse-type.rkt +++ b/collects/typed-racket/private/parse-type.rkt @@ -1,15 +1,15 @@ -#lang scheme/base +#lang racket/base (require "../utils/utils.rkt" (except-in (rep type-rep) make-arr) (rename-in (types convenience union utils printer filter-ops) [make-arr* make-arr]) (utils tc-utils stxclass-util) - syntax/stx (prefix-in c: scheme/contract) + syntax/stx (prefix-in c: racket/contract) syntax/parse (env type-env-structs tvar-env type-name-env type-alias-env lexical-env index-env) racket/match "parse-classes.rkt" - (for-template scheme/base "../base-env/colon.rkt") + (for-template racket/base "../base-env/colon.rkt") ;; needed at this phase for tests (combine-in (prefix-in t: "../base-env/base-types-extra.rkt") "../base-env/colon.rkt") (for-template (prefix-in t: "../base-env/base-types-extra.rkt"))) diff --git a/collects/typed-racket/private/type-contract.rkt b/collects/typed-racket/private/type-contract.rkt index d24e9f4f..928ff129 100644 --- a/collects/typed-racket/private/type-contract.rkt +++ b/collects/typed-racket/private/type-contract.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide type->contract define/fixup-contract? change-contract-fixups) @@ -12,12 +12,12 @@ (types resolve utils) (prefix-in t: (types convenience abbrev)) (private parse-type) - racket/match unstable/match syntax/struct syntax/stx mzlib/trace racket/syntax scheme/list - (only-in scheme/contract -> ->* case-> cons/c flat-rec-contract provide/contract any/c) - (for-template scheme/base racket/contract racket/set (utils any-wrap) + racket/match unstable/match syntax/struct syntax/stx mzlib/trace racket/syntax racket/list + (only-in racket/contract -> ->* case-> cons/c flat-rec-contract provide/contract any/c) + (for-template racket/base racket/contract racket/set (utils any-wrap) (prefix-in t: (types numeric-predicates)) (only-in unstable/contract sequence/c) - (only-in scheme/class object% is-a?/c subclass?/c object-contract class/c init object/c class?))) + (only-in racket/class object% is-a?/c subclass?/c object-contract class/c init object/c class?))) (define (define/fixup-contract? stx) (or (syntax-property stx 'typechecker:contract-def) diff --git a/collects/typed-racket/rep/type-rep.rkt b/collects/typed-racket/rep/type-rep.rkt index 6abbd38b..eb637381 100644 --- a/collects/typed-racket/rep/type-rep.rkt +++ b/collects/typed-racket/rep/type-rep.rkt @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base (require "../utils/utils.rkt") (require (utils tc-utils) "rep-utils.rkt" "object-rep.rkt" "filter-rep.rkt" "free-variance.rkt" mzlib/trace racket/match mzlib/etc - scheme/contract - (for-syntax scheme/base syntax/parse)) + racket/contract + (for-syntax racket/base syntax/parse)) (define name-table (make-weak-hasheq)) @@ -334,7 +334,7 @@ (def-type StructTop ([name Struct?]) [#:key 'struct]) (def-type ThreadCellTop () [#:fold-rhs #:base] [#:key 'thread-cell]) -;; v : Scheme Value +;; v : Racket Value (def-type Value (v) [#:frees #f] [#:fold-rhs #:base] [#:key (cond [(number? v) 'number] [(boolean? v) 'boolean] [(null? v) 'null] diff --git a/collects/typed-racket/typecheck/check-subforms-unit.rkt b/collects/typed-racket/typecheck/check-subforms-unit.rkt index 4c04fed1..6929a3af 100644 --- a/collects/typed-racket/typecheck/check-subforms-unit.rkt +++ b/collects/typed-racket/typecheck/check-subforms-unit.rkt @@ -1,4 +1,4 @@ -#lang scheme/unit +#lang racket/unit (require "../utils/utils.rkt" syntax/kerncase diff --git a/collects/typed-racket/typecheck/def-binding.rkt b/collects/typed-racket/typecheck/def-binding.rkt index ec9755b7..31543490 100644 --- a/collects/typed-racket/typecheck/def-binding.rkt +++ b/collects/typed-racket/typecheck/def-binding.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require scheme/contract "../utils/utils.rkt" scheme/struct-info) +(require racket/contract "../utils/utils.rkt" racket/struct-info) (define-struct binding (name) #:transparent) (define-struct (def-binding binding) (ty) #:transparent) diff --git a/collects/typed-racket/typecheck/find-annotation.rkt b/collects/typed-racket/typecheck/find-annotation.rkt index 434546e8..36f14836 100644 --- a/collects/typed-racket/typecheck/find-annotation.rkt +++ b/collects/typed-racket/typecheck/find-annotation.rkt @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base (require "../utils/utils.rkt" syntax/parse - scheme/contract + racket/contract (rep type-rep) (env lexical-env) (private type-annotation) - (for-template scheme/base)) + (for-template racket/base)) (provide/cond-contract [find-annotation (syntax? identifier? . -> . (or/c #f Type/c))]) diff --git a/collects/typed-racket/typecheck/internal-forms.rkt b/collects/typed-racket/typecheck/internal-forms.rkt index fbf46b83..69e70f6f 100644 --- a/collects/typed-racket/typecheck/internal-forms.rkt +++ b/collects/typed-racket/typecheck/internal-forms.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) +(require (for-syntax racket/base) syntax/parse) (define-syntax-rule (internal-forms set-name nms ...) diff --git a/collects/typed-racket/typecheck/provide-handling.rkt b/collects/typed-racket/typecheck/provide-handling.rkt index 7813aa0c..27c47ede 100644 --- a/collects/typed-racket/typecheck/provide-handling.rkt +++ b/collects/typed-racket/typecheck/provide-handling.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "../utils/utils.rkt" (only-in srfi/1/list s:member) @@ -12,9 +12,9 @@ (for-syntax syntax/parse racket/base) racket/contract/private/provide unstable/list syntax/id-table racket/dict - racket/syntax scheme/struct-info racket/match + racket/syntax racket/struct-info racket/match "def-binding.rkt" syntax/parse - (for-template scheme/base "def-export.rkt" scheme/contract)) + (for-template racket/base "def-export.rkt" racket/contract)) (provide remove-provides provide? generate-prov get-alternate) diff --git a/collects/typed-racket/typecheck/tc-app-helper.rkt b/collects/typed-racket/typecheck/tc-app-helper.rkt index 38371cd9..2f6e613c 100644 --- a/collects/typed-racket/typecheck/tc-app-helper.rkt +++ b/collects/typed-racket/typecheck/tc-app-helper.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "../utils/utils.rkt" racket/match unstable/list unstable/sequence (only-in srfi/1 unzip4) (only-in racket/list make-list) diff --git a/collects/typed-racket/typecheck/tc-app.rkt b/collects/typed-racket/typecheck/tc-app.rkt index ee7b3138..0a304d69 100644 --- a/collects/typed-racket/typecheck/tc-app.rkt +++ b/collects/typed-racket/typecheck/tc-app.rkt @@ -4,16 +4,16 @@ "signatures.rkt" "tc-metafunctions.rkt" "check-below.rkt" "tc-app-helper.rkt" "find-annotation.rkt" "tc-funapp.rkt" "tc-subst.rkt" (prefix-in c: racket/contract) - syntax/parse racket/match racket/trace scheme/list + syntax/parse racket/match racket/trace racket/list unstable/sequence unstable/list ;; fixme - don't need to be bound in this phase - only to make tests work - scheme/bool + racket/bool racket/unsafe/ops (only-in racket/private/class-internal do-make-object) (only-in syntax/location module-name-fixup) (only-in '#%kernel [apply k:apply] [reverse k:reverse]) ;; end fixme - (for-syntax syntax/parse scheme/base (utils tc-utils)) + (for-syntax syntax/parse racket/base (utils tc-utils)) (private type-annotation) (types utils abbrev union subtype resolve convenience type-table substitute) (utils tc-utils) @@ -25,7 +25,7 @@ (for-template racket/unsafe/ops racket/fixnum racket/flonum (only-in '#%kernel [apply k:apply] [reverse k:reverse]) - "internal-forms.rkt" scheme/base scheme/bool '#%paramz + "internal-forms.rkt" racket/base racket/bool '#%paramz (only-in racket/private/class-internal do-make-object) (only-in syntax/location module-name-fixup))) @@ -690,8 +690,8 @@ mp1 (#%plain-lambda () (#%plain-app mp2 (#%plain-app call-with-values (#%plain-lambda () e) list)))) - #:declare mp1 (id-from 'make-promise 'scheme/promise) - #:declare mp2 (id-from 'make-promise 'scheme/promise) + #:declare mp1 (id-from 'make-promise 'racket/promise) + #:declare mp2 (id-from 'make-promise 'racket/promise) (ret (-Promise (tc-expr/t #'e)))] ;; special case for `list' [(#%plain-app list . args) diff --git a/collects/typed-racket/typecheck/tc-envops.rkt b/collects/typed-racket/typecheck/tc-envops.rkt index dc42572f..88a19af8 100644 --- a/collects/typed-racket/typecheck/tc-envops.rkt +++ b/collects/typed-racket/typecheck/tc-envops.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require (rename-in "../utils/utils.rkt" [infer infer-in])) (require (rename-in (types subtype convenience remove-intersect union) @@ -11,10 +11,10 @@ (types resolve) (only-in (env type-env-structs lexical-env) env? update-type/lexical env-map env-props replace-props) - scheme/contract racket/match + racket/contract racket/match mzlib/trace unstable/struct "tc-metafunctions.rkt" - (for-syntax scheme/base)) + (for-syntax racket/base)) ;(trace replace-nth) diff --git a/collects/typed-racket/typecheck/tc-expr-unit.rkt b/collects/typed-racket/typecheck/tc-expr-unit.rkt index 9bfdd4f1..c0348796 100644 --- a/collects/typed-racket/typecheck/tc-expr-unit.rkt +++ b/collects/typed-racket/typecheck/tc-expr-unit.rkt @@ -1,8 +1,8 @@ -#lang scheme/unit +#lang racket/unit (require (rename-in "../utils/utils.rkt" [private private-in]) - racket/match (prefix-in - scheme/contract) + racket/match (prefix-in - racket/contract) "signatures.rkt" "tc-envops.rkt" "tc-metafunctions.rkt" "tc-subst.rkt" "check-below.rkt" "tc-funapp.rkt" "tc-app-helper.rkt" "../types/kw-types.rkt" (types utils convenience union subtype remove-intersect type-table filter-ops) @@ -17,13 +17,13 @@ (only-in srfi/1 split-at) (for-template "internal-forms.rkt")) -(require (for-template scheme/base racket/private/class-internal)) +(require (for-template racket/base racket/private/class-internal)) (import tc-if^ tc-lambda^ tc-app^ tc-let^ check-subforms^) (export tc-expr^) ;; return the type of a literal value -;; scheme-value [type] -> type +;; racket-value [type] -> type (define (tc-literal v-stx [expected #f]) (define-syntax-class exp (pattern (~and i (~or :number :str :bytes)) diff --git a/collects/typed-racket/typecheck/tc-lambda-unit.rkt b/collects/typed-racket/typecheck/tc-lambda-unit.rkt index 5bd1a303..35b40f29 100644 --- a/collects/typed-racket/typecheck/tc-lambda-unit.rkt +++ b/collects/typed-racket/typecheck/tc-lambda-unit.rkt @@ -1,13 +1,13 @@ -#lang scheme/unit +#lang racket/unit (require (rename-in "../utils/utils.rkt" [infer r:infer]) "signatures.rkt" "tc-metafunctions.rkt" "tc-subst.rkt" "check-below.rkt" mzlib/trace racket/dict - scheme/list syntax/parse "parse-cl.rkt" + racket/list syntax/parse "parse-cl.rkt" racket/syntax unstable/struct syntax/stx - (rename-in scheme/contract [-> -->] [->* -->*] [one-of/c -one-of/c]) + (rename-in racket/contract [-> -->] [->* -->*] [one-of/c -one-of/c]) (except-in (rep type-rep) make-arr) (rename-in (types convenience utils union) [make-arr* make-arr]) @@ -17,7 +17,7 @@ (utils tc-utils) racket/match) -(require (for-template scheme/base "internal-forms.rkt")) +(require (for-template racket/base "internal-forms.rkt")) (import tc-expr^) (export tc-lambda^) diff --git a/collects/typed-racket/typecheck/tc-structs.rkt b/collects/typed-racket/typecheck/tc-structs.rkt index a5b479ce..5158a88c 100644 --- a/collects/typed-racket/typecheck/tc-structs.rkt +++ b/collects/typed-racket/typecheck/tc-structs.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "../utils/utils.rkt" (except-in (rep type-rep free-variance) Dotted) @@ -19,10 +19,10 @@ [-> c->]) (for-syntax syntax/parse - scheme/base)) + racket/base)) -(require (for-template scheme/base +(require (for-template racket/base "internal-forms.rkt")) (provide tc/struct tc/poly-struct names-of-struct d-s) diff --git a/collects/typed-racket/typecheck/tc-subst.rkt b/collects/typed-racket/typecheck/tc-subst.rkt index cac7059e..902bd74c 100644 --- a/collects/typed-racket/typecheck/tc-subst.rkt +++ b/collects/typed-racket/typecheck/tc-subst.rkt @@ -1,13 +1,13 @@ -#lang scheme/base +#lang racket/base (require "../utils/utils.rkt") (require (rename-in (types subtype convenience remove-intersect union utils filter-ops) [-> -->] [->* -->*] [one-of/c -one-of/c]) - (rep type-rep filter-rep rep-utils) scheme/list - scheme/contract racket/match unstable/match - (for-syntax scheme/base) + (rep type-rep filter-rep rep-utils) racket/list + racket/contract racket/match unstable/match + (for-syntax racket/base) "tc-metafunctions.rkt") (provide (all-defined-out)) diff --git a/collects/typed-racket/typecheck/tc-toplevel.rkt b/collects/typed-racket/typecheck/tc-toplevel.rkt index 3716021f..01cb6748 100644 --- a/collects/typed-racket/typecheck/tc-toplevel.rkt +++ b/collects/typed-racket/typecheck/tc-toplevel.rkt @@ -24,7 +24,7 @@ "internal-forms.rkt" syntax/location mzlib/contract - scheme/base)) + racket/base)) (c:provide/contract [type-check (syntax? . c:-> . syntax?)] diff --git a/collects/typed-racket/typed-reader.rkt b/collects/typed-racket/typed-reader.rkt index 37ed4157..6721ff81 100644 --- a/collects/typed-racket/typed-reader.rkt +++ b/collects/typed-racket/typed-reader.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;; Provides raise-read-error and raise-read-eof-error (require syntax/readerr) diff --git a/collects/typed-racket/types/filter-ops.rkt b/collects/typed-racket/types/filter-ops.rkt index 682315a2..61b46e38 100644 --- a/collects/typed-racket/types/filter-ops.rkt +++ b/collects/typed-racket/types/filter-ops.rkt @@ -1,15 +1,15 @@ -#lang scheme/base +#lang racket/base (require "../utils/utils.rkt" (rep type-rep filter-rep object-rep rep-utils) (utils tc-utils) (only-in (infer infer) restrict) - "abbrev.rkt" (only-in scheme/contract current-blame-format [-> -->] listof) + "abbrev.rkt" (only-in racket/contract current-blame-format [-> -->] listof) (types comparison printer union subtype utils remove-intersect) - scheme/list racket/match - (for-syntax syntax/parse scheme/base) - syntax/id-table scheme/dict + racket/list racket/match + (for-syntax syntax/parse racket/base) + syntax/id-table racket/dict racket/trace - (for-template scheme/base)) + (for-template racket/base)) (provide (all-defined-out)) diff --git a/collects/typed-racket/types/remove-intersect.rkt b/collects/typed-racket/types/remove-intersect.rkt index 8d2d4569..ea5e93f1 100644 --- a/collects/typed-racket/types/remove-intersect.rkt +++ b/collects/typed-racket/types/remove-intersect.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "../utils/utils.rkt" (rep type-rep rep-utils) diff --git a/collects/typed-racket/types/resolve.rkt b/collects/typed-racket/types/resolve.rkt index 41b1a7ed..24340294 100644 --- a/collects/typed-racket/types/resolve.rkt +++ b/collects/typed-racket/types/resolve.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "../utils/utils.rkt") (require (rep type-rep rep-utils) @@ -6,7 +6,7 @@ (utils tc-utils) (types utils) racket/match - scheme/contract) + racket/contract) (provide resolve-name resolve-app needs-resolving? resolve) (provide/cond-contract [resolve-once (Type/c . -> . (or/c Type/c #f))]) diff --git a/collects/typed-racket/types/substitute.rkt b/collects/typed-racket/types/substitute.rkt index e2ba4cd1..18e3e7cd 100644 --- a/collects/typed-racket/types/substitute.rkt +++ b/collects/typed-racket/types/substitute.rkt @@ -6,7 +6,7 @@ (only-in (rep free-variance) combine-frees) (env index-env tvar-env) racket/match - scheme/contract) + racket/contract) (provide subst-all substitute substitute-dots substitute-dotted subst (struct-out t-subst) (struct-out i-subst) (struct-out i-subst/starred) (struct-out i-subst/dotted) diff --git a/collects/typed-racket/utils/tc-utils.rkt b/collects/typed-racket/utils/tc-utils.rkt index 2ad3a20c..36820309 100644 --- a/collects/typed-racket/utils/tc-utils.rkt +++ b/collects/typed-racket/utils/tc-utils.rkt @@ -205,7 +205,7 @@ don't depend on any other portion of the system ;; id: identifier ;; sym: a symbol -;; mod: a quoted require spec like 'scheme/base +;; mod: a quoted require spec like 'racket/base ;; is id the name sym defined in mod? (define (id-from? id sym mod) (and (eq? (syntax-e id) sym)