From f850aa09190efe1548ea3b9e301d01b1a00f1f48 Mon Sep 17 00:00:00 2001
From: Eric Dobson <eric.n.dobson@gmail.com>
Date: Wed, 18 Jun 2014 21:11:07 -0700
Subject: [PATCH] Change type<? to rep<?.

Also moves type-equal and rep<? to rep-utils.

original commit: c66d0286cf104d5f30635e850caad504f7201b49
---
 .../typed-racket/rep/rep-utils.rkt             | 17 +++++++++++++----
 .../typed-racket/rep/type-rep.rkt              | 18 +-----------------
 .../typed-racket/types/union.rkt               |  2 +-
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/rep-utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/rep-utils.rkt
index e301292a..3631af7d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/rep-utils.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/rep-utils.rkt
@@ -370,6 +370,11 @@
         (app (lambda (v) (vector->list (struct->vector v))) (list-rest tag seq fv fi stx key vals)))
      vals]))
 
+;; Rep equality and inequality
+(define (rep-equal? s t)
+  (eq? (Rep-seq s) (Rep-seq t)))
+(define (rep<? s t)
+  (< (Rep-seq s) (Rep-seq t)))
 
 (provide
   Rep-values
@@ -377,7 +382,11 @@
               [Rep-free-vars free-vars*]
               [Rep-free-idxs free-idxs*]))
 
-(provide/cond-contract (struct Rep ([seq exact-nonnegative-integer?]
-                                    [free-vars (hash/c symbol? variance?)]
-                                    [free-idxs (hash/c symbol? variance?)]
-                                    [stx (or/c #f syntax?)])))
+(provide/cond-contract
+  [rename rep-equal? type-equal? (Type? Type? . -> . boolean?)]
+  [rename rep<? type<? (Type? Type? . -> . boolean?)]
+  [rename rep<? filter<? (Filter? Filter? . -> . boolean?)]
+  [struct Rep ([seq exact-nonnegative-integer?]
+               [free-vars (hash/c symbol? variance?)]
+               [free-idxs (hash/c symbol? variance?)]
+               [stx (or/c #f syntax?)])])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/type-rep.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/type-rep.rkt
index 70e9f182..75c1378c 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/type-rep.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/type-rep.rkt
@@ -29,7 +29,7 @@
          PolyDots-n
          Class? Row? Row:
          free-vars*
-         type-compare type<?
+         type-equal?
          remove-dups
          sub-t sub-f sub-o sub-pe
          (rename-out [Class:* Class:]
@@ -48,7 +48,6 @@
                      [PolyDots-body* PolyDots-body]
                      [PolyRow-body* PolyRow-body]))
 
-(provide/cond-contract [type-equal? (Rep? Rep? . -> . boolean?)])
 
 ;; Ugly hack - should use units
 (lazy-require
@@ -579,21 +578,6 @@
         [(Scope: sc*) (remove-scopes (sub1 n) sc*)]
         [_ (int-err "Tried to remove too many scopes: ~a" sc)])))
 
-;; type equality
-(define/cond-contract (type-equal? s t)
-  (Rep? Rep? . -> . boolean?)
-  (eq? (Rep-seq s) (Rep-seq t)))
-
-;; inequality - good
-(define/cond-contract (type<? s t)
-  (Rep? Rep? . -> . boolean?)
-  (< (Rep-seq s) (Rep-seq t)))
-
-(define/cond-contract (type-compare s t)
-  (Rep? Rep? . -> . (or/c -1 0 1))
-  (cond [(type-equal? s t) 0]
-        [(type<? s t) 1]
-        [else -1]))
 
 (define ((sub-f st) e)
   (filter-case (#:Type st
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/union.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/union.rkt
index 750beecc..19f67817 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/union.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/union.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require "../utils/utils.rkt"
-         (rep type-rep)
+         (rep type-rep rep-utils)
          (prefix-in c: (contract-req))
          (types subtype base-abbrev resolve)
          racket/match