Remove isDevVersion for function / match options

carlosdelest · Jan 23, 2025 · c2f4ff6 · c2f4ff6
1 parent 500bf1f
commit c2f4ff6
Show file tree

Hide file tree

Showing 8 changed files with 1,040 additions and 1,067 deletions.
diff --git a/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4 b/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4
@@ -216,8 +216,8 @@ ASTERISK : '*';
 SLASH : '/';
 PERCENT : '%';
 
-LEFT_BRACES : {this.isDevVersion()}? '{';
-RIGHT_BRACES : {this.isDevVersion()}? '}';
+LEFT_BRACES : '{';
+RIGHT_BRACES : '}';
 
 NESTED_WHERE : WHERE -> type(WHERE);
 

diff --git a/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.tokens b/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.tokens
diff --git a/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4 b/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4
@@ -110,7 +110,7 @@ functionName
     ;
 
 mapExpression
-    : {this.isDevVersion()}? LEFT_BRACES entryExpression (COMMA entryExpression)* RIGHT_BRACES
+    : LEFT_BRACES entryExpression (COMMA entryExpression)* RIGHT_BRACES
     ;
 
 entryExpression

diff --git a/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.tokens b/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.tokens
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.interp b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.interp
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.java
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp