github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-22 14:21:31 +03:00
Code Issues Projects Releases Wiki Activity

Pull the context into the where clause.

Browse Source
This commit is contained in:
Rob Rix 2017-05-01 10:52:29 -04:00
parent e33da12d1b
commit c0dd99a5a4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Data/Syntax/Assignment.hs
View File

@ -93,12 +93,13 @@ data Error symbol = Error
showError :: Show symbol => Source.Source -> Error symbol -> ShowS showError :: Show symbol => Source.Source -> Error symbol -> ShowS
showError source Error{..} showError source Error{..}
= showSourcePos errorPos . showString ": error: " . showExpectation . showChar '\n' = showSourcePos errorPos . showString ": error: " . showExpectation . showChar '\n'
. showString (toS (Source.sourceText (Source.actualLines source !! Info.line errorPos))) -- actualLines results include line endings, so no newline here . showString context -- actualLines results include line endings, so no newline here
. showString (replicate (Info.column errorPos) ' ') . showChar '^' . showChar '\n' . showString (replicate (Info.column errorPos) ' ') . showChar '^' . showChar '\n'
where showExpectation = case (errorExpected, errorActual) of where showExpectation = case (errorExpected, errorActual) of
([], Nothing) -> showString "no rule to match at end of input nodes" ([], Nothing) -> showString "no rule to match at end of input nodes"
(symbols, Nothing) -> showString "expected " . showSymbols symbols . showString " at end of input nodes" (symbols, Nothing) -> showString "expected " . showSymbols symbols . showString " at end of input nodes"
(symbols, Just a) -> showString "expected " . showSymbols symbols . showString ", but got " . shows a (symbols, Just a) -> showString "expected " . showSymbols symbols . showString ", but got " . shows a
context = toS (Source.sourceText (Source.actualLines source !! Info.line errorPos))
showSymbols :: Show symbol => [symbol] -> ShowS showSymbols :: Show symbol => [symbol] -> ShowS
showSymbols [] = showString "end of input nodes" showSymbols [] = showString "end of input nodes"