From 0cfa940a0e0695c4dbb6a0cbc0cc32093e7038b2 Mon Sep 17 00:00:00 2001
From: Sam Tobin-Hochstadt <samth@racket-lang.org>
Date: Wed, 4 Apr 2012 09:47:47 -0400
Subject: [PATCH] Fix Typed Racket build with contracts enabled.

original commit: 1abb027fc7fdf238ab0086d9d0f73aa920175431
---
 collects/typed-racket/private/type-annotation.rkt | 3 ++-
 collects/typed-racket/rep/rep-utils.rkt           | 3 ++-
 collects/typed-racket/rep/type-rep.rkt            | 2 +-
 collects/typed-racket/types/union.rkt             | 2 +-
 collects/typed-racket/utils/utils.rkt             | 5 ++---
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/collects/typed-racket/private/type-annotation.rkt b/collects/typed-racket/private/type-annotation.rkt
index cc4440be..ba37dee8 100644
--- a/collects/typed-racket/private/type-annotation.rkt
+++ b/collects/typed-racket/private/type-annotation.rkt
@@ -4,10 +4,11 @@
 	 (rep type-rep)
 	 (utils tc-utils)
 	 (env global-env)
-         (except-in (types subtype union convenience resolve utils comparison) -> ->*)
+         (except-in (types subtype union convenience resolve utils comparison) -> ->* one-of/c)
          (private parse-type)
          (contract-req)
          racket/match mzlib/trace)
+
 (provide type-annotation
          get-type
          get-types
diff --git a/collects/typed-racket/rep/rep-utils.rkt b/collects/typed-racket/rep/rep-utils.rkt
index 2a901b19..57253ef5 100644
--- a/collects/typed-racket/rep/rep-utils.rkt
+++ b/collects/typed-racket/rep/rep-utils.rkt
@@ -2,6 +2,7 @@
 (require "../utils/utils.rkt"
          mzlib/pconvert
          racket/match
+         (contract-req)
          "free-variance.rkt"
          "interning.rkt"
          unstable/match unstable/struct
@@ -11,7 +12,7 @@
           (except-in syntax/parse id identifier keyword)
           racket/base
           syntax/struct
-          racket/contract
+          (contract-req)
           racket/syntax
           (rename-in (except-in (utils stxclass-util) bytes byte-regexp regexp byte-pregexp pregexp)
                      [id* id]
diff --git a/collects/typed-racket/rep/type-rep.rkt b/collects/typed-racket/rep/type-rep.rkt
index 1f55ced5..6abbd38b 100644
--- a/collects/typed-racket/rep/type-rep.rkt
+++ b/collects/typed-racket/rep/type-rep.rkt
@@ -374,7 +374,7 @@
 (def-type Hashtable ([key Type/c] [value Type/c]) [#:key 'hash]
   [#:frees (λ (f) (combine-frees (list (make-invariant (f key)) (make-invariant (f value)))))])
 
-(def-type Refinement ([parent Type/c] [pred identifier?] [cert certifier?])
+(def-type Refinement ([parent Type/c] [pred identifier?] [cert procedure?])
   [#:key (Type-key parent)]
   [#:intern (list (Rep-seq parent) (hash-id pred))]
   [#:fold-rhs (*Refinement (type-rec-id parent) pred cert)]
diff --git a/collects/typed-racket/types/union.rkt b/collects/typed-racket/types/union.rkt
index 8a47bf1b..762fe4b9 100644
--- a/collects/typed-racket/types/union.rkt
+++ b/collects/typed-racket/types/union.rkt
@@ -3,7 +3,7 @@
 (require "../utils/utils.rkt"
          (rep type-rep rep-utils)
          (utils tc-utils)
-         (contract-req)
+         (prefix-in c: (contract-req))
          (types utils subtype abbrev printer comparison)
          racket/match)
 
diff --git a/collects/typed-racket/utils/utils.rkt b/collects/typed-racket/utils/utils.rkt
index 99d70f2a..2f9271de 100644
--- a/collects/typed-racket/utils/utils.rkt
+++ b/collects/typed-racket/utils/utils.rkt
@@ -30,7 +30,7 @@ at least theoretically.
 
 (define-syntax do-contract-req
   (if enable-contracts?
-      (syntax-rules () [(_) (require racket/contract/base)])
+      (lambda (stx) (datum->syntax stx '(require racket/contract/base)))
       (syntax-rules () [(_) (begin)])))
 (do-contract-req)
 
@@ -189,8 +189,7 @@ at least theoretically.
 
 (define-require-syntax contract-req
   (if enable-contracts?
-      (syntax-rules ()
-        [(_) racket/contract])
+      (lambda (stx) (datum->syntax stx 'racket/contract))
       (syntax-rules ()
         [(_) (combine-in)])))