From b10cb6d089e3c26d08ac13fc4ea0039cbc475a26 Mon Sep 17 00:00:00 2001
From: Eric Dobson <eric.n.dobson@gmail.com>
Date: Sun, 29 Jun 2014 15:16:08 -0700
Subject: [PATCH] Change make-predicate/define-predicate to use
 flat-contract-predicate.

Closes PR 14610.
---
 .../typed-racket/base-env/prims.rkt           | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/prims.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/prims.rkt
index cfcb57be6a..c9de173362 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/prims.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/prims.rkt
@@ -289,9 +289,7 @@ This file defines two sorts of primitives. All of them are provided into any mod
   (syntax-parse stx
     [(_ name:id ty:expr)
      #`(begin
-         #,(ignore (if (eq? (syntax-local-context) 'top-level)
-                       #'(define name (procedure-rename (make-predicate ty) 'name))
-                       (flat-contract-def-property  #'(define name #f) #'ty)))
+         #,(ignore #'(define name (procedure-rename (make-predicate ty) 'name)))
          ;; not a require, this is just the unchecked declaration syntax
          #,(internal #'(require/typed-internal name (Any -> Boolean : ty))))]))
 
@@ -311,20 +309,21 @@ This file defines two sorts of primitives. All of them are provided into any mod
                type)))
 
          #`(#,(external-check-property #'#%expression check-valid-type)
-            #,(ignore-some/expr name #'(Any -> Boolean : ty))))
+            #,(ignore-some/expr #`(flat-contract-predicate #,name) #'(Any -> Boolean : ty))))
        (let ([typ (parse-type #'ty)])
          (if (Error? typ)
              ;; This code should never get run, typechecking will have an error earlier
              #`(error 'make-predicate "Couldn't parse type")
              #`(#%expression
                 #,(ignore-some/expr
-                   (type->contract
-                    typ
-                    ;; must be a flat contract
-                    #:kind 'flat
-                    ;; the value is not from the typed side
-                    #:typed-side #f
-                    (type->contract-fail typ #'ty #:ctc-str "predicate"))
+                   #`(flat-contract-predicate
+                      #,(type->contract
+                         typ
+                         ;; must be a flat contract
+                         #:kind 'flat
+                         ;; the value is not from the typed side
+                         #:typed-side #f
+                         (type->contract-fail typ #'ty #:ctc-str "predicate")))
                    #'(Any -> Boolean : ty))))))]))
 
 (define-syntax (cast stx)