From b5f09c0d39e85624273202cf13427f0c7de49f3d Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sun, 27 May 2012 11:29:21 -0600
Subject: [PATCH] more error-message conversions and repairs

original commit: a137459b65b54d65595e854101aae7440d9e65f6
---
 collects/scribble/base.rkt |  2 +-
 collects/scribble/eval.rkt | 12 ++++++------
 collects/scribble/xref.rkt | 16 ++++++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/collects/scribble/base.rkt b/collects/scribble/base.rkt
index 29fa02ee..50eb08c1 100644
--- a/collects/scribble/base.rkt
+++ b/collects/scribble/base.rkt
@@ -60,7 +60,7 @@
    [(string? s) (make-style s null)]
    [(symbol? s) (make-style #f (list s))]
    [(and (list? s) (andmap symbol? s)) (make-style #f s)]
-   [else (raise-type-error who "style, string, symbol, list of symbols, or #f" s)]))
+   [else (raise-argument-error who "(or/c style? string? symbol? (listof symbol?) #f)" s)]))
 
 (define (title #:tag [tag #f] #:tag-prefix [prefix #f] #:style [style plain]
                #:version [version #f] #:date [date #f]
diff --git a/collects/scribble/eval.rkt b/collects/scribble/eval.rkt
index 294e8532..bf398ad0 100644
--- a/collects/scribble/eval.rkt
+++ b/collects/scribble/eval.rkt
@@ -178,19 +178,19 @@
 (define (make-eval-results contents out err)
   (unless (and (list? contents)
                (andmap content? contents))
-    (raise-type-error 'eval:results "list of content" contents))
+    (raise-argument-error 'eval:results "(listof content?)" contents))
   (unless (string? out)
-    (raise-type-error 'eval:results "string" out))
+    (raise-argument-error 'eval:results "string?" out))
   (unless (string? err)
-    (raise-type-error 'eval:results "string" err))
+    (raise-argument-error 'eval:results "string?" err))
   (eval-results contents out err))
 (define (make-eval-result content out err)
   (unless (content? content)
-    (raise-type-error 'eval:result "content" content))
+    (raise-argument-error 'eval:result "content?" content))
   (unless (string? out)
-    (raise-type-error 'eval:result "string" out))
+    (raise-argument-error 'eval:result "string?" out))
   (unless (string? err)
-    (raise-type-error 'eval:result "string" err))
+    (raise-argument-error 'eval:result "string?" err))
   (eval-results (list content) out err))
 
 (define (extract-to-evaluate s)
diff --git a/collects/scribble/xref.rkt b/collects/scribble/xref.rkt
index 19407860..4b53608b 100644
--- a/collects/scribble/xref.rkt
+++ b/collects/scribble/xref.rkt
@@ -106,12 +106,16 @@
             [(module-path? src)
              (loop (module-path-index-join src #f))]
             [else
-             (raise-type-error 'xref-binding-definition->tag
-                               "list starting with module path or module path index"
-                               src)]))]
-        [else (raise-type-error 'xref-binding-definition->tag
-                                "identifier, 2-element list, or 7-element list"
-                                id/binding)]))]))
+             (raise-argument-error 'xref-binding-definition->tag
+                                   "(list/c (or/c module-path? module-path-index?) any/c)"
+                                   src)]))]
+        [else (raise-argument-error 'xref-binding-definition->tag
+                                    (string-append
+                                     "(or/c identifier? (lambda (l)\n"
+                                     "                    (and (list? l)\n"
+                                     "                         (or (= (length l) 2)\n"
+                                     "                             (= (length l) 7)))))")
+                                    id/binding)]))]))
 
 (define (xref-binding->definition-tag xrefs id/binding mode)
   (let-values ([(tag form?) (xref-binding-tag xrefs id/binding mode)])