From 14547ed7636de536bd2da5cb00e8d271d0970a10 Mon Sep 17 00:00:00 2001 From: Asumu Takikawa Date: Thu, 12 Dec 2013 16:12:58 -0500 Subject: [PATCH] Quote the identifier in the declaration error msg Please merge to v6.0 original commit: 34c5b327463db014fb0d3c42922d60e75e4ada63 --- .../typed-racket-lib/typed-racket/base-env/colon.rkt | 2 +- .../typed-racket-lib/typed-racket/env/global-env.rkt | 2 +- .../typed-racket-test/tests/typed-racket/fail/pr14246-2.rkt | 2 +- .../typed-racket-test/tests/typed-racket/fail/pr14246.rkt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/colon.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/colon.rkt index 27bc5afd..6e9bd4fb 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/colon.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/colon.rkt @@ -46,7 +46,7 @@ (unless (or (syntax-e #'top-level?) (identifier-binding #'i)) (tc-error/stx #'i - "Declaration for ~a provided, but ~a has no definition" + "Declaration for `~a' provided, but `~a' has no definition" (syntax-e #'i) (syntax-e #'i))) (syntax-property (syntax/loc stx (begin (quote-syntax (:-internal i ty)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/global-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/global-env.rkt index 9773b2ec..0e8b3ed6 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/global-env.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/global-env.rkt @@ -85,7 +85,7 @@ (when (box? e) (let ([bnd (identifier-binding id)]) (tc-error/expr #:stx id - "Declaration for ~a provided, but ~a ~a" + "Declaration for `~a' provided, but `~a' ~a" (syntax-e id) (syntax-e id) (cond [(eq? bnd 'lexical) "is a lexical binding"] ;; should never happen [(not bnd) "has no definition"] diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246-2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246-2.rkt index 370d7d9a..aab76f85 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246-2.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246-2.rkt @@ -1,5 +1,5 @@ #; -(exn-pred #rx"Type Checker: Declaration for n provided, but n has no definition") +(exn-pred #rx"Type Checker: Declaration for `n' provided, but `n' has no definition") #lang typed/racket ;; Similar to pr14246.rkt, but for local definitions diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246.rkt index c0597df5..89552370 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246.rkt @@ -1,5 +1,5 @@ #; -(exn-pred #rx"Type Checker: Declaration for n provided, but n has no definition") +(exn-pred #rx"Type Checker: Declaration for `n' provided, but `n' has no definition") #lang typed/racket ;; Test for the error message for unbound module bindings