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:52 UTC
[2/2] incubator-metron git commit: METRON-658: Updated Grammar to
Handle More Uses of in/not in Expressions closes apache/incubator-metron#430
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
*/