Allow more than two conditions in a single and/or, Fix #889 (#892)

This commit is contained in:
Steve Chávez
2017-06-21 00:52:21 -05:00
committed by Joe Nelson
parent 35d5e930ea
commit b007428142
5 changed files with 30 additions and 13 deletions
+1 -1
View File
@@ -177,7 +177,7 @@ pOrderTerm =
pLogicTree :: Parser LogicTree
pLogicTree = Stmnt <$> try pLogicFilter
<|> Expr <$> pNot <*> pLogicOp <*> (lexeme (char '(') *> pLogicTree) <*> (lexeme (char ',') *> pLogicTree <* lexeme (char ')'))
<|> Expr <$> pNot <*> pLogicOp <*> (lexeme (char '(') *> pLogicTree `sepBy1` lexeme (char ',') <* lexeme (char ')'))
where
pLogicFilter :: Parser Filter
pLogicFilter = Filter <$> pField <* pDelimiter <*> pOperation pLogicVText pLogicVTextL