Move base environment files to their own subdirectory.

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))
 

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)

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))

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) 
  + 

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))))
 

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)))

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)
+         (base-env base-types base-types-extra colon)
-         (for-template (private base-types base-types-extra base-env colon))
+         (for-template (base-env base-types base-types-extra base-env colon))
          (private parse-type)
          rackunit)
 

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)

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/base-env/prims)
-                                               (namespace-require 'typed-scheme/private/base-types)
+                                               (namespace-require 'typed-scheme/base-env/base-types)
-                                               (namespace-require 'typed-scheme/private/base-types-extra)
+                                               (namespace-require 'typed-scheme/base-env/base-types-extra)
                                                (expand 'ann-stx))))
                           ty))
 

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 
+(require (private type-annotation parse-type)
-		  base-types-extra base-special-env
+         (base-env prims
-		  base-env-indexing base-structs
+                   base-types-extra base-special-env
-                  parse-type)
+                   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 #;base-env #;base-env-numeric
-			      base-env-indexing base-special-env))
+			       base-env-indexing base-special-env))
-         (for-template (private #;base-env base-types base-types-extra
+         (for-template (base-env #;base-env base-types base-types-extra
-				#;base-env-numeric 
+				 #;base-env-numeric 
-                                base-special-env
+                                 base-special-env
-				base-env-indexing))
+				 base-env-indexing))
          (for-syntax syntax/kerncase syntax/parse))
 
-(require (prefix-in b: (private base-env))
+(require (prefix-in b: (base-env base-env))
-         (prefix-in n: (private base-env-numeric)))
+         (prefix-in n: (base-env base-env-numeric)))
 
 (provide typecheck-tests g tc-expr/expand)
  

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

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)

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

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 "base-env/prims.rkt")
-                 (except "private/base-types.rkt")
+                 (except "base-env/base-types.rkt")
-                 (except "private/base-types-extra.rkt"))
+                 (except "base-env/base-types-extra.rkt"))
 	   (basics #%module-begin		   		   		   
 		   #%top-interaction
 		   lambda
 		   #%app))
-(require "private/extra-procs.rkt"
+(require "base-env/extra-procs.rkt"
-         (for-syntax "private/base-types-extra.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*)

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)

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")
+         (combine-in (prefix-in t: "../base-env/base-types-extra.ss") "../base-env/colon.ss")
-         (for-template (prefix-in t: "base-types-extra.ss")))
+         (for-template (prefix-in t: "../base-env/base-types-extra.ss")))
 
 (define-struct poly (name vars) #:prefab)
 

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"

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/base-env/base-structs 'initialize-structs))
-  ((dynamic-require 'typed-scheme/private/base-env-indexing 'initialize-indexing))
+  ((dynamic-require 'typed-scheme/base-env/base-env-indexing 'initialize-indexing))
-  ((dynamic-require 'typed-scheme/private/base-env 'init))
+  ((dynamic-require 'typed-scheme/base-env/base-env 'init))
-  ((dynamic-require 'typed-scheme/private/base-env-numeric 'init)))
+  ((dynamic-require 'typed-scheme/base-env/base-env-numeric 'init)))
 
 (define-syntax-rule (drivers [name sym] ...)
   (begin 

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))

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
+(require typed-scheme/base-env/extra-procs
-         typed-scheme/private/prims
+         typed-scheme/base-env/prims
-         typed-scheme/private/base-types
+         typed-scheme/base-env/base-types
-         typed-scheme/private/base-types-extra
+         typed-scheme/base-env/base-types-extra
-	 (for-syntax typed-scheme/private/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/base-env/base-types)
-         (all-from-out typed-scheme/private/base-types-extra)
+         (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)))

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
+(require typed-scheme/base-env/extra-procs
-         typed-scheme/private/prims
+         typed-scheme/base-env/prims
-         typed-scheme/private/base-types
+         typed-scheme/base-env/base-types
-         typed-scheme/private/base-types-extra
+         typed-scheme/base-env/base-types-extra
-	 (for-syntax typed-scheme/private/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/base-env/base-types)
-         (all-from-out typed-scheme/private/base-types-extra)
+         (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)))