From fa8d09f4917c0df0113e840a7f124f33c4199a60 Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Wed, 12 Feb 2020 17:41:57 -0700 Subject: [PATCH 1/3] EQL: Add ? param support --- x-pack/plugin/eql/src/main/antlr/EqlBase.g4 | 3 + .../xpack/eql/parser/AstBuilder.java | 7 +- .../xpack/eql/parser/EqlBaseBaseListener.java | 12 + .../xpack/eql/parser/EqlBaseBaseVisitor.java | 7 + .../xpack/eql/parser/EqlBaseLexer.java | 287 +++++++++--------- .../xpack/eql/parser/EqlBaseListener.java | 12 + .../xpack/eql/parser/EqlBaseParser.java | 249 ++++++++------- .../xpack/eql/parser/EqlBaseVisitor.java | 7 + .../xpack/eql/parser/EqlParser.java | 84 ++++- .../xpack/eql/parser/ExpressionBuilder.java | 39 +++ .../xpack/eql/parser/LogicalPlanBuilder.java | 9 +- .../xpack/eql/parser/ParameterTests.java | 75 +++++ 12 files changed, 528 insertions(+), 263 deletions(-) create mode 100644 x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ParameterTests.java diff --git a/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 b/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 index 39b3de1cd5684..ed1a3de86f8f1 100644 --- a/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 +++ b/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 @@ -110,6 +110,7 @@ constant | number #numericLiteral | booleanValue #booleanLiteral | string #stringLiteral + | PARAM #paramLiteral ; comparisonOperator @@ -159,6 +160,8 @@ UNTIL: 'until'; WHERE: 'where'; WITH: 'with'; +PARAM: '?'; + // Operators EQ : '=' | '=='; NEQ : '!='; diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AstBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AstBuilder.java index 65c6c1a73e63d..8495b0113aa45 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AstBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/AstBuilder.java @@ -6,13 +6,16 @@ package org.elasticsearch.xpack.eql.parser; +import org.antlr.v4.runtime.Token; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.SingleStatementContext; import org.elasticsearch.xpack.ql.plan.logical.LogicalPlan; +import java.util.Map; + public class AstBuilder extends LogicalPlanBuilder { - AstBuilder(ParserParams params) { - super(params); + AstBuilder(ParserParams params, Map paramTokens) { + super(params, paramTokens); } @Override diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseListener.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseListener.java index 5c720fb6e4b0b..9b89a7c5b0395 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseListener.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseListener.java @@ -395,6 +395,18 @@ class EqlBaseBaseListener implements EqlBaseListener { *

The default implementation does nothing.

