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

Issue 1731 Literals in case patterns 

https://github.com/koalaman/shellcheck/issues/1731

Any literal except esac is valid pattern in a case statement
This commit is contained in:
Gandalf- 2019-12-18 20:23:48 -08:00
parent 0f15fa49ba
commit 3f296a08c1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ShellCheck/Parser.hs
View File

@ -1040,14 +1040,16 @@ prop_readNormalWord9 = isOk readSubshell "(foo\\ ;\nbar)"
prop_readNormalWord10 = isWarning readNormalWord "\x201Chello\x201D" prop_readNormalWord10 = isWarning readNormalWord "\x201Chello\x201D"
prop_readNormalWord11 = isWarning readNormalWord "\x2018hello\x2019" prop_readNormalWord11 = isWarning readNormalWord "\x2018hello\x2019"
prop_readNormalWord12 = isWarning readNormalWord "hello\x2018" prop_readNormalWord12 = isWarning readNormalWord "hello\x2018"
readNormalWord = readNormalishWord "" readNormalWord = readNormalishWord "" ["do", "done", "then", "fi", "esac"]
readNormalishWord end = do readPatternWord = readNormalishWord "" ["esac"]
readNormalishWord end terms = do
start <- startSpan start <- startSpan
pos <- getPosition pos <- getPosition
x <- many1 (readNormalWordPart end) x <- many1 (readNormalWordPart end)
id <- endSpan start id <- endSpan start
checkPossibleTermination pos x checkPossibleTermination pos x terms
return $ T_NormalWord id x return $ T_NormalWord id x
readIndexSpan = do readIndexSpan = do
@ -1067,10 +1069,10 @@ readIndexSpan = do
id <- endSpan start id <- endSpan start
return $ T_Literal id str return $ T_Literal id str
checkPossibleTermination pos [T_Literal _ x] = checkPossibleTermination pos [T_Literal _ x] terminators =
when (x `elem` ["do", "done", "then", "fi", "esac"]) $ when (x `elem` terminators) $
parseProblemAt pos WarningC 1010 $ "Use semicolon or linefeed before '" ++ x ++ "' (or quote to make it literal)." parseProblemAt pos WarningC 1010 $ "Use semicolon or linefeed before '" ++ x ++ "' (or quote to make it literal)."
checkPossibleTermination _ _ = return () checkPossibleTermination _ _ _ = return ()
readNormalWordPart end = do readNormalWordPart end = do
notFollowedBy2 $ oneOf end notFollowedBy2 $ oneOf end
@ -2655,7 +2657,7 @@ readCoProc = called "coproc" $ do
return $ T_CoProcBody id body return $ T_CoProcBody id body
readPattern = (readNormalWord `thenSkip` spacing) `sepBy1` (char '|' `thenSkip` spacing) readPattern = (readPatternWord `thenSkip` spacing) `sepBy1` (char '|' `thenSkip` spacing)
prop_readCompoundCommand = isOk readCompoundCommand "{ echo foo; }>/dev/null" prop_readCompoundCommand = isOk readCompoundCommand "{ echo foo; }>/dev/null"
readCompoundCommand = do readCompoundCommand = do