diff options
author | Özgür Kesim <oec@codeblau.de> | 2020-02-25 21:59:14 +0100 |
---|---|---|
committer | Özgür Kesim <oec@codeblau.de> | 2020-02-25 21:59:14 +0100 |
commit | e2c58411159b77a6135be3731c4a174f01d9d7a5 (patch) | |
tree | 4c8797f8a5c99ce004671cc6725484db200e9c9c /combinator.go | |
parent | 390017951eb80a2e1b58dbf9217e464f76dd71b3 (diff) |
Any(): print all possible values
When all of the parsers in Any() fail, instead of printing just the
longest error, we print the list of all failed/expected values. The
position of the error will still remain that of the longest one.
Diffstat (limited to 'combinator.go')
-rw-r--r-- | combinator.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/combinator.go b/combinator.go index b6b888b..ea75589 100644 --- a/combinator.go +++ b/combinator.go @@ -2,6 +2,7 @@ package goparsify import ( "bytes" + "strings" ) // Seq matches all of the given parsers in order and returns their result as .Child[n] @@ -51,11 +52,13 @@ func Any(parsers ...Parserish) Parser { startpos := ps.Pos var longestError Error + expected := []string{} for _, parser := range parserfied { parser(ps, node) if ps.Errored() { if ps.Error.pos >= longestError.pos { longestError = ps.Error + expected = append(expected, ps.Error.expected) } if ps.Cut > startpos { break @@ -68,7 +71,10 @@ func Any(parsers ...Parserish) Parser { return } - ps.Error = longestError + ps.Error = Error{ + pos: longestError.pos, + expected: strings.Join(expected, " or "), + } ps.Pos = startpos }) } |