suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve wording of "expected more terms" messages

Browse Source
This commit is contained in:
Ryan Culpepper 2013-10-11 00:17:47 -04:00
parent 454234cfc9
commit e3d7c5a22c
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
racket/collects/syntax/parse/private/runtime-report.rkt
View File

@ -98,13 +98,19 @@ complicated.
(report (prose-for-expects (expect:disj-expects frame-expect)) (report (prose-for-expects (expect:disj-expects frame-expect))
context frame-stx within-stx)] context frame-stx within-stx)]
[else [else
(report (prose-for-expect frame-expect) context frame-stx within-stx)]))]))) (report (prose-for-expects (list frame-expect))
context frame-stx within-stx)]))])))
;; prose-for-expects : (listof Expect) -> string ;; prose-for-expects : (listof Expect) -> string
;; FIXME: partition by role first? ;; FIXME: partition by role first?
(define (prose-for-expects expects) (define (prose-for-expects expects)
(join-sep (for/list ([expect expects]) (join-sep (append (for/list ([expect expects]
(prose-for-expect expect)) #:when (not (expect:proper-pair? expect)))
(prose-for-expect expect))
(let ([proper-pair-expects (filter expect:proper-pair? expects)])
(if (pair? proper-pair-expects)
(list (prose-for-proper-pair-expects proper-pair-expects))
null)))
";" "or")) ";" "or"))
;; prose-for-expect : Expect -> string ;; prose-for-expect : Expect -> string
@ -124,15 +130,28 @@ complicated.
[(expect:message message _) [(expect:message message _)
(format "~a" message)] (format "~a" message)]
[(expect:proper-pair '#f _) [(expect:proper-pair '#f _)
"expected more terms"] "expected more terms"]))
[(expect:proper-pair first-desc _)
(format "expected more terms starting with ~a"
(match first-desc
[(? string?) first-desc]
[(list 'any) "any term"]
[(list 'literal id) (format "the literal symbol `~s'" id)]
[(list 'datum d) (format "the literal ~s" d)]))]))
;; prose-for-proper-pair-expects : (listof expect:proper-pair) -> string
(define (prose-for-proper-pair-expects es)
(define descs (remove-duplicates (map expect:proper-pair-first-desc es)))
(cond [(for/or ([desc descs]) (equal? desc #f))
;; FIXME: better way to indicate unknown ???
"expected more terms"]
[else
(format "expected more terms starting with ~a"
(join-sep (map prose-for-first-desc descs)
"," "or"))]))
;; prose-for-first-desc : FirstDesc -> string
(define (prose-for-first-desc desc)
(match desc
[(? string?) desc]
[(list 'any) "any term"] ;; FIXME: maybe should cancel out other descs ???
[(list 'literal id) (format "the literal symbol `~s'" id)]
[(list 'datum d) (format "the literal ~s" d)]))
;; context-prose-for-expect : expect:thing -> (listof string)
(define (context-prose-for-expect e) (define (context-prose-for-expect e)
(match e (match e
[(expect:thing stx+index description transparent? role _) [(expect:thing stx+index description transparent? role _)