diff --git a/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 b/x-pack/plugin/eql/src/main/antlr/EqlBase.g4 index dc53354a7d1e8..01e2c7e42fb82 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 @@ -160,6 +161,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 c030e7480e239..8d083180c06e0 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, ANY=2, BY=3, FALSE=4, FORK=5, IN=6, JOIN=7, MAXSPAN=8, NOT=9, NULL=10, - OF=11, OR=12, SEQUENCE=13, TRUE=14, UNTIL=15, WHERE=16, WITH=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; + OF=11, OR=12, SEQUENCE=13, TRUE=14, UNTIL=15, WHERE=16, WITH=17, PARAM=18, + EQ=19, NEQ=20, LT=21, LTE=22, GT=23, GTE=24, PLUS=25, MINUS=26, ASTERISK=27, + SLASH=28, PERCENT=29, DOT=30, COMMA=31, LB=32, RB=33, LP=34, RP=35, PIPE=36, + ESCAPED_IDENTIFIER=37, STRING=38, INTEGER_VALUE=39, DECIMAL_VALUE=40, + IDENTIFIER=41, LINE_COMMENT=42, BRACKETED_COMMENT=43, WS=44; public static String[] modeNames = { "DEFAULT_MODE" }; public static final String[] ruleNames = { "AND", "ANY", "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,14 +39,14 @@ class EqlBaseLexer extends Lexer { private static final String[] _LITERAL_NAMES = { null, "'and'", "'any'", "'by'", "'false'", "'fork'", "'in'", "'join'", "'maxspan'", "'not'", "'null'", "'of'", "'or'", "'sequence'", "'true'", - "'until'", "'where'", "'with'", null, "'!='", "'<'", "'<='", "'>'", "'>='", - "'+'", "'-'", "'*'", "'/'", "'%'", "'.'", "','", "'['", "']'", "'('", - "')'", "'|'" + "'until'", "'where'", "'with'", "'?'", null, "'!='", "'<'", "'<='", "'>'", + "'>='", "'+'", "'-'", "'*'", "'/'", "'%'", "'.'", "','", "'['", "']'", + "'('", "')'", "'|'" }; private static final String[] _SYMBOLIC_NAMES = { null, "AND", "ANY", "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", + "NULL", "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,142 +106,144 @@ public EqlBaseLexer(CharStream input) { public ATN getATN() { return _ATN; } public static final String _serializedATN = - "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2-\u0185\b\1\4\2\t"+ + "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2.\u0189\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.\4/\t/\3\2\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3\4\3\4\3\4\3\5"+ - "\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3\b\3\b\3\b\3\b\3"+ - "\b\3\t\3\t\3\t\3\t\3\t\3\t\3\t\3\t\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\13"+ - "\3\13\3\f\3\f\3\f\3\r\3\r\3\r\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16"+ - "\3\16\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\21\3\22\3\22\3\22\3\22\3\22\3\23\3\23\3\23\5\23\u00b7"+ - "\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%\u00e0\n%\f%\16%\u00e3\13%\3"+ - "%\3%\3&\3&\3&\3&\7&\u00eb\n&\f&\16&\u00ee\13&\3&\3&\3&\3&\3&\7&\u00f5"+ - "\n&\f&\16&\u00f8\13&\3&\3&\3&\3&\3&\3&\3&\7&\u0101\n&\f&\16&\u0104\13"+ - "&\3&\3&\3&\3&\3&\3&\3&\7&\u010d\n&\f&\16&\u0110\13&\3&\5&\u0113\n&\3\'"+ - "\6\'\u0116\n\'\r\'\16\'\u0117\3(\6(\u011b\n(\r(\16(\u011c\3(\3(\7(\u0121"+ - "\n(\f(\16(\u0124\13(\3(\3(\6(\u0128\n(\r(\16(\u0129\3(\6(\u012d\n(\r("+ - "\16(\u012e\3(\3(\7(\u0133\n(\f(\16(\u0136\13(\5(\u0138\n(\3(\3(\3(\3("+ - "\6(\u013e\n(\r(\16(\u013f\3(\3(\5(\u0144\n(\3)\3)\5)\u0148\n)\3)\3)\3"+ - ")\7)\u014d\n)\f)\16)\u0150\13)\3*\3*\5*\u0154\n*\3*\6*\u0157\n*\r*\16"+ - "*\u0158\3+\3+\3,\3,\3-\3-\3-\3-\7-\u0163\n-\f-\16-\u0166\13-\3-\5-\u0169"+ - "\n-\3-\5-\u016c\n-\3-\3-\3.\3.\3.\3.\3.\7.\u0175\n.\f.\16.\u0178\13.\3"+ - ".\3.\3.\3.\3.\3/\6/\u0180\n/\r/\16/\u0181\3/\3/\3\u0176\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\2BBa"+ - "a\4\2GGgg\4\2--//\3\2\62;\4\2C\\c|\4\2\f\f\17\17\5\2\13\f\17\17\"\"\u01a5"+ + ",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\3\2\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3\4\3"+ + "\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3\b\3\b"+ + "\3\b\3\b\3\b\3\t\3\t\3\t\3\t\3\t\3\t\3\t\3\t\3\n\3\n\3\n\3\n\3\13\3\13"+ + "\3\13\3\13\3\13\3\f\3\f\3\f\3\r\3\r\3\r\3\16\3\16\3\16\3\16\3\16\3\16"+ + "\3\16\3\16\3\16\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\21\3\22\3\22\3\22\3\22\3\22\3\23\3\23\3\24"+ + "\3\24\3\24\5\24\u00bb\n\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\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%\3&\3&\7&\u00e4\n&\f&"+ + "\16&\u00e7\13&\3&\3&\3\'\3\'\3\'\3\'\7\'\u00ef\n\'\f\'\16\'\u00f2\13\'"+ + "\3\'\3\'\3\'\3\'\3\'\7\'\u00f9\n\'\f\'\16\'\u00fc\13\'\3\'\3\'\3\'\3\'"+ + "\3\'\3\'\3\'\7\'\u0105\n\'\f\'\16\'\u0108\13\'\3\'\3\'\3\'\3\'\3\'\3\'"+ + "\3\'\7\'\u0111\n\'\f\'\16\'\u0114\13\'\3\'\5\'\u0117\n\'\3(\6(\u011a\n"+ + "(\r(\16(\u011b\3)\6)\u011f\n)\r)\16)\u0120\3)\3)\7)\u0125\n)\f)\16)\u0128"+ + "\13)\3)\3)\6)\u012c\n)\r)\16)\u012d\3)\6)\u0131\n)\r)\16)\u0132\3)\3)"+ + "\7)\u0137\n)\f)\16)\u013a\13)\5)\u013c\n)\3)\3)\3)\3)\6)\u0142\n)\r)\16"+ + ")\u0143\3)\3)\5)\u0148\n)\3*\3*\5*\u014c\n*\3*\3*\3*\7*\u0151\n*\f*\16"+ + "*\u0154\13*\3+\3+\5+\u0158\n+\3+\6+\u015b\n+\r+\16+\u015c\3,\3,\3-\3-"+ + "\3.\3.\3.\3.\7.\u0167\n.\f.\16.\u016a\13.\3.\5.\u016d\n.\3.\5.\u0170\n"+ + ".\3.\3.\3/\3/\3/\3/\3/\7/\u0179\n/\f/\16/\u017c\13/\3/\3/\3/\3/\3/\3\60"+ + "\6\60\u0184\n\60\r\60\16\60\u0185\3\60\3\60\3\u017a\2\61\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\2W\2Y\2[,]-_.\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\"\"\u01a9"+ "\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\7g\3\2\2\2\tj\3\2\2\2\13p\3"+ - "\2\2\2\ru\3\2\2\2\17x\3\2\2\2\21}\3\2\2\2\23\u0085\3\2\2\2\25\u0089\3"+ - "\2\2\2\27\u008e\3\2\2\2\31\u0091\3\2\2\2\33\u0094\3\2\2\2\35\u009d\3\2"+ - "\2\2\37\u00a2\3\2\2\2!\u00a8\3\2\2\2#\u00ae\3\2\2\2%\u00b6\3\2\2\2\'\u00b8"+ - "\3\2\2\2)\u00bb\3\2\2\2+\u00bd\3\2\2\2-\u00c0\3\2\2\2/\u00c2\3\2\2\2\61"+ - "\u00c5\3\2\2\2\63\u00c7\3\2\2\2\65\u00c9\3\2\2\2\67\u00cb\3\2\2\29\u00cd"+ - "\3\2\2\2;\u00cf\3\2\2\2=\u00d1\3\2\2\2?\u00d3\3\2\2\2A\u00d5\3\2\2\2C"+ - "\u00d7\3\2\2\2E\u00d9\3\2\2\2G\u00db\3\2\2\2I\u00dd\3\2\2\2K\u0112\3\2"+ - "\2\2M\u0115\3\2\2\2O\u0143\3\2\2\2Q\u0147\3\2\2\2S\u0151\3\2\2\2U\u015a"+ - "\3\2\2\2W\u015c\3\2\2\2Y\u015e\3\2\2\2[\u016f\3\2\2\2]\u017f\3\2\2\2_"+ - "`\7c\2\2`a\7p\2\2ab\7f\2\2b\4\3\2\2\2cd\7c\2\2de\7p\2\2ef\7{\2\2f\6\3"+ - "\2\2\2gh\7d\2\2hi\7{\2\2i\b\3\2\2\2jk\7h\2\2kl\7c\2\2lm\7n\2\2mn\7u\2"+ - "\2no\7g\2\2o\n\3\2\2\2pq\7h\2\2qr\7q\2\2rs\7t\2\2st\7m\2\2t\f\3\2\2\2"+ - "uv\7k\2\2vw\7p\2\2w\16\3\2\2\2xy\7l\2\2yz\7q\2\2z{\7k\2\2{|\7p\2\2|\20"+ - "\3\2\2\2}~\7o\2\2~\177\7c\2\2\177\u0080\7z\2\2\u0080\u0081\7u\2\2\u0081"+ - "\u0082\7r\2\2\u0082\u0083\7c\2\2\u0083\u0084\7p\2\2\u0084\22\3\2\2\2\u0085"+ - "\u0086\7p\2\2\u0086\u0087\7q\2\2\u0087\u0088\7v\2\2\u0088\24\3\2\2\2\u0089"+ - "\u008a\7p\2\2\u008a\u008b\7w\2\2\u008b\u008c\7n\2\2\u008c\u008d\7n\2\2"+ - "\u008d\26\3\2\2\2\u008e\u008f\7q\2\2\u008f\u0090\7h\2\2\u0090\30\3\2\2"+ - "\2\u0091\u0092\7q\2\2\u0092\u0093\7t\2\2\u0093\32\3\2\2\2\u0094\u0095"+ - "\7u\2\2\u0095\u0096\7g\2\2\u0096\u0097\7s\2\2\u0097\u0098\7w\2\2\u0098"+ - "\u0099\7g\2\2\u0099\u009a\7p\2\2\u009a\u009b\7e\2\2\u009b\u009c\7g\2\2"+ - "\u009c\34\3\2\2\2\u009d\u009e\7v\2\2\u009e\u009f\7t\2\2\u009f\u00a0\7"+ - "w\2\2\u00a0\u00a1\7g\2\2\u00a1\36\3\2\2\2\u00a2\u00a3\7w\2\2\u00a3\u00a4"+ - "\7p\2\2\u00a4\u00a5\7v\2\2\u00a5\u00a6\7k\2\2\u00a6\u00a7\7n\2\2\u00a7"+ - " \3\2\2\2\u00a8\u00a9\7y\2\2\u00a9\u00aa\7j\2\2\u00aa\u00ab\7g\2\2\u00ab"+ - "\u00ac\7t\2\2\u00ac\u00ad\7g\2\2\u00ad\"\3\2\2\2\u00ae\u00af\7y\2\2\u00af"+ - "\u00b0\7k\2\2\u00b0\u00b1\7v\2\2\u00b1\u00b2\7j\2\2\u00b2$\3\2\2\2\u00b3"+ - "\u00b7\7?\2\2\u00b4\u00b5\7?\2\2\u00b5\u00b7\7?\2\2\u00b6\u00b3\3\2\2"+ - "\2\u00b6\u00b4\3\2\2\2\u00b7&\3\2\2\2\u00b8\u00b9\7#\2\2\u00b9\u00ba\7"+ - "?\2\2\u00ba(\3\2\2\2\u00bb\u00bc\7>\2\2\u00bc*\3\2\2\2\u00bd\u00be\7>"+ - "\2\2\u00be\u00bf\7?\2\2\u00bf,\3\2\2\2\u00c0\u00c1\7@\2\2\u00c1.\3\2\2"+ - "\2\u00c2\u00c3\7@\2\2\u00c3\u00c4\7?\2\2\u00c4\60\3\2\2\2\u00c5\u00c6"+ - "\7-\2\2\u00c6\62\3\2\2\2\u00c7\u00c8\7/\2\2\u00c8\64\3\2\2\2\u00c9\u00ca"+ - "\7,\2\2\u00ca\66\3\2\2\2\u00cb\u00cc\7\61\2\2\u00cc8\3\2\2\2\u00cd\u00ce"+ - "\7\'\2\2\u00ce:\3\2\2\2\u00cf\u00d0\7\60\2\2\u00d0<\3\2\2\2\u00d1\u00d2"+ - "\7.\2\2\u00d2>\3\2\2\2\u00d3\u00d4\7]\2\2\u00d4@\3\2\2\2\u00d5\u00d6\7"+ - "_\2\2\u00d6B\3\2\2\2\u00d7\u00d8\7*\2\2\u00d8D\3\2\2\2\u00d9\u00da\7+"+ - "\2\2\u00daF\3\2\2\2\u00db\u00dc\7~\2\2\u00dcH\3\2\2\2\u00dd\u00e1\7b\2"+ - "\2\u00de\u00e0\n\2\2\2\u00df\u00de\3\2\2\2\u00e0\u00e3\3\2\2\2\u00e1\u00df"+ - "\3\2\2\2\u00e1\u00e2\3\2\2\2\u00e2\u00e4\3\2\2\2\u00e3\u00e1\3\2\2\2\u00e4"+ - "\u00e5\7b\2\2\u00e5J\3\2\2\2\u00e6\u00ec\7)\2\2\u00e7\u00e8\7^\2\2\u00e8"+ - "\u00eb\t\3\2\2\u00e9\u00eb\n\4\2\2\u00ea\u00e7\3\2\2\2\u00ea\u00e9\3\2"+ - "\2\2\u00eb\u00ee\3\2\2\2\u00ec\u00ea\3\2\2\2\u00ec\u00ed\3\2\2\2\u00ed"+ - "\u00ef\3\2\2\2\u00ee\u00ec\3\2\2\2\u00ef\u0113\7)\2\2\u00f0\u00f6\7$\2"+ - "\2\u00f1\u00f2\7^\2\2\u00f2\u00f5\t\3\2\2\u00f3\u00f5\n\5\2\2\u00f4\u00f1"+ - "\3\2\2\2\u00f4\u00f3\3\2\2\2\u00f5\u00f8\3\2\2\2\u00f6\u00f4\3\2\2\2\u00f6"+ - "\u00f7\3\2\2\2\u00f7\u00f9\3\2\2\2\u00f8\u00f6\3\2\2\2\u00f9\u0113\7$"+ - "\2\2\u00fa\u00fb\7A\2\2\u00fb\u00fc\7$\2\2\u00fc\u0102\3\2\2\2\u00fd\u00fe"+ - "\7^\2\2\u00fe\u0101\7$\2\2\u00ff\u0101\n\6\2\2\u0100\u00fd\3\2\2\2\u0100"+ - "\u00ff\3\2\2\2\u0101\u0104\3\2\2\2\u0102\u0100\3\2\2\2\u0102\u0103\3\2"+ - "\2\2\u0103\u0105\3\2\2\2\u0104\u0102\3\2\2\2\u0105\u0113\7$\2\2\u0106"+ - "\u0107\7A\2\2\u0107\u0108\7)\2\2\u0108\u010e\3\2\2\2\u0109\u010a\7^\2"+ - "\2\u010a\u010d\7)\2\2\u010b\u010d\n\7\2\2\u010c\u0109\3\2\2\2\u010c\u010b"+ - "\3\2\2\2\u010d\u0110\3\2\2\2\u010e\u010c\3\2\2\2\u010e\u010f\3\2\2\2\u010f"+ - "\u0111\3\2\2\2\u0110\u010e\3\2\2\2\u0111\u0113\7)\2\2\u0112\u00e6\3\2"+ - "\2\2\u0112\u00f0\3\2\2\2\u0112\u00fa\3\2\2\2\u0112\u0106\3\2\2\2\u0113"+ - "L\3\2\2\2\u0114\u0116\5U+\2\u0115\u0114\3\2\2\2\u0116\u0117\3\2\2\2\u0117"+ - "\u0115\3\2\2\2\u0117\u0118\3\2\2\2\u0118N\3\2\2\2\u0119\u011b\5U+\2\u011a"+ - "\u0119\3\2\2\2\u011b\u011c\3\2\2\2\u011c\u011a\3\2\2\2\u011c\u011d\3\2"+ - "\2\2\u011d\u011e\3\2\2\2\u011e\u0122\5;\36\2\u011f\u0121\5U+\2\u0120\u011f"+ - "\3\2\2\2\u0121\u0124\3\2\2\2\u0122\u0120\3\2\2\2\u0122\u0123\3\2\2\2\u0123"+ - "\u0144\3\2\2\2\u0124\u0122\3\2\2\2\u0125\u0127\5;\36\2\u0126\u0128\5U"+ - "+\2\u0127\u0126\3\2\2\2\u0128\u0129\3\2\2\2\u0129\u0127\3\2\2\2\u0129"+ - "\u012a\3\2\2\2\u012a\u0144\3\2\2\2\u012b\u012d\5U+\2\u012c\u012b\3\2\2"+ - "\2\u012d\u012e\3\2\2\2\u012e\u012c\3\2\2\2\u012e\u012f\3\2\2\2\u012f\u0137"+ - "\3\2\2\2\u0130\u0134\5;\36\2\u0131\u0133\5U+\2\u0132\u0131\3\2\2\2\u0133"+ - "\u0136\3\2\2\2\u0134\u0132\3\2\2\2\u0134\u0135\3\2\2\2\u0135\u0138\3\2"+ - "\2\2\u0136\u0134\3\2\2\2\u0137\u0130\3\2\2\2\u0137\u0138\3\2\2\2\u0138"+ - "\u0139\3\2\2\2\u0139\u013a\5S*\2\u013a\u0144\3\2\2\2\u013b\u013d\5;\36"+ - "\2\u013c\u013e\5U+\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\u0141\3\2\2\2\u0141\u0142\5S*\2\u0142"+ - "\u0144\3\2\2\2\u0143\u011a\3\2\2\2\u0143\u0125\3\2\2\2\u0143\u012c\3\2"+ - "\2\2\u0143\u013b\3\2\2\2\u0144P\3\2\2\2\u0145\u0148\5W,\2\u0146\u0148"+ - "\t\b\2\2\u0147\u0145\3\2\2\2\u0147\u0146\3\2\2\2\u0148\u014e\3\2\2\2\u0149"+ - "\u014d\5W,\2\u014a\u014d\5U+\2\u014b\u014d\7a\2\2\u014c\u0149\3\2\2\2"+ - "\u014c\u014a\3\2\2\2\u014c\u014b\3\2\2\2\u014d\u0150\3\2\2\2\u014e\u014c"+ - "\3\2\2\2\u014e\u014f\3\2\2\2\u014fR\3\2\2\2\u0150\u014e\3\2\2\2\u0151"+ - "\u0153\t\t\2\2\u0152\u0154\t\n\2\2\u0153\u0152\3\2\2\2\u0153\u0154\3\2"+ - "\2\2\u0154\u0156\3\2\2\2\u0155\u0157\5U+\2\u0156\u0155\3\2\2\2\u0157\u0158"+ - "\3\2\2\2\u0158\u0156\3\2\2\2\u0158\u0159\3\2\2\2\u0159T\3\2\2\2\u015a"+ - "\u015b\t\13\2\2\u015bV\3\2\2\2\u015c\u015d\t\f\2\2\u015dX\3\2\2\2\u015e"+ - "\u015f\7\61\2\2\u015f\u0160\7\61\2\2\u0160\u0164\3\2\2\2\u0161\u0163\n"+ - "\r\2\2\u0162\u0161\3\2\2\2\u0163\u0166\3\2\2\2\u0164\u0162\3\2\2\2\u0164"+ - "\u0165\3\2\2\2\u0165\u0168\3\2\2\2\u0166\u0164\3\2\2\2\u0167\u0169\7\17"+ - "\2\2\u0168\u0167\3\2\2\2\u0168\u0169\3\2\2\2\u0169\u016b\3\2\2\2\u016a"+ - "\u016c\7\f\2\2\u016b\u016a\3\2\2\2\u016b\u016c\3\2\2\2\u016c\u016d\3\2"+ - "\2\2\u016d\u016e\b-\2\2\u016eZ\3\2\2\2\u016f\u0170\7\61\2\2\u0170\u0171"+ - "\7,\2\2\u0171\u0176\3\2\2\2\u0172\u0175\5[.\2\u0173\u0175\13\2\2\2\u0174"+ - "\u0172\3\2\2\2\u0174\u0173\3\2\2\2\u0175\u0178\3\2\2\2\u0176\u0177\3\2"+ - "\2\2\u0176\u0174\3\2\2\2\u0177\u0179\3\2\2\2\u0178\u0176\3\2\2\2\u0179"+ - "\u017a\7,\2\2\u017a\u017b\7\61\2\2\u017b\u017c\3\2\2\2\u017c\u017d\b."+ - "\2\2\u017d\\\3\2\2\2\u017e\u0180\t\16\2\2\u017f\u017e\3\2\2\2\u0180\u0181"+ - "\3\2\2\2\u0181\u017f\3\2\2\2\u0181\u0182\3\2\2\2\u0182\u0183\3\2\2\2\u0183"+ - "\u0184\b/\2\2\u0184^\3\2\2\2\"\2\u00b6\u00e1\u00ea\u00ec\u00f4\u00f6\u0100"+ - "\u0102\u010c\u010e\u0112\u0117\u011c\u0122\u0129\u012e\u0134\u0137\u013f"+ - "\u0143\u0147\u014c\u014e\u0153\u0158\u0164\u0168\u016b\u0174\u0176\u0181"+ - "\3\2\3\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\2"+ + "[\3\2\2\2\2]\3\2\2\2\2_\3\2\2\2\3a\3\2\2\2\5e\3\2\2\2\7i\3\2\2\2\tl\3"+ + "\2\2\2\13r\3\2\2\2\rw\3\2\2\2\17z\3\2\2\2\21\177\3\2\2\2\23\u0087\3\2"+ + "\2\2\25\u008b\3\2\2\2\27\u0090\3\2\2\2\31\u0093\3\2\2\2\33\u0096\3\2\2"+ + "\2\35\u009f\3\2\2\2\37\u00a4\3\2\2\2!\u00aa\3\2\2\2#\u00b0\3\2\2\2%\u00b5"+ + "\3\2\2\2\'\u00ba\3\2\2\2)\u00bc\3\2\2\2+\u00bf\3\2\2\2-\u00c1\3\2\2\2"+ + "/\u00c4\3\2\2\2\61\u00c6\3\2\2\2\63\u00c9\3\2\2\2\65\u00cb\3\2\2\2\67"+ + "\u00cd\3\2\2\29\u00cf\3\2\2\2;\u00d1\3\2\2\2=\u00d3\3\2\2\2?\u00d5\3\2"+ + "\2\2A\u00d7\3\2\2\2C\u00d9\3\2\2\2E\u00db\3\2\2\2G\u00dd\3\2\2\2I\u00df"+ + "\3\2\2\2K\u00e1\3\2\2\2M\u0116\3\2\2\2O\u0119\3\2\2\2Q\u0147\3\2\2\2S"+ + "\u014b\3\2\2\2U\u0155\3\2\2\2W\u015e\3\2\2\2Y\u0160\3\2\2\2[\u0162\3\2"+ + "\2\2]\u0173\3\2\2\2_\u0183\3\2\2\2ab\7c\2\2bc\7p\2\2cd\7f\2\2d\4\3\2\2"+ + "\2ef\7c\2\2fg\7p\2\2gh\7{\2\2h\6\3\2\2\2ij\7d\2\2jk\7{\2\2k\b\3\2\2\2"+ + "lm\7h\2\2mn\7c\2\2no\7n\2\2op\7u\2\2pq\7g\2\2q\n\3\2\2\2rs\7h\2\2st\7"+ + "q\2\2tu\7t\2\2uv\7m\2\2v\f\3\2\2\2wx\7k\2\2xy\7p\2\2y\16\3\2\2\2z{\7l"+ + "\2\2{|\7q\2\2|}\7k\2\2}~\7p\2\2~\20\3\2\2\2\177\u0080\7o\2\2\u0080\u0081"+ + "\7c\2\2\u0081\u0082\7z\2\2\u0082\u0083\7u\2\2\u0083\u0084\7r\2\2\u0084"+ + "\u0085\7c\2\2\u0085\u0086\7p\2\2\u0086\22\3\2\2\2\u0087\u0088\7p\2\2\u0088"+ + "\u0089\7q\2\2\u0089\u008a\7v\2\2\u008a\24\3\2\2\2\u008b\u008c\7p\2\2\u008c"+ + "\u008d\7w\2\2\u008d\u008e\7n\2\2\u008e\u008f\7n\2\2\u008f\26\3\2\2\2\u0090"+ + "\u0091\7q\2\2\u0091\u0092\7h\2\2\u0092\30\3\2\2\2\u0093\u0094\7q\2\2\u0094"+ + "\u0095\7t\2\2\u0095\32\3\2\2\2\u0096\u0097\7u\2\2\u0097\u0098\7g\2\2\u0098"+ + "\u0099\7s\2\2\u0099\u009a\7w\2\2\u009a\u009b\7g\2\2\u009b\u009c\7p\2\2"+ + "\u009c\u009d\7e\2\2\u009d\u009e\7g\2\2\u009e\34\3\2\2\2\u009f\u00a0\7"+ + "v\2\2\u00a0\u00a1\7t\2\2\u00a1\u00a2\7w\2\2\u00a2\u00a3\7g\2\2\u00a3\36"+ + "\3\2\2\2\u00a4\u00a5\7w\2\2\u00a5\u00a6\7p\2\2\u00a6\u00a7\7v\2\2\u00a7"+ + "\u00a8\7k\2\2\u00a8\u00a9\7n\2\2\u00a9 \3\2\2\2\u00aa\u00ab\7y\2\2\u00ab"+ + "\u00ac\7j\2\2\u00ac\u00ad\7g\2\2\u00ad\u00ae\7t\2\2\u00ae\u00af\7g\2\2"+ + "\u00af\"\3\2\2\2\u00b0\u00b1\7y\2\2\u00b1\u00b2\7k\2\2\u00b2\u00b3\7v"+ + "\2\2\u00b3\u00b4\7j\2\2\u00b4$\3\2\2\2\u00b5\u00b6\7A\2\2\u00b6&\3\2\2"+ + "\2\u00b7\u00bb\7?\2\2\u00b8\u00b9\7?\2\2\u00b9\u00bb\7?\2\2\u00ba\u00b7"+ + "\3\2\2\2\u00ba\u00b8\3\2\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,\3\2\2\2\u00c1\u00c2\7"+ + ">\2\2\u00c2\u00c3\7?\2\2\u00c3.\3\2\2\2\u00c4\u00c5\7@\2\2\u00c5\60\3"+ + "\2\2\2\u00c6\u00c7\7@\2\2\u00c7\u00c8\7?\2\2\u00c8\62\3\2\2\2\u00c9\u00ca"+ + "\7-\2\2\u00ca\64\3\2\2\2\u00cb\u00cc\7/\2\2\u00cc\66\3\2\2\2\u00cd\u00ce"+ + "\7,\2\2\u00ce8\3\2\2\2\u00cf\u00d0\7\61\2\2\u00d0:\3\2\2\2\u00d1\u00d2"+ + "\7\'\2\2\u00d2<\3\2\2\2\u00d3\u00d4\7\60\2\2\u00d4>\3\2\2\2\u00d5\u00d6"+ + "\7.\2\2\u00d6@\3\2\2\2\u00d7\u00d8\7]\2\2\u00d8B\3\2\2\2\u00d9\u00da\7"+ + "_\2\2\u00daD\3\2\2\2\u00db\u00dc\7*\2\2\u00dcF\3\2\2\2\u00dd\u00de\7+"+ + "\2\2\u00deH\3\2\2\2\u00df\u00e0\7~\2\2\u00e0J\3\2\2\2\u00e1\u00e5\7b\2"+ + "\2\u00e2\u00e4\n\2\2\2\u00e3\u00e2\3\2\2\2\u00e4\u00e7\3\2\2\2\u00e5\u00e3"+ + "\3\2\2\2\u00e5\u00e6\3\2\2\2\u00e6\u00e8\3\2\2\2\u00e7\u00e5\3\2\2\2\u00e8"+ + "\u00e9\7b\2\2\u00e9L\3\2\2\2\u00ea\u00f0\7)\2\2\u00eb\u00ec\7^\2\2\u00ec"+ + "\u00ef\t\3\2\2\u00ed\u00ef\n\4\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\u0117\7)\2\2\u00f4\u00fa\7$\2"+ + "\2\u00f5\u00f6\7^\2\2\u00f6\u00f9\t\3\2\2\u00f7\u00f9\n\5\2\2\u00f8\u00f5"+ + "\3\2\2\2\u00f8\u00f7\3\2\2\2\u00f9\u00fc\3\2\2\2\u00fa\u00f8\3\2\2\2\u00fa"+ + "\u00fb\3\2\2\2\u00fb\u00fd\3\2\2\2\u00fc\u00fa\3\2\2\2\u00fd\u0117\7$"+ + "\2\2\u00fe\u00ff\7A\2\2\u00ff\u0100\7$\2\2\u0100\u0106\3\2\2\2\u0101\u0102"+ + "\7^\2\2\u0102\u0105\7$\2\2\u0103\u0105\n\6\2\2\u0104\u0101\3\2\2\2\u0104"+ + "\u0103\3\2\2\2\u0105\u0108\3\2\2\2\u0106\u0104\3\2\2\2\u0106\u0107\3\2"+ + "\2\2\u0107\u0109\3\2\2\2\u0108\u0106\3\2\2\2\u0109\u0117\7$\2\2\u010a"+ + "\u010b\7A\2\2\u010b\u010c\7)\2\2\u010c\u0112\3\2\2\2\u010d\u010e\7^\2"+ + "\2\u010e\u0111\7)\2\2\u010f\u0111\n\7\2\2\u0110\u010d\3\2\2\2\u0110\u010f"+ + "\3\2\2\2\u0111\u0114\3\2\2\2\u0112\u0110\3\2\2\2\u0112\u0113\3\2\2\2\u0113"+ + "\u0115\3\2\2\2\u0114\u0112\3\2\2\2\u0115\u0117\7)\2\2\u0116\u00ea\3\2"+ + "\2\2\u0116\u00f4\3\2\2\2\u0116\u00fe\3\2\2\2\u0116\u010a\3\2\2\2\u0117"+ + "N\3\2\2\2\u0118\u011a\5W,\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\u011cP\3\2\2\2\u011d\u011f\5W,\2\u011e"+ + "\u011d\3\2\2\2\u011f\u0120\3\2\2\2\u0120\u011e\3\2\2\2\u0120\u0121\3\2"+ + "\2\2\u0121\u0122\3\2\2\2\u0122\u0126\5=\37\2\u0123\u0125\5W,\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"+ + "\u0148\3\2\2\2\u0128\u0126\3\2\2\2\u0129\u012b\5=\37\2\u012a\u012c\5W"+ + ",\2\u012b\u012a\3\2\2\2\u012c\u012d\3\2\2\2\u012d\u012b\3\2\2\2\u012d"+ + "\u012e\3\2\2\2\u012e\u0148\3\2\2\2\u012f\u0131\5W,\2\u0130\u012f\3\2\2"+ + "\2\u0131\u0132\3\2\2\2\u0132\u0130\3\2\2\2\u0132\u0133\3\2\2\2\u0133\u013b"+ + "\3\2\2\2\u0134\u0138\5=\37\2\u0135\u0137\5W,\2\u0136\u0135\3\2\2\2\u0137"+ + "\u013a\3\2\2\2\u0138\u0136\3\2\2\2\u0138\u0139\3\2\2\2\u0139\u013c\3\2"+ + "\2\2\u013a\u0138\3\2\2\2\u013b\u0134\3\2\2\2\u013b\u013c\3\2\2\2\u013c"+ + "\u013d\3\2\2\2\u013d\u013e\5U+\2\u013e\u0148\3\2\2\2\u013f\u0141\5=\37"+ + "\2\u0140\u0142\5W,\2\u0141\u0140\3\2\2\2\u0142\u0143\3\2\2\2\u0143\u0141"+ + "\3\2\2\2\u0143\u0144\3\2\2\2\u0144\u0145\3\2\2\2\u0145\u0146\5U+\2\u0146"+ + "\u0148\3\2\2\2\u0147\u011e\3\2\2\2\u0147\u0129\3\2\2\2\u0147\u0130\3\2"+ + "\2\2\u0147\u013f\3\2\2\2\u0148R\3\2\2\2\u0149\u014c\5Y-\2\u014a\u014c"+ + "\t\b\2\2\u014b\u0149\3\2\2\2\u014b\u014a\3\2\2\2\u014c\u0152\3\2\2\2\u014d"+ + "\u0151\5Y-\2\u014e\u0151\5W,\2\u014f\u0151\7a\2\2\u0150\u014d\3\2\2\2"+ + "\u0150\u014e\3\2\2\2\u0150\u014f\3\2\2\2\u0151\u0154\3\2\2\2\u0152\u0150"+ + "\3\2\2\2\u0152\u0153\3\2\2\2\u0153T\3\2\2\2\u0154\u0152\3\2\2\2\u0155"+ + "\u0157\t\t\2\2\u0156\u0158\t\n\2\2\u0157\u0156\3\2\2\2\u0157\u0158\3\2"+ + "\2\2\u0158\u015a\3\2\2\2\u0159\u015b\5W,\2\u015a\u0159\3\2\2\2\u015b\u015c"+ + "\3\2\2\2\u015c\u015a\3\2\2\2\u015c\u015d\3\2\2\2\u015dV\3\2\2\2\u015e"+ + "\u015f\t\13\2\2\u015fX\3\2\2\2\u0160\u0161\t\f\2\2\u0161Z\3\2\2\2\u0162"+ + "\u0163\7\61\2\2\u0163\u0164\7\61\2\2\u0164\u0168\3\2\2\2\u0165\u0167\n"+ + "\r\2\2\u0166\u0165\3\2\2\2\u0167\u016a\3\2\2\2\u0168\u0166\3\2\2\2\u0168"+ + "\u0169\3\2\2\2\u0169\u016c\3\2\2\2\u016a\u0168\3\2\2\2\u016b\u016d\7\17"+ + "\2\2\u016c\u016b\3\2\2\2\u016c\u016d\3\2\2\2\u016d\u016f\3\2\2\2\u016e"+ + "\u0170\7\f\2\2\u016f\u016e\3\2\2\2\u016f\u0170\3\2\2\2\u0170\u0171\3\2"+ + "\2\2\u0171\u0172\b.\2\2\u0172\\\3\2\2\2\u0173\u0174\7\61\2\2\u0174\u0175"+ + "\7,\2\2\u0175\u017a\3\2\2\2\u0176\u0179\5]/\2\u0177\u0179\13\2\2\2\u0178"+ + "\u0176\3\2\2\2\u0178\u0177\3\2\2\2\u0179\u017c\3\2\2\2\u017a\u017b\3\2"+ + "\2\2\u017a\u0178\3\2\2\2\u017b\u017d\3\2\2\2\u017c\u017a\3\2\2\2\u017d"+ + "\u017e\7,\2\2\u017e\u017f\7\61\2\2\u017f\u0180\3\2\2\2\u0180\u0181\b/"+ + "\2\2\u0181^\3\2\2\2\u0182\u0184\t\16\2\2\u0183\u0182\3\2\2\2\u0184\u0185"+ + "\3\2\2\2\u0185\u0183\3\2\2\2\u0185\u0186\3\2\2\2\u0186\u0187\3\2\2\2\u0187"+ + "\u0188\b\60\2\2\u0188`\3\2\2\2\"\2\u00ba\u00e5\u00ee\u00f0\u00f8\u00fa"+ + "\u0104\u0106\u0110\u0112\u0116\u011b\u0120\u0126\u012d\u0132\u0138\u013b"+ + "\u0143\u0147\u014b\u0150\u0152\u0157\u015c\u0168\u016c\u016f\u0178\u017a"+ + "\u0185\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 73539cfb33fb9..0c8d6d8ed2321 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, ANY=2, BY=3, FALSE=4, FORK=5, IN=6, JOIN=7, MAXSPAN=8, NOT=9, NULL=10, - OF=11, OR=12, SEQUENCE=13, TRUE=14, UNTIL=15, WHERE=16, WITH=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; + OF=11, OR=12, SEQUENCE=13, TRUE=14, UNTIL=15, WHERE=16, WITH=17, PARAM=18, + EQ=19, NEQ=20, LT=21, LTE=22, GT=23, GTE=24, PLUS=25, MINUS=26, ASTERISK=27, + SLASH=28, PERCENT=29, DOT=30, COMMA=31, LB=32, RB=33, LP=34, RP=35, PIPE=36, + ESCAPED_IDENTIFIER=37, STRING=38, INTEGER_VALUE=39, DECIMAL_VALUE=40, + IDENTIFIER=41, LINE_COMMENT=42, BRACKETED_COMMENT=43, WS=44; 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,14 +43,14 @@ class EqlBaseParser extends Parser { private static final String[] _LITERAL_NAMES = { null, "'and'", "'any'", "'by'", "'false'", "'fork'", "'in'", "'join'", "'maxspan'", "'not'", "'null'", "'of'", "'or'", "'sequence'", "'true'", - "'until'", "'where'", "'with'", null, "'!='", "'<'", "'<='", "'>'", "'>='", - "'+'", "'-'", "'*'", "'/'", "'%'", "'.'", "','", "'['", "']'", "'('", - "')'", "'|'" + "'until'", "'where'", "'with'", "'?'", null, "'!='", "'<'", "'<='", "'>'", + "'>='", "'+'", "'-'", "'*'", "'/'", "'%'", "'.'", "','", "'['", "']'", + "'('", "')'", "'|'" }; private static final String[] _SYMBOLIC_NAMES = { null, "AND", "ANY", "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", + "NULL", "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" @@ -648,7 +648,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); @@ -1405,6 +1405,7 @@ private ValueExpressionContext valueExpression(int _p) throws RecognitionExcepti case FALSE: case NULL: case TRUE: + case PARAM: case LP: case ESCAPED_IDENTIFIER: case STRING: @@ -1815,7 +1816,7 @@ public final FunctionExpressionContext functionExpression() throws RecognitionEx match(LP); setState(239); _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(231); expression(); @@ -1900,6 +1901,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); @@ -1943,7 +1961,7 @@ public final ConstantContext constant() throws RecognitionException { ConstantContext _localctx = new ConstantContext(_ctx, getState()); enterRule(_localctx, 38, RULE_constant); try { - setState(247); + setState(248); switch (_input.LA(1)) { case NULL: _localctx = new NullLiteralContext(_localctx); @@ -1979,6 +1997,14 @@ public final ConstantContext constant() throws RecognitionException { string(); } break; + case PARAM: + _localctx = new ParamLiteralContext(_localctx); + enterOuterAlt(_localctx, 5); + { + setState(247); + match(PARAM); + } + break; default: throw new NoViableAltException(this); } @@ -2027,7 +2053,7 @@ public final ComparisonOperatorContext comparisonOperator() throws RecognitionEx try { enterOuterAlt(_localctx, 1); { - setState(249); + setState(250); _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); @@ -2076,7 +2102,7 @@ public final BooleanValueContext booleanValue() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(251); + setState(252); _la = _input.LA(1); if ( !(_la==FALSE || _la==TRUE) ) { _errHandler.recoverInline(this); @@ -2146,43 +2172,43 @@ public final QualifiedNameContext qualifiedName() throws RecognitionException { int _alt; enterOuterAlt(_localctx, 1); { - setState(253); + setState(254); identifier(); - setState(265); + setState(266); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,33,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { - setState(263); + setState(264); switch (_input.LA(1)) { case DOT: { - setState(254); - match(DOT); setState(255); + match(DOT); + setState(256); identifier(); } break; case LB: { - setState(256); + setState(257); match(LB); - setState(258); + setState(259); _errHandler.sync(this); _la = _input.LA(1); do { { { - setState(257); + setState(258); match(INTEGER_VALUE); } } - setState(260); + setState(261); _errHandler.sync(this); _la = _input.LA(1); } while ( _la==INTEGER_VALUE ); - setState(262); + setState(263); match(RB); } break; @@ -2191,7 +2217,7 @@ public final QualifiedNameContext qualifiedName() throws RecognitionException { } } } - setState(267); + setState(268); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,33,_ctx); } @@ -2237,7 +2263,7 @@ public final IdentifierContext identifier() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(268); + setState(269); _la = _input.LA(1); if ( !(_la==ESCAPED_IDENTIFIER || _la==IDENTIFIER) ) { _errHandler.recoverInline(this); @@ -2289,13 +2315,13 @@ public final TimeUnitContext timeUnit() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(270); + setState(271); number(); - setState(272); + setState(273); _la = _input.LA(1); if (_la==IDENTIFIER) { { - setState(271); + setState(272); ((TimeUnitContext)_localctx).unit = match(IDENTIFIER); } } @@ -2363,13 +2389,13 @@ public final NumberContext number() throws RecognitionException { NumberContext _localctx = new NumberContext(_ctx, getState()); enterRule(_localctx, 50, RULE_number); try { - setState(276); + setState(277); switch (_input.LA(1)) { case DECIMAL_VALUE: _localctx = new DecimalLiteralContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(274); + setState(275); match(DECIMAL_VALUE); } break; @@ -2377,7 +2403,7 @@ public final NumberContext number() throws RecognitionException { _localctx = new IntegerLiteralContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(275); + setState(276); match(INTEGER_VALUE); } break; @@ -2423,7 +2449,7 @@ public final StringContext string() throws RecognitionException { try { enterOuterAlt(_localctx, 1); { - setState(278); + setState(279); match(STRING); } } @@ -2469,7 +2495,7 @@ private boolean valueExpression_sempred(ValueExpressionContext _localctx, int pr } public static final String _serializedATN = - "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3-\u011b\4\2\t\2\4"+ + "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3.\u011c\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"+ @@ -2488,84 +2514,85 @@ private boolean valueExpression_sempred(ValueExpressionContext _localctx, int pr "\3\22\3\22\7\22\u00d8\n\22\f\22\16\22\u00db\13\22\3\22\3\22\3\23\3\23"+ "\3\23\3\23\3\23\3\23\3\23\5\23\u00e6\n\23\3\24\3\24\3\24\3\24\3\24\7\24"+ "\u00ed\n\24\f\24\16\24\u00f0\13\24\5\24\u00f2\n\24\3\24\3\24\3\25\3\25"+ - "\3\25\3\25\5\25\u00fa\n\25\3\26\3\26\3\27\3\27\3\30\3\30\3\30\3\30\3\30"+ - "\6\30\u0105\n\30\r\30\16\30\u0106\3\30\7\30\u010a\n\30\f\30\16\30\u010d"+ - "\13\30\3\31\3\31\3\32\3\32\5\32\u0113\n\32\3\33\3\33\5\33\u0117\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\6\6\20\20\4\2&&"+ - "**\u012b\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\u009c\3\2\2\2\34\u00a1\3\2\2\2\36\u00aa\3\2\2"+ - "\2 \u00be\3\2\2\2\"\u00d0\3\2\2\2$\u00e5\3\2\2\2&\u00e7\3\2\2\2(\u00f9"+ - "\3\2\2\2*\u00fb\3\2\2\2,\u00fd\3\2\2\2.\u00ff\3\2\2\2\60\u010e\3\2\2\2"+ - "\62\u0110\3\2\2\2\64\u0116\3\2\2\2\66\u0118\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\2"+ - "FI\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\23"+ - "\2\2KL\7\n\2\2LM\7\24\2\2MN\5\62\32\2N\13\3\2\2\2OX\7\17\2\2PR\5\22\n"+ - "\2QS\5\n\6\2RQ\3\2\2\2RS\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\21\2\2ac\5\26\f\2b`\3\2\2\2bc\3\2\2\2c\r\3\2\2\2df\7\t\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\2k"+ - "l\3\2\2\2lj\3\2\2\2lm\3\2\2\2mp\3\2\2\2no\7\21\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\5\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\7\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\u009d\7\4\2\2\u009b"+ - "\u009d\5\60\31\2\u009c\u009a\3\2\2\2\u009c\u009b\3\2\2\2\u009d\u009e\3"+ - "\2\2\2\u009e\u009f\7\22\2\2\u009f\u00a0\5\34\17\2\u00a0\33\3\2\2\2\u00a1"+ - "\u00a2\5\36\20\2\u00a2\35\3\2\2\2\u00a3\u00a4\b\20\1\2\u00a4\u00a5\7\13"+ - "\2\2\u00a5\u00ab\5\36\20\7\u00a6\u00a7\7*\2\2\u00a7\u00a8\7\r\2\2\u00a8"+ - "\u00ab\5\30\r\2\u00a9\u00ab\5 \21\2\u00aa\u00a3\3\2\2\2\u00aa\u00a6\3"+ - "\2\2\2\u00aa\u00a9\3\2\2\2\u00ab\u00b4\3\2\2\2\u00ac\u00ad\f\4\2\2\u00ad"+ - "\u00ae\7\3\2\2\u00ae\u00b3\5\36\20\5\u00af\u00b0\f\3\2\2\u00b0\u00b1\7"+ - "\16\2\2\u00b1\u00b3\5\36\20\4\u00b2\u00ac\3\2\2\2\u00b2\u00af\3\2\2\2"+ - "\u00b3\u00b6\3\2\2\2\u00b4\u00b2\3\2\2\2\u00b4\u00b5\3\2\2\2\u00b5\37"+ - "\3\2\2\2\u00b6\u00b4\3\2\2\2\u00b7\u00b8\b\21\1\2\u00b8\u00ba\5$\23\2"+ - "\u00b9\u00bb\5\"\22\2\u00ba\u00b9\3\2\2\2\u00ba\u00bb\3\2\2\2\u00bb\u00bf"+ - "\3\2\2\2\u00bc\u00bd\t\2\2\2\u00bd\u00bf\5 \21\6\u00be\u00b7\3\2\2\2\u00be"+ - "\u00bc\3\2\2\2\u00bf\u00cc\3\2\2\2\u00c0\u00c1\f\5\2\2\u00c1\u00c2\t\3"+ - "\2\2\u00c2\u00cb\5 \21\6\u00c3\u00c4\f\4\2\2\u00c4\u00c5\t\2\2\2\u00c5"+ - "\u00cb\5 \21\5\u00c6\u00c7\f\3\2\2\u00c7\u00c8\5*\26\2\u00c8\u00c9\5 "+ - "\21\4\u00c9\u00cb\3\2\2\2\u00ca\u00c0\3\2\2\2\u00ca\u00c3\3\2\2\2\u00ca"+ - "\u00c6\3\2\2\2\u00cb\u00ce\3\2\2\2\u00cc\u00ca\3\2\2\2\u00cc\u00cd\3\2"+ - "\2\2\u00cd!\3\2\2\2\u00ce\u00cc\3\2\2\2\u00cf\u00d1\7\13\2\2\u00d0\u00cf"+ - "\3\2\2\2\u00d0\u00d1\3\2\2\2\u00d1\u00d2\3\2\2\2\u00d2\u00d3\7\b\2\2\u00d3"+ - "\u00d4\7#\2\2\u00d4\u00d9\5\34\17\2\u00d5\u00d6\7 \2\2\u00d6\u00d8\5\34"+ - "\17\2\u00d7\u00d5\3\2\2\2\u00d8\u00db\3\2\2\2\u00d9\u00d7\3\2\2\2\u00d9"+ - "\u00da\3\2\2\2\u00da\u00dc\3\2\2\2\u00db\u00d9\3\2\2\2\u00dc\u00dd\7$"+ - "\2\2\u00dd#\3\2\2\2\u00de\u00e6\5(\25\2\u00df\u00e6\5&\24\2\u00e0\u00e6"+ - "\5.\30\2\u00e1\u00e2\7#\2\2\u00e2\u00e3\5\34\17\2\u00e3\u00e4\7$\2\2\u00e4"+ - "\u00e6\3\2\2\2\u00e5\u00de\3\2\2\2\u00e5\u00df\3\2\2\2\u00e5\u00e0\3\2"+ - "\2\2\u00e5\u00e1\3\2\2\2\u00e6%\3\2\2\2\u00e7\u00e8\7*\2\2\u00e8\u00f1"+ - "\7#\2\2\u00e9\u00ee\5\34\17\2\u00ea\u00eb\7 \2\2\u00eb\u00ed\5\34\17\2"+ - "\u00ec\u00ea\3\2\2\2\u00ed\u00f0\3\2\2\2\u00ee\u00ec\3\2\2\2\u00ee\u00ef"+ - "\3\2\2\2\u00ef\u00f2\3\2\2\2\u00f0\u00ee\3\2\2\2\u00f1\u00e9\3\2\2\2\u00f1"+ - "\u00f2\3\2\2\2\u00f2\u00f3\3\2\2\2\u00f3\u00f4\7$\2\2\u00f4\'\3\2\2\2"+ - "\u00f5\u00fa\7\f\2\2\u00f6\u00fa\5\64\33\2\u00f7\u00fa\5,\27\2\u00f8\u00fa"+ - "\5\66\34\2\u00f9\u00f5\3\2\2\2\u00f9\u00f6\3\2\2\2\u00f9\u00f7\3\2\2\2"+ - "\u00f9\u00f8\3\2\2\2\u00fa)\3\2\2\2\u00fb\u00fc\t\4\2\2\u00fc+\3\2\2\2"+ - "\u00fd\u00fe\t\5\2\2\u00fe-\3\2\2\2\u00ff\u010b\5\60\31\2\u0100\u0101"+ - "\7\37\2\2\u0101\u010a\5\60\31\2\u0102\u0104\7!\2\2\u0103\u0105\7(\2\2"+ - "\u0104\u0103\3\2\2\2\u0105\u0106\3\2\2\2\u0106\u0104\3\2\2\2\u0106\u0107"+ - "\3\2\2\2\u0107\u0108\3\2\2\2\u0108\u010a\7\"\2\2\u0109\u0100\3\2\2\2\u0109"+ - "\u0102\3\2\2\2\u010a\u010d\3\2\2\2\u010b\u0109\3\2\2\2\u010b\u010c\3\2"+ - "\2\2\u010c/\3\2\2\2\u010d\u010b\3\2\2\2\u010e\u010f\t\6\2\2\u010f\61\3"+ - "\2\2\2\u0110\u0112\5\64\33\2\u0111\u0113\7*\2\2\u0112\u0111\3\2\2\2\u0112"+ - "\u0113\3\2\2\2\u0113\63\3\2\2\2\u0114\u0117\7)\2\2\u0115\u0117\7(\2\2"+ - "\u0116\u0114\3\2\2\2\u0116\u0115\3\2\2\2\u0117\65\3\2\2\2\u0118\u0119"+ - "\7\'\2\2\u0119\67\3\2\2\2&BHRVX^bflpy|\u0084\u0089\u008f\u0091\u0094\u009c"+ - "\u00aa\u00b2\u00b4\u00ba\u00be\u00ca\u00cc\u00d0\u00d9\u00e5\u00ee\u00f1"+ - "\u00f9\u0106\u0109\u010b\u0112\u0116"; + "\3\25\3\25\3\25\5\25\u00fb\n\25\3\26\3\26\3\27\3\27\3\30\3\30\3\30\3\30"+ + "\3\30\6\30\u0106\n\30\r\30\16\30\u0107\3\30\7\30\u010b\n\30\f\30\16\30"+ + "\u010e\13\30\3\31\3\31\3\32\3\32\5\32\u0114\n\32\3\33\3\33\5\33\u0118"+ + "\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\33\34\3\2\35\37\3\2\25\32\4\2\6\6\20\20"+ + "\4\2\'\'++\u012d\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\u009c\3\2\2\2\34\u00a1\3\2\2\2\36\u00aa"+ + "\3\2\2\2 \u00be\3\2\2\2\"\u00d0\3\2\2\2$\u00e5\3\2\2\2&\u00e7\3\2\2\2"+ + "(\u00fa\3\2\2\2*\u00fc\3\2\2\2,\u00fe\3\2\2\2.\u0100\3\2\2\2\60\u010f"+ + "\3\2\2\2\62\u0111\3\2\2\2\64\u0117\3\2\2\2\66\u0119\3\2\2\289\5\6\4\2"+ + "9:\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\2"+ + "JK\7\23\2\2KL\7\n\2\2LM\7\25\2\2MN\5\62\32\2N\13\3\2\2\2OX\7\17\2\2PR"+ + "\5\22\n\2QS\5\n\6\2RQ\3\2\2\2RS\3\2\2\2SY\3\2\2\2TV\5\n\6\2UW\5\22\n\2"+ + "VU\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\2"+ + "Z\\\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\21\2\2ac\5\26\f\2b`\3\2\2\2bc\3\2\2\2c\r\3\2\2\2df\7\t\2\2"+ + "eg\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\21\2\2oq\5\24\13\2"+ + "pn\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\5\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\7\2\2\u008d\u008e\7\25\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\u009d\7\4\2"+ + "\2\u009b\u009d\5\60\31\2\u009c\u009a\3\2\2\2\u009c\u009b\3\2\2\2\u009d"+ + "\u009e\3\2\2\2\u009e\u009f\7\22\2\2\u009f\u00a0\5\34\17\2\u00a0\33\3\2"+ + "\2\2\u00a1\u00a2\5\36\20\2\u00a2\35\3\2\2\2\u00a3\u00a4\b\20\1\2\u00a4"+ + "\u00a5\7\13\2\2\u00a5\u00ab\5\36\20\7\u00a6\u00a7\7+\2\2\u00a7\u00a8\7"+ + "\r\2\2\u00a8\u00ab\5\30\r\2\u00a9\u00ab\5 \21\2\u00aa\u00a3\3\2\2\2\u00aa"+ + "\u00a6\3\2\2\2\u00aa\u00a9\3\2\2\2\u00ab\u00b4\3\2\2\2\u00ac\u00ad\f\4"+ + "\2\2\u00ad\u00ae\7\3\2\2\u00ae\u00b3\5\36\20\5\u00af\u00b0\f\3\2\2\u00b0"+ + "\u00b1\7\16\2\2\u00b1\u00b3\5\36\20\4\u00b2\u00ac\3\2\2\2\u00b2\u00af"+ + "\3\2\2\2\u00b3\u00b6\3\2\2\2\u00b4\u00b2\3\2\2\2\u00b4\u00b5\3\2\2\2\u00b5"+ + "\37\3\2\2\2\u00b6\u00b4\3\2\2\2\u00b7\u00b8\b\21\1\2\u00b8\u00ba\5$\23"+ + "\2\u00b9\u00bb\5\"\22\2\u00ba\u00b9\3\2\2\2\u00ba\u00bb\3\2\2\2\u00bb"+ + "\u00bf\3\2\2\2\u00bc\u00bd\t\2\2\2\u00bd\u00bf\5 \21\6\u00be\u00b7\3\2"+ + "\2\2\u00be\u00bc\3\2\2\2\u00bf\u00cc\3\2\2\2\u00c0\u00c1\f\5\2\2\u00c1"+ + "\u00c2\t\3\2\2\u00c2\u00cb\5 \21\6\u00c3\u00c4\f\4\2\2\u00c4\u00c5\t\2"+ + "\2\2\u00c5\u00cb\5 \21\5\u00c6\u00c7\f\3\2\2\u00c7\u00c8\5*\26\2\u00c8"+ + "\u00c9\5 \21\4\u00c9\u00cb\3\2\2\2\u00ca\u00c0\3\2\2\2\u00ca\u00c3\3\2"+ + "\2\2\u00ca\u00c6\3\2\2\2\u00cb\u00ce\3\2\2\2\u00cc\u00ca\3\2\2\2\u00cc"+ + "\u00cd\3\2\2\2\u00cd!\3\2\2\2\u00ce\u00cc\3\2\2\2\u00cf\u00d1\7\13\2\2"+ + "\u00d0\u00cf\3\2\2\2\u00d0\u00d1\3\2\2\2\u00d1\u00d2\3\2\2\2\u00d2\u00d3"+ + "\7\b\2\2\u00d3\u00d4\7$\2\2\u00d4\u00d9\5\34\17\2\u00d5\u00d6\7!\2\2\u00d6"+ + "\u00d8\5\34\17\2\u00d7\u00d5\3\2\2\2\u00d8\u00db\3\2\2\2\u00d9\u00d7\3"+ + "\2\2\2\u00d9\u00da\3\2\2\2\u00da\u00dc\3\2\2\2\u00db\u00d9\3\2\2\2\u00dc"+ + "\u00dd\7%\2\2\u00dd#\3\2\2\2\u00de\u00e6\5(\25\2\u00df\u00e6\5&\24\2\u00e0"+ + "\u00e6\5.\30\2\u00e1\u00e2\7$\2\2\u00e2\u00e3\5\34\17\2\u00e3\u00e4\7"+ + "%\2\2\u00e4\u00e6\3\2\2\2\u00e5\u00de\3\2\2\2\u00e5\u00df\3\2\2\2\u00e5"+ + "\u00e0\3\2\2\2\u00e5\u00e1\3\2\2\2\u00e6%\3\2\2\2\u00e7\u00e8\7+\2\2\u00e8"+ + "\u00f1\7$\2\2\u00e9\u00ee\5\34\17\2\u00ea\u00eb\7!\2\2\u00eb\u00ed\5\34"+ + "\17\2\u00ec\u00ea\3\2\2\2\u00ed\u00f0\3\2\2\2\u00ee\u00ec\3\2\2\2\u00ee"+ + "\u00ef\3\2\2\2\u00ef\u00f2\3\2\2\2\u00f0\u00ee\3\2\2\2\u00f1\u00e9\3\2"+ + "\2\2\u00f1\u00f2\3\2\2\2\u00f2\u00f3\3\2\2\2\u00f3\u00f4\7%\2\2\u00f4"+ + "\'\3\2\2\2\u00f5\u00fb\7\f\2\2\u00f6\u00fb\5\64\33\2\u00f7\u00fb\5,\27"+ + "\2\u00f8\u00fb\5\66\34\2\u00f9\u00fb\7\24\2\2\u00fa\u00f5\3\2\2\2\u00fa"+ + "\u00f6\3\2\2\2\u00fa\u00f7\3\2\2\2\u00fa\u00f8\3\2\2\2\u00fa\u00f9\3\2"+ + "\2\2\u00fb)\3\2\2\2\u00fc\u00fd\t\4\2\2\u00fd+\3\2\2\2\u00fe\u00ff\t\5"+ + "\2\2\u00ff-\3\2\2\2\u0100\u010c\5\60\31\2\u0101\u0102\7 \2\2\u0102\u010b"+ + "\5\60\31\2\u0103\u0105\7\"\2\2\u0104\u0106\7)\2\2\u0105\u0104\3\2\2\2"+ + "\u0106\u0107\3\2\2\2\u0107\u0105\3\2\2\2\u0107\u0108\3\2\2\2\u0108\u0109"+ + "\3\2\2\2\u0109\u010b\7#\2\2\u010a\u0101\3\2\2\2\u010a\u0103\3\2\2\2\u010b"+ + "\u010e\3\2\2\2\u010c\u010a\3\2\2\2\u010c\u010d\3\2\2\2\u010d/\3\2\2\2"+ + "\u010e\u010c\3\2\2\2\u010f\u0110\t\6\2\2\u0110\61\3\2\2\2\u0111\u0113"+ + "\5\64\33\2\u0112\u0114\7+\2\2\u0113\u0112\3\2\2\2\u0113\u0114\3\2\2\2"+ + "\u0114\63\3\2\2\2\u0115\u0118\7*\2\2\u0116\u0118\7)\2\2\u0117\u0115\3"+ + "\2\2\2\u0117\u0116\3\2\2\2\u0118\65\3\2\2\2\u0119\u011a\7(\2\2\u011a\67"+ + "\3\2\2\2&BHRVX^bflpy|\u0084\u0089\u008f\u0091\u0094\u009c\u00aa\u00b2"+ + "\u00b4\u00ba\u00be\u00ca\u00cc\u00d0\u00d9\u00e5\u00ee\u00f1\u00fa\u0107"+ + "\u010a\u010c\u0113\u0117"; 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 21bcfdbd2a195..21ad5015a12e3 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..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 @@ -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; + private 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,32 @@ 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; + + dataType = DataTypes.fromJava(value); + + 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 1a42b7cbb21a5..6c2f18a76804a 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.Order; @@ -18,14 +19,14 @@ import org.elasticsearch.xpack.ql.tree.Source; import org.elasticsearch.xpack.ql.type.DataTypes; +import java.util.Map; + import static java.util.Collections.singletonList; public abstract class LogicalPlanBuilder extends ExpressionBuilder { - private final ParserParams params; - - 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..325912debe048 --- /dev/null +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/parser/ParameterTests.java @@ -0,0 +1,63 @@ +/* + * 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 java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static org.hamcrest.Matchers.containsString; + +public class ParameterTests extends ESTestCase { + + private final EqlParser parser = new EqlParser(); + + private Expression expr(String source) { + return parser.createExpression(source); + } + + private 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 testEscapes() { + assertEquals(expr("a == ? and b == ?'test'", Collections.singletonList("test \\ \n \r \t ' \"")), + expr("a == 'test \\\\ \\n \\r \\t \\' \\\"' and b == 'test'")); + } + + public void testInvalidParameters() { + ParsingException ex = expectThrows(ParsingException.class, + () -> 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")); + } + + public void testNotEnoughParameters() { + ParsingException ex = expectThrows(ParsingException.class, + () -> expr("(? + ? * ?) - ?", Arrays.asList(1, 2, 3))); + + assertThat(ex.getMessage(), containsString("Not enough actual parameters")); + } +}