Skip to content

Commit c350403

Browse files
committed
Remove lexer / parser isDevVersion
1 parent 6a32cea commit c350403

File tree

8 files changed

+1700
-1735
lines changed

8 files changed

+1700
-1735
lines changed

x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ WS
105105
: [ \r\n\t]+ -> channel(HIDDEN)
106106
;
107107

108-
COLON : ':';
109-
110108
//
111109
// Expression - used by most command
112110
//
@@ -177,6 +175,7 @@ AND : 'and';
177175
ASC : 'asc';
178176
ASSIGN : '=';
179177
CAST_OP : '::';
178+
COLON : ':';
180179
COMMA : ',';
181180
DESC : 'desc';
182181
DOT : '.';
@@ -209,7 +208,6 @@ MINUS : '-';
209208
ASTERISK : '*';
210209
SLASH : '/';
211210
PERCENT : '%';
212-
EXPRESSION_COLON : {this.isDevVersion()}? COLON -> type(COLON);
213211

214212
NESTED_WHERE : WHERE -> type(WHERE);
215213

x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.tokens

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ booleanExpression
6868
| left=booleanExpression operator=OR right=booleanExpression #logicalBinary
6969
| valueExpression (NOT)? IN LP valueExpression (COMMA valueExpression)* RP #logicalIn
7070
| valueExpression IS NOT? NULL #isNull
71-
| {this.isDevVersion()}? matchBooleanExpression #matchExpression
71+
| matchBooleanExpression #matchExpression
7272
;
7373

7474
regexBooleanExpression

x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.tokens

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.interp

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.java

Lines changed: 947 additions & 962 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.java

Lines changed: 710 additions & 727 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)