From bbfb99bc77cdb16e9178ad45d0d1440f6fc91f92 Mon Sep 17 00:00:00 2001
From: Sam Tobin-Hochstadt <samth@racket-lang.org>
Date: Tue, 3 Mar 2009 22:26:15 +0000
Subject: [PATCH] More file movement

svn: r13929
---
 collects/typed-scheme/env/type-name-env.ss           |  2 +-
 .../typed-scheme/types/{type-abbrev.ss => abbrev.ss} |  0
 collects/typed-scheme/types/comparison.ss            |  2 +-
 .../convenience.ss}                                  | 12 ++++--------
 collects/typed-scheme/types/resolve.ss               |  6 ++++--
 collects/typed-scheme/types/subtype.ss               |  7 +------
 collects/typed-scheme/{private => types}/union.ss    |  5 ++---
 .../typed-scheme/types/{type-utils.ss => utils.ss}   |  0
 8 files changed, 13 insertions(+), 21 deletions(-)
 rename collects/typed-scheme/types/{type-abbrev.ss => abbrev.ss} (100%)
 rename collects/typed-scheme/{private/type-effect-convenience.ss => types/convenience.ss} (88%)
 rename collects/typed-scheme/{private => types}/union.ss (91%)
 rename collects/typed-scheme/types/{type-utils.ss => utils.ss} (100%)

diff --git a/collects/typed-scheme/env/type-name-env.ss b/collects/typed-scheme/env/type-name-env.ss
index 314f61735b..374a2368be 100644
--- a/collects/typed-scheme/env/type-name-env.ss
+++ b/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
diff --git a/collects/typed-scheme/types/type-abbrev.ss b/collects/typed-scheme/types/abbrev.ss
similarity index 100%
rename from collects/typed-scheme/types/type-abbrev.ss
rename to collects/typed-scheme/types/abbrev.ss
diff --git a/collects/typed-scheme/types/comparison.ss b/collects/typed-scheme/types/comparison.ss
index dbc70e5f46..0ca075439e 100644
--- a/collects/typed-scheme/types/comparison.ss
+++ b/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?)
diff --git a/collects/typed-scheme/private/type-effect-convenience.ss b/collects/typed-scheme/types/convenience.ss
similarity index 88%
rename from collects/typed-scheme/private/type-effect-convenience.ss
rename to collects/typed-scheme/types/convenience.ss
index a3f41d0aa0..bdf297865b 100644
--- a/collects/typed-scheme/private/type-effect-convenience.ss
+++ b/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)))
diff --git a/collects/typed-scheme/types/resolve.ss b/collects/typed-scheme/types/resolve.ss
index c7faacdcd0..7a132543bb 100644
--- a/collects/typed-scheme/types/resolve.ss
+++ b/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)
-         "type-utils.ss"
+(require (rep type-rep)  
+	 (env type-name-env)
+	 (utils tc-utils)
+         (types utils)
          scheme/match
          mzlib/trace)
 
diff --git a/collects/typed-scheme/types/subtype.ss b/collects/typed-scheme/types/subtype.ss
index 1e7cd1519b..13d6785253 100644
--- a/collects/typed-scheme/types/subtype.ss
+++ b/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"
-         "comparison.ss"
-         "resolve.ss"
-         "type-abbrev.ss"
+	 (types utils comparison resolve abbrev)
          (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
 
diff --git a/collects/typed-scheme/private/union.ss b/collects/typed-scheme/types/union.ss
similarity index 91%
rename from collects/typed-scheme/private/union.ss
rename to collects/typed-scheme/types/union.ss
index cf48cac6e3..5019cada22 100644
--- a/collects/typed-scheme/private/union.ss
+++ b/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)]
diff --git a/collects/typed-scheme/types/type-utils.ss b/collects/typed-scheme/types/utils.ss
similarity index 100%
rename from collects/typed-scheme/types/type-utils.ss
rename to collects/typed-scheme/types/utils.ss