From 22b4cd7b924f27231ed92c950cee6abe8a3cd5c9 Mon Sep 17 00:00:00 2001 From: vlad Date: Wed, 11 Oct 2017 16:37:31 -0700 Subject: Support for boolean filters --- .../scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala') diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala index e46e11c..2b89831 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala @@ -104,9 +104,12 @@ object SearchFilterParser { private val longParser: Parser[Long] = P(CharIn('0' to '9').rep(min = 1).!.map(_.toLong)) + private val booleanParser: Parser[Boolean] = + P((IgnoreCase("true") | IgnoreCase("false")).!.map(_.toBoolean)) + private val binaryAtomParser: Parser[SearchFilterExpr.Atom.Binary] = P( dimensionParser ~ whitespaceParser ~ ( - (numericOperatorParser.! ~ whitespaceParser ~ (longParser | numberParser.!)) | + (numericOperatorParser.! ~ whitespaceParser ~ (longParser | booleanParser | numberParser.!)) | (commonOperatorParser.! ~ whitespaceParser ~ AnyChar.rep(min = 1).!) ) ~ End ).map { @@ -116,7 +119,7 @@ object SearchFilterParser { private val nAryAtomParser: Parser[SearchFilterExpr.Atom.NAry] = P( dimensionParser ~ whitespaceParser ~ ( naryOperatorParser ~ whitespaceParser ~ - (longParser.rep(min = 1, sep = ",") | nAryValueParser.!.rep(min = 1, sep = ",")) + (longParser.rep(min = 1, sep = ",") | booleanParser.rep(min = 1, sep = ",") | nAryValueParser.!.rep(min = 1, sep = ",")) ) ~ End ).map { case NAryAtomFromTuple(atom) => atom -- cgit v1.2.3 From e147d9c31b5817809c9875e3d746f53ea849c1a1 Mon Sep 17 00:00:00 2001 From: vlad Date: Wed, 11 Oct 2017 18:13:01 -0700 Subject: Support for boolean filters --- src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala') diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala index 2b89831..85e9149 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala @@ -119,7 +119,8 @@ object SearchFilterParser { private val nAryAtomParser: Parser[SearchFilterExpr.Atom.NAry] = P( dimensionParser ~ whitespaceParser ~ ( naryOperatorParser ~ whitespaceParser ~ - (longParser.rep(min = 1, sep = ",") | booleanParser.rep(min = 1, sep = ",") | nAryValueParser.!.rep(min = 1, sep = ",")) + (longParser.rep(min = 1, sep = ",") | booleanParser.rep(min = 1, sep = ",") | nAryValueParser.!.rep(min = 1, + sep = ",")) ) ~ End ).map { case NAryAtomFromTuple(atom) => atom -- cgit v1.2.3