More file movement

svn: r13929

collects/typed-scheme/env/type-name-env.ss

@@ -4,7 +4,7 @@
 (require syntax/boundmap
          mzlib/trace
          (utils tc-utils)
-         (types type-utils))
+         (types utils))
 
 (provide register-type-name
          lookup-type-name

collects/typed-scheme/types/comparison.ss

@@ -1,4 +1,4 @@
 #lang scheme/base
 (require "../utils/utils.ss")
-(require (rep type-rep) "type-utils.ss")
+(require (rep type-rep) (types utils))
 (provide type-equal? tc-result-equal? type<? type-compare effects-equal?)

collects/typed-scheme/types/convenience.ss

@@ -3,23 +3,19 @@
 
 (require (rep type-rep effect-rep)
          (utils tc-utils)
+	 (types comparison printer
+		union subtype type-utils type-abbrev)
          scheme/list
          scheme/match
-         "type-comparison.ss"
-         "type-effect-printer.ss"
-         "union.ss"
-         "subtype.ss"
-         "type-utils.ss" 
-         "type-abbrev.ss"
          scheme/promise
          (for-syntax stxclass)
          (for-syntax scheme/base)
          (for-template scheme/base scheme/contract scheme/tcp))
 
 (provide (all-defined-out)
-         (all-from-out "type-abbrev.ss")
+         (all-from-out (types type-abbrev))
          ;; these should all eventually go away
-         make-Name make-ValuesDots make-Function make-Latent-Restrict-Effect make-Latent-Remove-Effect)
+         make-Name make-ValuesDots make-Function)
 
 (define (one-of/c . args)
   (apply Un (map -val args)))

collects/typed-scheme/types/resolve.ss

@@ -1,8 +1,10 @@
 #lang scheme/base
 (require "../utils/utils.ss")
 
-(require (rep type-rep)  (env type-name-env) (utils tc-utils)
+(require (rep type-rep)  
-         "type-utils.ss"
+	 (env type-name-env)
+	 (utils tc-utils)
+         (types utils)
          scheme/match
          mzlib/trace)
 

collects/typed-scheme/types/subtype.ss

@@ -3,18 +3,13 @@
 
 (require (rep type-rep filter-rep object-rep rep-utils)
          (utils tc-utils)
-	 "type-utils.ss"
+	 (types utils comparison resolve abbrev)
-         "comparison.ss"
-         "resolve.ss"
-         "type-abbrev.ss"
          (env type-name-env)
          (only-in (infer infer-dummy) unify)
          scheme/match
          mzlib/trace
 	 (for-syntax scheme/base stxclass))
 
-
-
 ;; exn representing failure of subtyping
 ;; s,t both types
 

collects/typed-scheme/types/union.ss

@@ -4,10 +4,10 @@
 
 (require (rep type-rep rep-utils)
 	 (utils tc-utils)
-	 (types type-utils subtype type-abbrev printer comparison)
+	 (types utils subtype abbrev printer comparison)
          scheme/match mzlib/trace)
 
-(provide Un #;(rename *Un Un))
+(provide Un)
 
 (define (make-union* set)
   (match set
@@ -40,7 +40,6 @@
          [(subtype a b*) (list b*)]
          [(subtype b* a) (list a)]            
          [else (cons a b)]))
-     #;(union-count!)    
      (let ([types (remove-dups (sort (apply append (map flat args)) type<?))])
        (cond
          [(null? types) (make-union* null)]