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

Correcting pr 8867

Browse Source 
svn: r7092
This commit is contained in:
Kathy Gray 2007-08-13 23:34:38 +00:00
parent 3d3a0d8d60
commit 377b8b17e1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
collects/combinator-parser/private-combinator/combinator-parser.scm
View File

@ -72,6 +72,9 @@
(!!! (fail-type->message
(!!! (car (repeat-res-stop
(sort-repeats possible-repeat-errors))))))]
[(and (choice-res? result) (fail-type? (choice-res-errors result)))
(!!! (fail-type->message
(choice-res-errors result)))]
[(not (null? possible-errors))
;(printf "choice or pair fail~n")
(!!! (fail-type->message

8
collects/combinator-parser/private-combinator/errors.scm
View File

@ -120,7 +120,7 @@
(> (length winners) max-choice-depth))
(collapse-message
(add-to-message
(msg (format "An error occurred in this ~a. Program resembles one of ~a.~n"
(msg (format "An error occurred in this ~a. Program resembles one of: ~a.~n"
name (nice-list non-dup-tops)))
name #f message-to-date))]
[(and (> (length winners) 1)
@ -167,7 +167,7 @@
(equal? top-names no-dup-names))
(collapse-message
(add-to-message
(msg (format "An error occured in this ~a, expected one of ~a."
(msg (format "An error occured in this ~a, expected one of: ~a."
name (nice-list no-dup-names)))
name #f message-to-date))]
[(and (<= (choice-fail-options fail-type) max-choice-depth)
@ -179,13 +179,13 @@
(collapse-message
(add-to-message (car messages) #f #f
(add-to-message
(msg (format "An error occured in this ~a, expected one of ~a."
(msg (format "An error occured in this ~a, expected one of: ~a."
name (nice-list no-dup-names))
name #f message-to-date))))]
[else
(collapse-message
(add-to-message
(msg (format "An error occured in this ~a, expected one of ~a. Possible errors were:~n~a"
(msg (format "An error occured in this ~a, expected one of: ~a. Possible errors were:~n~a"
name (nice-list no-dup-names)
(alternate-error-list (map err-msg messages))))
name #f message-to-date))]))]