From c19fbbce454bced368937ec9676deca8917934b2 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Thu, 11 Apr 2013 18:42:49 -0500 Subject: [PATCH] fix listof error reporting closes PR 13685 please merge to the release branch (cherry picked from commit e6122d5fbd911660012d8a275f29f0768648b3f3) --- collects/racket/contract/private/misc.rkt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/collects/racket/contract/private/misc.rkt b/collects/racket/contract/private/misc.rkt index 96503a51ae..22b3feef9a 100644 --- a/collects/racket/contract/private/misc.rkt +++ b/collects/racket/contract/private/misc.rkt @@ -594,7 +594,7 @@ (define-syntax (*-listof stx) (syntax-case stx () - [(_ predicate? type-name name generate) + [(_ predicate? name generate) (identifier? (syntax predicate?)) (syntax (λ (input) @@ -610,8 +610,8 @@ (λ (val) (unless (predicate? val) (raise-blame-error blame val - '(expected: "~s" given "~e") - 'type-name + '(expected: "~s" given: "~e") + 'predicate? val)) (check-all p-app val)))) (cond @@ -633,11 +633,11 @@ #:first-order fo-check #:projection (ho-check (λ (p v) (map p v))))]))))])) -(define listof-func (*-listof list? list listof listof-generate)) +(define listof-func (*-listof list? listof listof-generate)) (define/subexpression-pos-prop (listof x) (listof-func x)) (define (non-empty-list? x) (and (pair? x) (list? (cdr x)))) -(define non-empty-listof-func (*-listof non-empty-list? non-empty-list non-empty-listof (λ (ctc) (make-generate-ctc-fail)))) +(define non-empty-listof-func (*-listof non-empty-list? non-empty-listof (λ (ctc) (make-generate-ctc-fail)))) (define/subexpression-pos-prop (non-empty-listof a) (non-empty-listof-func a)) (define cons/c-main-function