From a5b3d6b3d08015957dcff7991be617eae12df2c9 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Tue, 29 Dec 2015 21:46:06 -0600 Subject: [PATCH] uncopy some code --- .../racket/contract/private/arr-i.rkt | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/racket/collects/racket/contract/private/arr-i.rkt b/racket/collects/racket/contract/private/arr-i.rkt index bd9fbd4382e..6393b98bbbe 100644 --- a/racket/collects/racket/contract/private/arr-i.rkt +++ b/racket/collects/racket/contract/private/arr-i.rkt @@ -1088,7 +1088,7 @@ evaluted left-to-right.) #`(f #,@argument-list))) (begin-encourage-inline - (define (un-dep/chaperone orig-ctc obj blame neg-party) + (define (un-dep/maybe-chaperone orig-ctc obj blame neg-party chaperone?) (cond [(and (procedure? orig-ctc) (procedure-arity-includes? orig-ctc 1)) @@ -1097,21 +1097,15 @@ evaluted left-to-right.) (raise-predicate-blame-error-failure blame obj neg-party (object-name orig-ctc)))] [else - (define ctc (coerce-chaperone-contract '->i orig-ctc)) - (((get/build-late-neg-projection ctc) blame) obj neg-party)]))) - -(begin-encourage-inline + (define ctc (if chaperone? + (coerce-chaperone-contract '->i orig-ctc) + (coerce-contract '->i orig-ctc))) + (((get/build-late-neg-projection ctc) blame) obj neg-party)])) + (define (un-dep/chaperone orig-ctc obj blame neg-party) + (un-dep/maybe-chaperone orig-ctc obj blame neg-party #t)) + (define (un-dep orig-ctc obj blame neg-party) - (cond - [(and (procedure? orig-ctc) - (procedure-arity-includes? orig-ctc 1)) - (if (orig-ctc obj) - obj - (raise-predicate-blame-error-failure blame obj neg-party - (object-name orig-ctc)))] - [else - (define ctc (coerce-contract '->i orig-ctc)) - (((get/build-late-neg-projection ctc) blame) obj neg-party)]))) + (un-dep/maybe-chaperone orig-ctc obj blame neg-party #f))) (define-for-syntax (mk-used-indy-vars an-istx) (let ([vars (make-free-identifier-mapping)])