From f1d35f6ec94e1c9dff2d149c5f7f7a777a78f547 Mon Sep 17 00:00:00 2001
From: Asumu Takikawa <asumu@ccs.neu.edu>
Date: Thu, 12 Dec 2013 16:05:11 -0500
Subject: [PATCH] Better error msg for annotations on unbound ids

Closes PR 14246

Please merge to v6.0
---
 .../typed-racket-lib/typed-racket/base-env/colon.rkt |  8 ++++++--
 .../tests/typed-racket/fail/pr14246-2.rkt            | 12 ++++++++++++
 .../tests/typed-racket/fail/pr14246.rkt              |  8 ++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246-2.rkt
 create mode 100644 pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246.rkt

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 87e69101e4..27bc5afdac 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
@@ -1,7 +1,8 @@
 #lang racket/base
 
 (require (for-syntax racket/base syntax/parse unstable/sequence unstable/syntax
-                     "../utils/disappeared-use.rkt")
+                     "../utils/disappeared-use.rkt"
+                     (only-in "../utils/tc-utils.rkt" tc-error/stx))
          "../typecheck/internal-forms.rkt"
          (prefix-in t: "base-types-extra.rkt"))
 
@@ -44,7 +45,10 @@
     [(_ top-level? i:id ty)
      (unless (or (syntax-e #'top-level?)
                  (identifier-binding #'i))
-       (raise-syntax-error #f "unbound identifier in module" #'i))
+       (tc-error/stx #'i
+                     "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))
                                              (#%plain-app values)))
                       'disappeared-use #'i)]
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
new file mode 100644
index 0000000000..370d7d9ae6
--- /dev/null
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246-2.rkt
@@ -0,0 +1,12 @@
+#;
+(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
+(: foo : Number -> Number)
+(define (foo a)
+  (: n : Number)
+  (: i : Integer)
+  (: s : String)
+  a)
+
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
new file mode 100644
index 0000000000..c0597df595
--- /dev/null
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246.rkt
@@ -0,0 +1,8 @@
+#;
+(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
+;; with type annotations
+(: n String)
+