more error-message conversions and repairs

original commit: a137459b65b54d65595e854101aae7440d9e65f6
This commit is contained in:
Matthew Flatt 2012-05-27 11:29:21 -06:00
parent 625ee5db99
commit b5f09c0d39
3 changed files with 17 additions and 13 deletions

View File

@ -60,7 +60,7 @@
[(string? s) (make-style s null)] [(string? s) (make-style s null)]
[(symbol? s) (make-style #f (list s))] [(symbol? s) (make-style #f (list s))]
[(and (list? s) (andmap symbol? s)) (make-style #f 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] (define (title #:tag [tag #f] #:tag-prefix [prefix #f] #:style [style plain]
#:version [version #f] #:date [date #f] #:version [version #f] #:date [date #f]

View File

@ -178,19 +178,19 @@
(define (make-eval-results contents out err) (define (make-eval-results contents out err)
(unless (and (list? contents) (unless (and (list? contents)
(andmap content? contents)) (andmap content? contents))
(raise-type-error 'eval:results "list of content" contents)) (raise-argument-error 'eval:results "(listof content?)" contents))
(unless (string? out) (unless (string? out)
(raise-type-error 'eval:results "string" out)) (raise-argument-error 'eval:results "string?" out))
(unless (string? err) (unless (string? err)
(raise-type-error 'eval:results "string" err)) (raise-argument-error 'eval:results "string?" err))
(eval-results contents out err)) (eval-results contents out err))
(define (make-eval-result content out err) (define (make-eval-result content out err)
(unless (content? content) (unless (content? content)
(raise-type-error 'eval:result "content" content)) (raise-argument-error 'eval:result "content?" content))
(unless (string? out) (unless (string? out)
(raise-type-error 'eval:result "string" out)) (raise-argument-error 'eval:result "string?" out))
(unless (string? err) (unless (string? err)
(raise-type-error 'eval:result "string" err)) (raise-argument-error 'eval:result "string?" err))
(eval-results (list content) out err)) (eval-results (list content) out err))
(define (extract-to-evaluate s) (define (extract-to-evaluate s)

View File

@ -106,12 +106,16 @@
[(module-path? src) [(module-path? src)
(loop (module-path-index-join src #f))] (loop (module-path-index-join src #f))]
[else [else
(raise-type-error 'xref-binding-definition->tag (raise-argument-error 'xref-binding-definition->tag
"list starting with module path or module path index" "(list/c (or/c module-path? module-path-index?) any/c)"
src)]))] src)]))]
[else (raise-type-error 'xref-binding-definition->tag [else (raise-argument-error 'xref-binding-definition->tag
"identifier, 2-element list, or 7-element list" (string-append
id/binding)]))])) "(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) (define (xref-binding->definition-tag xrefs id/binding mode)
(let-values ([(tag form?) (xref-binding-tag xrefs id/binding mode)]) (let-values ([(tag form?) (xref-binding-tag xrefs id/binding mode)])