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

Added warnings for then/fi/do/done treated literally.

This commit is contained in:
Vidar Holen 2012-11-25 10:49:21 -08:00
parent 21262399cc
commit 648090af31
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ShellCheck/Parser.hs
View File

@ -449,14 +449,17 @@ prop_readNormalWord = isOk readNormalWord "'foo'\"bar\"{1..3}baz$(lol)"
prop_readNormalWord2 = isOk readNormalWord "foo**(foo)!!!(@@(bar))" prop_readNormalWord2 = isOk readNormalWord "foo**(foo)!!!(@@(bar))"
readNormalWord = do readNormalWord = do
id <- getNextId id <- getNextId
pos <- getPosition
x <- many1 readNormalWordPart x <- many1 readNormalWordPart
checkPossibleTermination x checkPossibleTermination pos x
return $ T_NormalWord id x return $ T_NormalWord id x
checkPossibleTermination [T_Literal _ "}"] = checkPossibleTermination pos [T_Literal _ x] =
parseProblem WarningC "If you meant to terminate a {} block, you need a semicolon or linefeed before the }." if x `elem` ["do", "done", "then", "fi", "esac", "}"]
checkPossibleTermination _ = return () then parseProblemAt pos WarningC $ "Use semicolon or linefeed before '" ++ x ++ "' (or quote to make it literal)."
else return ()
checkPossibleTermination _ _ = return ()
readNormalWordPart = readSingleQuoted <|> readDoubleQuoted <|> readExtglob <|> readDollar <|> readBraced <|> readBackTicked <|> (readNormalLiteral) readNormalWordPart = readSingleQuoted <|> readDoubleQuoted <|> readExtglob <|> readDollar <|> readBraced <|> readBackTicked <|> (readNormalLiteral)
@ -891,19 +894,12 @@ readIfClause = do
) )
return $ T_IfExpression id ((condition, action):elifs) elses return $ T_IfExpression id ((condition, action):elifs) elses
checkIfNotSpecial pos key stuff = do
eof
let f (T_Literal id str) | str == key = parseProblemAt pos ErrorC $ "You need a \\n or ; before '"++ key ++ "' to make it special."
f t = return ()
mapM (doAnalysis f) stuff
fail "lol"
readIfPart = do readIfPart = do
g_If g_If
allspacing allspacing
pos <- getPosition pos <- getPosition
condition <- readTerm condition <- readTerm
g_Then <|> (checkIfNotSpecial pos "then" condition) g_Then
acceptButWarn g_Semi ErrorC "No semicolons directly after 'then'." acceptButWarn g_Semi ErrorC "No semicolons directly after 'then'."
allspacing allspacing
action <- readTerm action <- readTerm
@ -914,7 +910,7 @@ readElifPart = do
g_Elif g_Elif
allspacing allspacing
condition <- readTerm condition <- readTerm
g_Then <|> (checkIfNotSpecial pos "then" condition) g_Then
acceptButWarn g_Semi ErrorC "No semicolons directly after 'then'." acceptButWarn g_Semi ErrorC "No semicolons directly after 'then'."
allspacing allspacing
action <- readTerm action <- readTerm
@ -953,7 +949,7 @@ readWhileClause = do
condition <- readTerm condition <- readTerm
return () `attempting` (do return () `attempting` (do
eof eof
parseProblemAt pos ErrorC "Condition missing 'do'. Did you forget it or the ; or \\n before i?" parseProblemAt pos ErrorC "Condition missing 'do'. Did you forget it or the ; or \\n before it?"
) )
statements <- readDoGroup statements <- readDoGroup
return $ T_WhileExpression id condition statements return $ T_WhileExpression id condition statements