diff --git a/racket/collects/racket/contract/base.rkt b/racket/collects/racket/contract/base.rkt index e32d5c96ec..8ec36b86b8 100644 --- a/racket/collects/racket/contract/base.rkt +++ b/racket/collects/racket/contract/base.rkt @@ -26,10 +26,6 @@ check-procedure check-procedure/more - contracted-function? - contracted-function-proc - contracted-function-ctc - make-contracted-function contract-key ;; these two are provided for-syntax diff --git a/racket/collects/racket/contract/private/arrow.rkt b/racket/collects/racket/contract/private/arrow.rkt index c79db49402..af3ded728a 100644 --- a/racket/collects/racket/contract/private/arrow.rkt +++ b/racket/collects/racket/contract/private/arrow.rkt @@ -28,11 +28,6 @@ procedure-accepts-and-more? check-procedure check-procedure/more - contracted-function? - contracted-function-proc - contracted-function-ctc - contracted-function-blame - make-contracted-function matches-arity-exactly? keywords-match bad-number-of-results @@ -54,11 +49,6 @@ (list id) null)) -(define-struct contracted-function (proc ctc blame) - #:property prop:procedure 0 - #:property prop:contracted 1 - #:property prop:blame 2) - (define contract-key (gensym 'contract-key)) (define-for-syntax (check-tail-contract rng-ctcs rng-checkers call-gen) diff --git a/racket/collects/racket/contract/private/base.rkt b/racket/collects/racket/contract/private/base.rkt index c7bb61c493..311f0d82a3 100644 --- a/racket/collects/racket/contract/private/base.rkt +++ b/racket/collects/racket/contract/private/base.rkt @@ -64,35 +64,12 @@ ;; name, we'll just put something stupid here ;; instead of changing the library around. (or pos "false") - + (if cvfp #f neg) #t)) - (define new-val - (cond - [cvfp (((cvfp blame) v) neg)] - [else (((contract-projection c) blame) v)])) (cond - [(and (not (parameter? new-val)) ;; when PR 11221 is fixed, remove this line - (procedure? new-val) - (object-name v) - (not (eq? (object-name v) (object-name new-val)))) - (define vs-name (object-name v)) - (cond - [(contracted-function? new-val) - ;; when PR11222 is fixed, change these things: - ;; - eliminate this cond case - ;; - remove the require of arrow.rkt above - ;; - change (struct-out contracted-function) - ;; in arrow.rkt to make-contracted-function - (make-contracted-function - (procedure-rename (contracted-function-proc new-val) vs-name) - (contracted-function-ctc new-val) - (if cvfp - (blame-add-missing-party blame neg) - blame))] - [else - (procedure-rename new-val vs-name)])] - [else new-val]))) + [cvfp (((cvfp blame) v) neg)] + [else (((contract-projection c) blame) v)]))) (define-syntax (invariant-assertion stx) (syntax-case stx ()