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

Support nested trinary expressions.

This commit is contained in:
Vidar Holen 2015-08-22 14:20:20 -07:00
parent 10276c878d
commit 090e09e4ca
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ShellCheck/Parser.hs
View File

@ -553,6 +553,8 @@ prop_a16= isOk readArithmeticContents "$foo$bar"
prop_a17= isOk readArithmeticContents "i<(0+(1+1))" prop_a17= isOk readArithmeticContents "i<(0+(1+1))"
prop_a18= isOk readArithmeticContents "a?b:c" prop_a18= isOk readArithmeticContents "a?b:c"
prop_a19= isOk readArithmeticContents "\\\n3 +\\\n 2" prop_a19= isOk readArithmeticContents "\\\n3 +\\\n 2"
prop_a20= isOk readArithmeticContents "a ? b ? c : d : e"
prop_a21= isOk readArithmeticContents "a ? b : c ? d : e"
readArithmeticContents = readArithmeticContents =
readSequence readSequence
where where
@ -618,16 +620,15 @@ readArithmeticContents =
readAssignment = readTrinary `splitBy` ["=", "*=", "/=", "%=", "+=", "-=", "<<=", ">>=", "&=", "^=", "|="] readAssignment = readTrinary `splitBy` ["=", "*=", "/=", "%=", "+=", "-=", "<<=", ">>=", "&=", "^=", "|="]
readTrinary = do readTrinary = do
let part = readLogicalOr x <- readLogicalOr
x <- part
do do
id <- getNextId id <- getNextId
string "?" string "?"
spacing spacing
y <- part y <- readTrinary
string ":" string ":"
spacing spacing
z <- part z <- readTrinary
return $ TA_Trinary id x y z return $ TA_Trinary id x y z
<|> <|>
return x return x