You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ce...@apache.org on 2017/02/03 16:01:51 UTC
[1/2] incubator-metron git commit: METRON-658: Updated Grammar to
Handle More Uses of in/not in Expressions closes apache/incubator-metron#430
Repository: incubator-metron
Updated Branches:
refs/heads/master fd77ec329 -> 8340c0e25
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8340c0e2/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarParser.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarParser.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarParser.java
index 4043601..b8f5173 100644
--- a/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarParser.java
+++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarParser.java
@@ -2,7 +2,7 @@
package org.apache.metron.common.stellar.generated;
//CHECKSTYLE:OFF
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -46,14 +46,14 @@ public class StellarParser extends Parser {
WS=43;
public static final int
RULE_transformation = 0, RULE_transformation_expr = 1, RULE_conditional_expr = 2,
- RULE_comparison_expr = 3, RULE_transformation_entity = 4, RULE_comp_operator = 5,
- RULE_arith_operator_addition = 6, RULE_arith_operator_mul = 7, RULE_func_args = 8,
- RULE_op_list = 9, RULE_list_entity = 10, RULE_kv_list = 11, RULE_map_entity = 12,
- RULE_arithmetic_expr = 13, RULE_arithmetic_expr_mul = 14, RULE_functions = 15,
- RULE_arithmetic_operands = 16, RULE_identifier_operand = 17;
+ RULE_logical_expr = 3, RULE_b_expr = 4, RULE_in_expr = 5, RULE_comparison_expr = 6,
+ RULE_transformation_entity = 7, RULE_comp_operator = 8, RULE_func_args = 9,
+ RULE_op_list = 10, RULE_list_entity = 11, RULE_kv_list = 12, RULE_map_entity = 13,
+ RULE_arithmetic_expr = 14, RULE_arithmetic_expr_mul = 15, RULE_functions = 16,
+ RULE_arithmetic_operands = 17, RULE_identifier_operand = 18;
public static final String[] ruleNames = {
- "transformation", "transformation_expr", "conditional_expr", "comparison_expr",
- "transformation_entity", "comp_operator", "arith_operator_addition", "arith_operator_mul",
+ "transformation", "transformation_expr", "conditional_expr", "logical_expr",
+ "b_expr", "in_expr", "comparison_expr", "transformation_entity", "comp_operator",
"func_args", "op_list", "list_entity", "kv_list", "map_entity", "arithmetic_expr",
"arithmetic_expr_mul", "functions", "arithmetic_operands", "identifier_operand"
};
@@ -145,9 +145,9 @@ public class StellarParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(36);
+ setState(38);
transformation_expr();
- setState(37);
+ setState(39);
match(EOF);
}
}
@@ -187,6 +187,20 @@ public class StellarParser extends Parser {
if ( listener instanceof StellarListener ) ((StellarListener)listener).exitComparisonExpression(this);
}
}
+ public static class LogicalExpressionContext extends Transformation_exprContext {
+ public Logical_exprContext logical_expr() {
+ return getRuleContext(Logical_exprContext.class,0);
+ }
+ public LogicalExpressionContext(Transformation_exprContext ctx) { copyFrom(ctx); }
+ @Override
+ public void enterRule(ParseTreeListener listener) {
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).enterLogicalExpression(this);
+ }
+ @Override
+ public void exitRule(ParseTreeListener listener) {
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).exitLogicalExpression(this);
+ }
+ }
public static class TransformationEntityContext extends Transformation_exprContext {
public Transformation_entityContext transformation_entity() {
return getRuleContext(Transformation_entityContext.class,0);
@@ -201,6 +215,20 @@ public class StellarParser extends Parser {
if ( listener instanceof StellarListener ) ((StellarListener)listener).exitTransformationEntity(this);
}
}
+ public static class InExpressionContext extends Transformation_exprContext {
+ public In_exprContext in_expr() {
+ return getRuleContext(In_exprContext.class,0);
+ }
+ public InExpressionContext(Transformation_exprContext ctx) { copyFrom(ctx); }
+ @Override
+ public void enterRule(ParseTreeListener listener) {
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).enterInExpression(this);
+ }
+ @Override
+ public void exitRule(ParseTreeListener listener) {
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).exitInExpression(this);
+ }
+ }
public static class ArithExpressionContext extends Transformation_exprContext {
public Arithmetic_exprContext arithmetic_expr() {
return getRuleContext(Arithmetic_exprContext.class,0);
@@ -250,13 +278,13 @@ public class StellarParser extends Parser {
Transformation_exprContext _localctx = new Transformation_exprContext(_ctx, getState());
enterRule(_localctx, 2, RULE_transformation_expr);
try {
- setState(47);
+ setState(51);
switch ( getInterpreter().adaptivePredict(_input,0,_ctx) ) {
case 1:
_localctx = new ConditionalExprContext(_localctx);
enterOuterAlt(_localctx, 1);
{
- setState(39);
+ setState(41);
conditional_expr();
}
break;
@@ -264,11 +292,11 @@ public class StellarParser extends Parser {
_localctx = new TransformationExprContext(_localctx);
enterOuterAlt(_localctx, 2);
{
- setState(40);
+ setState(42);
match(LPAREN);
- setState(41);
+ setState(43);
transformation_expr();
- setState(42);
+ setState(44);
match(RPAREN);
}
break;
@@ -276,7 +304,7 @@ public class StellarParser extends Parser {
_localctx = new ArithExpressionContext(_localctx);
enterOuterAlt(_localctx, 3);
{
- setState(44);
+ setState(46);
arithmetic_expr(0);
}
break;
@@ -284,7 +312,7 @@ public class StellarParser extends Parser {
_localctx = new TransformationEntityContext(_localctx);
enterOuterAlt(_localctx, 4);
{
- setState(45);
+ setState(47);
transformation_entity();
}
break;
@@ -292,10 +320,26 @@ public class StellarParser extends Parser {
_localctx = new ComparisonExpressionContext(_localctx);
enterOuterAlt(_localctx, 5);
{
- setState(46);
+ setState(48);
comparison_expr(0);
}
break;
+ case 6:
+ _localctx = new LogicalExpressionContext(_localctx);
+ enterOuterAlt(_localctx, 6);
+ {
+ setState(49);
+ logical_expr();
+ }
+ break;
+ case 7:
+ _localctx = new InExpressionContext(_localctx);
+ enterOuterAlt(_localctx, 7);
+ {
+ setState(50);
+ in_expr();
+ }
+ break;
}
}
catch (RecognitionException re) {
@@ -321,8 +365,8 @@ public class StellarParser extends Parser {
}
}
public static class TernaryFuncWithoutIfContext extends Conditional_exprContext {
- public Comparison_exprContext comparison_expr() {
- return getRuleContext(Comparison_exprContext.class,0);
+ public Logical_exprContext logical_expr() {
+ return getRuleContext(Logical_exprContext.class,0);
}
public TerminalNode QUESTION() { return getToken(StellarParser.QUESTION, 0); }
public List<Transformation_exprContext> transformation_expr() {
@@ -344,8 +388,8 @@ public class StellarParser extends Parser {
}
public static class TernaryFuncWithIfContext extends Conditional_exprContext {
public TerminalNode IF() { return getToken(StellarParser.IF, 0); }
- public Comparison_exprContext comparison_expr() {
- return getRuleContext(Comparison_exprContext.class,0);
+ public Logical_exprContext logical_expr() {
+ return getRuleContext(Logical_exprContext.class,0);
}
public TerminalNode THEN() { return getToken(StellarParser.THEN, 0); }
public List<Transformation_exprContext> transformation_expr() {
@@ -370,7 +414,7 @@ public class StellarParser extends Parser {
Conditional_exprContext _localctx = new Conditional_exprContext(_ctx, getState());
enterRule(_localctx, 4, RULE_conditional_expr);
try {
- setState(62);
+ setState(66);
switch (_input.LA(1)) {
case NOT:
case TRUE:
@@ -389,15 +433,15 @@ public class StellarParser extends Parser {
_localctx = new TernaryFuncWithoutIfContext(_localctx);
enterOuterAlt(_localctx, 1);
{
- setState(49);
- comparison_expr(0);
- setState(50);
+ setState(53);
+ logical_expr();
+ setState(54);
match(QUESTION);
- setState(51);
+ setState(55);
transformation_expr();
- setState(52);
+ setState(56);
match(COLON);
- setState(53);
+ setState(57);
transformation_expr();
}
break;
@@ -405,17 +449,17 @@ public class StellarParser extends Parser {
_localctx = new TernaryFuncWithIfContext(_localctx);
enterOuterAlt(_localctx, 2);
{
- setState(55);
+ setState(59);
match(IF);
- setState(56);
- comparison_expr(0);
- setState(57);
+ setState(60);
+ logical_expr();
+ setState(61);
match(THEN);
- setState(58);
+ setState(62);
transformation_expr();
- setState(59);
+ setState(63);
match(ELSE);
- setState(60);
+ setState(64);
transformation_expr();
}
break;
@@ -434,140 +478,326 @@ public class StellarParser extends Parser {
return _localctx;
}
- public static class Comparison_exprContext extends ParserRuleContext {
- public Comparison_exprContext(ParserRuleContext parent, int invokingState) {
+ public static class Logical_exprContext extends ParserRuleContext {
+ public Logical_exprContext(ParserRuleContext parent, int invokingState) {
super(parent, invokingState);
}
- @Override public int getRuleIndex() { return RULE_comparison_expr; }
+ @Override public int getRuleIndex() { return RULE_logical_expr; }
- public Comparison_exprContext() { }
- public void copyFrom(Comparison_exprContext ctx) {
+ public Logical_exprContext() { }
+ public void copyFrom(Logical_exprContext ctx) {
super.copyFrom(ctx);
}
}
- public static class NotFuncContext extends Comparison_exprContext {
- public TerminalNode NOT() { return getToken(StellarParser.NOT, 0); }
- public TerminalNode LPAREN() { return getToken(StellarParser.LPAREN, 0); }
- public Comparison_exprContext comparison_expr() {
- return getRuleContext(Comparison_exprContext.class,0);
+ public static class LogicalExpressionAndContext extends Logical_exprContext {
+ public B_exprContext b_expr() {
+ return getRuleContext(B_exprContext.class,0);
}
- public TerminalNode RPAREN() { return getToken(StellarParser.RPAREN, 0); }
- public NotFuncContext(Comparison_exprContext ctx) { copyFrom(ctx); }
+ public TerminalNode AND() { return getToken(StellarParser.AND, 0); }
+ public Logical_exprContext logical_expr() {
+ return getRuleContext(Logical_exprContext.class,0);
+ }
+ public LogicalExpressionAndContext(Logical_exprContext ctx) { copyFrom(ctx); }
@Override
public void enterRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).enterNotFunc(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).enterLogicalExpressionAnd(this);
}
@Override
public void exitRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).exitNotFunc(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).exitLogicalExpressionAnd(this);
}
}
- public static class ComparisonExpressionParensContext extends Comparison_exprContext {
- public TerminalNode LPAREN() { return getToken(StellarParser.LPAREN, 0); }
- public Comparison_exprContext comparison_expr() {
- return getRuleContext(Comparison_exprContext.class,0);
+ public static class BoleanExpressionContext extends Logical_exprContext {
+ public B_exprContext b_expr() {
+ return getRuleContext(B_exprContext.class,0);
}
- public TerminalNode RPAREN() { return getToken(StellarParser.RPAREN, 0); }
- public ComparisonExpressionParensContext(Comparison_exprContext ctx) { copyFrom(ctx); }
+ public BoleanExpressionContext(Logical_exprContext ctx) { copyFrom(ctx); }
@Override
public void enterRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).enterComparisonExpressionParens(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).enterBoleanExpression(this);
}
@Override
public void exitRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).exitComparisonExpressionParens(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).exitBoleanExpression(this);
}
}
- public static class InExpressionContext extends Comparison_exprContext {
- public List<Identifier_operandContext> identifier_operand() {
- return getRuleContexts(Identifier_operandContext.class);
+ public static class LogicalExpressionOrContext extends Logical_exprContext {
+ public B_exprContext b_expr() {
+ return getRuleContext(B_exprContext.class,0);
}
- public Identifier_operandContext identifier_operand(int i) {
- return getRuleContext(Identifier_operandContext.class,i);
+ public TerminalNode OR() { return getToken(StellarParser.OR, 0); }
+ public Logical_exprContext logical_expr() {
+ return getRuleContext(Logical_exprContext.class,0);
}
- public TerminalNode IN() { return getToken(StellarParser.IN, 0); }
- public InExpressionContext(Comparison_exprContext ctx) { copyFrom(ctx); }
+ public LogicalExpressionOrContext(Logical_exprContext ctx) { copyFrom(ctx); }
@Override
public void enterRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).enterInExpression(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).enterLogicalExpressionOr(this);
}
@Override
public void exitRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).exitInExpression(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).exitLogicalExpressionOr(this);
}
}
- public static class ComparisonExpressionWithOperatorContext extends Comparison_exprContext {
- public List<Identifier_operandContext> identifier_operand() {
- return getRuleContexts(Identifier_operandContext.class);
+
+ public final Logical_exprContext logical_expr() throws RecognitionException {
+ Logical_exprContext _localctx = new Logical_exprContext(_ctx, getState());
+ enterRule(_localctx, 6, RULE_logical_expr);
+ try {
+ setState(77);
+ switch ( getInterpreter().adaptivePredict(_input,2,_ctx) ) {
+ case 1:
+ _localctx = new LogicalExpressionAndContext(_localctx);
+ enterOuterAlt(_localctx, 1);
+ {
+ setState(68);
+ b_expr();
+ setState(69);
+ match(AND);
+ setState(70);
+ logical_expr();
+ }
+ break;
+ case 2:
+ _localctx = new LogicalExpressionOrContext(_localctx);
+ enterOuterAlt(_localctx, 2);
+ {
+ setState(72);
+ b_expr();
+ setState(73);
+ match(OR);
+ setState(74);
+ logical_expr();
+ }
+ break;
+ case 3:
+ _localctx = new BoleanExpressionContext(_localctx);
+ enterOuterAlt(_localctx, 3);
+ {
+ setState(76);
+ b_expr();
+ }
+ break;
+ }
+ }
+ catch (RecognitionException re) {
+ _localctx.exception = re;
+ _errHandler.reportError(this, re);
+ _errHandler.recover(this, re);
}
- public Identifier_operandContext identifier_operand(int i) {
- return getRuleContext(Identifier_operandContext.class,i);
+ finally {
+ exitRule();
}
- public Comp_operatorContext comp_operator() {
- return getRuleContext(Comp_operatorContext.class,0);
+ return _localctx;
+ }
+
+ public static class B_exprContext extends ParserRuleContext {
+ public Comparison_exprContext comparison_expr() {
+ return getRuleContext(Comparison_exprContext.class,0);
}
- public ComparisonExpressionWithOperatorContext(Comparison_exprContext ctx) { copyFrom(ctx); }
+ public In_exprContext in_expr() {
+ return getRuleContext(In_exprContext.class,0);
+ }
+ public B_exprContext(ParserRuleContext parent, int invokingState) {
+ super(parent, invokingState);
+ }
+ @Override public int getRuleIndex() { return RULE_b_expr; }
@Override
public void enterRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).enterComparisonExpressionWithOperator(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).enterB_expr(this);
}
@Override
public void exitRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).exitComparisonExpressionWithOperator(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).exitB_expr(this);
}
}
- public static class LogicalExpressionAndContext extends Comparison_exprContext {
- public List<Comparison_exprContext> comparison_expr() {
- return getRuleContexts(Comparison_exprContext.class);
+
+ public final B_exprContext b_expr() throws RecognitionException {
+ B_exprContext _localctx = new B_exprContext(_ctx, getState());
+ enterRule(_localctx, 8, RULE_b_expr);
+ try {
+ setState(81);
+ switch ( getInterpreter().adaptivePredict(_input,3,_ctx) ) {
+ case 1:
+ enterOuterAlt(_localctx, 1);
+ {
+ setState(79);
+ comparison_expr(0);
+ }
+ break;
+ case 2:
+ enterOuterAlt(_localctx, 2);
+ {
+ setState(80);
+ in_expr();
+ }
+ break;
+ }
}
- public Comparison_exprContext comparison_expr(int i) {
- return getRuleContext(Comparison_exprContext.class,i);
+ catch (RecognitionException re) {
+ _localctx.exception = re;
+ _errHandler.reportError(this, re);
+ _errHandler.recover(this, re);
}
- public TerminalNode AND() { return getToken(StellarParser.AND, 0); }
- public LogicalExpressionAndContext(Comparison_exprContext ctx) { copyFrom(ctx); }
+ finally {
+ exitRule();
+ }
+ return _localctx;
+ }
+
+ public static class In_exprContext extends ParserRuleContext {
+ public In_exprContext(ParserRuleContext parent, int invokingState) {
+ super(parent, invokingState);
+ }
+ @Override public int getRuleIndex() { return RULE_in_expr; }
+
+ public In_exprContext() { }
+ public void copyFrom(In_exprContext ctx) {
+ super.copyFrom(ctx);
+ }
+ }
+ public static class NInExpressionStatementContext extends In_exprContext {
+ public Identifier_operandContext identifier_operand() {
+ return getRuleContext(Identifier_operandContext.class,0);
+ }
+ public TerminalNode NIN() { return getToken(StellarParser.NIN, 0); }
+ public B_exprContext b_expr() {
+ return getRuleContext(B_exprContext.class,0);
+ }
+ public NInExpressionStatementContext(In_exprContext ctx) { copyFrom(ctx); }
@Override
public void enterRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).enterLogicalExpressionAnd(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).enterNInExpressionStatement(this);
}
@Override
public void exitRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).exitLogicalExpressionAnd(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).exitNInExpressionStatement(this);
}
}
- public static class NInExpressionContext extends Comparison_exprContext {
- public List<Identifier_operandContext> identifier_operand() {
- return getRuleContexts(Identifier_operandContext.class);
+ public static class InExpressionStatementContext extends In_exprContext {
+ public Identifier_operandContext identifier_operand() {
+ return getRuleContext(Identifier_operandContext.class,0);
}
- public Identifier_operandContext identifier_operand(int i) {
- return getRuleContext(Identifier_operandContext.class,i);
+ public TerminalNode IN() { return getToken(StellarParser.IN, 0); }
+ public B_exprContext b_expr() {
+ return getRuleContext(B_exprContext.class,0);
}
- public TerminalNode NIN() { return getToken(StellarParser.NIN, 0); }
- public NInExpressionContext(Comparison_exprContext ctx) { copyFrom(ctx); }
+ public InExpressionStatementContext(In_exprContext ctx) { copyFrom(ctx); }
@Override
public void enterRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).enterNInExpression(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).enterInExpressionStatement(this);
}
@Override
public void exitRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).exitNInExpression(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).exitInExpressionStatement(this);
+ }
+ }
+
+ public final In_exprContext in_expr() throws RecognitionException {
+ In_exprContext _localctx = new In_exprContext(_ctx, getState());
+ enterRule(_localctx, 10, RULE_in_expr);
+ try {
+ setState(91);
+ switch ( getInterpreter().adaptivePredict(_input,4,_ctx) ) {
+ case 1:
+ _localctx = new InExpressionStatementContext(_localctx);
+ enterOuterAlt(_localctx, 1);
+ {
+ setState(83);
+ identifier_operand();
+ setState(84);
+ match(IN);
+ setState(85);
+ b_expr();
+ }
+ break;
+ case 2:
+ _localctx = new NInExpressionStatementContext(_localctx);
+ enterOuterAlt(_localctx, 2);
+ {
+ setState(87);
+ identifier_operand();
+ setState(88);
+ match(NIN);
+ setState(89);
+ b_expr();
+ }
+ break;
+ }
+ }
+ catch (RecognitionException re) {
+ _localctx.exception = re;
+ _errHandler.reportError(this, re);
+ _errHandler.recover(this, re);
}
+ finally {
+ exitRule();
+ }
+ return _localctx;
}
- public static class LogicalExpressionOrContext extends Comparison_exprContext {
+
+ public static class Comparison_exprContext extends ParserRuleContext {
+ public Comparison_exprContext(ParserRuleContext parent, int invokingState) {
+ super(parent, invokingState);
+ }
+ @Override public int getRuleIndex() { return RULE_comparison_expr; }
+
+ public Comparison_exprContext() { }
+ public void copyFrom(Comparison_exprContext ctx) {
+ super.copyFrom(ctx);
+ }
+ }
+ public static class NotFuncContext extends Comparison_exprContext {
+ public TerminalNode NOT() { return getToken(StellarParser.NOT, 0); }
+ public TerminalNode LPAREN() { return getToken(StellarParser.LPAREN, 0); }
+ public Logical_exprContext logical_expr() {
+ return getRuleContext(Logical_exprContext.class,0);
+ }
+ public TerminalNode RPAREN() { return getToken(StellarParser.RPAREN, 0); }
+ public NotFuncContext(Comparison_exprContext ctx) { copyFrom(ctx); }
+ @Override
+ public void enterRule(ParseTreeListener listener) {
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).enterNotFunc(this);
+ }
+ @Override
+ public void exitRule(ParseTreeListener listener) {
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).exitNotFunc(this);
+ }
+ }
+ public static class ComparisonExpressionParensContext extends Comparison_exprContext {
+ public TerminalNode LPAREN() { return getToken(StellarParser.LPAREN, 0); }
+ public Logical_exprContext logical_expr() {
+ return getRuleContext(Logical_exprContext.class,0);
+ }
+ public TerminalNode RPAREN() { return getToken(StellarParser.RPAREN, 0); }
+ public ComparisonExpressionParensContext(Comparison_exprContext ctx) { copyFrom(ctx); }
+ @Override
+ public void enterRule(ParseTreeListener listener) {
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).enterComparisonExpressionParens(this);
+ }
+ @Override
+ public void exitRule(ParseTreeListener listener) {
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).exitComparisonExpressionParens(this);
+ }
+ }
+ public static class ComparisonExpressionWithOperatorContext extends Comparison_exprContext {
public List<Comparison_exprContext> comparison_expr() {
return getRuleContexts(Comparison_exprContext.class);
}
public Comparison_exprContext comparison_expr(int i) {
return getRuleContext(Comparison_exprContext.class,i);
}
- public TerminalNode OR() { return getToken(StellarParser.OR, 0); }
- public LogicalExpressionOrContext(Comparison_exprContext ctx) { copyFrom(ctx); }
+ public Comp_operatorContext comp_operator() {
+ return getRuleContext(Comp_operatorContext.class,0);
+ }
+ public ComparisonExpressionWithOperatorContext(Comparison_exprContext ctx) { copyFrom(ctx); }
@Override
public void enterRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).enterLogicalExpressionOr(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).enterComparisonExpressionWithOperator(this);
}
@Override
public void exitRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).exitLogicalExpressionOr(this);
+ if ( listener instanceof StellarListener ) ((StellarListener)listener).exitComparisonExpressionWithOperator(this);
}
}
public static class OperandContext extends Comparison_exprContext {
@@ -594,133 +824,77 @@ public class StellarParser extends Parser {
int _parentState = getState();
Comparison_exprContext _localctx = new Comparison_exprContext(_ctx, _parentState);
Comparison_exprContext _prevctx = _localctx;
- int _startState = 6;
- enterRecursionRule(_localctx, 6, RULE_comparison_expr, _p);
+ int _startState = 12;
+ enterRecursionRule(_localctx, 12, RULE_comparison_expr, _p);
try {
int _alt;
enterOuterAlt(_localctx, 1);
{
- setState(87);
- switch ( getInterpreter().adaptivePredict(_input,2,_ctx) ) {
+ setState(104);
+ switch ( getInterpreter().adaptivePredict(_input,5,_ctx) ) {
case 1:
{
- _localctx = new ComparisonExpressionWithOperatorContext(_localctx);
- _ctx = _localctx;
- _prevctx = _localctx;
-
- setState(65);
- identifier_operand();
- setState(66);
- comp_operator();
- setState(67);
- identifier_operand();
- }
- break;
- case 2:
- {
- _localctx = new InExpressionContext(_localctx);
- _ctx = _localctx;
- _prevctx = _localctx;
- setState(69);
- identifier_operand();
- setState(70);
- match(IN);
- setState(71);
- identifier_operand();
- }
- break;
- case 3:
- {
- _localctx = new NInExpressionContext(_localctx);
- _ctx = _localctx;
- _prevctx = _localctx;
- setState(73);
- identifier_operand();
- setState(74);
- match(NIN);
- setState(75);
- identifier_operand();
- }
- break;
- case 4:
- {
_localctx = new NotFuncContext(_localctx);
_ctx = _localctx;
_prevctx = _localctx;
- setState(77);
+
+ setState(94);
match(NOT);
- setState(78);
+ setState(95);
match(LPAREN);
- setState(79);
- comparison_expr(0);
- setState(80);
+ setState(96);
+ logical_expr();
+ setState(97);
match(RPAREN);
}
break;
- case 5:
+ case 2:
{
_localctx = new ComparisonExpressionParensContext(_localctx);
_ctx = _localctx;
_prevctx = _localctx;
- setState(82);
+ setState(99);
match(LPAREN);
- setState(83);
- comparison_expr(0);
- setState(84);
+ setState(100);
+ logical_expr();
+ setState(101);
match(RPAREN);
}
break;
- case 6:
+ case 3:
{
_localctx = new OperandContext(_localctx);
_ctx = _localctx;
_prevctx = _localctx;
- setState(86);
+ setState(103);
identifier_operand();
}
break;
}
_ctx.stop = _input.LT(-1);
- setState(97);
+ setState(112);
_errHandler.sync(this);
- _alt = getInterpreter().adaptivePredict(_input,4,_ctx);
+ _alt = getInterpreter().adaptivePredict(_input,6,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
if ( _alt==1 ) {
if ( _parseListeners!=null ) triggerExitRuleEvent();
_prevctx = _localctx;
{
- setState(95);
- switch ( getInterpreter().adaptivePredict(_input,3,_ctx) ) {
- case 1:
- {
- _localctx = new LogicalExpressionAndContext(new Comparison_exprContext(_parentctx, _parentState));
- pushNewRecursionContext(_localctx, _startState, RULE_comparison_expr);
- setState(89);
- if (!(precpred(_ctx, 5))) throw new FailedPredicateException(this, "precpred(_ctx, 5)");
- setState(90);
- match(AND);
- setState(91);
- comparison_expr(6);
- }
- break;
- case 2:
- {
- _localctx = new LogicalExpressionOrContext(new Comparison_exprContext(_parentctx, _parentState));
- pushNewRecursionContext(_localctx, _startState, RULE_comparison_expr);
- setState(92);
- if (!(precpred(_ctx, 4))) throw new FailedPredicateException(this, "precpred(_ctx, 4)");
- setState(93);
- match(OR);
- setState(94);
- comparison_expr(5);
- }
- break;
+ {
+ _localctx = new ComparisonExpressionWithOperatorContext(new Comparison_exprContext(_parentctx, _parentState));
+ pushNewRecursionContext(_localctx, _startState, RULE_comparison_expr);
+ setState(106);
+ if (!(precpred(_ctx, 4))) throw new FailedPredicateException(this, "precpred(_ctx, 4)");
+ setState(107);
+ comp_operator();
+ setState(108);
+ comparison_expr(5);
}
}
}
- setState(99);
+ setState(114);
_errHandler.sync(this);
- _alt = getInterpreter().adaptivePredict(_input,4,_ctx);
+ _alt = getInterpreter().adaptivePredict(_input,6,_ctx);
}
}
}
@@ -755,11 +929,11 @@ public class StellarParser extends Parser {
public final Transformation_entityContext transformation_entity() throws RecognitionException {
Transformation_entityContext _localctx = new Transformation_entityContext(_ctx, getState());
- enterRule(_localctx, 8, RULE_transformation_entity);
+ enterRule(_localctx, 14, RULE_transformation_entity);
try {
enterOuterAlt(_localctx, 1);
{
- setState(100);
+ setState(115);
identifier_operand();
}
}
@@ -805,13 +979,13 @@ public class StellarParser extends Parser {
public final Comp_operatorContext comp_operator() throws RecognitionException {
Comp_operatorContext _localctx = new Comp_operatorContext(_ctx, getState());
- enterRule(_localctx, 10, RULE_comp_operator);
+ enterRule(_localctx, 16, RULE_comp_operator);
int _la;
try {
_localctx = new ComparisonOpContext(_localctx);
enterOuterAlt(_localctx, 1);
{
- setState(102);
+ setState(117);
_la = _input.LA(1);
if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << EQ) | (1L << NEQ) | (1L << LT) | (1L << LTE) | (1L << GT) | (1L << GTE))) != 0)) ) {
_errHandler.recoverInline(this);
@@ -831,112 +1005,6 @@ public class StellarParser extends Parser {
return _localctx;
}
- public static class Arith_operator_additionContext extends ParserRuleContext {
- public Arith_operator_additionContext(ParserRuleContext parent, int invokingState) {
- super(parent, invokingState);
- }
- @Override public int getRuleIndex() { return RULE_arith_operator_addition; }
-
- public Arith_operator_additionContext() { }
- public void copyFrom(Arith_operator_additionContext ctx) {
- super.copyFrom(ctx);
- }
- }
- public static class ArithOp_plusContext extends Arith_operator_additionContext {
- public TerminalNode PLUS() { return getToken(StellarParser.PLUS, 0); }
- public TerminalNode MINUS() { return getToken(StellarParser.MINUS, 0); }
- public ArithOp_plusContext(Arith_operator_additionContext ctx) { copyFrom(ctx); }
- @Override
- public void enterRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).enterArithOp_plus(this);
- }
- @Override
- public void exitRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).exitArithOp_plus(this);
- }
- }
-
- public final Arith_operator_additionContext arith_operator_addition() throws RecognitionException {
- Arith_operator_additionContext _localctx = new Arith_operator_additionContext(_ctx, getState());
- enterRule(_localctx, 12, RULE_arith_operator_addition);
- int _la;
- try {
- _localctx = new ArithOp_plusContext(_localctx);
- enterOuterAlt(_localctx, 1);
- {
- setState(104);
- _la = _input.LA(1);
- if ( !(_la==MINUS || _la==PLUS) ) {
- _errHandler.recoverInline(this);
- } else {
- consume();
- }
- }
- }
- catch (RecognitionException re) {
- _localctx.exception = re;
- _errHandler.reportError(this, re);
- _errHandler.recover(this, re);
- }
- finally {
- exitRule();
- }
- return _localctx;
- }
-
- public static class Arith_operator_mulContext extends ParserRuleContext {
- public Arith_operator_mulContext(ParserRuleContext parent, int invokingState) {
- super(parent, invokingState);
- }
- @Override public int getRuleIndex() { return RULE_arith_operator_mul; }
-
- public Arith_operator_mulContext() { }
- public void copyFrom(Arith_operator_mulContext ctx) {
- super.copyFrom(ctx);
- }
- }
- public static class ArithOp_mulContext extends Arith_operator_mulContext {
- public TerminalNode MUL() { return getToken(StellarParser.MUL, 0); }
- public TerminalNode DIV() { return getToken(StellarParser.DIV, 0); }
- public ArithOp_mulContext(Arith_operator_mulContext ctx) { copyFrom(ctx); }
- @Override
- public void enterRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).enterArithOp_mul(this);
- }
- @Override
- public void exitRule(ParseTreeListener listener) {
- if ( listener instanceof StellarListener ) ((StellarListener)listener).exitArithOp_mul(this);
- }
- }
-
- public final Arith_operator_mulContext arith_operator_mul() throws RecognitionException {
- Arith_operator_mulContext _localctx = new Arith_operator_mulContext(_ctx, getState());
- enterRule(_localctx, 14, RULE_arith_operator_mul);
- int _la;
- try {
- _localctx = new ArithOp_mulContext(_localctx);
- enterOuterAlt(_localctx, 1);
- {
- setState(106);
- _la = _input.LA(1);
- if ( !(_la==DIV || _la==MUL) ) {
- _errHandler.recoverInline(this);
- } else {
- consume();
- }
- }
- }
- catch (RecognitionException re) {
- _localctx.exception = re;
- _errHandler.reportError(this, re);
- _errHandler.recover(this, re);
- }
- finally {
- exitRule();
- }
- return _localctx;
- }
-
public static class Func_argsContext extends ParserRuleContext {
public TerminalNode LPAREN() { return getToken(StellarParser.LPAREN, 0); }
public Op_listContext op_list() {
@@ -959,27 +1027,27 @@ public class StellarParser extends Parser {
public final Func_argsContext func_args() throws RecognitionException {
Func_argsContext _localctx = new Func_argsContext(_ctx, getState());
- enterRule(_localctx, 16, RULE_func_args);
+ enterRule(_localctx, 18, RULE_func_args);
try {
- setState(114);
- switch ( getInterpreter().adaptivePredict(_input,5,_ctx) ) {
+ setState(125);
+ switch ( getInterpreter().adaptivePredict(_input,7,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(108);
+ setState(119);
match(LPAREN);
- setState(109);
+ setState(120);
op_list(0);
- setState(110);
+ setState(121);
match(RPAREN);
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(112);
+ setState(123);
match(LPAREN);
- setState(113);
+ setState(124);
match(RPAREN);
}
break;
@@ -1030,47 +1098,47 @@ public class StellarParser extends Parser {
int _parentState = getState();
Op_listContext _localctx = new Op_listContext(_ctx, _parentState);
Op_listContext _prevctx = _localctx;
- int _startState = 18;
- enterRecursionRule(_localctx, 18, RULE_op_list, _p);
+ int _startState = 20;
+ enterRecursionRule(_localctx, 20, RULE_op_list, _p);
try {
int _alt;
enterOuterAlt(_localctx, 1);
{
- setState(119);
- switch ( getInterpreter().adaptivePredict(_input,6,_ctx) ) {
+ setState(130);
+ switch ( getInterpreter().adaptivePredict(_input,8,_ctx) ) {
case 1:
{
- setState(117);
+ setState(128);
identifier_operand();
}
break;
case 2:
{
- setState(118);
+ setState(129);
conditional_expr();
}
break;
}
_ctx.stop = _input.LT(-1);
- setState(129);
+ setState(140);
_errHandler.sync(this);
- _alt = getInterpreter().adaptivePredict(_input,8,_ctx);
+ _alt = getInterpreter().adaptivePredict(_input,10,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
if ( _alt==1 ) {
if ( _parseListeners!=null ) triggerExitRuleEvent();
_prevctx = _localctx;
{
- setState(127);
- switch ( getInterpreter().adaptivePredict(_input,7,_ctx) ) {
+ setState(138);
+ switch ( getInterpreter().adaptivePredict(_input,9,_ctx) ) {
case 1:
{
_localctx = new Op_listContext(_parentctx, _parentState);
pushNewRecursionContext(_localctx, _startState, RULE_op_list);
- setState(121);
+ setState(132);
if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)");
- setState(122);
+ setState(133);
match(COMMA);
- setState(123);
+ setState(134);
identifier_operand();
}
break;
@@ -1078,20 +1146,20 @@ public class StellarParser extends Parser {
{
_localctx = new Op_listContext(_parentctx, _parentState);
pushNewRecursionContext(_localctx, _startState, RULE_op_list);
- setState(124);
+ setState(135);
if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)");
- setState(125);
+ setState(136);
match(COMMA);
- setState(126);
+ setState(137);
conditional_expr();
}
break;
}
}
}
- setState(131);
+ setState(142);
_errHandler.sync(this);
- _alt = getInterpreter().adaptivePredict(_input,8,_ctx);
+ _alt = getInterpreter().adaptivePredict(_input,10,_ctx);
}
}
}
@@ -1128,27 +1196,27 @@ public class StellarParser extends Parser {
public final List_entityContext list_entity() throws RecognitionException {
List_entityContext _localctx = new List_entityContext(_ctx, getState());
- enterRule(_localctx, 20, RULE_list_entity);
+ enterRule(_localctx, 22, RULE_list_entity);
try {
- setState(138);
- switch ( getInterpreter().adaptivePredict(_input,9,_ctx) ) {
+ setState(149);
+ switch ( getInterpreter().adaptivePredict(_input,11,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(132);
+ setState(143);
match(LBRACKET);
- setState(133);
+ setState(144);
op_list(0);
- setState(134);
+ setState(145);
match(RBRACKET);
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(136);
+ setState(147);
match(LBRACKET);
- setState(137);
+ setState(148);
match(RBRACKET);
}
break;
@@ -1200,24 +1268,24 @@ public class StellarParser extends Parser {
int _parentState = getState();
Kv_listContext _localctx = new Kv_listContext(_ctx, _parentState);
Kv_listContext _prevctx = _localctx;
- int _startState = 22;
- enterRecursionRule(_localctx, 22, RULE_kv_list, _p);
+ int _startState = 24;
+ enterRecursionRule(_localctx, 24, RULE_kv_list, _p);
try {
int _alt;
enterOuterAlt(_localctx, 1);
{
{
- setState(141);
+ setState(152);
identifier_operand();
- setState(142);
+ setState(153);
match(COLON);
- setState(143);
+ setState(154);
transformation_expr();
}
_ctx.stop = _input.LT(-1);
- setState(153);
+ setState(164);
_errHandler.sync(this);
- _alt = getInterpreter().adaptivePredict(_input,10,_ctx);
+ _alt = getInterpreter().adaptivePredict(_input,12,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
if ( _alt==1 ) {
if ( _parseListeners!=null ) triggerExitRuleEvent();
@@ -1226,22 +1294,22 @@ public class StellarParser extends Parser {
{
_localctx = new Kv_listContext(_parentctx, _parentState);
pushNewRecursionContext(_localctx, _startState, RULE_kv_list);
- setState(145);
+ setState(156);
if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)");
- setState(146);
+ setState(157);
match(COMMA);
- setState(147);
+ setState(158);
identifier_operand();
- setState(148);
+ setState(159);
match(COLON);
- setState(149);
+ setState(160);
transformation_expr();
}
}
}
- setState(155);
+ setState(166);
_errHandler.sync(this);
- _alt = getInterpreter().adaptivePredict(_input,10,_ctx);
+ _alt = getInterpreter().adaptivePredict(_input,12,_ctx);
}
}
}
@@ -1278,27 +1346,27 @@ public class StellarParser extends Parser {
public final Map_entityContext map_entity() throws RecognitionException {
Map_entityContext _localctx = new Map_entityContext(_ctx, getState());
- enterRule(_localctx, 24, RULE_map_entity);
+ enterRule(_localctx, 26, RULE_map_entity);
try {
- setState(162);
- switch ( getInterpreter().adaptivePredict(_input,11,_ctx) ) {
+ setState(173);
+ switch ( getInterpreter().adaptivePredict(_input,13,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(156);
+ setState(167);
match(LBRACE);
- setState(157);
+ setState(168);
kv_list(0);
- setState(158);
+ setState(169);
match(RBRACE);
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(160);
+ setState(171);
match(LBRACE);
- setState(161);
+ setState(172);
match(RBRACE);
}
break;
@@ -1386,8 +1454,8 @@ public class StellarParser extends Parser {
int _parentState = getState();
Arithmetic_exprContext _localctx = new Arithmetic_exprContext(_ctx, _parentState);
Arithmetic_exprContext _prevctx = _localctx;
- int _startState = 26;
- enterRecursionRule(_localctx, 26, RULE_arithmetic_expr, _p);
+ int _startState = 28;
+ enterRecursionRule(_localctx, 28, RULE_arithmetic_expr, _p);
try {
int _alt;
enterOuterAlt(_localctx, 1);
@@ -1397,29 +1465,29 @@ public class StellarParser extends Parser {
_ctx = _localctx;
_prevctx = _localctx;
- setState(165);
+ setState(176);
arithmetic_expr_mul(0);
}
_ctx.stop = _input.LT(-1);
- setState(175);
+ setState(186);
_errHandler.sync(this);
- _alt = getInterpreter().adaptivePredict(_input,13,_ctx);
+ _alt = getInterpreter().adaptivePredict(_input,15,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
if ( _alt==1 ) {
if ( _parseListeners!=null ) triggerExitRuleEvent();
_prevctx = _localctx;
{
- setState(173);
- switch ( getInterpreter().adaptivePredict(_input,12,_ctx) ) {
+ setState(184);
+ switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) {
case 1:
{
_localctx = new ArithExpr_plusContext(new Arithmetic_exprContext(_parentctx, _parentState));
pushNewRecursionContext(_localctx, _startState, RULE_arithmetic_expr);
- setState(167);
+ setState(178);
if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)");
- setState(168);
+ setState(179);
match(PLUS);
- setState(169);
+ setState(180);
arithmetic_expr_mul(0);
}
break;
@@ -1427,20 +1495,20 @@ public class StellarParser extends Parser {
{
_localctx = new ArithExpr_minusContext(new Arithmetic_exprContext(_parentctx, _parentState));
pushNewRecursionContext(_localctx, _startState, RULE_arithmetic_expr);
- setState(170);
+ setState(181);
if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)");
- setState(171);
+ setState(182);
match(MINUS);
- setState(172);
+ setState(183);
arithmetic_expr_mul(0);
}
break;
}
}
}
- setState(177);
+ setState(188);
_errHandler.sync(this);
- _alt = getInterpreter().adaptivePredict(_input,13,_ctx);
+ _alt = getInterpreter().adaptivePredict(_input,15,_ctx);
}
}
}
@@ -1526,8 +1594,8 @@ public class StellarParser extends Parser {
int _parentState = getState();
Arithmetic_expr_mulContext _localctx = new Arithmetic_expr_mulContext(_ctx, _parentState);
Arithmetic_expr_mulContext _prevctx = _localctx;
- int _startState = 28;
- enterRecursionRule(_localctx, 28, RULE_arithmetic_expr_mul, _p);
+ int _startState = 30;
+ enterRecursionRule(_localctx, 30, RULE_arithmetic_expr_mul, _p);
try {
int _alt;
enterOuterAlt(_localctx, 1);
@@ -1537,29 +1605,29 @@ public class StellarParser extends Parser {
_ctx = _localctx;
_prevctx = _localctx;
- setState(179);
+ setState(190);
arithmetic_operands();
}
_ctx.stop = _input.LT(-1);
- setState(189);
+ setState(200);
_errHandler.sync(this);
- _alt = getInterpreter().adaptivePredict(_input,15,_ctx);
+ _alt = getInterpreter().adaptivePredict(_input,17,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
if ( _alt==1 ) {
if ( _parseListeners!=null ) triggerExitRuleEvent();
_prevctx = _localctx;
{
- setState(187);
- switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) {
+ setState(198);
+ switch ( getInterpreter().adaptivePredict(_input,16,_ctx) ) {
case 1:
{
_localctx = new ArithExpr_mulContext(new Arithmetic_expr_mulContext(_parentctx, _parentState));
pushNewRecursionContext(_localctx, _startState, RULE_arithmetic_expr_mul);
- setState(181);
+ setState(192);
if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)");
- setState(182);
+ setState(193);
match(MUL);
- setState(183);
+ setState(194);
arithmetic_expr_mul(3);
}
break;
@@ -1567,20 +1635,20 @@ public class StellarParser extends Parser {
{
_localctx = new ArithExpr_divContext(new Arithmetic_expr_mulContext(_parentctx, _parentState));
pushNewRecursionContext(_localctx, _startState, RULE_arithmetic_expr_mul);
- setState(184);
+ setState(195);
if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)");
- setState(185);
+ setState(196);
match(DIV);
- setState(186);
+ setState(197);
arithmetic_expr_mul(2);
}
break;
}
}
}
- setState(191);
+ setState(202);
_errHandler.sync(this);
- _alt = getInterpreter().adaptivePredict(_input,15,_ctx);
+ _alt = getInterpreter().adaptivePredict(_input,17,_ctx);
}
}
}
@@ -1624,14 +1692,14 @@ public class StellarParser extends Parser {
public final FunctionsContext functions() throws RecognitionException {
FunctionsContext _localctx = new FunctionsContext(_ctx, getState());
- enterRule(_localctx, 30, RULE_functions);
+ enterRule(_localctx, 32, RULE_functions);
try {
_localctx = new TransformationFuncContext(_localctx);
enterOuterAlt(_localctx, 1);
{
- setState(192);
+ setState(203);
match(IDENTIFIER);
- setState(193);
+ setState(204);
func_args();
}
}
@@ -1766,15 +1834,15 @@ public class StellarParser extends Parser {
public final Arithmetic_operandsContext arithmetic_operands() throws RecognitionException {
Arithmetic_operandsContext _localctx = new Arithmetic_operandsContext(_ctx, getState());
- enterRule(_localctx, 32, RULE_arithmetic_operands);
+ enterRule(_localctx, 34, RULE_arithmetic_operands);
try {
- setState(209);
- switch ( getInterpreter().adaptivePredict(_input,16,_ctx) ) {
+ setState(220);
+ switch ( getInterpreter().adaptivePredict(_input,18,_ctx) ) {
case 1:
_localctx = new NumericFunctionsContext(_localctx);
enterOuterAlt(_localctx, 1);
{
- setState(195);
+ setState(206);
functions();
}
break;
@@ -1782,7 +1850,7 @@ public class StellarParser extends Parser {
_localctx = new DoubleLiteralContext(_localctx);
enterOuterAlt(_localctx, 2);
{
- setState(196);
+ setState(207);
match(DOUBLE_LITERAL);
}
break;
@@ -1790,7 +1858,7 @@ public class StellarParser extends Parser {
_localctx = new IntLiteralContext(_localctx);
enterOuterAlt(_localctx, 3);
{
- setState(197);
+ setState(208);
match(INT_LITERAL);
}
break;
@@ -1798,7 +1866,7 @@ public class StellarParser extends Parser {
_localctx = new LongLiteralContext(_localctx);
enterOuterAlt(_localctx, 4);
{
- setState(198);
+ setState(209);
match(LONG_LITERAL);
}
break;
@@ -1806,7 +1874,7 @@ public class StellarParser extends Parser {
_localctx = new FloatLiteralContext(_localctx);
enterOuterAlt(_localctx, 5);
{
- setState(199);
+ setState(210);
match(FLOAT_LITERAL);
}
break;
@@ -1814,7 +1882,7 @@ public class StellarParser extends Parser {
_localctx = new VariableContext(_localctx);
enterOuterAlt(_localctx, 6);
{
- setState(200);
+ setState(211);
match(IDENTIFIER);
}
break;
@@ -1822,11 +1890,11 @@ public class StellarParser extends Parser {
_localctx = new ParenArithContext(_localctx);
enterOuterAlt(_localctx, 7);
{
- setState(201);
+ setState(212);
match(LPAREN);
- setState(202);
+ setState(213);
arithmetic_expr(0);
- setState(203);
+ setState(214);
match(RPAREN);
}
break;
@@ -1834,11 +1902,11 @@ public class StellarParser extends Parser {
_localctx = new CondExprContext(_localctx);
enterOuterAlt(_localctx, 8);
{
- setState(205);
+ setState(216);
match(LPAREN);
- setState(206);
+ setState(217);
conditional_expr();
- setState(207);
+ setState(218);
match(RPAREN);
}
break;
@@ -1979,16 +2047,16 @@ public class StellarParser extends Parser {
public final Identifier_operandContext identifier_operand() throws RecognitionException {
Identifier_operandContext _localctx = new Identifier_operandContext(_ctx, getState());
- enterRule(_localctx, 34, RULE_identifier_operand);
+ enterRule(_localctx, 36, RULE_identifier_operand);
int _la;
try {
- setState(225);
- switch ( getInterpreter().adaptivePredict(_input,17,_ctx) ) {
+ setState(236);
+ switch ( getInterpreter().adaptivePredict(_input,19,_ctx) ) {
case 1:
_localctx = new LogicalConstContext(_localctx);
enterOuterAlt(_localctx, 1);
{
- setState(211);
+ setState(222);
_la = _input.LA(1);
if ( !(_la==TRUE || _la==FALSE) ) {
_errHandler.recoverInline(this);
@@ -2001,7 +2069,7 @@ public class StellarParser extends Parser {
_localctx = new ArithmeticOperandsContext(_localctx);
enterOuterAlt(_localctx, 2);
{
- setState(212);
+ setState(223);
arithmetic_expr(0);
}
break;
@@ -2009,7 +2077,7 @@ public class StellarParser extends Parser {
_localctx = new StringLiteralContext(_localctx);
enterOuterAlt(_localctx, 3);
{
- setState(213);
+ setState(224);
match(STRING_LITERAL);
}
break;
@@ -2017,7 +2085,7 @@ public class StellarParser extends Parser {
_localctx = new ListContext(_localctx);
enterOuterAlt(_localctx, 4);
{
- setState(214);
+ setState(225);
list_entity();
}
break;
@@ -2025,7 +2093,7 @@ public class StellarParser extends Parser {
_localctx = new MapConstContext(_localctx);
enterOuterAlt(_localctx, 5);
{
- setState(215);
+ setState(226);
map_entity();
}
break;
@@ -2033,7 +2101,7 @@ public class StellarParser extends Parser {
_localctx = new NullConstContext(_localctx);
enterOuterAlt(_localctx, 6);
{
- setState(216);
+ setState(227);
match(NULL);
}
break;
@@ -2041,13 +2109,13 @@ public class StellarParser extends Parser {
_localctx = new ExistsFuncContext(_localctx);
enterOuterAlt(_localctx, 7);
{
- setState(217);
+ setState(228);
match(EXISTS);
- setState(218);
+ setState(229);
match(LPAREN);
- setState(219);
+ setState(230);
match(IDENTIFIER);
- setState(220);
+ setState(231);
match(RPAREN);
}
break;
@@ -2055,11 +2123,11 @@ public class StellarParser extends Parser {
_localctx = new CondExpr_parenContext(_localctx);
enterOuterAlt(_localctx, 8);
{
- setState(221);
+ setState(232);
match(LPAREN);
- setState(222);
+ setState(233);
conditional_expr();
- setState(223);
+ setState(234);
match(RPAREN);
}
break;
@@ -2078,15 +2146,15 @@ public class StellarParser extends Parser {
public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
switch (ruleIndex) {
- case 3:
+ case 6:
return comparison_expr_sempred((Comparison_exprContext)_localctx, predIndex);
- case 9:
+ case 10:
return op_list_sempred((Op_listContext)_localctx, predIndex);
- case 11:
+ case 12:
return kv_list_sempred((Kv_listContext)_localctx, predIndex);
- case 13:
- return arithmetic_expr_sempred((Arithmetic_exprContext)_localctx, predIndex);
case 14:
+ return arithmetic_expr_sempred((Arithmetic_exprContext)_localctx, predIndex);
+ case 15:
return arithmetic_expr_mul_sempred((Arithmetic_expr_mulContext)_localctx, predIndex);
}
return true;
@@ -2094,122 +2162,125 @@ public class StellarParser extends Parser {
private boolean comparison_expr_sempred(Comparison_exprContext _localctx, int predIndex) {
switch (predIndex) {
case 0:
- return precpred(_ctx, 5);
- case 1:
return precpred(_ctx, 4);
}
return true;
}
private boolean op_list_sempred(Op_listContext _localctx, int predIndex) {
switch (predIndex) {
- case 2:
+ case 1:
return precpred(_ctx, 3);
- case 3:
+ case 2:
return precpred(_ctx, 1);
}
return true;
}
private boolean kv_list_sempred(Kv_listContext _localctx, int predIndex) {
switch (predIndex) {
- case 4:
+ case 3:
return precpred(_ctx, 1);
}
return true;
}
private boolean arithmetic_expr_sempred(Arithmetic_exprContext _localctx, int predIndex) {
switch (predIndex) {
- case 5:
+ case 4:
return precpred(_ctx, 2);
- case 6:
+ case 5:
return precpred(_ctx, 1);
}
return true;
}
private boolean arithmetic_expr_mul_sempred(Arithmetic_expr_mulContext _localctx, int predIndex) {
switch (predIndex) {
- case 7:
+ case 6:
return precpred(_ctx, 2);
- case 8:
+ case 7:
return precpred(_ctx, 1);
}
return true;
}
public static final String _serializedATN =
- "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3-\u00e6\4\2\t\2\4"+
+ "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3-\u00f1\4\2\t\2\4"+
"\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+
"\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
- "\4\23\t\23\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\5\3\62\n\3\3\4"+
- "\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\5\4A\n\4\3\5\3\5\3\5"+
- "\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3"+
- "\5\3\5\3\5\5\5Z\n\5\3\5\3\5\3\5\3\5\3\5\3\5\7\5b\n\5\f\5\16\5e\13\5\3"+
- "\6\3\6\3\7\3\7\3\b\3\b\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\n\5\nu\n\n\3\13\3"+
- "\13\3\13\5\13z\n\13\3\13\3\13\3\13\3\13\3\13\3\13\7\13\u0082\n\13\f\13"+
- "\16\13\u0085\13\13\3\f\3\f\3\f\3\f\3\f\3\f\5\f\u008d\n\f\3\r\3\r\3\r\3"+
- "\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\7\r\u009a\n\r\f\r\16\r\u009d\13\r\3\16"+
- "\3\16\3\16\3\16\3\16\3\16\5\16\u00a5\n\16\3\17\3\17\3\17\3\17\3\17\3\17"+
- "\3\17\3\17\3\17\7\17\u00b0\n\17\f\17\16\17\u00b3\13\17\3\20\3\20\3\20"+
- "\3\20\3\20\3\20\3\20\3\20\3\20\7\20\u00be\n\20\f\20\16\20\u00c1\13\20"+
- "\3\21\3\21\3\21\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\22"+
- "\3\22\3\22\3\22\5\22\u00d4\n\22\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23"+
- "\3\23\3\23\3\23\3\23\3\23\3\23\5\23\u00e4\n\23\3\23\2\7\b\24\30\34\36"+
- "\24\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$\2\6\3\2\f\21\3\2\30\31"+
- "\3\2\32\33\3\2\n\13\u00f8\2&\3\2\2\2\4\61\3\2\2\2\6@\3\2\2\2\bY\3\2\2"+
- "\2\nf\3\2\2\2\fh\3\2\2\2\16j\3\2\2\2\20l\3\2\2\2\22t\3\2\2\2\24y\3\2\2"+
- "\2\26\u008c\3\2\2\2\30\u008e\3\2\2\2\32\u00a4\3\2\2\2\34\u00a6\3\2\2\2"+
- "\36\u00b4\3\2\2\2 \u00c2\3\2\2\2\"\u00d3\3\2\2\2$\u00e3\3\2\2\2&\'\5\4"+
- "\3\2\'(\7\2\2\3(\3\3\2\2\2)\62\5\6\4\2*+\7 \2\2+,\5\4\3\2,-\7!\2\2-\62"+
- "\3\2\2\2.\62\5\34\17\2/\62\5\n\6\2\60\62\5\b\5\2\61)\3\2\2\2\61*\3\2\2"+
- "\2\61.\3\2\2\2\61/\3\2\2\2\61\60\3\2\2\2\62\5\3\2\2\2\63\64\5\b\5\2\64"+
- "\65\7\22\2\2\65\66\5\4\3\2\66\67\7\23\2\2\678\5\4\3\28A\3\2\2\29:\7\24"+
- "\2\2:;\5\b\5\2;<\7\25\2\2<=\5\4\3\2=>\7\26\2\2>?\5\4\3\2?A\3\2\2\2@\63"+
- "\3\2\2\2@9\3\2\2\2A\7\3\2\2\2BC\b\5\1\2CD\5$\23\2DE\5\f\7\2EF\5$\23\2"+
- "FZ\3\2\2\2GH\5$\23\2HI\7\"\2\2IJ\5$\23\2JZ\3\2\2\2KL\5$\23\2LM\7#\2\2"+
- "MN\5$\23\2NZ\3\2\2\2OP\7\t\2\2PQ\7 \2\2QR\5\b\5\2RS\7!\2\2SZ\3\2\2\2T"+
- "U\7 \2\2UV\5\b\5\2VW\7!\2\2WZ\3\2\2\2XZ\5$\23\2YB\3\2\2\2YG\3\2\2\2YK"+
- "\3\2\2\2YO\3\2\2\2YT\3\2\2\2YX\3\2\2\2Zc\3\2\2\2[\\\f\7\2\2\\]\7\7\2\2"+
- "]b\5\b\5\b^_\f\6\2\2_`\7\b\2\2`b\5\b\5\7a[\3\2\2\2a^\3\2\2\2be\3\2\2\2"+
- "ca\3\2\2\2cd\3\2\2\2d\t\3\2\2\2ec\3\2\2\2fg\5$\23\2g\13\3\2\2\2hi\t\2"+
- "\2\2i\r\3\2\2\2jk\t\3\2\2k\17\3\2\2\2lm\t\4\2\2m\21\3\2\2\2no\7 \2\2o"+
- "p\5\24\13\2pq\7!\2\2qu\3\2\2\2rs\7 \2\2su\7!\2\2tn\3\2\2\2tr\3\2\2\2u"+
- "\23\3\2\2\2vw\b\13\1\2wz\5$\23\2xz\5\6\4\2yv\3\2\2\2yx\3\2\2\2z\u0083"+
- "\3\2\2\2{|\f\5\2\2|}\7\5\2\2}\u0082\5$\23\2~\177\f\3\2\2\177\u0080\7\5"+
- "\2\2\u0080\u0082\5\6\4\2\u0081{\3\2\2\2\u0081~\3\2\2\2\u0082\u0085\3\2"+
- "\2\2\u0083\u0081\3\2\2\2\u0083\u0084\3\2\2\2\u0084\25\3\2\2\2\u0085\u0083"+
- "\3\2\2\2\u0086\u0087\7\36\2\2\u0087\u0088\5\24\13\2\u0088\u0089\7\37\2"+
- "\2\u0089\u008d\3\2\2\2\u008a\u008b\7\36\2\2\u008b\u008d\7\37\2\2\u008c"+
- "\u0086\3\2\2\2\u008c\u008a\3\2\2\2\u008d\27\3\2\2\2\u008e\u008f\b\r\1"+
- "\2\u008f\u0090\5$\23\2\u0090\u0091\7\23\2\2\u0091\u0092\5\4\3\2\u0092"+
- "\u009b\3\2\2\2\u0093\u0094\f\3\2\2\u0094\u0095\7\5\2\2\u0095\u0096\5$"+
- "\23\2\u0096\u0097\7\23\2\2\u0097\u0098\5\4\3\2\u0098\u009a\3\2\2\2\u0099"+
- "\u0093\3\2\2\2\u009a\u009d\3\2\2\2\u009b\u0099\3\2\2\2\u009b\u009c\3\2"+
- "\2\2\u009c\31\3\2\2\2\u009d\u009b\3\2\2\2\u009e\u009f\7\34\2\2\u009f\u00a0"+
- "\5\30\r\2\u00a0\u00a1\7\35\2\2\u00a1\u00a5\3\2\2\2\u00a2\u00a3\7\34\2"+
- "\2\u00a3\u00a5\7\35\2\2\u00a4\u009e\3\2\2\2\u00a4\u00a2\3\2\2\2\u00a5"+
- "\33\3\2\2\2\u00a6\u00a7\b\17\1\2\u00a7\u00a8\5\36\20\2\u00a8\u00b1\3\2"+
- "\2\2\u00a9\u00aa\f\4\2\2\u00aa\u00ab\7\31\2\2\u00ab\u00b0\5\36\20\2\u00ac"+
- "\u00ad\f\3\2\2\u00ad\u00ae\7\30\2\2\u00ae\u00b0\5\36\20\2\u00af\u00a9"+
- "\3\2\2\2\u00af\u00ac\3\2\2\2\u00b0\u00b3\3\2\2\2\u00b1\u00af\3\2\2\2\u00b1"+
- "\u00b2\3\2\2\2\u00b2\35\3\2\2\2\u00b3\u00b1\3\2\2\2\u00b4\u00b5\b\20\1"+
- "\2\u00b5\u00b6\5\"\22\2\u00b6\u00bf\3\2\2\2\u00b7\u00b8\f\4\2\2\u00b8"+
- "\u00b9\7\33\2\2\u00b9\u00be\5\36\20\5\u00ba\u00bb\f\3\2\2\u00bb\u00bc"+
- "\7\32\2\2\u00bc\u00be\5\36\20\4\u00bd\u00b7\3\2\2\2\u00bd\u00ba\3\2\2"+
- "\2\u00be\u00c1\3\2\2\2\u00bf\u00bd\3\2\2\2\u00bf\u00c0\3\2\2\2\u00c0\37"+
- "\3\2\2\2\u00c1\u00bf\3\2\2\2\u00c2\u00c3\7*\2\2\u00c3\u00c4\5\22\n\2\u00c4"+
- "!\3\2\2\2\u00c5\u00d4\5 \21\2\u00c6\u00d4\7\'\2\2\u00c7\u00d4\7&\2\2\u00c8"+
- "\u00d4\7)\2\2\u00c9\u00d4\7(\2\2\u00ca\u00d4\7*\2\2\u00cb\u00cc\7 \2\2"+
- "\u00cc\u00cd\5\34\17\2\u00cd\u00ce\7!\2\2\u00ce\u00d4\3\2\2\2\u00cf\u00d0"+
- "\7 \2\2\u00d0\u00d1\5\6\4\2\u00d1\u00d2\7!\2\2\u00d2\u00d4\3\2\2\2\u00d3"+
- "\u00c5\3\2\2\2\u00d3\u00c6\3\2\2\2\u00d3\u00c7\3\2\2\2\u00d3\u00c8\3\2"+
- "\2\2\u00d3\u00c9\3\2\2\2\u00d3\u00ca\3\2\2\2\u00d3\u00cb\3\2\2\2\u00d3"+
- "\u00cf\3\2\2\2\u00d4#\3\2\2\2\u00d5\u00e4\t\5\2\2\u00d6\u00e4\5\34\17"+
- "\2\u00d7\u00e4\7+\2\2\u00d8\u00e4\5\26\f\2\u00d9\u00e4\5\32\16\2\u00da"+
- "\u00e4\7\27\2\2\u00db\u00dc\7$\2\2\u00dc\u00dd\7 \2\2\u00dd\u00de\7*\2"+
- "\2\u00de\u00e4\7!\2\2\u00df\u00e0\7 \2\2\u00e0\u00e1\5\6\4\2\u00e1\u00e2"+
- "\7!\2\2\u00e2\u00e4\3\2\2\2\u00e3\u00d5\3\2\2\2\u00e3\u00d6\3\2\2\2\u00e3"+
- "\u00d7\3\2\2\2\u00e3\u00d8\3\2\2\2\u00e3\u00d9\3\2\2\2\u00e3\u00da\3\2"+
- "\2\2\u00e3\u00db\3\2\2\2\u00e3\u00df\3\2\2\2\u00e4%\3\2\2\2\24\61@Yac"+
- "ty\u0081\u0083\u008c\u009b\u00a4\u00af\u00b1\u00bd\u00bf\u00d3\u00e3";
+ "\4\23\t\23\4\24\t\24\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3"+
+ "\3\5\3\66\n\3\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\5\4"+
+ "E\n\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\5\5P\n\5\3\6\3\6\5\6T\n\6\3"+
+ "\7\3\7\3\7\3\7\3\7\3\7\3\7\3\7\5\7^\n\7\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3"+
+ "\b\3\b\3\b\3\b\5\bk\n\b\3\b\3\b\3\b\3\b\7\bq\n\b\f\b\16\bt\13\b\3\t\3"+
+ "\t\3\n\3\n\3\13\3\13\3\13\3\13\3\13\3\13\5\13\u0080\n\13\3\f\3\f\3\f\5"+
+ "\f\u0085\n\f\3\f\3\f\3\f\3\f\3\f\3\f\7\f\u008d\n\f\f\f\16\f\u0090\13\f"+
+ "\3\r\3\r\3\r\3\r\3\r\3\r\5\r\u0098\n\r\3\16\3\16\3\16\3\16\3\16\3\16\3"+
+ "\16\3\16\3\16\3\16\3\16\7\16\u00a5\n\16\f\16\16\16\u00a8\13\16\3\17\3"+
+ "\17\3\17\3\17\3\17\3\17\5\17\u00b0\n\17\3\20\3\20\3\20\3\20\3\20\3\20"+
+ "\3\20\3\20\3\20\7\20\u00bb\n\20\f\20\16\20\u00be\13\20\3\21\3\21\3\21"+
+ "\3\21\3\21\3\21\3\21\3\21\3\21\7\21\u00c9\n\21\f\21\16\21\u00cc\13\21"+
+ "\3\22\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23"+
+ "\3\23\3\23\3\23\5\23\u00df\n\23\3\24\3\24\3\24\3\24\3\24\3\24\3\24\3\24"+
+ "\3\24\3\24\3\24\3\24\3\24\3\24\5\24\u00ef\n\24\3\24\2\7\16\26\32\36 \25"+
+ "\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$&\2\4\3\2\f\21\3\2\n\13\u0104"+
+ "\2(\3\2\2\2\4\65\3\2\2\2\6D\3\2\2\2\bO\3\2\2\2\nS\3\2\2\2\f]\3\2\2\2\16"+
+ "j\3\2\2\2\20u\3\2\2\2\22w\3\2\2\2\24\177\3\2\2\2\26\u0084\3\2\2\2\30\u0097"+
+ "\3\2\2\2\32\u0099\3\2\2\2\34\u00af\3\2\2\2\36\u00b1\3\2\2\2 \u00bf\3\2"+
+ "\2\2\"\u00cd\3\2\2\2$\u00de\3\2\2\2&\u00ee\3\2\2\2()\5\4\3\2)*\7\2\2\3"+
+ "*\3\3\2\2\2+\66\5\6\4\2,-\7 \2\2-.\5\4\3\2./\7!\2\2/\66\3\2\2\2\60\66"+
+ "\5\36\20\2\61\66\5\20\t\2\62\66\5\16\b\2\63\66\5\b\5\2\64\66\5\f\7\2\65"+
+ "+\3\2\2\2\65,\3\2\2\2\65\60\3\2\2\2\65\61\3\2\2\2\65\62\3\2\2\2\65\63"+
+ "\3\2\2\2\65\64\3\2\2\2\66\5\3\2\2\2\678\5\b\5\289\7\22\2\29:\5\4\3\2:"+
+ ";\7\23\2\2;<\5\4\3\2<E\3\2\2\2=>\7\24\2\2>?\5\b\5\2?@\7\25\2\2@A\5\4\3"+
+ "\2AB\7\26\2\2BC\5\4\3\2CE\3\2\2\2D\67\3\2\2\2D=\3\2\2\2E\7\3\2\2\2FG\5"+
+ "\n\6\2GH\7\7\2\2HI\5\b\5\2IP\3\2\2\2JK\5\n\6\2KL\7\b\2\2LM\5\b\5\2MP\3"+
+ "\2\2\2NP\5\n\6\2OF\3\2\2\2OJ\3\2\2\2ON\3\2\2\2P\t\3\2\2\2QT\5\16\b\2R"+
+ "T\5\f\7\2SQ\3\2\2\2SR\3\2\2\2T\13\3\2\2\2UV\5&\24\2VW\7\"\2\2WX\5\n\6"+
+ "\2X^\3\2\2\2YZ\5&\24\2Z[\7#\2\2[\\\5\n\6\2\\^\3\2\2\2]U\3\2\2\2]Y\3\2"+
+ "\2\2^\r\3\2\2\2_`\b\b\1\2`a\7\t\2\2ab\7 \2\2bc\5\b\5\2cd\7!\2\2dk\3\2"+
+ "\2\2ef\7 \2\2fg\5\b\5\2gh\7!\2\2hk\3\2\2\2ik\5&\24\2j_\3\2\2\2je\3\2\2"+
+ "\2ji\3\2\2\2kr\3\2\2\2lm\f\6\2\2mn\5\22\n\2no\5\16\b\7oq\3\2\2\2pl\3\2"+
+ "\2\2qt\3\2\2\2rp\3\2\2\2rs\3\2\2\2s\17\3\2\2\2tr\3\2\2\2uv\5&\24\2v\21"+
+ "\3\2\2\2wx\t\2\2\2x\23\3\2\2\2yz\7 \2\2z{\5\26\f\2{|\7!\2\2|\u0080\3\2"+
+ "\2\2}~\7 \2\2~\u0080\7!\2\2\177y\3\2\2\2\177}\3\2\2\2\u0080\25\3\2\2\2"+
+ "\u0081\u0082\b\f\1\2\u0082\u0085\5&\24\2\u0083\u0085\5\6\4\2\u0084\u0081"+
+ "\3\2\2\2\u0084\u0083\3\2\2\2\u0085\u008e\3\2\2\2\u0086\u0087\f\5\2\2\u0087"+
+ "\u0088\7\5\2\2\u0088\u008d\5&\24\2\u0089\u008a\f\3\2\2\u008a\u008b\7\5"+
+ "\2\2\u008b\u008d\5\6\4\2\u008c\u0086\3\2\2\2\u008c\u0089\3\2\2\2\u008d"+
+ "\u0090\3\2\2\2\u008e\u008c\3\2\2\2\u008e\u008f\3\2\2\2\u008f\27\3\2\2"+
+ "\2\u0090\u008e\3\2\2\2\u0091\u0092\7\36\2\2\u0092\u0093\5\26\f\2\u0093"+
+ "\u0094\7\37\2\2\u0094\u0098\3\2\2\2\u0095\u0096\7\36\2\2\u0096\u0098\7"+
+ "\37\2\2\u0097\u0091\3\2\2\2\u0097\u0095\3\2\2\2\u0098\31\3\2\2\2\u0099"+
+ "\u009a\b\16\1\2\u009a\u009b\5&\24\2\u009b\u009c\7\23\2\2\u009c\u009d\5"+
+ "\4\3\2\u009d\u00a6\3\2\2\2\u009e\u009f\f\3\2\2\u009f\u00a0\7\5\2\2\u00a0"+
+ "\u00a1\5&\24\2\u00a1\u00a2\7\23\2\2\u00a2\u00a3\5\4\3\2\u00a3\u00a5\3"+
+ "\2\2\2\u00a4\u009e\3\2\2\2\u00a5\u00a8\3\2\2\2\u00a6\u00a4\3\2\2\2\u00a6"+
+ "\u00a7\3\2\2\2\u00a7\33\3\2\2\2\u00a8\u00a6\3\2\2\2\u00a9\u00aa\7\34\2"+
+ "\2\u00aa\u00ab\5\32\16\2\u00ab\u00ac\7\35\2\2\u00ac\u00b0\3\2\2\2\u00ad"+
+ "\u00ae\7\34\2\2\u00ae\u00b0\7\35\2\2\u00af\u00a9\3\2\2\2\u00af\u00ad\3"+
+ "\2\2\2\u00b0\35\3\2\2\2\u00b1\u00b2\b\20\1\2\u00b2\u00b3\5 \21\2\u00b3"+
+ "\u00bc\3\2\2\2\u00b4\u00b5\f\4\2\2\u00b5\u00b6\7\31\2\2\u00b6\u00bb\5"+
+ " \21\2\u00b7\u00b8\f\3\2\2\u00b8\u00b9\7\30\2\2\u00b9\u00bb\5 \21\2\u00ba"+
+ "\u00b4\3\2\2\2\u00ba\u00b7\3\2\2\2\u00bb\u00be\3\2\2\2\u00bc\u00ba\3\2"+
+ "\2\2\u00bc\u00bd\3\2\2\2\u00bd\37\3\2\2\2\u00be\u00bc\3\2\2\2\u00bf\u00c0"+
+ "\b\21\1\2\u00c0\u00c1\5$\23\2\u00c1\u00ca\3\2\2\2\u00c2\u00c3\f\4\2\2"+
+ "\u00c3\u00c4\7\33\2\2\u00c4\u00c9\5 \21\5\u00c5\u00c6\f\3\2\2\u00c6\u00c7"+
+ "\7\32\2\2\u00c7\u00c9\5 \21\4\u00c8\u00c2\3\2\2\2\u00c8\u00c5\3\2\2\2"+
+ "\u00c9\u00cc\3\2\2\2\u00ca\u00c8\3\2\2\2\u00ca\u00cb\3\2\2\2\u00cb!\3"+
+ "\2\2\2\u00cc\u00ca\3\2\2\2\u00cd\u00ce\7*\2\2\u00ce\u00cf\5\24\13\2\u00cf"+
+ "#\3\2\2\2\u00d0\u00df\5\"\22\2\u00d1\u00df\7\'\2\2\u00d2\u00df\7&\2\2"+
+ "\u00d3\u00df\7)\2\2\u00d4\u00df\7(\2\2\u00d5\u00df\7*\2\2\u00d6\u00d7"+
+ "\7 \2\2\u00d7\u00d8\5\36\20\2\u00d8\u00d9\7!\2\2\u00d9\u00df\3\2\2\2\u00da"+
+ "\u00db\7 \2\2\u00db\u00dc\5\6\4\2\u00dc\u00dd\7!\2\2\u00dd\u00df\3\2\2"+
+ "\2\u00de\u00d0\3\2\2\2\u00de\u00d1\3\2\2\2\u00de\u00d2\3\2\2\2\u00de\u00d3"+
+ "\3\2\2\2\u00de\u00d4\3\2\2\2\u00de\u00d5\3\2\2\2\u00de\u00d6\3\2\2\2\u00de"+
+ "\u00da\3\2\2\2\u00df%\3\2\2\2\u00e0\u00ef\t\3\2\2\u00e1\u00ef\5\36\20"+
+ "\2\u00e2\u00ef\7+\2\2\u00e3\u00ef\5\30\r\2\u00e4\u00ef\5\34\17\2\u00e5"+
+ "\u00ef\7\27\2\2\u00e6\u00e7\7$\2\2\u00e7\u00e8\7 \2\2\u00e8\u00e9\7*\2"+
+ "\2\u00e9\u00ef\7!\2\2\u00ea\u00eb\7 \2\2\u00eb\u00ec\5\6\4\2\u00ec\u00ed"+
+ "\7!\2\2\u00ed\u00ef\3\2\2\2\u00ee\u00e0\3\2\2\2\u00ee\u00e1\3\2\2\2\u00ee"+
+ "\u00e2\3\2\2\2\u00ee\u00e3\3\2\2\2\u00ee\u00e4\3\2\2\2\u00ee\u00e5\3\2"+
+ "\2\2\u00ee\u00e6\3\2\2\2\u00ee\u00ea\3\2\2\2\u00ef\'\3\2\2\2\26\65DOS"+
+ "]jr\177\u0084\u008c\u008e\u0097\u00a6\u00af\u00ba\u00bc\u00c8\u00ca\u00de"+
+ "\u00ee";
public static final ATN _ATN =
new ATNDeserializer().deserialize(_serializedATN.toCharArray());
static {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8340c0e2/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/StellarTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/StellarTest.java b/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/StellarTest.java
index 29df491..dabf293 100644
--- a/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/StellarTest.java
+++ b/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/StellarTest.java
@@ -41,6 +41,7 @@ import static org.apache.metron.common.dsl.functions.resolver.ClasspathFunctionR
import static org.apache.metron.common.utils.StellarProcessorUtils.run;
import static org.apache.metron.common.utils.StellarProcessorUtils.runPredicate;
+@SuppressWarnings("ALL")
public class StellarTest {
@Test
@@ -192,7 +193,14 @@ public class StellarTest {
String query = "if 1 + 1 < 2 then 'one' else 'two'";
Assert.assertEquals("two", run(query, new HashMap<>()));
}
-
+ {
+ String query = "if 1 + 1 <= 2 AND 1 + 2 in [3] then 'one' else 'two'";
+ Assert.assertEquals("one", run(query, new HashMap<>()));
+ }
+ {
+ String query = "if 1 + 1 <= 2 AND (1 + 2 in [3]) then 'one' else 'two'";
+ Assert.assertEquals("one", run(query, new HashMap<>()));
+ }
{
String query = "if not(1 < 2) then 'one' else 'two'";
Assert.assertEquals("two", run(query, new HashMap<>()));
@@ -210,6 +218,34 @@ public class StellarTest {
Assert.assertEquals("two", run(query, ImmutableMap.of("one", 1, "very_nearly_one", 1.0000001)));
}
{
+ String query = "if one == very_nearly_one OR one == very_nearly_one then 'one' else 'two'";
+ Assert.assertEquals("two", run(query, ImmutableMap.of("one", 1, "very_nearly_one", 1.0000001)));
+ }
+ {
+ String query = "if one == very_nearly_one OR one != very_nearly_one then 'one' else 'two'";
+ Assert.assertEquals("one", run(query, ImmutableMap.of("one", 1, "very_nearly_one", 1.0000001)));
+ }
+ {
+ String query = "if one != very_nearly_one OR one == very_nearly_one then 'one' else 'two'";
+ Assert.assertEquals("one", run(query, ImmutableMap.of("one", 1, "very_nearly_one", 1.0000001)));
+ }
+ {
+ String query = "if 'foo' in ['foo'] OR one == very_nearly_one then 'one' else 'two'";
+ Assert.assertEquals("one", run(query, ImmutableMap.of("one", 1, "very_nearly_one", 1.0000001)));
+ }
+ {
+ String query = "if ('foo' in ['foo']) OR one == very_nearly_one then 'one' else 'two'";
+ Assert.assertEquals("one", run(query, ImmutableMap.of("one", 1, "very_nearly_one", 1.0000001)));
+ }
+ {
+ String query = "if not('foo' in ['foo']) OR one == very_nearly_one then 'one' else 'two'";
+ Assert.assertEquals("two", run(query, ImmutableMap.of("one", 1, "very_nearly_one", 1.0000001)));
+ }
+ {
+ String query = "if not('foo' in ['foo'] OR one == very_nearly_one) then 'one' else 'two'";
+ Assert.assertEquals("two", run(query, ImmutableMap.of("one", 1, "very_nearly_one", 1.0000001)));
+ }
+ {
String query = "1 < 2 ? 'one' : 'two'";
Assert.assertEquals("one", run(query, new HashMap<>()));
}
@@ -225,6 +261,30 @@ public class StellarTest {
String query = "1 < 2 ? one*3 : 'two'";
Assert.assertTrue(Math.abs(3 - (int) run(query, ImmutableMap.of("one", 1))) < 1e-6);
}
+ {
+ String query = "1 < 2 AND 1 < 2 ? one*3 : 'two'";
+ Assert.assertTrue(Math.abs(3 - (int) run(query, ImmutableMap.of("one", 1))) < 1e-6);
+ }
+ {
+ String query = "1 < 2 AND 1 > 2 ? one*3 : 'two'";
+ Assert.assertEquals("two", run(query, ImmutableMap.of("one", 1)));
+ }
+ {
+ String query = "1 > 2 AND 1 < 2 ? one*3 : 'two'";
+ Assert.assertEquals("two", run(query, ImmutableMap.of("one", 1)));
+ }
+ {
+ String query = "1 < 2 AND 'foo' in ['', 'foo'] ? one*3 : 'two'";
+ Assert.assertEquals(3, run(query, ImmutableMap.of("one", 1)));
+ }
+ {
+ String query = "1 < 2 AND ('foo' in ['', 'foo']) ? one*3 : 'two'";
+ Assert.assertEquals(3, run(query, ImmutableMap.of("one", 1)));
+ }
+ {
+ String query = "'foo' in ['', 'foo'] ? one*3 : 'two'";
+ Assert.assertEquals(3, run(query, ImmutableMap.of("one", 1)));
+ }
}
@Test
@@ -457,6 +517,26 @@ public class StellarTest {
}
@Test
+ public void inNestedInStatement() throws Exception {
+ final Map<String, String> variableMap = new HashMap<>();
+
+ Assert.assertTrue(runPredicate("('grok' not in 'foobar') == true", variableMap::get));
+ Assert.assertTrue(runPredicate("'grok' not in ('foobar' == true)", variableMap::get));
+ Assert.assertFalse(runPredicate("'grok' in 'grokbar' == true", variableMap::get));
+ Assert.assertTrue(runPredicate("false in 'grokbar' == true", variableMap::get));
+
+ Assert.assertTrue(runPredicate("('foo' in 'foobar') == true", variableMap::get));
+ Assert.assertFalse(runPredicate("'foo' in ('foobar' == true)", variableMap::get));
+ Assert.assertTrue(runPredicate("'grok' not in 'grokbar' == true", variableMap::get));
+ Assert.assertTrue(runPredicate("false in 'grokbar' == true", variableMap::get));
+ Assert.assertTrue(runPredicate("'foo' in ['foo'] AND 'bar' in ['bar']", variableMap::get));
+ Assert.assertTrue(runPredicate("('foo' in ['foo']) AND 'bar' in ['bar']", variableMap::get));
+ Assert.assertTrue(runPredicate("'foo' in ['foo'] AND ('bar' in ['bar'])", variableMap::get));
+ Assert.assertTrue(runPredicate("('foo' in ['foo']) AND ('bar' in ['bar'])", variableMap::get));
+ Assert.assertTrue(runPredicate("('foo' in ['foo'] AND 'bar' in ['bar'])", variableMap::get));
+ }
+
+ @Test
public void testExists() throws Exception {
final Map<String, String> variableMap = new HashMap<String, String>() {{
put("foo", "casey");
@@ -494,6 +574,8 @@ public class StellarTest {
}};
Assert.assertTrue(runPredicate("IN_SUBNET(ip, '192.168.0.0/24')", v -> variableMap.get(v)));
Assert.assertTrue(runPredicate("IN_SUBNET(ip, '192.168.0.0/24', '11.0.0.0/24')", v -> variableMap.get(v)));
+ Assert.assertTrue(runPredicate("IN_SUBNET(ip, '192.168.0.0/24', '11.0.0.0/24') in [true]", v -> variableMap.get(v)));
+ Assert.assertTrue(runPredicate("true in IN_SUBNET(ip, '192.168.0.0/24', '11.0.0.0/24')", v -> variableMap.get(v)));
Assert.assertFalse(runPredicate("IN_SUBNET(ip_dst_addr, '192.168.0.0/24', '11.0.0.0/24')", v -> variableMap.get(v)));
Assert.assertFalse(runPredicate("IN_SUBNET(other_ip, '192.168.0.0/24')", v -> variableMap.get(v)));
Assert.assertFalse(runPredicate("IN_SUBNET(blah, '192.168.0.0/24')", v -> variableMap.get(v)));
[2/2] incubator-metron git commit: METRON-658: Updated Grammar to
Handle More Uses of in/not in Expressions closes apache/incubator-metron#430
Posted by ce...@apache.org.
METRON-658: Updated Grammar to Handle More Uses of in/not in Expressions closes apache/incubator-metron#430
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/8340c0e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/8340c0e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/8340c0e2
Branch: refs/heads/master
Commit: 8340c0e25d04f13c2ded2cb37159d9644d00ccff
Parents: fd77ec3
Author: JJ <jj...@gmail.com>
Authored: Fri Feb 3 11:01:23 2017 -0500
Committer: cstella <ce...@gmail.com>
Committed: Fri Feb 3 11:01:23 2017 -0500
----------------------------------------------------------------------
.../metron/common/stellar/generated/Stellar.g4 | 190 ++--
.../metron/common/stellar/StellarCompiler.java | 49 +-
.../stellar/generated/StellarBaseListener.java | 74 +-
.../common/stellar/generated/StellarLexer.java | 316 ++---
.../stellar/generated/StellarListener.java | 144 ++-
.../common/stellar/generated/StellarParser.java | 1075 ++++++++++--------
.../metron/common/stellar/StellarTest.java | 84 +-
7 files changed, 1080 insertions(+), 852 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8340c0e2/metron-platform/metron-common/src/main/antlr4/org/apache/metron/common/stellar/generated/Stellar.g4
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/antlr4/org/apache/metron/common/stellar/generated/Stellar.g4 b/metron-platform/metron-common/src/main/antlr4/org/apache/metron/common/stellar/generated/Stellar.g4
index 98af17f..3005323 100644
--- a/metron-platform/metron-common/src/main/antlr4/org/apache/metron/common/stellar/generated/Stellar.g4
+++ b/metron-platform/metron-common/src/main/antlr4/org/apache/metron/common/stellar/generated/Stellar.g4
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -20,7 +20,7 @@ grammar Stellar;
@header {
//CHECKSTYLE:OFF
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -45,7 +45,6 @@ DOUBLE_QUOTE : '"';
SINGLE_QUOTE : '\'';
COMMA : ',';
PERIOD : '.';
-fragment EOL : '\n';
AND : 'and' | '&&' | 'AND';
OR : 'or' | '||' | 'OR';
@@ -90,13 +89,13 @@ DOUBLE_LITERAL :
| INT_LITERAL EXPONENT D?
| INT_LITERAL EXPONENT? D
;
-FLOAT_LITERAL :
+FLOAT_LITERAL :
INT_LITERAL PERIOD DIGIT* EXPONENT? F
| MINUS? PERIOD DIGIT+ EXPONENT? F
| INT_LITERAL EXPONENT? F
;
-LONG_LITERAL : INT_LITERAL L ;
-IDENTIFIER : [a-zA-Z_][a-zA-Z_\.:0-9]* ;
+LONG_LITERAL : INT_LITERAL L;
+IDENTIFIER : [a-zA-Z_][a-zA-Z_\.:0-9]*;
STRING_LITERAL :
DOUBLE_QUOTE SCHAR* DOUBLE_QUOTE
@@ -106,9 +105,9 @@ STRING_LITERAL :
// COMMENT and WS are stripped from the output token stream by sending
// to a different channel 'skip'
-COMMENT : '//' .+? (EOL|EOF) -> skip ;
+COMMENT : '//' .+? (EOL|EOF) -> skip;
-WS : [ \r\t\u000C\n]+ -> skip ;
+WS : [ \r\t\u000C\n]+ -> skip;
fragment ZERO: '0';
fragment FIRST_DIGIT: '1'..'9';
@@ -118,7 +117,7 @@ fragment D: ('d'|'D');
fragment E: ('e'|'E');
fragment F: ('f'|'F');
fragment L: ('l'|'L');
-
+fragment EOL : '\n';
/* Parser rules */
@@ -126,76 +125,105 @@ transformation : transformation_expr EOF;
transformation_expr:
conditional_expr #ConditionalExpr
- | LPAREN transformation_expr RPAREN #TransformationExpr
- | arithmetic_expr # ArithExpression
+ | LPAREN transformation_expr RPAREN #TransformationExpr
+ | arithmetic_expr # ArithExpression
| transformation_entity #TransformationEntity
- | comparison_expr # ComparisonExpression
- ;
-conditional_expr : comparison_expr QUESTION transformation_expr COLON transformation_expr #TernaryFuncWithoutIf
- | IF comparison_expr THEN transformation_expr ELSE transformation_expr #TernaryFuncWithIf
- ;
-
-comparison_expr : identifier_operand comp_operator identifier_operand # ComparisonExpressionWithOperator
- | identifier_operand IN identifier_operand #InExpression
- | identifier_operand NIN identifier_operand #NInExpression
- | comparison_expr AND comparison_expr #LogicalExpressionAnd
- | comparison_expr OR comparison_expr #LogicalExpressionOr
- | NOT LPAREN comparison_expr RPAREN #NotFunc
- | LPAREN comparison_expr RPAREN # ComparisonExpressionParens
- | identifier_operand #operand
- ;
-transformation_entity : identifier_operand
- ;
-comp_operator : (EQ | NEQ | LT | LTE | GT | GTE) # ComparisonOp
- ;
-arith_operator_addition : (PLUS | MINUS) # ArithOp_plus
- ;
-arith_operator_mul : (MUL | DIV) # ArithOp_mul
- ;
-func_args : LPAREN op_list RPAREN
- | LPAREN RPAREN
- ;
-op_list : identifier_operand
- | op_list COMMA identifier_operand
- | conditional_expr
- | op_list COMMA conditional_expr
- ;
-list_entity : LBRACKET op_list RBRACKET
- | LBRACKET RBRACKET;
-
-kv_list : identifier_operand COLON transformation_expr
- | kv_list COMMA identifier_operand COLON transformation_expr
- ;
-
-map_entity : LBRACE kv_list RBRACE
- | LBRACE RBRACE;
-
-arithmetic_expr: arithmetic_expr_mul #ArithExpr_solo
- | arithmetic_expr PLUS arithmetic_expr_mul #ArithExpr_plus
- | arithmetic_expr MINUS arithmetic_expr_mul #ArithExpr_minus
- ;
-arithmetic_expr_mul : arithmetic_operands #ArithExpr_mul_solo
- | arithmetic_expr_mul MUL arithmetic_expr_mul #ArithExpr_mul
- | arithmetic_expr_mul DIV arithmetic_expr_mul #ArithExpr_div
- ;
-
-functions : IDENTIFIER func_args #TransformationFunc
- ;
-arithmetic_operands : functions #NumericFunctions
- | DOUBLE_LITERAL #DoubleLiteral
- | INT_LITERAL #IntLiteral
- | LONG_LITERAL #LongLiteral
- | FLOAT_LITERAL #FloatLiteral
- | IDENTIFIER #Variable
- | LPAREN arithmetic_expr RPAREN #ParenArith
- | LPAREN conditional_expr RPAREN#condExpr
- ;
-identifier_operand : (TRUE | FALSE) # LogicalConst
- | arithmetic_expr #ArithmeticOperands
- | STRING_LITERAL # StringLiteral
- | list_entity #List
- | map_entity #MapConst
- | NULL #NullConst
- | EXISTS LPAREN IDENTIFIER RPAREN #ExistsFunc
- | LPAREN conditional_expr RPAREN#condExpr_paren
- ;
+ | comparison_expr # ComparisonExpression
+ | logical_expr #LogicalExpression
+ | in_expr #InExpression
+ ;
+
+conditional_expr :
+ logical_expr QUESTION transformation_expr COLON transformation_expr #TernaryFuncWithoutIf
+ | IF logical_expr THEN transformation_expr ELSE transformation_expr #TernaryFuncWithIf
+ ;
+
+logical_expr:
+ b_expr AND logical_expr #LogicalExpressionAnd
+ | b_expr OR logical_expr #LogicalExpressionOr
+ | b_expr #BoleanExpression
+ ;
+
+b_expr:
+ comparison_expr
+ | in_expr
+ ;
+
+in_expr:
+ identifier_operand IN b_expr #InExpressionStatement
+ | identifier_operand NIN b_expr #NInExpressionStatement
+ ;
+
+comparison_expr :
+ comparison_expr comp_operator comparison_expr #ComparisonExpressionWithOperator
+ | NOT LPAREN logical_expr RPAREN #NotFunc
+ | LPAREN logical_expr RPAREN #ComparisonExpressionParens
+ | identifier_operand #operand
+ ;
+
+transformation_entity : identifier_operand;
+
+comp_operator : (EQ | NEQ | LT | LTE | GT | GTE) # ComparisonOp;
+
+func_args :
+ LPAREN op_list RPAREN
+ | LPAREN RPAREN
+ ;
+
+op_list :
+ identifier_operand
+ | op_list COMMA identifier_operand
+ | conditional_expr
+ | op_list COMMA conditional_expr
+ ;
+
+list_entity :
+ LBRACKET op_list RBRACKET
+ | LBRACKET RBRACKET
+ ;
+
+kv_list :
+ identifier_operand COLON transformation_expr
+ | kv_list COMMA identifier_operand COLON transformation_expr
+ ;
+
+map_entity :
+ LBRACE kv_list RBRACE
+ | LBRACE RBRACE
+ ;
+
+arithmetic_expr:
+ arithmetic_expr_mul #ArithExpr_solo
+ | arithmetic_expr PLUS arithmetic_expr_mul #ArithExpr_plus
+ | arithmetic_expr MINUS arithmetic_expr_mul #ArithExpr_minus
+ ;
+
+arithmetic_expr_mul :
+ arithmetic_operands #ArithExpr_mul_solo
+ | arithmetic_expr_mul MUL arithmetic_expr_mul #ArithExpr_mul
+ | arithmetic_expr_mul DIV arithmetic_expr_mul #ArithExpr_div
+ ;
+
+functions : IDENTIFIER func_args #TransformationFunc;
+
+arithmetic_operands :
+ functions #NumericFunctions
+ | DOUBLE_LITERAL #DoubleLiteral
+ | INT_LITERAL #IntLiteral
+ | LONG_LITERAL #LongLiteral
+ | FLOAT_LITERAL #FloatLiteral
+ | IDENTIFIER #Variable
+ | LPAREN arithmetic_expr RPAREN #ParenArith
+ | LPAREN conditional_expr RPAREN #condExpr
+ ;
+
+identifier_operand :
+ (TRUE | FALSE) #LogicalConst
+ | arithmetic_expr #ArithmeticOperands
+ | STRING_LITERAL # StringLiteral
+ | list_entity #List
+ | map_entity #MapConst
+ | NULL #NullConst
+ | EXISTS LPAREN IDENTIFIER RPAREN #ExistsFunc
+ | LPAREN conditional_expr RPAREN #condExpr_paren
+ ;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8340c0e2/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/StellarCompiler.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/StellarCompiler.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/StellarCompiler.java
index 4822b31..4af299e 100644
--- a/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/StellarCompiler.java
+++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/StellarCompiler.java
@@ -57,20 +57,20 @@ public class StellarCompiler extends StellarBaseListener {
private final NumberLiteralEvaluator numberLiteralEvaluator;
private final ComparisonExpressionWithOperatorEvaluator comparisonExpressionWithOperatorEvaluator;
- public StellarCompiler(VariableResolver variableResolver,
- FunctionResolver functionResolver,
- Context context,
- Stack<Token<?>> tokenStack,
- ArithmeticEvaluator arithmeticEvaluator,
- NumberLiteralEvaluator numberLiteralEvaluator,
- ComparisonExpressionWithOperatorEvaluator comparisonExpressionWithOperatorEvaluator) {
+ public StellarCompiler(final VariableResolver variableResolver,
+ final FunctionResolver functionResolver,
+ final Context context,
+ final Stack<Token<?>> tokenStack,
+ final ArithmeticEvaluator arithmeticEvaluator,
+ final NumberLiteralEvaluator numberLiteralEvaluator,
+ final ComparisonExpressionWithOperatorEvaluator comparisonExpressionWithOperatorEvaluator) {
this.variableResolver = variableResolver;
this.functionResolver = functionResolver;
this.context = context;
this.tokenStack = tokenStack;
this.arithmeticEvaluator = arithmeticEvaluator;
this.numberLiteralEvaluator = numberLiteralEvaluator;
- this. comparisonExpressionWithOperatorEvaluator = comparisonExpressionWithOperatorEvaluator;
+ this.comparisonExpressionWithOperatorEvaluator = comparisonExpressionWithOperatorEvaluator;
}
@Override
@@ -78,22 +78,22 @@ public class StellarCompiler extends StellarBaseListener {
tokenStack.clear();
}
- private boolean handleIn(Token<?> left, Token<?> right) {
+ private boolean handleIn(final Token<?> left, final Token<?> right) {
Object key = right.getValue();
if (left.getValue() != null) {
- if(left.getValue() instanceof String && key instanceof String) {
- return ((String)left.getValue()).contains(key.toString());
+ if (left.getValue() instanceof String && key instanceof String) {
+ return ((String) left.getValue()).contains(key.toString());
}
- else if(left.getValue() instanceof Collection) {
- return ((Collection)left.getValue()).contains(key);
+ else if (left.getValue() instanceof Collection) {
+ return ((Collection) left.getValue()).contains(key);
}
- else if(left.getValue() instanceof Map) {
- return ((Map)left.getValue()).containsKey(key);
+ else if (left.getValue() instanceof Map) {
+ return ((Map) left.getValue()).containsKey(key);
}
else {
- if(key == null) {
+ if (key == null) {
return key == left.getValue();
}
else {
@@ -145,7 +145,7 @@ public class StellarCompiler extends StellarBaseListener {
Token<?> elseExpr = popStack();
Token<?> thenExpr = popStack();
Token<?> ifExpr = popStack();
- boolean b = ((Token<Boolean>) ifExpr).getValue();
+ @SuppressWarnings("unchecked") boolean b = ((Token<Boolean>) ifExpr).getValue();
if (b) {
tokenStack.push(thenExpr);
} else {
@@ -164,14 +164,14 @@ public class StellarCompiler extends StellarBaseListener {
}
@Override
- public void exitInExpression(StellarParser.InExpressionContext ctx) {
+ public void exitInExpressionStatement(StellarParser.InExpressionStatementContext ctx) {
Token<?> left = popStack();
Token<?> right = popStack();
tokenStack.push(new Token<>(handleIn(left, right), Boolean.class));
}
@Override
- public void exitNInExpression(StellarParser.NInExpressionContext ctx) {
+ public void exitNInExpressionStatement(StellarParser.NInExpressionStatementContext ctx) {
Token<?> left = popStack();
Token<?> right = popStack();
tokenStack.push(new Token<>(!handleIn(left, right), Boolean.class));
@@ -230,7 +230,7 @@ public class StellarCompiler extends StellarBaseListener {
@Override
public void exitLogicalConst(StellarParser.LogicalConstContext ctx) {
- Boolean b = null;
+ Boolean b;
switch (ctx.getText().toUpperCase()) {
case "TRUE":
b = true;
@@ -244,7 +244,7 @@ public class StellarCompiler extends StellarBaseListener {
tokenStack.push(new Token<>(b, Boolean.class));
}
- private boolean booleanOp(Token<?> left, Token<?> right, BooleanOp op, String opName) {
+ private boolean booleanOp(final Token<?> left, final Token<?> right, final BooleanOp op, final String opName) {
Boolean l = ConversionUtils.convert(left.getValue(), Boolean.class);
Boolean r = ConversionUtils.convert(right.getValue(), Boolean.class);
if (l == null || r == null) {
@@ -277,7 +277,8 @@ public class StellarCompiler extends StellarBaseListener {
* @param token The token containing the function arguments.
* @return
*/
- private List<Object> getFunctionArguments(Token<?> token) {
+ @SuppressWarnings("unchecked")
+ private List<Object> getFunctionArguments(final Token<?> token) {
if (token.getUnderlyingType().equals(List.class)) {
return (List<Object>) token.getValue();
@@ -404,8 +405,8 @@ public class StellarCompiler extends StellarBaseListener {
}
public Object getResult() throws ParseException {
- if(actualException != null) {
- throw new ParseException("Unable to execute: " +actualException.getMessage(), actualException);
+ if (actualException != null) {
+ throw new ParseException("Unable to execute: " + actualException.getMessage(), actualException);
}
if (tokenStack.empty()) {
throw new ParseException("Invalid predicate: Empty stack.");
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8340c0e2/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarBaseListener.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarBaseListener.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarBaseListener.java
index e0a8770..c13930d 100644
--- a/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarBaseListener.java
+++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarBaseListener.java
@@ -2,7 +2,7 @@
package org.apache.metron.common.stellar.generated;
//CHECKSTYLE:OFF
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -109,6 +109,30 @@ public class StellarBaseListener implements StellarListener {
*
* <p>The default implementation does nothing.</p>
*/
+ @Override public void enterLogicalExpression(StellarParser.LogicalExpressionContext ctx) { }
+ /**
+ * {@inheritDoc}
+ *
+ * <p>The default implementation does nothing.</p>
+ */
+ @Override public void exitLogicalExpression(StellarParser.LogicalExpressionContext ctx) { }
+ /**
+ * {@inheritDoc}
+ *
+ * <p>The default implementation does nothing.</p>
+ */
+ @Override public void enterInExpression(StellarParser.InExpressionContext ctx) { }
+ /**
+ * {@inheritDoc}
+ *
+ * <p>The default implementation does nothing.</p>
+ */
+ @Override public void exitInExpression(StellarParser.InExpressionContext ctx) { }
+ /**
+ * {@inheritDoc}
+ *
+ * <p>The default implementation does nothing.</p>
+ */
@Override public void enterTernaryFuncWithoutIf(StellarParser.TernaryFuncWithoutIfContext ctx) { }
/**
* {@inheritDoc}
@@ -133,145 +157,145 @@ public class StellarBaseListener implements StellarListener {
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void enterNotFunc(StellarParser.NotFuncContext ctx) { }
+ @Override public void enterLogicalExpressionAnd(StellarParser.LogicalExpressionAndContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void exitNotFunc(StellarParser.NotFuncContext ctx) { }
+ @Override public void exitLogicalExpressionAnd(StellarParser.LogicalExpressionAndContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void enterComparisonExpressionParens(StellarParser.ComparisonExpressionParensContext ctx) { }
+ @Override public void enterLogicalExpressionOr(StellarParser.LogicalExpressionOrContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void exitComparisonExpressionParens(StellarParser.ComparisonExpressionParensContext ctx) { }
+ @Override public void exitLogicalExpressionOr(StellarParser.LogicalExpressionOrContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void enterInExpression(StellarParser.InExpressionContext ctx) { }
+ @Override public void enterBoleanExpression(StellarParser.BoleanExpressionContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void exitInExpression(StellarParser.InExpressionContext ctx) { }
+ @Override public void exitBoleanExpression(StellarParser.BoleanExpressionContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void enterComparisonExpressionWithOperator(StellarParser.ComparisonExpressionWithOperatorContext ctx) { }
+ @Override public void enterB_expr(StellarParser.B_exprContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void exitComparisonExpressionWithOperator(StellarParser.ComparisonExpressionWithOperatorContext ctx) { }
+ @Override public void exitB_expr(StellarParser.B_exprContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void enterLogicalExpressionAnd(StellarParser.LogicalExpressionAndContext ctx) { }
+ @Override public void enterInExpressionStatement(StellarParser.InExpressionStatementContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void exitLogicalExpressionAnd(StellarParser.LogicalExpressionAndContext ctx) { }
+ @Override public void exitInExpressionStatement(StellarParser.InExpressionStatementContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void enterNInExpression(StellarParser.NInExpressionContext ctx) { }
+ @Override public void enterNInExpressionStatement(StellarParser.NInExpressionStatementContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void exitNInExpression(StellarParser.NInExpressionContext ctx) { }
+ @Override public void exitNInExpressionStatement(StellarParser.NInExpressionStatementContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void enterLogicalExpressionOr(StellarParser.LogicalExpressionOrContext ctx) { }
+ @Override public void enterNotFunc(StellarParser.NotFuncContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void exitLogicalExpressionOr(StellarParser.LogicalExpressionOrContext ctx) { }
+ @Override public void exitNotFunc(StellarParser.NotFuncContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void enterOperand(StellarParser.OperandContext ctx) { }
+ @Override public void enterComparisonExpressionParens(StellarParser.ComparisonExpressionParensContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void exitOperand(StellarParser.OperandContext ctx) { }
+ @Override public void exitComparisonExpressionParens(StellarParser.ComparisonExpressionParensContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void enterTransformation_entity(StellarParser.Transformation_entityContext ctx) { }
+ @Override public void enterComparisonExpressionWithOperator(StellarParser.ComparisonExpressionWithOperatorContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void exitTransformation_entity(StellarParser.Transformation_entityContext ctx) { }
+ @Override public void exitComparisonExpressionWithOperator(StellarParser.ComparisonExpressionWithOperatorContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void enterComparisonOp(StellarParser.ComparisonOpContext ctx) { }
+ @Override public void enterOperand(StellarParser.OperandContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void exitComparisonOp(StellarParser.ComparisonOpContext ctx) { }
+ @Override public void exitOperand(StellarParser.OperandContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void enterArithOp_plus(StellarParser.ArithOp_plusContext ctx) { }
+ @Override public void enterTransformation_entity(StellarParser.Transformation_entityContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void exitArithOp_plus(StellarParser.ArithOp_plusContext ctx) { }
+ @Override public void exitTransformation_entity(StellarParser.Transformation_entityContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void enterArithOp_mul(StellarParser.ArithOp_mulContext ctx) { }
+ @Override public void enterComparisonOp(StellarParser.ComparisonOpContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
- @Override public void exitArithOp_mul(StellarParser.ArithOp_mulContext ctx) { }
+ @Override public void exitComparisonOp(StellarParser.ComparisonOpContext ctx) { }
/**
* {@inheritDoc}
*
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8340c0e2/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarLexer.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarLexer.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarLexer.java
index 83e6434..ff2e9cb 100644
--- a/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarLexer.java
+++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarLexer.java
@@ -2,7 +2,7 @@
package org.apache.metron.common.stellar.generated;
//CHECKSTYLE:OFF
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -49,13 +49,13 @@ public class StellarLexer extends Lexer {
};
public static final String[] ruleNames = {
- "DOUBLE_QUOTE", "SINGLE_QUOTE", "COMMA", "PERIOD", "EOL", "AND", "OR",
- "NOT", "TRUE", "FALSE", "EQ", "NEQ", "LT", "LTE", "GT", "GTE", "QUESTION",
- "COLON", "IF", "THEN", "ELSE", "NULL", "MINUS", "PLUS", "DIV", "MUL",
- "LBRACE", "RBRACE", "LBRACKET", "RBRACKET", "LPAREN", "RPAREN", "IN",
- "NIN", "EXISTS", "EXPONENT", "INT_LITERAL", "DOUBLE_LITERAL", "FLOAT_LITERAL",
- "LONG_LITERAL", "IDENTIFIER", "STRING_LITERAL", "COMMENT", "WS", "ZERO",
- "FIRST_DIGIT", "DIGIT", "SCHAR", "D", "E", "F", "L"
+ "DOUBLE_QUOTE", "SINGLE_QUOTE", "COMMA", "PERIOD", "AND", "OR", "NOT",
+ "TRUE", "FALSE", "EQ", "NEQ", "LT", "LTE", "GT", "GTE", "QUESTION", "COLON",
+ "IF", "THEN", "ELSE", "NULL", "MINUS", "PLUS", "DIV", "MUL", "LBRACE",
+ "RBRACE", "LBRACKET", "RBRACKET", "LPAREN", "RPAREN", "IN", "NIN", "EXISTS",
+ "EXPONENT", "INT_LITERAL", "DOUBLE_LITERAL", "FLOAT_LITERAL", "LONG_LITERAL",
+ "IDENTIFIER", "STRING_LITERAL", "COMMENT", "WS", "ZERO", "FIRST_DIGIT",
+ "DIGIT", "SCHAR", "D", "E", "F", "L", "EOL"
};
private static final String[] _LITERAL_NAMES = {
@@ -133,156 +133,156 @@ public class StellarLexer extends Lexer {
"\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"+
"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"+
",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t"+
- "\64\4\65\t\65\3\2\3\2\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\7\3\7\3\7\3\7"+
- "\3\7\3\7\3\7\3\7\5\7~\n\7\3\b\3\b\3\b\3\b\3\b\3\b\5\b\u0086\n\b\3\t\3"+
- "\t\3\t\3\t\3\t\3\t\5\t\u008e\n\t\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\5\n\u0098"+
- "\n\n\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\5\13\u00a4\n\13"+
- "\3\f\3\f\3\f\3\r\3\r\3\r\3\16\3\16\3\17\3\17\3\17\3\20\3\20\3\21\3\21"+
- "\3\21\3\22\3\22\3\23\3\23\3\24\3\24\3\24\3\24\5\24\u00be\n\24\3\25\3\25"+
- "\3\25\3\25\3\25\3\25\3\25\3\25\5\25\u00c8\n\25\3\26\3\26\3\26\3\26\3\26"+
- "\3\26\3\26\3\26\5\26\u00d2\n\26\3\27\3\27\3\27\3\27\3\27\3\27\3\27\3\27"+
- "\5\27\u00dc\n\27\3\30\3\30\3\31\3\31\3\32\3\32\3\33\3\33\3\34\3\34\3\35"+
- "\3\35\3\36\3\36\3\37\3\37\3 \3 \3!\3!\3\"\3\"\3\"\3\"\5\"\u00f6\n\"\3"+
- "#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\3#\5#\u0104\n#\3$\3$\3$\3$\3$\3$\3$\3"+
- "$\3$\3$\3$\3$\5$\u0112\n$\3%\3%\3%\5%\u0117\n%\3%\6%\u011a\n%\r%\16%\u011b"+
- "\3&\5&\u011f\n&\3&\3&\5&\u0123\n&\3&\3&\7&\u0127\n&\f&\16&\u012a\13&\5"+
- "&\u012c\n&\3\'\3\'\3\'\7\'\u0131\n\'\f\'\16\'\u0134\13\'\3\'\5\'\u0137"+
- "\n\'\3\'\5\'\u013a\n\'\3\'\3\'\6\'\u013e\n\'\r\'\16\'\u013f\3\'\5\'\u0143"+
- "\n\'\3\'\5\'\u0146\n\'\3\'\3\'\3\'\5\'\u014b\n\'\3\'\3\'\5\'\u014f\n\'"+
- "\3\'\3\'\5\'\u0153\n\'\3(\3(\3(\7(\u0158\n(\f(\16(\u015b\13(\3(\5(\u015e"+
- "\n(\3(\3(\3(\5(\u0163\n(\3(\3(\6(\u0167\n(\r(\16(\u0168\3(\5(\u016c\n"+
- "(\3(\3(\3(\3(\5(\u0172\n(\3(\3(\5(\u0176\n(\3)\3)\3)\3*\3*\7*\u017d\n"+
- "*\f*\16*\u0180\13*\3+\3+\7+\u0184\n+\f+\16+\u0187\13+\3+\3+\3+\3+\7+\u018d"+
- "\n+\f+\16+\u0190\13+\3+\3+\5+\u0194\n+\3,\3,\3,\3,\6,\u019a\n,\r,\16,"+
- "\u019b\3,\3,\5,\u01a0\n,\3,\3,\3-\6-\u01a5\n-\r-\16-\u01a6\3-\3-\3.\3"+
- ".\3/\3/\3\60\3\60\3\61\3\61\3\62\3\62\3\63\3\63\3\64\3\64\3\65\3\65\3"+
- "\u019b\2\66\3\3\5\4\7\5\t\6\13\2\r\7\17\b\21\t\23\n\25\13\27\f\31\r\33"+
- "\16\35\17\37\20!\21#\22%\23\'\24)\25+\26-\27/\30\61\31\63\32\65\33\67"+
- "\349\35;\36=\37? A!C\"E#G$I%K&M\'O(Q)S*U+W,Y-[\2]\2_\2a\2c\2e\2g\2i\2"+
- "\3\2\n\5\2C\\aac|\b\2\60\60\62<C\\^^aac|\5\2\13\f\16\17\"\"\7\2\f\f\17"+
- "\17$$))^^\4\2FFff\4\2GGgg\4\2HHhh\4\2NNnn\u01df\2\3\3\2\2\2\2\5\3\2\2"+
- "\2\2\7\3\2\2\2\2\t\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23"+
- "\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2"+
- "\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2"+
- "\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3"+
- "\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2"+
- "\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2"+
- "\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\3k"+
- "\3\2\2\2\5m\3\2\2\2\7o\3\2\2\2\tq\3\2\2\2\13s\3\2\2\2\r}\3\2\2\2\17\u0085"+
- "\3\2\2\2\21\u008d\3\2\2\2\23\u0097\3\2\2\2\25\u00a3\3\2\2\2\27\u00a5\3"+
- "\2\2\2\31\u00a8\3\2\2\2\33\u00ab\3\2\2\2\35\u00ad\3\2\2\2\37\u00b0\3\2"+
- "\2\2!\u00b2\3\2\2\2#\u00b5\3\2\2\2%\u00b7\3\2\2\2\'\u00bd\3\2\2\2)\u00c7"+
- "\3\2\2\2+\u00d1\3\2\2\2-\u00db\3\2\2\2/\u00dd\3\2\2\2\61\u00df\3\2\2\2"+
- "\63\u00e1\3\2\2\2\65\u00e3\3\2\2\2\67\u00e5\3\2\2\29\u00e7\3\2\2\2;\u00e9"+
- "\3\2\2\2=\u00eb\3\2\2\2?\u00ed\3\2\2\2A\u00ef\3\2\2\2C\u00f5\3\2\2\2E"+
- "\u0103\3\2\2\2G\u0111\3\2\2\2I\u0113\3\2\2\2K\u012b\3\2\2\2M\u0152\3\2"+
- "\2\2O\u0175\3\2\2\2Q\u0177\3\2\2\2S\u017a\3\2\2\2U\u0193\3\2\2\2W\u0195"+
- "\3\2\2\2Y\u01a4\3\2\2\2[\u01aa\3\2\2\2]\u01ac\3\2\2\2_\u01ae\3\2\2\2a"+
- "\u01b0\3\2\2\2c\u01b2\3\2\2\2e\u01b4\3\2\2\2g\u01b6\3\2\2\2i\u01b8\3\2"+
- "\2\2kl\7$\2\2l\4\3\2\2\2mn\7)\2\2n\6\3\2\2\2op\7.\2\2p\b\3\2\2\2qr\7\60"+
- "\2\2r\n\3\2\2\2st\7\f\2\2t\f\3\2\2\2uv\7c\2\2vw\7p\2\2w~\7f\2\2xy\7(\2"+
- "\2y~\7(\2\2z{\7C\2\2{|\7P\2\2|~\7F\2\2}u\3\2\2\2}x\3\2\2\2}z\3\2\2\2~"+
- "\16\3\2\2\2\177\u0080\7q\2\2\u0080\u0086\7t\2\2\u0081\u0082\7~\2\2\u0082"+
- "\u0086\7~\2\2\u0083\u0084\7Q\2\2\u0084\u0086\7T\2\2\u0085\177\3\2\2\2"+
- "\u0085\u0081\3\2\2\2\u0085\u0083\3\2\2\2\u0086\20\3\2\2\2\u0087\u0088"+
- "\7p\2\2\u0088\u0089\7q\2\2\u0089\u008e\7v\2\2\u008a\u008b\7P\2\2\u008b"+
- "\u008c\7Q\2\2\u008c\u008e\7V\2\2\u008d\u0087\3\2\2\2\u008d\u008a\3\2\2"+
- "\2\u008e\22\3\2\2\2\u008f\u0090\7v\2\2\u0090\u0091\7t\2\2\u0091\u0092"+
- "\7w\2\2\u0092\u0098\7g\2\2\u0093\u0094\7V\2\2\u0094\u0095\7T\2\2\u0095"+
- "\u0096\7W\2\2\u0096\u0098\7G\2\2\u0097\u008f\3\2\2\2\u0097\u0093\3\2\2"+
- "\2\u0098\24\3\2\2\2\u0099\u009a\7h\2\2\u009a\u009b\7c\2\2\u009b\u009c"+
- "\7n\2\2\u009c\u009d\7u\2\2\u009d\u00a4\7g\2\2\u009e\u009f\7H\2\2\u009f"+
- "\u00a0\7C\2\2\u00a0\u00a1\7N\2\2\u00a1\u00a2\7U\2\2\u00a2\u00a4\7G\2\2"+
- "\u00a3\u0099\3\2\2\2\u00a3\u009e\3\2\2\2\u00a4\26\3\2\2\2\u00a5\u00a6"+
- "\7?\2\2\u00a6\u00a7\7?\2\2\u00a7\30\3\2\2\2\u00a8\u00a9\7#\2\2\u00a9\u00aa"+
- "\7?\2\2\u00aa\32\3\2\2\2\u00ab\u00ac\7>\2\2\u00ac\34\3\2\2\2\u00ad\u00ae"+
- "\7>\2\2\u00ae\u00af\7?\2\2\u00af\36\3\2\2\2\u00b0\u00b1\7@\2\2\u00b1 "+
- "\3\2\2\2\u00b2\u00b3\7@\2\2\u00b3\u00b4\7?\2\2\u00b4\"\3\2\2\2\u00b5\u00b6"+
- "\7A\2\2\u00b6$\3\2\2\2\u00b7\u00b8\7<\2\2\u00b8&\3\2\2\2\u00b9\u00ba\7"+
- "K\2\2\u00ba\u00be\7H\2\2\u00bb\u00bc\7k\2\2\u00bc\u00be\7h\2\2\u00bd\u00b9"+
- "\3\2\2\2\u00bd\u00bb\3\2\2\2\u00be(\3\2\2\2\u00bf\u00c0\7V\2\2\u00c0\u00c1"+
- "\7J\2\2\u00c1\u00c2\7G\2\2\u00c2\u00c8\7P\2\2\u00c3\u00c4\7v\2\2\u00c4"+
- "\u00c5\7j\2\2\u00c5\u00c6\7g\2\2\u00c6\u00c8\7p\2\2\u00c7\u00bf\3\2\2"+
- "\2\u00c7\u00c3\3\2\2\2\u00c8*\3\2\2\2\u00c9\u00ca\7G\2\2\u00ca\u00cb\7"+
- "N\2\2\u00cb\u00cc\7U\2\2\u00cc\u00d2\7G\2\2\u00cd\u00ce\7g\2\2\u00ce\u00cf"+
- "\7n\2\2\u00cf\u00d0\7u\2\2\u00d0\u00d2\7g\2\2\u00d1\u00c9\3\2\2\2\u00d1"+
- "\u00cd\3\2\2\2\u00d2,\3\2\2\2\u00d3\u00d4\7p\2\2\u00d4\u00d5\7w\2\2\u00d5"+
- "\u00d6\7n\2\2\u00d6\u00dc\7n\2\2\u00d7\u00d8\7P\2\2\u00d8\u00d9\7W\2\2"+
- "\u00d9\u00da\7N\2\2\u00da\u00dc\7N\2\2\u00db\u00d3\3\2\2\2\u00db\u00d7"+
- "\3\2\2\2\u00dc.\3\2\2\2\u00dd\u00de\7/\2\2\u00de\60\3\2\2\2\u00df\u00e0"+
- "\7-\2\2\u00e0\62\3\2\2\2\u00e1\u00e2\7\61\2\2\u00e2\64\3\2\2\2\u00e3\u00e4"+
- "\7,\2\2\u00e4\66\3\2\2\2\u00e5\u00e6\7}\2\2\u00e68\3\2\2\2\u00e7\u00e8"+
- "\7\177\2\2\u00e8:\3\2\2\2\u00e9\u00ea\7]\2\2\u00ea<\3\2\2\2\u00eb\u00ec"+
- "\7_\2\2\u00ec>\3\2\2\2\u00ed\u00ee\7*\2\2\u00ee@\3\2\2\2\u00ef\u00f0\7"+
- "+\2\2\u00f0B\3\2\2\2\u00f1\u00f2\7k\2\2\u00f2\u00f6\7p\2\2\u00f3\u00f4"+
- "\7K\2\2\u00f4\u00f6\7P\2\2\u00f5\u00f1\3\2\2\2\u00f5\u00f3\3\2\2\2\u00f6"+
- "D\3\2\2\2\u00f7\u00f8\7p\2\2\u00f8\u00f9\7q\2\2\u00f9\u00fa\7v\2\2\u00fa"+
- "\u00fb\7\"\2\2\u00fb\u00fc\7k\2\2\u00fc\u0104\7p\2\2\u00fd\u00fe\7P\2"+
- "\2\u00fe\u00ff\7Q\2\2\u00ff\u0100\7V\2\2\u0100\u0101\7\"\2\2\u0101\u0102"+
- "\7K\2\2\u0102\u0104\7P\2\2\u0103\u00f7\3\2\2\2\u0103\u00fd\3\2\2\2\u0104"+
- "F\3\2\2\2\u0105\u0106\7g\2\2\u0106\u0107\7z\2\2\u0107\u0108\7k\2\2\u0108"+
- "\u0109\7u\2\2\u0109\u010a\7v\2\2\u010a\u0112\7u\2\2\u010b\u010c\7G\2\2"+
- "\u010c\u010d\7Z\2\2\u010d\u010e\7K\2\2\u010e\u010f\7U\2\2\u010f\u0110"+
- "\7V\2\2\u0110\u0112\7U\2\2\u0111\u0105\3\2\2\2\u0111\u010b\3\2\2\2\u0112"+
- "H\3\2\2\2\u0113\u0116\5e\63\2\u0114\u0117\5\61\31\2\u0115\u0117\5/\30"+
- "\2\u0116\u0114\3\2\2\2\u0116\u0115\3\2\2\2\u0116\u0117\3\2\2\2\u0117\u0119"+
- "\3\2\2\2\u0118\u011a\5_\60\2\u0119\u0118\3\2\2\2\u011a\u011b\3\2\2\2\u011b"+
- "\u0119\3\2\2\2\u011b\u011c\3\2\2\2\u011cJ\3\2\2\2\u011d\u011f\5/\30\2"+
- "\u011e\u011d\3\2\2\2\u011e\u011f\3\2\2\2\u011f\u0120\3\2\2\2\u0120\u012c"+
- "\5[.\2\u0121\u0123\5/\30\2\u0122\u0121\3\2\2\2\u0122\u0123\3\2\2\2\u0123"+
- "\u0124\3\2\2\2\u0124\u0128\5]/\2\u0125\u0127\5_\60\2\u0126\u0125\3\2\2"+
- "\2\u0127\u012a\3\2\2\2\u0128\u0126\3\2\2\2\u0128\u0129\3\2\2\2\u0129\u012c"+
- "\3\2\2\2\u012a\u0128\3\2\2\2\u012b\u011e\3\2\2\2\u012b\u0122\3\2\2\2\u012c"+
- "L\3\2\2\2\u012d\u012e\5K&\2\u012e\u0132\5\t\5\2\u012f\u0131\5_\60\2\u0130"+
- "\u012f\3\2\2\2\u0131\u0134\3\2\2\2\u0132\u0130\3\2\2\2\u0132\u0133\3\2"+
- "\2\2\u0133\u0136\3\2\2\2\u0134\u0132\3\2\2\2\u0135\u0137\5I%\2\u0136\u0135"+
- "\3\2\2\2\u0136\u0137\3\2\2\2\u0137\u0139\3\2\2\2\u0138\u013a\5c\62\2\u0139"+
- "\u0138\3\2\2\2\u0139\u013a\3\2\2\2\u013a\u0153\3\2\2\2\u013b\u013d\5\t"+
- "\5\2\u013c\u013e\5_\60\2\u013d\u013c\3\2\2\2\u013e\u013f\3\2\2\2\u013f"+
- "\u013d\3\2\2\2\u013f\u0140\3\2\2\2\u0140\u0142\3\2\2\2\u0141\u0143\5I"+
- "%\2\u0142\u0141\3\2\2\2\u0142\u0143\3\2\2\2\u0143\u0145\3\2\2\2\u0144"+
- "\u0146\5c\62\2\u0145\u0144\3\2\2\2\u0145\u0146\3\2\2\2\u0146\u0153\3\2"+
- "\2\2\u0147\u0148\5K&\2\u0148\u014a\5I%\2\u0149\u014b\5c\62\2\u014a\u0149"+
- "\3\2\2\2\u014a\u014b\3\2\2\2\u014b\u0153\3\2\2\2\u014c\u014e\5K&\2\u014d"+
- "\u014f\5I%\2\u014e\u014d\3\2\2\2\u014e\u014f\3\2\2\2\u014f\u0150\3\2\2"+
- "\2\u0150\u0151\5c\62\2\u0151\u0153\3\2\2\2\u0152\u012d\3\2\2\2\u0152\u013b"+
- "\3\2\2\2\u0152\u0147\3\2\2\2\u0152\u014c\3\2\2\2\u0153N\3\2\2\2\u0154"+
- "\u0155\5K&\2\u0155\u0159\5\t\5\2\u0156\u0158\5_\60\2\u0157\u0156\3\2\2"+
- "\2\u0158\u015b\3\2\2\2\u0159\u0157\3\2\2\2\u0159\u015a\3\2\2\2\u015a\u015d"+
- "\3\2\2\2\u015b\u0159\3\2\2\2\u015c\u015e\5I%\2\u015d\u015c\3\2\2\2\u015d"+
- "\u015e\3\2\2\2\u015e\u015f\3\2\2\2\u015f\u0160\5g\64\2\u0160\u0176\3\2"+
- "\2\2\u0161\u0163\5/\30\2\u0162\u0161\3\2\2\2\u0162\u0163\3\2\2\2\u0163"+
- "\u0164\3\2\2\2\u0164\u0166\5\t\5\2\u0165\u0167\5_\60\2\u0166\u0165\3\2"+
- "\2\2\u0167\u0168\3\2\2\2\u0168\u0166\3\2\2\2\u0168\u0169\3\2\2\2\u0169"+
- "\u016b\3\2\2\2\u016a\u016c\5I%\2\u016b\u016a\3\2\2\2\u016b\u016c\3\2\2"+
- "\2\u016c\u016d\3\2\2\2\u016d\u016e\5g\64\2\u016e\u0176\3\2\2\2\u016f\u0171"+
- "\5K&\2\u0170\u0172\5I%\2\u0171\u0170\3\2\2\2\u0171\u0172\3\2\2\2\u0172"+
- "\u0173\3\2\2\2\u0173\u0174\5g\64\2\u0174\u0176\3\2\2\2\u0175\u0154\3\2"+
- "\2\2\u0175\u0162\3\2\2\2\u0175\u016f\3\2\2\2\u0176P\3\2\2\2\u0177\u0178"+
- "\5K&\2\u0178\u0179\5i\65\2\u0179R\3\2\2\2\u017a\u017e\t\2\2\2\u017b\u017d"+
- "\t\3\2\2\u017c\u017b\3\2\2\2\u017d\u0180\3\2\2\2\u017e\u017c\3\2\2\2\u017e"+
- "\u017f\3\2\2\2\u017fT\3\2\2\2\u0180\u017e\3\2\2\2\u0181\u0185\5\3\2\2"+
- "\u0182\u0184\5a\61\2\u0183\u0182\3\2\2\2\u0184\u0187\3\2\2\2\u0185\u0183"+
- "\3\2\2\2\u0185\u0186\3\2\2\2\u0186\u0188\3\2\2\2\u0187\u0185\3\2\2\2\u0188"+
- "\u0189\5\3\2\2\u0189\u0194\3\2\2\2\u018a\u018e\5\5\3\2\u018b\u018d\5a"+
- "\61\2\u018c\u018b\3\2\2\2\u018d\u0190\3\2\2\2\u018e\u018c\3\2\2\2\u018e"+
- "\u018f\3\2\2\2\u018f\u0191\3\2\2\2\u0190\u018e\3\2\2\2\u0191\u0192\5\5"+
- "\3\2\u0192\u0194\3\2\2\2\u0193\u0181\3\2\2\2\u0193\u018a\3\2\2\2\u0194"+
- "V\3\2\2\2\u0195\u0196\7\61\2\2\u0196\u0197\7\61\2\2\u0197\u0199\3\2\2"+
- "\2\u0198\u019a\13\2\2\2\u0199\u0198\3\2\2\2\u019a\u019b\3\2\2\2\u019b"+
- "\u019c\3\2\2\2\u019b\u0199\3\2\2\2\u019c\u019f\3\2\2\2\u019d\u01a0\5\13"+
- "\6\2\u019e\u01a0\7\2\2\3\u019f\u019d\3\2\2\2\u019f\u019e\3\2\2\2\u01a0"+
- "\u01a1\3\2\2\2\u01a1\u01a2\b,\2\2\u01a2X\3\2\2\2\u01a3\u01a5\t\4\2\2\u01a4"+
- "\u01a3\3\2\2\2\u01a5\u01a6\3\2\2\2\u01a6\u01a4\3\2\2\2\u01a6\u01a7\3\2"+
- "\2\2\u01a7\u01a8\3\2\2\2\u01a8\u01a9\b-\2\2\u01a9Z\3\2\2\2\u01aa\u01ab"+
- "\7\62\2\2\u01ab\\\3\2\2\2\u01ac\u01ad\4\63;\2\u01ad^\3\2\2\2\u01ae\u01af"+
- "\4\62;\2\u01af`\3\2\2\2\u01b0\u01b1\n\5\2\2\u01b1b\3\2\2\2\u01b2\u01b3"+
- "\t\6\2\2\u01b3d\3\2\2\2\u01b4\u01b5\t\7\2\2\u01b5f\3\2\2\2\u01b6\u01b7"+
- "\t\b\2\2\u01b7h\3\2\2\2\u01b8\u01b9\t\t\2\2\u01b9j\3\2\2\2,\2}\u0085\u008d"+
- "\u0097\u00a3\u00bd\u00c7\u00d1\u00db\u00f5\u0103\u0111\u0116\u011b\u011e"+
- "\u0122\u0128\u012b\u0132\u0136\u0139\u013f\u0142\u0145\u014a\u014e\u0152"+
- "\u0159\u015d\u0162\u0168\u016b\u0171\u0175\u017e\u0185\u018e\u0193\u019b"+
- "\u019f\u01a6\3\b\2\2";
+ "\64\4\65\t\65\3\2\3\2\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6"+
+ "\3\6\3\6\5\6|\n\6\3\7\3\7\3\7\3\7\3\7\3\7\5\7\u0084\n\7\3\b\3\b\3\b\3"+
+ "\b\3\b\3\b\5\b\u008c\n\b\3\t\3\t\3\t\3\t\3\t\3\t\3\t\3\t\5\t\u0096\n\t"+
+ "\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\5\n\u00a2\n\n\3\13\3\13\3\13"+
+ "\3\f\3\f\3\f\3\r\3\r\3\16\3\16\3\16\3\17\3\17\3\20\3\20\3\20\3\21\3\21"+
+ "\3\22\3\22\3\23\3\23\3\23\3\23\5\23\u00bc\n\23\3\24\3\24\3\24\3\24\3\24"+
+ "\3\24\3\24\3\24\5\24\u00c6\n\24\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25"+
+ "\5\25\u00d0\n\25\3\26\3\26\3\26\3\26\3\26\3\26\3\26\3\26\5\26\u00da\n"+
+ "\26\3\27\3\27\3\30\3\30\3\31\3\31\3\32\3\32\3\33\3\33\3\34\3\34\3\35\3"+
+ "\35\3\36\3\36\3\37\3\37\3 \3 \3!\3!\3!\3!\5!\u00f4\n!\3\"\3\"\3\"\3\""+
+ "\3\"\3\"\3\"\3\"\3\"\3\"\3\"\3\"\5\"\u0102\n\"\3#\3#\3#\3#\3#\3#\3#\3"+
+ "#\3#\3#\3#\3#\5#\u0110\n#\3$\3$\3$\5$\u0115\n$\3$\6$\u0118\n$\r$\16$\u0119"+
+ "\3%\5%\u011d\n%\3%\3%\5%\u0121\n%\3%\3%\7%\u0125\n%\f%\16%\u0128\13%\5"+
+ "%\u012a\n%\3&\3&\3&\7&\u012f\n&\f&\16&\u0132\13&\3&\5&\u0135\n&\3&\5&"+
+ "\u0138\n&\3&\3&\6&\u013c\n&\r&\16&\u013d\3&\5&\u0141\n&\3&\5&\u0144\n"+
+ "&\3&\3&\3&\5&\u0149\n&\3&\3&\5&\u014d\n&\3&\3&\5&\u0151\n&\3\'\3\'\3\'"+
+ "\7\'\u0156\n\'\f\'\16\'\u0159\13\'\3\'\5\'\u015c\n\'\3\'\3\'\3\'\5\'\u0161"+
+ "\n\'\3\'\3\'\6\'\u0165\n\'\r\'\16\'\u0166\3\'\5\'\u016a\n\'\3\'\3\'\3"+
+ "\'\3\'\5\'\u0170\n\'\3\'\3\'\5\'\u0174\n\'\3(\3(\3(\3)\3)\7)\u017b\n)"+
+ "\f)\16)\u017e\13)\3*\3*\7*\u0182\n*\f*\16*\u0185\13*\3*\3*\3*\3*\7*\u018b"+
+ "\n*\f*\16*\u018e\13*\3*\3*\5*\u0192\n*\3+\3+\3+\3+\6+\u0198\n+\r+\16+"+
+ "\u0199\3+\3+\5+\u019e\n+\3+\3+\3,\6,\u01a3\n,\r,\16,\u01a4\3,\3,\3-\3"+
+ "-\3.\3.\3/\3/\3\60\3\60\3\61\3\61\3\62\3\62\3\63\3\63\3\64\3\64\3\65\3"+
+ "\65\3\u0199\2\66\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31"+
+ "\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65"+
+ "\34\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y\2[\2]\2_\2a\2c\2e\2g"+
+ "\2i\2\3\2\n\5\2C\\aac|\b\2\60\60\62<C\\^^aac|\5\2\13\f\16\17\"\"\7\2\f"+
+ "\f\17\17$$))^^\4\2FFff\4\2GGgg\4\2HHhh\4\2NNnn\u01df\2\3\3\2\2\2\2\5\3"+
+ "\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2"+
+ "\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3"+
+ "\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'"+
+ "\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63"+
+ "\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2"+
+ "?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3"+
+ "\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2"+
+ "\2\3k\3\2\2\2\5m\3\2\2\2\7o\3\2\2\2\tq\3\2\2\2\13{\3\2\2\2\r\u0083\3\2"+
+ "\2\2\17\u008b\3\2\2\2\21\u0095\3\2\2\2\23\u00a1\3\2\2\2\25\u00a3\3\2\2"+
+ "\2\27\u00a6\3\2\2\2\31\u00a9\3\2\2\2\33\u00ab\3\2\2\2\35\u00ae\3\2\2\2"+
+ "\37\u00b0\3\2\2\2!\u00b3\3\2\2\2#\u00b5\3\2\2\2%\u00bb\3\2\2\2\'\u00c5"+
+ "\3\2\2\2)\u00cf\3\2\2\2+\u00d9\3\2\2\2-\u00db\3\2\2\2/\u00dd\3\2\2\2\61"+
+ "\u00df\3\2\2\2\63\u00e1\3\2\2\2\65\u00e3\3\2\2\2\67\u00e5\3\2\2\29\u00e7"+
+ "\3\2\2\2;\u00e9\3\2\2\2=\u00eb\3\2\2\2?\u00ed\3\2\2\2A\u00f3\3\2\2\2C"+
+ "\u0101\3\2\2\2E\u010f\3\2\2\2G\u0111\3\2\2\2I\u0129\3\2\2\2K\u0150\3\2"+
+ "\2\2M\u0173\3\2\2\2O\u0175\3\2\2\2Q\u0178\3\2\2\2S\u0191\3\2\2\2U\u0193"+
+ "\3\2\2\2W\u01a2\3\2\2\2Y\u01a8\3\2\2\2[\u01aa\3\2\2\2]\u01ac\3\2\2\2_"+
+ "\u01ae\3\2\2\2a\u01b0\3\2\2\2c\u01b2\3\2\2\2e\u01b4\3\2\2\2g\u01b6\3\2"+
+ "\2\2i\u01b8\3\2\2\2kl\7$\2\2l\4\3\2\2\2mn\7)\2\2n\6\3\2\2\2op\7.\2\2p"+
+ "\b\3\2\2\2qr\7\60\2\2r\n\3\2\2\2st\7c\2\2tu\7p\2\2u|\7f\2\2vw\7(\2\2w"+
+ "|\7(\2\2xy\7C\2\2yz\7P\2\2z|\7F\2\2{s\3\2\2\2{v\3\2\2\2{x\3\2\2\2|\f\3"+
+ "\2\2\2}~\7q\2\2~\u0084\7t\2\2\177\u0080\7~\2\2\u0080\u0084\7~\2\2\u0081"+
+ "\u0082\7Q\2\2\u0082\u0084\7T\2\2\u0083}\3\2\2\2\u0083\177\3\2\2\2\u0083"+
+ "\u0081\3\2\2\2\u0084\16\3\2\2\2\u0085\u0086\7p\2\2\u0086\u0087\7q\2\2"+
+ "\u0087\u008c\7v\2\2\u0088\u0089\7P\2\2\u0089\u008a\7Q\2\2\u008a\u008c"+
+ "\7V\2\2\u008b\u0085\3\2\2\2\u008b\u0088\3\2\2\2\u008c\20\3\2\2\2\u008d"+
+ "\u008e\7v\2\2\u008e\u008f\7t\2\2\u008f\u0090\7w\2\2\u0090\u0096\7g\2\2"+
+ "\u0091\u0092\7V\2\2\u0092\u0093\7T\2\2\u0093\u0094\7W\2\2\u0094\u0096"+
+ "\7G\2\2\u0095\u008d\3\2\2\2\u0095\u0091\3\2\2\2\u0096\22\3\2\2\2\u0097"+
+ "\u0098\7h\2\2\u0098\u0099\7c\2\2\u0099\u009a\7n\2\2\u009a\u009b\7u\2\2"+
+ "\u009b\u00a2\7g\2\2\u009c\u009d\7H\2\2\u009d\u009e\7C\2\2\u009e\u009f"+
+ "\7N\2\2\u009f\u00a0\7U\2\2\u00a0\u00a2\7G\2\2\u00a1\u0097\3\2\2\2\u00a1"+
+ "\u009c\3\2\2\2\u00a2\24\3\2\2\2\u00a3\u00a4\7?\2\2\u00a4\u00a5\7?\2\2"+
+ "\u00a5\26\3\2\2\2\u00a6\u00a7\7#\2\2\u00a7\u00a8\7?\2\2\u00a8\30\3\2\2"+
+ "\2\u00a9\u00aa\7>\2\2\u00aa\32\3\2\2\2\u00ab\u00ac\7>\2\2\u00ac\u00ad"+
+ "\7?\2\2\u00ad\34\3\2\2\2\u00ae\u00af\7@\2\2\u00af\36\3\2\2\2\u00b0\u00b1"+
+ "\7@\2\2\u00b1\u00b2\7?\2\2\u00b2 \3\2\2\2\u00b3\u00b4\7A\2\2\u00b4\"\3"+
+ "\2\2\2\u00b5\u00b6\7<\2\2\u00b6$\3\2\2\2\u00b7\u00b8\7K\2\2\u00b8\u00bc"+
+ "\7H\2\2\u00b9\u00ba\7k\2\2\u00ba\u00bc\7h\2\2\u00bb\u00b7\3\2\2\2\u00bb"+
+ "\u00b9\3\2\2\2\u00bc&\3\2\2\2\u00bd\u00be\7V\2\2\u00be\u00bf\7J\2\2\u00bf"+
+ "\u00c0\7G\2\2\u00c0\u00c6\7P\2\2\u00c1\u00c2\7v\2\2\u00c2\u00c3\7j\2\2"+
+ "\u00c3\u00c4\7g\2\2\u00c4\u00c6\7p\2\2\u00c5\u00bd\3\2\2\2\u00c5\u00c1"+
+ "\3\2\2\2\u00c6(\3\2\2\2\u00c7\u00c8\7G\2\2\u00c8\u00c9\7N\2\2\u00c9\u00ca"+
+ "\7U\2\2\u00ca\u00d0\7G\2\2\u00cb\u00cc\7g\2\2\u00cc\u00cd\7n\2\2\u00cd"+
+ "\u00ce\7u\2\2\u00ce\u00d0\7g\2\2\u00cf\u00c7\3\2\2\2\u00cf\u00cb\3\2\2"+
+ "\2\u00d0*\3\2\2\2\u00d1\u00d2\7p\2\2\u00d2\u00d3\7w\2\2\u00d3\u00d4\7"+
+ "n\2\2\u00d4\u00da\7n\2\2\u00d5\u00d6\7P\2\2\u00d6\u00d7\7W\2\2\u00d7\u00d8"+
+ "\7N\2\2\u00d8\u00da\7N\2\2\u00d9\u00d1\3\2\2\2\u00d9\u00d5\3\2\2\2\u00da"+
+ ",\3\2\2\2\u00db\u00dc\7/\2\2\u00dc.\3\2\2\2\u00dd\u00de\7-\2\2\u00de\60"+
+ "\3\2\2\2\u00df\u00e0\7\61\2\2\u00e0\62\3\2\2\2\u00e1\u00e2\7,\2\2\u00e2"+
+ "\64\3\2\2\2\u00e3\u00e4\7}\2\2\u00e4\66\3\2\2\2\u00e5\u00e6\7\177\2\2"+
+ "\u00e68\3\2\2\2\u00e7\u00e8\7]\2\2\u00e8:\3\2\2\2\u00e9\u00ea\7_\2\2\u00ea"+
+ "<\3\2\2\2\u00eb\u00ec\7*\2\2\u00ec>\3\2\2\2\u00ed\u00ee\7+\2\2\u00ee@"+
+ "\3\2\2\2\u00ef\u00f0\7k\2\2\u00f0\u00f4\7p\2\2\u00f1\u00f2\7K\2\2\u00f2"+
+ "\u00f4\7P\2\2\u00f3\u00ef\3\2\2\2\u00f3\u00f1\3\2\2\2\u00f4B\3\2\2\2\u00f5"+
+ "\u00f6\7p\2\2\u00f6\u00f7\7q\2\2\u00f7\u00f8\7v\2\2\u00f8\u00f9\7\"\2"+
+ "\2\u00f9\u00fa\7k\2\2\u00fa\u0102\7p\2\2\u00fb\u00fc\7P\2\2\u00fc\u00fd"+
+ "\7Q\2\2\u00fd\u00fe\7V\2\2\u00fe\u00ff\7\"\2\2\u00ff\u0100\7K\2\2\u0100"+
+ "\u0102\7P\2\2\u0101\u00f5\3\2\2\2\u0101\u00fb\3\2\2\2\u0102D\3\2\2\2\u0103"+
+ "\u0104\7g\2\2\u0104\u0105\7z\2\2\u0105\u0106\7k\2\2\u0106\u0107\7u\2\2"+
+ "\u0107\u0108\7v\2\2\u0108\u0110\7u\2\2\u0109\u010a\7G\2\2\u010a\u010b"+
+ "\7Z\2\2\u010b\u010c\7K\2\2\u010c\u010d\7U\2\2\u010d\u010e\7V\2\2\u010e"+
+ "\u0110\7U\2\2\u010f\u0103\3\2\2\2\u010f\u0109\3\2\2\2\u0110F\3\2\2\2\u0111"+
+ "\u0114\5c\62\2\u0112\u0115\5/\30\2\u0113\u0115\5-\27\2\u0114\u0112\3\2"+
+ "\2\2\u0114\u0113\3\2\2\2\u0114\u0115\3\2\2\2\u0115\u0117\3\2\2\2\u0116"+
+ "\u0118\5]/\2\u0117\u0116\3\2\2\2\u0118\u0119\3\2\2\2\u0119\u0117\3\2\2"+
+ "\2\u0119\u011a\3\2\2\2\u011aH\3\2\2\2\u011b\u011d\5-\27\2\u011c\u011b"+
+ "\3\2\2\2\u011c\u011d\3\2\2\2\u011d\u011e\3\2\2\2\u011e\u012a\5Y-\2\u011f"+
+ "\u0121\5-\27\2\u0120\u011f\3\2\2\2\u0120\u0121\3\2\2\2\u0121\u0122\3\2"+
+ "\2\2\u0122\u0126\5[.\2\u0123\u0125\5]/\2\u0124\u0123\3\2\2\2\u0125\u0128"+
+ "\3\2\2\2\u0126\u0124\3\2\2\2\u0126\u0127\3\2\2\2\u0127\u012a\3\2\2\2\u0128"+
+ "\u0126\3\2\2\2\u0129\u011c\3\2\2\2\u0129\u0120\3\2\2\2\u012aJ\3\2\2\2"+
+ "\u012b\u012c\5I%\2\u012c\u0130\5\t\5\2\u012d\u012f\5]/\2\u012e\u012d\3"+
+ "\2\2\2\u012f\u0132\3\2\2\2\u0130\u012e\3\2\2\2\u0130\u0131\3\2\2\2\u0131"+
+ "\u0134\3\2\2\2\u0132\u0130\3\2\2\2\u0133\u0135\5G$\2\u0134\u0133\3\2\2"+
+ "\2\u0134\u0135\3\2\2\2\u0135\u0137\3\2\2\2\u0136\u0138\5a\61\2\u0137\u0136"+
+ "\3\2\2\2\u0137\u0138\3\2\2\2\u0138\u0151\3\2\2\2\u0139\u013b\5\t\5\2\u013a"+
+ "\u013c\5]/\2\u013b\u013a\3\2\2\2\u013c\u013d\3\2\2\2\u013d\u013b\3\2\2"+
+ "\2\u013d\u013e\3\2\2\2\u013e\u0140\3\2\2\2\u013f\u0141\5G$\2\u0140\u013f"+
+ "\3\2\2\2\u0140\u0141\3\2\2\2\u0141\u0143\3\2\2\2\u0142\u0144\5a\61\2\u0143"+
+ "\u0142\3\2\2\2\u0143\u0144\3\2\2\2\u0144\u0151\3\2\2\2\u0145\u0146\5I"+
+ "%\2\u0146\u0148\5G$\2\u0147\u0149\5a\61\2\u0148\u0147\3\2\2\2\u0148\u0149"+
+ "\3\2\2\2\u0149\u0151\3\2\2\2\u014a\u014c\5I%\2\u014b\u014d\5G$\2\u014c"+
+ "\u014b\3\2\2\2\u014c\u014d\3\2\2\2\u014d\u014e\3\2\2\2\u014e\u014f\5a"+
+ "\61\2\u014f\u0151\3\2\2\2\u0150\u012b\3\2\2\2\u0150\u0139\3\2\2\2\u0150"+
+ "\u0145\3\2\2\2\u0150\u014a\3\2\2\2\u0151L\3\2\2\2\u0152\u0153\5I%\2\u0153"+
+ "\u0157\5\t\5\2\u0154\u0156\5]/\2\u0155\u0154\3\2\2\2\u0156\u0159\3\2\2"+
+ "\2\u0157\u0155\3\2\2\2\u0157\u0158\3\2\2\2\u0158\u015b\3\2\2\2\u0159\u0157"+
+ "\3\2\2\2\u015a\u015c\5G$\2\u015b\u015a\3\2\2\2\u015b\u015c\3\2\2\2\u015c"+
+ "\u015d\3\2\2\2\u015d\u015e\5e\63\2\u015e\u0174\3\2\2\2\u015f\u0161\5-"+
+ "\27\2\u0160\u015f\3\2\2\2\u0160\u0161\3\2\2\2\u0161\u0162\3\2\2\2\u0162"+
+ "\u0164\5\t\5\2\u0163\u0165\5]/\2\u0164\u0163\3\2\2\2\u0165\u0166\3\2\2"+
+ "\2\u0166\u0164\3\2\2\2\u0166\u0167\3\2\2\2\u0167\u0169\3\2\2\2\u0168\u016a"+
+ "\5G$\2\u0169\u0168\3\2\2\2\u0169\u016a\3\2\2\2\u016a\u016b\3\2\2\2\u016b"+
+ "\u016c\5e\63\2\u016c\u0174\3\2\2\2\u016d\u016f\5I%\2\u016e\u0170\5G$\2"+
+ "\u016f\u016e\3\2\2\2\u016f\u0170\3\2\2\2\u0170\u0171\3\2\2\2\u0171\u0172"+
+ "\5e\63\2\u0172\u0174\3\2\2\2\u0173\u0152\3\2\2\2\u0173\u0160\3\2\2\2\u0173"+
+ "\u016d\3\2\2\2\u0174N\3\2\2\2\u0175\u0176\5I%\2\u0176\u0177\5g\64\2\u0177"+
+ "P\3\2\2\2\u0178\u017c\t\2\2\2\u0179\u017b\t\3\2\2\u017a\u0179\3\2\2\2"+
+ "\u017b\u017e\3\2\2\2\u017c\u017a\3\2\2\2\u017c\u017d\3\2\2\2\u017dR\3"+
+ "\2\2\2\u017e\u017c\3\2\2\2\u017f\u0183\5\3\2\2\u0180\u0182\5_\60\2\u0181"+
+ "\u0180\3\2\2\2\u0182\u0185\3\2\2\2\u0183\u0181\3\2\2\2\u0183\u0184\3\2"+
+ "\2\2\u0184\u0186\3\2\2\2\u0185\u0183\3\2\2\2\u0186\u0187\5\3\2\2\u0187"+
+ "\u0192\3\2\2\2\u0188\u018c\5\5\3\2\u0189\u018b\5_\60\2\u018a\u0189\3\2"+
+ "\2\2\u018b\u018e\3\2\2\2\u018c\u018a\3\2\2\2\u018c\u018d\3\2\2\2\u018d"+
+ "\u018f\3\2\2\2\u018e\u018c\3\2\2\2\u018f\u0190\5\5\3\2\u0190\u0192\3\2"+
+ "\2\2\u0191\u017f\3\2\2\2\u0191\u0188\3\2\2\2\u0192T\3\2\2\2\u0193\u0194"+
+ "\7\61\2\2\u0194\u0195\7\61\2\2\u0195\u0197\3\2\2\2\u0196\u0198\13\2\2"+
+ "\2\u0197\u0196\3\2\2\2\u0198\u0199\3\2\2\2\u0199\u019a\3\2\2\2\u0199\u0197"+
+ "\3\2\2\2\u019a\u019d\3\2\2\2\u019b\u019e\5i\65\2\u019c\u019e\7\2\2\3\u019d"+
+ "\u019b\3\2\2\2\u019d\u019c\3\2\2\2\u019e\u019f\3\2\2\2\u019f\u01a0\b+"+
+ "\2\2\u01a0V\3\2\2\2\u01a1\u01a3\t\4\2\2\u01a2\u01a1\3\2\2\2\u01a3\u01a4"+
+ "\3\2\2\2\u01a4\u01a2\3\2\2\2\u01a4\u01a5\3\2\2\2\u01a5\u01a6\3\2\2\2\u01a6"+
+ "\u01a7\b,\2\2\u01a7X\3\2\2\2\u01a8\u01a9\7\62\2\2\u01a9Z\3\2\2\2\u01aa"+
+ "\u01ab\4\63;\2\u01ab\\\3\2\2\2\u01ac\u01ad\4\62;\2\u01ad^\3\2\2\2\u01ae"+
+ "\u01af\n\5\2\2\u01af`\3\2\2\2\u01b0\u01b1\t\6\2\2\u01b1b\3\2\2\2\u01b2"+
+ "\u01b3\t\7\2\2\u01b3d\3\2\2\2\u01b4\u01b5\t\b\2\2\u01b5f\3\2\2\2\u01b6"+
+ "\u01b7\t\t\2\2\u01b7h\3\2\2\2\u01b8\u01b9\7\f\2\2\u01b9j\3\2\2\2,\2{\u0083"+
+ "\u008b\u0095\u00a1\u00bb\u00c5\u00cf\u00d9\u00f3\u0101\u010f\u0114\u0119"+
+ "\u011c\u0120\u0126\u0129\u0130\u0134\u0137\u013d\u0140\u0143\u0148\u014c"+
+ "\u0150\u0157\u015b\u0160\u0166\u0169\u016f\u0173\u017c\u0183\u018c\u0191"+
+ "\u0199\u019d\u01a4\3\b\2\2";
public static final ATN _ATN =
new ATNDeserializer().deserialize(_serializedATN.toCharArray());
static {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8340c0e2/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarListener.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarListener.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarListener.java
index 8755e2a..bf3c272 100644
--- a/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarListener.java
+++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/generated/StellarListener.java
@@ -2,7 +2,7 @@
package org.apache.metron.common.stellar.generated;
//CHECKSTYLE:OFF
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -99,6 +99,30 @@ public interface StellarListener extends ParseTreeListener {
*/
void exitComparisonExpression(StellarParser.ComparisonExpressionContext ctx);
/**
+ * Enter a parse tree produced by the {@code LogicalExpression}
+ * labeled alternative in {@link StellarParser#transformation_expr}.
+ * @param ctx the parse tree
+ */
+ void enterLogicalExpression(StellarParser.LogicalExpressionContext ctx);
+ /**
+ * Exit a parse tree produced by the {@code LogicalExpression}
+ * labeled alternative in {@link StellarParser#transformation_expr}.
+ * @param ctx the parse tree
+ */
+ void exitLogicalExpression(StellarParser.LogicalExpressionContext ctx);
+ /**
+ * Enter a parse tree produced by the {@code InExpression}
+ * labeled alternative in {@link StellarParser#transformation_expr}.
+ * @param ctx the parse tree
+ */
+ void enterInExpression(StellarParser.InExpressionContext ctx);
+ /**
+ * Exit a parse tree produced by the {@code InExpression}
+ * labeled alternative in {@link StellarParser#transformation_expr}.
+ * @param ctx the parse tree
+ */
+ void exitInExpression(StellarParser.InExpressionContext ctx);
+ /**
* Enter a parse tree produced by the {@code TernaryFuncWithoutIf}
* labeled alternative in {@link StellarParser#conditional_expr}.
* @param ctx the parse tree
@@ -123,89 +147,111 @@ public interface StellarListener extends ParseTreeListener {
*/
void exitTernaryFuncWithIf(StellarParser.TernaryFuncWithIfContext ctx);
/**
- * Enter a parse tree produced by the {@code NotFunc}
- * labeled alternative in {@link StellarParser#comparison_expr}.
+ * Enter a parse tree produced by the {@code LogicalExpressionAnd}
+ * labeled alternative in {@link StellarParser#logical_expr}.
* @param ctx the parse tree
*/
- void enterNotFunc(StellarParser.NotFuncContext ctx);
+ void enterLogicalExpressionAnd(StellarParser.LogicalExpressionAndContext ctx);
/**
- * Exit a parse tree produced by the {@code NotFunc}
- * labeled alternative in {@link StellarParser#comparison_expr}.
+ * Exit a parse tree produced by the {@code LogicalExpressionAnd}
+ * labeled alternative in {@link StellarParser#logical_expr}.
* @param ctx the parse tree
*/
- void exitNotFunc(StellarParser.NotFuncContext ctx);
+ void exitLogicalExpressionAnd(StellarParser.LogicalExpressionAndContext ctx);
/**
- * Enter a parse tree produced by the {@code ComparisonExpressionParens}
- * labeled alternative in {@link StellarParser#comparison_expr}.
+ * Enter a parse tree produced by the {@code LogicalExpressionOr}
+ * labeled alternative in {@link StellarParser#logical_expr}.
* @param ctx the parse tree
*/
- void enterComparisonExpressionParens(StellarParser.ComparisonExpressionParensContext ctx);
+ void enterLogicalExpressionOr(StellarParser.LogicalExpressionOrContext ctx);
/**
- * Exit a parse tree produced by the {@code ComparisonExpressionParens}
- * labeled alternative in {@link StellarParser#comparison_expr}.
+ * Exit a parse tree produced by the {@code LogicalExpressionOr}
+ * labeled alternative in {@link StellarParser#logical_expr}.
* @param ctx the parse tree
*/
- void exitComparisonExpressionParens(StellarParser.ComparisonExpressionParensContext ctx);
+ void exitLogicalExpressionOr(StellarParser.LogicalExpressionOrContext ctx);
/**
- * Enter a parse tree produced by the {@code InExpression}
- * labeled alternative in {@link StellarParser#comparison_expr}.
+ * Enter a parse tree produced by the {@code BoleanExpression}
+ * labeled alternative in {@link StellarParser#logical_expr}.
* @param ctx the parse tree
*/
- void enterInExpression(StellarParser.InExpressionContext ctx);
+ void enterBoleanExpression(StellarParser.BoleanExpressionContext ctx);
/**
- * Exit a parse tree produced by the {@code InExpression}
- * labeled alternative in {@link StellarParser#comparison_expr}.
+ * Exit a parse tree produced by the {@code BoleanExpression}
+ * labeled alternative in {@link StellarParser#logical_expr}.
* @param ctx the parse tree
*/
- void exitInExpression(StellarParser.InExpressionContext ctx);
+ void exitBoleanExpression(StellarParser.BoleanExpressionContext ctx);
/**
- * Enter a parse tree produced by the {@code ComparisonExpressionWithOperator}
- * labeled alternative in {@link StellarParser#comparison_expr}.
+ * Enter a parse tree produced by {@link StellarParser#b_expr}.
* @param ctx the parse tree
*/
- void enterComparisonExpressionWithOperator(StellarParser.ComparisonExpressionWithOperatorContext ctx);
+ void enterB_expr(StellarParser.B_exprContext ctx);
/**
- * Exit a parse tree produced by the {@code ComparisonExpressionWithOperator}
- * labeled alternative in {@link StellarParser#comparison_expr}.
+ * Exit a parse tree produced by {@link StellarParser#b_expr}.
* @param ctx the parse tree
*/
- void exitComparisonExpressionWithOperator(StellarParser.ComparisonExpressionWithOperatorContext ctx);
+ void exitB_expr(StellarParser.B_exprContext ctx);
/**
- * Enter a parse tree produced by the {@code LogicalExpressionAnd}
+ * Enter a parse tree produced by the {@code InExpressionStatement}
+ * labeled alternative in {@link StellarParser#in_expr}.
+ * @param ctx the parse tree
+ */
+ void enterInExpressionStatement(StellarParser.InExpressionStatementContext ctx);
+ /**
+ * Exit a parse tree produced by the {@code InExpressionStatement}
+ * labeled alternative in {@link StellarParser#in_expr}.
+ * @param ctx the parse tree
+ */
+ void exitInExpressionStatement(StellarParser.InExpressionStatementContext ctx);
+ /**
+ * Enter a parse tree produced by the {@code NInExpressionStatement}
+ * labeled alternative in {@link StellarParser#in_expr}.
+ * @param ctx the parse tree
+ */
+ void enterNInExpressionStatement(StellarParser.NInExpressionStatementContext ctx);
+ /**
+ * Exit a parse tree produced by the {@code NInExpressionStatement}
+ * labeled alternative in {@link StellarParser#in_expr}.
+ * @param ctx the parse tree
+ */
+ void exitNInExpressionStatement(StellarParser.NInExpressionStatementContext ctx);
+ /**
+ * Enter a parse tree produced by the {@code NotFunc}
* labeled alternative in {@link StellarParser#comparison_expr}.
* @param ctx the parse tree
*/
- void enterLogicalExpressionAnd(StellarParser.LogicalExpressionAndContext ctx);
+ void enterNotFunc(StellarParser.NotFuncContext ctx);
/**
- * Exit a parse tree produced by the {@code LogicalExpressionAnd}
+ * Exit a parse tree produced by the {@code NotFunc}
* labeled alternative in {@link StellarParser#comparison_expr}.
* @param ctx the parse tree
*/
- void exitLogicalExpressionAnd(StellarParser.LogicalExpressionAndContext ctx);
+ void exitNotFunc(StellarParser.NotFuncContext ctx);
/**
- * Enter a parse tree produced by the {@code NInExpression}
+ * Enter a parse tree produced by the {@code ComparisonExpressionParens}
* labeled alternative in {@link StellarParser#comparison_expr}.
* @param ctx the parse tree
*/
- void enterNInExpression(StellarParser.NInExpressionContext ctx);
+ void enterComparisonExpressionParens(StellarParser.ComparisonExpressionParensContext ctx);
/**
- * Exit a parse tree produced by the {@code NInExpression}
+ * Exit a parse tree produced by the {@code ComparisonExpressionParens}
* labeled alternative in {@link StellarParser#comparison_expr}.
* @param ctx the parse tree
*/
- void exitNInExpression(StellarParser.NInExpressionContext ctx);
+ void exitComparisonExpressionParens(StellarParser.ComparisonExpressionParensContext ctx);
/**
- * Enter a parse tree produced by the {@code LogicalExpressionOr}
+ * Enter a parse tree produced by the {@code ComparisonExpressionWithOperator}
* labeled alternative in {@link StellarParser#comparison_expr}.
* @param ctx the parse tree
*/
- void enterLogicalExpressionOr(StellarParser.LogicalExpressionOrContext ctx);
+ void enterComparisonExpressionWithOperator(StellarParser.ComparisonExpressionWithOperatorContext ctx);
/**
- * Exit a parse tree produced by the {@code LogicalExpressionOr}
+ * Exit a parse tree produced by the {@code ComparisonExpressionWithOperator}
* labeled alternative in {@link StellarParser#comparison_expr}.
* @param ctx the parse tree
*/
- void exitLogicalExpressionOr(StellarParser.LogicalExpressionOrContext ctx);
+ void exitComparisonExpressionWithOperator(StellarParser.ComparisonExpressionWithOperatorContext ctx);
/**
* Enter a parse tree produced by the {@code operand}
* labeled alternative in {@link StellarParser#comparison_expr}.
@@ -241,30 +287,6 @@ public interface StellarListener extends ParseTreeListener {
*/
void exitComparisonOp(StellarParser.ComparisonOpContext ctx);
/**
- * Enter a parse tree produced by the {@code ArithOp_plus}
- * labeled alternative in {@link StellarParser#arith_operator_addition}.
- * @param ctx the parse tree
- */
- void enterArithOp_plus(StellarParser.ArithOp_plusContext ctx);
- /**
- * Exit a parse tree produced by the {@code ArithOp_plus}
- * labeled alternative in {@link StellarParser#arith_operator_addition}.
- * @param ctx the parse tree
- */
- void exitArithOp_plus(StellarParser.ArithOp_plusContext ctx);
- /**
- * Enter a parse tree produced by the {@code ArithOp_mul}
- * labeled alternative in {@link StellarParser#arith_operator_mul}.
- * @param ctx the parse tree
- */
- void enterArithOp_mul(StellarParser.ArithOp_mulContext ctx);
- /**
- * Exit a parse tree produced by the {@code ArithOp_mul}
- * labeled alternative in {@link StellarParser#arith_operator_mul}.
- * @param ctx the parse tree
- */
- void exitArithOp_mul(StellarParser.ArithOp_mulContext ctx);
- /**
* Enter a parse tree produced by {@link StellarParser#func_args}.
* @param ctx the parse tree
*/