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

Don't consider {} and {a} brace expansions.

This commit is contained in:
Vidar Holen 2015-10-03 21:12:28 -07:00
parent 4172722167
commit 55692926b9
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ShellCheck/Parser.hs
View File

@ -1152,12 +1152,19 @@ prop_readBraced3 = isOk readBraced "{1,\\},2}"
prop_readBraced4 = isOk readBraced "{1,{2,3}}" prop_readBraced4 = isOk readBraced "{1,{2,3}}"
prop_readBraced5 = isOk readBraced "{JP{,E}G,jp{,e}g}" prop_readBraced5 = isOk readBraced "{JP{,E}G,jp{,e}g}"
prop_readBraced6 = isOk readBraced "{foo,bar,$((${var}))}" prop_readBraced6 = isOk readBraced "{foo,bar,$((${var}))}"
prop_readBraced7 = isNotOk readBraced "{}"
prop_readBraced8 = isNotOk readBraced "{foo}"
readBraced = try braceExpansion readBraced = try braceExpansion
where where
braceExpansion = braceExpansion =
T_BraceExpansion `withParser` do T_BraceExpansion `withParser` do
char '{' char '{'
elements <- bracedElement `sepBy1` char ',' elements <- bracedElement `sepBy1` char ','
guard $
case elements of
(_:_:_) -> True
[t] -> ".." `isInfixOf` onlyLiteralString t
[] -> False
char '}' char '}'
return elements return elements
bracedElement = bracedElement =
@ -2334,6 +2341,7 @@ readScript = do
isWarning p s = parsesCleanly p s == Just False isWarning p s = parsesCleanly p s == Just False
isOk p s = parsesCleanly p s == Just True isOk p s = parsesCleanly p s == Just True
isNotOk p s = parsesCleanly p s == Nothing
testParse string = runIdentity $ do testParse string = runIdentity $ do
(res, _) <- runParser (mockedSystemInterface []) readScript "-" string (res, _) <- runParser (mockedSystemInterface []) readScript "-" string