From 17209ac855a90f38531be86a11594c0dd9ee3c12 Mon Sep 17 00:00:00 2001 From: Sidhant Aggarwal <10743214+sidhant92@users.noreply.github.com> Date: Tue, 28 May 2024 01:22:18 +0530 Subject: [PATCH 01/10] replace string node with unary node --- .../ArithmeticExpressionEvaluator.java | 11 +++-- .../boolparser/domain/StringNode.java | 24 ---------- .../antlr/BooleanExpressionBaseListener.java | 4 +- .../antlr/BooleanExpressionListener.java | 8 ++-- .../parser/antlr/BooleanExpressionParser.java | 48 +++++++++---------- .../parser/antlr/BooleanFilterListener.java | 12 ++--- src/main/java/resources/BooleanExpression.g4 | 7 ++- .../antlr/BooleanFilterBoolParserTest.java | 5 +- 8 files changed, 48 insertions(+), 71 deletions(-) delete mode 100644 src/main/java/com/github/sidhant92/boolparser/domain/StringNode.java diff --git a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java index f74f160..58b8626 100644 --- a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java +++ b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java @@ -10,7 +10,7 @@ import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.Operator; -import com.github.sidhant92.boolparser.domain.StringNode; +import com.github.sidhant92.boolparser.domain.UnaryNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticLeafNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticUnaryNode; @@ -61,16 +61,17 @@ private Object evaluateToken(final Node node, final Map data) { return evaluateUnaryArithmeticToken((ArithmeticUnaryNode) node, data); case ARITHMETIC_FUNCTION: return evaluateArithmeticFunctionToken((ArithmeticFunctionNode) node, data); - case STRING: - return evaluateStringToken((StringNode) node, data); + case UNARY: + return evaluateStringToken((UnaryNode) node, data); default: log.error("unsupported token {}", node.getTokenType()); throw new UnsupportedToken(); } } - private Object evaluateStringToken(final StringNode stringNode, final Map data) { - return ValueUtils.getValueFromMap(stringNode.getField(), data).orElse(stringNode.getField()); + private Object evaluateStringToken(final UnaryNode unaryNode, final Map data) { + return unaryNode.getDataType() == DataType.STRING ? ValueUtils.getValueFromMap(unaryNode.getValue().toString(), data) + .orElse(unaryNode.getValue()) : unaryNode.getValue(); } private Pair evaluateArithmeticLeafToken(final ArithmeticLeafNode arithmeticLeafNode, final Map data) { diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/StringNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/StringNode.java deleted file mode 100644 index 43a8fd3..0000000 --- a/src/main/java/com/github/sidhant92/boolparser/domain/StringNode.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.github.sidhant92.boolparser.domain; - -import com.github.sidhant92.boolparser.constant.NodeType; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; - -/** - * @author sidhant.aggarwal - * @since 16/03/2024 - */ -@AllArgsConstructor -@Getter -@Setter -@Builder -public class StringNode extends Node { - private final String field; - - @Override - public NodeType getTokenType() { - return NodeType.STRING; - } -} diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionBaseListener.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionBaseListener.java index 73b6c47..7aba7d1 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionBaseListener.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionBaseListener.java @@ -184,13 +184,13 @@ public class BooleanExpressionBaseListener implements BooleanExpressionListener * *

The default implementation does nothing.

*/ - @Override public void enterArrayArithmeticFunction(BooleanExpressionParser.ArrayArithmeticFunctionContext ctx) { } + @Override public void enterArithmeticFunction(BooleanExpressionParser.ArithmeticFunctionContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void exitArrayArithmeticFunction(BooleanExpressionParser.ArrayArithmeticFunctionContext ctx) { } + @Override public void exitArithmeticFunction(BooleanExpressionParser.ArithmeticFunctionContext ctx) { } /** * {@inheritDoc} * diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionListener.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionListener.java index f152d69..fc60aea 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionListener.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionListener.java @@ -169,15 +169,15 @@ public interface BooleanExpressionListener extends ParseTreeListener { */ void exitArithmeticOperator(BooleanExpressionParser.ArithmeticOperatorContext ctx); /** - * Enter a parse tree produced by {@link BooleanExpressionParser#arrayArithmeticFunction}. + * Enter a parse tree produced by {@link BooleanExpressionParser#arithmeticFunction}. * @param ctx the parse tree */ - void enterArrayArithmeticFunction(BooleanExpressionParser.ArrayArithmeticFunctionContext ctx); + void enterArithmeticFunction(BooleanExpressionParser.ArithmeticFunctionContext ctx); /** - * Exit a parse tree produced by {@link BooleanExpressionParser#arrayArithmeticFunction}. + * Exit a parse tree produced by {@link BooleanExpressionParser#arithmeticFunction}. * @param ctx the parse tree */ - void exitArrayArithmeticFunction(BooleanExpressionParser.ArrayArithmeticFunctionContext ctx); + void exitArithmeticFunction(BooleanExpressionParser.ArithmeticFunctionContext ctx); /** * Enter a parse tree produced by {@link BooleanExpressionParser#wordlist}. * @param ctx the parse tree diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionParser.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionParser.java index dccc41d..04e4667 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionParser.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionParser.java @@ -24,11 +24,11 @@ public class BooleanExpressionParser extends Parser { SQ=40, DQ=41; public static final int RULE_parse = 0, RULE_expression = 1, RULE_comparator = 2, RULE_arithmeticOperator = 3, - RULE_arrayArithmeticFunction = 4, RULE_wordlist = 5, RULE_arrayOperators = 6, + RULE_arithmeticFunction = 4, RULE_wordlist = 5, RULE_arrayOperators = 6, RULE_numericTypes = 7, RULE_types = 8, RULE_binary = 9, RULE_bool = 10; private static String[] makeRuleNames() { return new String[] { - "parse", "expression", "comparator", "arithmeticOperator", "arrayArithmeticFunction", + "parse", "expression", "comparator", "arithmeticOperator", "arithmeticFunction", "wordlist", "arrayOperators", "numericTypes", "types", "binary", "bool" }; } @@ -283,10 +283,10 @@ public void exitRule(ParseTreeListener listener) { } @SuppressWarnings("CheckReturnValue") public static class ArithmeticFunctionExpressionContext extends ExpressionContext { - public ArrayArithmeticFunctionContext left; + public ArithmeticFunctionContext left; public WordlistContext data; - public ArrayArithmeticFunctionContext arrayArithmeticFunction() { - return getRuleContext(ArrayArithmeticFunctionContext.class,0); + public ArithmeticFunctionContext arithmeticFunction() { + return getRuleContext(ArithmeticFunctionContext.class,0); } public WordlistContext wordlist() { return getRuleContext(WordlistContext.class,0); @@ -447,7 +447,7 @@ private ExpressionContext expression(int _p) throws RecognitionException { _ctx = _localctx; _prevctx = _localctx; setState(34); - ((ArithmeticFunctionExpressionContext)_localctx).left = arrayArithmeticFunction(); + ((ArithmeticFunctionExpressionContext)_localctx).left = arithmeticFunction(); setState(35); ((ArithmeticFunctionExpressionContext)_localctx).data = wordlist(); } @@ -778,7 +778,7 @@ public final ArithmeticOperatorContext arithmeticOperator() throws RecognitionEx } @SuppressWarnings("CheckReturnValue") - public static class ArrayArithmeticFunctionContext extends ParserRuleContext { + public static class ArithmeticFunctionContext extends ParserRuleContext { public TerminalNode MIN() { return getToken(BooleanExpressionParser.MIN, 0); } public TerminalNode MAX() { return getToken(BooleanExpressionParser.MAX, 0); } public TerminalNode SUM() { return getToken(BooleanExpressionParser.SUM, 0); } @@ -788,23 +788,23 @@ public static class ArrayArithmeticFunctionContext extends ParserRuleContext { public TerminalNode LEN() { return getToken(BooleanExpressionParser.LEN, 0); } public TerminalNode MEDIAN() { return getToken(BooleanExpressionParser.MEDIAN, 0); } public TerminalNode INT() { return getToken(BooleanExpressionParser.INT, 0); } - public ArrayArithmeticFunctionContext(ParserRuleContext parent, int invokingState) { + public ArithmeticFunctionContext(ParserRuleContext parent, int invokingState) { super(parent, invokingState); } - @Override public int getRuleIndex() { return RULE_arrayArithmeticFunction; } + @Override public int getRuleIndex() { return RULE_arithmeticFunction; } @Override public void enterRule(ParseTreeListener listener) { - if ( listener instanceof BooleanExpressionListener ) ((BooleanExpressionListener)listener).enterArrayArithmeticFunction(this); + if ( listener instanceof BooleanExpressionListener ) ((BooleanExpressionListener)listener).enterArithmeticFunction(this); } @Override public void exitRule(ParseTreeListener listener) { - if ( listener instanceof BooleanExpressionListener ) ((BooleanExpressionListener)listener).exitArrayArithmeticFunction(this); + if ( listener instanceof BooleanExpressionListener ) ((BooleanExpressionListener)listener).exitArithmeticFunction(this); } } - public final ArrayArithmeticFunctionContext arrayArithmeticFunction() throws RecognitionException { - ArrayArithmeticFunctionContext _localctx = new ArrayArithmeticFunctionContext(_ctx, getState()); - enterRule(_localctx, 8, RULE_arrayArithmeticFunction); + public final ArithmeticFunctionContext arithmeticFunction() throws RecognitionException { + ArithmeticFunctionContext _localctx = new ArithmeticFunctionContext(_ctx, getState()); + enterRule(_localctx, 8, RULE_arithmeticFunction); int _la; try { enterOuterAlt(_localctx, 1); @@ -834,15 +834,15 @@ public final ArrayArithmeticFunctionContext arrayArithmeticFunction() throws Rec @SuppressWarnings("CheckReturnValue") public static class WordlistContext extends ParserRuleContext { - public TypesContext first; - public TypesContext rest; + public ExpressionContext first; + public ExpressionContext rest; public TerminalNode LPAREN() { return getToken(BooleanExpressionParser.LPAREN, 0); } public TerminalNode RPAREN() { return getToken(BooleanExpressionParser.RPAREN, 0); } - public List types() { - return getRuleContexts(TypesContext.class); + public List expression() { + return getRuleContexts(ExpressionContext.class); } - public TypesContext types(int i) { - return getRuleContext(TypesContext.class,i); + public ExpressionContext expression(int i) { + return getRuleContext(ExpressionContext.class,i); } public List WS() { return getTokens(BooleanExpressionParser.WS); } public TerminalNode WS(int i) { @@ -889,7 +889,7 @@ public final WordlistContext wordlist() throws RecognitionException { _alt = getInterpreter().adaptivePredict(_input,7,_ctx); } setState(105); - ((WordlistContext)_localctx).first = types(); + ((WordlistContext)_localctx).first = expression(0); setState(109); _errHandler.sync(this); _la = _input.LA(1); @@ -929,7 +929,7 @@ public final WordlistContext wordlist() throws RecognitionException { _alt = getInterpreter().adaptivePredict(_input,9,_ctx); } setState(119); - ((WordlistContext)_localctx).rest = types(); + ((WordlistContext)_localctx).rest = expression(0); setState(123); _errHandler.sync(this); _la = _input.LA(1); @@ -1339,13 +1339,13 @@ private boolean expression_sempred(ExpressionContext _localctx, int predIndex) { "\u0000\u0000a\t\u0001\u0000\u0000\u0000bf\u0005 \u0000\u0000ce\u0005%"+ "\u0000\u0000dc\u0001\u0000\u0000\u0000eh\u0001\u0000\u0000\u0000fd\u0001"+ "\u0000\u0000\u0000fg\u0001\u0000\u0000\u0000gi\u0001\u0000\u0000\u0000"+ - "hf\u0001\u0000\u0000\u0000im\u0003\u0010\b\u0000jl\u0005%\u0000\u0000"+ + "hf\u0001\u0000\u0000\u0000im\u0003\u0002\u0001\u0000jl\u0005%\u0000\u0000"+ "kj\u0001\u0000\u0000\u0000lo\u0001\u0000\u0000\u0000mk\u0001\u0000\u0000"+ "\u0000mn\u0001\u0000\u0000\u0000n\u0080\u0001\u0000\u0000\u0000om\u0001"+ "\u0000\u0000\u0000pt\u0005\u0001\u0000\u0000qs\u0005%\u0000\u0000rq\u0001"+ "\u0000\u0000\u0000sv\u0001\u0000\u0000\u0000tr\u0001\u0000\u0000\u0000"+ "tu\u0001\u0000\u0000\u0000uw\u0001\u0000\u0000\u0000vt\u0001\u0000\u0000"+ - "\u0000w{\u0003\u0010\b\u0000xz\u0005%\u0000\u0000yx\u0001\u0000\u0000"+ + "\u0000w{\u0003\u0002\u0001\u0000xz\u0005%\u0000\u0000yx\u0001\u0000\u0000"+ "\u0000z}\u0001\u0000\u0000\u0000{y\u0001\u0000\u0000\u0000{|\u0001\u0000"+ "\u0000\u0000|\u007f\u0001\u0000\u0000\u0000}{\u0001\u0000\u0000\u0000"+ "~p\u0001\u0000\u0000\u0000\u007f\u0082\u0001\u0000\u0000\u0000\u0080~"+ diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java index 0359c64..529f837 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java @@ -13,7 +13,6 @@ import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.LogicalOperationType; import com.github.sidhant92.boolparser.constant.Operator; -import com.github.sidhant92.boolparser.domain.StringNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticLeafNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; @@ -174,9 +173,9 @@ public void exitInExpression(BooleanExpressionParser.InExpressionContext ctx) { private List> getArrayElements(final List trees) { return trees .stream() - .filter(child -> child instanceof BooleanExpressionParser.TypesContext) + .filter(child -> child instanceof BooleanExpressionParser.TypesExpressionContext) .map(child -> { - final DataType dataType = getDataType(((BooleanExpressionParser.TypesContext) child).start); + final DataType dataType = getDataType(((BooleanExpressionParser.TypesExpressionContext) child).start); final Object value = ValueUtils.convertValue(child.getText(), dataType); return Pair.of(dataType, value); }) @@ -186,9 +185,9 @@ private List> getArrayElements(final List tree private List getArithmeticArrayElements(final List trees) { return trees .stream() - .filter(child -> child instanceof BooleanExpressionParser.TypesContext) + .filter(child -> child instanceof BooleanExpressionParser.TypesExpressionContext) .map(child -> { - final DataType dataType = getDataType(((BooleanExpressionParser.TypesContext) child).start); + final DataType dataType = getDataType(((BooleanExpressionParser.TypesExpressionContext) child).start); final Object value = ValueUtils.convertValue(child.getText(), dataType); return new ArithmeticLeafNode(value, dataType); }) @@ -248,7 +247,8 @@ public void exitParse(BooleanExpressionParser.ParseContext ctx) { } } if (this.node == null && tokenCount == 1 && lastToken instanceof CommonToken) { - this.node = StringNode.builder().field(ValueUtils.convertValue(lastToken.getText(), DataType.STRING).toString()).build(); + this.node = UnaryNode.builder().dataType(DataType.STRING).value(ValueUtils.convertValue(lastToken.getText(), DataType.STRING).toString()) + .build(); } if (this.node == null) { log.error("Error parsing expression for the string {}", ctx.getText()); diff --git a/src/main/java/resources/BooleanExpression.g4 b/src/main/java/resources/BooleanExpression.g4 index 807beeb..80ee6c2 100644 --- a/src/main/java/resources/BooleanExpression.g4 +++ b/src/main/java/resources/BooleanExpression.g4 @@ -15,7 +15,7 @@ expression | left=expression op= MODULUS right=expression #arithmeticExpression | left=expression op= ADD right=expression #arithmeticExpression | left=expression op= SUBTRACT right=expression #arithmeticExpression - | left=arrayArithmeticFunction data=wordlist #arithmeticFunctionExpression + | left=arithmeticFunction data=wordlist #arithmeticFunctionExpression | left=expression op=binary right=expression #binaryExpression | types #typesExpression | (field=WORD)? lower=numericTypes TO upper=numericTypes #toExpression @@ -36,7 +36,7 @@ arithmeticOperator | EXPONENT ; - arrayArithmeticFunction +arithmeticFunction : MIN | MAX | SUM @@ -48,9 +48,8 @@ arithmeticOperator | INT ; - wordlist - : LPAREN WS* first=types WS* (',' WS* rest=types WS*)* RPAREN + : LPAREN WS* first=expression WS* (',' WS* rest=expression WS*)* RPAREN ; arrayOperators diff --git a/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java b/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java index a37141f..bc438bf 100644 --- a/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java +++ b/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java @@ -10,7 +10,6 @@ import com.github.sidhant92.boolparser.constant.LogicalOperationType; import com.github.sidhant92.boolparser.constant.NodeType; import com.github.sidhant92.boolparser.constant.Operator; -import com.github.sidhant92.boolparser.domain.StringNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticLeafNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; @@ -330,7 +329,9 @@ public void testStringList2() { public void testSingleToken() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("a"); assertTrue(nodeOptional.isSuccess()); - assertTrue(nodeOptional.get() instanceof StringNode); + assertTrue(nodeOptional.get() instanceof UnaryNode); + assertEquals(((UnaryNode) nodeOptional.get()).getDataType(), DataType.STRING); + assertEquals(((UnaryNode) nodeOptional.get()).getValue(), "a"); } @Test From 9f65eecfcce906edc7d833a76fec510ef05591d4 Mon Sep 17 00:00:00 2001 From: Sidhant Aggarwal <10743214+sidhant92@users.noreply.github.com> Date: Tue, 28 May 2024 01:24:38 +0530 Subject: [PATCH 02/10] fix test case --- .../boolparser/application/BooleanExpressionEvaluatorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluatorTest.java b/src/test/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluatorTest.java index 79e0017..4ca1dfd 100644 --- a/src/test/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluatorTest.java +++ b/src/test/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluatorTest.java @@ -543,7 +543,7 @@ public void testComparisonWithArithmeticVariableFunction() { numbers.add(30); data.put("age", "20"); data.put("numbers", numbers); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("age > max (numbers))", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("age > max (numbers)", data); assertTrue(booleanOptional.isSuccess()); assertFalse(booleanOptional.get()); } From 9f8b543b488d1d814021c3d0b4f9cc1bb0a041e5 Mon Sep 17 00:00:00 2001 From: Sidhant Aggarwal <10743214+sidhant92@users.noreply.github.com> Date: Tue, 28 May 2024 11:22:40 +0530 Subject: [PATCH 03/10] replace pair for evaluated node --- .../ArithmeticExpressionEvaluator.java | 46 +++++++++---------- .../boolparser/domain/EvaluatedNode.java | 17 +++++++ .../function/FunctionEvaluatorService.java | 9 ++-- .../function/arithmetic/AbstractFunction.java | 3 +- .../function/arithmetic/AvgFunction.java | 13 +++--- .../function/arithmetic/IntFunction.java | 15 +++--- .../function/arithmetic/LenFunction.java | 7 +-- .../function/arithmetic/MaxFunction.java | 13 +++--- .../function/arithmetic/MeanFunction.java | 11 ++--- .../function/arithmetic/MedianFunction.java | 5 +- .../function/arithmetic/MinFunction.java | 13 +++--- .../function/arithmetic/ModeFunction.java | 5 +- .../function/arithmetic/SumFunction.java | 13 +++--- .../parser/antlr/BooleanFilterListener.java | 3 ++ 14 files changed, 101 insertions(+), 72 deletions(-) create mode 100644 src/main/java/com/github/sidhant92/boolparser/domain/EvaluatedNode.java diff --git a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java index 58b8626..38122cb 100644 --- a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java +++ b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java @@ -6,10 +6,10 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -import org.apache.commons.lang3.tuple.Pair; import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.Operator; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; import com.github.sidhant92.boolparser.domain.UnaryNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticLeafNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; @@ -62,31 +62,31 @@ private Object evaluateToken(final Node node, final Map data) { case ARITHMETIC_FUNCTION: return evaluateArithmeticFunctionToken((ArithmeticFunctionNode) node, data); case UNARY: - return evaluateStringToken((UnaryNode) node, data); + return evaluateUnaryToken((UnaryNode) node, data); default: log.error("unsupported token {}", node.getTokenType()); throw new UnsupportedToken(); } } - private Object evaluateStringToken(final UnaryNode unaryNode, final Map data) { + private Object evaluateUnaryToken(final UnaryNode unaryNode, final Map data) { return unaryNode.getDataType() == DataType.STRING ? ValueUtils.getValueFromMap(unaryNode.getValue().toString(), data) .orElse(unaryNode.getValue()) : unaryNode.getValue(); } - private Pair evaluateArithmeticLeafToken(final ArithmeticLeafNode arithmeticLeafNode, final Map data) { + private EvaluatedNode evaluateArithmeticLeafToken(final ArithmeticLeafNode arithmeticLeafNode, final Map data) { final Optional fetchedValue = arithmeticLeafNode.getDataType() != DataType.STRING ? Optional.of( arithmeticLeafNode.getOperand()) : ValueUtils.getValueFromMap(arithmeticLeafNode.getOperand().toString(), data); return fetchedValue - .map(o -> Pair.of(o, ValueUtils.getDataType(o))) - .orElseGet(() -> Pair.of(arithmeticLeafNode.getOperand(), arithmeticLeafNode.getDataType())); + .map(o -> EvaluatedNode.builder().value(o).dataType(ValueUtils.getDataType(o)).build()) + .orElseGet(() -> EvaluatedNode.builder().value(arithmeticLeafNode.getOperand()).dataType(arithmeticLeafNode.getDataType()).build()); } private Object evaluateUnaryArithmeticToken(final ArithmeticUnaryNode arithmeticUnaryNode, final Map data) { final Object resolvedValue = evaluateToken(arithmeticUnaryNode.getOperand(), data); - if (resolvedValue instanceof Pair) { - final Pair pair = (Pair) resolvedValue; - return operatorService.evaluateArithmeticOperator(pair.getLeft(), pair.getRight(), null, null, Operator.UNARY, + if (resolvedValue instanceof EvaluatedNode) { + final EvaluatedNode evaluatedNode = (EvaluatedNode) resolvedValue; + return operatorService.evaluateArithmeticOperator(evaluatedNode.getValue(), evaluatedNode.getDataType(), null, null, Operator.UNARY, ContainerDataType.PRIMITIVE); } final DataType dataType = ValueUtils.getDataType(resolvedValue); @@ -94,14 +94,14 @@ private Object evaluateUnaryArithmeticToken(final ArithmeticUnaryNode arithmetic } private Object evaluateArithmeticFunctionToken(final ArithmeticFunctionNode arithmeticFunctionNode, final Map data) { - final List> resolvedValues = arithmeticFunctionNode.getItems() + final List resolvedValues = arithmeticFunctionNode.getItems() .stream() .map(item -> evaluateArithmeticLeafToken(item, data)) .collect(Collectors.toList()); - final List> flattenedValues = new ArrayList<>(); + final List flattenedValues = new ArrayList<>(); resolvedValues.forEach(value -> { - if (value.getKey() instanceof Collection) { - ((Collection) value.getKey()).forEach(v -> flattenedValues.add(Pair.of(v, ValueUtils.getDataType(v)))); + if (value.getValue() instanceof Collection) { + ((Collection) value.getValue()).forEach(v -> flattenedValues.add(EvaluatedNode.builder().value(v).dataType(ValueUtils.getDataType(v)).build())); } else { flattenedValues.add(value); } @@ -112,20 +112,20 @@ private Object evaluateArithmeticFunctionToken(final ArithmeticFunctionNode arit private Object evaluateArithmeticToken(final ArithmeticNode arithmeticNode, final Map data) { final Object leftValue = evaluateToken(arithmeticNode.getLeft(), data); final Object rightValue = evaluateToken(arithmeticNode.getRight(), data); - if (leftValue instanceof Pair && rightValue instanceof Pair) { - final Pair leftPair = (Pair) leftValue; - final Pair rightPair = (Pair) rightValue; - return operatorService.evaluateArithmeticOperator(leftPair.getLeft(), leftPair.getRight(), rightPair.getLeft(), rightPair.getRight(), + if (leftValue instanceof EvaluatedNode && rightValue instanceof EvaluatedNode) { + final EvaluatedNode leftPair = (EvaluatedNode) leftValue; + final EvaluatedNode rightPair = (EvaluatedNode) rightValue; + return operatorService.evaluateArithmeticOperator(leftPair.getValue(), leftPair.getDataType(), rightPair.getValue(), rightPair.getDataType(), arithmeticNode.getOperator(), ContainerDataType.PRIMITIVE); - } else if (leftValue instanceof Pair) { - final Pair leftPair = (Pair) leftValue; + } else if (leftValue instanceof EvaluatedNode) { + final EvaluatedNode leftPair = (EvaluatedNode) leftValue; final DataType rightDataType = ValueUtils.getDataType(rightValue); - return operatorService.evaluateArithmeticOperator(leftPair.getLeft(), leftPair.getRight(), rightValue, rightDataType, + return operatorService.evaluateArithmeticOperator(leftPair.getValue(), leftPair.getDataType(), rightValue, rightDataType, arithmeticNode.getOperator(), ContainerDataType.PRIMITIVE); - } else if (rightValue instanceof Pair) { - final Pair rightPair = (Pair) rightValue; + } else if (rightValue instanceof EvaluatedNode) { + final EvaluatedNode rightPair = (EvaluatedNode) rightValue; final DataType leftDataType = ValueUtils.getDataType(leftValue); - return operatorService.evaluateArithmeticOperator(leftValue, leftDataType, rightPair.getLeft(), rightPair.getRight(), + return operatorService.evaluateArithmeticOperator(leftValue, leftDataType, rightPair.getValue(), rightPair.getDataType(), arithmeticNode.getOperator(), ContainerDataType.PRIMITIVE); } else { final DataType leftDataType = ValueUtils.getDataType(leftValue); diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/EvaluatedNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/EvaluatedNode.java new file mode 100644 index 0000000..23babda --- /dev/null +++ b/src/main/java/com/github/sidhant92/boolparser/domain/EvaluatedNode.java @@ -0,0 +1,17 @@ +package com.github.sidhant92.boolparser.domain; + +import com.github.sidhant92.boolparser.constant.DataType; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +@AllArgsConstructor +@Getter +@Setter +@Builder +public class EvaluatedNode { + private final DataType dataType; + + private final Object value; +} diff --git a/src/main/java/com/github/sidhant92/boolparser/function/FunctionEvaluatorService.java b/src/main/java/com/github/sidhant92/boolparser/function/FunctionEvaluatorService.java index 4bdeac9..bd3e4fc 100644 --- a/src/main/java/com/github/sidhant92/boolparser/function/FunctionEvaluatorService.java +++ b/src/main/java/com/github/sidhant92/boolparser/function/FunctionEvaluatorService.java @@ -5,6 +5,7 @@ import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.FunctionType; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; import com.github.sidhant92.boolparser.exception.InvalidContainerTypeException; import com.github.sidhant92.boolparser.exception.InvalidDataType; import com.github.sidhant92.boolparser.exception.InvalidExpressionException; @@ -21,7 +22,7 @@ public FunctionEvaluatorService() { FunctionFactory.initialize(); } - public Object evaluateArithmeticFunction(final FunctionType functionType, final List> items) { + public Object evaluateArithmeticFunction(final FunctionType functionType, final List items) { final AbstractFunction abstractFunction = FunctionFactory.getArithmeticFunction(functionType); if (items.isEmpty()) { log.error("Empty items not allowed"); @@ -33,15 +34,15 @@ public Object evaluateArithmeticFunction(final FunctionType functionType, final throw new InvalidContainerTypeException(); } final boolean validDataType = items - .stream().allMatch(item -> abstractFunction.getAllowedDataTypes().contains(item.getValue())); + .stream().allMatch(item -> abstractFunction.getAllowedDataTypes().contains(item.getDataType())); if (!validDataType) { log.error("Invalid data type {} for function {}", items, functionType.name()); throw new InvalidDataType(); } items.forEach(item -> { - if (!ContainerDataType.PRIMITIVE.isValid(item.getValue(), item.getKey())) { - log.error("Validation failed for the function {} for the operand {}", functionType.name(), item.getKey()); + if (!ContainerDataType.PRIMITIVE.isValid(item.getDataType(), item.getValue())) { + log.error("Validation failed for the function {} for the operand {}", functionType.name(), item.getValue()); throw new InvalidDataType(); } }); diff --git a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/AbstractFunction.java b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/AbstractFunction.java index 098d05c..07e19df 100644 --- a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/AbstractFunction.java +++ b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/AbstractFunction.java @@ -5,6 +5,7 @@ import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.FunctionType; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode; /** @@ -12,7 +13,7 @@ * @since 21/05/2024 */ public abstract class AbstractFunction { - public abstract Object evaluate(final List> items); + public abstract Object evaluate(final List items); public abstract FunctionType getFunctionType(); diff --git a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/AvgFunction.java b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/AvgFunction.java index c2b492c..7b9eeb2 100644 --- a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/AvgFunction.java +++ b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/AvgFunction.java @@ -7,6 +7,7 @@ import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.FunctionType; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; import com.github.sidhant92.boolparser.util.ValueUtils; /** @@ -15,19 +16,19 @@ */ public class AvgFunction extends AbstractFunction { @Override - public Object evaluate(final List> items) { + public Object evaluate(final List items) { if (items - .stream().anyMatch(a -> a.getValue().equals(DataType.DECIMAL))) { + .stream().anyMatch(a -> a.getDataType().equals(DataType.DECIMAL))) { return ValueUtils.caseDouble(items - .stream().mapToDouble(a -> Double.parseDouble(a.getKey().toString())).average().getAsDouble()); + .stream().mapToDouble(a -> Double.parseDouble(a.getValue().toString())).average().getAsDouble()); } if (items - .stream().anyMatch(a -> a.getValue().equals(DataType.LONG))) { + .stream().anyMatch(a -> a.getDataType().equals(DataType.LONG))) { return ValueUtils.caseDouble(items - .stream().mapToLong(a -> Long.parseLong(a.getKey().toString())).average().getAsDouble()); + .stream().mapToLong(a -> Long.parseLong(a.getValue().toString())).average().getAsDouble()); } return ValueUtils.caseDouble(items - .stream().mapToInt(a -> Integer.parseInt(a.getKey().toString())).average().getAsDouble()); + .stream().mapToInt(a -> Integer.parseInt(a.getValue().toString())).average().getAsDouble()); } @Override diff --git a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/IntFunction.java b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/IntFunction.java index 015c9ea..ea032c8 100644 --- a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/IntFunction.java +++ b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/IntFunction.java @@ -7,6 +7,7 @@ import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.FunctionType; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; /** * @author sidhant.aggarwal @@ -14,15 +15,15 @@ */ public class IntFunction extends AbstractFunction { @Override - public Object evaluate(final List> items) { - final Pair item = items.get(0); - if (item.getValue() == DataType.DECIMAL) { - return ((Double) item.getKey()).intValue(); + public Object evaluate(final List items) { + final EvaluatedNode item = items.get(0); + if (item.getDataType() == DataType.DECIMAL) { + return ((Double) item.getValue()).intValue(); } - if (item.getValue() == DataType.LONG) { - return ((Long) item.getKey()).intValue(); + if (item.getDataType() == DataType.LONG) { + return ((Long) item.getValue()).intValue(); } - return item.getKey(); + return item.getValue(); } @Override diff --git a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/LenFunction.java b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/LenFunction.java index 4072fac..b23729f 100644 --- a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/LenFunction.java +++ b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/LenFunction.java @@ -6,6 +6,7 @@ import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.FunctionType; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; /** * @author sidhant.aggarwal @@ -13,9 +14,9 @@ */ public class LenFunction extends AbstractFunction { @Override - public Object evaluate(final List> items) { - if (items.size() == 1 && items.get(0).getKey() instanceof String) { - return ((String) items.get(0).getKey()).length(); + public Object evaluate(final List items) { + if (items.size() == 1 && items.get(0).getValue() instanceof String) { + return ((String) items.get(0).getValue()).length(); } return items.size(); } diff --git a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MaxFunction.java b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MaxFunction.java index b39b444..8d02e87 100644 --- a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MaxFunction.java +++ b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MaxFunction.java @@ -7,6 +7,7 @@ import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.FunctionType; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; import com.github.sidhant92.boolparser.util.ValueUtils; /** @@ -15,19 +16,19 @@ */ public class MaxFunction extends AbstractFunction { @Override - public Object evaluate(final List> items) { + public Object evaluate(final List items) { if (items - .stream().anyMatch(a -> a.getValue().equals(DataType.DECIMAL))) { + .stream().anyMatch(a -> a.getDataType().equals(DataType.DECIMAL))) { return ValueUtils.caseDouble(items - .stream().mapToDouble(a -> Double.parseDouble(a.getKey().toString())).max().getAsDouble()); + .stream().mapToDouble(a -> Double.parseDouble(a.getValue().toString())).max().getAsDouble()); } if (items - .stream().anyMatch(a -> a.getValue().equals(DataType.LONG))) { + .stream().anyMatch(a -> a.getDataType().equals(DataType.LONG))) { return ValueUtils.caseDouble(items - .stream().mapToLong(a -> Long.parseLong(a.getKey().toString())).max().getAsLong()); + .stream().mapToLong(a -> Long.parseLong(a.getValue().toString())).max().getAsLong()); } return ValueUtils.caseDouble(items - .stream().mapToInt(a -> Integer.parseInt(a.getKey().toString())).max().getAsInt()); + .stream().mapToInt(a -> Integer.parseInt(a.getValue().toString())).max().getAsInt()); } @Override diff --git a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MeanFunction.java b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MeanFunction.java index 15cc927..e3ae6ac 100644 --- a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MeanFunction.java +++ b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MeanFunction.java @@ -9,6 +9,8 @@ import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.FunctionType; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; +import com.github.sidhant92.boolparser.util.ValueUtils; /** * @author sidhant.aggarwal @@ -16,13 +18,10 @@ */ public class MeanFunction extends AbstractFunction { @Override - public Object evaluate(final List> items) { + public Object evaluate(final List items) { final double mean = StatUtils.mean(items - .stream().mapToDouble(a -> Double.parseDouble(a.getKey().toString())).toArray()); - if ((int) mean == mean) { - return (int) mean; - } - return mean; + .stream().mapToDouble(a -> Double.parseDouble(a.getValue().toString())).toArray()); + return ValueUtils.caseDouble(mean); } @Override diff --git a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MedianFunction.java b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MedianFunction.java index 477d924..9394e0c 100644 --- a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MedianFunction.java +++ b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MedianFunction.java @@ -8,6 +8,7 @@ import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.FunctionType; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; import com.github.sidhant92.boolparser.util.ValueUtils; /** @@ -22,9 +23,9 @@ public MedianFunction() { } @Override - public Object evaluate(final List> items) { + public Object evaluate(final List items) { final double res = median.evaluate(items - .stream().mapToDouble(a -> Double.parseDouble(a.getKey().toString())).toArray()); + .stream().mapToDouble(a -> Double.parseDouble(a.getValue().toString())).toArray()); return ValueUtils.caseDouble(res); } diff --git a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MinFunction.java b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MinFunction.java index 959433e..30a95c8 100644 --- a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MinFunction.java +++ b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/MinFunction.java @@ -7,6 +7,7 @@ import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.FunctionType; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; import com.github.sidhant92.boolparser.util.ValueUtils; /** @@ -15,19 +16,19 @@ */ public class MinFunction extends AbstractFunction { @Override - public Object evaluate(final List> items) { + public Object evaluate(final List items) { if (items - .stream().anyMatch(a -> a.getValue().equals(DataType.DECIMAL))) { + .stream().anyMatch(a -> a.getDataType().equals(DataType.DECIMAL))) { return ValueUtils.caseDouble(items - .stream().mapToDouble(a -> Double.parseDouble(a.getKey().toString())).min().getAsDouble()); + .stream().mapToDouble(a -> Double.parseDouble(a.getValue().toString())).min().getAsDouble()); } if (items - .stream().anyMatch(a -> a.getValue().equals(DataType.LONG))) { + .stream().anyMatch(a -> a.getDataType().equals(DataType.LONG))) { return ValueUtils.caseDouble(items - .stream().mapToLong(a -> Long.parseLong(a.getKey().toString())).min().getAsLong()); + .stream().mapToLong(a -> Long.parseLong(a.getValue().toString())).min().getAsLong()); } return ValueUtils.caseDouble(items - .stream().mapToInt(a -> Integer.parseInt(a.getKey().toString())).min().getAsInt()); + .stream().mapToInt(a -> Integer.parseInt(a.getValue().toString())).min().getAsInt()); } @Override diff --git a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/ModeFunction.java b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/ModeFunction.java index 313502b..6539efd 100644 --- a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/ModeFunction.java +++ b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/ModeFunction.java @@ -9,6 +9,7 @@ import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.FunctionType; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; import com.github.sidhant92.boolparser.util.ValueUtils; /** @@ -17,9 +18,9 @@ */ public class ModeFunction extends AbstractFunction { @Override - public Object evaluate(final List> items) { + public Object evaluate(final List items) { final double mode = StatUtils.mode(items - .stream().mapToDouble(a -> Double.parseDouble(a.getKey().toString())).toArray())[0]; + .stream().mapToDouble(a -> Double.parseDouble(a.getValue().toString())).toArray())[0]; return ValueUtils.caseDouble(mode); } diff --git a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/SumFunction.java b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/SumFunction.java index 077f436..8d8e54f 100644 --- a/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/SumFunction.java +++ b/src/main/java/com/github/sidhant92/boolparser/function/arithmetic/SumFunction.java @@ -7,6 +7,7 @@ import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.FunctionType; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; import com.github.sidhant92.boolparser.util.ValueUtils; /** @@ -15,19 +16,19 @@ */ public class SumFunction extends AbstractFunction { @Override - public Object evaluate(final List> items) { + public Object evaluate(final List items) { if (items - .stream().anyMatch(a -> a.getValue().equals(DataType.DECIMAL))) { + .stream().anyMatch(a -> a.getDataType().equals(DataType.DECIMAL))) { return ValueUtils.caseDouble(items - .stream().mapToDouble(a -> Double.parseDouble(a.getKey().toString())).sum()); + .stream().mapToDouble(a -> Double.parseDouble(a.getValue().toString())).sum()); } if (items - .stream().anyMatch(a -> a.getValue().equals(DataType.LONG))) { + .stream().anyMatch(a -> a.getDataType().equals(DataType.LONG))) { return ValueUtils.caseDouble(items - .stream().mapToLong(a -> Long.parseLong(a.getKey().toString())).sum()); + .stream().mapToLong(a -> Long.parseLong(a.getValue().toString())).sum()); } return ValueUtils.caseDouble(items - .stream().mapToInt(a -> Integer.parseInt(a.getKey().toString())).sum()); + .stream().mapToInt(a -> Integer.parseInt(a.getValue().toString())).sum()); } @Override diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java index 529f837..92980e9 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java @@ -171,6 +171,9 @@ public void exitInExpression(BooleanExpressionParser.InExpressionContext ctx) { } private List> getArrayElements(final List trees) { + trees.forEach(tr -> { + System.out.println("**********" + tr.getClass()); + }); return trees .stream() .filter(child -> child instanceof BooleanExpressionParser.TypesExpressionContext) From a447716edfdc8adec09f7ede6da1790a719ab498 Mon Sep 17 00:00:00 2001 From: Sidhant Aggarwal <10743214+sidhant92@users.noreply.github.com> Date: Tue, 28 May 2024 21:21:40 +0530 Subject: [PATCH 04/10] replace arithmetic leaf node with unary node --- .../ArithmeticExpressionEvaluator.java | 35 ++++++---- .../arithmetic/ArithmeticFunctionNode.java | 3 +- .../domain/arithmetic/ArithmeticLeafNode.java | 28 -------- .../parser/antlr/BooleanFilterListener.java | 21 +++--- .../antlr/BooleanFilterBoolParserTest.java | 65 +++++++++---------- 5 files changed, 66 insertions(+), 86 deletions(-) delete mode 100644 src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticLeafNode.java diff --git a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java index 38122cb..0f189e4 100644 --- a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java +++ b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java @@ -11,7 +11,6 @@ import com.github.sidhant92.boolparser.constant.Operator; import com.github.sidhant92.boolparser.domain.EvaluatedNode; import com.github.sidhant92.boolparser.domain.UnaryNode; -import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticLeafNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticUnaryNode; import com.github.sidhant92.boolparser.domain.Node; @@ -56,7 +55,7 @@ private Object evaluateToken(final Node node, final Map data) { case ARITHMETIC: return evaluateArithmeticToken((ArithmeticNode) node, data); case ARITHMETIC_LEAF: - return evaluateArithmeticLeafToken((ArithmeticLeafNode) node, data); + return evaluateUnaryNode((UnaryNode) node, data); case ARITHMETIC_UNARY: return evaluateUnaryArithmeticToken((ArithmeticUnaryNode) node, data); case ARITHMETIC_FUNCTION: @@ -74,12 +73,12 @@ private Object evaluateUnaryToken(final UnaryNode unaryNode, final Map data) { - final Optional fetchedValue = arithmeticLeafNode.getDataType() != DataType.STRING ? Optional.of( - arithmeticLeafNode.getOperand()) : ValueUtils.getValueFromMap(arithmeticLeafNode.getOperand().toString(), data); + private EvaluatedNode evaluateUnaryNode(final UnaryNode unaryNode, final Map data) { + final Optional fetchedValue = unaryNode.getDataType() != DataType.STRING ? Optional.of( + unaryNode.getValue()) : ValueUtils.getValueFromMap(unaryNode.getValue().toString(), data); return fetchedValue .map(o -> EvaluatedNode.builder().value(o).dataType(ValueUtils.getDataType(o)).build()) - .orElseGet(() -> EvaluatedNode.builder().value(arithmeticLeafNode.getOperand()).dataType(arithmeticLeafNode.getDataType()).build()); + .orElseGet(() -> EvaluatedNode.builder().value(unaryNode.getValue()).dataType(unaryNode.getDataType()).build()); } private Object evaluateUnaryArithmeticToken(final ArithmeticUnaryNode arithmeticUnaryNode, final Map data) { @@ -94,16 +93,26 @@ private Object evaluateUnaryArithmeticToken(final ArithmeticUnaryNode arithmetic } private Object evaluateArithmeticFunctionToken(final ArithmeticFunctionNode arithmeticFunctionNode, final Map data) { - final List resolvedValues = arithmeticFunctionNode.getItems() + final List resolvedValues = arithmeticFunctionNode.getItems() .stream() - .map(item -> evaluateArithmeticLeafToken(item, data)) + .map(item -> evaluate(item, data)) .collect(Collectors.toList()); final List flattenedValues = new ArrayList<>(); resolvedValues.forEach(value -> { - if (value.getValue() instanceof Collection) { - ((Collection) value.getValue()).forEach(v -> flattenedValues.add(EvaluatedNode.builder().value(v).dataType(ValueUtils.getDataType(v)).build())); + if (value instanceof EvaluatedNode) { + final EvaluatedNode node = (EvaluatedNode) value; + if (node.getValue() instanceof Collection) { + ((Collection) node.getValue()).forEach( + v -> flattenedValues.add(EvaluatedNode.builder().value(v).dataType(ValueUtils.getDataType(v)).build())); + } else { + flattenedValues.add(node); + } + } + if (value instanceof Collection) { + ((Collection) value).forEach( + v -> flattenedValues.add(EvaluatedNode.builder().value(v).dataType(ValueUtils.getDataType(v)).build())); } else { - flattenedValues.add(value); + flattenedValues.add(EvaluatedNode.builder().value(value).dataType(ValueUtils.getDataType(value)).build()); } }); return functionEvaluatorService.evaluateArithmeticFunction(arithmeticFunctionNode.getFunctionType(), flattenedValues); @@ -115,8 +124,8 @@ private Object evaluateArithmeticToken(final ArithmeticNode arithmeticNode, fina if (leftValue instanceof EvaluatedNode && rightValue instanceof EvaluatedNode) { final EvaluatedNode leftPair = (EvaluatedNode) leftValue; final EvaluatedNode rightPair = (EvaluatedNode) rightValue; - return operatorService.evaluateArithmeticOperator(leftPair.getValue(), leftPair.getDataType(), rightPair.getValue(), rightPair.getDataType(), - arithmeticNode.getOperator(), ContainerDataType.PRIMITIVE); + return operatorService.evaluateArithmeticOperator(leftPair.getValue(), leftPair.getDataType(), rightPair.getValue(), + rightPair.getDataType(), arithmeticNode.getOperator(), ContainerDataType.PRIMITIVE); } else if (leftValue instanceof EvaluatedNode) { final EvaluatedNode leftPair = (EvaluatedNode) leftValue; final DataType rightDataType = ValueUtils.getDataType(rightValue); diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticFunctionNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticFunctionNode.java index 111d90a..f3a786e 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticFunctionNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticFunctionNode.java @@ -3,6 +3,7 @@ import java.util.List; import com.github.sidhant92.boolparser.constant.FunctionType; import com.github.sidhant92.boolparser.constant.NodeType; +import com.github.sidhant92.boolparser.domain.Node; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -20,7 +21,7 @@ public class ArithmeticFunctionNode extends ArithmeticBaseNode { private FunctionType functionType; - private final List items; + private final List items; @Override diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticLeafNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticLeafNode.java deleted file mode 100644 index 56f08f6..0000000 --- a/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticLeafNode.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.github.sidhant92.boolparser.domain.arithmetic; - -import com.github.sidhant92.boolparser.constant.DataType; -import com.github.sidhant92.boolparser.constant.NodeType; -import com.github.sidhant92.boolparser.domain.Node; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; - -/** - * @author sidhant.aggarwal - * @since 15/03/2024 - */ -@AllArgsConstructor -@Getter -@Setter -@Builder -public class ArithmeticLeafNode extends ArithmeticBaseNode { - private Object operand; - - private DataType dataType; - - @Override - public NodeType getTokenType() { - return NodeType.ARITHMETIC_LEAF; - } -} diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java index 92980e9..56b3350 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java @@ -14,7 +14,6 @@ import com.github.sidhant92.boolparser.constant.LogicalOperationType; import com.github.sidhant92.boolparser.constant.Operator; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode; -import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticLeafNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticUnaryNode; import com.github.sidhant92.boolparser.domain.ArrayNode; @@ -72,27 +71,27 @@ public void exitComparatorExpression(BooleanExpressionParser.ComparatorExpressio super.enterComparatorExpression(ctx); } - private ArithmeticLeafNode getArithmeticLeafNode(final BooleanExpressionParser.TypesExpressionContext ctx) { + private UnaryNode getUnaryNode(final BooleanExpressionParser.TypesExpressionContext ctx) { final DataType dataType = getDataType(ctx.getStart()); final Object operand = ValueUtils.convertValue(ctx.getText(), dataType); - return ArithmeticLeafNode.builder().operand(operand).dataType(dataType).build(); + return UnaryNode.builder().value(operand).dataType(dataType).build(); } @Override public void exitArithmeticExpression(BooleanExpressionParser.ArithmeticExpressionContext ctx) { final Operator operator = Operator.getOperatorFromSymbol(ctx.op.getText()).orElse(Operator.EQUALS); if (ctx.left instanceof BooleanExpressionParser.TypesExpressionContext && ctx.right instanceof BooleanExpressionParser.TypesExpressionContext) { - final ArithmeticLeafNode left = getArithmeticLeafNode((BooleanExpressionParser.TypesExpressionContext) ctx.left); - final ArithmeticLeafNode right = getArithmeticLeafNode((BooleanExpressionParser.TypesExpressionContext) ctx.right); + final UnaryNode left = getUnaryNode((BooleanExpressionParser.TypesExpressionContext) ctx.left); + final UnaryNode right = getUnaryNode((BooleanExpressionParser.TypesExpressionContext) ctx.right); final ArithmeticNode node = ArithmeticNode.builder().left(left).right(right).operator(operator).build(); currentNodes.add(node); } else if (ctx.left instanceof BooleanExpressionParser.TypesExpressionContext) { - final ArithmeticLeafNode left = getArithmeticLeafNode((BooleanExpressionParser.TypesExpressionContext) ctx.left); + final UnaryNode left = getUnaryNode((BooleanExpressionParser.TypesExpressionContext) ctx.left); final Node right = currentNodes.pop(); final ArithmeticNode node = ArithmeticNode.builder().left(left).right(right).operator(operator).build(); currentNodes.add(node); } else if (ctx.right instanceof BooleanExpressionParser.TypesExpressionContext) { - final ArithmeticLeafNode right = getArithmeticLeafNode((BooleanExpressionParser.TypesExpressionContext) ctx.right); + final UnaryNode right = getUnaryNode((BooleanExpressionParser.TypesExpressionContext) ctx.right); final Node left = currentNodes.pop(); final ArithmeticNode node = ArithmeticNode.builder().left(left).right(right).operator(operator).build(); currentNodes.add(node); @@ -113,7 +112,7 @@ public void exitArithmeticExpression(BooleanExpressionParser.ArithmeticExpressio public void exitUnaryArithmeticExpression(BooleanExpressionParser.UnaryArithmeticExpressionContext ctx) { final DataType dataType = getDataType(ctx.exp.getStart()); final Object operand = ValueUtils.convertValue(ctx.exp.getText(), dataType); - final ArithmeticLeafNode leafNode = ArithmeticLeafNode.builder().operand(operand).dataType(dataType).build(); + final UnaryNode leafNode = UnaryNode.builder().value(operand).dataType(dataType).build(); currentNodes.add(ArithmeticUnaryNode.builder().operand(leafNode).build()); super.enterUnaryArithmeticExpression(ctx); } @@ -150,7 +149,7 @@ public void exitArithmeticFunctionExpression(BooleanExpressionParser.ArithmeticF log.error("Error parsing expression for the string {}", ctx.getText()); return new InvalidExpressionException(); }); - final List items = getArithmeticArrayElements(ctx.data.children); + final List items = getArithmeticArrayElements(ctx.data.children); currentNodes.add(new ArithmeticFunctionNode(functionType, items)); super.exitArithmeticFunctionExpression(ctx); } @@ -185,14 +184,14 @@ private List> getArrayElements(final List tree .collect(Collectors.toList()); } - private List getArithmeticArrayElements(final List trees) { + private List getArithmeticArrayElements(final List trees) { return trees .stream() .filter(child -> child instanceof BooleanExpressionParser.TypesExpressionContext) .map(child -> { final DataType dataType = getDataType(((BooleanExpressionParser.TypesExpressionContext) child).start); final Object value = ValueUtils.convertValue(child.getText(), dataType); - return new ArithmeticLeafNode(value, dataType); + return new UnaryNode(dataType, value); }) .collect(Collectors.toList()); } diff --git a/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java b/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java index bc438bf..c31bff8 100644 --- a/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java +++ b/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java @@ -11,7 +11,6 @@ import com.github.sidhant92.boolparser.constant.NodeType; import com.github.sidhant92.boolparser.constant.Operator; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode; -import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticLeafNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; import com.github.sidhant92.boolparser.domain.ArrayNode; import com.github.sidhant92.boolparser.domain.BooleanNode; @@ -265,10 +264,10 @@ public void testNotIntegerList() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("age not IN (12,45)"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType().name(), NodeType.BOOLEAN.name()); - assertNotNull(((BooleanNode)nodeOptional.get()).getLeft()); - assertNull(((BooleanNode)nodeOptional.get()).getRight()); - assertEquals(((BooleanNode)nodeOptional.get()).getOperator(), LogicalOperationType.NOT); - final InNode inToken = (InNode) ((BooleanNode)nodeOptional.get()).getLeft(); + assertNotNull(((BooleanNode) nodeOptional.get()).getLeft()); + assertNull(((BooleanNode) nodeOptional.get()).getRight()); + assertEquals(((BooleanNode) nodeOptional.get()).getOperator(), LogicalOperationType.NOT); + final InNode inToken = (InNode) ((BooleanNode) nodeOptional.get()).getLeft(); assertEquals(inToken.getItems().size(), 2); assertEquals(inToken.getField(), "age"); assertEquals(inToken.getItems().get(0).getKey(), DataType.INTEGER); @@ -366,10 +365,10 @@ public void testAddOperatorString() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("a + b"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType(), NodeType.ARITHMETIC); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getLeft()).getOperand(), "a"); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getLeft()).getDataType(), DataType.STRING); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getRight()).getOperand(), "b"); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getRight()).getDataType(), DataType.STRING); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getLeft()).getValue(), "a"); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getLeft()).getDataType(), DataType.STRING); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getRight()).getValue(), "b"); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getRight()).getDataType(), DataType.STRING); assertEquals(((ArithmeticNode) nodeOptional.get()).getOperator(), Operator.ADD); } @@ -378,10 +377,10 @@ public void testAddOperatorInt() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("20 + 5"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType(), NodeType.ARITHMETIC); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getLeft()).getOperand(), 20); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getLeft()).getDataType(), DataType.INTEGER); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getRight()).getOperand(), 5); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getRight()).getDataType(), DataType.INTEGER); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getLeft()).getValue(), 20); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getLeft()).getDataType(), DataType.INTEGER); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getRight()).getValue(), 5); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getRight()).getDataType(), DataType.INTEGER); assertEquals(((ArithmeticNode) nodeOptional.get()).getOperator(), Operator.ADD); } @@ -390,10 +389,10 @@ public void testAddOperatorDecimal() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("20.5 + 5"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType(), NodeType.ARITHMETIC); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getLeft()).getOperand(), 20.5); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getLeft()).getDataType(), DataType.DECIMAL); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getRight()).getOperand(), 5); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getRight()).getDataType(), DataType.INTEGER); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getLeft()).getValue(), 20.5); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getLeft()).getDataType(), DataType.DECIMAL); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getRight()).getValue(), 5); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getRight()).getDataType(), DataType.INTEGER); assertEquals(((ArithmeticNode) nodeOptional.get()).getOperator(), Operator.ADD); } @@ -404,12 +403,12 @@ public void testArithmeticArrayFunction() { assertEquals(nodeOptional.get().getTokenType(), NodeType.ARITHMETIC_FUNCTION); assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getFunctionType().name(), "MIN"); assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getItems().size(), 3); - assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(0).getDataType(), DataType.INTEGER); - assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(0).getOperand(), 1); - assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(1).getDataType(), DataType.INTEGER); - assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(1).getOperand(), 2); - assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(2).getDataType(), DataType.INTEGER); - assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(2).getOperand(), 3); + assertEquals(((UnaryNode) ((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(0)).getDataType(), DataType.INTEGER); + assertEquals(((UnaryNode) ((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(0)).getValue(), 1); + assertEquals(((UnaryNode) ((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(1)).getDataType(), DataType.INTEGER); + assertEquals(((UnaryNode) ((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(1)).getValue(), 2); + assertEquals(((UnaryNode) ((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(2)).getDataType(), DataType.INTEGER); + assertEquals(((UnaryNode) ((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(2)).getValue(), 3); } @Test @@ -419,8 +418,8 @@ public void testArithmeticArrayFunctionWithSubstitution() { assertEquals(nodeOptional.get().getTokenType(), NodeType.ARITHMETIC_FUNCTION); assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getFunctionType().name(), "MIN"); assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getItems().size(), 1); - assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(0).getDataType(), DataType.STRING); - assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(0).getOperand(), "abc"); + assertEquals(((UnaryNode) ((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(0)).getDataType(), DataType.STRING); + assertEquals(((UnaryNode) ((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(0)).getValue(), "abc"); } @Test @@ -434,10 +433,10 @@ public void testAddOperatorBool() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("false + 5"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType(), NodeType.ARITHMETIC); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getLeft()).getOperand(), false); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getLeft()).getDataType(), DataType.BOOLEAN); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getRight()).getOperand(), 5); - assertEquals(((ArithmeticLeafNode)((ArithmeticNode) nodeOptional.get()).getRight()).getDataType(), DataType.INTEGER); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getLeft()).getValue(), false); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getLeft()).getDataType(), DataType.BOOLEAN); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getRight()).getValue(), 5); + assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getRight()).getDataType(), DataType.INTEGER); assertEquals(((ArithmeticNode) nodeOptional.get()).getOperator(), Operator.ADD); } @@ -448,10 +447,10 @@ public void testComparisonWithArithmetic() { assertEquals(nodeOptional.get().getTokenType(), NodeType.COMPARISON); assertEquals((((ComparisonNode) nodeOptional.get()).getField()), "a"); final ArithmeticNode arithmeticNode = (ArithmeticNode) ((ComparisonNode) nodeOptional.get()).getValue(); - assertEquals(((ArithmeticLeafNode)(arithmeticNode.getLeft())).getOperand(), 10); - assertEquals(((ArithmeticLeafNode)(arithmeticNode.getLeft())).getDataType(), DataType.INTEGER); - assertEquals(((ArithmeticLeafNode)(arithmeticNode.getRight())).getOperand(), 20); - assertEquals(((ArithmeticLeafNode)(arithmeticNode.getRight())).getDataType(), DataType.INTEGER); + assertEquals(((UnaryNode) (arithmeticNode.getLeft())).getValue(), 10); + assertEquals(((UnaryNode) (arithmeticNode.getLeft())).getDataType(), DataType.INTEGER); + assertEquals(((UnaryNode) (arithmeticNode.getRight())).getValue(), 20); + assertEquals(((UnaryNode) (arithmeticNode.getRight())).getDataType(), DataType.INTEGER); assertEquals(arithmeticNode.getOperator(), Operator.ADD); } From 8ee0809f5221d67acef4d1c28526b86d459a2b47 Mon Sep 17 00:00:00 2001 From: Sidhant Aggarwal <10743214+sidhant92@users.noreply.github.com> Date: Wed, 29 May 2024 13:58:41 +0530 Subject: [PATCH 05/10] remove arithmetic unary node --- .../ArithmeticExpressionEvaluator.java | 36 ++++++------------- .../boolparser/constant/NodeType.java | 5 +-- .../arithmetic/ArithmeticUnaryNode.java | 25 ------------- .../parser/antlr/BooleanFilterListener.java | 14 +++----- 4 files changed, 17 insertions(+), 63 deletions(-) delete mode 100644 src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticUnaryNode.java diff --git a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java index 0f189e4..02228ac 100644 --- a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java +++ b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java @@ -4,7 +4,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.stream.Collectors; import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; @@ -12,7 +11,6 @@ import com.github.sidhant92.boolparser.domain.EvaluatedNode; import com.github.sidhant92.boolparser.domain.UnaryNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; -import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticUnaryNode; import com.github.sidhant92.boolparser.domain.Node; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode; import com.github.sidhant92.boolparser.exception.UnsupportedToken; @@ -54,10 +52,6 @@ private Object evaluateToken(final Node node, final Map data) { switch (node.getTokenType()) { case ARITHMETIC: return evaluateArithmeticToken((ArithmeticNode) node, data); - case ARITHMETIC_LEAF: - return evaluateUnaryNode((UnaryNode) node, data); - case ARITHMETIC_UNARY: - return evaluateUnaryArithmeticToken((ArithmeticUnaryNode) node, data); case ARITHMETIC_FUNCTION: return evaluateArithmeticFunctionToken((ArithmeticFunctionNode) node, data); case UNARY: @@ -73,25 +67,6 @@ private Object evaluateUnaryToken(final UnaryNode unaryNode, final Map data) { - final Optional fetchedValue = unaryNode.getDataType() != DataType.STRING ? Optional.of( - unaryNode.getValue()) : ValueUtils.getValueFromMap(unaryNode.getValue().toString(), data); - return fetchedValue - .map(o -> EvaluatedNode.builder().value(o).dataType(ValueUtils.getDataType(o)).build()) - .orElseGet(() -> EvaluatedNode.builder().value(unaryNode.getValue()).dataType(unaryNode.getDataType()).build()); - } - - private Object evaluateUnaryArithmeticToken(final ArithmeticUnaryNode arithmeticUnaryNode, final Map data) { - final Object resolvedValue = evaluateToken(arithmeticUnaryNode.getOperand(), data); - if (resolvedValue instanceof EvaluatedNode) { - final EvaluatedNode evaluatedNode = (EvaluatedNode) resolvedValue; - return operatorService.evaluateArithmeticOperator(evaluatedNode.getValue(), evaluatedNode.getDataType(), null, null, Operator.UNARY, - ContainerDataType.PRIMITIVE); - } - final DataType dataType = ValueUtils.getDataType(resolvedValue); - return operatorService.evaluateArithmeticOperator(resolvedValue, dataType, null, null, Operator.UNARY, ContainerDataType.PRIMITIVE); - } - private Object evaluateArithmeticFunctionToken(final ArithmeticFunctionNode arithmeticFunctionNode, final Map data) { final List resolvedValues = arithmeticFunctionNode.getItems() .stream() @@ -120,6 +95,17 @@ private Object evaluateArithmeticFunctionToken(final ArithmeticFunctionNode arit private Object evaluateArithmeticToken(final ArithmeticNode arithmeticNode, final Map data) { final Object leftValue = evaluateToken(arithmeticNode.getLeft(), data); + if (arithmeticNode.getOperator().equals(Operator.UNARY)) { + if (leftValue instanceof EvaluatedNode) { + final EvaluatedNode leftPair = (EvaluatedNode) leftValue; + return operatorService.evaluateArithmeticOperator(leftPair.getValue(), leftPair.getDataType(), null, null, + arithmeticNode.getOperator(), ContainerDataType.PRIMITIVE); + } else { + final DataType leftDataType = ValueUtils.getDataType(leftValue); + return operatorService.evaluateArithmeticOperator(leftValue, leftDataType, null, null, arithmeticNode.getOperator(), + ContainerDataType.PRIMITIVE); + } + } final Object rightValue = evaluateToken(arithmeticNode.getRight(), data); if (leftValue instanceof EvaluatedNode && rightValue instanceof EvaluatedNode) { final EvaluatedNode leftPair = (EvaluatedNode) leftValue; diff --git a/src/main/java/com/github/sidhant92/boolparser/constant/NodeType.java b/src/main/java/com/github/sidhant92/boolparser/constant/NodeType.java index 567d666..3acb52f 100644 --- a/src/main/java/com/github/sidhant92/boolparser/constant/NodeType.java +++ b/src/main/java/com/github/sidhant92/boolparser/constant/NodeType.java @@ -12,8 +12,5 @@ public enum NodeType { ARRAY, UNARY, ARITHMETIC, - ARITHMETIC_LEAF, - ARITHMETIC_UNARY, - ARITHMETIC_FUNCTION, - STRING + ARITHMETIC_FUNCTION } diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticUnaryNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticUnaryNode.java deleted file mode 100644 index 57e649e..0000000 --- a/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticUnaryNode.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.github.sidhant92.boolparser.domain.arithmetic; - -import com.github.sidhant92.boolparser.constant.NodeType; -import com.github.sidhant92.boolparser.domain.Node; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; - -/** - * @author sidhant.aggarwal - * @since 15/03/2024 - */ -@AllArgsConstructor -@Getter -@Setter -@Builder -public class ArithmeticUnaryNode extends ArithmeticBaseNode { - private Node operand; - - @Override - public NodeType getTokenType() { - return NodeType.ARITHMETIC_UNARY; - } -} diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java index 56b3350..a9fc509 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java @@ -15,7 +15,6 @@ import com.github.sidhant92.boolparser.constant.Operator; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; -import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticUnaryNode; import com.github.sidhant92.boolparser.domain.ArrayNode; import com.github.sidhant92.boolparser.domain.BooleanNode; import com.github.sidhant92.boolparser.domain.InNode; @@ -113,7 +112,7 @@ public void exitUnaryArithmeticExpression(BooleanExpressionParser.UnaryArithmeti final DataType dataType = getDataType(ctx.exp.getStart()); final Object operand = ValueUtils.convertValue(ctx.exp.getText(), dataType); final UnaryNode leafNode = UnaryNode.builder().value(operand).dataType(dataType).build(); - currentNodes.add(ArithmeticUnaryNode.builder().operand(leafNode).build()); + currentNodes.add(ArithmeticNode.builder().left(leafNode).operator(Operator.UNARY).build()); super.enterUnaryArithmeticExpression(ctx); } @@ -170,9 +169,6 @@ public void exitInExpression(BooleanExpressionParser.InExpressionContext ctx) { } private List> getArrayElements(final List trees) { - trees.forEach(tr -> { - System.out.println("**********" + tr.getClass()); - }); return trees .stream() .filter(child -> child instanceof BooleanExpressionParser.TypesExpressionContext) @@ -241,11 +237,11 @@ public void exitParse(BooleanExpressionParser.ParseContext ctx) { } else if (this.node == null && this.currentNodes.size() == 2) { final Node firstNode = currentNodes.pop(); final Node secondNode = currentNodes.pop(); - if (firstNode instanceof ArithmeticNode && secondNode instanceof ArithmeticUnaryNode) { - this.node = ArithmeticUnaryNode.builder().operand(firstNode).build(); + if (firstNode instanceof ArithmeticNode && secondNode instanceof ArithmeticNode && ((ArithmeticNode) secondNode).getRight() == null) { + this.node = ArithmeticNode.builder().operator(Operator.UNARY).left(firstNode).build(); } - if (secondNode instanceof ArithmeticNode && firstNode instanceof ArithmeticUnaryNode) { - this.node = ArithmeticUnaryNode.builder().operand(secondNode).build(); + if (secondNode instanceof ArithmeticNode && firstNode instanceof ArithmeticNode && ((ArithmeticNode) firstNode).getRight() == null) { + this.node = ArithmeticNode.builder().operator(Operator.UNARY).left(secondNode).build(); } } if (this.node == null && tokenCount == 1 && lastToken instanceof CommonToken) { From 53d1955412523b811e43f7792cc4256300f98f7a Mon Sep 17 00:00:00 2001 From: Sidhant Aggarwal <10743214+sidhant92@users.noreply.github.com> Date: Thu, 30 May 2024 11:29:24 +0530 Subject: [PATCH 06/10] code cleanup --- README.md | 2 +- .../ArithmeticExpressionEvaluator.java | 41 +++++---------- .../BooleanExpressionEvaluator.java | 36 ++++++++++--- .../boolparser/domain/ArrayNode.java | 2 +- .../sidhant92/boolparser/domain/InNode.java | 2 +- .../boolparser/domain/UnaryNode.java | 3 +- .../parser/antlr/BooleanFilterListener.java | 20 ++----- .../sidhant92/boolparser/util/ValueUtils.java | 26 ++++++++++ .../antlr/BooleanFilterBoolParserTest.java | 52 +++++++++---------- 9 files changed, 101 insertions(+), 83 deletions(-) diff --git a/README.md b/README.md index b9fd245..703b987 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ InNode ``` private final String field; -private final List> items; +private final List items; ``` diff --git a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java index 02228ac..6170bdd 100644 --- a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java +++ b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java @@ -72,24 +72,7 @@ private Object evaluateArithmeticFunctionToken(final ArithmeticFunctionNode arit .stream() .map(item -> evaluate(item, data)) .collect(Collectors.toList()); - final List flattenedValues = new ArrayList<>(); - resolvedValues.forEach(value -> { - if (value instanceof EvaluatedNode) { - final EvaluatedNode node = (EvaluatedNode) value; - if (node.getValue() instanceof Collection) { - ((Collection) node.getValue()).forEach( - v -> flattenedValues.add(EvaluatedNode.builder().value(v).dataType(ValueUtils.getDataType(v)).build())); - } else { - flattenedValues.add(node); - } - } - if (value instanceof Collection) { - ((Collection) value).forEach( - v -> flattenedValues.add(EvaluatedNode.builder().value(v).dataType(ValueUtils.getDataType(v)).build())); - } else { - flattenedValues.add(EvaluatedNode.builder().value(value).dataType(ValueUtils.getDataType(value)).build()); - } - }); + final List flattenedValues = ValueUtils.mapToEvaluatedNodes(resolvedValues); return functionEvaluatorService.evaluateArithmeticFunction(arithmeticFunctionNode.getFunctionType(), flattenedValues); } @@ -97,9 +80,9 @@ private Object evaluateArithmeticToken(final ArithmeticNode arithmeticNode, fina final Object leftValue = evaluateToken(arithmeticNode.getLeft(), data); if (arithmeticNode.getOperator().equals(Operator.UNARY)) { if (leftValue instanceof EvaluatedNode) { - final EvaluatedNode leftPair = (EvaluatedNode) leftValue; - return operatorService.evaluateArithmeticOperator(leftPair.getValue(), leftPair.getDataType(), null, null, - arithmeticNode.getOperator(), ContainerDataType.PRIMITIVE); + final EvaluatedNode left = (EvaluatedNode) leftValue; + return operatorService.evaluateArithmeticOperator(left.getValue(), left.getDataType(), null, null, arithmeticNode.getOperator(), + ContainerDataType.PRIMITIVE); } else { final DataType leftDataType = ValueUtils.getDataType(leftValue); return operatorService.evaluateArithmeticOperator(leftValue, leftDataType, null, null, arithmeticNode.getOperator(), @@ -108,19 +91,19 @@ private Object evaluateArithmeticToken(final ArithmeticNode arithmeticNode, fina } final Object rightValue = evaluateToken(arithmeticNode.getRight(), data); if (leftValue instanceof EvaluatedNode && rightValue instanceof EvaluatedNode) { - final EvaluatedNode leftPair = (EvaluatedNode) leftValue; - final EvaluatedNode rightPair = (EvaluatedNode) rightValue; - return operatorService.evaluateArithmeticOperator(leftPair.getValue(), leftPair.getDataType(), rightPair.getValue(), - rightPair.getDataType(), arithmeticNode.getOperator(), ContainerDataType.PRIMITIVE); + final EvaluatedNode left = (EvaluatedNode) leftValue; + final EvaluatedNode right = (EvaluatedNode) rightValue; + return operatorService.evaluateArithmeticOperator(left.getValue(), left.getDataType(), right.getValue(), right.getDataType(), + arithmeticNode.getOperator(), ContainerDataType.PRIMITIVE); } else if (leftValue instanceof EvaluatedNode) { - final EvaluatedNode leftPair = (EvaluatedNode) leftValue; + final EvaluatedNode left = (EvaluatedNode) leftValue; final DataType rightDataType = ValueUtils.getDataType(rightValue); - return operatorService.evaluateArithmeticOperator(leftPair.getValue(), leftPair.getDataType(), rightValue, rightDataType, + return operatorService.evaluateArithmeticOperator(left.getValue(), left.getDataType(), rightValue, rightDataType, arithmeticNode.getOperator(), ContainerDataType.PRIMITIVE); } else if (rightValue instanceof EvaluatedNode) { - final EvaluatedNode rightPair = (EvaluatedNode) rightValue; + final EvaluatedNode right = (EvaluatedNode) rightValue; final DataType leftDataType = ValueUtils.getDataType(leftValue); - return operatorService.evaluateArithmeticOperator(leftValue, leftDataType, rightPair.getValue(), rightPair.getDataType(), + return operatorService.evaluateArithmeticOperator(leftValue, leftDataType, right.getValue(), right.getDataType(), arithmeticNode.getOperator(), ContainerDataType.PRIMITIVE); } else { final DataType leftDataType = ValueUtils.getDataType(leftValue); diff --git a/src/main/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluator.java b/src/main/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluator.java index 2329677..c815dc1 100644 --- a/src/main/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluator.java +++ b/src/main/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluator.java @@ -1,18 +1,23 @@ package com.github.sidhant92.boolparser.application; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import java.util.Map; -import org.apache.commons.lang3.tuple.Pair; +import java.util.stream.Collectors; import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.Operator; import com.github.sidhant92.boolparser.domain.ArrayNode; import com.github.sidhant92.boolparser.domain.BooleanNode; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; import com.github.sidhant92.boolparser.domain.InNode; import com.github.sidhant92.boolparser.domain.NumericRangeNode; import com.github.sidhant92.boolparser.domain.ComparisonNode; import com.github.sidhant92.boolparser.domain.Node; import com.github.sidhant92.boolparser.domain.UnaryNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticBaseNode; +import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; import com.github.sidhant92.boolparser.exception.DataNotFoundException; import com.github.sidhant92.boolparser.exception.HeterogeneousArrayException; import com.github.sidhant92.boolparser.exception.InvalidUnaryOperand; @@ -85,24 +90,39 @@ private boolean evaluateNumericRangeToken(final NumericRangeNode numericRangeTok private boolean evaluateInToken(final InNode inToken, final Map data) { final Object fieldData = ValueUtils.getValueFromMap(inToken.getField(), data).orElseThrow(DataNotFoundException::new); + final List items = resolveArrayElements(inToken.getItems(), data); final DataType dataType = ValueUtils.getDataType(fieldData); - final Object[] values = inToken.getItems() + final Object[] values = items .stream() - .map(Pair::getRight).toArray(); + .map(EvaluatedNode::getValue).toArray(); return operatorService.evaluateLogicalOperator(Operator.IN, ContainerDataType.PRIMITIVE, dataType, fieldData, values); } + private List resolveArrayElements(final List items, final Map data) { + final List resolvedValues = items + .stream() + .map(item -> { + if (item instanceof ArithmeticBaseNode) { + return arithmeticExpressionEvaluator.evaluate(item, data); + } + return evaluateToken(item, data); + }) + .collect(Collectors.toList()); + return ValueUtils.mapToEvaluatedNodes(resolvedValues); + } + private boolean evaluateArrayToken(final ArrayNode arrayNode, final Map data) { final Object fieldData = ValueUtils.getValueFromMap(arrayNode.getField(), data).orElseThrow(DataNotFoundException::new); - if (arrayNode.getItems() + final List items = resolveArrayElements(arrayNode.getItems(), data); + if (items .stream() - .map(Pair::getLeft).distinct().count() > 1) { + .map(EvaluatedNode::getDataType).distinct().count() > 1) { throw new HeterogeneousArrayException(); } - final DataType dataType = arrayNode.getItems().get(0).getLeft(); - final Object[] values = arrayNode.getItems() + final DataType dataType = items.get(0).getDataType(); + final Object[] values = items .stream() - .map(Pair::getRight).toArray(); + .map(EvaluatedNode::getValue).toArray(); return operatorService.evaluateLogicalOperator(arrayNode.getOperator(), ContainerDataType.LIST, dataType, fieldData, values); } diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/ArrayNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/ArrayNode.java index 06fd7f7..9329c81 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/ArrayNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/ArrayNode.java @@ -19,7 +19,7 @@ public class ArrayNode extends Node { private final Operator operator; - private final List> items; + private final List items; @Override public NodeType getTokenType() { return NodeType.ARRAY; diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/InNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/InNode.java index 188e305..c6fc30f 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/InNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/InNode.java @@ -16,7 +16,7 @@ public class InNode extends Node { private final String field; - private final List> items; + private final List items; @Override public NodeType getTokenType() { return NodeType.IN; diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/UnaryNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/UnaryNode.java index 52b32cc..8c0bd12 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/UnaryNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/UnaryNode.java @@ -2,6 +2,7 @@ import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.NodeType; +import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticBaseNode; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -11,7 +12,7 @@ @Getter @Setter @Builder -public class UnaryNode extends Node { +public class UnaryNode extends ArithmeticBaseNode { private final DataType dataType; private final Object value; diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java index a9fc509..a43ce33 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java @@ -132,7 +132,7 @@ public void exitToExpression(BooleanExpressionParser.ToExpressionContext ctx) { public void exitArrayExpression(BooleanExpressionParser.ArrayExpressionContext ctx) { validateField(ctx.field, ctx.getText()); final String field = getField(ctx.field.getText()); - final List> items = getArrayElements(ctx.data.children); + final List items = getArrayElements(ctx.data.children); final Operator operator = Operator.getOperatorFromSymbol(ctx.op.getText()).orElse(Operator.EQUALS); currentNodes.add(new ArrayNode(field, operator, items)); super.exitArrayExpression(ctx); @@ -148,7 +148,7 @@ public void exitArithmeticFunctionExpression(BooleanExpressionParser.ArithmeticF log.error("Error parsing expression for the string {}", ctx.getText()); return new InvalidExpressionException(); }); - final List items = getArithmeticArrayElements(ctx.data.children); + final List items = getArrayElements(ctx.data.children); currentNodes.add(new ArithmeticFunctionNode(functionType, items)); super.exitArithmeticFunctionExpression(ctx); } @@ -157,7 +157,7 @@ public void exitArithmeticFunctionExpression(BooleanExpressionParser.ArithmeticF public void exitInExpression(BooleanExpressionParser.InExpressionContext ctx) { validateField(ctx.field, ctx.getText()); final String field = getField(ctx.field.getText()); - final List> items = getArrayElements(ctx.data.children); + final List items = getArrayElements(ctx.data.children); final InNode inNode = new InNode(field, items); if (Objects.isNull(ctx.not)) { currentNodes.add(inNode); @@ -168,19 +168,7 @@ public void exitInExpression(BooleanExpressionParser.InExpressionContext ctx) { super.exitInExpression(ctx); } - private List> getArrayElements(final List trees) { - return trees - .stream() - .filter(child -> child instanceof BooleanExpressionParser.TypesExpressionContext) - .map(child -> { - final DataType dataType = getDataType(((BooleanExpressionParser.TypesExpressionContext) child).start); - final Object value = ValueUtils.convertValue(child.getText(), dataType); - return Pair.of(dataType, value); - }) - .collect(Collectors.toList()); - } - - private List getArithmeticArrayElements(final List trees) { + private List getArrayElements(final List trees) { return trees .stream() .filter(child -> child instanceof BooleanExpressionParser.TypesExpressionContext) diff --git a/src/main/java/com/github/sidhant92/boolparser/util/ValueUtils.java b/src/main/java/com/github/sidhant92/boolparser/util/ValueUtils.java index 2d37783..cd9efe5 100644 --- a/src/main/java/com/github/sidhant92/boolparser/util/ValueUtils.java +++ b/src/main/java/com/github/sidhant92/boolparser/util/ValueUtils.java @@ -1,11 +1,15 @@ package com.github.sidhant92.boolparser.util; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; +import java.util.List; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; import org.apache.maven.artifact.versioning.ComparableVersion; import com.github.sidhant92.boolparser.constant.DataType; +import com.github.sidhant92.boolparser.domain.EvaluatedNode; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -31,6 +35,28 @@ public static Optional getValueFromMap(final String key, final Map mapToEvaluatedNodes(final List items) { + final List flattenedValues = new ArrayList<>(); + items.forEach(value -> { + if (value instanceof EvaluatedNode) { + final EvaluatedNode node = (EvaluatedNode) value; + if (node.getValue() instanceof Collection) { + ((Collection) node.getValue()).forEach( + v -> flattenedValues.add(EvaluatedNode.builder().value(v).dataType(ValueUtils.getDataType(v)).build())); + } else { + flattenedValues.add(node); + } + } + if (value instanceof Collection) { + ((Collection) value).forEach( + v -> flattenedValues.add(EvaluatedNode.builder().value(v).dataType(ValueUtils.getDataType(v)).build())); + } else { + flattenedValues.add(EvaluatedNode.builder().value(value).dataType(ValueUtils.getDataType(value)).build()); + } + }); + return flattenedValues; + } + public static Object convertValue(final String value, final DataType dataType) { switch (dataType) { case INTEGER: diff --git a/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java b/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java index c31bff8..9580249 100644 --- a/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java +++ b/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java @@ -253,10 +253,10 @@ public void testIntegerList() { final InNode inToken = (InNode) nodeOptional.get(); assertEquals(inToken.getItems().size(), 2); assertEquals(inToken.getField(), "age"); - assertEquals(inToken.getItems().get(0).getKey(), DataType.INTEGER); - assertEquals(inToken.getItems().get(1).getKey(), DataType.INTEGER); - assertEquals(inToken.getItems().get(0).getValue(), 12); - assertEquals(inToken.getItems().get(1).getValue(), 45); + assertEquals(((UnaryNode)inToken.getItems().get(0)).getDataType(), DataType.INTEGER); + assertEquals(((UnaryNode)inToken.getItems().get(1)).getDataType(), DataType.INTEGER); + assertEquals(((UnaryNode)inToken.getItems().get(0)).getValue(), 12); + assertEquals(((UnaryNode)inToken.getItems().get(1)).getValue(), 45); } @Test @@ -270,10 +270,10 @@ public void testNotIntegerList() { final InNode inToken = (InNode) ((BooleanNode) nodeOptional.get()).getLeft(); assertEquals(inToken.getItems().size(), 2); assertEquals(inToken.getField(), "age"); - assertEquals(inToken.getItems().get(0).getKey(), DataType.INTEGER); - assertEquals(inToken.getItems().get(1).getKey(), DataType.INTEGER); - assertEquals(inToken.getItems().get(0).getValue(), 12); - assertEquals(inToken.getItems().get(1).getValue(), 45); + assertEquals(((UnaryNode)inToken.getItems().get(0)).getDataType(), DataType.INTEGER); + assertEquals(((UnaryNode)inToken.getItems().get(1)).getDataType(), DataType.INTEGER); + assertEquals(((UnaryNode)inToken.getItems().get(0)).getValue(), 12); + assertEquals(((UnaryNode)inToken.getItems().get(1)).getValue(), 45); } @Test @@ -284,12 +284,12 @@ public void testStringList() { final InNode inToken = (InNode) nodeOptional.get(); assertEquals(inToken.getItems().size(), 3); assertEquals(inToken.getField(), "name"); - assertEquals(inToken.getItems().get(0).getKey(), DataType.STRING); - assertEquals(inToken.getItems().get(1).getKey(), DataType.STRING); - assertEquals(inToken.getItems().get(2).getKey(), DataType.STRING); - assertEquals(inToken.getItems().get(0).getValue(), "abc"); - assertEquals(inToken.getItems().get(1).getValue(), "def"); - assertEquals(inToken.getItems().get(2).getValue(), "abc def"); + assertEquals(((UnaryNode)inToken.getItems().get(0)).getDataType(), DataType.STRING); + assertEquals(((UnaryNode)inToken.getItems().get(1)).getDataType(), DataType.STRING); + assertEquals(((UnaryNode)inToken.getItems().get(2)).getDataType(), DataType.STRING); + assertEquals(((UnaryNode)inToken.getItems().get(0)).getValue(), "abc"); + assertEquals(((UnaryNode)inToken.getItems().get(1)).getValue(), "def"); + assertEquals(((UnaryNode)inToken.getItems().get(2)).getValue(), "abc def"); } @Test @@ -300,12 +300,12 @@ public void testStringList1() { final InNode inToken = (InNode) nodeOptional.get(); assertEquals(inToken.getItems().size(), 3); assertEquals(inToken.getField(), "name"); - assertEquals(inToken.getItems().get(0).getKey(), DataType.STRING); - assertEquals(inToken.getItems().get(1).getKey(), DataType.STRING); - assertEquals(inToken.getItems().get(2).getKey(), DataType.STRING); - assertEquals(inToken.getItems().get(0).getValue(), "abc"); - assertEquals(inToken.getItems().get(1).getValue(), "def"); - assertEquals(inToken.getItems().get(2).getValue(), "abc, def"); + assertEquals(((UnaryNode)inToken.getItems().get(0)).getDataType(), DataType.STRING); + assertEquals(((UnaryNode)inToken.getItems().get(1)).getDataType(), DataType.STRING); + assertEquals(((UnaryNode)inToken.getItems().get(2)).getDataType(), DataType.STRING); + assertEquals(((UnaryNode)inToken.getItems().get(0)).getValue(), "abc"); + assertEquals(((UnaryNode)inToken.getItems().get(1)).getValue(), "def"); + assertEquals(((UnaryNode)inToken.getItems().get(2)).getValue(), "abc, def"); } @Test @@ -316,12 +316,12 @@ public void testStringList2() { final InNode inToken = (InNode) nodeOptional.get(); assertEquals(inToken.getItems().size(), 3); assertEquals(inToken.getField(), "name"); - assertEquals(inToken.getItems().get(0).getKey(), DataType.STRING); - assertEquals(inToken.getItems().get(1).getKey(), DataType.STRING); - assertEquals(inToken.getItems().get(2).getKey(), DataType.STRING); - assertEquals(inToken.getItems().get(0).getValue(), "abc"); - assertEquals(inToken.getItems().get(1).getValue(), "def"); - assertEquals(inToken.getItems().get(2).getValue(), "ab\"c"); + assertEquals(((UnaryNode)inToken.getItems().get(0)).getDataType(), DataType.STRING); + assertEquals(((UnaryNode)inToken.getItems().get(1)).getDataType(), DataType.STRING); + assertEquals(((UnaryNode)inToken.getItems().get(2)).getDataType(), DataType.STRING); + assertEquals(((UnaryNode)inToken.getItems().get(0)).getValue(), "abc"); + assertEquals(((UnaryNode)inToken.getItems().get(1)).getValue(), "def"); + assertEquals(((UnaryNode)inToken.getItems().get(2)).getValue(), "ab\"c"); } @Test From 51e3fd1b54993329042bda409efa95e71b66e64a Mon Sep 17 00:00:00 2001 From: Sidhant Aggarwal <10743214+sidhant92@users.noreply.github.com> Date: Thu, 30 May 2024 11:57:43 +0530 Subject: [PATCH 07/10] refactor --- .../ArithmeticExpressionEvaluator.java | 6 ++---- .../application/BooleanExpressionEvaluator.java | 17 +++++++---------- .../domain/arithmetic/ArithmeticBaseNode.java | 2 +- .../arithmetic/ArithmeticFunctionNode.java | 2 +- .../domain/arithmetic/ArithmeticNode.java | 2 +- .../domain/{ => arithmetic}/UnaryNode.java | 3 +-- .../domain/{ => logical}/ArrayNode.java | 4 +--- .../domain/{ => logical}/BooleanNode.java | 2 +- .../domain/{ => logical}/ComparisonNode.java | 2 +- .../boolparser/domain/{ => logical}/InNode.java | 4 +--- .../boolparser/domain/{ => logical}/Node.java | 2 +- .../domain/{ => logical}/NumericRangeNode.java | 2 +- .../boolparser/parser/BoolExpressionParser.java | 2 +- .../boolparser/parser/antlr/BoolParser.java | 2 +- .../parser/antlr/BooleanFilterListener.java | 15 +++++++-------- .../parser/antlr/CachedBoolParser.java | 2 +- .../antlr/BooleanFilterBoolParserTest.java | 14 +++++++------- 17 files changed, 36 insertions(+), 47 deletions(-) rename src/main/java/com/github/sidhant92/boolparser/domain/{ => arithmetic}/UnaryNode.java (79%) rename src/main/java/com/github/sidhant92/boolparser/domain/{ => logical}/ArrayNode.java (77%) rename src/main/java/com/github/sidhant92/boolparser/domain/{ => logical}/BooleanNode.java (90%) rename src/main/java/com/github/sidhant92/boolparser/domain/{ => logical}/ComparisonNode.java (92%) rename src/main/java/com/github/sidhant92/boolparser/domain/{ => logical}/InNode.java (73%) rename src/main/java/com/github/sidhant92/boolparser/domain/{ => logical}/Node.java (77%) rename src/main/java/com/github/sidhant92/boolparser/domain/{ => logical}/NumericRangeNode.java (92%) diff --git a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java index 6170bdd..f630206 100644 --- a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java +++ b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java @@ -1,7 +1,5 @@ package com.github.sidhant92.boolparser.application; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -9,9 +7,9 @@ import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.Operator; import com.github.sidhant92.boolparser.domain.EvaluatedNode; -import com.github.sidhant92.boolparser.domain.UnaryNode; +import com.github.sidhant92.boolparser.domain.arithmetic.UnaryNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; -import com.github.sidhant92.boolparser.domain.Node; +import com.github.sidhant92.boolparser.domain.logical.Node; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode; import com.github.sidhant92.boolparser.exception.UnsupportedToken; import com.github.sidhant92.boolparser.function.FunctionEvaluatorService; diff --git a/src/main/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluator.java b/src/main/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluator.java index c815dc1..1746f0e 100644 --- a/src/main/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluator.java +++ b/src/main/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluator.java @@ -1,23 +1,20 @@ package com.github.sidhant92.boolparser.application; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import com.github.sidhant92.boolparser.constant.ContainerDataType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.Operator; -import com.github.sidhant92.boolparser.domain.ArrayNode; -import com.github.sidhant92.boolparser.domain.BooleanNode; +import com.github.sidhant92.boolparser.domain.logical.ArrayNode; +import com.github.sidhant92.boolparser.domain.logical.BooleanNode; import com.github.sidhant92.boolparser.domain.EvaluatedNode; -import com.github.sidhant92.boolparser.domain.InNode; -import com.github.sidhant92.boolparser.domain.NumericRangeNode; -import com.github.sidhant92.boolparser.domain.ComparisonNode; -import com.github.sidhant92.boolparser.domain.Node; -import com.github.sidhant92.boolparser.domain.UnaryNode; +import com.github.sidhant92.boolparser.domain.logical.InNode; +import com.github.sidhant92.boolparser.domain.logical.NumericRangeNode; +import com.github.sidhant92.boolparser.domain.logical.ComparisonNode; +import com.github.sidhant92.boolparser.domain.logical.Node; +import com.github.sidhant92.boolparser.domain.arithmetic.UnaryNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticBaseNode; -import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; import com.github.sidhant92.boolparser.exception.DataNotFoundException; import com.github.sidhant92.boolparser.exception.HeterogeneousArrayException; import com.github.sidhant92.boolparser.exception.InvalidUnaryOperand; diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticBaseNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticBaseNode.java index 76f66a7..35fc90d 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticBaseNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticBaseNode.java @@ -1,6 +1,6 @@ package com.github.sidhant92.boolparser.domain.arithmetic; -import com.github.sidhant92.boolparser.domain.Node; +import com.github.sidhant92.boolparser.domain.logical.Node; /** * @author sidhant.aggarwal diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticFunctionNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticFunctionNode.java index f3a786e..6e94661 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticFunctionNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticFunctionNode.java @@ -3,7 +3,7 @@ import java.util.List; import com.github.sidhant92.boolparser.constant.FunctionType; import com.github.sidhant92.boolparser.constant.NodeType; -import com.github.sidhant92.boolparser.domain.Node; +import com.github.sidhant92.boolparser.domain.logical.Node; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticNode.java index a00f065..3a57e7e 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticNode.java @@ -2,7 +2,7 @@ import com.github.sidhant92.boolparser.constant.NodeType; import com.github.sidhant92.boolparser.constant.Operator; -import com.github.sidhant92.boolparser.domain.Node; +import com.github.sidhant92.boolparser.domain.logical.Node; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/UnaryNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/UnaryNode.java similarity index 79% rename from src/main/java/com/github/sidhant92/boolparser/domain/UnaryNode.java rename to src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/UnaryNode.java index 8c0bd12..e37865f 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/UnaryNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/UnaryNode.java @@ -1,8 +1,7 @@ -package com.github.sidhant92.boolparser.domain; +package com.github.sidhant92.boolparser.domain.arithmetic; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.NodeType; -import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticBaseNode; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/ArrayNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/logical/ArrayNode.java similarity index 77% rename from src/main/java/com/github/sidhant92/boolparser/domain/ArrayNode.java rename to src/main/java/com/github/sidhant92/boolparser/domain/logical/ArrayNode.java index 9329c81..7117014 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/ArrayNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/logical/ArrayNode.java @@ -1,8 +1,6 @@ -package com.github.sidhant92.boolparser.domain; +package com.github.sidhant92.boolparser.domain.logical; import java.util.List; -import org.apache.commons.lang3.tuple.Pair; -import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.NodeType; import com.github.sidhant92.boolparser.constant.Operator; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/BooleanNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/logical/BooleanNode.java similarity index 90% rename from src/main/java/com/github/sidhant92/boolparser/domain/BooleanNode.java rename to src/main/java/com/github/sidhant92/boolparser/domain/logical/BooleanNode.java index b3590c8..6ffe5cf 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/BooleanNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/logical/BooleanNode.java @@ -1,4 +1,4 @@ -package com.github.sidhant92.boolparser.domain; +package com.github.sidhant92.boolparser.domain.logical; import com.github.sidhant92.boolparser.constant.NodeType; import com.github.sidhant92.boolparser.constant.LogicalOperationType; diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/ComparisonNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/logical/ComparisonNode.java similarity index 92% rename from src/main/java/com/github/sidhant92/boolparser/domain/ComparisonNode.java rename to src/main/java/com/github/sidhant92/boolparser/domain/logical/ComparisonNode.java index 9638cb8..131b8ec 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/ComparisonNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/logical/ComparisonNode.java @@ -1,4 +1,4 @@ -package com.github.sidhant92.boolparser.domain; +package com.github.sidhant92.boolparser.domain.logical; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.NodeType; diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/InNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/logical/InNode.java similarity index 73% rename from src/main/java/com/github/sidhant92/boolparser/domain/InNode.java rename to src/main/java/com/github/sidhant92/boolparser/domain/logical/InNode.java index c6fc30f..225360a 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/InNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/logical/InNode.java @@ -1,8 +1,6 @@ -package com.github.sidhant92.boolparser.domain; +package com.github.sidhant92.boolparser.domain.logical; import java.util.List; -import org.apache.commons.lang3.tuple.Pair; -import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.NodeType; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/Node.java b/src/main/java/com/github/sidhant92/boolparser/domain/logical/Node.java similarity index 77% rename from src/main/java/com/github/sidhant92/boolparser/domain/Node.java rename to src/main/java/com/github/sidhant92/boolparser/domain/logical/Node.java index adb44ac..14ff7ca 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/Node.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/logical/Node.java @@ -1,4 +1,4 @@ -package com.github.sidhant92.boolparser.domain; +package com.github.sidhant92.boolparser.domain.logical; import com.github.sidhant92.boolparser.constant.NodeType; diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/NumericRangeNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/logical/NumericRangeNode.java similarity index 92% rename from src/main/java/com/github/sidhant92/boolparser/domain/NumericRangeNode.java rename to src/main/java/com/github/sidhant92/boolparser/domain/logical/NumericRangeNode.java index 888a309..8be8dcd 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/NumericRangeNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/logical/NumericRangeNode.java @@ -1,4 +1,4 @@ -package com.github.sidhant92.boolparser.domain; +package com.github.sidhant92.boolparser.domain.logical; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.NodeType; diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/BoolExpressionParser.java b/src/main/java/com/github/sidhant92/boolparser/parser/BoolExpressionParser.java index c9aee89..a7c1eac 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/BoolExpressionParser.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/BoolExpressionParser.java @@ -1,6 +1,6 @@ package com.github.sidhant92.boolparser.parser; -import com.github.sidhant92.boolparser.domain.Node; +import com.github.sidhant92.boolparser.domain.logical.Node; import io.vavr.control.Try; /** diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BoolParser.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BoolParser.java index ccc4282..29f4454 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BoolParser.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BoolParser.java @@ -4,7 +4,7 @@ import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.ParseTreeWalker; -import com.github.sidhant92.boolparser.domain.Node; +import com.github.sidhant92.boolparser.domain.logical.Node; import com.github.sidhant92.boolparser.operator.OperatorFactory; import com.github.sidhant92.boolparser.parser.BoolExpressionParser; import io.vavr.control.Try; diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java index a43ce33..9f8c57a 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java @@ -8,20 +8,19 @@ import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.tree.ParseTree; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; import com.github.sidhant92.boolparser.constant.FunctionType; import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.LogicalOperationType; import com.github.sidhant92.boolparser.constant.Operator; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; -import com.github.sidhant92.boolparser.domain.ArrayNode; -import com.github.sidhant92.boolparser.domain.BooleanNode; -import com.github.sidhant92.boolparser.domain.InNode; -import com.github.sidhant92.boolparser.domain.Node; -import com.github.sidhant92.boolparser.domain.NumericRangeNode; -import com.github.sidhant92.boolparser.domain.ComparisonNode; -import com.github.sidhant92.boolparser.domain.UnaryNode; +import com.github.sidhant92.boolparser.domain.logical.ArrayNode; +import com.github.sidhant92.boolparser.domain.logical.BooleanNode; +import com.github.sidhant92.boolparser.domain.logical.InNode; +import com.github.sidhant92.boolparser.domain.logical.Node; +import com.github.sidhant92.boolparser.domain.logical.NumericRangeNode; +import com.github.sidhant92.boolparser.domain.logical.ComparisonNode; +import com.github.sidhant92.boolparser.domain.arithmetic.UnaryNode; import com.github.sidhant92.boolparser.exception.InvalidExpressionException; import com.github.sidhant92.boolparser.util.ValueUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/CachedBoolParser.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/CachedBoolParser.java index 2037abb..f8a6b04 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/CachedBoolParser.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/CachedBoolParser.java @@ -2,7 +2,7 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import com.github.sidhant92.boolparser.domain.Node; +import com.github.sidhant92.boolparser.domain.logical.Node; import com.github.sidhant92.boolparser.operator.OperatorFactory; import io.vavr.control.Try; diff --git a/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java b/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java index 9580249..68d4291 100644 --- a/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java +++ b/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java @@ -12,13 +12,13 @@ import com.github.sidhant92.boolparser.constant.Operator; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; -import com.github.sidhant92.boolparser.domain.ArrayNode; -import com.github.sidhant92.boolparser.domain.BooleanNode; -import com.github.sidhant92.boolparser.domain.InNode; -import com.github.sidhant92.boolparser.domain.Node; -import com.github.sidhant92.boolparser.domain.NumericRangeNode; -import com.github.sidhant92.boolparser.domain.ComparisonNode; -import com.github.sidhant92.boolparser.domain.UnaryNode; +import com.github.sidhant92.boolparser.domain.logical.ArrayNode; +import com.github.sidhant92.boolparser.domain.logical.BooleanNode; +import com.github.sidhant92.boolparser.domain.logical.InNode; +import com.github.sidhant92.boolparser.domain.logical.Node; +import com.github.sidhant92.boolparser.domain.logical.NumericRangeNode; +import com.github.sidhant92.boolparser.domain.logical.ComparisonNode; +import com.github.sidhant92.boolparser.domain.arithmetic.UnaryNode; import com.github.sidhant92.boolparser.exception.InvalidExpressionException; import io.vavr.control.Try; From a4367e886cd150398d2058f45074f8890b0d2ad5 Mon Sep 17 00:00:00 2001 From: Sidhant Aggarwal <10743214+sidhant92@users.noreply.github.com> Date: Fri, 31 May 2024 00:36:14 +0530 Subject: [PATCH 08/10] support for nested functions --- .../parser/antlr/BooleanFilterListener.java | 184 ++++++++++-------- .../ArithmeticExpressionEvaluatorTest.java | 18 ++ .../antlr/BooleanFilterBoolParserTest.java | 7 - 3 files changed, 118 insertions(+), 91 deletions(-) diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java index 9f8c57a..bbf5c08 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java @@ -7,6 +7,7 @@ import org.antlr.v4.runtime.CommonToken; import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.tree.ParseTree; +import org.antlr.v4.runtime.tree.TerminalNodeImpl; import org.apache.commons.lang3.StringUtils; import com.github.sidhant92.boolparser.constant.FunctionType; import com.github.sidhant92.boolparser.constant.DataType; @@ -50,59 +51,13 @@ public Node getNode() { @Override public void exitComparatorExpression(BooleanExpressionParser.ComparatorExpressionContext ctx) { - final String variableName = getField(ctx.left.getText()); - final Operator operator = Operator.getOperatorFromSymbol(ctx.op.getText()).orElse(Operator.EQUALS); - /*if ((ctx.right instanceof BooleanExpressionParser.ParentExpressionContext || ctx.right instanceof BooleanExpressionParser.ArithmeticFunctionExpressionContext) && !currentNodes.isEmpty()) { - final Node value = currentNodes.pop(); - currentNodes.add(new ComparisonNode(variableName, value, operator, DataType.INTEGER)); - } else { - final DataType dataType = getDataType(ctx.right.getStart()); - currentNodes.add(new ComparisonNode(variableName, ValueUtils.convertValue(ctx.right.getText(), dataType), operator, dataType)); - }*/ - if (!(ctx.right instanceof BooleanExpressionParser.TypesExpressionContext) && !currentNodes.isEmpty()) { - final Node value = currentNodes.pop(); - currentNodes.add(new ComparisonNode(variableName, value, operator, DataType.INTEGER)); - } else { - final DataType dataType = getDataType(ctx.right.getStart()); - currentNodes.add(new ComparisonNode(variableName, ValueUtils.convertValue(ctx.right.getText(), dataType), operator, dataType)); - } + currentNodes.add(mapComparatorExpressionContext(ctx)); super.enterComparatorExpression(ctx); } - private UnaryNode getUnaryNode(final BooleanExpressionParser.TypesExpressionContext ctx) { - final DataType dataType = getDataType(ctx.getStart()); - final Object operand = ValueUtils.convertValue(ctx.getText(), dataType); - return UnaryNode.builder().value(operand).dataType(dataType).build(); - } - @Override public void exitArithmeticExpression(BooleanExpressionParser.ArithmeticExpressionContext ctx) { - final Operator operator = Operator.getOperatorFromSymbol(ctx.op.getText()).orElse(Operator.EQUALS); - if (ctx.left instanceof BooleanExpressionParser.TypesExpressionContext && ctx.right instanceof BooleanExpressionParser.TypesExpressionContext) { - final UnaryNode left = getUnaryNode((BooleanExpressionParser.TypesExpressionContext) ctx.left); - final UnaryNode right = getUnaryNode((BooleanExpressionParser.TypesExpressionContext) ctx.right); - final ArithmeticNode node = ArithmeticNode.builder().left(left).right(right).operator(operator).build(); - currentNodes.add(node); - } else if (ctx.left instanceof BooleanExpressionParser.TypesExpressionContext) { - final UnaryNode left = getUnaryNode((BooleanExpressionParser.TypesExpressionContext) ctx.left); - final Node right = currentNodes.pop(); - final ArithmeticNode node = ArithmeticNode.builder().left(left).right(right).operator(operator).build(); - currentNodes.add(node); - } else if (ctx.right instanceof BooleanExpressionParser.TypesExpressionContext) { - final UnaryNode right = getUnaryNode((BooleanExpressionParser.TypesExpressionContext) ctx.right); - final Node left = currentNodes.pop(); - final ArithmeticNode node = ArithmeticNode.builder().left(left).right(right).operator(operator).build(); - currentNodes.add(node); - } else { - if (currentNodes.size() < 2) { - log.error("Error parsing expression for the string {}", ctx.getText()); - throw new InvalidExpressionException(); - } - final Node right = currentNodes.pop(); - final Node left = currentNodes.pop(); - final ArithmeticNode node = ArithmeticNode.builder().left(left).right(right).operator(operator).build(); - currentNodes.add(node); - } + currentNodes.add(mapArithmeticExpressionContext(ctx)); super.exitArithmeticExpression(ctx); } @@ -110,20 +65,14 @@ public void exitArithmeticExpression(BooleanExpressionParser.ArithmeticExpressio public void exitUnaryArithmeticExpression(BooleanExpressionParser.UnaryArithmeticExpressionContext ctx) { final DataType dataType = getDataType(ctx.exp.getStart()); final Object operand = ValueUtils.convertValue(ctx.exp.getText(), dataType); - final UnaryNode leafNode = UnaryNode.builder().value(operand).dataType(dataType).build(); + final Node leafNode = !currentNodes.isEmpty() ? currentNodes.pop() : UnaryNode.builder().value(operand).dataType(dataType).build(); currentNodes.add(ArithmeticNode.builder().left(leafNode).operator(Operator.UNARY).build()); super.enterUnaryArithmeticExpression(ctx); } @Override public void exitToExpression(BooleanExpressionParser.ToExpressionContext ctx) { - validateField(ctx.field, ctx.getText()); - final String field = getField(ctx.field.getText()); - final DataType lowerDataType = getDataType(ctx.lower.start); - final Object lowerValue = ValueUtils.convertValue(ctx.lower.start.getText(), lowerDataType); - final DataType upperDataType = getDataType(ctx.upper.start); - final Object upperValue = ValueUtils.convertValue(ctx.upper.getText(), upperDataType); - currentNodes.add(new NumericRangeNode(field, lowerValue, upperValue, lowerDataType, upperDataType)); + currentNodes.add(mapToExpressionContext(ctx)); super.exitToExpression(ctx); } @@ -139,6 +88,51 @@ public void exitArrayExpression(BooleanExpressionParser.ArrayExpressionContext c @Override public void exitArithmeticFunctionExpression(BooleanExpressionParser.ArithmeticFunctionExpressionContext ctx) { + final Node node = mapArithmeticFunctionExpressionContext(ctx); + currentNodes.add(node); + super.exitArithmeticFunctionExpression(ctx); + } + + @Override + public void exitInExpression(BooleanExpressionParser.InExpressionContext ctx) { + currentNodes.add(mapInExpressionContext(ctx)); + super.exitInExpression(ctx); + } + + private List getArrayElements(final List trees) { + return trees + .stream() + .filter(child -> !(child instanceof TerminalNodeImpl)) + .map(this::mapContextToNode) + .collect(Collectors.toList()); + } + + private Node mapContextToNode(final ParseTree ctx) { + if (ctx instanceof BooleanExpressionParser.ArithmeticExpressionContext) { + return mapArithmeticExpressionContext((BooleanExpressionParser.ArithmeticExpressionContext) ctx); + } else if (ctx instanceof BooleanExpressionParser.InExpressionContext) { + return mapInExpressionContext((BooleanExpressionParser.InExpressionContext) ctx); + } else if (ctx instanceof BooleanExpressionParser.ArithmeticFunctionExpressionContext) { + return mapArithmeticFunctionExpressionContext((BooleanExpressionParser.ArithmeticFunctionExpressionContext) ctx); + } else if (ctx instanceof BooleanExpressionParser.ComparatorExpressionContext) { + return mapComparatorExpressionContext((BooleanExpressionParser.ComparatorExpressionContext) ctx); + } else if (ctx instanceof BooleanExpressionParser.ToExpressionContext) { + return mapToExpressionContext((BooleanExpressionParser.ToExpressionContext) ctx); + } else if (ctx instanceof BooleanExpressionParser.TypesExpressionContext) { + return mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx); + } else { + log.error("Array does not support this expression {}", ctx.getText()); + throw new InvalidExpressionException(); + } + } + + private UnaryNode mapTypesExpressionContext(BooleanExpressionParser.TypesExpressionContext ctx) { + final DataType dataType = getDataType(ctx.start); + final Object value = ValueUtils.convertValue(ctx.getText(), dataType); + return new UnaryNode(dataType, value); + } + + private ArithmeticFunctionNode mapArithmeticFunctionExpressionContext(BooleanExpressionParser.ArithmeticFunctionExpressionContext ctx) { if (ctx.data.exception != null) { log.error("Error parsing expression for the string {}", ctx.getText()); throw new InvalidExpressionException(); @@ -148,35 +142,66 @@ public void exitArithmeticFunctionExpression(BooleanExpressionParser.ArithmeticF return new InvalidExpressionException(); }); final List items = getArrayElements(ctx.data.children); - currentNodes.add(new ArithmeticFunctionNode(functionType, items)); - super.exitArithmeticFunctionExpression(ctx); + return new ArithmeticFunctionNode(functionType, items); } - @Override - public void exitInExpression(BooleanExpressionParser.InExpressionContext ctx) { + private ComparisonNode mapComparatorExpressionContext(BooleanExpressionParser.ComparatorExpressionContext ctx) { + final String variableName = getField(ctx.left.getText()); + final Operator operator = Operator.getOperatorFromSymbol(ctx.op.getText()).orElse(Operator.EQUALS); + if (!(ctx.right instanceof BooleanExpressionParser.TypesExpressionContext) && !currentNodes.isEmpty()) { + final Node value = currentNodes.pop(); + return new ComparisonNode(variableName, value, operator, DataType.INTEGER); + } else { + final DataType dataType = getDataType(ctx.right.getStart()); + return new ComparisonNode(variableName, ValueUtils.convertValue(ctx.right.getText(), dataType), operator, dataType); + } + } + + private ArithmeticNode mapArithmeticExpressionContext(BooleanExpressionParser.ArithmeticExpressionContext ctx) { + final Operator operator = Operator.getOperatorFromSymbol(ctx.op.getText()).orElse(Operator.EQUALS); + if (ctx.left instanceof BooleanExpressionParser.TypesExpressionContext && ctx.right instanceof BooleanExpressionParser.TypesExpressionContext) { + final UnaryNode left = mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx.left); + final UnaryNode right = mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx.right); + return ArithmeticNode.builder().left(left).right(right).operator(operator).build(); + } else if (ctx.left instanceof BooleanExpressionParser.TypesExpressionContext) { + final UnaryNode left = mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx.left); + final Node right = currentNodes.pop(); + return ArithmeticNode.builder().left(left).right(right).operator(operator).build(); + } else if (ctx.right instanceof BooleanExpressionParser.TypesExpressionContext) { + final UnaryNode right = mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx.right); + final Node left = currentNodes.pop(); + return ArithmeticNode.builder().left(left).right(right).operator(operator).build(); + } else { + if (currentNodes.size() < 2) { + log.error("Error parsing expression for the string {}", ctx.getText()); + throw new InvalidExpressionException(); + } + final Node right = currentNodes.pop(); + final Node left = currentNodes.pop(); + return ArithmeticNode.builder().left(left).right(right).operator(operator).build(); + } + } + + private Node mapInExpressionContext(BooleanExpressionParser.InExpressionContext ctx) { validateField(ctx.field, ctx.getText()); final String field = getField(ctx.field.getText()); final List items = getArrayElements(ctx.data.children); final InNode inNode = new InNode(field, items); if (Objects.isNull(ctx.not)) { - currentNodes.add(inNode); + return inNode; } else { - final BooleanNode booleanNode = new BooleanNode(inNode, null, LogicalOperationType.NOT); - currentNodes.add(booleanNode); + return new BooleanNode(inNode, null, LogicalOperationType.NOT); } - super.exitInExpression(ctx); } - private List getArrayElements(final List trees) { - return trees - .stream() - .filter(child -> child instanceof BooleanExpressionParser.TypesExpressionContext) - .map(child -> { - final DataType dataType = getDataType(((BooleanExpressionParser.TypesExpressionContext) child).start); - final Object value = ValueUtils.convertValue(child.getText(), dataType); - return new UnaryNode(dataType, value); - }) - .collect(Collectors.toList()); + private NumericRangeNode mapToExpressionContext(BooleanExpressionParser.ToExpressionContext ctx) { + validateField(ctx.field, ctx.getText()); + final String field = getField(ctx.field.getText()); + final DataType lowerDataType = getDataType(ctx.lower.start); + final Object lowerValue = ValueUtils.convertValue(ctx.lower.start.getText(), lowerDataType); + final DataType upperDataType = getDataType(ctx.upper.start); + final Object upperValue = ValueUtils.convertValue(ctx.upper.getText(), upperDataType); + return new NumericRangeNode(field, lowerValue, upperValue, lowerDataType, upperDataType); } private void validateField(final Token token, final String text) { @@ -219,17 +244,8 @@ private LogicalOperationType getLogicalOperator(final org.antlr.v4.runtime.Token @Override public void exitParse(BooleanExpressionParser.ParseContext ctx) { - if (this.node == null && this.currentNodes.size() == 1) { + if (this.node == null && !this.currentNodes.isEmpty()) { this.node = currentNodes.pop(); - } else if (this.node == null && this.currentNodes.size() == 2) { - final Node firstNode = currentNodes.pop(); - final Node secondNode = currentNodes.pop(); - if (firstNode instanceof ArithmeticNode && secondNode instanceof ArithmeticNode && ((ArithmeticNode) secondNode).getRight() == null) { - this.node = ArithmeticNode.builder().operator(Operator.UNARY).left(firstNode).build(); - } - if (secondNode instanceof ArithmeticNode && firstNode instanceof ArithmeticNode && ((ArithmeticNode) firstNode).getRight() == null) { - this.node = ArithmeticNode.builder().operator(Operator.UNARY).left(secondNode).build(); - } } if (this.node == null && tokenCount == 1 && lastToken instanceof CommonToken) { this.node = UnaryNode.builder().dataType(DataType.STRING).value(ValueUtils.convertValue(lastToken.getText(), DataType.STRING).toString()) diff --git a/src/test/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluatorTest.java b/src/test/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluatorTest.java index 928be3d..d36315b 100644 --- a/src/test/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluatorTest.java +++ b/src/test/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluatorTest.java @@ -397,4 +397,22 @@ public void testLenArithmeticFunctionIntegerVariable() { assertTrue(resultOptional.isSuccess()); assertEquals(resultOptional.get(), 4); } + + @Test + public void testNestedFunctions() { + final Map data = new HashMap<>(); + data.put("a", 2.7); + final Try resultOptional = arithmeticExpressionEvaluator.evaluate("max(1,2,min(5,7,87))", data); + assertTrue(resultOptional.isSuccess()); + assertEquals(resultOptional.get(), 5); + } + + @Test + public void testNestedFunctions1() { + final Map data = new HashMap<>(); + data.put("a", 2.7); + final Try resultOptional = arithmeticExpressionEvaluator.evaluate("max(1,2,min(5,7,87,min(1,2)))", data); + assertTrue(resultOptional.isSuccess()); + assertEquals(resultOptional.get(), 2); + } } diff --git a/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java b/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java index 68d4291..8ea27db 100644 --- a/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java +++ b/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java @@ -333,13 +333,6 @@ public void testSingleToken() { assertEquals(((UnaryNode) nodeOptional.get()).getValue(), "a"); } - @Test - public void testInvalidNotExpression() { - final Try nodeOptional = boolExpressionBoolParser.parseExpression("not a > 5"); - assertTrue(nodeOptional.isFailure()); - assertTrue(nodeOptional.getCause() instanceof InvalidExpressionException); - } - @Test public void testContainsAny() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("a contains_any (1,2,3)"); From 39bf89b1475e190f5dd406ab88e9627c85bc1771 Mon Sep 17 00:00:00 2001 From: Sidhant Aggarwal <10743214+sidhant92@users.noreply.github.com> Date: Sun, 9 Jun 2024 17:02:26 +0530 Subject: [PATCH 09/10] change syntax for strings and variables --- .../ArithmeticExpressionEvaluator.java | 14 +- .../BooleanExpressionEvaluator.java | 2 +- .../boolparser/constant/NodeType.java | 1 + .../boolparser/domain/FieldNode.java | 21 + .../domain/logical/ComparisonNode.java | 2 +- .../antlr/BooleanExpressionBaseListener.java | 2 +- .../parser/antlr/BooleanExpressionLexer.java | 485 +++++++++--------- .../antlr/BooleanExpressionListener.java | 2 +- .../parser/antlr/BooleanExpressionParser.java | 376 +++++++------- .../parser/antlr/BooleanFilterListener.java | 34 +- src/main/java/resources/BooleanExpression.g4 | 13 +- .../BooleanExpressionEvaluatorTest.java | 46 +- .../antlr/BooleanFilterBoolParserTest.java | 144 +++--- 13 files changed, 607 insertions(+), 535 deletions(-) create mode 100644 src/main/java/com/github/sidhant92/boolparser/domain/FieldNode.java diff --git a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java index f630206..d9c670b 100644 --- a/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java +++ b/src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java @@ -7,10 +7,12 @@ import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.Operator; import com.github.sidhant92.boolparser.domain.EvaluatedNode; +import com.github.sidhant92.boolparser.domain.FieldNode; import com.github.sidhant92.boolparser.domain.arithmetic.UnaryNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; import com.github.sidhant92.boolparser.domain.logical.Node; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode; +import com.github.sidhant92.boolparser.exception.DataNotFoundException; import com.github.sidhant92.boolparser.exception.UnsupportedToken; import com.github.sidhant92.boolparser.function.FunctionEvaluatorService; import com.github.sidhant92.boolparser.operator.OperatorService; @@ -54,15 +56,23 @@ private Object evaluateToken(final Node node, final Map data) { return evaluateArithmeticFunctionToken((ArithmeticFunctionNode) node, data); case UNARY: return evaluateUnaryToken((UnaryNode) node, data); + case FIELD: + return evaluateFieldToken((FieldNode) node, data); default: log.error("unsupported token {}", node.getTokenType()); throw new UnsupportedToken(); } } + private Object evaluateFieldToken(final FieldNode fieldNode, final Map data) { + if (!data.containsKey(fieldNode.getField())) { + throw new DataNotFoundException(); + } + return data.get(fieldNode.getField()); + } + private Object evaluateUnaryToken(final UnaryNode unaryNode, final Map data) { - return unaryNode.getDataType() == DataType.STRING ? ValueUtils.getValueFromMap(unaryNode.getValue().toString(), data) - .orElse(unaryNode.getValue()) : unaryNode.getValue(); + return unaryNode.getValue(); } private Object evaluateArithmeticFunctionToken(final ArithmeticFunctionNode arithmeticFunctionNode, final Map data) { diff --git a/src/main/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluator.java b/src/main/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluator.java index 1746f0e..142639c 100644 --- a/src/main/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluator.java +++ b/src/main/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluator.java @@ -73,7 +73,7 @@ private boolean evaluateToken(final Node node, final Map data) { private boolean evaluateComparisonToken(final ComparisonNode comparisonToken, final Map data) { final Object fieldData = ValueUtils.getValueFromMap(comparisonToken.getField(), data).orElseThrow(DataNotFoundException::new); final Object value = comparisonToken.getValue() instanceof ArithmeticBaseNode ? arithmeticExpressionEvaluator.evaluate( - (Node) comparisonToken.getValue(), data) : comparisonToken.getValue(); + comparisonToken.getValue(), data) : comparisonToken.getValue(); return operatorService.evaluateLogicalOperator(comparisonToken.getOperator(), ContainerDataType.PRIMITIVE, comparisonToken.getDataType(), fieldData, value); } diff --git a/src/main/java/com/github/sidhant92/boolparser/constant/NodeType.java b/src/main/java/com/github/sidhant92/boolparser/constant/NodeType.java index 3acb52f..efe5169 100644 --- a/src/main/java/com/github/sidhant92/boolparser/constant/NodeType.java +++ b/src/main/java/com/github/sidhant92/boolparser/constant/NodeType.java @@ -11,6 +11,7 @@ public enum NodeType { IN, ARRAY, UNARY, + FIELD, ARITHMETIC, ARITHMETIC_FUNCTION } diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/FieldNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/FieldNode.java new file mode 100644 index 0000000..442c487 --- /dev/null +++ b/src/main/java/com/github/sidhant92/boolparser/domain/FieldNode.java @@ -0,0 +1,21 @@ +package com.github.sidhant92.boolparser.domain; + +import com.github.sidhant92.boolparser.constant.NodeType; +import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticBaseNode; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +@AllArgsConstructor +@Getter +@Setter +@Builder +public class FieldNode extends ArithmeticBaseNode { + private final String field; + + @Override + public NodeType getTokenType() { + return NodeType.FIELD; + } +} diff --git a/src/main/java/com/github/sidhant92/boolparser/domain/logical/ComparisonNode.java b/src/main/java/com/github/sidhant92/boolparser/domain/logical/ComparisonNode.java index 131b8ec..81f15a4 100644 --- a/src/main/java/com/github/sidhant92/boolparser/domain/logical/ComparisonNode.java +++ b/src/main/java/com/github/sidhant92/boolparser/domain/logical/ComparisonNode.java @@ -19,7 +19,7 @@ public class ComparisonNode extends Node { private final String field; - private final Object value; + private final Node value; private final Operator operator; diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionBaseListener.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionBaseListener.java index 7aba7d1..fd825b8 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionBaseListener.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionBaseListener.java @@ -1,4 +1,4 @@ -package com.github.sidhant92.boolparser.parser.antlr;// Generated from /Users/sid/Desktop/filter1/BooleanExpression.g4 by ANTLR 4.13.1 +package com.github.sidhant92.boolparser.parser.antlr;// Generated from /Users/sid/Desktop/filter2/BooleanExpression.g4 by ANTLR 4.13.1 import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.tree.ErrorNode; diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionLexer.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionLexer.java index d2c607a..fe48745 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionLexer.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionLexer.java @@ -1,4 +1,4 @@ -package com.github.sidhant92.boolparser.parser.antlr;// Generated from /Users/sid/Desktop/filter1/BooleanExpression.g4 by ANTLR 4.13.1 +package com.github.sidhant92.boolparser.parser.antlr;// Generated from /Users/sid/Desktop/filter2/BooleanExpression.g4 by ANTLR 4.13.1 import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.Token; @@ -20,8 +20,8 @@ public class BooleanExpressionLexer extends Lexer { CONTAINS_ANY=10, MIN=11, MAX=12, AVG=13, SUM=14, MEAN=15, MODE=16, MEDIAN=17, LEN=18, INT=19, ADD=20, SUBTRACT=21, MULTIPLY=22, DIVIDE=23, MODULUS=24, EXPONENT=25, NE=26, GT=27, GE=28, LT=29, LE=30, EQ=31, LPAREN=32, RPAREN=33, - DECIMAL=34, APP_VERSION=35, INTEGER=36, WS=37, WORD=38, ALPHANUMERIC=39, - SQ=40, DQ=41; + DECIMAL=34, APP_VERSION=35, INTEGER=36, WS=37, WORD=38, SQSTR=39, DQSTR=40, + FIELD=41, ALPHANUMERIC=42, SQ=43, DQ=44; public static String[] channelNames = { "DEFAULT_TOKEN_CHANNEL", "HIDDEN" }; @@ -36,7 +36,8 @@ private static String[] makeRuleNames() { "CONTAINS_ANY", "MIN", "MAX", "AVG", "SUM", "MEAN", "MODE", "MEDIAN", "LEN", "INT", "ADD", "SUBTRACT", "MULTIPLY", "DIVIDE", "MODULUS", "EXPONENT", "NE", "GT", "GE", "LT", "LE", "EQ", "LPAREN", "RPAREN", "DECIMAL", "APP_VERSION", - "INTEGER", "WS", "WORD", "ALPHANUMERIC", "SQ", "DQ" + "INTEGER", "WS", "WORD", "SQSTR", "DQSTR", "FIELD", "ALPHANUMERIC", "SQ", + "DQ" }; } public static final String[] ruleNames = makeRuleNames(); @@ -56,7 +57,8 @@ private static String[] makeSymbolicNames() { "CONTAINS_ANY", "MIN", "MAX", "AVG", "SUM", "MEAN", "MODE", "MEDIAN", "LEN", "INT", "ADD", "SUBTRACT", "MULTIPLY", "DIVIDE", "MODULUS", "EXPONENT", "NE", "GT", "GE", "LT", "LE", "EQ", "LPAREN", "RPAREN", "DECIMAL", "APP_VERSION", - "INTEGER", "WS", "WORD", "ALPHANUMERIC", "SQ", "DQ" + "INTEGER", "WS", "WORD", "SQSTR", "DQSTR", "FIELD", "ALPHANUMERIC", "SQ", + "DQ" }; } private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames(); @@ -118,7 +120,7 @@ public BooleanExpressionLexer(CharStream input) { public ATN getATN() { return _ATN; } public static final String _serializedATN = - "\u0004\u0000)\u018a\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+ + "\u0004\u0000,\u018a\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+ "\u0007\u0001\u0002\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004"+ "\u0007\u0004\u0002\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007"+ "\u0007\u0007\u0002\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b"+ @@ -130,247 +132,244 @@ public BooleanExpressionLexer(CharStream input) { "\u001b\u0007\u001b\u0002\u001c\u0007\u001c\u0002\u001d\u0007\u001d\u0002"+ "\u001e\u0007\u001e\u0002\u001f\u0007\u001f\u0002 \u0007 \u0002!\u0007"+ "!\u0002\"\u0007\"\u0002#\u0007#\u0002$\u0007$\u0002%\u0007%\u0002&\u0007"+ - "&\u0002\'\u0007\'\u0002(\u0007(\u0001\u0000\u0001\u0000\u0001\u0001\u0001"+ - "\u0001\u0001\u0001\u0001\u0001\u0003\u0001Z\b\u0001\u0001\u0002\u0001"+ - "\u0002\u0001\u0002\u0001\u0002\u0003\u0002`\b\u0002\u0001\u0003\u0001"+ - "\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001"+ - "\u0003\u0003\u0003j\b\u0003\u0001\u0004\u0001\u0004\u0001\u0004\u0001"+ - "\u0004\u0001\u0004\u0001\u0004\u0003\u0004r\b\u0004\u0001\u0005\u0001"+ - "\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0003\u0005z\b"+ - "\u0005\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001"+ - "\u0006\u0001\u0006\u0001\u0006\u0003\u0006\u0084\b\u0006\u0001\u0007\u0001"+ - "\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001"+ - "\u0007\u0001\u0007\u0001\u0007\u0003\u0007\u0090\b\u0007\u0001\b\u0001"+ + "&\u0002\'\u0007\'\u0002(\u0007(\u0002)\u0007)\u0002*\u0007*\u0002+\u0007"+ + "+\u0001\u0000\u0001\u0000\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+ + "\u0003\u0001`\b\u0001\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002"+ + "\u0003\u0002f\b\u0002\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003"+ + "\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0003\u0003p\b\u0003"+ + "\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004"+ + "\u0003\u0004x\b\u0004\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005"+ + "\u0001\u0005\u0001\u0005\u0003\u0005\u0080\b\u0005\u0001\u0006\u0001\u0006"+ + "\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+ + "\u0003\u0006\u008a\b\u0006\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007"+ + "\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007"+ + "\u0003\u0007\u0096\b\u0007\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001"+ "\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001"+ "\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001"+ - "\b\u0001\b\u0001\b\u0001\b\u0001\b\u0003\b\u00aa\b\b\u0001\t\u0001\t\u0001"+ + "\b\u0003\b\u00b0\b\b\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001"+ "\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001"+ - "\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001"+ - "\t\u0001\t\u0001\t\u0001\t\u0003\t\u00c4\b\t\u0001\n\u0001\n\u0001\n\u0001"+ - "\n\u0001\n\u0001\n\u0003\n\u00cc\b\n\u0001\u000b\u0001\u000b\u0001\u000b"+ - "\u0001\u000b\u0001\u000b\u0001\u000b\u0003\u000b\u00d4\b\u000b\u0001\f"+ - "\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0003\f\u00dc\b\f\u0001\r\u0001"+ - "\r\u0001\r\u0001\r\u0001\r\u0001\r\u0003\r\u00e4\b\r\u0001\u000e\u0001"+ - "\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001"+ - "\u000e\u0003\u000e\u00ee\b\u000e\u0001\u000f\u0001\u000f\u0001\u000f\u0001"+ - "\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0003\u000f\u00f8"+ - "\b\u000f\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001"+ + "\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0003"+ + "\t\u00ca\b\t\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0003\n\u00d2"+ + "\b\n\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001"+ + "\u000b\u0003\u000b\u00da\b\u000b\u0001\f\u0001\f\u0001\f\u0001\f\u0001"+ + "\f\u0001\f\u0003\f\u00e2\b\f\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001"+ + "\r\u0003\r\u00ea\b\r\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001"+ + "\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0003\u000e\u00f4\b\u000e\u0001"+ + "\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001"+ + "\u000f\u0001\u000f\u0003\u000f\u00fe\b\u000f\u0001\u0010\u0001\u0010\u0001"+ "\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001"+ - "\u0010\u0003\u0010\u0106\b\u0010\u0001\u0011\u0001\u0011\u0001\u0011\u0001"+ - "\u0011\u0001\u0011\u0001\u0011\u0003\u0011\u010e\b\u0011\u0001\u0012\u0001"+ - "\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0003\u0012\u0116"+ - "\b\u0012\u0001\u0013\u0001\u0013\u0001\u0014\u0001\u0014\u0001\u0015\u0001"+ - "\u0015\u0001\u0016\u0001\u0016\u0001\u0017\u0001\u0017\u0001\u0018\u0001"+ - "\u0018\u0001\u0019\u0001\u0019\u0001\u0019\u0001\u001a\u0001\u001a\u0001"+ - "\u001b\u0001\u001b\u0001\u001b\u0001\u001c\u0001\u001c\u0001\u001d\u0001"+ - "\u001d\u0001\u001d\u0001\u001e\u0001\u001e\u0001\u001f\u0001\u001f\u0001"+ - " \u0001 \u0001!\u0004!\u0138\b!\u000b!\f!\u0139\u0001!\u0001!\u0004!\u013e"+ - "\b!\u000b!\f!\u013f\u0001\"\u0001\"\u0001\"\u0004\"\u0145\b\"\u000b\""+ - "\f\"\u0146\u0001#\u0004#\u014a\b#\u000b#\f#\u014b\u0001$\u0004$\u014f"+ - "\b$\u000b$\f$\u0150\u0001$\u0001$\u0001%\u0001%\u0001%\u0004%\u0158\b"+ - "%\u000b%\f%\u0159\u0001%\u0001%\u0001%\u0001%\u0005%\u0160\b%\n%\f%\u0163"+ - "\t%\u0001%\u0001%\u0003%\u0167\b%\u0001%\u0001%\u0001%\u0001%\u0004%\u016d"+ - "\b%\u000b%\f%\u016e\u0001%\u0001%\u0003%\u0173\b%\u0003%\u0175\b%\u0001"+ - "&\u0001&\u0001\'\u0001\'\u0005\'\u017b\b\'\n\'\f\'\u017e\t\'\u0001\'\u0001"+ - "\'\u0001(\u0001(\u0005(\u0184\b(\n(\f(\u0187\t(\u0001(\u0001(\u0002\u017c"+ - "\u0185\u0000)\u0001\u0001\u0003\u0002\u0005\u0003\u0007\u0004\t\u0005"+ - "\u000b\u0006\r\u0007\u000f\b\u0011\t\u0013\n\u0015\u000b\u0017\f\u0019"+ - "\r\u001b\u000e\u001d\u000f\u001f\u0010!\u0011#\u0012%\u0013\'\u0014)\u0015"+ - "+\u0016-\u0017/\u00181\u00193\u001a5\u001b7\u001c9\u001d;\u001e=\u001f"+ - "? A!C\"E#G$I%K&M\'O(Q)\u0001\u0000\u0005\u0001\u000009\u0003\u0000\t\n"+ - "\f\r \u0002\u0000..__\u0002\u0000-.__\u0003\u000009AZaz\u01b2\u0000\u0001"+ - "\u0001\u0000\u0000\u0000\u0000\u0003\u0001\u0000\u0000\u0000\u0000\u0005"+ - "\u0001\u0000\u0000\u0000\u0000\u0007\u0001\u0000\u0000\u0000\u0000\t\u0001"+ - "\u0000\u0000\u0000\u0000\u000b\u0001\u0000\u0000\u0000\u0000\r\u0001\u0000"+ - "\u0000\u0000\u0000\u000f\u0001\u0000\u0000\u0000\u0000\u0011\u0001\u0000"+ - "\u0000\u0000\u0000\u0013\u0001\u0000\u0000\u0000\u0000\u0015\u0001\u0000"+ - "\u0000\u0000\u0000\u0017\u0001\u0000\u0000\u0000\u0000\u0019\u0001\u0000"+ - "\u0000\u0000\u0000\u001b\u0001\u0000\u0000\u0000\u0000\u001d\u0001\u0000"+ - "\u0000\u0000\u0000\u001f\u0001\u0000\u0000\u0000\u0000!\u0001\u0000\u0000"+ - "\u0000\u0000#\u0001\u0000\u0000\u0000\u0000%\u0001\u0000\u0000\u0000\u0000"+ - "\'\u0001\u0000\u0000\u0000\u0000)\u0001\u0000\u0000\u0000\u0000+\u0001"+ - "\u0000\u0000\u0000\u0000-\u0001\u0000\u0000\u0000\u0000/\u0001\u0000\u0000"+ - "\u0000\u00001\u0001\u0000\u0000\u0000\u00003\u0001\u0000\u0000\u0000\u0000"+ - "5\u0001\u0000\u0000\u0000\u00007\u0001\u0000\u0000\u0000\u00009\u0001"+ - "\u0000\u0000\u0000\u0000;\u0001\u0000\u0000\u0000\u0000=\u0001\u0000\u0000"+ - "\u0000\u0000?\u0001\u0000\u0000\u0000\u0000A\u0001\u0000\u0000\u0000\u0000"+ - "C\u0001\u0000\u0000\u0000\u0000E\u0001\u0000\u0000\u0000\u0000G\u0001"+ - "\u0000\u0000\u0000\u0000I\u0001\u0000\u0000\u0000\u0000K\u0001\u0000\u0000"+ - "\u0000\u0000M\u0001\u0000\u0000\u0000\u0000O\u0001\u0000\u0000\u0000\u0000"+ - "Q\u0001\u0000\u0000\u0000\u0001S\u0001\u0000\u0000\u0000\u0003Y\u0001"+ - "\u0000\u0000\u0000\u0005_\u0001\u0000\u0000\u0000\u0007i\u0001\u0000\u0000"+ - "\u0000\tq\u0001\u0000\u0000\u0000\u000by\u0001\u0000\u0000\u0000\r\u0083"+ - "\u0001\u0000\u0000\u0000\u000f\u008f\u0001\u0000\u0000\u0000\u0011\u00a9"+ - "\u0001\u0000\u0000\u0000\u0013\u00c3\u0001\u0000\u0000\u0000\u0015\u00cb"+ - "\u0001\u0000\u0000\u0000\u0017\u00d3\u0001\u0000\u0000\u0000\u0019\u00db"+ - "\u0001\u0000\u0000\u0000\u001b\u00e3\u0001\u0000\u0000\u0000\u001d\u00ed"+ - "\u0001\u0000\u0000\u0000\u001f\u00f7\u0001\u0000\u0000\u0000!\u0105\u0001"+ - "\u0000\u0000\u0000#\u010d\u0001\u0000\u0000\u0000%\u0115\u0001\u0000\u0000"+ - "\u0000\'\u0117\u0001\u0000\u0000\u0000)\u0119\u0001\u0000\u0000\u0000"+ - "+\u011b\u0001\u0000\u0000\u0000-\u011d\u0001\u0000\u0000\u0000/\u011f"+ - "\u0001\u0000\u0000\u00001\u0121\u0001\u0000\u0000\u00003\u0123\u0001\u0000"+ - "\u0000\u00005\u0126\u0001\u0000\u0000\u00007\u0128\u0001\u0000\u0000\u0000"+ - "9\u012b\u0001\u0000\u0000\u0000;\u012d\u0001\u0000\u0000\u0000=\u0130"+ - "\u0001\u0000\u0000\u0000?\u0132\u0001\u0000\u0000\u0000A\u0134\u0001\u0000"+ - "\u0000\u0000C\u0137\u0001\u0000\u0000\u0000E\u0141\u0001\u0000\u0000\u0000"+ - "G\u0149\u0001\u0000\u0000\u0000I\u014e\u0001\u0000\u0000\u0000K\u0174"+ - "\u0001\u0000\u0000\u0000M\u0176\u0001\u0000\u0000\u0000O\u0178\u0001\u0000"+ - "\u0000\u0000Q\u0181\u0001\u0000\u0000\u0000ST\u0005,\u0000\u0000T\u0002"+ - "\u0001\u0000\u0000\u0000UV\u0005I\u0000\u0000VZ\u0005N\u0000\u0000WX\u0005"+ - "i\u0000\u0000XZ\u0005n\u0000\u0000YU\u0001\u0000\u0000\u0000YW\u0001\u0000"+ - "\u0000\u0000Z\u0004\u0001\u0000\u0000\u0000[\\\u0005T\u0000\u0000\\`\u0005"+ - "O\u0000\u0000]^\u0005t\u0000\u0000^`\u0005o\u0000\u0000_[\u0001\u0000"+ - "\u0000\u0000_]\u0001\u0000\u0000\u0000`\u0006\u0001\u0000\u0000\u0000"+ - "ab\u0005A\u0000\u0000bc\u0005N\u0000\u0000cj\u0005D\u0000\u0000de\u0005"+ - "a\u0000\u0000ef\u0005n\u0000\u0000fj\u0005d\u0000\u0000gh\u0005&\u0000"+ - "\u0000hj\u0005&\u0000\u0000ia\u0001\u0000\u0000\u0000id\u0001\u0000\u0000"+ - "\u0000ig\u0001\u0000\u0000\u0000j\b\u0001\u0000\u0000\u0000kl\u0005O\u0000"+ - "\u0000lr\u0005R\u0000\u0000mn\u0005o\u0000\u0000nr\u0005r\u0000\u0000"+ - "op\u0005|\u0000\u0000pr\u0005|\u0000\u0000qk\u0001\u0000\u0000\u0000q"+ - "m\u0001\u0000\u0000\u0000qo\u0001\u0000\u0000\u0000r\n\u0001\u0000\u0000"+ - "\u0000st\u0005N\u0000\u0000tu\u0005O\u0000\u0000uz\u0005T\u0000\u0000"+ - "vw\u0005n\u0000\u0000wx\u0005o\u0000\u0000xz\u0005t\u0000\u0000ys\u0001"+ - "\u0000\u0000\u0000yv\u0001\u0000\u0000\u0000z\f\u0001\u0000\u0000\u0000"+ - "{|\u0005T\u0000\u0000|}\u0005R\u0000\u0000}~\u0005U\u0000\u0000~\u0084"+ - "\u0005E\u0000\u0000\u007f\u0080\u0005t\u0000\u0000\u0080\u0081\u0005r"+ - "\u0000\u0000\u0081\u0082\u0005u\u0000\u0000\u0082\u0084\u0005e\u0000\u0000"+ - "\u0083{\u0001\u0000\u0000\u0000\u0083\u007f\u0001\u0000\u0000\u0000\u0084"+ - "\u000e\u0001\u0000\u0000\u0000\u0085\u0086\u0005F\u0000\u0000\u0086\u0087"+ - "\u0005A\u0000\u0000\u0087\u0088\u0005L\u0000\u0000\u0088\u0089\u0005S"+ - "\u0000\u0000\u0089\u0090\u0005E\u0000\u0000\u008a\u008b\u0005f\u0000\u0000"+ - "\u008b\u008c\u0005a\u0000\u0000\u008c\u008d\u0005l\u0000\u0000\u008d\u008e"+ - "\u0005s\u0000\u0000\u008e\u0090\u0005e\u0000\u0000\u008f\u0085\u0001\u0000"+ - "\u0000\u0000\u008f\u008a\u0001\u0000\u0000\u0000\u0090\u0010\u0001\u0000"+ - "\u0000\u0000\u0091\u0092\u0005C\u0000\u0000\u0092\u0093\u0005O\u0000\u0000"+ - "\u0093\u0094\u0005N\u0000\u0000\u0094\u0095\u0005T\u0000\u0000\u0095\u0096"+ - "\u0005A\u0000\u0000\u0096\u0097\u0005I\u0000\u0000\u0097\u0098\u0005N"+ - "\u0000\u0000\u0098\u0099\u0005S\u0000\u0000\u0099\u009a\u0005_\u0000\u0000"+ - "\u009a\u009b\u0005A\u0000\u0000\u009b\u009c\u0005L\u0000\u0000\u009c\u00aa"+ - "\u0005L\u0000\u0000\u009d\u009e\u0005c\u0000\u0000\u009e\u009f\u0005o"+ - "\u0000\u0000\u009f\u00a0\u0005n\u0000\u0000\u00a0\u00a1\u0005t\u0000\u0000"+ - "\u00a1\u00a2\u0005a\u0000\u0000\u00a2\u00a3\u0005i\u0000\u0000\u00a3\u00a4"+ - "\u0005n\u0000\u0000\u00a4\u00a5\u0005s\u0000\u0000\u00a5\u00a6\u0005_"+ - "\u0000\u0000\u00a6\u00a7\u0005a\u0000\u0000\u00a7\u00a8\u0005l\u0000\u0000"+ - "\u00a8\u00aa\u0005l\u0000\u0000\u00a9\u0091\u0001\u0000\u0000\u0000\u00a9"+ - "\u009d\u0001\u0000\u0000\u0000\u00aa\u0012\u0001\u0000\u0000\u0000\u00ab"+ - "\u00ac\u0005C\u0000\u0000\u00ac\u00ad\u0005O\u0000\u0000\u00ad\u00ae\u0005"+ - "N\u0000\u0000\u00ae\u00af\u0005T\u0000\u0000\u00af\u00b0\u0005A\u0000"+ - "\u0000\u00b0\u00b1\u0005I\u0000\u0000\u00b1\u00b2\u0005N\u0000\u0000\u00b2"+ - "\u00b3\u0005S\u0000\u0000\u00b3\u00b4\u0005_\u0000\u0000\u00b4\u00b5\u0005"+ - "A\u0000\u0000\u00b5\u00b6\u0005N\u0000\u0000\u00b6\u00c4\u0005Y\u0000"+ - "\u0000\u00b7\u00b8\u0005c\u0000\u0000\u00b8\u00b9\u0005o\u0000\u0000\u00b9"+ - "\u00ba\u0005n\u0000\u0000\u00ba\u00bb\u0005t\u0000\u0000\u00bb\u00bc\u0005"+ - "a\u0000\u0000\u00bc\u00bd\u0005i\u0000\u0000\u00bd\u00be\u0005n\u0000"+ - "\u0000\u00be\u00bf\u0005s\u0000\u0000\u00bf\u00c0\u0005_\u0000\u0000\u00c0"+ - "\u00c1\u0005a\u0000\u0000\u00c1\u00c2\u0005n\u0000\u0000\u00c2\u00c4\u0005"+ - "y\u0000\u0000\u00c3\u00ab\u0001\u0000\u0000\u0000\u00c3\u00b7\u0001\u0000"+ - "\u0000\u0000\u00c4\u0014\u0001\u0000\u0000\u0000\u00c5\u00c6\u0005M\u0000"+ - "\u0000\u00c6\u00c7\u0005I\u0000\u0000\u00c7\u00cc\u0005N\u0000\u0000\u00c8"+ - "\u00c9\u0005m\u0000\u0000\u00c9\u00ca\u0005i\u0000\u0000\u00ca\u00cc\u0005"+ - "n\u0000\u0000\u00cb\u00c5\u0001\u0000\u0000\u0000\u00cb\u00c8\u0001\u0000"+ - "\u0000\u0000\u00cc\u0016\u0001\u0000\u0000\u0000\u00cd\u00ce\u0005M\u0000"+ - "\u0000\u00ce\u00cf\u0005A\u0000\u0000\u00cf\u00d4\u0005X\u0000\u0000\u00d0"+ - "\u00d1\u0005m\u0000\u0000\u00d1\u00d2\u0005a\u0000\u0000\u00d2\u00d4\u0005"+ - "x\u0000\u0000\u00d3\u00cd\u0001\u0000\u0000\u0000\u00d3\u00d0\u0001\u0000"+ - "\u0000\u0000\u00d4\u0018\u0001\u0000\u0000\u0000\u00d5\u00d6\u0005A\u0000"+ - "\u0000\u00d6\u00d7\u0005V\u0000\u0000\u00d7\u00dc\u0005G\u0000\u0000\u00d8"+ - "\u00d9\u0005a\u0000\u0000\u00d9\u00da\u0005v\u0000\u0000\u00da\u00dc\u0005"+ - "g\u0000\u0000\u00db\u00d5\u0001\u0000\u0000\u0000\u00db\u00d8\u0001\u0000"+ - "\u0000\u0000\u00dc\u001a\u0001\u0000\u0000\u0000\u00dd\u00de\u0005S\u0000"+ - "\u0000\u00de\u00df\u0005U\u0000\u0000\u00df\u00e4\u0005M\u0000\u0000\u00e0"+ - "\u00e1\u0005s\u0000\u0000\u00e1\u00e2\u0005u\u0000\u0000\u00e2\u00e4\u0005"+ - "m\u0000\u0000\u00e3\u00dd\u0001\u0000\u0000\u0000\u00e3\u00e0\u0001\u0000"+ - "\u0000\u0000\u00e4\u001c\u0001\u0000\u0000\u0000\u00e5\u00e6\u0005M\u0000"+ - "\u0000\u00e6\u00e7\u0005E\u0000\u0000\u00e7\u00e8\u0005A\u0000\u0000\u00e8"+ - "\u00ee\u0005N\u0000\u0000\u00e9\u00ea\u0005m\u0000\u0000\u00ea\u00eb\u0005"+ - "e\u0000\u0000\u00eb\u00ec\u0005a\u0000\u0000\u00ec\u00ee\u0005n\u0000"+ - "\u0000\u00ed\u00e5\u0001\u0000\u0000\u0000\u00ed\u00e9\u0001\u0000\u0000"+ - "\u0000\u00ee\u001e\u0001\u0000\u0000\u0000\u00ef\u00f0\u0005M\u0000\u0000"+ - "\u00f0\u00f1\u0005O\u0000\u0000\u00f1\u00f2\u0005D\u0000\u0000\u00f2\u00f8"+ - "\u0005E\u0000\u0000\u00f3\u00f4\u0005m\u0000\u0000\u00f4\u00f5\u0005o"+ - "\u0000\u0000\u00f5\u00f6\u0005d\u0000\u0000\u00f6\u00f8\u0005e\u0000\u0000"+ - "\u00f7\u00ef\u0001\u0000\u0000\u0000\u00f7\u00f3\u0001\u0000\u0000\u0000"+ - "\u00f8 \u0001\u0000\u0000\u0000\u00f9\u00fa\u0005M\u0000\u0000\u00fa\u00fb"+ - "\u0005E\u0000\u0000\u00fb\u00fc\u0005D\u0000\u0000\u00fc\u00fd\u0005I"+ - "\u0000\u0000\u00fd\u00fe\u0005A\u0000\u0000\u00fe\u0106\u0005N\u0000\u0000"+ - "\u00ff\u0100\u0005m\u0000\u0000\u0100\u0101\u0005e\u0000\u0000\u0101\u0102"+ - "\u0005d\u0000\u0000\u0102\u0103\u0005i\u0000\u0000\u0103\u0104\u0005a"+ - "\u0000\u0000\u0104\u0106\u0005n\u0000\u0000\u0105\u00f9\u0001\u0000\u0000"+ - "\u0000\u0105\u00ff\u0001\u0000\u0000\u0000\u0106\"\u0001\u0000\u0000\u0000"+ - "\u0107\u0108\u0005L\u0000\u0000\u0108\u0109\u0005E\u0000\u0000\u0109\u010e"+ - "\u0005N\u0000\u0000\u010a\u010b\u0005l\u0000\u0000\u010b\u010c\u0005e"+ - "\u0000\u0000\u010c\u010e\u0005n\u0000\u0000\u010d\u0107\u0001\u0000\u0000"+ - "\u0000\u010d\u010a\u0001\u0000\u0000\u0000\u010e$\u0001\u0000\u0000\u0000"+ - "\u010f\u0110\u0005I\u0000\u0000\u0110\u0111\u0005N\u0000\u0000\u0111\u0116"+ - "\u0005T\u0000\u0000\u0112\u0113\u0005i\u0000\u0000\u0113\u0114\u0005n"+ - "\u0000\u0000\u0114\u0116\u0005t\u0000\u0000\u0115\u010f\u0001\u0000\u0000"+ - "\u0000\u0115\u0112\u0001\u0000\u0000\u0000\u0116&\u0001\u0000\u0000\u0000"+ - "\u0117\u0118\u0005+\u0000\u0000\u0118(\u0001\u0000\u0000\u0000\u0119\u011a"+ - "\u0005-\u0000\u0000\u011a*\u0001\u0000\u0000\u0000\u011b\u011c\u0005*"+ - "\u0000\u0000\u011c,\u0001\u0000\u0000\u0000\u011d\u011e\u0005/\u0000\u0000"+ - "\u011e.\u0001\u0000\u0000\u0000\u011f\u0120\u0005%\u0000\u0000\u01200"+ - "\u0001\u0000\u0000\u0000\u0121\u0122\u0005^\u0000\u0000\u01222\u0001\u0000"+ - "\u0000\u0000\u0123\u0124\u0005!\u0000\u0000\u0124\u0125\u0005=\u0000\u0000"+ - "\u01254\u0001\u0000\u0000\u0000\u0126\u0127\u0005>\u0000\u0000\u01276"+ - "\u0001\u0000\u0000\u0000\u0128\u0129\u0005>\u0000\u0000\u0129\u012a\u0005"+ - "=\u0000\u0000\u012a8\u0001\u0000\u0000\u0000\u012b\u012c\u0005<\u0000"+ - "\u0000\u012c:\u0001\u0000\u0000\u0000\u012d\u012e\u0005<\u0000\u0000\u012e"+ - "\u012f\u0005=\u0000\u0000\u012f<\u0001\u0000\u0000\u0000\u0130\u0131\u0005"+ - "=\u0000\u0000\u0131>\u0001\u0000\u0000\u0000\u0132\u0133\u0005(\u0000"+ - "\u0000\u0133@\u0001\u0000\u0000\u0000\u0134\u0135\u0005)\u0000\u0000\u0135"+ - "B\u0001\u0000\u0000\u0000\u0136\u0138\u0007\u0000\u0000\u0000\u0137\u0136"+ - "\u0001\u0000\u0000\u0000\u0138\u0139\u0001\u0000\u0000\u0000\u0139\u0137"+ - "\u0001\u0000\u0000\u0000\u0139\u013a\u0001\u0000\u0000\u0000\u013a\u013b"+ - "\u0001\u0000\u0000\u0000\u013b\u013d\u0005.\u0000\u0000\u013c\u013e\u0007"+ - "\u0000\u0000\u0000\u013d\u013c\u0001\u0000\u0000\u0000\u013e\u013f\u0001"+ - "\u0000\u0000\u0000\u013f\u013d\u0001\u0000\u0000\u0000\u013f\u0140\u0001"+ - "\u0000\u0000\u0000\u0140D\u0001\u0000\u0000\u0000\u0141\u0144\u0007\u0000"+ - "\u0000\u0000\u0142\u0143\u0005.\u0000\u0000\u0143\u0145\u0003G#\u0000"+ - "\u0144\u0142\u0001\u0000\u0000\u0000\u0145\u0146\u0001\u0000\u0000\u0000"+ - "\u0146\u0144\u0001\u0000\u0000\u0000\u0146\u0147\u0001\u0000\u0000\u0000"+ - "\u0147F\u0001\u0000\u0000\u0000\u0148\u014a\u0007\u0000\u0000\u0000\u0149"+ - "\u0148\u0001\u0000\u0000\u0000\u014a\u014b\u0001\u0000\u0000\u0000\u014b"+ - "\u0149\u0001\u0000\u0000\u0000\u014b\u014c\u0001\u0000\u0000\u0000\u014c"+ - "H\u0001\u0000\u0000\u0000\u014d\u014f\u0007\u0001\u0000\u0000\u014e\u014d"+ - "\u0001\u0000\u0000\u0000\u014f\u0150\u0001\u0000\u0000\u0000\u0150\u014e"+ - "\u0001\u0000\u0000\u0000\u0150\u0151\u0001\u0000\u0000\u0000\u0151\u0152"+ - "\u0001\u0000\u0000\u0000\u0152\u0153\u0006$\u0000\u0000\u0153J\u0001\u0000"+ - "\u0000\u0000\u0154\u0158\u0003M&\u0000\u0155\u0158\u0003O\'\u0000\u0156"+ - "\u0158\u0003Q(\u0000\u0157\u0154\u0001\u0000\u0000\u0000\u0157\u0155\u0001"+ - "\u0000\u0000\u0000\u0157\u0156\u0001\u0000\u0000\u0000\u0158\u0159\u0001"+ - "\u0000\u0000\u0000\u0159\u0157\u0001\u0000\u0000\u0000\u0159\u015a\u0001"+ - "\u0000\u0000\u0000\u015a\u0161\u0001\u0000\u0000\u0000\u015b\u0160\u0003"+ - "M&\u0000\u015c\u0160\u0007\u0002\u0000\u0000\u015d\u0160\u0003O\'\u0000"+ - "\u015e\u0160\u0003Q(\u0000\u015f\u015b\u0001\u0000\u0000\u0000\u015f\u015c"+ - "\u0001\u0000\u0000\u0000\u015f\u015d\u0001\u0000\u0000\u0000\u015f\u015e"+ - "\u0001\u0000\u0000\u0000\u0160\u0163\u0001\u0000\u0000\u0000\u0161\u015f"+ - "\u0001\u0000\u0000\u0000\u0161\u0162\u0001\u0000\u0000\u0000\u0162\u0175"+ - "\u0001\u0000\u0000\u0000\u0163\u0161\u0001\u0000\u0000\u0000\u0164\u0167"+ - "\u0003O\'\u0000\u0165\u0167\u0003Q(\u0000\u0166\u0164\u0001\u0000\u0000"+ - "\u0000\u0166\u0165\u0001\u0000\u0000\u0000\u0167\u016c\u0001\u0000\u0000"+ - "\u0000\u0168\u016d\u0003M&\u0000\u0169\u016d\u0007\u0003\u0000\u0000\u016a"+ - "\u016d\u0003O\'\u0000\u016b\u016d\u0003Q(\u0000\u016c\u0168\u0001\u0000"+ - "\u0000\u0000\u016c\u0169\u0001\u0000\u0000\u0000\u016c\u016a\u0001\u0000"+ - "\u0000\u0000\u016c\u016b\u0001\u0000\u0000\u0000\u016d\u016e\u0001\u0000"+ - "\u0000\u0000\u016e\u016c\u0001\u0000\u0000\u0000\u016e\u016f\u0001\u0000"+ - "\u0000\u0000\u016f\u0172\u0001\u0000\u0000\u0000\u0170\u0173\u0003O\'"+ - "\u0000\u0171\u0173\u0003Q(\u0000\u0172\u0170\u0001\u0000\u0000\u0000\u0172"+ - "\u0171\u0001\u0000\u0000\u0000\u0173\u0175\u0001\u0000\u0000\u0000\u0174"+ - "\u0157\u0001\u0000\u0000\u0000\u0174\u0166\u0001\u0000\u0000\u0000\u0175"+ - "L\u0001\u0000\u0000\u0000\u0176\u0177\u0007\u0004\u0000\u0000\u0177N\u0001"+ - "\u0000\u0000\u0000\u0178\u017c\u0005\'\u0000\u0000\u0179\u017b\t\u0000"+ - "\u0000\u0000\u017a\u0179\u0001\u0000\u0000\u0000\u017b\u017e\u0001\u0000"+ - "\u0000\u0000\u017c\u017d\u0001\u0000\u0000\u0000\u017c\u017a\u0001\u0000"+ - "\u0000\u0000\u017d\u017f\u0001\u0000\u0000\u0000\u017e\u017c\u0001\u0000"+ - "\u0000\u0000\u017f\u0180\u0005\'\u0000\u0000\u0180P\u0001\u0000\u0000"+ - "\u0000\u0181\u0185\u0005\"\u0000\u0000\u0182\u0184\t\u0000\u0000\u0000"+ - "\u0183\u0182\u0001\u0000\u0000\u0000\u0184\u0187\u0001\u0000\u0000\u0000"+ - "\u0185\u0186\u0001\u0000\u0000\u0000\u0185\u0183\u0001\u0000\u0000\u0000"+ - "\u0186\u0188\u0001\u0000\u0000\u0000\u0187\u0185\u0001\u0000\u0000\u0000"+ - "\u0188\u0189\u0005\"\u0000\u0000\u0189R\u0001\u0000\u0000\u0000#\u0000"+ - "Y_iqy\u0083\u008f\u00a9\u00c3\u00cb\u00d3\u00db\u00e3\u00ed\u00f7\u0105"+ - "\u010d\u0115\u0139\u013f\u0146\u014b\u0150\u0157\u0159\u015f\u0161\u0166"+ - "\u016c\u016e\u0172\u0174\u017c\u0185\u0001\u0006\u0000\u0000"; + "\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0003\u0010\u010c\b\u0010\u0001"+ + "\u0011\u0001\u0011\u0001\u0011\u0001\u0011\u0001\u0011\u0001\u0011\u0003"+ + "\u0011\u0114\b\u0011\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001"+ + "\u0012\u0001\u0012\u0003\u0012\u011c\b\u0012\u0001\u0013\u0001\u0013\u0001"+ + "\u0014\u0001\u0014\u0001\u0015\u0001\u0015\u0001\u0016\u0001\u0016\u0001"+ + "\u0017\u0001\u0017\u0001\u0018\u0001\u0018\u0001\u0019\u0001\u0019\u0001"+ + "\u0019\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b\u0001\u001b\u0001"+ + "\u001c\u0001\u001c\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001e\u0001"+ + "\u001e\u0001\u001f\u0001\u001f\u0001 \u0001 \u0001!\u0004!\u013e\b!\u000b"+ + "!\f!\u013f\u0001!\u0001!\u0004!\u0144\b!\u000b!\f!\u0145\u0001\"\u0001"+ + "\"\u0001\"\u0004\"\u014b\b\"\u000b\"\f\"\u014c\u0001#\u0004#\u0150\b#"+ + "\u000b#\f#\u0151\u0001$\u0004$\u0155\b$\u000b$\f$\u0156\u0001$\u0001$"+ + "\u0001%\u0001%\u0003%\u015d\b%\u0001&\u0001&\u0005&\u0161\b&\n&\f&\u0164"+ + "\t&\u0001&\u0001&\u0001\'\u0001\'\u0005\'\u016a\b\'\n\'\f\'\u016d\t\'"+ + "\u0001\'\u0001\'\u0001(\u0001(\u0004(\u0173\b(\u000b(\f(\u0174\u0001)"+ + "\u0001)\u0001*\u0001*\u0005*\u017b\b*\n*\f*\u017e\t*\u0001*\u0001*\u0001"+ + "+\u0001+\u0005+\u0184\b+\n+\f+\u0187\t+\u0001+\u0001+\u0004\u0162\u016b"+ + "\u017c\u0185\u0000,\u0001\u0001\u0003\u0002\u0005\u0003\u0007\u0004\t"+ + "\u0005\u000b\u0006\r\u0007\u000f\b\u0011\t\u0013\n\u0015\u000b\u0017\f"+ + "\u0019\r\u001b\u000e\u001d\u000f\u001f\u0010!\u0011#\u0012%\u0013\'\u0014"+ + ")\u0015+\u0016-\u0017/\u00181\u00193\u001a5\u001b7\u001c9\u001d;\u001e"+ + "=\u001f? A!C\"E#G$I%K&M\'O(Q)S*U+W,\u0001\u0000\u0004\u0001\u000009\u0003"+ + "\u0000\t\n\f\r \u0002\u0000..__\u0003\u000009AZaz\u01a9\u0000\u0001\u0001"+ + "\u0000\u0000\u0000\u0000\u0003\u0001\u0000\u0000\u0000\u0000\u0005\u0001"+ + "\u0000\u0000\u0000\u0000\u0007\u0001\u0000\u0000\u0000\u0000\t\u0001\u0000"+ + "\u0000\u0000\u0000\u000b\u0001\u0000\u0000\u0000\u0000\r\u0001\u0000\u0000"+ + "\u0000\u0000\u000f\u0001\u0000\u0000\u0000\u0000\u0011\u0001\u0000\u0000"+ + "\u0000\u0000\u0013\u0001\u0000\u0000\u0000\u0000\u0015\u0001\u0000\u0000"+ + "\u0000\u0000\u0017\u0001\u0000\u0000\u0000\u0000\u0019\u0001\u0000\u0000"+ + "\u0000\u0000\u001b\u0001\u0000\u0000\u0000\u0000\u001d\u0001\u0000\u0000"+ + "\u0000\u0000\u001f\u0001\u0000\u0000\u0000\u0000!\u0001\u0000\u0000\u0000"+ + "\u0000#\u0001\u0000\u0000\u0000\u0000%\u0001\u0000\u0000\u0000\u0000\'"+ + "\u0001\u0000\u0000\u0000\u0000)\u0001\u0000\u0000\u0000\u0000+\u0001\u0000"+ + "\u0000\u0000\u0000-\u0001\u0000\u0000\u0000\u0000/\u0001\u0000\u0000\u0000"+ + "\u00001\u0001\u0000\u0000\u0000\u00003\u0001\u0000\u0000\u0000\u00005"+ + "\u0001\u0000\u0000\u0000\u00007\u0001\u0000\u0000\u0000\u00009\u0001\u0000"+ + "\u0000\u0000\u0000;\u0001\u0000\u0000\u0000\u0000=\u0001\u0000\u0000\u0000"+ + "\u0000?\u0001\u0000\u0000\u0000\u0000A\u0001\u0000\u0000\u0000\u0000C"+ + "\u0001\u0000\u0000\u0000\u0000E\u0001\u0000\u0000\u0000\u0000G\u0001\u0000"+ + "\u0000\u0000\u0000I\u0001\u0000\u0000\u0000\u0000K\u0001\u0000\u0000\u0000"+ + "\u0000M\u0001\u0000\u0000\u0000\u0000O\u0001\u0000\u0000\u0000\u0000Q"+ + "\u0001\u0000\u0000\u0000\u0000S\u0001\u0000\u0000\u0000\u0000U\u0001\u0000"+ + "\u0000\u0000\u0000W\u0001\u0000\u0000\u0000\u0001Y\u0001\u0000\u0000\u0000"+ + "\u0003_\u0001\u0000\u0000\u0000\u0005e\u0001\u0000\u0000\u0000\u0007o"+ + "\u0001\u0000\u0000\u0000\tw\u0001\u0000\u0000\u0000\u000b\u007f\u0001"+ + "\u0000\u0000\u0000\r\u0089\u0001\u0000\u0000\u0000\u000f\u0095\u0001\u0000"+ + "\u0000\u0000\u0011\u00af\u0001\u0000\u0000\u0000\u0013\u00c9\u0001\u0000"+ + "\u0000\u0000\u0015\u00d1\u0001\u0000\u0000\u0000\u0017\u00d9\u0001\u0000"+ + "\u0000\u0000\u0019\u00e1\u0001\u0000\u0000\u0000\u001b\u00e9\u0001\u0000"+ + "\u0000\u0000\u001d\u00f3\u0001\u0000\u0000\u0000\u001f\u00fd\u0001\u0000"+ + "\u0000\u0000!\u010b\u0001\u0000\u0000\u0000#\u0113\u0001\u0000\u0000\u0000"+ + "%\u011b\u0001\u0000\u0000\u0000\'\u011d\u0001\u0000\u0000\u0000)\u011f"+ + "\u0001\u0000\u0000\u0000+\u0121\u0001\u0000\u0000\u0000-\u0123\u0001\u0000"+ + "\u0000\u0000/\u0125\u0001\u0000\u0000\u00001\u0127\u0001\u0000\u0000\u0000"+ + "3\u0129\u0001\u0000\u0000\u00005\u012c\u0001\u0000\u0000\u00007\u012e"+ + "\u0001\u0000\u0000\u00009\u0131\u0001\u0000\u0000\u0000;\u0133\u0001\u0000"+ + "\u0000\u0000=\u0136\u0001\u0000\u0000\u0000?\u0138\u0001\u0000\u0000\u0000"+ + "A\u013a\u0001\u0000\u0000\u0000C\u013d\u0001\u0000\u0000\u0000E\u0147"+ + "\u0001\u0000\u0000\u0000G\u014f\u0001\u0000\u0000\u0000I\u0154\u0001\u0000"+ + "\u0000\u0000K\u015c\u0001\u0000\u0000\u0000M\u015e\u0001\u0000\u0000\u0000"+ + "O\u0167\u0001\u0000\u0000\u0000Q\u0172\u0001\u0000\u0000\u0000S\u0176"+ + "\u0001\u0000\u0000\u0000U\u0178\u0001\u0000\u0000\u0000W\u0181\u0001\u0000"+ + "\u0000\u0000YZ\u0005,\u0000\u0000Z\u0002\u0001\u0000\u0000\u0000[\\\u0005"+ + "I\u0000\u0000\\`\u0005N\u0000\u0000]^\u0005i\u0000\u0000^`\u0005n\u0000"+ + "\u0000_[\u0001\u0000\u0000\u0000_]\u0001\u0000\u0000\u0000`\u0004\u0001"+ + "\u0000\u0000\u0000ab\u0005T\u0000\u0000bf\u0005O\u0000\u0000cd\u0005t"+ + "\u0000\u0000df\u0005o\u0000\u0000ea\u0001\u0000\u0000\u0000ec\u0001\u0000"+ + "\u0000\u0000f\u0006\u0001\u0000\u0000\u0000gh\u0005A\u0000\u0000hi\u0005"+ + "N\u0000\u0000ip\u0005D\u0000\u0000jk\u0005a\u0000\u0000kl\u0005n\u0000"+ + "\u0000lp\u0005d\u0000\u0000mn\u0005&\u0000\u0000np\u0005&\u0000\u0000"+ + "og\u0001\u0000\u0000\u0000oj\u0001\u0000\u0000\u0000om\u0001\u0000\u0000"+ + "\u0000p\b\u0001\u0000\u0000\u0000qr\u0005O\u0000\u0000rx\u0005R\u0000"+ + "\u0000st\u0005o\u0000\u0000tx\u0005r\u0000\u0000uv\u0005|\u0000\u0000"+ + "vx\u0005|\u0000\u0000wq\u0001\u0000\u0000\u0000ws\u0001\u0000\u0000\u0000"+ + "wu\u0001\u0000\u0000\u0000x\n\u0001\u0000\u0000\u0000yz\u0005N\u0000\u0000"+ + "z{\u0005O\u0000\u0000{\u0080\u0005T\u0000\u0000|}\u0005n\u0000\u0000}"+ + "~\u0005o\u0000\u0000~\u0080\u0005t\u0000\u0000\u007fy\u0001\u0000\u0000"+ + "\u0000\u007f|\u0001\u0000\u0000\u0000\u0080\f\u0001\u0000\u0000\u0000"+ + "\u0081\u0082\u0005T\u0000\u0000\u0082\u0083\u0005R\u0000\u0000\u0083\u0084"+ + "\u0005U\u0000\u0000\u0084\u008a\u0005E\u0000\u0000\u0085\u0086\u0005t"+ + "\u0000\u0000\u0086\u0087\u0005r\u0000\u0000\u0087\u0088\u0005u\u0000\u0000"+ + "\u0088\u008a\u0005e\u0000\u0000\u0089\u0081\u0001\u0000\u0000\u0000\u0089"+ + "\u0085\u0001\u0000\u0000\u0000\u008a\u000e\u0001\u0000\u0000\u0000\u008b"+ + "\u008c\u0005F\u0000\u0000\u008c\u008d\u0005A\u0000\u0000\u008d\u008e\u0005"+ + "L\u0000\u0000\u008e\u008f\u0005S\u0000\u0000\u008f\u0096\u0005E\u0000"+ + "\u0000\u0090\u0091\u0005f\u0000\u0000\u0091\u0092\u0005a\u0000\u0000\u0092"+ + "\u0093\u0005l\u0000\u0000\u0093\u0094\u0005s\u0000\u0000\u0094\u0096\u0005"+ + "e\u0000\u0000\u0095\u008b\u0001\u0000\u0000\u0000\u0095\u0090\u0001\u0000"+ + "\u0000\u0000\u0096\u0010\u0001\u0000\u0000\u0000\u0097\u0098\u0005C\u0000"+ + "\u0000\u0098\u0099\u0005O\u0000\u0000\u0099\u009a\u0005N\u0000\u0000\u009a"+ + "\u009b\u0005T\u0000\u0000\u009b\u009c\u0005A\u0000\u0000\u009c\u009d\u0005"+ + "I\u0000\u0000\u009d\u009e\u0005N\u0000\u0000\u009e\u009f\u0005S\u0000"+ + "\u0000\u009f\u00a0\u0005_\u0000\u0000\u00a0\u00a1\u0005A\u0000\u0000\u00a1"+ + "\u00a2\u0005L\u0000\u0000\u00a2\u00b0\u0005L\u0000\u0000\u00a3\u00a4\u0005"+ + "c\u0000\u0000\u00a4\u00a5\u0005o\u0000\u0000\u00a5\u00a6\u0005n\u0000"+ + "\u0000\u00a6\u00a7\u0005t\u0000\u0000\u00a7\u00a8\u0005a\u0000\u0000\u00a8"+ + "\u00a9\u0005i\u0000\u0000\u00a9\u00aa\u0005n\u0000\u0000\u00aa\u00ab\u0005"+ + "s\u0000\u0000\u00ab\u00ac\u0005_\u0000\u0000\u00ac\u00ad\u0005a\u0000"+ + "\u0000\u00ad\u00ae\u0005l\u0000\u0000\u00ae\u00b0\u0005l\u0000\u0000\u00af"+ + "\u0097\u0001\u0000\u0000\u0000\u00af\u00a3\u0001\u0000\u0000\u0000\u00b0"+ + "\u0012\u0001\u0000\u0000\u0000\u00b1\u00b2\u0005C\u0000\u0000\u00b2\u00b3"+ + "\u0005O\u0000\u0000\u00b3\u00b4\u0005N\u0000\u0000\u00b4\u00b5\u0005T"+ + "\u0000\u0000\u00b5\u00b6\u0005A\u0000\u0000\u00b6\u00b7\u0005I\u0000\u0000"+ + "\u00b7\u00b8\u0005N\u0000\u0000\u00b8\u00b9\u0005S\u0000\u0000\u00b9\u00ba"+ + "\u0005_\u0000\u0000\u00ba\u00bb\u0005A\u0000\u0000\u00bb\u00bc\u0005N"+ + "\u0000\u0000\u00bc\u00ca\u0005Y\u0000\u0000\u00bd\u00be\u0005c\u0000\u0000"+ + "\u00be\u00bf\u0005o\u0000\u0000\u00bf\u00c0\u0005n\u0000\u0000\u00c0\u00c1"+ + "\u0005t\u0000\u0000\u00c1\u00c2\u0005a\u0000\u0000\u00c2\u00c3\u0005i"+ + "\u0000\u0000\u00c3\u00c4\u0005n\u0000\u0000\u00c4\u00c5\u0005s\u0000\u0000"+ + "\u00c5\u00c6\u0005_\u0000\u0000\u00c6\u00c7\u0005a\u0000\u0000\u00c7\u00c8"+ + "\u0005n\u0000\u0000\u00c8\u00ca\u0005y\u0000\u0000\u00c9\u00b1\u0001\u0000"+ + "\u0000\u0000\u00c9\u00bd\u0001\u0000\u0000\u0000\u00ca\u0014\u0001\u0000"+ + "\u0000\u0000\u00cb\u00cc\u0005M\u0000\u0000\u00cc\u00cd\u0005I\u0000\u0000"+ + "\u00cd\u00d2\u0005N\u0000\u0000\u00ce\u00cf\u0005m\u0000\u0000\u00cf\u00d0"+ + "\u0005i\u0000\u0000\u00d0\u00d2\u0005n\u0000\u0000\u00d1\u00cb\u0001\u0000"+ + "\u0000\u0000\u00d1\u00ce\u0001\u0000\u0000\u0000\u00d2\u0016\u0001\u0000"+ + "\u0000\u0000\u00d3\u00d4\u0005M\u0000\u0000\u00d4\u00d5\u0005A\u0000\u0000"+ + "\u00d5\u00da\u0005X\u0000\u0000\u00d6\u00d7\u0005m\u0000\u0000\u00d7\u00d8"+ + "\u0005a\u0000\u0000\u00d8\u00da\u0005x\u0000\u0000\u00d9\u00d3\u0001\u0000"+ + "\u0000\u0000\u00d9\u00d6\u0001\u0000\u0000\u0000\u00da\u0018\u0001\u0000"+ + "\u0000\u0000\u00db\u00dc\u0005A\u0000\u0000\u00dc\u00dd\u0005V\u0000\u0000"+ + "\u00dd\u00e2\u0005G\u0000\u0000\u00de\u00df\u0005a\u0000\u0000\u00df\u00e0"+ + "\u0005v\u0000\u0000\u00e0\u00e2\u0005g\u0000\u0000\u00e1\u00db\u0001\u0000"+ + "\u0000\u0000\u00e1\u00de\u0001\u0000\u0000\u0000\u00e2\u001a\u0001\u0000"+ + "\u0000\u0000\u00e3\u00e4\u0005S\u0000\u0000\u00e4\u00e5\u0005U\u0000\u0000"+ + "\u00e5\u00ea\u0005M\u0000\u0000\u00e6\u00e7\u0005s\u0000\u0000\u00e7\u00e8"+ + "\u0005u\u0000\u0000\u00e8\u00ea\u0005m\u0000\u0000\u00e9\u00e3\u0001\u0000"+ + "\u0000\u0000\u00e9\u00e6\u0001\u0000\u0000\u0000\u00ea\u001c\u0001\u0000"+ + "\u0000\u0000\u00eb\u00ec\u0005M\u0000\u0000\u00ec\u00ed\u0005E\u0000\u0000"+ + "\u00ed\u00ee\u0005A\u0000\u0000\u00ee\u00f4\u0005N\u0000\u0000\u00ef\u00f0"+ + "\u0005m\u0000\u0000\u00f0\u00f1\u0005e\u0000\u0000\u00f1\u00f2\u0005a"+ + "\u0000\u0000\u00f2\u00f4\u0005n\u0000\u0000\u00f3\u00eb\u0001\u0000\u0000"+ + "\u0000\u00f3\u00ef\u0001\u0000\u0000\u0000\u00f4\u001e\u0001\u0000\u0000"+ + "\u0000\u00f5\u00f6\u0005M\u0000\u0000\u00f6\u00f7\u0005O\u0000\u0000\u00f7"+ + "\u00f8\u0005D\u0000\u0000\u00f8\u00fe\u0005E\u0000\u0000\u00f9\u00fa\u0005"+ + "m\u0000\u0000\u00fa\u00fb\u0005o\u0000\u0000\u00fb\u00fc\u0005d\u0000"+ + "\u0000\u00fc\u00fe\u0005e\u0000\u0000\u00fd\u00f5\u0001\u0000\u0000\u0000"+ + "\u00fd\u00f9\u0001\u0000\u0000\u0000\u00fe \u0001\u0000\u0000\u0000\u00ff"+ + "\u0100\u0005M\u0000\u0000\u0100\u0101\u0005E\u0000\u0000\u0101\u0102\u0005"+ + "D\u0000\u0000\u0102\u0103\u0005I\u0000\u0000\u0103\u0104\u0005A\u0000"+ + "\u0000\u0104\u010c\u0005N\u0000\u0000\u0105\u0106\u0005m\u0000\u0000\u0106"+ + "\u0107\u0005e\u0000\u0000\u0107\u0108\u0005d\u0000\u0000\u0108\u0109\u0005"+ + "i\u0000\u0000\u0109\u010a\u0005a\u0000\u0000\u010a\u010c\u0005n\u0000"+ + "\u0000\u010b\u00ff\u0001\u0000\u0000\u0000\u010b\u0105\u0001\u0000\u0000"+ + "\u0000\u010c\"\u0001\u0000\u0000\u0000\u010d\u010e\u0005L\u0000\u0000"+ + "\u010e\u010f\u0005E\u0000\u0000\u010f\u0114\u0005N\u0000\u0000\u0110\u0111"+ + "\u0005l\u0000\u0000\u0111\u0112\u0005e\u0000\u0000\u0112\u0114\u0005n"+ + "\u0000\u0000\u0113\u010d\u0001\u0000\u0000\u0000\u0113\u0110\u0001\u0000"+ + "\u0000\u0000\u0114$\u0001\u0000\u0000\u0000\u0115\u0116\u0005I\u0000\u0000"+ + "\u0116\u0117\u0005N\u0000\u0000\u0117\u011c\u0005T\u0000\u0000\u0118\u0119"+ + "\u0005i\u0000\u0000\u0119\u011a\u0005n\u0000\u0000\u011a\u011c\u0005t"+ + "\u0000\u0000\u011b\u0115\u0001\u0000\u0000\u0000\u011b\u0118\u0001\u0000"+ + "\u0000\u0000\u011c&\u0001\u0000\u0000\u0000\u011d\u011e\u0005+\u0000\u0000"+ + "\u011e(\u0001\u0000\u0000\u0000\u011f\u0120\u0005-\u0000\u0000\u0120*"+ + "\u0001\u0000\u0000\u0000\u0121\u0122\u0005*\u0000\u0000\u0122,\u0001\u0000"+ + "\u0000\u0000\u0123\u0124\u0005/\u0000\u0000\u0124.\u0001\u0000\u0000\u0000"+ + "\u0125\u0126\u0005%\u0000\u0000\u01260\u0001\u0000\u0000\u0000\u0127\u0128"+ + "\u0005^\u0000\u0000\u01282\u0001\u0000\u0000\u0000\u0129\u012a\u0005!"+ + "\u0000\u0000\u012a\u012b\u0005=\u0000\u0000\u012b4\u0001\u0000\u0000\u0000"+ + "\u012c\u012d\u0005>\u0000\u0000\u012d6\u0001\u0000\u0000\u0000\u012e\u012f"+ + "\u0005>\u0000\u0000\u012f\u0130\u0005=\u0000\u0000\u01308\u0001\u0000"+ + "\u0000\u0000\u0131\u0132\u0005<\u0000\u0000\u0132:\u0001\u0000\u0000\u0000"+ + "\u0133\u0134\u0005<\u0000\u0000\u0134\u0135\u0005=\u0000\u0000\u0135<"+ + "\u0001\u0000\u0000\u0000\u0136\u0137\u0005=\u0000\u0000\u0137>\u0001\u0000"+ + "\u0000\u0000\u0138\u0139\u0005(\u0000\u0000\u0139@\u0001\u0000\u0000\u0000"+ + "\u013a\u013b\u0005)\u0000\u0000\u013bB\u0001\u0000\u0000\u0000\u013c\u013e"+ + "\u0007\u0000\u0000\u0000\u013d\u013c\u0001\u0000\u0000\u0000\u013e\u013f"+ + "\u0001\u0000\u0000\u0000\u013f\u013d\u0001\u0000\u0000\u0000\u013f\u0140"+ + "\u0001\u0000\u0000\u0000\u0140\u0141\u0001\u0000\u0000\u0000\u0141\u0143"+ + "\u0005.\u0000\u0000\u0142\u0144\u0007\u0000\u0000\u0000\u0143\u0142\u0001"+ + "\u0000\u0000\u0000\u0144\u0145\u0001\u0000\u0000\u0000\u0145\u0143\u0001"+ + "\u0000\u0000\u0000\u0145\u0146\u0001\u0000\u0000\u0000\u0146D\u0001\u0000"+ + "\u0000\u0000\u0147\u014a\u0007\u0000\u0000\u0000\u0148\u0149\u0005.\u0000"+ + "\u0000\u0149\u014b\u0003G#\u0000\u014a\u0148\u0001\u0000\u0000\u0000\u014b"+ + "\u014c\u0001\u0000\u0000\u0000\u014c\u014a\u0001\u0000\u0000\u0000\u014c"+ + "\u014d\u0001\u0000\u0000\u0000\u014dF\u0001\u0000\u0000\u0000\u014e\u0150"+ + "\u0007\u0000\u0000\u0000\u014f\u014e\u0001\u0000\u0000\u0000\u0150\u0151"+ + "\u0001\u0000\u0000\u0000\u0151\u014f\u0001\u0000\u0000\u0000\u0151\u0152"+ + "\u0001\u0000\u0000\u0000\u0152H\u0001\u0000\u0000\u0000\u0153\u0155\u0007"+ + "\u0001\u0000\u0000\u0154\u0153\u0001\u0000\u0000\u0000\u0155\u0156\u0001"+ + "\u0000\u0000\u0000\u0156\u0154\u0001\u0000\u0000\u0000\u0156\u0157\u0001"+ + "\u0000\u0000\u0000\u0157\u0158\u0001\u0000\u0000\u0000\u0158\u0159\u0006"+ + "$\u0000\u0000\u0159J\u0001\u0000\u0000\u0000\u015a\u015d\u0003M&\u0000"+ + "\u015b\u015d\u0003O\'\u0000\u015c\u015a\u0001\u0000\u0000\u0000\u015c"+ + "\u015b\u0001\u0000\u0000\u0000\u015dL\u0001\u0000\u0000\u0000\u015e\u0162"+ + "\u0005\'\u0000\u0000\u015f\u0161\t\u0000\u0000\u0000\u0160\u015f\u0001"+ + "\u0000\u0000\u0000\u0161\u0164\u0001\u0000\u0000\u0000\u0162\u0163\u0001"+ + "\u0000\u0000\u0000\u0162\u0160\u0001\u0000\u0000\u0000\u0163\u0165\u0001"+ + "\u0000\u0000\u0000\u0164\u0162\u0001\u0000\u0000\u0000\u0165\u0166\u0005"+ + "\'\u0000\u0000\u0166N\u0001\u0000\u0000\u0000\u0167\u016b\u0005\"\u0000"+ + "\u0000\u0168\u016a\t\u0000\u0000\u0000\u0169\u0168\u0001\u0000\u0000\u0000"+ + "\u016a\u016d\u0001\u0000\u0000\u0000\u016b\u016c\u0001\u0000\u0000\u0000"+ + "\u016b\u0169\u0001\u0000\u0000\u0000\u016c\u016e\u0001\u0000\u0000\u0000"+ + "\u016d\u016b\u0001\u0000\u0000\u0000\u016e\u016f\u0005\"\u0000\u0000\u016f"+ + "P\u0001\u0000\u0000\u0000\u0170\u0173\u0003S)\u0000\u0171\u0173\u0007"+ + "\u0002\u0000\u0000\u0172\u0170\u0001\u0000\u0000\u0000\u0172\u0171\u0001"+ + "\u0000\u0000\u0000\u0173\u0174\u0001\u0000\u0000\u0000\u0174\u0172\u0001"+ + "\u0000\u0000\u0000\u0174\u0175\u0001\u0000\u0000\u0000\u0175R\u0001\u0000"+ + "\u0000\u0000\u0176\u0177\u0007\u0003\u0000\u0000\u0177T\u0001\u0000\u0000"+ + "\u0000\u0178\u017c\u0005\'\u0000\u0000\u0179\u017b\t\u0000\u0000\u0000"+ + "\u017a\u0179\u0001\u0000\u0000\u0000\u017b\u017e\u0001\u0000\u0000\u0000"+ + "\u017c\u017d\u0001\u0000\u0000\u0000\u017c\u017a\u0001\u0000\u0000\u0000"+ + "\u017d\u017f\u0001\u0000\u0000\u0000\u017e\u017c\u0001\u0000\u0000\u0000"+ + "\u017f\u0180\u0005\'\u0000\u0000\u0180V\u0001\u0000\u0000\u0000\u0181"+ + "\u0185\u0005\"\u0000\u0000\u0182\u0184\t\u0000\u0000\u0000\u0183\u0182"+ + "\u0001\u0000\u0000\u0000\u0184\u0187\u0001\u0000\u0000\u0000\u0185\u0186"+ + "\u0001\u0000\u0000\u0000\u0185\u0183\u0001\u0000\u0000\u0000\u0186\u0188"+ + "\u0001\u0000\u0000\u0000\u0187\u0185\u0001\u0000\u0000\u0000\u0188\u0189"+ + "\u0005\"\u0000\u0000\u0189X\u0001\u0000\u0000\u0000\u001f\u0000_eow\u007f"+ + "\u0089\u0095\u00af\u00c9\u00d1\u00d9\u00e1\u00e9\u00f3\u00fd\u010b\u0113"+ + "\u011b\u013f\u0145\u014c\u0151\u0156\u015c\u0162\u016b\u0172\u0174\u017c"+ + "\u0185\u0001\u0006\u0000\u0000"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionListener.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionListener.java index fc60aea..8c2d033 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionListener.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionListener.java @@ -1,4 +1,4 @@ -package com.github.sidhant92.boolparser.parser.antlr;// Generated from /Users/sid/Desktop/filter1/BooleanExpression.g4 by ANTLR 4.13.1 +package com.github.sidhant92.boolparser.parser.antlr;// Generated from /Users/sid/Desktop/filter2/BooleanExpression.g4 by ANTLR 4.13.1 import org.antlr.v4.runtime.tree.ParseTreeListener; /** diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionParser.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionParser.java index 04e4667..6589155 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionParser.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanExpressionParser.java @@ -1,4 +1,4 @@ -package com.github.sidhant92.boolparser.parser.antlr;// Generated from /Users/sid/Desktop/filter1/BooleanExpression.g4 by ANTLR 4.13.1 +package com.github.sidhant92.boolparser.parser.antlr;// Generated from /Users/sid/Desktop/filter2/BooleanExpression.g4 by ANTLR 4.13.1 import org.antlr.v4.runtime.atn.*; import org.antlr.v4.runtime.dfa.DFA; import org.antlr.v4.runtime.*; @@ -20,8 +20,8 @@ public class BooleanExpressionParser extends Parser { CONTAINS_ANY=10, MIN=11, MAX=12, AVG=13, SUM=14, MEAN=15, MODE=16, MEDIAN=17, LEN=18, INT=19, ADD=20, SUBTRACT=21, MULTIPLY=22, DIVIDE=23, MODULUS=24, EXPONENT=25, NE=26, GT=27, GE=28, LT=29, LE=30, EQ=31, LPAREN=32, RPAREN=33, - DECIMAL=34, APP_VERSION=35, INTEGER=36, WS=37, WORD=38, ALPHANUMERIC=39, - SQ=40, DQ=41; + DECIMAL=34, APP_VERSION=35, INTEGER=36, WS=37, WORD=38, SQSTR=39, DQSTR=40, + FIELD=41, ALPHANUMERIC=42, SQ=43, DQ=44; public static final int RULE_parse = 0, RULE_expression = 1, RULE_comparator = 2, RULE_arithmeticOperator = 3, RULE_arithmeticFunction = 4, RULE_wordlist = 5, RULE_arrayOperators = 6, @@ -49,7 +49,8 @@ private static String[] makeSymbolicNames() { "CONTAINS_ANY", "MIN", "MAX", "AVG", "SUM", "MEAN", "MODE", "MEDIAN", "LEN", "INT", "ADD", "SUBTRACT", "MULTIPLY", "DIVIDE", "MODULUS", "EXPONENT", "NE", "GT", "GE", "LT", "LE", "EQ", "LPAREN", "RPAREN", "DECIMAL", "APP_VERSION", - "INTEGER", "WS", "WORD", "ALPHANUMERIC", "SQ", "DQ" + "INTEGER", "WS", "WORD", "SQSTR", "DQSTR", "FIELD", "ALPHANUMERIC", "SQ", + "DQ" }; } private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames(); @@ -224,7 +225,7 @@ public static class InExpressionContext extends ExpressionContext { public WordlistContext wordlist() { return getRuleContext(WordlistContext.class,0); } - public TerminalNode WORD() { return getToken(BooleanExpressionParser.WORD, 0); } + public TerminalNode FIELD() { return getToken(BooleanExpressionParser.FIELD, 0); } public TerminalNode NOT() { return getToken(BooleanExpressionParser.NOT, 0); } public InExpressionContext(ExpressionContext ctx) { copyFrom(ctx); } @Override @@ -247,7 +248,7 @@ public ArrayOperatorsContext arrayOperators() { public WordlistContext wordlist() { return getRuleContext(WordlistContext.class,0); } - public TerminalNode WORD() { return getToken(BooleanExpressionParser.WORD, 0); } + public TerminalNode FIELD() { return getToken(BooleanExpressionParser.FIELD, 0); } public ArrayExpressionContext(ExpressionContext ctx) { copyFrom(ctx); } @Override public void enterRule(ParseTreeListener listener) { @@ -270,7 +271,7 @@ public List numericTypes() { public NumericTypesContext numericTypes(int i) { return getRuleContext(NumericTypesContext.class,i); } - public TerminalNode WORD() { return getToken(BooleanExpressionParser.WORD, 0); } + public TerminalNode FIELD() { return getToken(BooleanExpressionParser.FIELD, 0); } public ToExpressionContext(ExpressionContext ctx) { copyFrom(ctx); } @Override public void enterRule(ParseTreeListener listener) { @@ -402,9 +403,9 @@ private ExpressionContext expression(int _p) throws RecognitionException { int _alt; enterOuterAlt(_localctx, 1); { - setState(59); + setState(53); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,4,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,1,_ctx) ) { case 1: { _localctx = new ParentExpressionContext(_localctx); @@ -466,21 +467,15 @@ private ExpressionContext expression(int _p) throws RecognitionException { _localctx = new ToExpressionContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(39); - _errHandler.sync(this); - _la = _input.LA(1); - if (_la==WORD) { - { - setState(38); - ((ToExpressionContext)_localctx).field = match(WORD); - } + { + setState(38); + ((ToExpressionContext)_localctx).field = match(FIELD); } - - setState(41); + setState(39); ((ToExpressionContext)_localctx).lower = numericTypes(); - setState(42); + setState(40); match(TO); - setState(43); + setState(41); ((ToExpressionContext)_localctx).upper = numericTypes(); } break; @@ -489,29 +484,23 @@ private ExpressionContext expression(int _p) throws RecognitionException { _localctx = new InExpressionContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(46); - _errHandler.sync(this); - _la = _input.LA(1); - if (_la==WORD) { - { - setState(45); - ((InExpressionContext)_localctx).field = match(WORD); - } + { + setState(43); + ((InExpressionContext)_localctx).field = match(FIELD); } - - setState(49); + setState(45); _errHandler.sync(this); _la = _input.LA(1); if (_la==NOT) { { - setState(48); + setState(44); ((InExpressionContext)_localctx).not = match(NOT); } } - setState(51); + setState(47); match(IN); - setState(52); + setState(48); ((InExpressionContext)_localctx).data = wordlist(); } break; @@ -520,45 +509,39 @@ private ExpressionContext expression(int _p) throws RecognitionException { _localctx = new ArrayExpressionContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(54); - _errHandler.sync(this); - _la = _input.LA(1); - if (_la==WORD) { - { - setState(53); - ((ArrayExpressionContext)_localctx).field = match(WORD); - } + { + setState(49); + ((ArrayExpressionContext)_localctx).field = match(FIELD); } - - setState(56); + setState(50); ((ArrayExpressionContext)_localctx).op = arrayOperators(); - setState(57); + setState(51); ((ArrayExpressionContext)_localctx).data = wordlist(); } break; } _ctx.stop = _input.LT(-1); - setState(89); + setState(83); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,6,_ctx); + _alt = getInterpreter().adaptivePredict(_input,3,_ctx); while ( _alt!=2 && _alt!= ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { if ( _parseListeners!=null ) triggerExitRuleEvent(); _prevctx = _localctx; { - setState(87); + setState(81); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,5,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,2,_ctx) ) { case 1: { _localctx = new ComparatorExpressionContext(new ExpressionContext(_parentctx, _parentState)); ((ComparatorExpressionContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); - setState(61); + setState(55); if (!(precpred(_ctx, 14))) throw new FailedPredicateException(this, "precpred(_ctx, 14)"); - setState(62); + setState(56); ((ComparatorExpressionContext)_localctx).op = comparator(); - setState(63); + setState(57); ((ComparatorExpressionContext)_localctx).right = expression(15); } break; @@ -567,11 +550,11 @@ private ExpressionContext expression(int _p) throws RecognitionException { _localctx = new ArithmeticExpressionContext(new ExpressionContext(_parentctx, _parentState)); ((ArithmeticExpressionContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); - setState(65); + setState(59); if (!(precpred(_ctx, 12))) throw new FailedPredicateException(this, "precpred(_ctx, 12)"); - setState(66); + setState(60); ((ArithmeticExpressionContext)_localctx).op = match(EXPONENT); - setState(67); + setState(61); ((ArithmeticExpressionContext)_localctx).right = expression(13); } break; @@ -580,11 +563,11 @@ private ExpressionContext expression(int _p) throws RecognitionException { _localctx = new ArithmeticExpressionContext(new ExpressionContext(_parentctx, _parentState)); ((ArithmeticExpressionContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); - setState(68); + setState(62); if (!(precpred(_ctx, 11))) throw new FailedPredicateException(this, "precpred(_ctx, 11)"); - setState(69); + setState(63); ((ArithmeticExpressionContext)_localctx).op = match(DIVIDE); - setState(70); + setState(64); ((ArithmeticExpressionContext)_localctx).right = expression(12); } break; @@ -593,11 +576,11 @@ private ExpressionContext expression(int _p) throws RecognitionException { _localctx = new ArithmeticExpressionContext(new ExpressionContext(_parentctx, _parentState)); ((ArithmeticExpressionContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); - setState(71); + setState(65); if (!(precpred(_ctx, 10))) throw new FailedPredicateException(this, "precpred(_ctx, 10)"); - setState(72); + setState(66); ((ArithmeticExpressionContext)_localctx).op = match(MULTIPLY); - setState(73); + setState(67); ((ArithmeticExpressionContext)_localctx).right = expression(11); } break; @@ -606,11 +589,11 @@ private ExpressionContext expression(int _p) throws RecognitionException { _localctx = new ArithmeticExpressionContext(new ExpressionContext(_parentctx, _parentState)); ((ArithmeticExpressionContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); - setState(74); + setState(68); if (!(precpred(_ctx, 9))) throw new FailedPredicateException(this, "precpred(_ctx, 9)"); - setState(75); + setState(69); ((ArithmeticExpressionContext)_localctx).op = match(MODULUS); - setState(76); + setState(70); ((ArithmeticExpressionContext)_localctx).right = expression(10); } break; @@ -619,11 +602,11 @@ private ExpressionContext expression(int _p) throws RecognitionException { _localctx = new ArithmeticExpressionContext(new ExpressionContext(_parentctx, _parentState)); ((ArithmeticExpressionContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); - setState(77); + setState(71); if (!(precpred(_ctx, 8))) throw new FailedPredicateException(this, "precpred(_ctx, 8)"); - setState(78); + setState(72); ((ArithmeticExpressionContext)_localctx).op = match(ADD); - setState(79); + setState(73); ((ArithmeticExpressionContext)_localctx).right = expression(9); } break; @@ -632,11 +615,11 @@ private ExpressionContext expression(int _p) throws RecognitionException { _localctx = new ArithmeticExpressionContext(new ExpressionContext(_parentctx, _parentState)); ((ArithmeticExpressionContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); - setState(80); + setState(74); if (!(precpred(_ctx, 7))) throw new FailedPredicateException(this, "precpred(_ctx, 7)"); - setState(81); + setState(75); ((ArithmeticExpressionContext)_localctx).op = match(SUBTRACT); - setState(82); + setState(76); ((ArithmeticExpressionContext)_localctx).right = expression(8); } break; @@ -645,20 +628,20 @@ private ExpressionContext expression(int _p) throws RecognitionException { _localctx = new BinaryExpressionContext(new ExpressionContext(_parentctx, _parentState)); ((BinaryExpressionContext)_localctx).left = _prevctx; pushNewRecursionContext(_localctx, _startState, RULE_expression); - setState(83); + setState(77); if (!(precpred(_ctx, 5))) throw new FailedPredicateException(this, "precpred(_ctx, 5)"); - setState(84); + setState(78); ((BinaryExpressionContext)_localctx).op = binary(); - setState(85); + setState(79); ((BinaryExpressionContext)_localctx).right = expression(6); } break; } } } - setState(91); + setState(85); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,6,_ctx); + _alt = getInterpreter().adaptivePredict(_input,3,_ctx); } } } @@ -702,7 +685,7 @@ public final ComparatorContext comparator() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(92); + setState(86); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 4227858432L) != 0)) ) { _errHandler.recoverInline(this); @@ -754,7 +737,7 @@ public final ArithmeticOperatorContext arithmeticOperator() throws RecognitionEx try { enterOuterAlt(_localctx, 1); { - setState(94); + setState(88); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 66060288L) != 0)) ) { _errHandler.recoverInline(this); @@ -809,7 +792,7 @@ public final ArithmeticFunctionContext arithmeticFunction() throws RecognitionEx try { enterOuterAlt(_localctx, 1); { - setState(96); + setState(90); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 1046528L) != 0)) ) { _errHandler.recoverInline(this); @@ -870,87 +853,87 @@ public final WordlistContext wordlist() throws RecognitionException { int _alt; enterOuterAlt(_localctx, 1); { - setState(98); + setState(92); match(LPAREN); - setState(102); + setState(96); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,7,_ctx); + _alt = getInterpreter().adaptivePredict(_input,4,_ctx); while ( _alt!=2 && _alt!= ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(99); + setState(93); match(WS); } } } - setState(104); + setState(98); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,7,_ctx); + _alt = getInterpreter().adaptivePredict(_input,4,_ctx); } - setState(105); + setState(99); ((WordlistContext)_localctx).first = expression(0); - setState(109); + setState(103); _errHandler.sync(this); _la = _input.LA(1); while (_la==WS) { { { - setState(106); + setState(100); match(WS); } } - setState(111); + setState(105); _errHandler.sync(this); _la = _input.LA(1); } - setState(128); + setState(122); _errHandler.sync(this); _la = _input.LA(1); while (_la==T__0) { { { - setState(112); + setState(106); match(T__0); - setState(116); + setState(110); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,9,_ctx); + _alt = getInterpreter().adaptivePredict(_input,6,_ctx); while ( _alt!=2 && _alt!= ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(113); + setState(107); match(WS); } } } - setState(118); + setState(112); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,9,_ctx); + _alt = getInterpreter().adaptivePredict(_input,6,_ctx); } - setState(119); + setState(113); ((WordlistContext)_localctx).rest = expression(0); - setState(123); + setState(117); _errHandler.sync(this); _la = _input.LA(1); while (_la==WS) { { { - setState(120); + setState(114); match(WS); } } - setState(125); + setState(119); _errHandler.sync(this); _la = _input.LA(1); } } } - setState(130); + setState(124); _errHandler.sync(this); _la = _input.LA(1); } - setState(131); + setState(125); match(RPAREN); } } @@ -990,7 +973,7 @@ public final ArrayOperatorsContext arrayOperators() throws RecognitionException try { enterOuterAlt(_localctx, 1); { - setState(133); + setState(127); _la = _input.LA(1); if ( !(_la==CONTAINS_ALL || _la==CONTAINS_ANY) ) { _errHandler.recoverInline(this); @@ -1038,7 +1021,7 @@ public final NumericTypesContext numericTypes() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(135); + setState(129); _la = _input.LA(1); if ( !(_la==DECIMAL || _la==INTEGER) ) { _errHandler.recoverInline(this); @@ -1070,6 +1053,7 @@ public BoolContext bool() { return getRuleContext(BoolContext.class,0); } public TerminalNode WORD() { return getToken(BooleanExpressionParser.WORD, 0); } + public TerminalNode FIELD() { return getToken(BooleanExpressionParser.FIELD, 0); } public TypesContext(ParserRuleContext parent, int invokingState) { super(parent, invokingState); } @@ -1088,47 +1072,54 @@ public final TypesContext types() throws RecognitionException { TypesContext _localctx = new TypesContext(_ctx, getState()); enterRule(_localctx, 16, RULE_types); try { - setState(143); + setState(138); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,12,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,9,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(137); + setState(131); match(INTEGER); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(138); + setState(132); match(DECIMAL); } break; case 3: enterOuterAlt(_localctx, 3); { - setState(139); + setState(133); match(APP_VERSION); } break; case 4: enterOuterAlt(_localctx, 4); { - setState(140); + setState(134); bool(); } break; case 5: enterOuterAlt(_localctx, 5); { - setState(141); + setState(135); match(WORD); } break; case 6: enterOuterAlt(_localctx, 6); { + setState(136); + match(FIELD); + } + break; + case 7: + enterOuterAlt(_localctx, 7); + { } break; } @@ -1169,7 +1160,7 @@ public final BinaryContext binary() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(145); + setState(140); _la = _input.LA(1); if ( !(_la==AND || _la==OR) ) { _errHandler.recoverInline(this); @@ -1217,7 +1208,7 @@ public final BoolContext bool() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(147); + setState(142); _la = _input.LA(1); if ( !(_la==TRUE || _la==FALSE) ) { _errHandler.recoverInline(this); @@ -1270,99 +1261,94 @@ private boolean expression_sempred(ExpressionContext _localctx, int predIndex) { } public static final String _serializedATN = - "\u0004\u0001)\u0096\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+ + "\u0004\u0001,\u0091\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+ "\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004\u0007\u0004\u0002"+ "\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007\u0007\u0007\u0002"+ "\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0001\u0000\u0001\u0000\u0001"+ "\u0000\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+ "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+ - "\u0001\u0001\u0001\u0001\u0001\u0003\u0001(\b\u0001\u0001\u0001\u0001"+ - "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0003\u0001/\b\u0001\u0001"+ - "\u0001\u0003\u00012\b\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0003"+ - "\u00017\b\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0003\u0001<\b\u0001"+ + "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+ + "\u0001\u0001\u0001\u0001\u0001\u0003\u0001.\b\u0001\u0001\u0001\u0001"+ + "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0003\u00016\b"+ "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+ "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+ "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+ "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+ - "\u0001\u0001\u0001\u0001\u0005\u0001X\b\u0001\n\u0001\f\u0001[\t\u0001"+ - "\u0001\u0002\u0001\u0002\u0001\u0003\u0001\u0003\u0001\u0004\u0001\u0004"+ - "\u0001\u0005\u0001\u0005\u0005\u0005e\b\u0005\n\u0005\f\u0005h\t\u0005"+ - "\u0001\u0005\u0001\u0005\u0005\u0005l\b\u0005\n\u0005\f\u0005o\t\u0005"+ - "\u0001\u0005\u0001\u0005\u0005\u0005s\b\u0005\n\u0005\f\u0005v\t\u0005"+ - "\u0001\u0005\u0001\u0005\u0005\u0005z\b\u0005\n\u0005\f\u0005}\t\u0005"+ - "\u0005\u0005\u007f\b\u0005\n\u0005\f\u0005\u0082\t\u0005\u0001\u0005\u0001"+ + "\u0001\u0001\u0001\u0001\u0001\u0005\u0001R\b\u0001\n\u0001\f\u0001U\t"+ + "\u0001\u0001\u0002\u0001\u0002\u0001\u0003\u0001\u0003\u0001\u0004\u0001"+ + "\u0004\u0001\u0005\u0001\u0005\u0005\u0005_\b\u0005\n\u0005\f\u0005b\t"+ + "\u0005\u0001\u0005\u0001\u0005\u0005\u0005f\b\u0005\n\u0005\f\u0005i\t"+ + "\u0005\u0001\u0005\u0001\u0005\u0005\u0005m\b\u0005\n\u0005\f\u0005p\t"+ + "\u0005\u0001\u0005\u0001\u0005\u0005\u0005t\b\u0005\n\u0005\f\u0005w\t"+ + "\u0005\u0005\u0005y\b\u0005\n\u0005\f\u0005|\t\u0005\u0001\u0005\u0001"+ "\u0005\u0001\u0006\u0001\u0006\u0001\u0007\u0001\u0007\u0001\b\u0001\b"+ - "\u0001\b\u0001\b\u0001\b\u0001\b\u0003\b\u0090\b\b\u0001\t\u0001\t\u0001"+ - "\n\u0001\n\u0001\n\u0000\u0001\u0002\u000b\u0000\u0002\u0004\u0006\b\n"+ - "\f\u000e\u0010\u0012\u0014\u0000\u0007\u0001\u0000\u001a\u001f\u0001\u0000"+ - "\u0014\u0019\u0001\u0000\u000b\u0013\u0001\u0000\t\n\u0002\u0000\"\"$"+ - "$\u0001\u0000\u0004\u0005\u0001\u0000\u0007\b\u00a7\u0000\u0016\u0001"+ - "\u0000\u0000\u0000\u0002;\u0001\u0000\u0000\u0000\u0004\\\u0001\u0000"+ - "\u0000\u0000\u0006^\u0001\u0000\u0000\u0000\b`\u0001\u0000\u0000\u0000"+ - "\nb\u0001\u0000\u0000\u0000\f\u0085\u0001\u0000\u0000\u0000\u000e\u0087"+ - "\u0001\u0000\u0000\u0000\u0010\u008f\u0001\u0000\u0000\u0000\u0012\u0091"+ - "\u0001\u0000\u0000\u0000\u0014\u0093\u0001\u0000\u0000\u0000\u0016\u0017"+ - "\u0003\u0002\u0001\u0000\u0017\u0018\u0005\u0000\u0000\u0001\u0018\u0001"+ - "\u0001\u0000\u0000\u0000\u0019\u001a\u0006\u0001\uffff\uffff\u0000\u001a"+ - "\u001b\u0005 \u0000\u0000\u001b\u001c\u0003\u0002\u0001\u0000\u001c\u001d"+ - "\u0005!\u0000\u0000\u001d<\u0001\u0000\u0000\u0000\u001e\u001f\u0005\u0006"+ - "\u0000\u0000\u001f<\u0003\u0002\u0001\u000f !\u0005\u0015\u0000\u0000"+ - "!<\u0003\u0002\u0001\r\"#\u0003\b\u0004\u0000#$\u0003\n\u0005\u0000$<"+ - "\u0001\u0000\u0000\u0000%<\u0003\u0010\b\u0000&(\u0005&\u0000\u0000\'"+ - "&\u0001\u0000\u0000\u0000\'(\u0001\u0000\u0000\u0000()\u0001\u0000\u0000"+ - "\u0000)*\u0003\u000e\u0007\u0000*+\u0005\u0003\u0000\u0000+,\u0003\u000e"+ - "\u0007\u0000,<\u0001\u0000\u0000\u0000-/\u0005&\u0000\u0000.-\u0001\u0000"+ - "\u0000\u0000./\u0001\u0000\u0000\u0000/1\u0001\u0000\u0000\u000002\u0005"+ - "\u0006\u0000\u000010\u0001\u0000\u0000\u000012\u0001\u0000\u0000\u0000"+ - "23\u0001\u0000\u0000\u000034\u0005\u0002\u0000\u00004<\u0003\n\u0005\u0000"+ - "57\u0005&\u0000\u000065\u0001\u0000\u0000\u000067\u0001\u0000\u0000\u0000"+ - "78\u0001\u0000\u0000\u000089\u0003\f\u0006\u00009:\u0003\n\u0005\u0000"+ - ":<\u0001\u0000\u0000\u0000;\u0019\u0001\u0000\u0000\u0000;\u001e\u0001"+ - "\u0000\u0000\u0000; \u0001\u0000\u0000\u0000;\"\u0001\u0000\u0000\u0000"+ - ";%\u0001\u0000\u0000\u0000;\'\u0001\u0000\u0000\u0000;.\u0001\u0000\u0000"+ - "\u0000;6\u0001\u0000\u0000\u0000\n\u000e\u0000"+ - "\u0000>?\u0003\u0004\u0002\u0000?@\u0003\u0002\u0001\u000f@X\u0001\u0000"+ - "\u0000\u0000AB\n\f\u0000\u0000BC\u0005\u0019\u0000\u0000CX\u0003\u0002"+ - "\u0001\rDE\n\u000b\u0000\u0000EF\u0005\u0017\u0000\u0000FX\u0003\u0002"+ - "\u0001\fGH\n\n\u0000\u0000HI\u0005\u0016\u0000\u0000IX\u0003\u0002\u0001"+ - "\u000bJK\n\t\u0000\u0000KL\u0005\u0018\u0000\u0000LX\u0003\u0002\u0001"+ - "\nMN\n\b\u0000\u0000NO\u0005\u0014\u0000\u0000OX\u0003\u0002\u0001\tP"+ - "Q\n\u0007\u0000\u0000QR\u0005\u0015\u0000\u0000RX\u0003\u0002\u0001\b"+ - "ST\n\u0005\u0000\u0000TU\u0003\u0012\t\u0000UV\u0003\u0002\u0001\u0006"+ - "VX\u0001\u0000\u0000\u0000W=\u0001\u0000\u0000\u0000WA\u0001\u0000\u0000"+ - "\u0000WD\u0001\u0000\u0000\u0000WG\u0001\u0000\u0000\u0000WJ\u0001\u0000"+ - "\u0000\u0000WM\u0001\u0000\u0000\u0000WP\u0001\u0000\u0000\u0000WS\u0001"+ - "\u0000\u0000\u0000X[\u0001\u0000\u0000\u0000YW\u0001\u0000\u0000\u0000"+ - "YZ\u0001\u0000\u0000\u0000Z\u0003\u0001\u0000\u0000\u0000[Y\u0001\u0000"+ - "\u0000\u0000\\]\u0007\u0000\u0000\u0000]\u0005\u0001\u0000\u0000\u0000"+ - "^_\u0007\u0001\u0000\u0000_\u0007\u0001\u0000\u0000\u0000`a\u0007\u0002"+ - "\u0000\u0000a\t\u0001\u0000\u0000\u0000bf\u0005 \u0000\u0000ce\u0005%"+ - "\u0000\u0000dc\u0001\u0000\u0000\u0000eh\u0001\u0000\u0000\u0000fd\u0001"+ - "\u0000\u0000\u0000fg\u0001\u0000\u0000\u0000gi\u0001\u0000\u0000\u0000"+ - "hf\u0001\u0000\u0000\u0000im\u0003\u0002\u0001\u0000jl\u0005%\u0000\u0000"+ - "kj\u0001\u0000\u0000\u0000lo\u0001\u0000\u0000\u0000mk\u0001\u0000\u0000"+ - "\u0000mn\u0001\u0000\u0000\u0000n\u0080\u0001\u0000\u0000\u0000om\u0001"+ - "\u0000\u0000\u0000pt\u0005\u0001\u0000\u0000qs\u0005%\u0000\u0000rq\u0001"+ - "\u0000\u0000\u0000sv\u0001\u0000\u0000\u0000tr\u0001\u0000\u0000\u0000"+ - "tu\u0001\u0000\u0000\u0000uw\u0001\u0000\u0000\u0000vt\u0001\u0000\u0000"+ - "\u0000w{\u0003\u0002\u0001\u0000xz\u0005%\u0000\u0000yx\u0001\u0000\u0000"+ - "\u0000z}\u0001\u0000\u0000\u0000{y\u0001\u0000\u0000\u0000{|\u0001\u0000"+ - "\u0000\u0000|\u007f\u0001\u0000\u0000\u0000}{\u0001\u0000\u0000\u0000"+ - "~p\u0001\u0000\u0000\u0000\u007f\u0082\u0001\u0000\u0000\u0000\u0080~"+ - "\u0001\u0000\u0000\u0000\u0080\u0081\u0001\u0000\u0000\u0000\u0081\u0083"+ - "\u0001\u0000\u0000\u0000\u0082\u0080\u0001\u0000\u0000\u0000\u0083\u0084"+ - "\u0005!\u0000\u0000\u0084\u000b\u0001\u0000\u0000\u0000\u0085\u0086\u0007"+ - "\u0003\u0000\u0000\u0086\r\u0001\u0000\u0000\u0000\u0087\u0088\u0007\u0004"+ - "\u0000\u0000\u0088\u000f\u0001\u0000\u0000\u0000\u0089\u0090\u0005$\u0000"+ - "\u0000\u008a\u0090\u0005\"\u0000\u0000\u008b\u0090\u0005#\u0000\u0000"+ - "\u008c\u0090\u0003\u0014\n\u0000\u008d\u0090\u0005&\u0000\u0000\u008e"+ - "\u0090\u0001\u0000\u0000\u0000\u008f\u0089\u0001\u0000\u0000\u0000\u008f"+ - "\u008a\u0001\u0000\u0000\u0000\u008f\u008b\u0001\u0000\u0000\u0000\u008f"+ - "\u008c\u0001\u0000\u0000\u0000\u008f\u008d\u0001\u0000\u0000\u0000\u008f"+ - "\u008e\u0001\u0000\u0000\u0000\u0090\u0011\u0001\u0000\u0000\u0000\u0091"+ - "\u0092\u0007\u0005\u0000\u0000\u0092\u0013\u0001\u0000\u0000\u0000\u0093"+ - "\u0094\u0007\u0006\u0000\u0000\u0094\u0015\u0001\u0000\u0000\u0000\r\'"+ - ".16;WYfmt{\u0080\u008f"; + "\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0003\b\u008b\b\b\u0001\t\u0001"+ + "\t\u0001\n\u0001\n\u0001\n\u0000\u0001\u0002\u000b\u0000\u0002\u0004\u0006"+ + "\b\n\f\u000e\u0010\u0012\u0014\u0000\u0007\u0001\u0000\u001a\u001f\u0001"+ + "\u0000\u0014\u0019\u0001\u0000\u000b\u0013\u0001\u0000\t\n\u0002\u0000"+ + "\"\"$$\u0001\u0000\u0004\u0005\u0001\u0000\u0007\b\u00a0\u0000\u0016\u0001"+ + "\u0000\u0000\u0000\u00025\u0001\u0000\u0000\u0000\u0004V\u0001\u0000\u0000"+ + "\u0000\u0006X\u0001\u0000\u0000\u0000\bZ\u0001\u0000\u0000\u0000\n\\\u0001"+ + "\u0000\u0000\u0000\f\u007f\u0001\u0000\u0000\u0000\u000e\u0081\u0001\u0000"+ + "\u0000\u0000\u0010\u008a\u0001\u0000\u0000\u0000\u0012\u008c\u0001\u0000"+ + "\u0000\u0000\u0014\u008e\u0001\u0000\u0000\u0000\u0016\u0017\u0003\u0002"+ + "\u0001\u0000\u0017\u0018\u0005\u0000\u0000\u0001\u0018\u0001\u0001\u0000"+ + "\u0000\u0000\u0019\u001a\u0006\u0001\uffff\uffff\u0000\u001a\u001b\u0005"+ + " \u0000\u0000\u001b\u001c\u0003\u0002\u0001\u0000\u001c\u001d\u0005!\u0000"+ + "\u0000\u001d6\u0001\u0000\u0000\u0000\u001e\u001f\u0005\u0006\u0000\u0000"+ + "\u001f6\u0003\u0002\u0001\u000f !\u0005\u0015\u0000\u0000!6\u0003\u0002"+ + "\u0001\r\"#\u0003\b\u0004\u0000#$\u0003\n\u0005\u0000$6\u0001\u0000\u0000"+ + "\u0000%6\u0003\u0010\b\u0000&\'\u0005)\u0000\u0000\'(\u0003\u000e\u0007"+ + "\u0000()\u0005\u0003\u0000\u0000)*\u0003\u000e\u0007\u0000*6\u0001\u0000"+ + "\u0000\u0000+-\u0005)\u0000\u0000,.\u0005\u0006\u0000\u0000-,\u0001\u0000"+ + "\u0000\u0000-.\u0001\u0000\u0000\u0000./\u0001\u0000\u0000\u0000/0\u0005"+ + "\u0002\u0000\u000006\u0003\n\u0005\u000012\u0005)\u0000\u000023\u0003"+ + "\f\u0006\u000034\u0003\n\u0005\u000046\u0001\u0000\u0000\u00005\u0019"+ + "\u0001\u0000\u0000\u00005\u001e\u0001\u0000\u0000\u00005 \u0001\u0000"+ + "\u0000\u00005\"\u0001\u0000\u0000\u00005%\u0001\u0000\u0000\u00005&\u0001"+ + "\u0000\u0000\u00005+\u0001\u0000\u0000\u000051\u0001\u0000\u0000\u0000"+ + "6S\u0001\u0000\u0000\u000078\n\u000e\u0000\u000089\u0003\u0004\u0002\u0000"+ + "9:\u0003\u0002\u0001\u000f:R\u0001\u0000\u0000\u0000;<\n\f\u0000\u0000"+ + "<=\u0005\u0019\u0000\u0000=R\u0003\u0002\u0001\r>?\n\u000b\u0000\u0000"+ + "?@\u0005\u0017\u0000\u0000@R\u0003\u0002\u0001\fAB\n\n\u0000\u0000BC\u0005"+ + "\u0016\u0000\u0000CR\u0003\u0002\u0001\u000bDE\n\t\u0000\u0000EF\u0005"+ + "\u0018\u0000\u0000FR\u0003\u0002\u0001\nGH\n\b\u0000\u0000HI\u0005\u0014"+ + "\u0000\u0000IR\u0003\u0002\u0001\tJK\n\u0007\u0000\u0000KL\u0005\u0015"+ + "\u0000\u0000LR\u0003\u0002\u0001\bMN\n\u0005\u0000\u0000NO\u0003\u0012"+ + "\t\u0000OP\u0003\u0002\u0001\u0006PR\u0001\u0000\u0000\u0000Q7\u0001\u0000"+ + "\u0000\u0000Q;\u0001\u0000\u0000\u0000Q>\u0001\u0000\u0000\u0000QA\u0001"+ + "\u0000\u0000\u0000QD\u0001\u0000\u0000\u0000QG\u0001\u0000\u0000\u0000"+ + "QJ\u0001\u0000\u0000\u0000QM\u0001\u0000\u0000\u0000RU\u0001\u0000\u0000"+ + "\u0000SQ\u0001\u0000\u0000\u0000ST\u0001\u0000\u0000\u0000T\u0003\u0001"+ + "\u0000\u0000\u0000US\u0001\u0000\u0000\u0000VW\u0007\u0000\u0000\u0000"+ + "W\u0005\u0001\u0000\u0000\u0000XY\u0007\u0001\u0000\u0000Y\u0007\u0001"+ + "\u0000\u0000\u0000Z[\u0007\u0002\u0000\u0000[\t\u0001\u0000\u0000\u0000"+ + "\\`\u0005 \u0000\u0000]_\u0005%\u0000\u0000^]\u0001\u0000\u0000\u0000"+ + "_b\u0001\u0000\u0000\u0000`^\u0001\u0000\u0000\u0000`a\u0001\u0000\u0000"+ + "\u0000ac\u0001\u0000\u0000\u0000b`\u0001\u0000\u0000\u0000cg\u0003\u0002"+ + "\u0001\u0000df\u0005%\u0000\u0000ed\u0001\u0000\u0000\u0000fi\u0001\u0000"+ + "\u0000\u0000ge\u0001\u0000\u0000\u0000gh\u0001\u0000\u0000\u0000hz\u0001"+ + "\u0000\u0000\u0000ig\u0001\u0000\u0000\u0000jn\u0005\u0001\u0000\u0000"+ + "km\u0005%\u0000\u0000lk\u0001\u0000\u0000\u0000mp\u0001\u0000\u0000\u0000"+ + "nl\u0001\u0000\u0000\u0000no\u0001\u0000\u0000\u0000oq\u0001\u0000\u0000"+ + "\u0000pn\u0001\u0000\u0000\u0000qu\u0003\u0002\u0001\u0000rt\u0005%\u0000"+ + "\u0000sr\u0001\u0000\u0000\u0000tw\u0001\u0000\u0000\u0000us\u0001\u0000"+ + "\u0000\u0000uv\u0001\u0000\u0000\u0000vy\u0001\u0000\u0000\u0000wu\u0001"+ + "\u0000\u0000\u0000xj\u0001\u0000\u0000\u0000y|\u0001\u0000\u0000\u0000"+ + "zx\u0001\u0000\u0000\u0000z{\u0001\u0000\u0000\u0000{}\u0001\u0000\u0000"+ + "\u0000|z\u0001\u0000\u0000\u0000}~\u0005!\u0000\u0000~\u000b\u0001\u0000"+ + "\u0000\u0000\u007f\u0080\u0007\u0003\u0000\u0000\u0080\r\u0001\u0000\u0000"+ + "\u0000\u0081\u0082\u0007\u0004\u0000\u0000\u0082\u000f\u0001\u0000\u0000"+ + "\u0000\u0083\u008b\u0005$\u0000\u0000\u0084\u008b\u0005\"\u0000\u0000"+ + "\u0085\u008b\u0005#\u0000\u0000\u0086\u008b\u0003\u0014\n\u0000\u0087"+ + "\u008b\u0005&\u0000\u0000\u0088\u008b\u0005)\u0000\u0000\u0089\u008b\u0001"+ + "\u0000\u0000\u0000\u008a\u0083\u0001\u0000\u0000\u0000\u008a\u0084\u0001"+ + "\u0000\u0000\u0000\u008a\u0085\u0001\u0000\u0000\u0000\u008a\u0086\u0001"+ + "\u0000\u0000\u0000\u008a\u0087\u0001\u0000\u0000\u0000\u008a\u0088\u0001"+ + "\u0000\u0000\u0000\u008a\u0089\u0001\u0000\u0000\u0000\u008b\u0011\u0001"+ + "\u0000\u0000\u0000\u008c\u008d\u0007\u0005\u0000\u0000\u008d\u0013\u0001"+ + "\u0000\u0000\u0000\u008e\u008f\u0007\u0006\u0000\u0000\u008f\u0015\u0001"+ + "\u0000\u0000\u0000\n-5QS`gnuz\u008a"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java index bbf5c08..7235231 100644 --- a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java +++ b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java @@ -13,6 +13,7 @@ import com.github.sidhant92.boolparser.constant.DataType; import com.github.sidhant92.boolparser.constant.LogicalOperationType; import com.github.sidhant92.boolparser.constant.Operator; +import com.github.sidhant92.boolparser.domain.FieldNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; import com.github.sidhant92.boolparser.domain.logical.ArrayNode; @@ -63,9 +64,8 @@ public void exitArithmeticExpression(BooleanExpressionParser.ArithmeticExpressio @Override public void exitUnaryArithmeticExpression(BooleanExpressionParser.UnaryArithmeticExpressionContext ctx) { - final DataType dataType = getDataType(ctx.exp.getStart()); - final Object operand = ValueUtils.convertValue(ctx.exp.getText(), dataType); - final Node leafNode = !currentNodes.isEmpty() ? currentNodes.pop() : UnaryNode.builder().value(operand).dataType(dataType).build(); + final Node leafNode = !currentNodes.isEmpty() ? currentNodes.pop() : mapTypesExpressionContext( + (BooleanExpressionParser.TypesExpressionContext) ctx.exp); currentNodes.add(ArithmeticNode.builder().left(leafNode).operator(Operator.UNARY).build()); super.enterUnaryArithmeticExpression(ctx); } @@ -118,6 +118,8 @@ private Node mapContextToNode(final ParseTree ctx) { return mapComparatorExpressionContext((BooleanExpressionParser.ComparatorExpressionContext) ctx); } else if (ctx instanceof BooleanExpressionParser.ToExpressionContext) { return mapToExpressionContext((BooleanExpressionParser.ToExpressionContext) ctx); + } else if (ctx instanceof BooleanExpressionParser.TypesExpressionContext && ((BooleanExpressionParser.TypesExpressionContext) ctx).start.getType() == BooleanExpressionLexer.FIELD) { + return mapTypesExpressionContextField((BooleanExpressionParser.TypesExpressionContext) ctx); } else if (ctx instanceof BooleanExpressionParser.TypesExpressionContext) { return mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx); } else { @@ -126,9 +128,16 @@ private Node mapContextToNode(final ParseTree ctx) { } } - private UnaryNode mapTypesExpressionContext(BooleanExpressionParser.TypesExpressionContext ctx) { + private FieldNode mapTypesExpressionContextField(BooleanExpressionParser.TypesExpressionContext ctx) { + return new FieldNode(ctx.getText()); + } + + private Node mapTypesExpressionContext(BooleanExpressionParser.TypesExpressionContext ctx) { + if (ctx.start.getType() == BooleanExpressionLexer.FIELD) { + return mapTypesExpressionContextField(ctx); + } final DataType dataType = getDataType(ctx.start); - final Object value = ValueUtils.convertValue(ctx.getText(), dataType); + final Object value = ValueUtils.convertValue(ctx.start.getText(), dataType); return new UnaryNode(dataType, value); } @@ -153,22 +162,23 @@ private ComparisonNode mapComparatorExpressionContext(BooleanExpressionParser.Co return new ComparisonNode(variableName, value, operator, DataType.INTEGER); } else { final DataType dataType = getDataType(ctx.right.getStart()); - return new ComparisonNode(variableName, ValueUtils.convertValue(ctx.right.getText(), dataType), operator, dataType); + final Node value = mapContextToNode(ctx.right); + return new ComparisonNode(variableName, value, operator, dataType); } } private ArithmeticNode mapArithmeticExpressionContext(BooleanExpressionParser.ArithmeticExpressionContext ctx) { final Operator operator = Operator.getOperatorFromSymbol(ctx.op.getText()).orElse(Operator.EQUALS); if (ctx.left instanceof BooleanExpressionParser.TypesExpressionContext && ctx.right instanceof BooleanExpressionParser.TypesExpressionContext) { - final UnaryNode left = mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx.left); - final UnaryNode right = mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx.right); + final Node left = mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx.left); + final Node right = mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx.right); return ArithmeticNode.builder().left(left).right(right).operator(operator).build(); } else if (ctx.left instanceof BooleanExpressionParser.TypesExpressionContext) { - final UnaryNode left = mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx.left); + final Node left = mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx.left); final Node right = currentNodes.pop(); return ArithmeticNode.builder().left(left).right(right).operator(operator).build(); } else if (ctx.right instanceof BooleanExpressionParser.TypesExpressionContext) { - final UnaryNode right = mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx.right); + final Node right = mapTypesExpressionContext((BooleanExpressionParser.TypesExpressionContext) ctx.right); final Node left = currentNodes.pop(); return ArithmeticNode.builder().left(left).right(right).operator(operator).build(); } else { @@ -248,8 +258,8 @@ public void exitParse(BooleanExpressionParser.ParseContext ctx) { this.node = currentNodes.pop(); } if (this.node == null && tokenCount == 1 && lastToken instanceof CommonToken) { - this.node = UnaryNode.builder().dataType(DataType.STRING).value(ValueUtils.convertValue(lastToken.getText(), DataType.STRING).toString()) - .build(); + this.node = lastToken.getType() == BooleanExpressionLexer.FIELD ? FieldNode.builder().field(lastToken.getText()).build() : UnaryNode + .builder().dataType(DataType.STRING).value(ValueUtils.convertValue(lastToken.getText(), DataType.STRING).toString()).build(); } if (this.node == null) { log.error("Error parsing expression for the string {}", ctx.getText()); diff --git a/src/main/java/resources/BooleanExpression.g4 b/src/main/java/resources/BooleanExpression.g4 index 80ee6c2..b1ec315 100644 --- a/src/main/java/resources/BooleanExpression.g4 +++ b/src/main/java/resources/BooleanExpression.g4 @@ -18,9 +18,9 @@ expression | left=arithmeticFunction data=wordlist #arithmeticFunctionExpression | left=expression op=binary right=expression #binaryExpression | types #typesExpression - | (field=WORD)? lower=numericTypes TO upper=numericTypes #toExpression - | (field=WORD)? (not=NOT)? IN data=wordlist #inExpression - | (field=WORD)? op=arrayOperators data=wordlist #arrayExpression + | (field=FIELD) lower=numericTypes TO upper=numericTypes #toExpression + | (field=FIELD) (not=NOT)? IN data=wordlist #inExpression + | (field=FIELD) op=arrayOperators data=wordlist #arrayExpression ; comparator @@ -62,7 +62,7 @@ arithmeticFunction ; types - : INTEGER | DECIMAL | APP_VERSION | bool | WORD | + : INTEGER | DECIMAL | APP_VERSION | bool | WORD | FIELD | ; @@ -111,7 +111,10 @@ DECIMAL : [0-9]+ '.' [0-9]+; APP_VERSION : [0-9] ('.' INTEGER)+; INTEGER : [0-9]+; WS : [ \r\t\u000C\n]+ -> skip; -WORD : ( ((ALPHANUMERIC | SQ | DQ)+ (ALPHANUMERIC | '_' | '.' | SQ | DQ)*) | (SQ | DQ) (ALPHANUMERIC | '_' | '-' | '.' | SQ | DQ)+ (SQ | DQ)); +WORD : SQSTR | DQSTR; +SQSTR : '\'' .*? '\''; +DQSTR : '"' .*? '"'; +FIELD : (ALPHANUMERIC | '_' | '.')+; ALPHANUMERIC : [a-zA-Z0-9]; SQ : '\''.*? '\''; DQ : '"'.*? '"'; diff --git a/src/test/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluatorTest.java b/src/test/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluatorTest.java index 4ca1dfd..591cc89 100644 --- a/src/test/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluatorTest.java +++ b/src/test/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluatorTest.java @@ -53,7 +53,7 @@ public void testInvalidUnaryOperation() { public void testSimpleTrueCorrectExpression() { final Map data = new HashMap<>(); data.put("name", "abc"); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = abc", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = 'abc'", data); assertTrue(booleanOptional.isSuccess()); assertTrue(booleanOptional.get()); } @@ -80,7 +80,7 @@ public void testInvalidDataType() { public void testSimpleFalseIncorrectExpression() { final Map data = new HashMap<>(); data.put("name", "def"); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = abc", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = 'abc'", data); assertTrue(booleanOptional.isSuccess()); assertFalse(booleanOptional.get()); } @@ -112,6 +112,16 @@ public void testNumericGreaterThanCorrectExpression() { assertTrue(booleanOptional.get()); } + @Test + public void testNumericGreaterThanCorrectExpressionWithField() { + final Map data = new HashMap<>(); + data.put("age", 24); + data.put("b", 20); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("age > b", data); + assertTrue(booleanOptional.isSuccess()); + assertTrue(booleanOptional.get()); + } + @Test public void testNestedField() { final Map data = new HashMap<>(); @@ -214,7 +224,7 @@ public void testNumericNotEqualIncorrectExpression() { public void testSimpleNotStringExpression() { final Map data = new HashMap<>(); data.put("name", "abc"); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("NOT (name = abc)", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("NOT (name = 'abc')", data); assertTrue(booleanOptional.isSuccess()); assertFalse(booleanOptional.get()); } @@ -233,7 +243,7 @@ public void testComplexAndCorrectExpression() { final Map data = new HashMap<>(); data.put("age", 25); data.put("name", "sid"); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = sid AND age = 25", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = 'sid' AND age = 25", data); assertTrue(booleanOptional.isSuccess()); assertTrue(booleanOptional.get()); } @@ -243,7 +253,7 @@ public void testComplexAndIncorrectExpression() { final Map data = new HashMap<>(); data.put("age", 25); data.put("name", "sid"); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = sid AND age = 23", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = 'sid' AND age = 23", data); assertTrue(booleanOptional.isSuccess()); assertFalse(booleanOptional.get()); } @@ -253,7 +263,7 @@ public void testComplexORCorrectExpression() { final Map data = new HashMap<>(); data.put("age", 25); data.put("name", "sid"); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = sid OR age = 23", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = 'sid' OR age = 23", data); assertTrue(booleanOptional.isSuccess()); assertTrue(booleanOptional.get()); } @@ -263,7 +273,7 @@ public void testComplexORIncorrectExpression() { final Map data = new HashMap<>(); data.put("age", 25); data.put("name", "sidh"); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = sid OR age = 23", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = 'sid' OR age = 23", data); assertTrue(booleanOptional.isSuccess()); assertFalse(booleanOptional.get()); } @@ -274,7 +284,7 @@ public void testCorrectComplexExpressionWithParenthesis() { data.put("age", 25); data.put("name", "sid"); data.put("num", 45); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = sid AND (age = 25 OR num = 44)", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = 'sid' AND (age = 25 OR num = 44)", data); assertTrue(booleanOptional.isSuccess()); assertTrue(booleanOptional.get()); } @@ -288,6 +298,16 @@ public void testNegativeInClauseForIntegers() { assertFalse(booleanOptional.get()); } + @Test + public void testNegativeInClauseForIntegersWithField() { + final Map data = new HashMap<>(); + data.put("age", 25); + data.put("a", 25); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("age in (26,56,34,a)", data); + assertTrue(booleanOptional.isSuccess()); + assertTrue(booleanOptional.get()); + } + @Test public void testNotInClauseForIntegers() { final Map data = new HashMap<>(); @@ -319,7 +339,7 @@ public void testPositiveInClauseForDecimals() { public void testNegativeInClauseForStrings() { final Map data = new HashMap<>(); data.put("name", "test"); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("name in (tes, abc)", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("name in ('tes', 'abc')", data); assertTrue(booleanOptional.isSuccess()); assertFalse(booleanOptional.get()); } @@ -328,7 +348,7 @@ public void testNegativeInClauseForStrings() { public void testPositiveInClauseForStrings() { final Map data = new HashMap<>(); data.put("name", "test"); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("name in (abc, test)", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("name in ('abc', 'test')", data); assertTrue(booleanOptional.isSuccess()); assertTrue(booleanOptional.get()); } @@ -339,7 +359,7 @@ public void testCorrectComplexExpressionWithParenthesis1() { data.put("age", 25); data.put("name", "sid"); data.put("num", 45); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = sidh OR (age = 25 AND num = 45)", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = 'sidh' OR (age = 25 AND num = 45)", data); assertTrue(booleanOptional.isSuccess()); assertTrue(booleanOptional.get()); } @@ -350,7 +370,7 @@ public void testIncorrectComplexExpressionWithParenthesis() { data.put("age", 25); data.put("name", "sid"); data.put("num", 45); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = sid AND (age = 23 OR num = 44)", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("name = 'sid' AND (age = 23 OR num = 44)", data); assertTrue(booleanOptional.isSuccess()); assertFalse(booleanOptional.get()); } @@ -359,7 +379,7 @@ public void testIncorrectComplexExpressionWithParenthesis() { public void testWrongDataType() { final Map data = new HashMap<>(); data.put("age", 24); - final Try booleanOptional = booleanExpressionEvaluator.evaluate("age = dsf", data); + final Try booleanOptional = booleanExpressionEvaluator.evaluate("age = 'dsf'", data); assertTrue(booleanOptional.isSuccess()); assertFalse(booleanOptional.get()); } diff --git a/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java b/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java index 8ea27db..20ec9a6 100644 --- a/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java +++ b/src/test/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterBoolParserTest.java @@ -1,7 +1,6 @@ package com.github.sidhant92.boolparser.parser.antlr; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -10,6 +9,7 @@ import com.github.sidhant92.boolparser.constant.LogicalOperationType; import com.github.sidhant92.boolparser.constant.NodeType; import com.github.sidhant92.boolparser.constant.Operator; +import com.github.sidhant92.boolparser.domain.FieldNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode; import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode; import com.github.sidhant92.boolparser.domain.logical.ArrayNode; @@ -19,7 +19,6 @@ import com.github.sidhant92.boolparser.domain.logical.NumericRangeNode; import com.github.sidhant92.boolparser.domain.logical.ComparisonNode; import com.github.sidhant92.boolparser.domain.arithmetic.UnaryNode; -import com.github.sidhant92.boolparser.exception.InvalidExpressionException; import io.vavr.control.Try; /** @@ -51,58 +50,58 @@ public void testUnaryTokenString() { @Test public void testSingleStringToken() { - final Try nodeOptional = boolExpressionBoolParser.parseExpression("name = test"); + final Try nodeOptional = boolExpressionBoolParser.parseExpression("name = 'test'"); assertTrue(nodeOptional.isSuccess()); - assertEquals(nodeOptional.get().getTokenType().name(), NodeType.COMPARISON.name()); - verifyStringToken((ComparisonNode) nodeOptional.get(), "name", "test"); + verifyComparisonToken(nodeOptional.get(), "name", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode) nodeOptional.get()).getValue(), "test", DataType.STRING); } @Test public void testSingleStringTokenWithSingleQuotes() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("name = \"te\'st\""); assertTrue(nodeOptional.isSuccess()); - assertEquals(nodeOptional.get().getTokenType().name(), NodeType.COMPARISON.name()); - verifyStringToken((ComparisonNode) nodeOptional.get(), "name", "te\'st"); + verifyComparisonToken(nodeOptional.get(), "name", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode) nodeOptional.get()).getValue(), "te'st", DataType.STRING); } @Test public void testSingleStringTokenWithDoubleQuotes() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("name = 'te\"st'"); assertTrue(nodeOptional.isSuccess()); - assertEquals(nodeOptional.get().getTokenType().name(), NodeType.COMPARISON.name()); - verifyStringToken((ComparisonNode) nodeOptional.get(), "name", "te\"st"); + verifyComparisonToken(nodeOptional.get(), "name", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode) nodeOptional.get()).getValue(), "te\"st", DataType.STRING); } @Test public void testSingleStringTokenWithSpace() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("name = \"first second\""); assertTrue(nodeOptional.isSuccess()); - assertEquals(nodeOptional.get().getTokenType().name(), NodeType.COMPARISON.name()); - verifyStringToken((ComparisonNode) nodeOptional.get(), "name", "first second"); + verifyComparisonToken(nodeOptional.get(), "name", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode) nodeOptional.get()).getValue(), "first second", DataType.STRING); } @Test public void testSingleIntToken() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("age=44"); assertTrue(nodeOptional.isSuccess()); - assertEquals(nodeOptional.get().getTokenType().name(), NodeType.COMPARISON.name()); - verifyNumericToken((ComparisonNode) nodeOptional.get(), "age", 44, Operator.EQUALS); + verifyComparisonToken(nodeOptional.get(), "age", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode) nodeOptional.get()).getValue(), 44, DataType.INTEGER); } @Test public void testSingleLongToken() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("age=1611473334114"); assertTrue(nodeOptional.isSuccess()); - assertEquals(nodeOptional.get().getTokenType().name(), NodeType.COMPARISON.name()); - verifyNumericToken((ComparisonNode) nodeOptional.get(), "age", 1611473334114L, Operator.EQUALS); + verifyComparisonToken(nodeOptional.get(), "age", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode) nodeOptional.get()).getValue(), 1611473334114L, DataType.LONG); } @Test public void testSingleDecimalToken() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("age=44.34"); assertTrue(nodeOptional.isSuccess()); - assertEquals(nodeOptional.get().getTokenType().name(), NodeType.COMPARISON.name()); - verifyNumericToken((ComparisonNode) nodeOptional.get(), "age", 44.34, Operator.EQUALS); + verifyComparisonToken(nodeOptional.get(), "age", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode) nodeOptional.get()).getValue(), 44.34, DataType.DECIMAL); } @Test @@ -117,8 +116,16 @@ public void testSingleIntRangeToken() { public void testGreaterThan() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("age > 18"); assertTrue(nodeOptional.isSuccess()); - assertEquals(nodeOptional.get().getTokenType().name(), NodeType.COMPARISON.name()); - verifyNumericToken((ComparisonNode) nodeOptional.get(), "age", 18, Operator.GREATER_THAN); + verifyComparisonToken(nodeOptional.get(), "age", Operator.GREATER_THAN); + verifyUnaryToken(((ComparisonNode) nodeOptional.get()).getValue(), 18, DataType.INTEGER); + } + + @Test + public void testGreaterThanWithField() { + final Try nodeOptional = boolExpressionBoolParser.parseExpression("age > a"); + assertTrue(nodeOptional.isSuccess()); + verifyComparisonToken(nodeOptional.get(), "age", Operator.GREATER_THAN); + verifyFieldToken(((ComparisonNode) nodeOptional.get()).getValue(), "a"); } @Test @@ -131,7 +138,7 @@ public void testSingleDecimalRangeToken() { @Test public void testSimpleOrCondition() { - final Try nodeOptional = boolExpressionBoolParser.parseExpression("name = test OR age=33"); + final Try nodeOptional = boolExpressionBoolParser.parseExpression("name = 'test' OR age=33"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType().name(), NodeType.BOOLEAN.name()); final BooleanNode booleanToken = (BooleanNode) nodeOptional.get(); @@ -140,13 +147,15 @@ public void testSimpleOrCondition() { assertEquals(booleanToken.getOperator(), LogicalOperationType.OR); assertEquals(booleanToken.getLeft().getTokenType().name(), NodeType.COMPARISON.name()); assertEquals(booleanToken.getRight().getTokenType().name(), NodeType.COMPARISON.name()); - verifyStringToken((ComparisonNode) booleanToken.getLeft(), "name", "test"); - verifyNumericToken((ComparisonNode) booleanToken.getRight(), "age", 33, Operator.EQUALS); + verifyComparisonToken(((BooleanNode) nodeOptional.get()).getLeft(), "name", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode)((BooleanNode) nodeOptional.get()).getLeft()).getValue(), "test", DataType.STRING); + verifyComparisonToken(((BooleanNode) nodeOptional.get()).getRight(), "age", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode)((BooleanNode) nodeOptional.get()).getRight()).getValue(), 33, DataType.INTEGER); } @Test public void testSimpleAndCondition() { - final Try nodeOptional = boolExpressionBoolParser.parseExpression("name = test AND age=33"); + final Try nodeOptional = boolExpressionBoolParser.parseExpression("name = 'test' AND age=33"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType().name(), NodeType.BOOLEAN.name()); final BooleanNode booleanToken = (BooleanNode) nodeOptional.get(); @@ -155,13 +164,15 @@ public void testSimpleAndCondition() { assertEquals(booleanToken.getOperator(), LogicalOperationType.AND); assertEquals(booleanToken.getLeft().getTokenType().name(), NodeType.COMPARISON.name()); assertEquals(booleanToken.getRight().getTokenType().name(), NodeType.COMPARISON.name()); - verifyStringToken((ComparisonNode) booleanToken.getLeft(), "name", "test"); - verifyNumericToken((ComparisonNode) booleanToken.getRight(), "age", 33, Operator.EQUALS); + verifyComparisonToken(((BooleanNode) nodeOptional.get()).getLeft(), "name", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode)((BooleanNode) nodeOptional.get()).getLeft()).getValue(), "test", DataType.STRING); + verifyComparisonToken(((BooleanNode) nodeOptional.get()).getRight(), "age", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode)((BooleanNode) nodeOptional.get()).getRight()).getValue(), 33, DataType.INTEGER); } @Test public void testSimpleNotCondition() { - final Try nodeOptional = boolExpressionBoolParser.parseExpression("NOT (name = test)"); + final Try nodeOptional = boolExpressionBoolParser.parseExpression("NOT (name = 'test')"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType().name(), NodeType.BOOLEAN.name()); final BooleanNode booleanToken = (BooleanNode) nodeOptional.get(); @@ -169,12 +180,13 @@ public void testSimpleNotCondition() { assertNull(booleanToken.getRight()); assertEquals(booleanToken.getOperator(), LogicalOperationType.NOT); assertEquals(booleanToken.getLeft().getTokenType().name(), NodeType.COMPARISON.name()); - verifyStringToken((ComparisonNode) booleanToken.getLeft(), "name", "test"); + verifyComparisonToken(((BooleanNode) nodeOptional.get()).getLeft(), "name", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode)((BooleanNode) nodeOptional.get()).getLeft()).getValue(), "test", DataType.STRING); } @Test public void testNestedAndCondition() { - final Try nodeOptional = boolExpressionBoolParser.parseExpression("name = test OR (age=33 AND city = dummy)"); + final Try nodeOptional = boolExpressionBoolParser.parseExpression("name = 'test' OR (age=33 AND city = 'dummy')"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType().name(), NodeType.BOOLEAN.name()); final BooleanNode booleanToken = (BooleanNode) nodeOptional.get(); @@ -183,20 +195,23 @@ public void testNestedAndCondition() { assertEquals(booleanToken.getOperator(), LogicalOperationType.OR); assertEquals(booleanToken.getLeft().getTokenType().name(), NodeType.COMPARISON.name()); assertEquals(booleanToken.getRight().getTokenType().name(), NodeType.BOOLEAN.name()); - verifyStringToken((ComparisonNode) booleanToken.getLeft(), "name", "test"); + verifyComparisonToken(booleanToken.getLeft(), "name", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode)((BooleanNode) nodeOptional.get()).getLeft()).getValue(), "test", DataType.STRING); final BooleanNode nestedBooleanExpression = (BooleanNode) booleanToken.getRight(); assertNotNull(nestedBooleanExpression.getLeft()); assertNotNull(nestedBooleanExpression.getRight()); assertEquals(nestedBooleanExpression.getOperator(), LogicalOperationType.AND); assertEquals(nestedBooleanExpression.getLeft().getTokenType().name(), NodeType.COMPARISON.name()); assertEquals(nestedBooleanExpression.getRight().getTokenType().name(), NodeType.COMPARISON.name()); - verifyNumericToken((ComparisonNode) nestedBooleanExpression.getLeft(), "age", 33, Operator.EQUALS); - verifyStringToken((ComparisonNode) nestedBooleanExpression.getRight(), "city", "dummy"); + verifyComparisonToken(nestedBooleanExpression.getLeft(), "age", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode) nestedBooleanExpression.getLeft()).getValue(), 33, DataType.INTEGER); + verifyComparisonToken(nestedBooleanExpression.getRight(), "city", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode) nestedBooleanExpression.getRight()).getValue(), "dummy", DataType.STRING); } @Test public void testNestedAndCondition1() { - final Try nodeOptional = boolExpressionBoolParser.parseExpression("(agel=44 AND cityl = abc) OR (ager=33 AND cityr = dummy)"); + final Try nodeOptional = boolExpressionBoolParser.parseExpression("(agel=44 AND cityl = 'abc') OR (ager=33 AND cityr = 'dummy')"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType().name(), NodeType.BOOLEAN.name()); final BooleanNode booleanToken = (BooleanNode) nodeOptional.get(); @@ -211,21 +226,25 @@ public void testNestedAndCondition1() { assertEquals(nestedLeftBooleanExpression.getOperator(), LogicalOperationType.AND); assertEquals(nestedLeftBooleanExpression.getLeft().getTokenType().name(), NodeType.COMPARISON.name()); assertEquals(nestedLeftBooleanExpression.getRight().getTokenType().name(), NodeType.COMPARISON.name()); - verifyNumericToken((ComparisonNode) nestedLeftBooleanExpression.getLeft(), "agel", 44, Operator.EQUALS); - verifyStringToken((ComparisonNode) nestedLeftBooleanExpression.getRight(), "cityl", "abc"); + verifyComparisonToken(nestedLeftBooleanExpression.getLeft(), "agel", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode)nestedLeftBooleanExpression.getLeft()).getValue(), 44, DataType.INTEGER); + verifyComparisonToken(nestedLeftBooleanExpression.getRight(), "cityl", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode)nestedLeftBooleanExpression.getRight()).getValue(), "abc", DataType.STRING); final BooleanNode nestedRightBooleanExpression = (BooleanNode) booleanToken.getRight(); assertNotNull(nestedRightBooleanExpression.getLeft()); assertNotNull(nestedRightBooleanExpression.getRight()); assertEquals(nestedRightBooleanExpression.getOperator(), LogicalOperationType.AND); assertEquals(nestedRightBooleanExpression.getLeft().getTokenType().name(), NodeType.COMPARISON.name()); assertEquals(nestedRightBooleanExpression.getRight().getTokenType().name(), NodeType.COMPARISON.name()); - verifyNumericToken((ComparisonNode) nestedRightBooleanExpression.getLeft(), "ager", 33, Operator.EQUALS); - verifyStringToken((ComparisonNode) nestedRightBooleanExpression.getRight(), "cityr", "dummy"); + verifyComparisonToken(nestedRightBooleanExpression.getLeft(), "ager", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode)nestedRightBooleanExpression.getLeft()).getValue(), 33, DataType.INTEGER); + verifyComparisonToken(nestedRightBooleanExpression.getRight(), "cityr", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode)nestedRightBooleanExpression.getRight()).getValue(), "dummy", DataType.STRING); } @Test public void testNestedOrCondition() { - final Try nodeOptional = boolExpressionBoolParser.parseExpression("name = test AND (age=33 OR city = dummy)"); + final Try nodeOptional = boolExpressionBoolParser.parseExpression("name = 'test' AND (age=33 OR city = 'dummy')"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType().name(), NodeType.BOOLEAN.name()); final BooleanNode booleanToken = (BooleanNode) nodeOptional.get(); @@ -234,15 +253,18 @@ public void testNestedOrCondition() { assertEquals(booleanToken.getOperator(), LogicalOperationType.AND); assertEquals(booleanToken.getLeft().getTokenType().name(), NodeType.COMPARISON.name()); assertEquals(booleanToken.getRight().getTokenType().name(), NodeType.BOOLEAN.name()); - verifyStringToken((ComparisonNode) booleanToken.getLeft(), "name", "test"); + verifyComparisonToken(booleanToken.getLeft(), "name", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode)booleanToken.getLeft()).getValue(), "test", DataType.STRING); final BooleanNode nestedBooleanExpression = (BooleanNode) booleanToken.getRight(); assertNotNull(nestedBooleanExpression.getLeft()); assertNotNull(nestedBooleanExpression.getRight()); assertEquals(nestedBooleanExpression.getOperator(), LogicalOperationType.OR); assertEquals(nestedBooleanExpression.getLeft().getTokenType().name(), NodeType.COMPARISON.name()); assertEquals(nestedBooleanExpression.getRight().getTokenType().name(), NodeType.COMPARISON.name()); - verifyNumericToken((ComparisonNode) nestedBooleanExpression.getLeft(), "age", 33, Operator.EQUALS); - verifyStringToken((ComparisonNode) nestedBooleanExpression.getRight(), "city", "dummy"); + verifyComparisonToken(nestedBooleanExpression.getLeft(), "age", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode)nestedBooleanExpression.getLeft()).getValue(), 33, DataType.INTEGER); + verifyComparisonToken(nestedBooleanExpression.getRight(), "city", Operator.EQUALS); + verifyUnaryToken(((ComparisonNode)nestedBooleanExpression.getRight()).getValue(), "dummy", DataType.STRING); } @Test @@ -278,7 +300,7 @@ public void testNotIntegerList() { @Test public void testStringList() { - final Try nodeOptional = boolExpressionBoolParser.parseExpression("name IN (abc, def, 'abc def')"); + final Try nodeOptional = boolExpressionBoolParser.parseExpression("name IN ('abc', 'def', 'abc def')"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType().name(), NodeType.IN.name()); final InNode inToken = (InNode) nodeOptional.get(); @@ -294,7 +316,7 @@ public void testStringList() { @Test public void testStringList1() { - final Try nodeOptional = boolExpressionBoolParser.parseExpression("name IN (abc, def, 'abc, def')"); + final Try nodeOptional = boolExpressionBoolParser.parseExpression("name IN ('abc', 'def', 'abc, def')"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType().name(), NodeType.IN.name()); final InNode inToken = (InNode) nodeOptional.get(); @@ -310,7 +332,7 @@ public void testStringList1() { @Test public void testStringList2() { - final Try nodeOptional = boolExpressionBoolParser.parseExpression("name IN (abc, def, 'ab\"c')"); + final Try nodeOptional = boolExpressionBoolParser.parseExpression("name IN ('abc', 'def', 'ab\"c')"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType().name(), NodeType.IN.name()); final InNode inToken = (InNode) nodeOptional.get(); @@ -328,9 +350,8 @@ public void testStringList2() { public void testSingleToken() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("a"); assertTrue(nodeOptional.isSuccess()); - assertTrue(nodeOptional.get() instanceof UnaryNode); - assertEquals(((UnaryNode) nodeOptional.get()).getDataType(), DataType.STRING); - assertEquals(((UnaryNode) nodeOptional.get()).getValue(), "a"); + assertTrue(nodeOptional.get() instanceof FieldNode); + assertEquals(((FieldNode) nodeOptional.get()).getField(), "a"); } @Test @@ -358,10 +379,8 @@ public void testAddOperatorString() { final Try nodeOptional = boolExpressionBoolParser.parseExpression("a + b"); assertTrue(nodeOptional.isSuccess()); assertEquals(nodeOptional.get().getTokenType(), NodeType.ARITHMETIC); - assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getLeft()).getValue(), "a"); - assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getLeft()).getDataType(), DataType.STRING); - assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getRight()).getValue(), "b"); - assertEquals(((UnaryNode) ((ArithmeticNode) nodeOptional.get()).getRight()).getDataType(), DataType.STRING); + assertEquals(((FieldNode) ((ArithmeticNode) nodeOptional.get()).getLeft()).getField(), "a"); + assertEquals(((FieldNode) ((ArithmeticNode) nodeOptional.get()).getRight()).getField(), "b"); assertEquals(((ArithmeticNode) nodeOptional.get()).getOperator(), Operator.ADD); } @@ -411,8 +430,7 @@ public void testArithmeticArrayFunctionWithSubstitution() { assertEquals(nodeOptional.get().getTokenType(), NodeType.ARITHMETIC_FUNCTION); assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getFunctionType().name(), "MIN"); assertEquals(((ArithmeticFunctionNode) nodeOptional.get()).getItems().size(), 1); - assertEquals(((UnaryNode) ((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(0)).getDataType(), DataType.STRING); - assertEquals(((UnaryNode) ((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(0)).getValue(), "abc"); + assertEquals(((FieldNode) ((ArithmeticFunctionNode) nodeOptional.get()).getItems().get(0)).getField(), "abc"); } @Test @@ -447,17 +465,21 @@ public void testComparisonWithArithmetic() { assertEquals(arithmeticNode.getOperator(), Operator.ADD); } - private void verifyStringToken(final ComparisonNode stringToken, final String field, final String value) { - assertEquals(stringToken.getTokenType().name(), NodeType.COMPARISON.name()); - assertEquals(stringToken.getField(), field); - assertEquals(stringToken.getValue(), value); + private void verifyUnaryToken(final Node node, final Object value, final DataType dataType) { + assertEquals(node.getTokenType().name(), NodeType.UNARY.name()); + assertEquals(((UnaryNode)node).getValue(), value); + assertEquals(((UnaryNode)node).getDataType(), dataType); + } + + private void verifyFieldToken(final Node node, final Object value) { + assertEquals(node.getTokenType().name(), NodeType.FIELD.name()); + assertEquals(((FieldNode)node).getField(), value); } - private void verifyNumericToken(final ComparisonNode comparisonToken, final String field, final Object value, final Operator operator) { - assertEquals(comparisonToken.getTokenType().name(), NodeType.COMPARISON.name()); - assertEquals(comparisonToken.getField(), field); - assertEquals(comparisonToken.getValue(), value); - assertEquals(comparisonToken.getOperator().name(), operator.name()); + private void verifyComparisonToken(final Node node, final String field, final Operator operator) { + assertEquals(node.getTokenType().name(), NodeType.COMPARISON.name()); + assertEquals(((ComparisonNode)node).getField(), field); + assertEquals(((ComparisonNode)node).getOperator(), operator); } private void verifyNumericRangeToken(final NumericRangeNode numericRangeToken, final String field, final Object fromValue, final Object toValue) { From 6f1a8e4d76b91d03abd4caca172530a8b05560f8 Mon Sep 17 00:00:00 2001 From: Sidhant Aggarwal <10743214+sidhant92@users.noreply.github.com> Date: Sun, 9 Jun 2024 17:16:24 +0530 Subject: [PATCH 10/10] update readme --- README.md | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 703b987..802ad9a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A Boolean Expression Parser for Java The library can help parse complex and nested boolean expressions. The expressions are in SQL-like syntax, where you can use boolean operators and parentheses to combine individual expressions. -An expression can be as simple as `name = Sidhant`. +An expression can be as simple as `name = 'Sidhant'`. A Complex expression is formed by combining these small expressions by logical operators and giving precedence using parenthesis ### Examples @@ -12,7 +12,7 @@ A Complex expression is formed by combining these small expressions by logical o Format: `${attributeName} = ${value}` -Example: `name = john` +Example: `name = 'john'` #### Numeric Comparisons @@ -34,7 +34,7 @@ Example: `price 5.99 TO 100` Example: -`price < 10 AND (category:Book OR NOT category:Ebook)` +`price < 10 AND (category:'Book' OR NOT category:'Ebook')` Individual filters can be combined via boolean operators. The following operators are supported: @@ -45,6 +45,8 @@ Individual filters can be combined via boolean operators. The following operator Parentheses, `(` and `)`, can be used for grouping. #### Usage Notes +* String must be enclosed either in single or double quotes. +* Variables substitution is supported by passing the name of the variable without the quotes. * Phrases that includes quotes, like `content = "It's a wonderful day"` * Phrases that includes quotes, like `attribute = 'She said "Hello World"'` * For nested keys in data map you can use the dot notation, like `person.age` @@ -72,7 +74,7 @@ dependencies { Code ``` final BoolParser boolParser = new BoolParser(); -final Try nodeOptional = boolParser.parseExpression("name = test"); +final Try nodeOptional = boolParser.parseExpression("name = 'test'"); ``` ### Node Types Post Parsing @@ -120,6 +122,12 @@ private final DataType dataType; private final Object value; ``` +#### +FieldNode +``` +private final String field; +``` + #### InNode ``` @@ -160,7 +168,7 @@ final BooleanExpressionEvaluator booleanExpressionEvaluator = new BooleanExpress final Map data = new HashMap<>(); data.put("age", 25); data.put("name", "sid"); -final Try resultOptional = booleanExpressionEvaluator.evaluate("name = sid AND age = 25", data); +final Try resultOptional = booleanExpressionEvaluator.evaluate("name = 'sid' AND age = 25", data); assertTrue(resultOptional.isPresent()); assertTrue(resultOptional.get()); ``` @@ -171,7 +179,7 @@ final Map data = new HashMap<>(); data.put("age", 25); data.put("name", "sid"); data.put("num", 45); -final Try resultOptional = booleanExpressionEvaluator.evaluate("name:sid AND (age = 25 OR num = 44)", data); +final Try resultOptional = booleanExpressionEvaluator.evaluate("name = sid AND (age = 25 OR num = 44)", data); assertTrue(resultOptional.isPresent()); assertTrue(resultOptional.get()); ``` @@ -211,6 +219,22 @@ The following Operators are supported: 5. Modulus (%) 6. Exponent (^) +The following functions are supported: +1. Minimum (min) +2. Maximum (max) +3. Average (avg) +4. Sum (sum) +5. Mean (mean) +6. Mode (mode) +7. Median (median) +8. Integer (int) - converts the input to integer +9. Length (len) - Returns length of the give array + +Syntax For using functions +Format: `${FunctionIdentifier} (item1, item2...)` + +Example: `min (1,2,3)` or with variable substitution `min (a,b,c)` + Usage examples: Simple Addition Operation @@ -232,5 +256,14 @@ final Try resultOptional = evaluator.evaluate("((5 * 2) + a) * 2 + (1 + assertTrue(resultOptional.isPresent()); assertTrue(resultOptional.get(), 56); ``` +Function Usage +``` +final ArithmeticExpressionEvaluator evaluator = new ArithmeticExpressionEvaluator(new Boolparser()); +final Map data = new HashMap<>(); +data.put("a", 10); +final Try resultOptional = arithmeticExpressionEvaluator.evaluate("min (1,2,3)", data); +assertTrue(resultOptional.isSuccess()); +assertEquals(resultOptional.get(), 1); +``` [For a complete list of examples please check out the test file](src/test/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluatorTest.java)