diff --git a/collects/tests/typed-scheme/fail/infer-dots.rkt b/collects/tests/typed-scheme/fail/infer-dots.rkt index 40dea04980..b7ae503a39 100644 --- a/collects/tests/typed-scheme/fail/infer-dots.rkt +++ b/collects/tests/typed-scheme/fail/infer-dots.rkt @@ -1,6 +1,6 @@ #lang typed-scheme -(require typed-scheme/private/extra-procs) +(require typed-scheme/base-env/extra-procs) (map + (list 1 2 3) (list 10 20 30) (list 'a 'b 'c)) diff --git a/collects/tests/typed-scheme/fail/values-dots.rkt b/collects/tests/typed-scheme/fail/values-dots.rkt index d12b885d26..f3166c16aa 100644 --- a/collects/tests/typed-scheme/fail/values-dots.rkt +++ b/collects/tests/typed-scheme/fail/values-dots.rkt @@ -2,7 +2,7 @@ (exn-pred 10) #lang typed-scheme -(require typed-scheme/private/extra-procs) +(require typed-scheme/base-env/extra-procs) (: map-with-funcs (All (b ...) ((b ... b -> b) ... b -> (b ... b -> (values b ... b))))) (define (map-with-funcs . fs) diff --git a/collects/tests/typed-scheme/succeed/infer-dots.rkt b/collects/tests/typed-scheme/succeed/infer-dots.rkt index 8989233668..69f766e5e3 100644 --- a/collects/tests/typed-scheme/succeed/infer-dots.rkt +++ b/collects/tests/typed-scheme/succeed/infer-dots.rkt @@ -1,6 +1,6 @@ #lang typed-scheme -(require typed-scheme/private/extra-procs) +(require typed-scheme/base-env/extra-procs) (: f (Integer Integer -> Integer)) (define (f x y) (+ x y)) diff --git a/collects/tests/typed-scheme/succeed/inst-dots.rkt b/collects/tests/typed-scheme/succeed/inst-dots.rkt index 51bf322356..5e76ae8bf4 100644 --- a/collects/tests/typed-scheme/succeed/inst-dots.rkt +++ b/collects/tests/typed-scheme/succeed/inst-dots.rkt @@ -1,6 +1,6 @@ #lang typed-scheme -(require typed-scheme/private/extra-procs) +(require typed-scheme/base-env/extra-procs) ((inst map Number Number Number Number Number Number Number) + diff --git a/collects/tests/typed-scheme/succeed/nested-poly.rkt b/collects/tests/typed-scheme/succeed/nested-poly.rkt index a7de587fd6..29420e6d3a 100644 --- a/collects/tests/typed-scheme/succeed/nested-poly.rkt +++ b/collects/tests/typed-scheme/succeed/nested-poly.rkt @@ -1,6 +1,6 @@ #lang typed-scheme -(require typed-scheme/private/extra-procs) +(require typed-scheme/base-env/extra-procs) (: f (All (A ...) (All (B ...) (A ... A -> Integer)))) diff --git a/collects/tests/typed-scheme/succeed/values-dots.rkt b/collects/tests/typed-scheme/succeed/values-dots.rkt index 24e6bb1cde..738030ba5e 100644 --- a/collects/tests/typed-scheme/succeed/values-dots.rkt +++ b/collects/tests/typed-scheme/succeed/values-dots.rkt @@ -1,6 +1,6 @@ #lang typed-scheme -(require typed-scheme/private/extra-procs) +(require typed-scheme/base-env/extra-procs) (call-with-values (lambda () (values 1 2)) (lambda: ([x : Number] [y : Number]) (+ x y))) diff --git a/collects/tests/typed-scheme/unit-tests/parse-type-tests.rkt b/collects/tests/typed-scheme/unit-tests/parse-type-tests.rkt index e666d3ea74..3dbe7d543d 100644 --- a/collects/tests/typed-scheme/unit-tests/parse-type-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/parse-type-tests.rkt @@ -6,8 +6,8 @@ (rep type-rep) (rename-in (types comparison subtype union utils convenience) [Un t:Un] [-> t:->] [->* t:->*]) - (private base-types base-types-extra colon) - (for-template (private base-types base-types-extra base-env colon)) + (base-env base-types base-types-extra colon) + (for-template (base-env base-types base-types-extra base-env colon)) (private parse-type) rackunit) diff --git a/collects/tests/typed-scheme/unit-tests/test-utils.rkt b/collects/tests/typed-scheme/unit-tests/test-utils.rkt index b80dd17411..30d9f6da3b 100644 --- a/collects/tests/typed-scheme/unit-tests/test-utils.rkt +++ b/collects/tests/typed-scheme/unit-tests/test-utils.rkt @@ -9,7 +9,7 @@ (types comparison utils) rackunit rackunit/text-ui) -(provide private typecheck (rename-out [infer r:infer]) utils env rep types) +(provide private typecheck (rename-out [infer r:infer]) utils env rep types base-env) (define (mk-suite ts) (match (map (lambda (f) (f)) ts) diff --git a/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt b/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt index a3230ae46c..f92443daa4 100644 --- a/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt +++ b/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt @@ -16,9 +16,9 @@ (type-ascription (let ([ons (current-namespace)] [ns (make-base-namespace)]) (parameterize ([current-namespace ns]) - (namespace-require 'typed-scheme/private/prims) - (namespace-require 'typed-scheme/private/base-types) - (namespace-require 'typed-scheme/private/base-types-extra) + (namespace-require 'typed-scheme/base-env/prims) + (namespace-require 'typed-scheme/base-env/base-types) + (namespace-require 'typed-scheme/base-env/base-types-extra) (expand 'ann-stx)))) ty)) diff --git a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt index 9f73c7fc10..b3cee8beec 100644 --- a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt @@ -3,10 +3,10 @@ (require "test-utils.ss" (for-syntax scheme/base) (for-template scheme/base)) -(require (private prims type-annotation - base-types-extra base-special-env - base-env-indexing base-structs - parse-type) +(require (private type-annotation parse-type) + (base-env prims + base-types-extra base-special-env + base-env-indexing base-structs) (typecheck typechecker) (rep type-rep filter-rep object-rep) (rename-in (types utils union convenience abbrev filter-ops) @@ -23,16 +23,16 @@ (for-syntax (utils tc-utils) (typecheck typechecker) (env global-env) - (private #;base-env #;base-env-numeric - base-env-indexing base-special-env)) - (for-template (private #;base-env base-types base-types-extra - #;base-env-numeric - base-special-env - base-env-indexing)) + (base-env #;base-env #;base-env-numeric + base-env-indexing base-special-env)) + (for-template (base-env #;base-env base-types base-types-extra + #;base-env-numeric + base-special-env + base-env-indexing)) (for-syntax syntax/kerncase syntax/parse)) -(require (prefix-in b: (private base-env)) - (prefix-in n: (private base-env-numeric))) +(require (prefix-in b: (base-env base-env)) + (prefix-in n: (base-env base-env-numeric))) (provide typecheck-tests g tc-expr/expand) diff --git a/collects/typed-scheme/private/annotate-classes.rkt b/collects/typed-scheme/base-env/annotate-classes.rkt similarity index 98% rename from collects/typed-scheme/private/annotate-classes.rkt rename to collects/typed-scheme/base-env/annotate-classes.rkt index 78af999749..2ac45479ba 100644 --- a/collects/typed-scheme/private/annotate-classes.rkt +++ b/collects/typed-scheme/base-env/annotate-classes.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require syntax/parse "colon.rkt" (for-template "colon.rkt") "parse-type.rkt") +(require syntax/parse "colon.rkt" (for-template "colon.rkt") "../private/parse-type.rkt") (provide (all-defined-out)) (define-splicing-syntax-class annotated-name diff --git a/collects/typed-scheme/private/base-env-indexing-abs.rkt b/collects/typed-scheme/base-env/base-env-indexing-abs.rkt similarity index 99% rename from collects/typed-scheme/private/base-env-indexing-abs.rkt rename to collects/typed-scheme/base-env/base-env-indexing-abs.rkt index 9035f1aedf..0dd956f99d 100644 --- a/collects/typed-scheme/private/base-env-indexing-abs.rkt +++ b/collects/typed-scheme/base-env/base-env-indexing-abs.rkt @@ -6,7 +6,6 @@ racket/tcp (only-in rnrs/lists-6 fold-left) '#%paramz - "extra-procs.rkt" (only-in '#%kernel [apply kernel:apply]) racket/promise racket/system (only-in string-constants/private/only-once maybe-print-message) diff --git a/collects/typed-scheme/private/base-env-indexing.rkt b/collects/typed-scheme/base-env/base-env-indexing.rkt similarity index 100% rename from collects/typed-scheme/private/base-env-indexing.rkt rename to collects/typed-scheme/base-env/base-env-indexing.rkt diff --git a/collects/typed-scheme/private/base-env-numeric.rkt b/collects/typed-scheme/base-env/base-env-numeric.rkt similarity index 100% rename from collects/typed-scheme/private/base-env-numeric.rkt rename to collects/typed-scheme/base-env/base-env-numeric.rkt diff --git a/collects/typed-scheme/private/base-env.rkt b/collects/typed-scheme/base-env/base-env.rkt similarity index 100% rename from collects/typed-scheme/private/base-env.rkt rename to collects/typed-scheme/base-env/base-env.rkt diff --git a/collects/typed-scheme/private/base-special-env.rkt b/collects/typed-scheme/base-env/base-special-env.rkt similarity index 100% rename from collects/typed-scheme/private/base-special-env.rkt rename to collects/typed-scheme/base-env/base-special-env.rkt diff --git a/collects/typed-scheme/private/base-structs.rkt b/collects/typed-scheme/base-env/base-structs.rkt similarity index 100% rename from collects/typed-scheme/private/base-structs.rkt rename to collects/typed-scheme/base-env/base-structs.rkt diff --git a/collects/typed-scheme/private/base-types-extra.rkt b/collects/typed-scheme/base-env/base-types-extra.rkt similarity index 100% rename from collects/typed-scheme/private/base-types-extra.rkt rename to collects/typed-scheme/base-env/base-types-extra.rkt diff --git a/collects/typed-scheme/private/base-types.rkt b/collects/typed-scheme/base-env/base-types.rkt similarity index 100% rename from collects/typed-scheme/private/base-types.rkt rename to collects/typed-scheme/base-env/base-types.rkt diff --git a/collects/typed-scheme/private/colon.rkt b/collects/typed-scheme/base-env/colon.rkt similarity index 100% rename from collects/typed-scheme/private/colon.rkt rename to collects/typed-scheme/base-env/colon.rkt diff --git a/collects/typed-scheme/private/env-lang.rkt b/collects/typed-scheme/base-env/env-lang.rkt similarity index 100% rename from collects/typed-scheme/private/env-lang.rkt rename to collects/typed-scheme/base-env/env-lang.rkt diff --git a/collects/typed-scheme/private/extra-procs.rkt b/collects/typed-scheme/base-env/extra-procs.rkt similarity index 100% rename from collects/typed-scheme/private/extra-procs.rkt rename to collects/typed-scheme/base-env/extra-procs.rkt diff --git a/collects/typed-scheme/private/for-clauses.rkt b/collects/typed-scheme/base-env/for-clauses.rkt similarity index 100% rename from collects/typed-scheme/private/for-clauses.rkt rename to collects/typed-scheme/base-env/for-clauses.rkt diff --git a/collects/typed-scheme/private/internal.rkt b/collects/typed-scheme/base-env/internal.rkt similarity index 100% rename from collects/typed-scheme/private/internal.rkt rename to collects/typed-scheme/base-env/internal.rkt diff --git a/collects/typed-scheme/private/prims.rkt b/collects/typed-scheme/base-env/prims.rkt similarity index 99% rename from collects/typed-scheme/private/prims.rkt rename to collects/typed-scheme/base-env/prims.rkt index 255c576111..5fec8083e7 100644 --- a/collects/typed-scheme/private/prims.rkt +++ b/collects/typed-scheme/base-env/prims.rkt @@ -42,12 +42,12 @@ This file defines two sorts of primitives. All of them are provided into any mod racket/struct-info syntax/struct "../rep/type-rep.rkt" - "parse-type.rkt" + "../private/parse-type.rkt" "annotate-classes.rkt" "internal.rkt" "../utils/tc-utils.rkt" "../env/type-name-env.rkt" - "type-contract.rkt" + "../private/type-contract.rkt" "for-clauses.rkt") "../types/numeric-predicates.rkt") (provide index?) ; useful for assert, and racket doesn't have it diff --git a/collects/typed-scheme/private/type-env-lang.rkt b/collects/typed-scheme/base-env/type-env-lang.rkt similarity index 100% rename from collects/typed-scheme/private/type-env-lang.rkt rename to collects/typed-scheme/base-env/type-env-lang.rkt diff --git a/collects/typed-scheme/main.rkt b/collects/typed-scheme/main.rkt index 016cdebff2..e84a437caa 100644 --- a/collects/typed-scheme/main.rkt +++ b/collects/typed-scheme/main.rkt @@ -3,15 +3,15 @@ (providing (libs (except scheme/base #%module-begin #%top-interaction with-handlers lambda #%app for for*) - (except "private/prims.rkt") - (except "private/base-types.rkt") - (except "private/base-types-extra.rkt")) + (except "base-env/prims.rkt") + (except "base-env/base-types.rkt") + (except "base-env/base-types-extra.rkt")) (basics #%module-begin #%top-interaction lambda #%app)) -(require "private/extra-procs.rkt" - (for-syntax "private/base-types-extra.rkt")) +(require "base-env/extra-procs.rkt" + (for-syntax "base-env/base-types-extra.rkt")) (provide (rename-out [with-handlers: with-handlers]) - (for-syntax (all-from-out "private/base-types-extra.rkt")) + (for-syntax (all-from-out "base-env/base-types-extra.rkt")) assert defined? with-type for for*) diff --git a/collects/typed-scheme/no-check.rkt b/collects/typed-scheme/no-check.rkt index fb1ac85dd4..dd557a1b2a 100644 --- a/collects/typed-scheme/no-check.rkt +++ b/collects/typed-scheme/no-check.rkt @@ -1,13 +1,13 @@ #lang scheme/base (require - (except-in "private/prims.rkt" + (except-in "base-env/prims.rkt" require/typed require/opaque-type require-typed-struct) - "private/base-types-extra.rkt" + "base-env/base-types-extra.rkt" (for-syntax scheme/base syntax/parse syntax/struct)) (provide (all-from-out scheme/base) (all-defined-out) - (all-from-out "private/prims.rkt" "private/base-types-extra.rkt")) + (all-from-out "base-env/prims.rkt" "base-env/base-types-extra.rkt")) (define-syntax (require/typed stx) diff --git a/collects/typed-scheme/private/parse-type.rkt b/collects/typed-scheme/private/parse-type.rkt index d622ef9a57..19a4ece477 100644 --- a/collects/typed-scheme/private/parse-type.rkt +++ b/collects/typed-scheme/private/parse-type.rkt @@ -8,10 +8,10 @@ syntax/parse (env type-env-structs tvar-env type-name-env type-alias-env lexical-env index-env) racket/match - (for-template scheme/base "colon.ss") + (for-template scheme/base "../base-env/colon.ss") ;; needed at this phase for tests - (combine-in (prefix-in t: "base-types-extra.ss") "colon.ss") - (for-template (prefix-in t: "base-types-extra.ss"))) + (combine-in (prefix-in t: "../base-env/base-types-extra.ss") "../base-env/colon.ss") + (for-template (prefix-in t: "../base-env/base-types-extra.ss"))) (define-struct poly (name vars) #:prefab) diff --git a/collects/typed-scheme/private/with-types.rkt b/collects/typed-scheme/private/with-types.rkt index 56420d212e..2262f1400d 100644 --- a/collects/typed-scheme/private/with-types.rkt +++ b/collects/typed-scheme/private/with-types.rkt @@ -3,11 +3,11 @@ (require racket/require (for-template (except-in racket/base for for*) - "prims.rkt" + "../base-env/prims.rkt" (prefix-in c: (combine-in racket/contract/region racket/contract/base))) - "extra-procs.rkt" "prims.rkt" + "../base-env/extra-procs.rkt" "../base-env/prims.rkt" syntax/parse racket/block racket/match - unstable/sequence "base-types-extra.rkt" + unstable/sequence "../base-env/base-types-extra.rkt" (except-in (path-up "env/type-name-env.rkt" "env/type-alias-env.rkt" "infer/infer-dummy.rkt" diff --git a/collects/typed-scheme/typed-scheme.rkt b/collects/typed-scheme/typed-scheme.rkt index 5de02dd741..ee8f7c75e7 100644 --- a/collects/typed-scheme/typed-scheme.rkt +++ b/collects/typed-scheme/typed-scheme.rkt @@ -4,7 +4,7 @@ ;; these requires are needed since their code ;; appears in the residual program "typecheck/renamer.rkt" "types/type-table.rkt" profile) - "private/base-special-env.rkt" ) + "base-env/base-special-env.rkt" ) (provide (rename-out [module-begin #%module-begin] [top-interaction #%top-interaction] @@ -16,10 +16,10 @@ (define-for-syntax (do-standard-inits) (initialize-special) - ((dynamic-require 'typed-scheme/private/base-structs 'initialize-structs)) - ((dynamic-require 'typed-scheme/private/base-env-indexing 'initialize-indexing)) - ((dynamic-require 'typed-scheme/private/base-env 'init)) - ((dynamic-require 'typed-scheme/private/base-env-numeric 'init))) + ((dynamic-require 'typed-scheme/base-env/base-structs 'initialize-structs)) + ((dynamic-require 'typed-scheme/base-env/base-env-indexing 'initialize-indexing)) + ((dynamic-require 'typed-scheme/base-env/base-env 'init)) + ((dynamic-require 'typed-scheme/base-env/base-env-numeric 'init))) (define-syntax-rule (drivers [name sym] ...) (begin diff --git a/collects/typed-scheme/utils/utils.rkt b/collects/typed-scheme/utils/utils.rkt index 2ac08d1f8f..c981ca9b69 100644 --- a/collects/typed-scheme/utils/utils.rkt +++ b/collects/typed-scheme/utils/utils.rkt @@ -85,6 +85,7 @@ at least theoretically. (define-requirer private private-out) (define-requirer types types-out) (define-requirer optimizer optimizer-out) +(define-requirer base-env base-env-out) ;; run `h' last, but drop its return value (define-syntax-rule (reverse-begin h . forms) (begin0 (begin . forms) h)) diff --git a/collects/typed/racket/base.rkt b/collects/typed/racket/base.rkt index 64952f4ac7..c39cfe203f 100644 --- a/collects/typed/racket/base.rkt +++ b/collects/typed/racket/base.rkt @@ -3,16 +3,16 @@ (providing (libs (except racket/base #%module-begin #%top-interaction with-handlers lambda #%app define-struct for for*)) (basics #%module-begin #%top-interaction lambda #%app)) -(require typed-scheme/private/extra-procs - typed-scheme/private/prims - typed-scheme/private/base-types - typed-scheme/private/base-types-extra - (for-syntax typed-scheme/private/base-types-extra)) +(require typed-scheme/base-env/extra-procs + typed-scheme/base-env/prims + typed-scheme/base-env/base-types + typed-scheme/base-env/base-types-extra + (for-syntax typed-scheme/base-env/base-types-extra)) (provide (rename-out [with-handlers: with-handlers] [define-type-alias define-type]) - (except-out (all-from-out typed-scheme/private/prims) + (except-out (all-from-out typed-scheme/base-env/prims) with-handlers: for/annotation for*/annotation) - (all-from-out typed-scheme/private/base-types) - (all-from-out typed-scheme/private/base-types-extra) + (all-from-out typed-scheme/base-env/base-types) + (all-from-out typed-scheme/base-env/base-types-extra) assert defined? with-type for for* - (for-syntax (all-from-out typed-scheme/private/base-types-extra))) + (for-syntax (all-from-out typed-scheme/base-env/base-types-extra))) diff --git a/collects/typed/scheme/base.rkt b/collects/typed/scheme/base.rkt index 302f1c162c..ba2146a210 100644 --- a/collects/typed/scheme/base.rkt +++ b/collects/typed/scheme/base.rkt @@ -3,16 +3,16 @@ (providing (libs (except scheme/base #%module-begin #%top-interaction with-handlers lambda #%app define-struct for for*)) (basics #%module-begin #%top-interaction lambda #%app)) -(require typed-scheme/private/extra-procs - typed-scheme/private/prims - typed-scheme/private/base-types - typed-scheme/private/base-types-extra - (for-syntax typed-scheme/private/base-types-extra)) +(require typed-scheme/base-env/extra-procs + typed-scheme/base-env/prims + typed-scheme/base-env/base-types + typed-scheme/base-env/base-types-extra + (for-syntax typed-scheme/base-env/base-types-extra)) (provide (rename-out [with-handlers: with-handlers] [define-type-alias define-type]) - (except-out (all-from-out typed-scheme/private/prims) + (except-out (all-from-out typed-scheme/base-env/prims) with-handlers: for/annotation for*/annotation) - (all-from-out typed-scheme/private/base-types) - (all-from-out typed-scheme/private/base-types-extra) + (all-from-out typed-scheme/base-env/base-types) + (all-from-out typed-scheme/base-env/base-types-extra) assert defined? with-type for for* - (for-syntax (all-from-out typed-scheme/private/base-types-extra))) + (for-syntax (all-from-out typed-scheme/base-env/base-types-extra)))