*/ @Override public void exitStringLiteral(EqlBaseParser.StringLiteralContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void enterParamLiteral(EqlBaseParser.ParamLiteralContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void exitParamLiteral(EqlBaseParser.ParamLiteralContext ctx) { } /** * {@inheritDoc} * diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseVisitor.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseVisitor.java index 4f60c45ff5b71..3fac4a38e8d60 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseVisitor.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseBaseVisitor.java @@ -235,6 +235,13 @@ class EqlBaseBaseVisitor extends AbstractParseTreeVisitor implements EqlBa * {@link #visitChildren} on {@code ctx}.

*/ @Override public T visitStringLiteral(EqlBaseParser.StringLiteralContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitParamLiteral(EqlBaseParser.ParamLiteralContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseLexer.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseLexer.java index 2fc525ff52796..2c1695d592d0c 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseLexer.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseLexer.java @@ -18,20 +18,20 @@ class EqlBaseLexer extends Lexer { new PredictionContextCache(); public static final int AND=1, BY=2, FALSE=3, FORK=4, IN=5, JOIN=6, MAXSPAN=7, NOT=8, NULL=9, - OF=10, OR=11, SEQUENCE=12, TRUE=13, UNTIL=14, WHERE=15, WITH=16, EQ=17, - NEQ=18, LT=19, LTE=20, GT=21, GTE=22, PLUS=23, MINUS=24, ASTERISK=25, - SLASH=26, PERCENT=27, DOT=28, COMMA=29, LB=30, RB=31, LP=32, RP=33, PIPE=34, - ESCAPED_IDENTIFIER=35, STRING=36, INTEGER_VALUE=37, DECIMAL_VALUE=38, - IDENTIFIER=39, LINE_COMMENT=40, BRACKETED_COMMENT=41, WS=42; + OF=10, OR=11, SEQUENCE=12, TRUE=13, UNTIL=14, WHERE=15, WITH=16, PARAM=17, + EQ=18, NEQ=19, LT=20, LTE=21, GT=22, GTE=23, PLUS=24, MINUS=25, ASTERISK=26, + SLASH=27, PERCENT=28, DOT=29, COMMA=30, LB=31, RB=32, LP=33, RP=34, PIPE=35, + ESCAPED_IDENTIFIER=36, STRING=37, INTEGER_VALUE=38, DECIMAL_VALUE=39, + IDENTIFIER=40, LINE_COMMENT=41, BRACKETED_COMMENT=42, WS=43; public static String[] modeNames = { "DEFAULT_MODE" }; public static final String[] ruleNames = { "AND", "BY", "FALSE", "FORK", "IN", "JOIN", "MAXSPAN", "NOT", "NULL", - "OF", "OR", "SEQUENCE", "TRUE", "UNTIL", "WHERE", "WITH", "EQ", "NEQ", - "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", "PERCENT", - "DOT", "COMMA", "LB", "RB", "LP", "RP", "PIPE", "ESCAPED_IDENTIFIER", + "OF", "OR", "SEQUENCE", "TRUE", "UNTIL", "WHERE", "WITH", "PARAM", "EQ", + "NEQ", "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", + "PERCENT", "DOT", "COMMA", "LB", "RB", "LP", "RP", "PIPE", "ESCAPED_IDENTIFIER", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", "IDENTIFIER", "EXPONENT", "DIGIT", "LETTER", "LINE_COMMENT", "BRACKETED_COMMENT", "WS" }; @@ -39,15 +39,15 @@ class EqlBaseLexer extends Lexer { private static final String[] _LITERAL_NAMES = { null, "'and'", "'by'", "'false'", "'fork'", "'in'", "'join'", "'maxspan'", "'not'", "'null'", "'of'", "'or'", "'sequence'", "'true'", "'until'", - "'where'", "'with'", null, "'!='", "'<'", "'<='", "'>'", "'>='", "'+'", - "'-'", "'*'", "'/'", "'%'", "'.'", "','", "'['", "']'", "'('", "')'", - "'|'" + "'where'", "'with'", "'?'", null, "'!='", "'<'", "'<='", "'>'", "'>='", + "'+'", "'-'", "'*'", "'/'", "'%'", "'.'", "','", "'['", "']'", "'('", + "')'", "'|'" }; private static final String[] _SYMBOLIC_NAMES = { null, "AND", "BY", "FALSE", "FORK", "IN", "JOIN", "MAXSPAN", "NOT", "NULL", - "OF", "OR", "SEQUENCE", "TRUE", "UNTIL", "WHERE", "WITH", "EQ", "NEQ", - "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", "PERCENT", - "DOT", "COMMA", "LB", "RB", "LP", "RP", "PIPE", "ESCAPED_IDENTIFIER", + "OF", "OR", "SEQUENCE", "TRUE", "UNTIL", "WHERE", "WITH", "PARAM", "EQ", + "NEQ", "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", + "PERCENT", "DOT", "COMMA", "LB", "RB", "LP", "RP", "PIPE", "ESCAPED_IDENTIFIER", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", "IDENTIFIER", "LINE_COMMENT", "BRACKETED_COMMENT", "WS" }; @@ -106,140 +106,141 @@ public EqlBaseLexer(CharStream input) { public ATN getATN() { return _ATN; } public static final String _serializedATN = - "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2,\u017f\b\1\4\2\t"+ + "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2-\u0183\b\1\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\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+ "\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.\3\2\3\2\3\2\3\2\3\3\3\3\3\3\3\4\3\4\3\4\3\4\3\4\3\4\3"+ - "\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3\b"+ - "\3\b\3\b\3\b\3\t\3\t\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\f\3"+ - "\f\3\f\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\16\3\16\3\16\3\16\3\16\3"+ - "\17\3\17\3\17\3\17\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\21\3\21\3"+ - "\21\3\21\3\21\3\22\3\22\3\22\5\22\u00b1\n\22\3\23\3\23\3\23\3\24\3\24"+ - "\3\25\3\25\3\25\3\26\3\26\3\27\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\""+ - "\3#\3#\3$\3$\7$\u00da\n$\f$\16$\u00dd\13$\3$\3$\3%\3%\3%\3%\7%\u00e5\n"+ - "%\f%\16%\u00e8\13%\3%\3%\3%\3%\3%\7%\u00ef\n%\f%\16%\u00f2\13%\3%\3%\3"+ - "%\3%\3%\3%\3%\7%\u00fb\n%\f%\16%\u00fe\13%\3%\3%\3%\3%\3%\3%\3%\7%\u0107"+ - "\n%\f%\16%\u010a\13%\3%\5%\u010d\n%\3&\6&\u0110\n&\r&\16&\u0111\3\'\6"+ - "\'\u0115\n\'\r\'\16\'\u0116\3\'\3\'\7\'\u011b\n\'\f\'\16\'\u011e\13\'"+ - "\3\'\3\'\6\'\u0122\n\'\r\'\16\'\u0123\3\'\6\'\u0127\n\'\r\'\16\'\u0128"+ - "\3\'\3\'\7\'\u012d\n\'\f\'\16\'\u0130\13\'\5\'\u0132\n\'\3\'\3\'\3\'\3"+ - "\'\6\'\u0138\n\'\r\'\16\'\u0139\3\'\3\'\5\'\u013e\n\'\3(\3(\5(\u0142\n"+ - "(\3(\3(\3(\7(\u0147\n(\f(\16(\u014a\13(\3)\3)\5)\u014e\n)\3)\6)\u0151"+ - "\n)\r)\16)\u0152\3*\3*\3+\3+\3,\3,\3,\3,\7,\u015d\n,\f,\16,\u0160\13,"+ - "\3,\5,\u0163\n,\3,\5,\u0166\n,\3,\3,\3-\3-\3-\3-\3-\7-\u016f\n-\f-\16"+ - "-\u0172\13-\3-\3-\3-\3-\3-\3.\6.\u017a\n.\r.\16.\u017b\3.\3.\3\u0170\2"+ - "/\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\2S\2U\2W*Y+[,\3\2\17\3\2bb\n\2$$))^^ddhhppttv"+ - "v\6\2\f\f\17\17))^^\6\2\f\f\17\17$$^^\5\2\f\f\17\17$$\5\2\f\f\17\17))"+ - "\4\2BBaa\4\2GGgg\4\2--//\3\2\62;\4\2C\\c|\4\2\f\f\17\17\5\2\13\f\17\17"+ - "\"\"\u019f\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\2W\3\2\2\2\2Y"+ - "\3\2\2\2\2[\3\2\2\2\3]\3\2\2\2\5a\3\2\2\2\7d\3\2\2\2\tj\3\2\2\2\13o\3"+ - "\2\2\2\rr\3\2\2\2\17w\3\2\2\2\21\177\3\2\2\2\23\u0083\3\2\2\2\25\u0088"+ - "\3\2\2\2\27\u008b\3\2\2\2\31\u008e\3\2\2\2\33\u0097\3\2\2\2\35\u009c\3"+ - "\2\2\2\37\u00a2\3\2\2\2!\u00a8\3\2\2\2#\u00b0\3\2\2\2%\u00b2\3\2\2\2\'"+ - "\u00b5\3\2\2\2)\u00b7\3\2\2\2+\u00ba\3\2\2\2-\u00bc\3\2\2\2/\u00bf\3\2"+ - "\2\2\61\u00c1\3\2\2\2\63\u00c3\3\2\2\2\65\u00c5\3\2\2\2\67\u00c7\3\2\2"+ - "\29\u00c9\3\2\2\2;\u00cb\3\2\2\2=\u00cd\3\2\2\2?\u00cf\3\2\2\2A\u00d1"+ - "\3\2\2\2C\u00d3\3\2\2\2E\u00d5\3\2\2\2G\u00d7\3\2\2\2I\u010c\3\2\2\2K"+ - "\u010f\3\2\2\2M\u013d\3\2\2\2O\u0141\3\2\2\2Q\u014b\3\2\2\2S\u0154\3\2"+ - "\2\2U\u0156\3\2\2\2W\u0158\3\2\2\2Y\u0169\3\2\2\2[\u0179\3\2\2\2]^\7c"+ - "\2\2^_\7p\2\2_`\7f\2\2`\4\3\2\2\2ab\7d\2\2bc\7{\2\2c\6\3\2\2\2de\7h\2"+ - "\2ef\7c\2\2fg\7n\2\2gh\7u\2\2hi\7g\2\2i\b\3\2\2\2jk\7h\2\2kl\7q\2\2lm"+ - "\7t\2\2mn\7m\2\2n\n\3\2\2\2op\7k\2\2pq\7p\2\2q\f\3\2\2\2rs\7l\2\2st\7"+ - "q\2\2tu\7k\2\2uv\7p\2\2v\16\3\2\2\2wx\7o\2\2xy\7c\2\2yz\7z\2\2z{\7u\2"+ - "\2{|\7r\2\2|}\7c\2\2}~\7p\2\2~\20\3\2\2\2\177\u0080\7p\2\2\u0080\u0081"+ - "\7q\2\2\u0081\u0082\7v\2\2\u0082\22\3\2\2\2\u0083\u0084\7p\2\2\u0084\u0085"+ - "\7w\2\2\u0085\u0086\7n\2\2\u0086\u0087\7n\2\2\u0087\24\3\2\2\2\u0088\u0089"+ - "\7q\2\2\u0089\u008a\7h\2\2\u008a\26\3\2\2\2\u008b\u008c\7q\2\2\u008c\u008d"+ - "\7t\2\2\u008d\30\3\2\2\2\u008e\u008f\7u\2\2\u008f\u0090\7g\2\2\u0090\u0091"+ - "\7s\2\2\u0091\u0092\7w\2\2\u0092\u0093\7g\2\2\u0093\u0094\7p\2\2\u0094"+ - "\u0095\7e\2\2\u0095\u0096\7g\2\2\u0096\32\3\2\2\2\u0097\u0098\7v\2\2\u0098"+ - "\u0099\7t\2\2\u0099\u009a\7w\2\2\u009a\u009b\7g\2\2\u009b\34\3\2\2\2\u009c"+ - "\u009d\7w\2\2\u009d\u009e\7p\2\2\u009e\u009f\7v\2\2\u009f\u00a0\7k\2\2"+ - "\u00a0\u00a1\7n\2\2\u00a1\36\3\2\2\2\u00a2\u00a3\7y\2\2\u00a3\u00a4\7"+ - "j\2\2\u00a4\u00a5\7g\2\2\u00a5\u00a6\7t\2\2\u00a6\u00a7\7g\2\2\u00a7 "+ - "\3\2\2\2\u00a8\u00a9\7y\2\2\u00a9\u00aa\7k\2\2\u00aa\u00ab\7v\2\2\u00ab"+ - "\u00ac\7j\2\2\u00ac\"\3\2\2\2\u00ad\u00b1\7?\2\2\u00ae\u00af\7?\2\2\u00af"+ - "\u00b1\7?\2\2\u00b0\u00ad\3\2\2\2\u00b0\u00ae\3\2\2\2\u00b1$\3\2\2\2\u00b2"+ - "\u00b3\7#\2\2\u00b3\u00b4\7?\2\2\u00b4&\3\2\2\2\u00b5\u00b6\7>\2\2\u00b6"+ - "(\3\2\2\2\u00b7\u00b8\7>\2\2\u00b8\u00b9\7?\2\2\u00b9*\3\2\2\2\u00ba\u00bb"+ - "\7@\2\2\u00bb,\3\2\2\2\u00bc\u00bd\7@\2\2\u00bd\u00be\7?\2\2\u00be.\3"+ - "\2\2\2\u00bf\u00c0\7-\2\2\u00c0\60\3\2\2\2\u00c1\u00c2\7/\2\2\u00c2\62"+ - "\3\2\2\2\u00c3\u00c4\7,\2\2\u00c4\64\3\2\2\2\u00c5\u00c6\7\61\2\2\u00c6"+ - "\66\3\2\2\2\u00c7\u00c8\7\'\2\2\u00c88\3\2\2\2\u00c9\u00ca\7\60\2\2\u00ca"+ - ":\3\2\2\2\u00cb\u00cc\7.\2\2\u00cc<\3\2\2\2\u00cd\u00ce\7]\2\2\u00ce>"+ - "\3\2\2\2\u00cf\u00d0\7_\2\2\u00d0@\3\2\2\2\u00d1\u00d2\7*\2\2\u00d2B\3"+ - "\2\2\2\u00d3\u00d4\7+\2\2\u00d4D\3\2\2\2\u00d5\u00d6\7~\2\2\u00d6F\3\2"+ - "\2\2\u00d7\u00db\7b\2\2\u00d8\u00da\n\2\2\2\u00d9\u00d8\3\2\2\2\u00da"+ - "\u00dd\3\2\2\2\u00db\u00d9\3\2\2\2\u00db\u00dc\3\2\2\2\u00dc\u00de\3\2"+ - "\2\2\u00dd\u00db\3\2\2\2\u00de\u00df\7b\2\2\u00dfH\3\2\2\2\u00e0\u00e6"+ - "\7)\2\2\u00e1\u00e2\7^\2\2\u00e2\u00e5\t\3\2\2\u00e3\u00e5\n\4\2\2\u00e4"+ - "\u00e1\3\2\2\2\u00e4\u00e3\3\2\2\2\u00e5\u00e8\3\2\2\2\u00e6\u00e4\3\2"+ - "\2\2\u00e6\u00e7\3\2\2\2\u00e7\u00e9\3\2\2\2\u00e8\u00e6\3\2\2\2\u00e9"+ - "\u010d\7)\2\2\u00ea\u00f0\7$\2\2\u00eb\u00ec\7^\2\2\u00ec\u00ef\t\3\2"+ - "\2\u00ed\u00ef\n\5\2\2\u00ee\u00eb\3\2\2\2\u00ee\u00ed\3\2\2\2\u00ef\u00f2"+ - "\3\2\2\2\u00f0\u00ee\3\2\2\2\u00f0\u00f1\3\2\2\2\u00f1\u00f3\3\2\2\2\u00f2"+ - "\u00f0\3\2\2\2\u00f3\u010d\7$\2\2\u00f4\u00f5\7A\2\2\u00f5\u00f6\7$\2"+ - "\2\u00f6\u00fc\3\2\2\2\u00f7\u00f8\7^\2\2\u00f8\u00fb\7$\2\2\u00f9\u00fb"+ - "\n\6\2\2\u00fa\u00f7\3\2\2\2\u00fa\u00f9\3\2\2\2\u00fb\u00fe\3\2\2\2\u00fc"+ - "\u00fa\3\2\2\2\u00fc\u00fd\3\2\2\2\u00fd\u00ff\3\2\2\2\u00fe\u00fc\3\2"+ - "\2\2\u00ff\u010d\7$\2\2\u0100\u0101\7A\2\2\u0101\u0102\7)\2\2\u0102\u0108"+ - "\3\2\2\2\u0103\u0104\7^\2\2\u0104\u0107\7)\2\2\u0105\u0107\n\7\2\2\u0106"+ - "\u0103\3\2\2\2\u0106\u0105\3\2\2\2\u0107\u010a\3\2\2\2\u0108\u0106\3\2"+ - "\2\2\u0108\u0109\3\2\2\2\u0109\u010b\3\2\2\2\u010a\u0108\3\2\2\2\u010b"+ - "\u010d\7)\2\2\u010c\u00e0\3\2\2\2\u010c\u00ea\3\2\2\2\u010c\u00f4\3\2"+ - "\2\2\u010c\u0100\3\2\2\2\u010dJ\3\2\2\2\u010e\u0110\5S*\2\u010f\u010e"+ - "\3\2\2\2\u0110\u0111\3\2\2\2\u0111\u010f\3\2\2\2\u0111\u0112\3\2\2\2\u0112"+ - "L\3\2\2\2\u0113\u0115\5S*\2\u0114\u0113\3\2\2\2\u0115\u0116\3\2\2\2\u0116"+ - "\u0114\3\2\2\2\u0116\u0117\3\2\2\2\u0117\u0118\3\2\2\2\u0118\u011c\59"+ - "\35\2\u0119\u011b\5S*\2\u011a\u0119\3\2\2\2\u011b\u011e\3\2\2\2\u011c"+ - "\u011a\3\2\2\2\u011c\u011d\3\2\2\2\u011d\u013e\3\2\2\2\u011e\u011c\3\2"+ - "\2\2\u011f\u0121\59\35\2\u0120\u0122\5S*\2\u0121\u0120\3\2\2\2\u0122\u0123"+ - "\3\2\2\2\u0123\u0121\3\2\2\2\u0123\u0124\3\2\2\2\u0124\u013e\3\2\2\2\u0125"+ - "\u0127\5S*\2\u0126\u0125\3\2\2\2\u0127\u0128\3\2\2\2\u0128\u0126\3\2\2"+ - "\2\u0128\u0129\3\2\2\2\u0129\u0131\3\2\2\2\u012a\u012e\59\35\2\u012b\u012d"+ - "\5S*\2\u012c\u012b\3\2\2\2\u012d\u0130\3\2\2\2\u012e\u012c\3\2\2\2\u012e"+ - "\u012f\3\2\2\2\u012f\u0132\3\2\2\2\u0130\u012e\3\2\2\2\u0131\u012a\3\2"+ - "\2\2\u0131\u0132\3\2\2\2\u0132\u0133\3\2\2\2\u0133\u0134\5Q)\2\u0134\u013e"+ - "\3\2\2\2\u0135\u0137\59\35\2\u0136\u0138\5S*\2\u0137\u0136\3\2\2\2\u0138"+ - "\u0139\3\2\2\2\u0139\u0137\3\2\2\2\u0139\u013a\3\2\2\2\u013a\u013b\3\2"+ - "\2\2\u013b\u013c\5Q)\2\u013c\u013e\3\2\2\2\u013d\u0114\3\2\2\2\u013d\u011f"+ - "\3\2\2\2\u013d\u0126\3\2\2\2\u013d\u0135\3\2\2\2\u013eN\3\2\2\2\u013f"+ - "\u0142\5U+\2\u0140\u0142\t\b\2\2\u0141\u013f\3\2\2\2\u0141\u0140\3\2\2"+ - "\2\u0142\u0148\3\2\2\2\u0143\u0147\5U+\2\u0144\u0147\5S*\2\u0145\u0147"+ - "\7a\2\2\u0146\u0143\3\2\2\2\u0146\u0144\3\2\2\2\u0146\u0145\3\2\2\2\u0147"+ - "\u014a\3\2\2\2\u0148\u0146\3\2\2\2\u0148\u0149\3\2\2\2\u0149P\3\2\2\2"+ - "\u014a\u0148\3\2\2\2\u014b\u014d\t\t\2\2\u014c\u014e\t\n\2\2\u014d\u014c"+ - "\3\2\2\2\u014d\u014e\3\2\2\2\u014e\u0150\3\2\2\2\u014f\u0151\5S*\2\u0150"+ - "\u014f\3\2\2\2\u0151\u0152\3\2\2\2\u0152\u0150\3\2\2\2\u0152\u0153\3\2"+ - "\2\2\u0153R\3\2\2\2\u0154\u0155\t\13\2\2\u0155T\3\2\2\2\u0156\u0157\t"+ - "\f\2\2\u0157V\3\2\2\2\u0158\u0159\7\61\2\2\u0159\u015a\7\61\2\2\u015a"+ - "\u015e\3\2\2\2\u015b\u015d\n\r\2\2\u015c\u015b\3\2\2\2\u015d\u0160\3\2"+ - "\2\2\u015e\u015c\3\2\2\2\u015e\u015f\3\2\2\2\u015f\u0162\3\2\2\2\u0160"+ - "\u015e\3\2\2\2\u0161\u0163\7\17\2\2\u0162\u0161\3\2\2\2\u0162\u0163\3"+ - "\2\2\2\u0163\u0165\3\2\2\2\u0164\u0166\7\f\2\2\u0165\u0164\3\2\2\2\u0165"+ - "\u0166\3\2\2\2\u0166\u0167\3\2\2\2\u0167\u0168\b,\2\2\u0168X\3\2\2\2\u0169"+ - "\u016a\7\61\2\2\u016a\u016b\7,\2\2\u016b\u0170\3\2\2\2\u016c\u016f\5Y"+ - "-\2\u016d\u016f\13\2\2\2\u016e\u016c\3\2\2\2\u016e\u016d\3\2\2\2\u016f"+ - "\u0172\3\2\2\2\u0170\u0171\3\2\2\2\u0170\u016e\3\2\2\2\u0171\u0173\3\2"+ - "\2\2\u0172\u0170\3\2\2\2\u0173\u0174\7,\2\2\u0174\u0175\7\61\2\2\u0175"+ - "\u0176\3\2\2\2\u0176\u0177\b-\2\2\u0177Z\3\2\2\2\u0178\u017a\t\16\2\2"+ - "\u0179\u0178\3\2\2\2\u017a\u017b\3\2\2\2\u017b\u0179\3\2\2\2\u017b\u017c"+ - "\3\2\2\2\u017c\u017d\3\2\2\2\u017d\u017e\b.\2\2\u017e\\\3\2\2\2\"\2\u00b0"+ - "\u00db\u00e4\u00e6\u00ee\u00f0\u00fa\u00fc\u0106\u0108\u010c\u0111\u0116"+ - "\u011c\u0123\u0128\u012e\u0131\u0139\u013d\u0141\u0146\u0148\u014d\u0152"+ - "\u015e\u0162\u0165\u016e\u0170\u017b\3\2\3\2"; + ",\t,\4-\t-\4.\t.\4/\t/\3\2\3\2\3\2\3\2\3\3\3\3\3\3\3\4\3\4\3\4\3\4\3\4"+ + "\3\4\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3"+ + "\b\3\b\3\b\3\b\3\b\3\t\3\t\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\13\3\13\3\13"+ + "\3\f\3\f\3\f\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\16\3\16\3\16\3\16\3"+ + "\16\3\17\3\17\3\17\3\17\3\17\3\17\3\20\3\20\3\20\3\20\3\20\3\20\3\21\3"+ + "\21\3\21\3\21\3\21\3\22\3\22\3\23\3\23\3\23\5\23\u00b5\n\23\3\24\3\24"+ + "\3\24\3\25\3\25\3\26\3\26\3\26\3\27\3\27\3\30\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#\3$\3$\3%\3%\7%\u00de\n%\f%\16%\u00e1\13%\3%\3%\3&\3&\3&\3"+ + "&\7&\u00e9\n&\f&\16&\u00ec\13&\3&\3&\3&\3&\3&\7&\u00f3\n&\f&\16&\u00f6"+ + "\13&\3&\3&\3&\3&\3&\3&\3&\7&\u00ff\n&\f&\16&\u0102\13&\3&\3&\3&\3&\3&"+ + "\3&\3&\7&\u010b\n&\f&\16&\u010e\13&\3&\5&\u0111\n&\3\'\6\'\u0114\n\'\r"+ + "\'\16\'\u0115\3(\6(\u0119\n(\r(\16(\u011a\3(\3(\7(\u011f\n(\f(\16(\u0122"+ + "\13(\3(\3(\6(\u0126\n(\r(\16(\u0127\3(\6(\u012b\n(\r(\16(\u012c\3(\3("+ + "\7(\u0131\n(\f(\16(\u0134\13(\5(\u0136\n(\3(\3(\3(\3(\6(\u013c\n(\r(\16"+ + "(\u013d\3(\3(\5(\u0142\n(\3)\3)\5)\u0146\n)\3)\3)\3)\7)\u014b\n)\f)\16"+ + ")\u014e\13)\3*\3*\5*\u0152\n*\3*\6*\u0155\n*\r*\16*\u0156\3+\3+\3,\3,"+ + "\3-\3-\3-\3-\7-\u0161\n-\f-\16-\u0164\13-\3-\5-\u0167\n-\3-\5-\u016a\n"+ + "-\3-\3-\3.\3.\3.\3.\3.\7.\u0173\n.\f.\16.\u0176\13.\3.\3.\3.\3.\3.\3/"+ + "\6/\u017e\n/\r/\16/\u017f\3/\3/\3\u0174\2\60\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"+ + "\2U\2W\2Y+[,]-\3\2\17\3\2bb\n\2$$))^^ddhhppttvv\6\2\f\f\17\17))^^\6\2"+ + "\f\f\17\17$$^^\5\2\f\f\17\17$$\5\2\f\f\17\17))\4\2BBaa\4\2GGgg\4\2--/"+ + "/\3\2\62;\4\2C\\c|\4\2\f\f\17\17\5\2\13\f\17\17\"\"\u01a3\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\2Y\3\2\2\2\2[\3\2\2\2\2]"+ + "\3\2\2\2\3_\3\2\2\2\5c\3\2\2\2\7f\3\2\2\2\tl\3\2\2\2\13q\3\2\2\2\rt\3"+ + "\2\2\2\17y\3\2\2\2\21\u0081\3\2\2\2\23\u0085\3\2\2\2\25\u008a\3\2\2\2"+ + "\27\u008d\3\2\2\2\31\u0090\3\2\2\2\33\u0099\3\2\2\2\35\u009e\3\2\2\2\37"+ + "\u00a4\3\2\2\2!\u00aa\3\2\2\2#\u00af\3\2\2\2%\u00b4\3\2\2\2\'\u00b6\3"+ + "\2\2\2)\u00b9\3\2\2\2+\u00bb\3\2\2\2-\u00be\3\2\2\2/\u00c0\3\2\2\2\61"+ + "\u00c3\3\2\2\2\63\u00c5\3\2\2\2\65\u00c7\3\2\2\2\67\u00c9\3\2\2\29\u00cb"+ + "\3\2\2\2;\u00cd\3\2\2\2=\u00cf\3\2\2\2?\u00d1\3\2\2\2A\u00d3\3\2\2\2C"+ + "\u00d5\3\2\2\2E\u00d7\3\2\2\2G\u00d9\3\2\2\2I\u00db\3\2\2\2K\u0110\3\2"+ + "\2\2M\u0113\3\2\2\2O\u0141\3\2\2\2Q\u0145\3\2\2\2S\u014f\3\2\2\2U\u0158"+ + "\3\2\2\2W\u015a\3\2\2\2Y\u015c\3\2\2\2[\u016d\3\2\2\2]\u017d\3\2\2\2_"+ + "`\7c\2\2`a\7p\2\2ab\7f\2\2b\4\3\2\2\2cd\7d\2\2de\7{\2\2e\6\3\2\2\2fg\7"+ + "h\2\2gh\7c\2\2hi\7n\2\2ij\7u\2\2jk\7g\2\2k\b\3\2\2\2lm\7h\2\2mn\7q\2\2"+ + "no\7t\2\2op\7m\2\2p\n\3\2\2\2qr\7k\2\2rs\7p\2\2s\f\3\2\2\2tu\7l\2\2uv"+ + "\7q\2\2vw\7k\2\2wx\7p\2\2x\16\3\2\2\2yz\7o\2\2z{\7c\2\2{|\7z\2\2|}\7u"+ + "\2\2}~\7r\2\2~\177\7c\2\2\177\u0080\7p\2\2\u0080\20\3\2\2\2\u0081\u0082"+ + "\7p\2\2\u0082\u0083\7q\2\2\u0083\u0084\7v\2\2\u0084\22\3\2\2\2\u0085\u0086"+ + "\7p\2\2\u0086\u0087\7w\2\2\u0087\u0088\7n\2\2\u0088\u0089\7n\2\2\u0089"+ + "\24\3\2\2\2\u008a\u008b\7q\2\2\u008b\u008c\7h\2\2\u008c\26\3\2\2\2\u008d"+ + "\u008e\7q\2\2\u008e\u008f\7t\2\2\u008f\30\3\2\2\2\u0090\u0091\7u\2\2\u0091"+ + "\u0092\7g\2\2\u0092\u0093\7s\2\2\u0093\u0094\7w\2\2\u0094\u0095\7g\2\2"+ + "\u0095\u0096\7p\2\2\u0096\u0097\7e\2\2\u0097\u0098\7g\2\2\u0098\32\3\2"+ + "\2\2\u0099\u009a\7v\2\2\u009a\u009b\7t\2\2\u009b\u009c\7w\2\2\u009c\u009d"+ + "\7g\2\2\u009d\34\3\2\2\2\u009e\u009f\7w\2\2\u009f\u00a0\7p\2\2\u00a0\u00a1"+ + "\7v\2\2\u00a1\u00a2\7k\2\2\u00a2\u00a3\7n\2\2\u00a3\36\3\2\2\2\u00a4\u00a5"+ + "\7y\2\2\u00a5\u00a6\7j\2\2\u00a6\u00a7\7g\2\2\u00a7\u00a8\7t\2\2\u00a8"+ + "\u00a9\7g\2\2\u00a9 \3\2\2\2\u00aa\u00ab\7y\2\2\u00ab\u00ac\7k\2\2\u00ac"+ + "\u00ad\7v\2\2\u00ad\u00ae\7j\2\2\u00ae\"\3\2\2\2\u00af\u00b0\7A\2\2\u00b0"+ + "$\3\2\2\2\u00b1\u00b5\7?\2\2\u00b2\u00b3\7?\2\2\u00b3\u00b5\7?\2\2\u00b4"+ + "\u00b1\3\2\2\2\u00b4\u00b2\3\2\2\2\u00b5&\3\2\2\2\u00b6\u00b7\7#\2\2\u00b7"+ + "\u00b8\7?\2\2\u00b8(\3\2\2\2\u00b9\u00ba\7>\2\2\u00ba*\3\2\2\2\u00bb\u00bc"+ + "\7>\2\2\u00bc\u00bd\7?\2\2\u00bd,\3\2\2\2\u00be\u00bf\7@\2\2\u00bf.\3"+ + "\2\2\2\u00c0\u00c1\7@\2\2\u00c1\u00c2\7?\2\2\u00c2\60\3\2\2\2\u00c3\u00c4"+ + "\7-\2\2\u00c4\62\3\2\2\2\u00c5\u00c6\7/\2\2\u00c6\64\3\2\2\2\u00c7\u00c8"+ + "\7,\2\2\u00c8\66\3\2\2\2\u00c9\u00ca\7\61\2\2\u00ca8\3\2\2\2\u00cb\u00cc"+ + "\7\'\2\2\u00cc:\3\2\2\2\u00cd\u00ce\7\60\2\2\u00ce<\3\2\2\2\u00cf\u00d0"+ + "\7.\2\2\u00d0>\3\2\2\2\u00d1\u00d2\7]\2\2\u00d2@\3\2\2\2\u00d3\u00d4\7"+ + "_\2\2\u00d4B\3\2\2\2\u00d5\u00d6\7*\2\2\u00d6D\3\2\2\2\u00d7\u00d8\7+"+ + "\2\2\u00d8F\3\2\2\2\u00d9\u00da\7~\2\2\u00daH\3\2\2\2\u00db\u00df\7b\2"+ + "\2\u00dc\u00de\n\2\2\2\u00dd\u00dc\3\2\2\2\u00de\u00e1\3\2\2\2\u00df\u00dd"+ + "\3\2\2\2\u00df\u00e0\3\2\2\2\u00e0\u00e2\3\2\2\2\u00e1\u00df\3\2\2\2\u00e2"+ + "\u00e3\7b\2\2\u00e3J\3\2\2\2\u00e4\u00ea\7)\2\2\u00e5\u00e6\7^\2\2\u00e6"+ + "\u00e9\t\3\2\2\u00e7\u00e9\n\4\2\2\u00e8\u00e5\3\2\2\2\u00e8\u00e7\3\2"+ + "\2\2\u00e9\u00ec\3\2\2\2\u00ea\u00e8\3\2\2\2\u00ea\u00eb\3\2\2\2\u00eb"+ + "\u00ed\3\2\2\2\u00ec\u00ea\3\2\2\2\u00ed\u0111\7)\2\2\u00ee\u00f4\7$\2"+ + "\2\u00ef\u00f0\7^\2\2\u00f0\u00f3\t\3\2\2\u00f1\u00f3\n\5\2\2\u00f2\u00ef"+ + "\3\2\2\2\u00f2\u00f1\3\2\2\2\u00f3\u00f6\3\2\2\2\u00f4\u00f2\3\2\2\2\u00f4"+ + "\u00f5\3\2\2\2\u00f5\u00f7\3\2\2\2\u00f6\u00f4\3\2\2\2\u00f7\u0111\7$"+ + "\2\2\u00f8\u00f9\7A\2\2\u00f9\u00fa\7$\2\2\u00fa\u0100\3\2\2\2\u00fb\u00fc"+ + "\7^\2\2\u00fc\u00ff\7$\2\2\u00fd\u00ff\n\6\2\2\u00fe\u00fb\3\2\2\2\u00fe"+ + "\u00fd\3\2\2\2\u00ff\u0102\3\2\2\2\u0100\u00fe\3\2\2\2\u0100\u0101\3\2"+ + "\2\2\u0101\u0103\3\2\2\2\u0102\u0100\3\2\2\2\u0103\u0111\7$\2\2\u0104"+ + "\u0105\7A\2\2\u0105\u0106\7)\2\2\u0106\u010c\3\2\2\2\u0107\u0108\7^\2"+ + "\2\u0108\u010b\7)\2\2\u0109\u010b\n\7\2\2\u010a\u0107\3\2\2\2\u010a\u0109"+ + "\3\2\2\2\u010b\u010e\3\2\2\2\u010c\u010a\3\2\2\2\u010c\u010d\3\2\2\2\u010d"+ + "\u010f\3\2\2\2\u010e\u010c\3\2\2\2\u010f\u0111\7)\2\2\u0110\u00e4\3\2"+ + "\2\2\u0110\u00ee\3\2\2\2\u0110\u00f8\3\2\2\2\u0110\u0104\3\2\2\2\u0111"+ + "L\3\2\2\2\u0112\u0114\5U+\2\u0113\u0112\3\2\2\2\u0114\u0115\3\2\2\2\u0115"+ + "\u0113\3\2\2\2\u0115\u0116\3\2\2\2\u0116N\3\2\2\2\u0117\u0119\5U+\2\u0118"+ + "\u0117\3\2\2\2\u0119\u011a\3\2\2\2\u011a\u0118\3\2\2\2\u011a\u011b\3\2"+ + "\2\2\u011b\u011c\3\2\2\2\u011c\u0120\5;\36\2\u011d\u011f\5U+\2\u011e\u011d"+ + "\3\2\2\2\u011f\u0122\3\2\2\2\u0120\u011e\3\2\2\2\u0120\u0121\3\2\2\2\u0121"+ + "\u0142\3\2\2\2\u0122\u0120\3\2\2\2\u0123\u0125\5;\36\2\u0124\u0126\5U"+ + "+\2\u0125\u0124\3\2\2\2\u0126\u0127\3\2\2\2\u0127\u0125\3\2\2\2\u0127"+ + "\u0128\3\2\2\2\u0128\u0142\3\2\2\2\u0129\u012b\5U+\2\u012a\u0129\3\2\2"+ + "\2\u012b\u012c\3\2\2\2\u012c\u012a\3\2\2\2\u012c\u012d\3\2\2\2\u012d\u0135"+ + "\3\2\2\2\u012e\u0132\5;\36\2\u012f\u0131\5U+\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\u012e\3\2\2\2\u0135\u0136\3\2\2\2\u0136"+ + "\u0137\3\2\2\2\u0137\u0138\5S*\2\u0138\u0142\3\2\2\2\u0139\u013b\5;\36"+ + "\2\u013a\u013c\5U+\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\u013f\3\2\2\2\u013f\u0140\5S*\2\u0140"+ + "\u0142\3\2\2\2\u0141\u0118\3\2\2\2\u0141\u0123\3\2\2\2\u0141\u012a\3\2"+ + "\2\2\u0141\u0139\3\2\2\2\u0142P\3\2\2\2\u0143\u0146\5W,\2\u0144\u0146"+ + "\t\b\2\2\u0145\u0143\3\2\2\2\u0145\u0144\3\2\2\2\u0146\u014c\3\2\2\2\u0147"+ + "\u014b\5W,\2\u0148\u014b\5U+\2\u0149\u014b\7a\2\2\u014a\u0147\3\2\2\2"+ + "\u014a\u0148\3\2\2\2\u014a\u0149\3\2\2\2\u014b\u014e\3\2\2\2\u014c\u014a"+ + "\3\2\2\2\u014c\u014d\3\2\2\2\u014dR\3\2\2\2\u014e\u014c\3\2\2\2\u014f"+ + "\u0151\t\t\2\2\u0150\u0152\t\n\2\2\u0151\u0150\3\2\2\2\u0151\u0152\3\2"+ + "\2\2\u0152\u0154\3\2\2\2\u0153\u0155\5U+\2\u0154\u0153\3\2\2\2\u0155\u0156"+ + "\3\2\2\2\u0156\u0154\3\2\2\2\u0156\u0157\3\2\2\2\u0157T\3\2\2\2\u0158"+ + "\u0159\t\13\2\2\u0159V\3\2\2\2\u015a\u015b\t\f\2\2\u015bX\3\2\2\2\u015c"+ + "\u015d\7\61\2\2\u015d\u015e\7\61\2\2\u015e\u0162\3\2\2\2\u015f\u0161\n"+ + "\r\2\2\u0160\u015f\3\2\2\2\u0161\u0164\3\2\2\2\u0162\u0160\3\2\2\2\u0162"+ + "\u0163\3\2\2\2\u0163\u0166\3\2\2\2\u0164\u0162\3\2\2\2\u0165\u0167\7\17"+ + "\2\2\u0166\u0165\3\2\2\2\u0166\u0167\3\2\2\2\u0167\u0169\3\2\2\2\u0168"+ + "\u016a\7\f\2\2\u0169\u0168\3\2\2\2\u0169\u016a\3\2\2\2\u016a\u016b\3\2"+ + "\2\2\u016b\u016c\b-\2\2\u016cZ\3\2\2\2\u016d\u016e\7\61\2\2\u016e\u016f"+ + "\7,\2\2\u016f\u0174\3\2\2\2\u0170\u0173\5[.\2\u0171\u0173\13\2\2\2\u0172"+ + "\u0170\3\2\2\2\u0172\u0171\3\2\2\2\u0173\u0176\3\2\2\2\u0174\u0175\3\2"+ + "\2\2\u0174\u0172\3\2\2\2\u0175\u0177\3\2\2\2\u0176\u0174\3\2\2\2\u0177"+ + "\u0178\7,\2\2\u0178\u0179\7\61\2\2\u0179\u017a\3\2\2\2\u017a\u017b\b."+ + "\2\2\u017b\\\3\2\2\2\u017c\u017e\t\16\2\2\u017d\u017c\3\2\2\2\u017e\u017f"+ + "\3\2\2\2\u017f\u017d\3\2\2\2\u017f\u0180\3\2\2\2\u0180\u0181\3\2\2\2\u0181"+ + "\u0182\b/\2\2\u0182^\3\2\2\2\"\2\u00b4\u00df\u00e8\u00ea\u00f2\u00f4\u00fe"+ + "\u0100\u010a\u010c\u0110\u0115\u011a\u0120\u0127\u012c\u0132\u0135\u013d"+ + "\u0141\u0145\u014a\u014c\u0151\u0156\u0162\u0166\u0169\u0172\u0174\u017f"+ + "\3\2\3\2"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseListener.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseListener.java index 61e50f121c72c..d1c0e3e244e1e 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseListener.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseListener.java @@ -359,6 +359,18 @@ interface EqlBaseListener extends ParseTreeListener { * @param ctx the parse tree */ void exitStringLiteral(EqlBaseParser.StringLiteralContext ctx); + /** + * Enter a parse tree produced by the {@code paramLiteral} + * labeled alternative in {@link EqlBaseParser#constant}. + * @param ctx the parse tree + */ + void enterParamLiteral(EqlBaseParser.ParamLiteralContext ctx); + /** + * Exit a parse tree produced by the {@code paramLiteral} + * labeled alternative in {@link EqlBaseParser#constant}. + * @param ctx the parse tree + */ + void exitParamLiteral(EqlBaseParser.ParamLiteralContext ctx); /** * Enter a parse tree produced by {@link EqlBaseParser#comparisonOperator}. * @param ctx the parse tree diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseParser.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseParser.java index a19f7dcdb50be..3c311ae0f2b53 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseParser.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseParser.java @@ -18,11 +18,11 @@ class EqlBaseParser extends Parser { new PredictionContextCache(); public static final int AND=1, BY=2, FALSE=3, FORK=4, IN=5, JOIN=6, MAXSPAN=7, NOT=8, NULL=9, - OF=10, OR=11, SEQUENCE=12, TRUE=13, UNTIL=14, WHERE=15, WITH=16, EQ=17, - NEQ=18, LT=19, LTE=20, GT=21, GTE=22, PLUS=23, MINUS=24, ASTERISK=25, - SLASH=26, PERCENT=27, DOT=28, COMMA=29, LB=30, RB=31, LP=32, RP=33, PIPE=34, - ESCAPED_IDENTIFIER=35, STRING=36, INTEGER_VALUE=37, DECIMAL_VALUE=38, - IDENTIFIER=39, LINE_COMMENT=40, BRACKETED_COMMENT=41, WS=42; + OF=10, OR=11, SEQUENCE=12, TRUE=13, UNTIL=14, WHERE=15, WITH=16, PARAM=17, + EQ=18, NEQ=19, LT=20, LTE=21, GT=22, GTE=23, PLUS=24, MINUS=25, ASTERISK=26, + SLASH=27, PERCENT=28, DOT=29, COMMA=30, LB=31, RB=32, LP=33, RP=34, PIPE=35, + ESCAPED_IDENTIFIER=36, STRING=37, INTEGER_VALUE=38, DECIMAL_VALUE=39, + IDENTIFIER=40, LINE_COMMENT=41, BRACKETED_COMMENT=42, WS=43; public static final int RULE_singleStatement = 0, RULE_singleExpression = 1, RULE_statement = 2, RULE_query = 3, RULE_sequenceParams = 4, RULE_sequence = 5, RULE_join = 6, @@ -43,15 +43,15 @@ class EqlBaseParser extends Parser { private static final String[] _LITERAL_NAMES = { null, "'and'", "'by'", "'false'", "'fork'", "'in'", "'join'", "'maxspan'", "'not'", "'null'", "'of'", "'or'", "'sequence'", "'true'", "'until'", - "'where'", "'with'", null, "'!='", "'<'", "'<='", "'>'", "'>='", "'+'", - "'-'", "'*'", "'/'", "'%'", "'.'", "','", "'['", "']'", "'('", "')'", - "'|'" + "'where'", "'with'", "'?'", null, "'!='", "'<'", "'<='", "'>'", "'>='", + "'+'", "'-'", "'*'", "'/'", "'%'", "'.'", "','", "'['", "']'", "'('", + "')'", "'|'" }; private static final String[] _SYMBOLIC_NAMES = { null, "AND", "BY", "FALSE", "FORK", "IN", "JOIN", "MAXSPAN", "NOT", "NULL", - "OF", "OR", "SEQUENCE", "TRUE", "UNTIL", "WHERE", "WITH", "EQ", "NEQ", - "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", "PERCENT", - "DOT", "COMMA", "LB", "RB", "LP", "RP", "PIPE", "ESCAPED_IDENTIFIER", + "OF", "OR", "SEQUENCE", "TRUE", "UNTIL", "WHERE", "WITH", "PARAM", "EQ", + "NEQ", "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", + "PERCENT", "DOT", "COMMA", "LB", "RB", "LP", "RP", "PIPE", "ESCAPED_IDENTIFIER", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", "IDENTIFIER", "LINE_COMMENT", "BRACKETED_COMMENT", "WS" }; @@ -647,7 +647,7 @@ public final PipeContext pipe() throws RecognitionException { ((PipeContext)_localctx).kind = match(IDENTIFIER); setState(122); _la = _input.LA(1); - if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << FALSE) | (1L << NOT) | (1L << NULL) | (1L << TRUE) | (1L << PLUS) | (1L << MINUS) | (1L << LP) | (1L << ESCAPED_IDENTIFIER) | (1L << STRING) | (1L << INTEGER_VALUE) | (1L << DECIMAL_VALUE) | (1L << IDENTIFIER))) != 0)) { + if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << FALSE) | (1L << NOT) | (1L << NULL) | (1L << TRUE) | (1L << PARAM) | (1L << PLUS) | (1L << MINUS) | (1L << LP) | (1L << ESCAPED_IDENTIFIER) | (1L << STRING) | (1L << INTEGER_VALUE) | (1L << DECIMAL_VALUE) | (1L << IDENTIFIER))) != 0)) { { setState(114); booleanExpression(0); @@ -1387,6 +1387,7 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti case FALSE: case NULL: case TRUE: + case PARAM: case LP: case ESCAPED_IDENTIFIER: case STRING: @@ -1797,7 +1798,7 @@ public final FunctionExpressionContext functionExpression() throws RecognitionEx match(LP); setState(236); _la = _input.LA(1); - if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << FALSE) | (1L << NOT) | (1L << NULL) | (1L << TRUE) | (1L << PLUS) | (1L << MINUS) | (1L << LP) | (1L << ESCAPED_IDENTIFIER) | (1L << STRING) | (1L << INTEGER_VALUE) | (1L << DECIMAL_VALUE) | (1L << IDENTIFIER))) != 0)) { + if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << FALSE) | (1L << NOT) | (1L << NULL) | (1L << TRUE) | (1L << PARAM) | (1L << PLUS) | (1L << MINUS) | (1L << LP) | (1L << ESCAPED_IDENTIFIER) | (1L << STRING) | (1L << INTEGER_VALUE) | (1L << DECIMAL_VALUE) | (1L << IDENTIFIER))) != 0)) { { setState(228); expression(); @@ -1882,6 +1883,23 @@ public T accept(ParseTreeVisitor visitor) { else return visitor.visitChildren(this); } } + public static class ParamLiteralContext extends ConstantContext { + public TerminalNode PARAM() { return getToken(EqlBaseParser.PARAM, 0); } + public ParamLiteralContext(ConstantContext ctx) { copyFrom(ctx); } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof EqlBaseListener ) ((EqlBaseListener)listener).enterParamLiteral(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof EqlBaseListener ) ((EqlBaseListener)listener).exitParamLiteral(this); + } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof EqlBaseVisitor ) return ((EqlBaseVisitor)visitor).visitParamLiteral(this); + else return visitor.visitChildren(this); + } + } public static class NumericLiteralContext extends ConstantContext { public NumberContext number() { return getRuleContext(NumberContext.class,0); @@ -1925,7 +1943,7 @@ public final ConstantContext constant() throws RecognitionException { ConstantContext _localctx = new ConstantContext(_ctx, getState()); enterRule(_localctx, 38, RULE_constant); try { - setState(244); + setState(245); switch (_input.LA(1)) { case NULL: _localctx = new NullLiteralContext(_localctx); @@ -1961,6 +1979,14 @@ public final ConstantContext constant() throws RecognitionException { string(); } break; + case PARAM: + _localctx = new ParamLiteralContext(_localctx); + enterOuterAlt(_localctx, 5); + { + setState(244); + match(PARAM); + } + break; default: throw new NoViableAltException(this); } @@ -2009,7 +2035,7 @@ public final ComparisonOperatorContext comparisonOperator() throws RecognitionEx try { enterOuterAlt(_localctx, 1); { - setState(246); + setState(247); _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); @@ -2058,7 +2084,7 @@ public final BooleanValueContext booleanValue() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(248); + setState(249); _la = _input.LA(1); if ( !(_la==FALSE || _la==TRUE) ) { _errHandler.recoverInline(this); @@ -2128,43 +2154,43 @@ public final QualifiedNameContext qualifiedName() throws RecognitionException { int _alt; enterOuterAlt(_localctx, 1); { - setState(250); + setState(251); identifier(); - setState(262); + setState(263); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,32,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { - setState(260); + setState(261); switch (_input.LA(1)) { case DOT: { - setState(251); - match(DOT); setState(252); + match(DOT); + setState(253); identifier(); } break; case LB: { - setState(253); + setState(254); match(LB); - setState(255); + setState(256); _errHandler.sync(this); _la = _input.LA(1); do { { { - setState(254); + setState(255); match(INTEGER_VALUE); } } - setState(257); + setState(258); _errHandler.sync(this); _la = _input.LA(1); } while ( _la==INTEGER_VALUE ); - setState(259); + setState(260); match(RB); } break; @@ -2173,7 +2199,7 @@ public final QualifiedNameContext qualifiedName() throws RecognitionException { } } } - setState(264); + setState(265); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,32,_ctx); } @@ -2219,7 +2245,7 @@ public final IdentifierContext identifier() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(265); + setState(266); _la = _input.LA(1); if ( !(_la==ESCAPED_IDENTIFIER || _la==IDENTIFIER) ) { _errHandler.recoverInline(this); @@ -2271,13 +2297,13 @@ public final TimeUnitContext timeUnit() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(267); + setState(268); number(); - setState(269); + setState(270); _la = _input.LA(1); if (_la==IDENTIFIER) { { - setState(268); + setState(269); ((TimeUnitContext)_localctx).unit = match(IDENTIFIER); } } @@ -2345,13 +2371,13 @@ public final NumberContext number() throws RecognitionException { NumberContext _localctx = new NumberContext(_ctx, getState()); enterRule(_localctx, 50, RULE_number); try { - setState(273); + setState(274); switch (_input.LA(1)) { case DECIMAL_VALUE: _localctx = new DecimalLiteralContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(271); + setState(272); match(DECIMAL_VALUE); } break; @@ -2359,7 +2385,7 @@ public final NumberContext number() throws RecognitionException { _localctx = new IntegerLiteralContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(272); + setState(273); match(INTEGER_VALUE); } break; @@ -2405,7 +2431,7 @@ public final StringContext string() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(275); + setState(276); match(STRING); } } @@ -2451,7 +2477,7 @@ private boolean valueExpression_sempred(ValueExpressionContext _localctx, int pr } public static final String _serializedATN = - "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3,\u0118\4\2\t\2\4"+ + "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3-\u0119\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\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+ @@ -2469,83 +2495,84 @@ private boolean valueExpression_sempred(ValueExpressionContext _localctx, int pr "\13\21\3\22\5\22\u00ce\n\22\3\22\3\22\3\22\3\22\3\22\7\22\u00d5\n\22\f"+ "\22\16\22\u00d8\13\22\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23\3\23\5\23"+ "\u00e3\n\23\3\24\3\24\3\24\3\24\3\24\7\24\u00ea\n\24\f\24\16\24\u00ed"+ - "\13\24\5\24\u00ef\n\24\3\24\3\24\3\25\3\25\3\25\3\25\5\25\u00f7\n\25\3"+ - "\26\3\26\3\27\3\27\3\30\3\30\3\30\3\30\3\30\6\30\u0102\n\30\r\30\16\30"+ - "\u0103\3\30\7\30\u0107\n\30\f\30\16\30\u010a\13\30\3\31\3\31\3\32\3\32"+ - "\5\32\u0110\n\32\3\33\3\33\5\33\u0114\n\33\3\34\3\34\3\34\2\4\36 \35\2"+ - "\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\64\66\2\7\3\2\31"+ - "\32\3\2\33\35\3\2\23\30\4\2\5\5\17\17\4\2%%))\u0127\28\3\2\2\2\4;\3\2"+ - "\2\2\6>\3\2\2\2\bH\3\2\2\2\nJ\3\2\2\2\fO\3\2\2\2\16d\3\2\2\2\20r\3\2\2"+ - "\2\22~\3\2\2\2\24\u0087\3\2\2\2\26\u008b\3\2\2\2\30\u0096\3\2\2\2\32\u009a"+ - "\3\2\2\2\34\u009e\3\2\2\2\36\u00a7\3\2\2\2 \u00bb\3\2\2\2\"\u00cd\3\2"+ - "\2\2$\u00e2\3\2\2\2&\u00e4\3\2\2\2(\u00f6\3\2\2\2*\u00f8\3\2\2\2,\u00fa"+ - "\3\2\2\2.\u00fc\3\2\2\2\60\u010b\3\2\2\2\62\u010d\3\2\2\2\64\u0113\3\2"+ - "\2\2\66\u0115\3\2\2\289\5\6\4\29:\7\2\2\3:\3\3\2\2\2;<\5\34\17\2<=\7\2"+ - "\2\3=\5\3\2\2\2>B\5\b\5\2?A\5\20\t\2@?\3\2\2\2AD\3\2\2\2B@\3\2\2\2BC\3"+ - "\2\2\2C\7\3\2\2\2DB\3\2\2\2EI\5\f\7\2FI\5\16\b\2GI\5\32\16\2HE\3\2\2\2"+ - "HF\3\2\2\2HG\3\2\2\2I\t\3\2\2\2JK\7\22\2\2KL\7\t\2\2LM\7\23\2\2MN\5\62"+ - "\32\2N\13\3\2\2\2OX\7\16\2\2PR\5\22\n\2QS\5\n\6\2RQ\3\2\2\2RS\3\2\2\2"+ - "SY\3\2\2\2TV\5\n\6\2UW\5\22\n\2VU\3\2\2\2VW\3\2\2\2WY\3\2\2\2XP\3\2\2"+ - "\2XT\3\2\2\2XY\3\2\2\2YZ\3\2\2\2Z\\\5\26\f\2[]\5\26\f\2\\[\3\2\2\2]^\3"+ - "\2\2\2^\\\3\2\2\2^_\3\2\2\2_b\3\2\2\2`a\7\20\2\2ac\5\26\f\2b`\3\2\2\2"+ - "bc\3\2\2\2c\r\3\2\2\2df\7\b\2\2eg\5\22\n\2fe\3\2\2\2fg\3\2\2\2gh\3\2\2"+ - "\2hj\5\24\13\2ik\5\24\13\2ji\3\2\2\2kl\3\2\2\2lj\3\2\2\2lm\3\2\2\2mp\3"+ - "\2\2\2no\7\20\2\2oq\5\24\13\2pn\3\2\2\2pq\3\2\2\2q\17\3\2\2\2rs\7$\2\2"+ - "s|\7)\2\2ty\5\36\20\2uv\7\37\2\2vx\5\36\20\2wu\3\2\2\2x{\3\2\2\2yw\3\2"+ - "\2\2yz\3\2\2\2z}\3\2\2\2{y\3\2\2\2|t\3\2\2\2|}\3\2\2\2}\21\3\2\2\2~\177"+ - "\7\4\2\2\177\u0084\5\34\17\2\u0080\u0081\7\37\2\2\u0081\u0083\5\34\17"+ - "\2\u0082\u0080\3\2\2\2\u0083\u0086\3\2\2\2\u0084\u0082\3\2\2\2\u0084\u0085"+ - "\3\2\2\2\u0085\23\3\2\2\2\u0086\u0084\3\2\2\2\u0087\u0089\5\30\r\2\u0088"+ - "\u008a\5\22\n\2\u0089\u0088\3\2\2\2\u0089\u008a\3\2\2\2\u008a\25\3\2\2"+ - "\2\u008b\u0091\5\30\r\2\u008c\u008f\7\6\2\2\u008d\u008e\7\23\2\2\u008e"+ - "\u0090\5,\27\2\u008f\u008d\3\2\2\2\u008f\u0090\3\2\2\2\u0090\u0092\3\2"+ - "\2\2\u0091\u008c\3\2\2\2\u0091\u0092\3\2\2\2\u0092\u0094\3\2\2\2\u0093"+ - "\u0095\5\22\n\2\u0094\u0093\3\2\2\2\u0094\u0095\3\2\2\2\u0095\27\3\2\2"+ - "\2\u0096\u0097\7 \2\2\u0097\u0098\5\32\16\2\u0098\u0099\7!\2\2\u0099\31"+ - "\3\2\2\2\u009a\u009b\5\60\31\2\u009b\u009c\7\21\2\2\u009c\u009d\5\34\17"+ - "\2\u009d\33\3\2\2\2\u009e\u009f\5\36\20\2\u009f\35\3\2\2\2\u00a0\u00a1"+ - "\b\20\1\2\u00a1\u00a2\7\n\2\2\u00a2\u00a8\5\36\20\7\u00a3\u00a4\7)\2\2"+ - "\u00a4\u00a5\7\f\2\2\u00a5\u00a8\5\30\r\2\u00a6\u00a8\5 \21\2\u00a7\u00a0"+ - "\3\2\2\2\u00a7\u00a3\3\2\2\2\u00a7\u00a6\3\2\2\2\u00a8\u00b1\3\2\2\2\u00a9"+ - "\u00aa\f\4\2\2\u00aa\u00ab\7\3\2\2\u00ab\u00b0\5\36\20\5\u00ac\u00ad\f"+ - "\3\2\2\u00ad\u00ae\7\r\2\2\u00ae\u00b0\5\36\20\4\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\37\3\2\2\2\u00b3\u00b1\3\2\2\2\u00b4\u00b5\b\21\1\2\u00b5\u00b7"+ - "\5$\23\2\u00b6\u00b8\5\"\22\2\u00b7\u00b6\3\2\2\2\u00b7\u00b8\3\2\2\2"+ - "\u00b8\u00bc\3\2\2\2\u00b9\u00ba\t\2\2\2\u00ba\u00bc\5 \21\6\u00bb\u00b4"+ - "\3\2\2\2\u00bb\u00b9\3\2\2\2\u00bc\u00c9\3\2\2\2\u00bd\u00be\f\5\2\2\u00be"+ - "\u00bf\t\3\2\2\u00bf\u00c8\5 \21\6\u00c0\u00c1\f\4\2\2\u00c1\u00c2\t\2"+ - "\2\2\u00c2\u00c8\5 \21\5\u00c3\u00c4\f\3\2\2\u00c4\u00c5\5*\26\2\u00c5"+ - "\u00c6\5 \21\4\u00c6\u00c8\3\2\2\2\u00c7\u00bd\3\2\2\2\u00c7\u00c0\3\2"+ - "\2\2\u00c7\u00c3\3\2\2\2\u00c8\u00cb\3\2\2\2\u00c9\u00c7\3\2\2\2\u00c9"+ - "\u00ca\3\2\2\2\u00ca!\3\2\2\2\u00cb\u00c9\3\2\2\2\u00cc\u00ce\7\n\2\2"+ - "\u00cd\u00cc\3\2\2\2\u00cd\u00ce\3\2\2\2\u00ce\u00cf\3\2\2\2\u00cf\u00d0"+ - "\7\7\2\2\u00d0\u00d1\7\"\2\2\u00d1\u00d6\5\34\17\2\u00d2\u00d3\7\37\2"+ - "\2\u00d3\u00d5\5\34\17\2\u00d4\u00d2\3\2\2\2\u00d5\u00d8\3\2\2\2\u00d6"+ - "\u00d4\3\2\2\2\u00d6\u00d7\3\2\2\2\u00d7\u00d9\3\2\2\2\u00d8\u00d6\3\2"+ - "\2\2\u00d9\u00da\7#\2\2\u00da#\3\2\2\2\u00db\u00e3\5(\25\2\u00dc\u00e3"+ - "\5&\24\2\u00dd\u00e3\5.\30\2\u00de\u00df\7\"\2\2\u00df\u00e0\5\34\17\2"+ - "\u00e0\u00e1\7#\2\2\u00e1\u00e3\3\2\2\2\u00e2\u00db\3\2\2\2\u00e2\u00dc"+ - "\3\2\2\2\u00e2\u00dd\3\2\2\2\u00e2\u00de\3\2\2\2\u00e3%\3\2\2\2\u00e4"+ - "\u00e5\7)\2\2\u00e5\u00ee\7\"\2\2\u00e6\u00eb\5\34\17\2\u00e7\u00e8\7"+ - "\37\2\2\u00e8\u00ea\5\34\17\2\u00e9\u00e7\3\2\2\2\u00ea\u00ed\3\2\2\2"+ + "\13\24\5\24\u00ef\n\24\3\24\3\24\3\25\3\25\3\25\3\25\3\25\5\25\u00f8\n"+ + "\25\3\26\3\26\3\27\3\27\3\30\3\30\3\30\3\30\3\30\6\30\u0103\n\30\r\30"+ + "\16\30\u0104\3\30\7\30\u0108\n\30\f\30\16\30\u010b\13\30\3\31\3\31\3\32"+ + "\3\32\5\32\u0111\n\32\3\33\3\33\5\33\u0115\n\33\3\34\3\34\3\34\2\4\36"+ + " \35\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\64\66\2\7\3"+ + "\2\32\33\3\2\34\36\3\2\24\31\4\2\5\5\17\17\4\2&&**\u0129\28\3\2\2\2\4"+ + ";\3\2\2\2\6>\3\2\2\2\bH\3\2\2\2\nJ\3\2\2\2\fO\3\2\2\2\16d\3\2\2\2\20r"+ + "\3\2\2\2\22~\3\2\2\2\24\u0087\3\2\2\2\26\u008b\3\2\2\2\30\u0096\3\2\2"+ + "\2\32\u009a\3\2\2\2\34\u009e\3\2\2\2\36\u00a7\3\2\2\2 \u00bb\3\2\2\2\""+ + "\u00cd\3\2\2\2$\u00e2\3\2\2\2&\u00e4\3\2\2\2(\u00f7\3\2\2\2*\u00f9\3\2"+ + "\2\2,\u00fb\3\2\2\2.\u00fd\3\2\2\2\60\u010c\3\2\2\2\62\u010e\3\2\2\2\64"+ + "\u0114\3\2\2\2\66\u0116\3\2\2\289\5\6\4\29:\7\2\2\3:\3\3\2\2\2;<\5\34"+ + "\17\2<=\7\2\2\3=\5\3\2\2\2>B\5\b\5\2?A\5\20\t\2@?\3\2\2\2AD\3\2\2\2B@"+ + "\3\2\2\2BC\3\2\2\2C\7\3\2\2\2DB\3\2\2\2EI\5\f\7\2FI\5\16\b\2GI\5\32\16"+ + "\2HE\3\2\2\2HF\3\2\2\2HG\3\2\2\2I\t\3\2\2\2JK\7\22\2\2KL\7\t\2\2LM\7\24"+ + "\2\2MN\5\62\32\2N\13\3\2\2\2OX\7\16\2\2PR\5\22\n\2QS\5\n\6\2RQ\3\2\2\2"+ + "RS\3\2\2\2SY\3\2\2\2TV\5\n\6\2UW\5\22\n\2VU\3\2\2\2VW\3\2\2\2WY\3\2\2"+ + "\2XP\3\2\2\2XT\3\2\2\2XY\3\2\2\2YZ\3\2\2\2Z\\\5\26\f\2[]\5\26\f\2\\[\3"+ + "\2\2\2]^\3\2\2\2^\\\3\2\2\2^_\3\2\2\2_b\3\2\2\2`a\7\20\2\2ac\5\26\f\2"+ + "b`\3\2\2\2bc\3\2\2\2c\r\3\2\2\2df\7\b\2\2eg\5\22\n\2fe\3\2\2\2fg\3\2\2"+ + "\2gh\3\2\2\2hj\5\24\13\2ik\5\24\13\2ji\3\2\2\2kl\3\2\2\2lj\3\2\2\2lm\3"+ + "\2\2\2mp\3\2\2\2no\7\20\2\2oq\5\24\13\2pn\3\2\2\2pq\3\2\2\2q\17\3\2\2"+ + "\2rs\7%\2\2s|\7*\2\2ty\5\36\20\2uv\7 \2\2vx\5\36\20\2wu\3\2\2\2x{\3\2"+ + "\2\2yw\3\2\2\2yz\3\2\2\2z}\3\2\2\2{y\3\2\2\2|t\3\2\2\2|}\3\2\2\2}\21\3"+ + "\2\2\2~\177\7\4\2\2\177\u0084\5\34\17\2\u0080\u0081\7 \2\2\u0081\u0083"+ + "\5\34\17\2\u0082\u0080\3\2\2\2\u0083\u0086\3\2\2\2\u0084\u0082\3\2\2\2"+ + "\u0084\u0085\3\2\2\2\u0085\23\3\2\2\2\u0086\u0084\3\2\2\2\u0087\u0089"+ + "\5\30\r\2\u0088\u008a\5\22\n\2\u0089\u0088\3\2\2\2\u0089\u008a\3\2\2\2"+ + "\u008a\25\3\2\2\2\u008b\u0091\5\30\r\2\u008c\u008f\7\6\2\2\u008d\u008e"+ + "\7\24\2\2\u008e\u0090\5,\27\2\u008f\u008d\3\2\2\2\u008f\u0090\3\2\2\2"+ + "\u0090\u0092\3\2\2\2\u0091\u008c\3\2\2\2\u0091\u0092\3\2\2\2\u0092\u0094"+ + "\3\2\2\2\u0093\u0095\5\22\n\2\u0094\u0093\3\2\2\2\u0094\u0095\3\2\2\2"+ + "\u0095\27\3\2\2\2\u0096\u0097\7!\2\2\u0097\u0098\5\32\16\2\u0098\u0099"+ + "\7\"\2\2\u0099\31\3\2\2\2\u009a\u009b\5\60\31\2\u009b\u009c\7\21\2\2\u009c"+ + "\u009d\5\34\17\2\u009d\33\3\2\2\2\u009e\u009f\5\36\20\2\u009f\35\3\2\2"+ + "\2\u00a0\u00a1\b\20\1\2\u00a1\u00a2\7\n\2\2\u00a2\u00a8\5\36\20\7\u00a3"+ + "\u00a4\7*\2\2\u00a4\u00a5\7\f\2\2\u00a5\u00a8\5\30\r\2\u00a6\u00a8\5 "+ + "\21\2\u00a7\u00a0\3\2\2\2\u00a7\u00a3\3\2\2\2\u00a7\u00a6\3\2\2\2\u00a8"+ + "\u00b1\3\2\2\2\u00a9\u00aa\f\4\2\2\u00aa\u00ab\7\3\2\2\u00ab\u00b0\5\36"+ + "\20\5\u00ac\u00ad\f\3\2\2\u00ad\u00ae\7\r\2\2\u00ae\u00b0\5\36\20\4\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\37\3\2\2\2\u00b3\u00b1\3\2\2\2\u00b4\u00b5"+ + "\b\21\1\2\u00b5\u00b7\5$\23\2\u00b6\u00b8\5\"\22\2\u00b7\u00b6\3\2\2\2"+ + "\u00b7\u00b8\3\2\2\2\u00b8\u00bc\3\2\2\2\u00b9\u00ba\t\2\2\2\u00ba\u00bc"+ + "\5 \21\6\u00bb\u00b4\3\2\2\2\u00bb\u00b9\3\2\2\2\u00bc\u00c9\3\2\2\2\u00bd"+ + "\u00be\f\5\2\2\u00be\u00bf\t\3\2\2\u00bf\u00c8\5 \21\6\u00c0\u00c1\f\4"+ + "\2\2\u00c1\u00c2\t\2\2\2\u00c2\u00c8\5 \21\5\u00c3\u00c4\f\3\2\2\u00c4"+ + "\u00c5\5*\26\2\u00c5\u00c6\5 \21\4\u00c6\u00c8\3\2\2\2\u00c7\u00bd\3\2"+ + "\2\2\u00c7\u00c0\3\2\2\2\u00c7\u00c3\3\2\2\2\u00c8\u00cb\3\2\2\2\u00c9"+ + "\u00c7\3\2\2\2\u00c9\u00ca\3\2\2\2\u00ca!\3\2\2\2\u00cb\u00c9\3\2\2\2"+ + "\u00cc\u00ce\7\n\2\2\u00cd\u00cc\3\2\2\2\u00cd\u00ce\3\2\2\2\u00ce\u00cf"+ + "\3\2\2\2\u00cf\u00d0\7\7\2\2\u00d0\u00d1\7#\2\2\u00d1\u00d6\5\34\17\2"+ + "\u00d2\u00d3\7 \2\2\u00d3\u00d5\5\34\17\2\u00d4\u00d2\3\2\2\2\u00d5\u00d8"+ + "\3\2\2\2\u00d6\u00d4\3\2\2\2\u00d6\u00d7\3\2\2\2\u00d7\u00d9\3\2\2\2\u00d8"+ + "\u00d6\3\2\2\2\u00d9\u00da\7$\2\2\u00da#\3\2\2\2\u00db\u00e3\5(\25\2\u00dc"+ + "\u00e3\5&\24\2\u00dd\u00e3\5.\30\2\u00de\u00df\7#\2\2\u00df\u00e0\5\34"+ + "\17\2\u00e0\u00e1\7$\2\2\u00e1\u00e3\3\2\2\2\u00e2\u00db\3\2\2\2\u00e2"+ + "\u00dc\3\2\2\2\u00e2\u00dd\3\2\2\2\u00e2\u00de\3\2\2\2\u00e3%\3\2\2\2"+ + "\u00e4\u00e5\7*\2\2\u00e5\u00ee\7#\2\2\u00e6\u00eb\5\34\17\2\u00e7\u00e8"+ + "\7 \2\2\u00e8\u00ea\5\34\17\2\u00e9\u00e7\3\2\2\2\u00ea\u00ed\3\2\2\2"+ "\u00eb\u00e9\3\2\2\2\u00eb\u00ec\3\2\2\2\u00ec\u00ef\3\2\2\2\u00ed\u00eb"+ "\3\2\2\2\u00ee\u00e6\3\2\2\2\u00ee\u00ef\3\2\2\2\u00ef\u00f0\3\2\2\2\u00f0"+ - "\u00f1\7#\2\2\u00f1\'\3\2\2\2\u00f2\u00f7\7\13\2\2\u00f3\u00f7\5\64\33"+ - "\2\u00f4\u00f7\5,\27\2\u00f5\u00f7\5\66\34\2\u00f6\u00f2\3\2\2\2\u00f6"+ - "\u00f3\3\2\2\2\u00f6\u00f4\3\2\2\2\u00f6\u00f5\3\2\2\2\u00f7)\3\2\2\2"+ - "\u00f8\u00f9\t\4\2\2\u00f9+\3\2\2\2\u00fa\u00fb\t\5\2\2\u00fb-\3\2\2\2"+ - "\u00fc\u0108\5\60\31\2\u00fd\u00fe\7\36\2\2\u00fe\u0107\5\60\31\2\u00ff"+ - "\u0101\7 \2\2\u0100\u0102\7\'\2\2\u0101\u0100\3\2\2\2\u0102\u0103\3\2"+ - "\2\2\u0103\u0101\3\2\2\2\u0103\u0104\3\2\2\2\u0104\u0105\3\2\2\2\u0105"+ - "\u0107\7!\2\2\u0106\u00fd\3\2\2\2\u0106\u00ff\3\2\2\2\u0107\u010a\3\2"+ - "\2\2\u0108\u0106\3\2\2\2\u0108\u0109\3\2\2\2\u0109/\3\2\2\2\u010a\u0108"+ - "\3\2\2\2\u010b\u010c\t\6\2\2\u010c\61\3\2\2\2\u010d\u010f\5\64\33\2\u010e"+ - "\u0110\7)\2\2\u010f\u010e\3\2\2\2\u010f\u0110\3\2\2\2\u0110\63\3\2\2\2"+ - "\u0111\u0114\7(\2\2\u0112\u0114\7\'\2\2\u0113\u0111\3\2\2\2\u0113\u0112"+ - "\3\2\2\2\u0114\65\3\2\2\2\u0115\u0116\7&\2\2\u0116\67\3\2\2\2%BHRVX^b"+ - "flpy|\u0084\u0089\u008f\u0091\u0094\u00a7\u00af\u00b1\u00b7\u00bb\u00c7"+ - "\u00c9\u00cd\u00d6\u00e2\u00eb\u00ee\u00f6\u0103\u0106\u0108\u010f\u0113"; + "\u00f1\7$\2\2\u00f1\'\3\2\2\2\u00f2\u00f8\7\13\2\2\u00f3\u00f8\5\64\33"+ + "\2\u00f4\u00f8\5,\27\2\u00f5\u00f8\5\66\34\2\u00f6\u00f8\7\23\2\2\u00f7"+ + "\u00f2\3\2\2\2\u00f7\u00f3\3\2\2\2\u00f7\u00f4\3\2\2\2\u00f7\u00f5\3\2"+ + "\2\2\u00f7\u00f6\3\2\2\2\u00f8)\3\2\2\2\u00f9\u00fa\t\4\2\2\u00fa+\3\2"+ + "\2\2\u00fb\u00fc\t\5\2\2\u00fc-\3\2\2\2\u00fd\u0109\5\60\31\2\u00fe\u00ff"+ + "\7\37\2\2\u00ff\u0108\5\60\31\2\u0100\u0102\7!\2\2\u0101\u0103\7(\2\2"+ + "\u0102\u0101\3\2\2\2\u0103\u0104\3\2\2\2\u0104\u0102\3\2\2\2\u0104\u0105"+ + "\3\2\2\2\u0105\u0106\3\2\2\2\u0106\u0108\7\"\2\2\u0107\u00fe\3\2\2\2\u0107"+ + "\u0100\3\2\2\2\u0108\u010b\3\2\2\2\u0109\u0107\3\2\2\2\u0109\u010a\3\2"+ + "\2\2\u010a/\3\2\2\2\u010b\u0109\3\2\2\2\u010c\u010d\t\6\2\2\u010d\61\3"+ + "\2\2\2\u010e\u0110\5\64\33\2\u010f\u0111\7*\2\2\u0110\u010f\3\2\2\2\u0110"+ + "\u0111\3\2\2\2\u0111\63\3\2\2\2\u0112\u0115\7)\2\2\u0113\u0115\7(\2\2"+ + "\u0114\u0112\3\2\2\2\u0114\u0113\3\2\2\2\u0115\65\3\2\2\2\u0116\u0117"+ + "\7\'\2\2\u0117\67\3\2\2\2%BHRVX^bflpy|\u0084\u0089\u008f\u0091\u0094\u00a7"+ + "\u00af\u00b1\u00b7\u00bb\u00c7\u00c9\u00cd\u00d6\u00e2\u00eb\u00ee\u00f7"+ + "\u0104\u0107\u0109\u0110\u0114"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseVisitor.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseVisitor.java index 8e5287a0f6632..a1d107bd3f314 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseVisitor.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlBaseVisitor.java @@ -218,6 +218,13 @@ interface EqlBaseVisitor extends ParseTreeVisitor { * @return the visitor result */ T visitStringLiteral(EqlBaseParser.StringLiteralContext ctx); + /** + * Visit a parse tree produced by the {@code paramLiteral} + * labeled alternative in {@link EqlBaseParser#constant}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitParamLiteral(EqlBaseParser.ParamLiteralContext ctx); /** * Visit a parse tree produced by {@link EqlBaseParser#comparisonOperator}. * @param ctx the parse tree diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlParser.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlParser.java index 4896f3f15f737..d93078c7b3d40 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlParser.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/EqlParser.java @@ -7,6 +7,7 @@ import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.BaseErrorListener; +import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.DiagnosticErrorListener; import org.antlr.v4.runtime.Parser; @@ -14,6 +15,8 @@ import org.antlr.v4.runtime.RecognitionException; import org.antlr.v4.runtime.Recognizer; import org.antlr.v4.runtime.Token; +import org.antlr.v4.runtime.TokenFactory; +import org.antlr.v4.runtime.TokenSource; import org.antlr.v4.runtime.atn.ATNConfigSet; import org.antlr.v4.runtime.atn.PredictionMode; import org.antlr.v4.runtime.dfa.DFA; @@ -24,8 +27,10 @@ import java.util.Arrays; import java.util.BitSet; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.function.BiFunction; import java.util.function.Function; @@ -43,7 +48,7 @@ public class EqlParser { public LogicalPlan createStatement(String eql) { return createStatement(eql, new ParserParams()); } - + public LogicalPlan createStatement(String eql, ParserParams params) { if (log.isDebugEnabled()) { log.debug("Parsing as statement: {}", eql); @@ -55,6 +60,12 @@ public Expression createExpression(String expression) { return createExpression(expression, new ParserParams()); } + public Expression createExpression(String expression, List paramValues) { + ParserParams params = new ParserParams(); + params.params(paramValues); + return createExpression(expression, params); + } + public Expression createExpression(String expression, ParserParams params) { if (log.isDebugEnabled()) { log.debug("Parsing as expression: {}", expression); @@ -72,7 +83,10 @@ private T invokeParser(String eql, ParserParams params, lexer.removeErrorListeners(); lexer.addErrorListener(ERROR_LISTENER); - CommonTokenStream tokenStream = new CommonTokenStream(lexer); + Map paramTokens = new HashMap<>(); + TokenSource tokenSource = new ParametrizedTokenSource(lexer, paramTokens, params.params()); + + CommonTokenStream tokenStream = new CommonTokenStream(tokenSource); EqlBaseParser parser = new EqlBaseParser(tokenStream); parser.addParseListener(new PostProcessor(Arrays.asList(parser.getRuleNames()))); @@ -101,7 +115,7 @@ private T invokeParser(String eql, ParserParams params, log.info("Parse tree {} " + tree.toStringTree()); } - return visitor.apply(new AstBuilder(params), tree); + return visitor.apply(new AstBuilder(params, paramTokens), tree); } catch (StackOverflowError e) { throw new ParsingException("EQL statement is too large, " + "causing stack overflow when generating the parsing tree: [{}]", eql); @@ -238,4 +252,68 @@ public void syntaxError(Recognizer recognizer, Object offendingSymbol, int throw new ParsingException(message, e, line, charPositionInLine); } }; + + /** + * Finds all parameter tokens (?) and associates them with actual parameter values + *

+ * Parameters are positional and we know where parameters occurred in the original stream in order to associate them + * with actual values. + */ + private static class ParametrizedTokenSource implements TokenSource { + + private TokenSource delegate; + private Map paramTokens; + private int param; + private List params; + + ParametrizedTokenSource(TokenSource delegate, Map paramTokens, List params) { + this.delegate = delegate; + this.paramTokens = paramTokens; + this.params = params; + param = 0; + } + + @Override + public Token nextToken() { + Token token = delegate.nextToken(); + if (token.getType() == EqlBaseLexer.PARAM) { + if (param >= params.size()) { + throw new ParsingException("Not enough actual parameters {} ", params.size()); + } + paramTokens.put(token, params.get(param)); + param++; + } + return token; + } + + @Override + public int getLine() { + return delegate.getLine(); + } + + @Override + public int getCharPositionInLine() { + return delegate.getCharPositionInLine(); + } + + @Override + public CharStream getInputStream() { + return delegate.getInputStream(); + } + + @Override + public String getSourceName() { + return delegate.getSourceName(); + } + + @Override + public void setTokenFactory(TokenFactory factory) { + delegate.setTokenFactory(factory); + } + + @Override + public TokenFactory getTokenFactory() { + return delegate.getTokenFactory(); + } + } } diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java index 6510fdc3561c7..1a370aa50b084 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java @@ -7,6 +7,7 @@ package org.elasticsearch.xpack.eql.parser; import org.antlr.v4.runtime.ParserRuleContext; +import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.TerminalNode; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.ArithmeticUnaryContext; @@ -15,6 +16,7 @@ import org.elasticsearch.xpack.eql.parser.EqlBaseParser.FunctionExpressionContext; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.LogicalBinaryContext; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.LogicalNotContext; +import org.elasticsearch.xpack.eql.parser.EqlBaseParser.ParamLiteralContext; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.PredicateContext; import org.elasticsearch.xpack.eql.parser.EqlBaseParser.ValueExpressionDefaultContext; import org.elasticsearch.xpack.ql.QlIllegalArgumentException; @@ -44,10 +46,19 @@ import org.elasticsearch.xpack.ql.util.StringUtils; import java.util.List; +import java.util.Map; public class ExpressionBuilder extends IdentifierBuilder { + protected final ParserParams params; + protected final Map paramTokens; + + public ExpressionBuilder(ParserParams params, Map paramTokens) { + this.params = params; + this.paramTokens = paramTokens; + } + protected Expression expression(ParseTree ctx) { return typedParsing(ctx, Expression.class); } @@ -230,6 +241,34 @@ public Literal visitNullLiteral(EqlBaseParser.NullLiteralContext ctx) { return new Literal(source, null, DataTypes.NULL); } + private Object param(TerminalNode node) { + Token token = node.getSymbol(); + + + if (paramTokens.containsKey(token) == false) { + throw new ParsingException(source(node), "Unexpected parameter"); + } + + return paramTokens.get(token); + } + + @Override + public Literal visitParamLiteral(ParamLiteralContext ctx) { + Object value = param(ctx.PARAM()); + Source source = source(ctx); + DataType dataType = null; + + try { + dataType = DataTypes.fromJava(value); + } catch (QlIllegalArgumentException ignored) {}; + + if (dataType == null) { + throw new ParsingException(source, "Invalid parameter [{}]", value); + } + return new Literal(source, value, dataType); + + } + @Override public Expression visitParenthesizedExpression(EqlBaseParser.ParenthesizedExpressionContext ctx) { return expression(ctx.expression()); diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LogicalPlanBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LogicalPlanBuilder.java index 718175282625d..3caaa20170219 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LogicalPlanBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/LogicalPlanBuilder.java @@ -5,6 +5,7 @@ */ package org.elasticsearch.xpack.eql.parser; +import org.antlr.v4.runtime.Token; import org.elasticsearch.xpack.ql.expression.Expression; import org.elasticsearch.xpack.ql.expression.Literal; import org.elasticsearch.xpack.ql.expression.UnresolvedAttribute; @@ -16,12 +17,12 @@ import org.elasticsearch.xpack.ql.tree.Source; import org.elasticsearch.xpack.ql.type.DataTypes; -public abstract class LogicalPlanBuilder extends ExpressionBuilder { +import java.util.Map; - private final ParserParams params; +public abstract class LogicalPlanBuilder extends ExpressionBuilder { - public LogicalPlanBuilder(ParserParams params) { - this.params = params; + LogicalPlanBuilder(ParserParams params, Map paramTokens) { + super(params, paramTokens); } @Override diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ParameterTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ParameterTests.java new file mode 100644 index 0000000000000..14c23328778a2 --- /dev/null +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ParameterTests.java @@ -0,0 +1,75 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + +package org.elasticsearch.xpack.eql.parser; + +import org.elasticsearch.test.ESTestCase; +import org.elasticsearch.xpack.ql.expression.Expression; +import org.elasticsearch.xpack.ql.expression.Literal; +import org.elasticsearch.xpack.ql.expression.UnresolvedAttribute; +import org.elasticsearch.xpack.ql.expression.function.UnresolvedFunction; +import org.elasticsearch.xpack.ql.expression.predicate.logical.And; +import org.elasticsearch.xpack.ql.expression.predicate.logical.Or; +import org.elasticsearch.xpack.ql.expression.predicate.operator.arithmetic.Neg; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.Equals; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.GreaterThan; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.GreaterThanOrEqual; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.LessThan; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.LessThanOrEqual; +import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.NotEquals; +import org.elasticsearch.xpack.ql.type.DataTypes; +import org.elasticsearch.xpack.sql.proto.SqlTypedParamValue; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static org.elasticsearch.xpack.eql.parser.AbstractBuilder.unquoteString; +import static org.elasticsearch.xpack.ql.type.DataTypes.KEYWORD; +import static org.elasticsearch.xpack.ql.type.DataTypes.LONG; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; + +public class ParameterTests extends ESTestCase { + + private final EqlParser parser = new EqlParser(); + + public Expression expr(String source) { + return parser.createExpression(source); + } + public Expression expr(String source, List params) { + return parser.createExpression(source, params); + } + + public void testSingleParameter() { + assertEquals(expr("a == ?", Collections.singletonList("test")), expr("a == 'test'")); + assertEquals(expr("a == ?", Collections.singletonList(1)), expr("a == 1")); + assertEquals(expr("a == ?", Collections.singletonList(1.0)), expr("a == 1.0")); + assertEquals(expr("a == ?", Collections.singletonList(true)), expr("a == true")); + assertEquals(expr("a == ?", Collections.singletonList(false)), expr("a == false")); + assertEquals(expr("a == ?", Collections.singletonList(null)), expr("a == null")); + } + + public void testInvalidParameters() { + ParsingException ex = expectThrows(ParsingException.class, + () -> new EqlParser().createExpression("a + ?", Collections.singletonList(new Object()))); + assertThat(ex.getMessage(), containsString("Invalid parameter")); + } + public void testMultipleParameters() { + Expression expression = expr("(? + ? * ?) - ?", Arrays.asList(1, 2, 3, 4)); + assertEquals(expression, expr("(1 + 2 * 3) - 4")); + } + + public void testNotEnoughParameters() { + ParsingException ex = expectThrows(ParsingException.class, + () -> new EqlParser().createExpression("(? + ? * ?) - ?", Arrays.asList(1, 2, 3))); + assertThat(ex.getMessage(), containsString("Not enough actual parameters")); + } +} From 3369668e2f66fb6f269e719468b7c59aa9ac243f Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Thu, 13 Feb 2020 09:27:53 -0700 Subject: [PATCH 2/3] Add escape tests and formatting changes --- .../xpack/eql/parser/ParameterTests.java | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ParameterTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ParameterTests.java index 14c23328778a2..5078de009dc52 100644 --- a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ParameterTests.java +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ParameterTests.java @@ -9,33 +9,12 @@ import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xpack.ql.expression.Expression; -import org.elasticsearch.xpack.ql.expression.Literal; -import org.elasticsearch.xpack.ql.expression.UnresolvedAttribute; -import org.elasticsearch.xpack.ql.expression.function.UnresolvedFunction; -import org.elasticsearch.xpack.ql.expression.predicate.logical.And; -import org.elasticsearch.xpack.ql.expression.predicate.logical.Or; -import org.elasticsearch.xpack.ql.expression.predicate.operator.arithmetic.Neg; -import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.Equals; -import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.GreaterThan; -import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.GreaterThanOrEqual; -import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.LessThan; -import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.LessThanOrEqual; -import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.NotEquals; -import org.elasticsearch.xpack.ql.type.DataTypes; -import org.elasticsearch.xpack.sql.proto.SqlTypedParamValue; import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.elasticsearch.xpack.eql.parser.AbstractBuilder.unquoteString; -import static org.elasticsearch.xpack.ql.type.DataTypes.KEYWORD; -import static org.elasticsearch.xpack.ql.type.DataTypes.LONG; import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; public class ParameterTests extends ESTestCase { @@ -44,6 +23,7 @@ public class ParameterTests extends ESTestCase { public Expression expr(String source) { return parser.createExpression(source); } + public Expression expr(String source, List params) { return parser.createExpression(source, params); } @@ -57,11 +37,18 @@ public void testSingleParameter() { assertEquals(expr("a == ?", Collections.singletonList(null)), expr("a == null")); } + public void testEscapes() { + assertEquals(expr("a == ?", Collections.singletonList("test \\ \n \r \t ' \"")), + expr("a == 'test \\\\ \\n \\r \\t \\' \\\"'")); + } + public void testInvalidParameters() { ParsingException ex = expectThrows(ParsingException.class, - () -> new EqlParser().createExpression("a + ?", Collections.singletonList(new Object()))); + () -> expr("a + ?", Collections.singletonList(new Object()))); + assertThat(ex.getMessage(), containsString("Invalid parameter")); } + public void testMultipleParameters() { Expression expression = expr("(? + ? * ?) - ?", Arrays.asList(1, 2, 3, 4)); assertEquals(expression, expr("(1 + 2 * 3) - 4")); @@ -69,7 +56,8 @@ public void testMultipleParameters() { public void testNotEnoughParameters() { ParsingException ex = expectThrows(ParsingException.class, - () -> new EqlParser().createExpression("(? + ? * ?) - ?", Arrays.asList(1, 2, 3))); + () -> expr("(? + ? * ?) - ?", Arrays.asList(1, 2, 3))); + assertThat(ex.getMessage(), containsString("Not enough actual parameters")); } } From d02c10fc9d02a703f40959b83e319ce5679ef53b Mon Sep 17 00:00:00 2001 From: Ross Wolf <31489089+rw-access@users.noreply.github.com> Date: Thu, 13 Feb 2020 09:33:48 -0700 Subject: [PATCH 3/3] Add tests, lint fixes, PR feedback --- .../elasticsearch/xpack/eql/parser/ExpressionBuilder.java | 6 ++---- .../elasticsearch/xpack/eql/parser/ParameterTests.java | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java index 1a370aa50b084..5baecfcf05299 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/parser/ExpressionBuilder.java @@ -52,7 +52,7 @@ public class ExpressionBuilder extends IdentifierBuilder { protected final ParserParams params; - protected final Map paramTokens; + private final Map paramTokens; public ExpressionBuilder(ParserParams params, Map paramTokens) { this.params = params; @@ -258,9 +258,7 @@ public Literal visitParamLiteral(ParamLiteralContext ctx) { Source source = source(ctx); DataType dataType = null; - try { - dataType = DataTypes.fromJava(value); - } catch (QlIllegalArgumentException ignored) {}; + dataType = DataTypes.fromJava(value); if (dataType == null) { throw new ParsingException(source, "Invalid parameter [{}]", value); diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ParameterTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ParameterTests.java index 5078de009dc52..325912debe048 100644 --- a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ParameterTests.java +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ParameterTests.java @@ -20,11 +20,11 @@ public class ParameterTests extends ESTestCase { private final EqlParser parser = new EqlParser(); - public Expression expr(String source) { + private Expression expr(String source) { return parser.createExpression(source); } - public Expression expr(String source, List params) { + private Expression expr(String source, List params) { return parser.createExpression(source, params); } @@ -38,8 +38,8 @@ public void testSingleParameter() { } public void testEscapes() { - assertEquals(expr("a == ?", Collections.singletonList("test \\ \n \r \t ' \"")), - expr("a == 'test \\\\ \\n \\r \\t \\' \\\"'")); + assertEquals(expr("a == ? and b == ?'test'", Collections.singletonList("test \\ \n \r \t ' \"")), + expr("a == 'test \\\\ \\n \\r \\t \\' \\\"' and b == 'test'")); } public void testInvalidParameters() {