From 72d551082d627584ae9304c21d998410e83bb011 Mon Sep 17 00:00:00 2001 From: Stevie Strickland Date: Fri, 23 Jan 2009 20:34:59 +0000 Subject: [PATCH] If we're using known-good-contract here, we won't always have an identifier for the contract, so use the contract in that case. Also rename to contract-stx in make-with-contract-transformer so its name isn't misleading. svn: r13269 --- collects/scheme/private/contract.ss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/collects/scheme/private/contract.ss b/collects/scheme/private/contract.ss index 263e8a4fc5..b62c4be140 100644 --- a/collects/scheme/private/contract.ss +++ b/collects/scheme/private/contract.ss @@ -134,12 +134,12 @@ improve method arity mismatch contract violation error messages? (define-syntax-parameter current-contract-region (λ (stx) #'(#%variable-reference))) -(define-for-syntax (make-with-contract-transformer contract-id id pos-blame-id) +(define-for-syntax (make-with-contract-transformer contract-stx id pos-blame-id) (make-set!-transformer (lambda (stx) (with-syntax ([neg-blame-id #'(current-contract-region)] [pos-blame-id pos-blame-id] - [contract-id contract-id] + [contract-stx contract-stx] [id id]) (syntax-case stx (set!) [(set! id arg) @@ -149,7 +149,7 @@ improve method arity mismatch contract violation error messages? (syntax id))] [(f arg ...) (syntax/loc stx - ((-contract contract-id + ((-contract contract-stx id pos-blame-id neg-blame-id @@ -158,7 +158,7 @@ improve method arity mismatch contract violation error messages? [ident (identifier? (syntax ident)) (syntax/loc stx - (-contract contract-id + (-contract contract-stx id pos-blame-id neg-blame-id @@ -245,7 +245,7 @@ improve method arity mismatch contract violation error messages? [always-defined (list #`(define-syntaxes (#,p) (make-with-contract-transformer - (quote-syntax #,contract-id) + (quote-syntax #,(if contract-id contract-id c)) (quote-syntax #,(marker-f p)) (quote-syntax blame-stx))) #`(define-values ()