From 2a99e418d585ff167ba8ae23746df763cac912f7 Mon Sep 17 00:00:00 2001
From: Eric Dobson <eric.n.dobson@gmail.com>
Date: Tue, 12 Nov 2013 09:26:15 -0800
Subject: [PATCH] Make tc-expr unit use the new syntax classes.

---
 .../typed-racket/typecheck/tc-expr-unit.rkt          | 12 ++++++------
 .../typed-racket/utils/syntax-classes.rkt            |  5 ++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt
index 14f314e823..71e7533949 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt
@@ -8,13 +8,13 @@
          (types utils abbrev union subtype type-table)
          (private-in parse-type type-annotation syntax-properties)
          (rep type-rep filter-rep object-rep)
-         (utils tc-utils)
+         (utils tc-utils syntax-classes)
          (env lexical-env tvar-env index-env)
          racket/private/class-internal
          syntax/parse syntax/stx
          unstable/syntax
          (only-in srfi/1 split-at)
-         (for-template "internal-forms.rkt" (only-in '#%paramz [parameterization-key pz:pk])))
+         (for-template (only-in '#%paramz [parameterization-key pz:pk])))
 
 (require (for-template racket/base racket/private/class-internal))
 
@@ -188,8 +188,8 @@
        ;; We trust ignore to be only on syntax objects objects that are well typed
        expected]
       ;; explicit failure
-      [(quote-syntax ((~literal typecheck-fail-internal) stx msg:str var))
-       (explicit-fail #'stx #'msg #'var)]
+      [t:failed-typecheck
+       (explicit-fail #'t.stx #'t.message #'t.var)]
       ;; data
       [(quote #f) (ret (-val #f) -false-filter)]
       [(quote #t) (ret (-val #t) -true-filter)]
@@ -328,8 +328,8 @@
        (check-subforms/ignore form)
        (ret Univ)]
       ;; explicit failure
-      [(quote-syntax ((~literal typecheck-fail-internal) stx msg var))
-       (explicit-fail #'stx #'msg #'var)]
+      [t:failed-typecheck
+       (explicit-fail #'t.stx #'t.message #'t.var)]
       ;; data
       [(quote #f) (ret (-val #f) -false-filter)]
       [(quote #t) (ret (-val #t) -true-filter)]
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/syntax-classes.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/syntax-classes.rkt
index 1cf03f9943..195cad6365 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/syntax-classes.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/syntax-classes.rkt
@@ -16,6 +16,7 @@
   typed-require/struct
   predicate-assertion
   type-declaration
+  failed-typecheck
 
   type-alias?
   typed-struct?
@@ -65,7 +66,9 @@
   [predicate-assertion
     (assert-predicate-internal type predicate)]
   [type-declaration
-    (:-internal id:identifier type)])
+    (:-internal id:identifier type)]
+  [failed-typecheck
+    (typecheck-fail-internal stx message:str var:id)])
 
 ;;; Helpers