7x31
/
shellcheck
mirror of https://github.com/koalaman/shellcheck.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show 'eof' instead of blank string in unexpected token messages

This commit is contained in:
Vidar Holen 2012-11-05 01:39:37 -08:00
parent 9140544176
commit ae175bbdf4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shpell/Parser.hs
View File

@ -1006,10 +1006,13 @@ getStringFromParsec errors =
_ -> "Unknown error" _ -> "Unknown error"
where f err = where f err =
case err of case err of
UnExpect s -> (1, "Aborting due to unexpected " ++ s ++". Is this valid?") UnExpect s -> (1, unexpected s)
SysUnExpect s -> (2, "Aborting due to unexpected " ++ s ++ ". Is this valid?") SysUnExpect s -> (2, unexpected s)
Expect s -> (3, "Expected " ++ s ++ "") Expect s -> (3, "Expected " ++ s ++ "")
Message s -> (4, "Message: " ++ s) Message s -> (4, "Message: " ++ s)
wut "" = "eof"
wut x = x
unexpected s = "Aborting due to unexpected " ++ (wut s) ++ ". Is this valid?"
parseShell filename contents = do parseShell filename contents = do
case rp (parseWithNotes readScript) filename contents of case rp (parseWithNotes readScript) filename contents of