From d8296a31f5d9612fb1fa7813e8847a421d234ed5 Mon Sep 17 00:00:00 2001
From: Ryan Culpepper <ryanc@racket-lang.org>
Date: Wed, 26 Sep 2012 20:41:35 -0400
Subject: [PATCH] syntax/parse/experimental/template: make errors consistent
 with 'syntax'

---
 collects/syntax/parse/experimental/private/substitute.rkt | 2 +-
 collects/syntax/parse/experimental/template.rkt           | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/collects/syntax/parse/experimental/private/substitute.rkt b/collects/syntax/parse/experimental/private/substitute.rkt
index 9e3cdc002c..0628011a7e 100644
--- a/collects/syntax/parse/experimental/private/substitute.rkt
+++ b/collects/syntax/parse/experimental/private/substitute.rkt
@@ -224,7 +224,7 @@ An VarRef is one of
            (parameterize ((current-template-metafunction-introducer mark))
              (let ([r (call-with-continuation-barrier (lambda () (mf (mark (old-mark v)))))])
                (unless (syntax? r)
-                 (raise-syntax-error 'template "result of metafunction was not syntax" stx))
+                 (raise-syntax-error #f "result of template metafunction was not syntax" stx))
                (restx stx (old-mark (mark r))))))))]
 
     [(vector 'vector g1)
diff --git a/collects/syntax/parse/experimental/template.rkt b/collects/syntax/parse/experimental/template.rkt
index dd229110a8..b4177bc79d 100644
--- a/collects/syntax/parse/experimental/template.rkt
+++ b/collects/syntax/parse/experimental/template.rkt
@@ -508,7 +508,7 @@ instead of integers and integer vectors.
                      [(tdrivers tguide tprops-guide)
                       (parse-t tail depth esc?)])
           (when (set-empty? hdrivers)
-            (wrong-syntax #'head "no pattern variables in term before ellipsis"))
+            (wrong-syntax #'head "no pattern variables before ellipsis in template"))
           (when (set-empty? (set-filter hdrivers (pvar/dd<=? depth)))
             ;; FIXME: improve error message?
             (let ([bad-dots
@@ -626,10 +626,7 @@ instead of integers and integer vectors.
                     [(>= depth pvar-depth)
                      (pvar v attr (- depth pvar-depth))]
                     [else
-                     (wrong-syntax id
-                                   (string-append "pattern variable used at wrong ellipsis depth "
-                                                  "(expected at least ~s, used at ~s)")
-                                   pvar-depth depth)]))]
+                     (wrong-syntax id "missing ellipses with pattern variable in template")]))]
            [(template-metafunction? v)
             v]
            [else