Removed *Un from abbrev.rkt, replaced it with Un from union.rkt.

original commit: 21598297a7dd29ce6e0a106d13326e84a7330b6f

collects/tests/typed-racket/unit-tests/subtype-tests.rkt

@@ -56,7 +56,7 @@
    [(-mu x (Un -Number (make-Listof x))) (-mu x (Un -Number -Symbol (make-Listof x)))]
    [(-mu x (Un -Number (make-Listof x))) (-mu y (Un -Number -Symbol (make-Listof y)))]
    ;; a hard one
-   [(-mu x (*Un -Number (-pair x (-pair -Symbol (-pair x (-val null)))))) -Sexp]
+   [(-mu x (Un -Number (-pair x (-pair -Symbol (-pair x (-val null)))))) -Sexp]
    [t1 (unfold t1)]
    [(unfold t1) t1]
    ;; simple function types

collects/typed-racket/base-env/base-env.rkt

@@ -1210,43 +1210,43 @@
 
 [identifier-binding
  (Ident [(-opt -Integer)]. ->opt .
-  (*Un (-val 'lexical) (-val #f)
+  (Un (-val 'lexical) (-val #f)
    (-lst* -Module-Path-Index
           -Symbol
           -Module-Path-Index
           -Symbol
-          (*Un (-val 0) (-val 1))
+          (Un (-val 0) (-val 1))
           (-opt -Integer)
           (-opt -Integer))))]
 
 [identifier-transformer-binding
  (Ident . -> .
-  (*Un (-val 'lexical) (-val #f)
+  (Un (-val 'lexical) (-val #f)
    (-lst* -Module-Path-Index
           -Symbol
           -Module-Path-Index
           -Symbol
-          (*Un (-val 0) (-val 1))
+          (Un (-val 0) (-val 1))
           (-opt -Integer)
           (-opt -Integer))))]
 [identifier-template-binding
  (Ident . -> .
-  (*Un (-val 'lexical) (-val #f)
+  (Un (-val 'lexical) (-val #f)
    (-lst* -Module-Path-Index
           -Symbol
           -Module-Path-Index
           -Symbol
-          (*Un (-val 0) (-val 1))
+          (Un (-val 0) (-val 1))
           (-opt -Integer)
           (-opt -Integer))))]
 [identifier-label-binding
  (Ident . -> .
-  (*Un (-val 'lexical) (-val #f)
+  (Un (-val 'lexical) (-val #f)
    (-lst* -Module-Path-Index
           -Symbol
           -Module-Path-Index
           -Symbol
-          (*Un (-val 0) (-val 1))
+          (Un (-val 0) (-val 1))
           (-opt -Integer)
           (-opt -Integer))))]
 

collects/typed-racket/base-env/base-special-env.rkt

@@ -46,7 +46,7 @@
   (-poly (a b)
         (cl->*
          (-> (-lst a) (-val '()) (-lst a))
-         (-> (-lst a) (-lst b) (-lst (*Un a b)))))]
+         (-> (-lst a) (-lst b) (-lst (Un a b)))))]
   ;; make-sequence
   [(make-template-identifier 'make-sequence 'racket/private/for)
    (-poly (a b)

collects/typed-racket/base-env/base-structs.rkt

@@ -43,10 +43,10 @@
 
   (define-hierarchy srcloc (#:kernel-maker k:srcloc)
     ([source : Univ]
-     [line : (*Un -Integer (-val #f))]
-     [column : (*Un -Integer (-val #f))]
-     [position : (*Un -Integer (-val #f))]
-     [span : (*Un -Integer (-val #f))]))
+     [line : (Un -Integer (-val #f))]
+     [column : (Un -Integer (-val #f))]
+     [position : (Un -Integer (-val #f))]
+     [span : (Un -Integer (-val #f))]))
 
   (define-hierarchy date (#:kernel-maker k:date)
     ([second : -Nat]

collects/typed-racket/base-env/base-types.rkt

@@ -6,7 +6,7 @@
 ;; I don't understand this at all. :(
 ;; -- STH, 6/26/12
 (require (for-syntax "../env/global-env.rkt"))
-(require "../types/abbrev.rkt" "../types/numeric-tower.rkt" "../rep/type-rep.rkt")
+(require "../types/abbrev.rkt" "../types/union.rkt" "../types/numeric-tower.rkt" "../rep/type-rep.rkt")
 
 [Complex -Number]
 [Number -Number]
@@ -161,7 +161,7 @@
 [False (-val #f)]
 [True (-val #t)]
 [Null (-val null)]
-[Nothing (*Un)]
+[Nothing (Un)]
 [Futureof (-poly (a) (-future a))]
 [Pairof (-poly (a b) (-pair a b))]
 [MPairof (-poly (a b) (-mpair a b))]

collects/typed-racket/types/abbrev.rkt

@@ -26,8 +26,6 @@
 
 (provide (except-out (all-defined-out) make-Base)
          (all-from-out "base-abbrev.rkt")
-         ;; TODO change the uses of this export to Un
-         (rename-out (Un *Un))
          (rename-out [make-Listof -lst]
                      [make-MListof -mlst]))