Browse Source

SQL: Implement CURRENT_DATE (#38175)

Since DATE data type is now available, this implements the
`CURRENT_DATE/CURRENT_DATE()/TODAY()` similar to `CURRENT_TIMESTAMP`.

Closes: #38160
Marios Trivyzas 6 years ago
parent
commit
c9701be1e8
21 changed files with 1100 additions and 705 deletions
  1. 77 2
      docs/reference/sql/functions/date-time.asciidoc
  2. 1 0
      x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/cli/ShowTestCase.java
  3. 5 1
      x-pack/plugin/sql/qa/src/main/resources/command.csv-spec
  4. 87 0
      x-pack/plugin/sql/qa/src/main/resources/date.csv-spec
  5. 7 0
      x-pack/plugin/sql/qa/src/main/resources/datetime.sql-spec
  6. 62 12
      x-pack/plugin/sql/qa/src/main/resources/docs.csv-spec
  7. 4 3
      x-pack/plugin/sql/src/main/antlr/SqlBase.g4
  8. 2 2
      x-pack/plugin/sql/src/main/antlr/SqlBase.tokens
  9. 2 2
      x-pack/plugin/sql/src/main/antlr/SqlBaseLexer.tokens
  10. 3 1
      x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/FunctionRegistry.java
  11. 1 1
      x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/ConfigurationFunction.java
  12. 25 0
      x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/CurrentDate.java
  13. 14 38
      x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/CurrentDateTime.java
  14. 49 0
      x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/CurrentFunction.java
  15. 6 4
      x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/ExpressionBuilder.java
  16. 362 361
      x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseLexer.java
  17. 277 259
      x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseParser.java
  18. 46 0
      x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/CurrentDateTests.java
  19. 51 13
      x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/CurrentDateTimeTests.java
  20. 17 1
      x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/parser/ExpressionTests.java
  21. 2 5
      x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/tree/NodeSubclassTests.java

+ 77 - 2
docs/reference/sql/functions/date-time.asciidoc

@@ -93,6 +93,48 @@ include-tagged::{sql-specs}/docs.csv-spec[dtIntervalMul]
 
 beta[]
 
+[[sql-functions-current-date]]
+==== `CURRENT_DATE/CURDATE`
+
+.Synopsis:
+[source, sql]
+--------------------------------------------------
+CURRENT_DATE
+CURRENT_DATE()
+--------------------------------------------------
+
+*Input*: _none_
+
+*Output*: date
+
+.Description:
+
+Returns the date (no time part) when the current query reached the server.
+It can be used both as a keyword: `CURRENT_DATE` or as a function with no arguments: `CURRENT_DATE()`.
+
+[NOTE]
+Unlike CURRENT_DATE, `CURDATE()` can only be used as a function with no arguments and not as a keyword.
+
+This method always returns the same value for its every occurrence within the same query.
+
+["source","sql",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{sql-specs}/docs.csv-spec[curDate]
+--------------------------------------------------
+
+["source","sql",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{sql-specs}/docs.csv-spec[curDateFunction]
+--------------------------------------------------
+
+Typically, this function (as well as its twin <<sql-functions-today,TODAY())>> function
+is used for relative date filtering:
+
+["source","sql",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{sql-specs}/docs.csv-spec[filterToday]
+--------------------------------------------------
+
 [[sql-functions-current-timestamp]]
 ==== `CURRENT_TIMESTAMP`
 
@@ -115,7 +157,7 @@ Returns the date/time when the current query reached the server.
 As a function, `CURRENT_TIMESTAMP()` accepts _precision_ as an optional
 parameter for rounding the second fractional digits (nanoseconds).
 
-This method always returns the same value within a query.
+This method always returns the same value for its every occurrence within the same query.
 
 ["source","sql",subs="attributes,callouts,macros"]
 --------------------------------------------------
@@ -422,7 +464,8 @@ NOW()
 .Description:
 
 This function offers the same functionality as <<sql-functions-current-timestamp,CURRENT_TIMESTAMP()>> function: returns
-the datetime when the current query reached the server. This method always returns the same value within a query.
+the datetime when the current query reached the server. This method always returns the same value for its every
+occurrence within the same query.
 
 ["source","sql",subs="attributes,callouts,macros"]
 --------------------------------------------------
@@ -485,6 +528,38 @@ Extract the year quarter the date/datetime falls in.
 include-tagged::{sql-specs}/docs.csv-spec[quarter]
 --------------------------------------------------
 
+[[sql-functions-today]]
+==== `TODAY`
+
+.Synopsis:
+[source, sql]
+--------------------------------------------------
+TODAY()
+--------------------------------------------------
+
+*Input*: _none_
+
+*Output*: date
+
+.Description:
+
+This function offers the same functionality as <<sql-functions-current-date,CURRENT_DATE()>> function: returns
+the date when the current query reached the server. This method always returns the same value for its every occurrence
+within the same query.
+
+["source","sql",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{sql-specs}/docs.csv-spec[todayFunction]
+--------------------------------------------------
+
+Typically, this function (as well as its twin <<sql-functions-current-timestamp,CURRENT_TIMESTAMP())>> function is used
+for relative date filtering:
+
+["source","sql",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{sql-specs}/docs.csv-spec[filterToday]
+--------------------------------------------------
+
 [[sql-functions-datetime-week]]
 ==== `WEEK_OF_YEAR/WEEK`
 

+ 1 - 0
x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/cli/ShowTestCase.java

@@ -91,6 +91,7 @@ public abstract class ShowTestCase extends CliIntegrationTestCase {
         assertThat(readLine(), RegexMatcher.matches("\\s*ISODAYOFWEEK\\s*\\|\\s*SCALAR\\s*"));
         assertThat(readLine(), RegexMatcher.matches("\\s*ISO_DAY_OF_WEEK\\s*\\|\\s*SCALAR\\s*"));
         assertThat(readLine(), RegexMatcher.matches("\\s*MINUTE_OF_DAY\\s*\\|\\s*SCALAR\\s*"));
+        assertThat(readLine(), RegexMatcher.matches("\\s*TODAY\\s*\\|\\s*SCALAR\\s*"));
         assertEquals("", readLine());
     }
 }

+ 5 - 1
x-pack/plugin/sql/qa/src/main/resources/command.csv-spec

@@ -31,6 +31,8 @@ ISNULL           |CONDITIONAL
 LEAST            |CONDITIONAL
 NULLIF           |CONDITIONAL
 NVL              |CONDITIONAL
+CURDATE          |SCALAR
+CURRENT_DATE     |SCALAR
 CURRENT_TIMESTAMP|SCALAR
 DAY              |SCALAR
 DAYNAME          |SCALAR
@@ -65,7 +67,8 @@ MONTH_OF_YEAR    |SCALAR
 NOW              |SCALAR
 QUARTER          |SCALAR         
 SECOND           |SCALAR         
-SECOND_OF_MINUTE |SCALAR         
+SECOND_OF_MINUTE |SCALAR
+TODAY            |SCALAR
 WEEK             |SCALAR         
 WEEK_OF_YEAR     |SCALAR         
 YEAR             |SCALAR         
@@ -175,6 +178,7 @@ HOUR_OF_DAY    |SCALAR
 ISODAYOFWEEK   |SCALAR
 ISO_DAY_OF_WEEK|SCALAR
 MINUTE_OF_DAY  |SCALAR         
+TODAY          |SCALAR
 ;
 
 showTables

+ 87 - 0
x-pack/plugin/sql/qa/src/main/resources/date.csv-spec

@@ -2,6 +2,73 @@
 // Date
 //
 
+currentDateKeywordWithDivision
+SELECT YEAR(CURRENT_TIMESTAMP) / 1000 AS result;
+
+    result
+---------------
+2
+;
+
+currentDateFunctionNoArgsWithDivision
+SELECT YEAR(CURRENT_TIMESTAMP()) / 1000 AS result;
+
+    result
+---------------
+2
+;
+
+todayWithDivision
+SELECT YEAR(TODAY()) / 1000 AS result;
+
+    result
+---------------
+2
+;
+
+todayIntervalSubstraction
+SELECT TRUNCATE(YEAR(TODAY() - INTERVAL 50 YEARS) / 1000) AS result;
+
+    result
+---------------
+1
+;
+
+
+currentDateFilter
+SELECT first_name FROM test_emp WHERE hire_date > CURRENT_DATE() - INTERVAL 25 YEARS ORDER BY first_name ASC LIMIT 10;
+
+    first_name
+-----------------
+Kazuhito
+Kenroku
+Lillian
+Mayumi
+Mingsen
+Sailaja
+Saniya
+Shahaf
+Suzette
+Tuval
+;
+
+currentDateFilterScript
+SELECT first_name, TRUNCATE(YEAR(hire_date) - YEAR(TODAY()) / 1000) AS filter FROM test_emp
+WHERE TRUNCATE(YEAR(hire_date) - YEAR(TODAY()) / 1000) > 1990 ORDER BY first_name ASC LIMIT 10;
+
+  first_name   |  filter
+Cristinel      |1991
+Kazuhito       |1993
+Kenroku        |1992
+Lillian        |1997
+Magy           |1991
+Mayumi         |1993
+Mingsen        |1992
+Sailaja        |1994
+Saniya         |1992
+Shahaf         |1993
+;
+
 dateExtractDateParts
 SELECT
 DAY(CAST(birth_date AS DATE)) d,
@@ -75,3 +142,23 @@ SELECT YEAR(CAST('2019-01-21' AS DATE) + INTERVAL '1-2' YEAR TO MONTH) AS y, MON
 y:i       | m:i
 2020      | 3
 ;
+
+orderByCurrentDate
+SELECT first_name FROM test_emp ORDER BY TODAY(), first_name LIMIT 5;
+
+  first_name
+---------------
+Alejandro
+Amabile
+Anneke
+Anoosh
+Arumugam
+;
+
+groupByCurrentDate
+SELECT MAX(salary) FROM test_emp GROUP BY TODAY();
+
+  MAX(salary)
+---------------
+74999
+;

+ 7 - 0
x-pack/plugin/sql/qa/src/main/resources/datetime.sql-spec

@@ -120,6 +120,12 @@ SELECT DAY_OF_WEEK(birth_date) day, COUNT(*) c FROM test_emp WHERE DAY_OF_WEEK(b
 currentTimestampYear
 SELECT YEAR(CURRENT_TIMESTAMP()) AS result;
 
+orderByCurrentTimestamp
+SELECT first_name FROM test_emp ORDER BY NOW(), first_name NULLS LAST LIMIT 5;
+
+groupByCurrentTimestamp
+SELECT MAX(salary) AS max FROM test_emp GROUP BY NOW();
+
 //
 // H2 uses the local timezone instead of the specified one
 //
@@ -131,3 +137,4 @@ SELECT HOUR(CURRENT_TIMESTAMP()) AS result;
 
 currentTimestampMinute-Ignore
 SELECT MINUTE(CURRENT_TIMESTAMP()) AS result;
+

+ 62 - 12
x-pack/plugin/sql/qa/src/main/resources/docs.csv-spec

@@ -208,6 +208,8 @@ ISNULL           |CONDITIONAL
 LEAST            |CONDITIONAL
 NULLIF           |CONDITIONAL
 NVL              |CONDITIONAL
+CURDATE          |SCALAR
+CURRENT_DATE     |SCALAR
 CURRENT_TIMESTAMP|SCALAR
 DAY              |SCALAR
 DAYNAME          |SCALAR
@@ -242,7 +244,8 @@ MONTH_OF_YEAR    |SCALAR
 NOW              |SCALAR
 QUARTER          |SCALAR         
 SECOND           |SCALAR         
-SECOND_OF_MINUTE |SCALAR         
+SECOND_OF_MINUTE |SCALAR
+TODAY            |SCALAR
 WEEK             |SCALAR         
 WEEK_OF_YEAR     |SCALAR         
 YEAR             |SCALAR         
@@ -365,6 +368,7 @@ HOUR_OF_DAY    |SCALAR
 ISODAYOFWEEK   |SCALAR
 ISO_DAY_OF_WEEK|SCALAR
 MINUTE_OF_DAY  |SCALAR         
+TODAY          |SCALAR
 
 // end::showFunctionsWithPattern
 ;
@@ -2227,18 +2231,50 @@ SELECT WEEK(CAST('1988-01-05T09:22:10Z' AS TIMESTAMP)) AS week, ISOWEEK(CAST('19
 ;
 
 
-currentNow
-// tag::filterNow
-SELECT first_name FROM emp WHERE hire_date > NOW() - INTERVAL 100 YEARS ORDER BY first_name ASC LIMIT 5;
 
-  first_name   
----------------
-Alejandro      
-Amabile        
-Anneke         
-Anoosh         
-Arumugam       
-// end::filterNow
+
+currentDate-Ignore
+// tag::curDate
+SELECT CURRENT_TIMESTAMP AS result;
+
+         result
+------------------------
+2018-12-12
+// end::curDate
+;
+
+currentDateFunction-Ignore
+// tag::curDateFunction
+SELECT CURRENT_TIMESTAMP() AS result;
+
+         result
+------------------------
+2018-12-12
+// end::curDateFunction
+;
+
+todayFunction-Ignore
+// tag::todayFunction
+SELECT TODAY() AS result;
+
+         result
+------------------------
+2018-12-12
+// end::todayFunction
+;
+
+filterToday
+// tag::filterToday
+SELECT first_name FROM emp WHERE hire_date > TODAY() - INTERVAL 25 YEARS ORDER BY first_name ASC LIMIT 5;
+
+ first_name
+------------
+Kazuhito
+Kenroku
+Lillian
+Mayumi
+Mingsen
+// end::filterToday
 ;
 
 currentTimestamp-Ignore
@@ -2282,6 +2318,20 @@ SELECT NOW() AS result;
 // end::nowFunction
 ;
 
+filterNow
+// tag::filterNow
+SELECT first_name FROM emp WHERE hire_date > NOW() - INTERVAL 100 YEARS ORDER BY first_name ASC LIMIT 5;
+
+  first_name
+---------------
+Alejandro
+Amabile
+Anneke
+Anoosh
+Arumugam
+// end::filterNow
+;
+
 ////////////
 // Next two queries need to have the same output, as they should be equivalent.
 // They are used in the "SQL Limitations" page.

+ 4 - 3
x-pack/plugin/sql/src/main/antlr/SqlBase.g4

@@ -236,7 +236,8 @@ castTemplate
     ;
 
 builtinDateTimeFunction
-    : name=CURRENT_TIMESTAMP ('(' precision=INTEGER_VALUE? ')')?
+    : name=CURRENT_DATE ('(' ')')?
+    | name=CURRENT_TIMESTAMP ('(' precision=INTEGER_VALUE? ')')?
     ;
     
 convertTemplate
@@ -337,7 +338,7 @@ string
 // http://developer.mimer.se/validator/sql-reserved-words.tml
 nonReserved
     : ANALYZE | ANALYZED 
-    | CATALOGS | COLUMNS | CURRENT 
+    | CATALOGS | COLUMNS
     | DAY | DEBUG  
     | EXECUTABLE | EXPLAIN 
     | FIRST | FORMAT | FULL | FUNCTIONS
@@ -370,7 +371,7 @@ CATALOG: 'CATALOG';
 CATALOGS: 'CATALOGS';
 COLUMNS: 'COLUMNS';
 CONVERT: 'CONVERT';
-CURRENT: 'CURRENT';
+CURRENT_DATE : 'CURRENT_DATE';
 CURRENT_TIMESTAMP : 'CURRENT_TIMESTAMP';
 DAY: 'DAY';
 DAYS: 'DAYS';

+ 2 - 2
x-pack/plugin/sql/src/main/antlr/SqlBase.tokens

@@ -16,7 +16,7 @@ CATALOG=15
 CATALOGS=16
 COLUMNS=17
 CONVERT=18
-CURRENT=19
+CURRENT_DATE=19
 CURRENT_TIMESTAMP=20
 DAY=21
 DAYS=22
@@ -143,7 +143,7 @@ DELIMITER=127
 'CATALOGS'=16
 'COLUMNS'=17
 'CONVERT'=18
-'CURRENT'=19
+'CURRENT_DATE'=19
 'CURRENT_TIMESTAMP'=20
 'DAY'=21
 'DAYS'=22

+ 2 - 2
x-pack/plugin/sql/src/main/antlr/SqlBaseLexer.tokens

@@ -16,7 +16,7 @@ CATALOG=15
 CATALOGS=16
 COLUMNS=17
 CONVERT=18
-CURRENT=19
+CURRENT_DATE=19
 CURRENT_TIMESTAMP=20
 DAY=21
 DAYS=22
@@ -142,7 +142,7 @@ UNRECOGNIZED=126
 'CATALOGS'=16
 'COLUMNS'=17
 'CONVERT'=18
-'CURRENT'=19
+'CURRENT_DATE'=19
 'CURRENT_TIMESTAMP'=20
 'DAY'=21
 'DAYS'=22

+ 3 - 1
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/FunctionRegistry.java

@@ -27,6 +27,7 @@ import org.elasticsearch.xpack.sql.expression.function.grouping.Histogram;
 import org.elasticsearch.xpack.sql.expression.function.scalar.Cast;
 import org.elasticsearch.xpack.sql.expression.function.scalar.Database;
 import org.elasticsearch.xpack.sql.expression.function.scalar.User;
+import org.elasticsearch.xpack.sql.expression.function.scalar.datetime.CurrentDate;
 import org.elasticsearch.xpack.sql.expression.function.scalar.datetime.CurrentDateTime;
 import org.elasticsearch.xpack.sql.expression.function.scalar.datetime.DayName;
 import org.elasticsearch.xpack.sql.expression.function.scalar.datetime.DayOfMonth;
@@ -169,7 +170,8 @@ public class FunctionRegistry {
                 def(Greatest.class, Greatest::new, "GREATEST"),
                 def(Least.class, Least::new, "LEAST"));
         // Date
-        addToMap(def(CurrentDateTime.class, CurrentDateTime::new, "CURRENT_TIMESTAMP", "NOW"),
+        addToMap(def(CurrentDate.class, CurrentDate::new, "CURRENT_DATE", "CURDATE", "TODAY"),
+                def(CurrentDateTime.class, CurrentDateTime::new, "CURRENT_TIMESTAMP", "NOW"),
                 def(DayName.class, DayName::new, "DAY_NAME", "DAYNAME"),
                 def(DayOfMonth.class, DayOfMonth::new, "DAY_OF_MONTH", "DAYOFMONTH", "DAY", "DOM"),
                 def(DayOfWeek.class, DayOfWeek::new, "DAY_OF_WEEK", "DAYOFWEEK", "DOW"),

+ 1 - 1
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/ConfigurationFunction.java

@@ -32,7 +32,7 @@ public abstract class ConfigurationFunction extends ScalarFunction {
         throw new UnsupportedOperationException("this node doesn't have any children");
     }
 
-    protected Configuration configuration() {
+    public Configuration configuration() {
         return configuration;
     }
 

+ 25 - 0
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/CurrentDate.java

@@ -0,0 +1,25 @@
+/*
+ * 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.sql.expression.function.scalar.datetime;
+
+import org.elasticsearch.xpack.sql.session.Configuration;
+import org.elasticsearch.xpack.sql.tree.NodeInfo;
+import org.elasticsearch.xpack.sql.tree.Source;
+import org.elasticsearch.xpack.sql.type.DataType;
+import org.elasticsearch.xpack.sql.util.DateUtils;
+
+public class CurrentDate extends CurrentFunction {
+
+    public CurrentDate(Source source, Configuration configuration) {
+        super(source, configuration, DateUtils.asDateOnly(configuration.now()), DataType.DATE);
+    }
+
+    @Override
+    protected NodeInfo<CurrentDate> info() {
+        return NodeInfo.create(this, CurrentDate::new, configuration());
+    }
+}

+ 14 - 38
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/CurrentDateTime.java

@@ -7,29 +7,25 @@
 package org.elasticsearch.xpack.sql.expression.function.scalar.datetime;
 
 import org.elasticsearch.xpack.sql.expression.Expression;
-import org.elasticsearch.xpack.sql.expression.function.scalar.ConfigurationFunction;
+import org.elasticsearch.xpack.sql.expression.Foldables;
 import org.elasticsearch.xpack.sql.session.Configuration;
-import org.elasticsearch.xpack.sql.tree.Source;
 import org.elasticsearch.xpack.sql.tree.NodeInfo;
+import org.elasticsearch.xpack.sql.tree.Source;
 import org.elasticsearch.xpack.sql.type.DataType;
 
 import java.time.ZonedDateTime;
-import java.util.Objects;
 
-public class CurrentDateTime extends ConfigurationFunction {
+public class CurrentDateTime extends CurrentFunction {
+
     private final Expression precision;
-    private final ZonedDateTime dateTime;
 
     public CurrentDateTime(Source source, Expression precision, Configuration configuration) {
-        super(source, configuration, DataType.DATETIME);
+        super(source, configuration, nanoPrecision(configuration.now(), precision), DataType.DATETIME);
         this.precision = precision;
-        int p = precision != null ? ((Number) precision.fold()).intValue() : 0;
-        this.dateTime = nanoPrecision(configuration().now(), p);
     }
 
-    @Override
-    public Object fold() {
-        return dateTime;
+    Expression precision() {
+        return precision;
     }
 
     @Override
@@ -37,33 +33,13 @@ public class CurrentDateTime extends ConfigurationFunction {
         return NodeInfo.create(this, CurrentDateTime::new, precision, configuration());
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(dateTime);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-
-        CurrentDateTime other = (CurrentDateTime) obj;
-        return Objects.equals(dateTime, other.dateTime);
-    }
-
-    static ZonedDateTime nanoPrecision(ZonedDateTime zdt, int precision) {
-        if (zdt != null) {
-            int nano = zdt.getNano();
-            if (precision >= 0 && precision < 10) {
-                // remove the remainder
-                nano = nano - nano % (int) Math.pow(10, (9 - precision));
-                return zdt.withNano(nano);
-            }
+    static ZonedDateTime nanoPrecision(ZonedDateTime zdt, Expression precisionExpression) {
+        int precision = precisionExpression != null ? Foldables.intValueOf(precisionExpression) : 0;
+        int nano = zdt.getNano();
+        if (precision >= 0 && precision < 10) {
+            // remove the remainder
+            nano = nano - nano % (int) Math.pow(10, (9 - precision));
+            return zdt.withNano(nano);
         }
         return zdt;
     }

+ 49 - 0
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/CurrentFunction.java

@@ -0,0 +1,49 @@
+/*
+ * 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.sql.expression.function.scalar.datetime;
+
+import org.elasticsearch.xpack.sql.expression.function.scalar.ConfigurationFunction;
+import org.elasticsearch.xpack.sql.session.Configuration;
+import org.elasticsearch.xpack.sql.tree.Source;
+import org.elasticsearch.xpack.sql.type.DataType;
+
+import java.time.ZonedDateTime;
+import java.util.Objects;
+
+abstract class CurrentFunction extends ConfigurationFunction {
+
+    private final ZonedDateTime date;
+
+    CurrentFunction(Source source, Configuration configuration, ZonedDateTime date, DataType dataType) {
+        super(source, configuration, dataType);
+        this.date = date;
+    }
+
+    @Override
+    public Object fold() {
+        return date;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(date);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+
+        CurrentFunction other = (CurrentFunction) obj;
+        return Objects.equals(date, other.date);
+    }
+}

+ 6 - 4
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/ExpressionBuilder.java

@@ -465,7 +465,7 @@ abstract class ExpressionBuilder extends IdentifierBuilder {
 
     @Override
     public Object visitBuiltinDateTimeFunction(BuiltinDateTimeFunctionContext ctx) {
-        // maps current_XXX to their respective functions
+        // maps CURRENT_XXX to its respective function e.g: CURRENT_TIMESTAMP()
         // since the functions need access to the Configuration, the parser only registers the definition and not the actual function
         Source source = source(ctx);
         Literal p = null;
@@ -484,13 +484,15 @@ abstract class ExpressionBuilder extends IdentifierBuilder {
         }
         
         String functionName = ctx.name.getText();
-        
+
         switch (ctx.name.getType()) {
+            case SqlBaseLexer.CURRENT_DATE:
+                return new UnresolvedFunction(source, functionName, ResolutionType.STANDARD, emptyList());
             case SqlBaseLexer.CURRENT_TIMESTAMP:
                 return new UnresolvedFunction(source, functionName, ResolutionType.STANDARD, p != null ? singletonList(p) : emptyList());
+            default:
+                throw new ParsingException(source, "Unknown function [{}]", functionName);
         }
-
-        throw new ParsingException(source, "Unknown function [{}]", functionName);
     }
 
     @Override

+ 362 - 361
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseLexer.java

@@ -19,7 +19,7 @@ class SqlBaseLexer extends Lexer {
   public static final int
     T__0=1, T__1=2, T__2=3, T__3=4, ALL=5, ANALYZE=6, ANALYZED=7, AND=8, ANY=9, 
     AS=10, ASC=11, BETWEEN=12, BY=13, CAST=14, CATALOG=15, CATALOGS=16, COLUMNS=17, 
-    CONVERT=18, CURRENT=19, CURRENT_TIMESTAMP=20, DAY=21, DAYS=22, DEBUG=23, 
+    CONVERT=18, CURRENT_DATE=19, CURRENT_TIMESTAMP=20, DAY=21, DAYS=22, DEBUG=23, 
     DESC=24, DESCRIBE=25, DISTINCT=26, ESCAPE=27, EXECUTABLE=28, EXISTS=29, 
     EXPLAIN=30, EXTRACT=31, FALSE=32, FIRST=33, FORMAT=34, FROM=35, FULL=36, 
     FUNCTIONS=37, GRAPHVIZ=38, GROUP=39, HAVING=40, HOUR=41, HOURS=42, IN=43, 
@@ -43,16 +43,16 @@ class SqlBaseLexer extends Lexer {
   public static final String[] ruleNames = {
     "T__0", "T__1", "T__2", "T__3", "ALL", "ANALYZE", "ANALYZED", "AND", "ANY", 
     "AS", "ASC", "BETWEEN", "BY", "CAST", "CATALOG", "CATALOGS", "COLUMNS", 
-    "CONVERT", "CURRENT", "CURRENT_TIMESTAMP", "DAY", "DAYS", "DEBUG", "DESC", 
-    "DESCRIBE", "DISTINCT", "ESCAPE", "EXECUTABLE", "EXISTS", "EXPLAIN", "EXTRACT", 
-    "FALSE", "FIRST", "FORMAT", "FROM", "FULL", "FUNCTIONS", "GRAPHVIZ", "GROUP", 
-    "HAVING", "HOUR", "HOURS", "IN", "INNER", "INTERVAL", "IS", "JOIN", "LAST", 
-    "LEFT", "LIKE", "LIMIT", "MAPPED", "MATCH", "MINUTE", "MINUTES", "MONTH", 
-    "MONTHS", "NATURAL", "NOT", "NULL", "NULLS", "ON", "OPTIMIZED", "OR", 
-    "ORDER", "OUTER", "PARSED", "PHYSICAL", "PLAN", "RIGHT", "RLIKE", "QUERY", 
-    "SCHEMAS", "SECOND", "SECONDS", "SELECT", "SHOW", "SYS", "TABLE", "TABLES", 
-    "TEXT", "TRUE", "TO", "TYPE", "TYPES", "USING", "VERIFY", "WHERE", "WITH", 
-    "YEAR", "YEARS", "ESCAPE_ESC", "FUNCTION_ESC", "LIMIT_ESC", "DATE_ESC", 
+    "CONVERT", "CURRENT_DATE", "CURRENT_TIMESTAMP", "DAY", "DAYS", "DEBUG", 
+    "DESC", "DESCRIBE", "DISTINCT", "ESCAPE", "EXECUTABLE", "EXISTS", "EXPLAIN", 
+    "EXTRACT", "FALSE", "FIRST", "FORMAT", "FROM", "FULL", "FUNCTIONS", "GRAPHVIZ", 
+    "GROUP", "HAVING", "HOUR", "HOURS", "IN", "INNER", "INTERVAL", "IS", "JOIN", 
+    "LAST", "LEFT", "LIKE", "LIMIT", "MAPPED", "MATCH", "MINUTE", "MINUTES", 
+    "MONTH", "MONTHS", "NATURAL", "NOT", "NULL", "NULLS", "ON", "OPTIMIZED", 
+    "OR", "ORDER", "OUTER", "PARSED", "PHYSICAL", "PLAN", "RIGHT", "RLIKE", 
+    "QUERY", "SCHEMAS", "SECOND", "SECONDS", "SELECT", "SHOW", "SYS", "TABLE", 
+    "TABLES", "TEXT", "TRUE", "TO", "TYPE", "TYPES", "USING", "VERIFY", "WHERE", 
+    "WITH", "YEAR", "YEARS", "ESCAPE_ESC", "FUNCTION_ESC", "LIMIT_ESC", "DATE_ESC", 
     "TIME_ESC", "TIMESTAMP_ESC", "GUID_ESC", "ESC_END", "EQ", "NULLEQ", "NEQ", 
     "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", "PERCENT", 
     "CONCAT", "DOT", "PARAM", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", 
@@ -64,7 +64,7 @@ class SqlBaseLexer extends Lexer {
   private static final String[] _LITERAL_NAMES = {
     null, "'('", "')'", "','", "':'", "'ALL'", "'ANALYZE'", "'ANALYZED'", 
     "'AND'", "'ANY'", "'AS'", "'ASC'", "'BETWEEN'", "'BY'", "'CAST'", "'CATALOG'", 
-    "'CATALOGS'", "'COLUMNS'", "'CONVERT'", "'CURRENT'", "'CURRENT_TIMESTAMP'", 
+    "'CATALOGS'", "'COLUMNS'", "'CONVERT'", "'CURRENT_DATE'", "'CURRENT_TIMESTAMP'", 
     "'DAY'", "'DAYS'", "'DEBUG'", "'DESC'", "'DESCRIBE'", "'DISTINCT'", "'ESCAPE'", 
     "'EXECUTABLE'", "'EXISTS'", "'EXPLAIN'", "'EXTRACT'", "'FALSE'", "'FIRST'", 
     "'FORMAT'", "'FROM'", "'FULL'", "'FUNCTIONS'", "'GRAPHVIZ'", "'GROUP'", 
@@ -83,16 +83,16 @@ class SqlBaseLexer extends Lexer {
   private static final String[] _SYMBOLIC_NAMES = {
     null, null, null, null, null, "ALL", "ANALYZE", "ANALYZED", "AND", "ANY", 
     "AS", "ASC", "BETWEEN", "BY", "CAST", "CATALOG", "CATALOGS", "COLUMNS", 
-    "CONVERT", "CURRENT", "CURRENT_TIMESTAMP", "DAY", "DAYS", "DEBUG", "DESC", 
-    "DESCRIBE", "DISTINCT", "ESCAPE", "EXECUTABLE", "EXISTS", "EXPLAIN", "EXTRACT", 
-    "FALSE", "FIRST", "FORMAT", "FROM", "FULL", "FUNCTIONS", "GRAPHVIZ", "GROUP", 
-    "HAVING", "HOUR", "HOURS", "IN", "INNER", "INTERVAL", "IS", "JOIN", "LAST", 
-    "LEFT", "LIKE", "LIMIT", "MAPPED", "MATCH", "MINUTE", "MINUTES", "MONTH", 
-    "MONTHS", "NATURAL", "NOT", "NULL", "NULLS", "ON", "OPTIMIZED", "OR", 
-    "ORDER", "OUTER", "PARSED", "PHYSICAL", "PLAN", "RIGHT", "RLIKE", "QUERY", 
-    "SCHEMAS", "SECOND", "SECONDS", "SELECT", "SHOW", "SYS", "TABLE", "TABLES", 
-    "TEXT", "TRUE", "TO", "TYPE", "TYPES", "USING", "VERIFY", "WHERE", "WITH", 
-    "YEAR", "YEARS", "ESCAPE_ESC", "FUNCTION_ESC", "LIMIT_ESC", "DATE_ESC", 
+    "CONVERT", "CURRENT_DATE", "CURRENT_TIMESTAMP", "DAY", "DAYS", "DEBUG", 
+    "DESC", "DESCRIBE", "DISTINCT", "ESCAPE", "EXECUTABLE", "EXISTS", "EXPLAIN", 
+    "EXTRACT", "FALSE", "FIRST", "FORMAT", "FROM", "FULL", "FUNCTIONS", "GRAPHVIZ", 
+    "GROUP", "HAVING", "HOUR", "HOURS", "IN", "INNER", "INTERVAL", "IS", "JOIN", 
+    "LAST", "LEFT", "LIKE", "LIMIT", "MAPPED", "MATCH", "MINUTE", "MINUTES", 
+    "MONTH", "MONTHS", "NATURAL", "NOT", "NULL", "NULLS", "ON", "OPTIMIZED", 
+    "OR", "ORDER", "OUTER", "PARSED", "PHYSICAL", "PLAN", "RIGHT", "RLIKE", 
+    "QUERY", "SCHEMAS", "SECOND", "SECONDS", "SELECT", "SHOW", "SYS", "TABLE", 
+    "TABLES", "TEXT", "TRUE", "TO", "TYPE", "TYPES", "USING", "VERIFY", "WHERE", 
+    "WITH", "YEAR", "YEARS", "ESCAPE_ESC", "FUNCTION_ESC", "LIMIT_ESC", "DATE_ESC", 
     "TIME_ESC", "TIMESTAMP_ESC", "GUID_ESC", "ESC_END", "EQ", "NULLEQ", "NEQ", 
     "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", "PERCENT", 
     "CONCAT", "DOT", "PARAM", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", 
@@ -155,7 +155,7 @@ class SqlBaseLexer extends Lexer {
   public ATN getATN() { return _ATN; }
 
   public static final String _serializedATN =
-    "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2\u0080\u0423\b\1\4"+
+    "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2\u0080\u0428\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"+
@@ -176,345 +176,346 @@ class SqlBaseLexer extends Lexer {
     "\3\17\3\17\3\20\3\20\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\21\3\21\3\21\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\22\3\23"+
     "\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24\3\24\3\24"+
-    "\3\24\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25"+
-    "\3\25\3\25\3\25\3\25\3\25\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27\3\27"+
-    "\3\30\3\30\3\30\3\30\3\30\3\30\3\31\3\31\3\31\3\31\3\31\3\32\3\32\3\32"+
-    "\3\32\3\32\3\32\3\32\3\32\3\32\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33"+
-    "\3\33\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\35"+
-    "\3\35\3\35\3\35\3\35\3\35\3\36\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37"+
-    "\3\37\3\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!"+
-    "\3!\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3%\3%"+
-    "\3%\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3"+
-    "\'\3\'\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)\3)\3)\3*\3*\3*\3*\3*\3+\3+\3+"+
-    "\3+\3+\3+\3,\3,\3,\3-\3-\3-\3-\3-\3-\3.\3.\3.\3.\3.\3.\3.\3.\3.\3/\3/"+
-    "\3/\3\60\3\60\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\61\3\62\3\62\3\62\3"+
-    "\62\3\62\3\63\3\63\3\63\3\63\3\63\3\64\3\64\3\64\3\64\3\64\3\64\3\65\3"+
-    "\65\3\65\3\65\3\65\3\65\3\65\3\66\3\66\3\66\3\66\3\66\3\66\3\67\3\67\3"+
-    "\67\3\67\3\67\3\67\3\67\38\38\38\38\38\38\38\38\39\39\39\39\39\39\3:\3"+
-    ":\3:\3:\3:\3:\3:\3;\3;\3;\3;\3;\3;\3;\3;\3<\3<\3<\3<\3=\3=\3=\3=\3=\3"+
-    ">\3>\3>\3>\3>\3>\3?\3?\3?\3@\3@\3@\3@\3@\3@\3@\3@\3@\3@\3A\3A\3A\3B\3"+
-    "B\3B\3B\3B\3B\3C\3C\3C\3C\3C\3C\3D\3D\3D\3D\3D\3D\3D\3E\3E\3E\3E\3E\3"+
-    "E\3E\3E\3E\3F\3F\3F\3F\3F\3G\3G\3G\3G\3G\3G\3H\3H\3H\3H\3H\3H\3I\3I\3"+
-    "I\3I\3I\3I\3J\3J\3J\3J\3J\3J\3J\3J\3K\3K\3K\3K\3K\3K\3K\3L\3L\3L\3L\3"+
-    "L\3L\3L\3L\3M\3M\3M\3M\3M\3M\3M\3N\3N\3N\3N\3N\3O\3O\3O\3O\3P\3P\3P\3"+
-    "P\3P\3P\3Q\3Q\3Q\3Q\3Q\3Q\3Q\3R\3R\3R\3R\3R\3S\3S\3S\3S\3S\3T\3T\3T\3"+
-    "U\3U\3U\3U\3U\3V\3V\3V\3V\3V\3V\3W\3W\3W\3W\3W\3W\3X\3X\3X\3X\3X\3X\3"+
-    "X\3Y\3Y\3Y\3Y\3Y\3Y\3Z\3Z\3Z\3Z\3Z\3[\3[\3[\3[\3[\3\\\3\\\3\\\3\\\3\\"+
-    "\3\\\3]\3]\3]\3]\3]\3]\3]\3]\3^\3^\3^\3^\3_\3_\3_\3_\3_\3_\3_\3`\3`\3"+
-    "`\3a\3a\3a\3b\3b\3b\3b\3c\3c\3c\3c\3c\3c\3d\3d\3e\3e\3f\3f\3f\3f\3g\3"+
-    "g\3g\3g\5g\u0364\ng\3h\3h\3i\3i\3i\3j\3j\3k\3k\3k\3l\3l\3m\3m\3n\3n\3"+
-    "o\3o\3p\3p\3q\3q\3q\3r\3r\3s\3s\3t\3t\3t\3t\7t\u0385\nt\ft\16t\u0388\13"+
-    "t\3t\3t\3u\6u\u038d\nu\ru\16u\u038e\3v\6v\u0392\nv\rv\16v\u0393\3v\3v"+
-    "\7v\u0398\nv\fv\16v\u039b\13v\3v\3v\6v\u039f\nv\rv\16v\u03a0\3v\6v\u03a4"+
-    "\nv\rv\16v\u03a5\3v\3v\7v\u03aa\nv\fv\16v\u03ad\13v\5v\u03af\nv\3v\3v"+
-    "\3v\3v\6v\u03b5\nv\rv\16v\u03b6\3v\3v\5v\u03bb\nv\3w\3w\5w\u03bf\nw\3"+
-    "w\3w\3w\7w\u03c4\nw\fw\16w\u03c7\13w\3x\3x\3x\3x\6x\u03cd\nx\rx\16x\u03ce"+
-    "\3y\3y\3y\6y\u03d4\ny\ry\16y\u03d5\3z\3z\3z\3z\7z\u03dc\nz\fz\16z\u03df"+
-    "\13z\3z\3z\3{\3{\3{\3{\7{\u03e7\n{\f{\16{\u03ea\13{\3{\3{\3|\3|\5|\u03f0"+
-    "\n|\3|\6|\u03f3\n|\r|\16|\u03f4\3}\3}\3~\3~\3\177\3\177\3\177\3\177\7"+
-    "\177\u03ff\n\177\f\177\16\177\u0402\13\177\3\177\5\177\u0405\n\177\3\177"+
-    "\5\177\u0408\n\177\3\177\3\177\3\u0080\3\u0080\3\u0080\3\u0080\3\u0080"+
-    "\7\u0080\u0411\n\u0080\f\u0080\16\u0080\u0414\13\u0080\3\u0080\3\u0080"+
-    "\3\u0080\3\u0080\3\u0080\3\u0081\6\u0081\u041c\n\u0081\r\u0081\16\u0081"+
-    "\u041d\3\u0081\3\u0081\3\u0082\3\u0082\3\u0412\2\u0083\3\3\5\4\7\5\t\6"+
-    "\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23%\24"+
-    "\'\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G%I&K"+
-    "\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o9q:s;u<w=y>{?}@\177"+
-    "A\u0081B\u0083C\u0085D\u0087E\u0089F\u008bG\u008dH\u008fI\u0091J\u0093"+
-    "K\u0095L\u0097M\u0099N\u009bO\u009dP\u009fQ\u00a1R\u00a3S\u00a5T\u00a7"+
-    "U\u00a9V\u00abW\u00adX\u00afY\u00b1Z\u00b3[\u00b5\\\u00b7]\u00b9^\u00bb"+
-    "_\u00bd`\u00bfa\u00c1b\u00c3c\u00c5d\u00c7e\u00c9f\u00cbg\u00cdh\u00cf"+
-    "i\u00d1j\u00d3k\u00d5l\u00d7m\u00d9n\u00dbo\u00ddp\u00dfq\u00e1r\u00e3"+
-    "s\u00e5t\u00e7u\u00e9v\u00ebw\u00edx\u00efy\u00f1z\u00f3{\u00f5|\u00f7"+
-    "\2\u00f9\2\u00fb\2\u00fd}\u00ff~\u0101\177\u0103\u0080\3\2\f\3\2))\4\2"+
-    "BBaa\5\2<<BBaa\3\2$$\3\2bb\4\2--//\3\2\62;\3\2C\\\4\2\f\f\17\17\5\2\13"+
-    "\f\17\17\"\"\u0443\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13"+
-    "\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2"+
-    "\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2"+
-    "!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3"+
-    "\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2"+
-    "\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E"+
-    "\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2"+
-    "\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2"+
-    "\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k"+
-    "\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2"+
-    "\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2"+
-    "\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\2\u0089\3\2\2\2\2\u008b"+
-    "\3\2\2\2\2\u008d\3\2\2\2\2\u008f\3\2\2\2\2\u0091\3\2\2\2\2\u0093\3\2\2"+
-    "\2\2\u0095\3\2\2\2\2\u0097\3\2\2\2\2\u0099\3\2\2\2\2\u009b\3\2\2\2\2\u009d"+
-    "\3\2\2\2\2\u009f\3\2\2\2\2\u00a1\3\2\2\2\2\u00a3\3\2\2\2\2\u00a5\3\2\2"+
-    "\2\2\u00a7\3\2\2\2\2\u00a9\3\2\2\2\2\u00ab\3\2\2\2\2\u00ad\3\2\2\2\2\u00af"+
-    "\3\2\2\2\2\u00b1\3\2\2\2\2\u00b3\3\2\2\2\2\u00b5\3\2\2\2\2\u00b7\3\2\2"+
-    "\2\2\u00b9\3\2\2\2\2\u00bb\3\2\2\2\2\u00bd\3\2\2\2\2\u00bf\3\2\2\2\2\u00c1"+
-    "\3\2\2\2\2\u00c3\3\2\2\2\2\u00c5\3\2\2\2\2\u00c7\3\2\2\2\2\u00c9\3\2\2"+
-    "\2\2\u00cb\3\2\2\2\2\u00cd\3\2\2\2\2\u00cf\3\2\2\2\2\u00d1\3\2\2\2\2\u00d3"+
-    "\3\2\2\2\2\u00d5\3\2\2\2\2\u00d7\3\2\2\2\2\u00d9\3\2\2\2\2\u00db\3\2\2"+
-    "\2\2\u00dd\3\2\2\2\2\u00df\3\2\2\2\2\u00e1\3\2\2\2\2\u00e3\3\2\2\2\2\u00e5"+
-    "\3\2\2\2\2\u00e7\3\2\2\2\2\u00e9\3\2\2\2\2\u00eb\3\2\2\2\2\u00ed\3\2\2"+
-    "\2\2\u00ef\3\2\2\2\2\u00f1\3\2\2\2\2\u00f3\3\2\2\2\2\u00f5\3\2\2\2\2\u00fd"+
-    "\3\2\2\2\2\u00ff\3\2\2\2\2\u0101\3\2\2\2\2\u0103\3\2\2\2\3\u0105\3\2\2"+
-    "\2\5\u0107\3\2\2\2\7\u0109\3\2\2\2\t\u010b\3\2\2\2\13\u010d\3\2\2\2\r"+
-    "\u0111\3\2\2\2\17\u0119\3\2\2\2\21\u0122\3\2\2\2\23\u0126\3\2\2\2\25\u012a"+
-    "\3\2\2\2\27\u012d\3\2\2\2\31\u0131\3\2\2\2\33\u0139\3\2\2\2\35\u013c\3"+
-    "\2\2\2\37\u0141\3\2\2\2!\u0149\3\2\2\2#\u0152\3\2\2\2%\u015a\3\2\2\2\'"+
-    "\u0162\3\2\2\2)\u016a\3\2\2\2+\u017c\3\2\2\2-\u0180\3\2\2\2/\u0185\3\2"+
-    "\2\2\61\u018b\3\2\2\2\63\u0190\3\2\2\2\65\u0199\3\2\2\2\67\u01a2\3\2\2"+
-    "\29\u01a9\3\2\2\2;\u01b4\3\2\2\2=\u01bb\3\2\2\2?\u01c3\3\2\2\2A\u01cb"+
-    "\3\2\2\2C\u01d1\3\2\2\2E\u01d7\3\2\2\2G\u01de\3\2\2\2I\u01e3\3\2\2\2K"+
-    "\u01e8\3\2\2\2M\u01f2\3\2\2\2O\u01fb\3\2\2\2Q\u0201\3\2\2\2S\u0208\3\2"+
-    "\2\2U\u020d\3\2\2\2W\u0213\3\2\2\2Y\u0216\3\2\2\2[\u021c\3\2\2\2]\u0225"+
-    "\3\2\2\2_\u0228\3\2\2\2a\u022d\3\2\2\2c\u0232\3\2\2\2e\u0237\3\2\2\2g"+
-    "\u023c\3\2\2\2i\u0242\3\2\2\2k\u0249\3\2\2\2m\u024f\3\2\2\2o\u0256\3\2"+
-    "\2\2q\u025e\3\2\2\2s\u0264\3\2\2\2u\u026b\3\2\2\2w\u0273\3\2\2\2y\u0277"+
-    "\3\2\2\2{\u027c\3\2\2\2}\u0282\3\2\2\2\177\u0285\3\2\2\2\u0081\u028f\3"+
-    "\2\2\2\u0083\u0292\3\2\2\2\u0085\u0298\3\2\2\2\u0087\u029e\3\2\2\2\u0089"+
-    "\u02a5\3\2\2\2\u008b\u02ae\3\2\2\2\u008d\u02b3\3\2\2\2\u008f\u02b9\3\2"+
-    "\2\2\u0091\u02bf\3\2\2\2\u0093\u02c5\3\2\2\2\u0095\u02cd\3\2\2\2\u0097"+
-    "\u02d4\3\2\2\2\u0099\u02dc\3\2\2\2\u009b\u02e3\3\2\2\2\u009d\u02e8\3\2"+
-    "\2\2\u009f\u02ec\3\2\2\2\u00a1\u02f2\3\2\2\2\u00a3\u02f9\3\2\2\2\u00a5"+
-    "\u02fe\3\2\2\2\u00a7\u0303\3\2\2\2\u00a9\u0306\3\2\2\2\u00ab\u030b\3\2"+
-    "\2\2\u00ad\u0311\3\2\2\2\u00af\u0317\3\2\2\2\u00b1\u031e\3\2\2\2\u00b3"+
-    "\u0324\3\2\2\2\u00b5\u0329\3\2\2\2\u00b7\u032e\3\2\2\2\u00b9\u0334\3\2"+
-    "\2\2\u00bb\u033c\3\2\2\2\u00bd\u0340\3\2\2\2\u00bf\u0347\3\2\2\2\u00c1"+
-    "\u034a\3\2\2\2\u00c3\u034d\3\2\2\2\u00c5\u0351\3\2\2\2\u00c7\u0357\3\2"+
-    "\2\2\u00c9\u0359\3\2\2\2\u00cb\u035b\3\2\2\2\u00cd\u0363\3\2\2\2\u00cf"+
-    "\u0365\3\2\2\2\u00d1\u0367\3\2\2\2\u00d3\u036a\3\2\2\2\u00d5\u036c\3\2"+
-    "\2\2\u00d7\u036f\3\2\2\2\u00d9\u0371\3\2\2\2\u00db\u0373\3\2\2\2\u00dd"+
-    "\u0375\3\2\2\2\u00df\u0377\3\2\2\2\u00e1\u0379\3\2\2\2\u00e3\u037c\3\2"+
-    "\2\2\u00e5\u037e\3\2\2\2\u00e7\u0380\3\2\2\2\u00e9\u038c\3\2\2\2\u00eb"+
-    "\u03ba\3\2\2\2\u00ed\u03be\3\2\2\2\u00ef\u03c8\3\2\2\2\u00f1\u03d3\3\2"+
-    "\2\2\u00f3\u03d7\3\2\2\2\u00f5\u03e2\3\2\2\2\u00f7\u03ed\3\2\2\2\u00f9"+
-    "\u03f6\3\2\2\2\u00fb\u03f8\3\2\2\2\u00fd\u03fa\3\2\2\2\u00ff\u040b\3\2"+
-    "\2\2\u0101\u041b\3\2\2\2\u0103\u0421\3\2\2\2\u0105\u0106\7*\2\2\u0106"+
-    "\4\3\2\2\2\u0107\u0108\7+\2\2\u0108\6\3\2\2\2\u0109\u010a\7.\2\2\u010a"+
-    "\b\3\2\2\2\u010b\u010c\7<\2\2\u010c\n\3\2\2\2\u010d\u010e\7C\2\2\u010e"+
-    "\u010f\7N\2\2\u010f\u0110\7N\2\2\u0110\f\3\2\2\2\u0111\u0112\7C\2\2\u0112"+
-    "\u0113\7P\2\2\u0113\u0114\7C\2\2\u0114\u0115\7N\2\2\u0115\u0116\7[\2\2"+
-    "\u0116\u0117\7\\\2\2\u0117\u0118\7G\2\2\u0118\16\3\2\2\2\u0119\u011a\7"+
-    "C\2\2\u011a\u011b\7P\2\2\u011b\u011c\7C\2\2\u011c\u011d\7N\2\2\u011d\u011e"+
-    "\7[\2\2\u011e\u011f\7\\\2\2\u011f\u0120\7G\2\2\u0120\u0121\7F\2\2\u0121"+
-    "\20\3\2\2\2\u0122\u0123\7C\2\2\u0123\u0124\7P\2\2\u0124\u0125\7F\2\2\u0125"+
-    "\22\3\2\2\2\u0126\u0127\7C\2\2\u0127\u0128\7P\2\2\u0128\u0129\7[\2\2\u0129"+
-    "\24\3\2\2\2\u012a\u012b\7C\2\2\u012b\u012c\7U\2\2\u012c\26\3\2\2\2\u012d"+
-    "\u012e\7C\2\2\u012e\u012f\7U\2\2\u012f\u0130\7E\2\2\u0130\30\3\2\2\2\u0131"+
-    "\u0132\7D\2\2\u0132\u0133\7G\2\2\u0133\u0134\7V\2\2\u0134\u0135\7Y\2\2"+
-    "\u0135\u0136\7G\2\2\u0136\u0137\7G\2\2\u0137\u0138\7P\2\2\u0138\32\3\2"+
-    "\2\2\u0139\u013a\7D\2\2\u013a\u013b\7[\2\2\u013b\34\3\2\2\2\u013c\u013d"+
-    "\7E\2\2\u013d\u013e\7C\2\2\u013e\u013f\7U\2\2\u013f\u0140\7V\2\2\u0140"+
-    "\36\3\2\2\2\u0141\u0142\7E\2\2\u0142\u0143\7C\2\2\u0143\u0144\7V\2\2\u0144"+
-    "\u0145\7C\2\2\u0145\u0146\7N\2\2\u0146\u0147\7Q\2\2\u0147\u0148\7I\2\2"+
-    "\u0148 \3\2\2\2\u0149\u014a\7E\2\2\u014a\u014b\7C\2\2\u014b\u014c\7V\2"+
-    "\2\u014c\u014d\7C\2\2\u014d\u014e\7N\2\2\u014e\u014f\7Q\2\2\u014f\u0150"+
-    "\7I\2\2\u0150\u0151\7U\2\2\u0151\"\3\2\2\2\u0152\u0153\7E\2\2\u0153\u0154"+
-    "\7Q\2\2\u0154\u0155\7N\2\2\u0155\u0156\7W\2\2\u0156\u0157\7O\2\2\u0157"+
-    "\u0158\7P\2\2\u0158\u0159\7U\2\2\u0159$\3\2\2\2\u015a\u015b\7E\2\2\u015b"+
-    "\u015c\7Q\2\2\u015c\u015d\7P\2\2\u015d\u015e\7X\2\2\u015e\u015f\7G\2\2"+
-    "\u015f\u0160\7T\2\2\u0160\u0161\7V\2\2\u0161&\3\2\2\2\u0162\u0163\7E\2"+
-    "\2\u0163\u0164\7W\2\2\u0164\u0165\7T\2\2\u0165\u0166\7T\2\2\u0166\u0167"+
-    "\7G\2\2\u0167\u0168\7P\2\2\u0168\u0169\7V\2\2\u0169(\3\2\2\2\u016a\u016b"+
-    "\7E\2\2\u016b\u016c\7W\2\2\u016c\u016d\7T\2\2\u016d\u016e\7T\2\2\u016e"+
-    "\u016f\7G\2\2\u016f\u0170\7P\2\2\u0170\u0171\7V\2\2\u0171\u0172\7a\2\2"+
-    "\u0172\u0173\7V\2\2\u0173\u0174\7K\2\2\u0174\u0175\7O\2\2\u0175\u0176"+
-    "\7G\2\2\u0176\u0177\7U\2\2\u0177\u0178\7V\2\2\u0178\u0179\7C\2\2\u0179"+
-    "\u017a\7O\2\2\u017a\u017b\7R\2\2\u017b*\3\2\2\2\u017c\u017d\7F\2\2\u017d"+
-    "\u017e\7C\2\2\u017e\u017f\7[\2\2\u017f,\3\2\2\2\u0180\u0181\7F\2\2\u0181"+
-    "\u0182\7C\2\2\u0182\u0183\7[\2\2\u0183\u0184\7U\2\2\u0184.\3\2\2\2\u0185"+
-    "\u0186\7F\2\2\u0186\u0187\7G\2\2\u0187\u0188\7D\2\2\u0188\u0189\7W\2\2"+
-    "\u0189\u018a\7I\2\2\u018a\60\3\2\2\2\u018b\u018c\7F\2\2\u018c\u018d\7"+
-    "G\2\2\u018d\u018e\7U\2\2\u018e\u018f\7E\2\2\u018f\62\3\2\2\2\u0190\u0191"+
-    "\7F\2\2\u0191\u0192\7G\2\2\u0192\u0193\7U\2\2\u0193\u0194\7E\2\2\u0194"+
-    "\u0195\7T\2\2\u0195\u0196\7K\2\2\u0196\u0197\7D\2\2\u0197\u0198\7G\2\2"+
-    "\u0198\64\3\2\2\2\u0199\u019a\7F\2\2\u019a\u019b\7K\2\2\u019b\u019c\7"+
-    "U\2\2\u019c\u019d\7V\2\2\u019d\u019e\7K\2\2\u019e\u019f\7P\2\2\u019f\u01a0"+
-    "\7E\2\2\u01a0\u01a1\7V\2\2\u01a1\66\3\2\2\2\u01a2\u01a3\7G\2\2\u01a3\u01a4"+
-    "\7U\2\2\u01a4\u01a5\7E\2\2\u01a5\u01a6\7C\2\2\u01a6\u01a7\7R\2\2\u01a7"+
-    "\u01a8\7G\2\2\u01a88\3\2\2\2\u01a9\u01aa\7G\2\2\u01aa\u01ab\7Z\2\2\u01ab"+
-    "\u01ac\7G\2\2\u01ac\u01ad\7E\2\2\u01ad\u01ae\7W\2\2\u01ae\u01af\7V\2\2"+
-    "\u01af\u01b0\7C\2\2\u01b0\u01b1\7D\2\2\u01b1\u01b2\7N\2\2\u01b2\u01b3"+
-    "\7G\2\2\u01b3:\3\2\2\2\u01b4\u01b5\7G\2\2\u01b5\u01b6\7Z\2\2\u01b6\u01b7"+
-    "\7K\2\2\u01b7\u01b8\7U\2\2\u01b8\u01b9\7V\2\2\u01b9\u01ba\7U\2\2\u01ba"+
-    "<\3\2\2\2\u01bb\u01bc\7G\2\2\u01bc\u01bd\7Z\2\2\u01bd\u01be\7R\2\2\u01be"+
-    "\u01bf\7N\2\2\u01bf\u01c0\7C\2\2\u01c0\u01c1\7K\2\2\u01c1\u01c2\7P\2\2"+
-    "\u01c2>\3\2\2\2\u01c3\u01c4\7G\2\2\u01c4\u01c5\7Z\2\2\u01c5\u01c6\7V\2"+
-    "\2\u01c6\u01c7\7T\2\2\u01c7\u01c8\7C\2\2\u01c8\u01c9\7E\2\2\u01c9\u01ca"+
-    "\7V\2\2\u01ca@\3\2\2\2\u01cb\u01cc\7H\2\2\u01cc\u01cd\7C\2\2\u01cd\u01ce"+
-    "\7N\2\2\u01ce\u01cf\7U\2\2\u01cf\u01d0\7G\2\2\u01d0B\3\2\2\2\u01d1\u01d2"+
-    "\7H\2\2\u01d2\u01d3\7K\2\2\u01d3\u01d4\7T\2\2\u01d4\u01d5\7U\2\2\u01d5"+
-    "\u01d6\7V\2\2\u01d6D\3\2\2\2\u01d7\u01d8\7H\2\2\u01d8\u01d9\7Q\2\2\u01d9"+
-    "\u01da\7T\2\2\u01da\u01db\7O\2\2\u01db\u01dc\7C\2\2\u01dc\u01dd\7V\2\2"+
-    "\u01ddF\3\2\2\2\u01de\u01df\7H\2\2\u01df\u01e0\7T\2\2\u01e0\u01e1\7Q\2"+
-    "\2\u01e1\u01e2\7O\2\2\u01e2H\3\2\2\2\u01e3\u01e4\7H\2\2\u01e4\u01e5\7"+
-    "W\2\2\u01e5\u01e6\7N\2\2\u01e6\u01e7\7N\2\2\u01e7J\3\2\2\2\u01e8\u01e9"+
-    "\7H\2\2\u01e9\u01ea\7W\2\2\u01ea\u01eb\7P\2\2\u01eb\u01ec\7E\2\2\u01ec"+
-    "\u01ed\7V\2\2\u01ed\u01ee\7K\2\2\u01ee\u01ef\7Q\2\2\u01ef\u01f0\7P\2\2"+
-    "\u01f0\u01f1\7U\2\2\u01f1L\3\2\2\2\u01f2\u01f3\7I\2\2\u01f3\u01f4\7T\2"+
-    "\2\u01f4\u01f5\7C\2\2\u01f5\u01f6\7R\2\2\u01f6\u01f7\7J\2\2\u01f7\u01f8"+
-    "\7X\2\2\u01f8\u01f9\7K\2\2\u01f9\u01fa\7\\\2\2\u01faN\3\2\2\2\u01fb\u01fc"+
-    "\7I\2\2\u01fc\u01fd\7T\2\2\u01fd\u01fe\7Q\2\2\u01fe\u01ff\7W\2\2\u01ff"+
-    "\u0200\7R\2\2\u0200P\3\2\2\2\u0201\u0202\7J\2\2\u0202\u0203\7C\2\2\u0203"+
-    "\u0204\7X\2\2\u0204\u0205\7K\2\2\u0205\u0206\7P\2\2\u0206\u0207\7I\2\2"+
-    "\u0207R\3\2\2\2\u0208\u0209\7J\2\2\u0209\u020a\7Q\2\2\u020a\u020b\7W\2"+
-    "\2\u020b\u020c\7T\2\2\u020cT\3\2\2\2\u020d\u020e\7J\2\2\u020e\u020f\7"+
-    "Q\2\2\u020f\u0210\7W\2\2\u0210\u0211\7T\2\2\u0211\u0212\7U\2\2\u0212V"+
-    "\3\2\2\2\u0213\u0214\7K\2\2\u0214\u0215\7P\2\2\u0215X\3\2\2\2\u0216\u0217"+
-    "\7K\2\2\u0217\u0218\7P\2\2\u0218\u0219\7P\2\2\u0219\u021a\7G\2\2\u021a"+
-    "\u021b\7T\2\2\u021bZ\3\2\2\2\u021c\u021d\7K\2\2\u021d\u021e\7P\2\2\u021e"+
-    "\u021f\7V\2\2\u021f\u0220\7G\2\2\u0220\u0221\7T\2\2\u0221\u0222\7X\2\2"+
-    "\u0222\u0223\7C\2\2\u0223\u0224\7N\2\2\u0224\\\3\2\2\2\u0225\u0226\7K"+
-    "\2\2\u0226\u0227\7U\2\2\u0227^\3\2\2\2\u0228\u0229\7L\2\2\u0229\u022a"+
-    "\7Q\2\2\u022a\u022b\7K\2\2\u022b\u022c\7P\2\2\u022c`\3\2\2\2\u022d\u022e"+
-    "\7N\2\2\u022e\u022f\7C\2\2\u022f\u0230\7U\2\2\u0230\u0231\7V\2\2\u0231"+
-    "b\3\2\2\2\u0232\u0233\7N\2\2\u0233\u0234\7G\2\2\u0234\u0235\7H\2\2\u0235"+
-    "\u0236\7V\2\2\u0236d\3\2\2\2\u0237\u0238\7N\2\2\u0238\u0239\7K\2\2\u0239"+
-    "\u023a\7M\2\2\u023a\u023b\7G\2\2\u023bf\3\2\2\2\u023c\u023d\7N\2\2\u023d"+
-    "\u023e\7K\2\2\u023e\u023f\7O\2\2\u023f\u0240\7K\2\2\u0240\u0241\7V\2\2"+
-    "\u0241h\3\2\2\2\u0242\u0243\7O\2\2\u0243\u0244\7C\2\2\u0244\u0245\7R\2"+
-    "\2\u0245\u0246\7R\2\2\u0246\u0247\7G\2\2\u0247\u0248\7F\2\2\u0248j\3\2"+
-    "\2\2\u0249\u024a\7O\2\2\u024a\u024b\7C\2\2\u024b\u024c\7V\2\2\u024c\u024d"+
-    "\7E\2\2\u024d\u024e\7J\2\2\u024el\3\2\2\2\u024f\u0250\7O\2\2\u0250\u0251"+
-    "\7K\2\2\u0251\u0252\7P\2\2\u0252\u0253\7W\2\2\u0253\u0254\7V\2\2\u0254"+
-    "\u0255\7G\2\2\u0255n\3\2\2\2\u0256\u0257\7O\2\2\u0257\u0258\7K\2\2\u0258"+
-    "\u0259\7P\2\2\u0259\u025a\7W\2\2\u025a\u025b\7V\2\2\u025b\u025c\7G\2\2"+
-    "\u025c\u025d\7U\2\2\u025dp\3\2\2\2\u025e\u025f\7O\2\2\u025f\u0260\7Q\2"+
-    "\2\u0260\u0261\7P\2\2\u0261\u0262\7V\2\2\u0262\u0263\7J\2\2\u0263r\3\2"+
-    "\2\2\u0264\u0265\7O\2\2\u0265\u0266\7Q\2\2\u0266\u0267\7P\2\2\u0267\u0268"+
-    "\7V\2\2\u0268\u0269\7J\2\2\u0269\u026a\7U\2\2\u026at\3\2\2\2\u026b\u026c"+
-    "\7P\2\2\u026c\u026d\7C\2\2\u026d\u026e\7V\2\2\u026e\u026f\7W\2\2\u026f"+
-    "\u0270\7T\2\2\u0270\u0271\7C\2\2\u0271\u0272\7N\2\2\u0272v\3\2\2\2\u0273"+
-    "\u0274\7P\2\2\u0274\u0275\7Q\2\2\u0275\u0276\7V\2\2\u0276x\3\2\2\2\u0277"+
-    "\u0278\7P\2\2\u0278\u0279\7W\2\2\u0279\u027a\7N\2\2\u027a\u027b\7N\2\2"+
-    "\u027bz\3\2\2\2\u027c\u027d\7P\2\2\u027d\u027e\7W\2\2\u027e\u027f\7N\2"+
-    "\2\u027f\u0280\7N\2\2\u0280\u0281\7U\2\2\u0281|\3\2\2\2\u0282\u0283\7"+
-    "Q\2\2\u0283\u0284\7P\2\2\u0284~\3\2\2\2\u0285\u0286\7Q\2\2\u0286\u0287"+
-    "\7R\2\2\u0287\u0288\7V\2\2\u0288\u0289\7K\2\2\u0289\u028a\7O\2\2\u028a"+
-    "\u028b\7K\2\2\u028b\u028c\7\\\2\2\u028c\u028d\7G\2\2\u028d\u028e\7F\2"+
-    "\2\u028e\u0080\3\2\2\2\u028f\u0290\7Q\2\2\u0290\u0291\7T\2\2\u0291\u0082"+
-    "\3\2\2\2\u0292\u0293\7Q\2\2\u0293\u0294\7T\2\2\u0294\u0295\7F\2\2\u0295"+
-    "\u0296\7G\2\2\u0296\u0297\7T\2\2\u0297\u0084\3\2\2\2\u0298\u0299\7Q\2"+
-    "\2\u0299\u029a\7W\2\2\u029a\u029b\7V\2\2\u029b\u029c\7G\2\2\u029c\u029d"+
-    "\7T\2\2\u029d\u0086\3\2\2\2\u029e\u029f\7R\2\2\u029f\u02a0\7C\2\2\u02a0"+
-    "\u02a1\7T\2\2\u02a1\u02a2\7U\2\2\u02a2\u02a3\7G\2\2\u02a3\u02a4\7F\2\2"+
-    "\u02a4\u0088\3\2\2\2\u02a5\u02a6\7R\2\2\u02a6\u02a7\7J\2\2\u02a7\u02a8"+
-    "\7[\2\2\u02a8\u02a9\7U\2\2\u02a9\u02aa\7K\2\2\u02aa\u02ab\7E\2\2\u02ab"+
-    "\u02ac\7C\2\2\u02ac\u02ad\7N\2\2\u02ad\u008a\3\2\2\2\u02ae\u02af\7R\2"+
-    "\2\u02af\u02b0\7N\2\2\u02b0\u02b1\7C\2\2\u02b1\u02b2\7P\2\2\u02b2\u008c"+
-    "\3\2\2\2\u02b3\u02b4\7T\2\2\u02b4\u02b5\7K\2\2\u02b5\u02b6\7I\2\2\u02b6"+
-    "\u02b7\7J\2\2\u02b7\u02b8\7V\2\2\u02b8\u008e\3\2\2\2\u02b9\u02ba\7T\2"+
-    "\2\u02ba\u02bb\7N\2\2\u02bb\u02bc\7K\2\2\u02bc\u02bd\7M\2\2\u02bd\u02be"+
-    "\7G\2\2\u02be\u0090\3\2\2\2\u02bf\u02c0\7S\2\2\u02c0\u02c1\7W\2\2\u02c1"+
-    "\u02c2\7G\2\2\u02c2\u02c3\7T\2\2\u02c3\u02c4\7[\2\2\u02c4\u0092\3\2\2"+
-    "\2\u02c5\u02c6\7U\2\2\u02c6\u02c7\7E\2\2\u02c7\u02c8\7J\2\2\u02c8\u02c9"+
-    "\7G\2\2\u02c9\u02ca\7O\2\2\u02ca\u02cb\7C\2\2\u02cb\u02cc\7U\2\2\u02cc"+
-    "\u0094\3\2\2\2\u02cd\u02ce\7U\2\2\u02ce\u02cf\7G\2\2\u02cf\u02d0\7E\2"+
-    "\2\u02d0\u02d1\7Q\2\2\u02d1\u02d2\7P\2\2\u02d2\u02d3\7F\2\2\u02d3\u0096"+
-    "\3\2\2\2\u02d4\u02d5\7U\2\2\u02d5\u02d6\7G\2\2\u02d6\u02d7\7E\2\2\u02d7"+
-    "\u02d8\7Q\2\2\u02d8\u02d9\7P\2\2\u02d9\u02da\7F\2\2\u02da\u02db\7U\2\2"+
-    "\u02db\u0098\3\2\2\2\u02dc\u02dd\7U\2\2\u02dd\u02de\7G\2\2\u02de\u02df"+
-    "\7N\2\2\u02df\u02e0\7G\2\2\u02e0\u02e1\7E\2\2\u02e1\u02e2\7V\2\2\u02e2"+
-    "\u009a\3\2\2\2\u02e3\u02e4\7U\2\2\u02e4\u02e5\7J\2\2\u02e5\u02e6\7Q\2"+
-    "\2\u02e6\u02e7\7Y\2\2\u02e7\u009c\3\2\2\2\u02e8\u02e9\7U\2\2\u02e9\u02ea"+
-    "\7[\2\2\u02ea\u02eb\7U\2\2\u02eb\u009e\3\2\2\2\u02ec\u02ed\7V\2\2\u02ed"+
-    "\u02ee\7C\2\2\u02ee\u02ef\7D\2\2\u02ef\u02f0\7N\2\2\u02f0\u02f1\7G\2\2"+
-    "\u02f1\u00a0\3\2\2\2\u02f2\u02f3\7V\2\2\u02f3\u02f4\7C\2\2\u02f4\u02f5"+
-    "\7D\2\2\u02f5\u02f6\7N\2\2\u02f6\u02f7\7G\2\2\u02f7\u02f8\7U\2\2\u02f8"+
-    "\u00a2\3\2\2\2\u02f9\u02fa\7V\2\2\u02fa\u02fb\7G\2\2\u02fb\u02fc\7Z\2"+
-    "\2\u02fc\u02fd\7V\2\2\u02fd\u00a4\3\2\2\2\u02fe\u02ff\7V\2\2\u02ff\u0300"+
-    "\7T\2\2\u0300\u0301\7W\2\2\u0301\u0302\7G\2\2\u0302\u00a6\3\2\2\2\u0303"+
-    "\u0304\7V\2\2\u0304\u0305\7Q\2\2\u0305\u00a8\3\2\2\2\u0306\u0307\7V\2"+
-    "\2\u0307\u0308\7[\2\2\u0308\u0309\7R\2\2\u0309\u030a\7G\2\2\u030a\u00aa"+
-    "\3\2\2\2\u030b\u030c\7V\2\2\u030c\u030d\7[\2\2\u030d\u030e\7R\2\2\u030e"+
-    "\u030f\7G\2\2\u030f\u0310\7U\2\2\u0310\u00ac\3\2\2\2\u0311\u0312\7W\2"+
-    "\2\u0312\u0313\7U\2\2\u0313\u0314\7K\2\2\u0314\u0315\7P\2\2\u0315\u0316"+
-    "\7I\2\2\u0316\u00ae\3\2\2\2\u0317\u0318\7X\2\2\u0318\u0319\7G\2\2\u0319"+
-    "\u031a\7T\2\2\u031a\u031b\7K\2\2\u031b\u031c\7H\2\2\u031c\u031d\7[\2\2"+
-    "\u031d\u00b0\3\2\2\2\u031e\u031f\7Y\2\2\u031f\u0320\7J\2\2\u0320\u0321"+
-    "\7G\2\2\u0321\u0322\7T\2\2\u0322\u0323\7G\2\2\u0323\u00b2\3\2\2\2\u0324"+
-    "\u0325\7Y\2\2\u0325\u0326\7K\2\2\u0326\u0327\7V\2\2\u0327\u0328\7J\2\2"+
-    "\u0328\u00b4\3\2\2\2\u0329\u032a\7[\2\2\u032a\u032b\7G\2\2\u032b\u032c"+
-    "\7C\2\2\u032c\u032d\7T\2\2\u032d\u00b6\3\2\2\2\u032e\u032f\7[\2\2\u032f"+
-    "\u0330\7G\2\2\u0330\u0331\7C\2\2\u0331\u0332\7T\2\2\u0332\u0333\7U\2\2"+
-    "\u0333\u00b8\3\2\2\2\u0334\u0335\7}\2\2\u0335\u0336\7G\2\2\u0336\u0337"+
-    "\7U\2\2\u0337\u0338\7E\2\2\u0338\u0339\7C\2\2\u0339\u033a\7R\2\2\u033a"+
-    "\u033b\7G\2\2\u033b\u00ba\3\2\2\2\u033c\u033d\7}\2\2\u033d\u033e\7H\2"+
-    "\2\u033e\u033f\7P\2\2\u033f\u00bc\3\2\2\2\u0340\u0341\7}\2\2\u0341\u0342"+
-    "\7N\2\2\u0342\u0343\7K\2\2\u0343\u0344\7O\2\2\u0344\u0345\7K\2\2\u0345"+
-    "\u0346\7V\2\2\u0346\u00be\3\2\2\2\u0347\u0348\7}\2\2\u0348\u0349\7F\2"+
-    "\2\u0349\u00c0\3\2\2\2\u034a\u034b\7}\2\2\u034b\u034c\7V\2\2\u034c\u00c2"+
-    "\3\2\2\2\u034d\u034e\7}\2\2\u034e\u034f\7V\2\2\u034f\u0350\7U\2\2\u0350"+
-    "\u00c4\3\2\2\2\u0351\u0352\7}\2\2\u0352\u0353\7I\2\2\u0353\u0354\7W\2"+
-    "\2\u0354\u0355\7K\2\2\u0355\u0356\7F\2\2\u0356\u00c6\3\2\2\2\u0357\u0358"+
-    "\7\177\2\2\u0358\u00c8\3\2\2\2\u0359\u035a\7?\2\2\u035a\u00ca\3\2\2\2"+
-    "\u035b\u035c\7>\2\2\u035c\u035d\7?\2\2\u035d\u035e\7@\2\2\u035e\u00cc"+
-    "\3\2\2\2\u035f\u0360\7>\2\2\u0360\u0364\7@\2\2\u0361\u0362\7#\2\2\u0362"+
-    "\u0364\7?\2\2\u0363\u035f\3\2\2\2\u0363\u0361\3\2\2\2\u0364\u00ce\3\2"+
-    "\2\2\u0365\u0366\7>\2\2\u0366\u00d0\3\2\2\2\u0367\u0368\7>\2\2\u0368\u0369"+
-    "\7?\2\2\u0369\u00d2\3\2\2\2\u036a\u036b\7@\2\2\u036b\u00d4\3\2\2\2\u036c"+
-    "\u036d\7@\2\2\u036d\u036e\7?\2\2\u036e\u00d6\3\2\2\2\u036f\u0370\7-\2"+
-    "\2\u0370\u00d8\3\2\2\2\u0371\u0372\7/\2\2\u0372\u00da\3\2\2\2\u0373\u0374"+
-    "\7,\2\2\u0374\u00dc\3\2\2\2\u0375\u0376\7\61\2\2\u0376\u00de\3\2\2\2\u0377"+
-    "\u0378\7\'\2\2\u0378\u00e0\3\2\2\2\u0379\u037a\7~\2\2\u037a\u037b\7~\2"+
-    "\2\u037b\u00e2\3\2\2\2\u037c\u037d\7\60\2\2\u037d\u00e4\3\2\2\2\u037e"+
-    "\u037f\7A\2\2\u037f\u00e6\3\2\2\2\u0380\u0386\7)\2\2\u0381\u0385\n\2\2"+
-    "\2\u0382\u0383\7)\2\2\u0383\u0385\7)\2\2\u0384\u0381\3\2\2\2\u0384\u0382"+
-    "\3\2\2\2\u0385\u0388\3\2\2\2\u0386\u0384\3\2\2\2\u0386\u0387\3\2\2\2\u0387"+
-    "\u0389\3\2\2\2\u0388\u0386\3\2\2\2\u0389\u038a\7)\2\2\u038a\u00e8\3\2"+
-    "\2\2\u038b\u038d\5\u00f9}\2\u038c\u038b\3\2\2\2\u038d\u038e\3\2\2\2\u038e"+
-    "\u038c\3\2\2\2\u038e\u038f\3\2\2\2\u038f\u00ea\3\2\2\2\u0390\u0392\5\u00f9"+
+    "\3\24\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25"+
+    "\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\26\3\26\3\26\3\26"+
+    "\3\27\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\30\3\30\3\30\3\31\3\31\3\31"+
+    "\3\31\3\31\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\33\3\33\3\33"+
+    "\3\33\3\33\3\33\3\33\3\33\3\33\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\35"+
+    "\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\36\3\36\3\36\3\36"+
+    "\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3"+
+    " \3 \3 \3 \3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3"+
+    "#\3#\3$\3$\3$\3$\3$\3%\3%\3%\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\3&\3&\3\'\3"+
+    "\'\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)\3)\3)"+
+    "\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3,\3,\3,\3-\3-\3-\3-\3-\3-\3.\3.\3."+
+    "\3.\3.\3.\3.\3.\3.\3/\3/\3/\3\60\3\60\3\60\3\60\3\60\3\61\3\61\3\61\3"+
+    "\61\3\61\3\62\3\62\3\62\3\62\3\62\3\63\3\63\3\63\3\63\3\63\3\64\3\64\3"+
+    "\64\3\64\3\64\3\64\3\65\3\65\3\65\3\65\3\65\3\65\3\65\3\66\3\66\3\66\3"+
+    "\66\3\66\3\66\3\67\3\67\3\67\3\67\3\67\3\67\3\67\38\38\38\38\38\38\38"+
+    "\38\39\39\39\39\39\39\3:\3:\3:\3:\3:\3:\3:\3;\3;\3;\3;\3;\3;\3;\3;\3<"+
+    "\3<\3<\3<\3=\3=\3=\3=\3=\3>\3>\3>\3>\3>\3>\3?\3?\3?\3@\3@\3@\3@\3@\3@"+
+    "\3@\3@\3@\3@\3A\3A\3A\3B\3B\3B\3B\3B\3B\3C\3C\3C\3C\3C\3C\3D\3D\3D\3D"+
+    "\3D\3D\3D\3E\3E\3E\3E\3E\3E\3E\3E\3E\3F\3F\3F\3F\3F\3G\3G\3G\3G\3G\3G"+
+    "\3H\3H\3H\3H\3H\3H\3I\3I\3I\3I\3I\3I\3J\3J\3J\3J\3J\3J\3J\3J\3K\3K\3K"+
+    "\3K\3K\3K\3K\3L\3L\3L\3L\3L\3L\3L\3L\3M\3M\3M\3M\3M\3M\3M\3N\3N\3N\3N"+
+    "\3N\3O\3O\3O\3O\3P\3P\3P\3P\3P\3P\3Q\3Q\3Q\3Q\3Q\3Q\3Q\3R\3R\3R\3R\3R"+
+    "\3S\3S\3S\3S\3S\3T\3T\3T\3U\3U\3U\3U\3U\3V\3V\3V\3V\3V\3V\3W\3W\3W\3W"+
+    "\3W\3W\3X\3X\3X\3X\3X\3X\3X\3Y\3Y\3Y\3Y\3Y\3Y\3Z\3Z\3Z\3Z\3Z\3[\3[\3["+
+    "\3[\3[\3\\\3\\\3\\\3\\\3\\\3\\\3]\3]\3]\3]\3]\3]\3]\3]\3^\3^\3^\3^\3_"+
+    "\3_\3_\3_\3_\3_\3_\3`\3`\3`\3a\3a\3a\3b\3b\3b\3b\3c\3c\3c\3c\3c\3c\3d"+
+    "\3d\3e\3e\3f\3f\3f\3f\3g\3g\3g\3g\5g\u0369\ng\3h\3h\3i\3i\3i\3j\3j\3k"+
+    "\3k\3k\3l\3l\3m\3m\3n\3n\3o\3o\3p\3p\3q\3q\3q\3r\3r\3s\3s\3t\3t\3t\3t"+
+    "\7t\u038a\nt\ft\16t\u038d\13t\3t\3t\3u\6u\u0392\nu\ru\16u\u0393\3v\6v"+
+    "\u0397\nv\rv\16v\u0398\3v\3v\7v\u039d\nv\fv\16v\u03a0\13v\3v\3v\6v\u03a4"+
+    "\nv\rv\16v\u03a5\3v\6v\u03a9\nv\rv\16v\u03aa\3v\3v\7v\u03af\nv\fv\16v"+
+    "\u03b2\13v\5v\u03b4\nv\3v\3v\3v\3v\6v\u03ba\nv\rv\16v\u03bb\3v\3v\5v\u03c0"+
+    "\nv\3w\3w\5w\u03c4\nw\3w\3w\3w\7w\u03c9\nw\fw\16w\u03cc\13w\3x\3x\3x\3"+
+    "x\6x\u03d2\nx\rx\16x\u03d3\3y\3y\3y\6y\u03d9\ny\ry\16y\u03da\3z\3z\3z"+
+    "\3z\7z\u03e1\nz\fz\16z\u03e4\13z\3z\3z\3{\3{\3{\3{\7{\u03ec\n{\f{\16{"+
+    "\u03ef\13{\3{\3{\3|\3|\5|\u03f5\n|\3|\6|\u03f8\n|\r|\16|\u03f9\3}\3}\3"+
+    "~\3~\3\177\3\177\3\177\3\177\7\177\u0404\n\177\f\177\16\177\u0407\13\177"+
+    "\3\177\5\177\u040a\n\177\3\177\5\177\u040d\n\177\3\177\3\177\3\u0080\3"+
+    "\u0080\3\u0080\3\u0080\3\u0080\7\u0080\u0416\n\u0080\f\u0080\16\u0080"+
+    "\u0419\13\u0080\3\u0080\3\u0080\3\u0080\3\u0080\3\u0080\3\u0081\6\u0081"+
+    "\u0421\n\u0081\r\u0081\16\u0081\u0422\3\u0081\3\u0081\3\u0082\3\u0082"+
+    "\3\u0417\2\u0083\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31"+
+    "\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65"+
+    "\34\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64"+
+    "g\65i\66k\67m8o9q:s;u<w=y>{?}@\177A\u0081B\u0083C\u0085D\u0087E\u0089"+
+    "F\u008bG\u008dH\u008fI\u0091J\u0093K\u0095L\u0097M\u0099N\u009bO\u009d"+
+    "P\u009fQ\u00a1R\u00a3S\u00a5T\u00a7U\u00a9V\u00abW\u00adX\u00afY\u00b1"+
+    "Z\u00b3[\u00b5\\\u00b7]\u00b9^\u00bb_\u00bd`\u00bfa\u00c1b\u00c3c\u00c5"+
+    "d\u00c7e\u00c9f\u00cbg\u00cdh\u00cfi\u00d1j\u00d3k\u00d5l\u00d7m\u00d9"+
+    "n\u00dbo\u00ddp\u00dfq\u00e1r\u00e3s\u00e5t\u00e7u\u00e9v\u00ebw\u00ed"+
+    "x\u00efy\u00f1z\u00f3{\u00f5|\u00f7\2\u00f9\2\u00fb\2\u00fd}\u00ff~\u0101"+
+    "\177\u0103\u0080\3\2\f\3\2))\4\2BBaa\5\2<<BBaa\3\2$$\3\2bb\4\2--//\3\2"+
+    "\62;\3\2C\\\4\2\f\f\17\17\5\2\13\f\17\17\"\"\u0448\2\3\3\2\2\2\2\5\3\2"+
+    "\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21"+
+    "\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2"+
+    "\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3"+
+    "\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3"+
+    "\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3"+
+    "\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2"+
+    "\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2"+
+    "Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3"+
+    "\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2"+
+    "\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2"+
+    "\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3"+
+    "\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2\2\2\u008d\3\2\2\2\2\u008f\3\2\2\2"+
+    "\2\u0091\3\2\2\2\2\u0093\3\2\2\2\2\u0095\3\2\2\2\2\u0097\3\2\2\2\2\u0099"+
+    "\3\2\2\2\2\u009b\3\2\2\2\2\u009d\3\2\2\2\2\u009f\3\2\2\2\2\u00a1\3\2\2"+
+    "\2\2\u00a3\3\2\2\2\2\u00a5\3\2\2\2\2\u00a7\3\2\2\2\2\u00a9\3\2\2\2\2\u00ab"+
+    "\3\2\2\2\2\u00ad\3\2\2\2\2\u00af\3\2\2\2\2\u00b1\3\2\2\2\2\u00b3\3\2\2"+
+    "\2\2\u00b5\3\2\2\2\2\u00b7\3\2\2\2\2\u00b9\3\2\2\2\2\u00bb\3\2\2\2\2\u00bd"+
+    "\3\2\2\2\2\u00bf\3\2\2\2\2\u00c1\3\2\2\2\2\u00c3\3\2\2\2\2\u00c5\3\2\2"+
+    "\2\2\u00c7\3\2\2\2\2\u00c9\3\2\2\2\2\u00cb\3\2\2\2\2\u00cd\3\2\2\2\2\u00cf"+
+    "\3\2\2\2\2\u00d1\3\2\2\2\2\u00d3\3\2\2\2\2\u00d5\3\2\2\2\2\u00d7\3\2\2"+
+    "\2\2\u00d9\3\2\2\2\2\u00db\3\2\2\2\2\u00dd\3\2\2\2\2\u00df\3\2\2\2\2\u00e1"+
+    "\3\2\2\2\2\u00e3\3\2\2\2\2\u00e5\3\2\2\2\2\u00e7\3\2\2\2\2\u00e9\3\2\2"+
+    "\2\2\u00eb\3\2\2\2\2\u00ed\3\2\2\2\2\u00ef\3\2\2\2\2\u00f1\3\2\2\2\2\u00f3"+
+    "\3\2\2\2\2\u00f5\3\2\2\2\2\u00fd\3\2\2\2\2\u00ff\3\2\2\2\2\u0101\3\2\2"+
+    "\2\2\u0103\3\2\2\2\3\u0105\3\2\2\2\5\u0107\3\2\2\2\7\u0109\3\2\2\2\t\u010b"+
+    "\3\2\2\2\13\u010d\3\2\2\2\r\u0111\3\2\2\2\17\u0119\3\2\2\2\21\u0122\3"+
+    "\2\2\2\23\u0126\3\2\2\2\25\u012a\3\2\2\2\27\u012d\3\2\2\2\31\u0131\3\2"+
+    "\2\2\33\u0139\3\2\2\2\35\u013c\3\2\2\2\37\u0141\3\2\2\2!\u0149\3\2\2\2"+
+    "#\u0152\3\2\2\2%\u015a\3\2\2\2\'\u0162\3\2\2\2)\u016f\3\2\2\2+\u0181\3"+
+    "\2\2\2-\u0185\3\2\2\2/\u018a\3\2\2\2\61\u0190\3\2\2\2\63\u0195\3\2\2\2"+
+    "\65\u019e\3\2\2\2\67\u01a7\3\2\2\29\u01ae\3\2\2\2;\u01b9\3\2\2\2=\u01c0"+
+    "\3\2\2\2?\u01c8\3\2\2\2A\u01d0\3\2\2\2C\u01d6\3\2\2\2E\u01dc\3\2\2\2G"+
+    "\u01e3\3\2\2\2I\u01e8\3\2\2\2K\u01ed\3\2\2\2M\u01f7\3\2\2\2O\u0200\3\2"+
+    "\2\2Q\u0206\3\2\2\2S\u020d\3\2\2\2U\u0212\3\2\2\2W\u0218\3\2\2\2Y\u021b"+
+    "\3\2\2\2[\u0221\3\2\2\2]\u022a\3\2\2\2_\u022d\3\2\2\2a\u0232\3\2\2\2c"+
+    "\u0237\3\2\2\2e\u023c\3\2\2\2g\u0241\3\2\2\2i\u0247\3\2\2\2k\u024e\3\2"+
+    "\2\2m\u0254\3\2\2\2o\u025b\3\2\2\2q\u0263\3\2\2\2s\u0269\3\2\2\2u\u0270"+
+    "\3\2\2\2w\u0278\3\2\2\2y\u027c\3\2\2\2{\u0281\3\2\2\2}\u0287\3\2\2\2\177"+
+    "\u028a\3\2\2\2\u0081\u0294\3\2\2\2\u0083\u0297\3\2\2\2\u0085\u029d\3\2"+
+    "\2\2\u0087\u02a3\3\2\2\2\u0089\u02aa\3\2\2\2\u008b\u02b3\3\2\2\2\u008d"+
+    "\u02b8\3\2\2\2\u008f\u02be\3\2\2\2\u0091\u02c4\3\2\2\2\u0093\u02ca\3\2"+
+    "\2\2\u0095\u02d2\3\2\2\2\u0097\u02d9\3\2\2\2\u0099\u02e1\3\2\2\2\u009b"+
+    "\u02e8\3\2\2\2\u009d\u02ed\3\2\2\2\u009f\u02f1\3\2\2\2\u00a1\u02f7\3\2"+
+    "\2\2\u00a3\u02fe\3\2\2\2\u00a5\u0303\3\2\2\2\u00a7\u0308\3\2\2\2\u00a9"+
+    "\u030b\3\2\2\2\u00ab\u0310\3\2\2\2\u00ad\u0316\3\2\2\2\u00af\u031c\3\2"+
+    "\2\2\u00b1\u0323\3\2\2\2\u00b3\u0329\3\2\2\2\u00b5\u032e\3\2\2\2\u00b7"+
+    "\u0333\3\2\2\2\u00b9\u0339\3\2\2\2\u00bb\u0341\3\2\2\2\u00bd\u0345\3\2"+
+    "\2\2\u00bf\u034c\3\2\2\2\u00c1\u034f\3\2\2\2\u00c3\u0352\3\2\2\2\u00c5"+
+    "\u0356\3\2\2\2\u00c7\u035c\3\2\2\2\u00c9\u035e\3\2\2\2\u00cb\u0360\3\2"+
+    "\2\2\u00cd\u0368\3\2\2\2\u00cf\u036a\3\2\2\2\u00d1\u036c\3\2\2\2\u00d3"+
+    "\u036f\3\2\2\2\u00d5\u0371\3\2\2\2\u00d7\u0374\3\2\2\2\u00d9\u0376\3\2"+
+    "\2\2\u00db\u0378\3\2\2\2\u00dd\u037a\3\2\2\2\u00df\u037c\3\2\2\2\u00e1"+
+    "\u037e\3\2\2\2\u00e3\u0381\3\2\2\2\u00e5\u0383\3\2\2\2\u00e7\u0385\3\2"+
+    "\2\2\u00e9\u0391\3\2\2\2\u00eb\u03bf\3\2\2\2\u00ed\u03c3\3\2\2\2\u00ef"+
+    "\u03cd\3\2\2\2\u00f1\u03d8\3\2\2\2\u00f3\u03dc\3\2\2\2\u00f5\u03e7\3\2"+
+    "\2\2\u00f7\u03f2\3\2\2\2\u00f9\u03fb\3\2\2\2\u00fb\u03fd\3\2\2\2\u00fd"+
+    "\u03ff\3\2\2\2\u00ff\u0410\3\2\2\2\u0101\u0420\3\2\2\2\u0103\u0426\3\2"+
+    "\2\2\u0105\u0106\7*\2\2\u0106\4\3\2\2\2\u0107\u0108\7+\2\2\u0108\6\3\2"+
+    "\2\2\u0109\u010a\7.\2\2\u010a\b\3\2\2\2\u010b\u010c\7<\2\2\u010c\n\3\2"+
+    "\2\2\u010d\u010e\7C\2\2\u010e\u010f\7N\2\2\u010f\u0110\7N\2\2\u0110\f"+
+    "\3\2\2\2\u0111\u0112\7C\2\2\u0112\u0113\7P\2\2\u0113\u0114\7C\2\2\u0114"+
+    "\u0115\7N\2\2\u0115\u0116\7[\2\2\u0116\u0117\7\\\2\2\u0117\u0118\7G\2"+
+    "\2\u0118\16\3\2\2\2\u0119\u011a\7C\2\2\u011a\u011b\7P\2\2\u011b\u011c"+
+    "\7C\2\2\u011c\u011d\7N\2\2\u011d\u011e\7[\2\2\u011e\u011f\7\\\2\2\u011f"+
+    "\u0120\7G\2\2\u0120\u0121\7F\2\2\u0121\20\3\2\2\2\u0122\u0123\7C\2\2\u0123"+
+    "\u0124\7P\2\2\u0124\u0125\7F\2\2\u0125\22\3\2\2\2\u0126\u0127\7C\2\2\u0127"+
+    "\u0128\7P\2\2\u0128\u0129\7[\2\2\u0129\24\3\2\2\2\u012a\u012b\7C\2\2\u012b"+
+    "\u012c\7U\2\2\u012c\26\3\2\2\2\u012d\u012e\7C\2\2\u012e\u012f\7U\2\2\u012f"+
+    "\u0130\7E\2\2\u0130\30\3\2\2\2\u0131\u0132\7D\2\2\u0132\u0133\7G\2\2\u0133"+
+    "\u0134\7V\2\2\u0134\u0135\7Y\2\2\u0135\u0136\7G\2\2\u0136\u0137\7G\2\2"+
+    "\u0137\u0138\7P\2\2\u0138\32\3\2\2\2\u0139\u013a\7D\2\2\u013a\u013b\7"+
+    "[\2\2\u013b\34\3\2\2\2\u013c\u013d\7E\2\2\u013d\u013e\7C\2\2\u013e\u013f"+
+    "\7U\2\2\u013f\u0140\7V\2\2\u0140\36\3\2\2\2\u0141\u0142\7E\2\2\u0142\u0143"+
+    "\7C\2\2\u0143\u0144\7V\2\2\u0144\u0145\7C\2\2\u0145\u0146\7N\2\2\u0146"+
+    "\u0147\7Q\2\2\u0147\u0148\7I\2\2\u0148 \3\2\2\2\u0149\u014a\7E\2\2\u014a"+
+    "\u014b\7C\2\2\u014b\u014c\7V\2\2\u014c\u014d\7C\2\2\u014d\u014e\7N\2\2"+
+    "\u014e\u014f\7Q\2\2\u014f\u0150\7I\2\2\u0150\u0151\7U\2\2\u0151\"\3\2"+
+    "\2\2\u0152\u0153\7E\2\2\u0153\u0154\7Q\2\2\u0154\u0155\7N\2\2\u0155\u0156"+
+    "\7W\2\2\u0156\u0157\7O\2\2\u0157\u0158\7P\2\2\u0158\u0159\7U\2\2\u0159"+
+    "$\3\2\2\2\u015a\u015b\7E\2\2\u015b\u015c\7Q\2\2\u015c\u015d\7P\2\2\u015d"+
+    "\u015e\7X\2\2\u015e\u015f\7G\2\2\u015f\u0160\7T\2\2\u0160\u0161\7V\2\2"+
+    "\u0161&\3\2\2\2\u0162\u0163\7E\2\2\u0163\u0164\7W\2\2\u0164\u0165\7T\2"+
+    "\2\u0165\u0166\7T\2\2\u0166\u0167\7G\2\2\u0167\u0168\7P\2\2\u0168\u0169"+
+    "\7V\2\2\u0169\u016a\7a\2\2\u016a\u016b\7F\2\2\u016b\u016c\7C\2\2\u016c"+
+    "\u016d\7V\2\2\u016d\u016e\7G\2\2\u016e(\3\2\2\2\u016f\u0170\7E\2\2\u0170"+
+    "\u0171\7W\2\2\u0171\u0172\7T\2\2\u0172\u0173\7T\2\2\u0173\u0174\7G\2\2"+
+    "\u0174\u0175\7P\2\2\u0175\u0176\7V\2\2\u0176\u0177\7a\2\2\u0177\u0178"+
+    "\7V\2\2\u0178\u0179\7K\2\2\u0179\u017a\7O\2\2\u017a\u017b\7G\2\2\u017b"+
+    "\u017c\7U\2\2\u017c\u017d\7V\2\2\u017d\u017e\7C\2\2\u017e\u017f\7O\2\2"+
+    "\u017f\u0180\7R\2\2\u0180*\3\2\2\2\u0181\u0182\7F\2\2\u0182\u0183\7C\2"+
+    "\2\u0183\u0184\7[\2\2\u0184,\3\2\2\2\u0185\u0186\7F\2\2\u0186\u0187\7"+
+    "C\2\2\u0187\u0188\7[\2\2\u0188\u0189\7U\2\2\u0189.\3\2\2\2\u018a\u018b"+
+    "\7F\2\2\u018b\u018c\7G\2\2\u018c\u018d\7D\2\2\u018d\u018e\7W\2\2\u018e"+
+    "\u018f\7I\2\2\u018f\60\3\2\2\2\u0190\u0191\7F\2\2\u0191\u0192\7G\2\2\u0192"+
+    "\u0193\7U\2\2\u0193\u0194\7E\2\2\u0194\62\3\2\2\2\u0195\u0196\7F\2\2\u0196"+
+    "\u0197\7G\2\2\u0197\u0198\7U\2\2\u0198\u0199\7E\2\2\u0199\u019a\7T\2\2"+
+    "\u019a\u019b\7K\2\2\u019b\u019c\7D\2\2\u019c\u019d\7G\2\2\u019d\64\3\2"+
+    "\2\2\u019e\u019f\7F\2\2\u019f\u01a0\7K\2\2\u01a0\u01a1\7U\2\2\u01a1\u01a2"+
+    "\7V\2\2\u01a2\u01a3\7K\2\2\u01a3\u01a4\7P\2\2\u01a4\u01a5\7E\2\2\u01a5"+
+    "\u01a6\7V\2\2\u01a6\66\3\2\2\2\u01a7\u01a8\7G\2\2\u01a8\u01a9\7U\2\2\u01a9"+
+    "\u01aa\7E\2\2\u01aa\u01ab\7C\2\2\u01ab\u01ac\7R\2\2\u01ac\u01ad\7G\2\2"+
+    "\u01ad8\3\2\2\2\u01ae\u01af\7G\2\2\u01af\u01b0\7Z\2\2\u01b0\u01b1\7G\2"+
+    "\2\u01b1\u01b2\7E\2\2\u01b2\u01b3\7W\2\2\u01b3\u01b4\7V\2\2\u01b4\u01b5"+
+    "\7C\2\2\u01b5\u01b6\7D\2\2\u01b6\u01b7\7N\2\2\u01b7\u01b8\7G\2\2\u01b8"+
+    ":\3\2\2\2\u01b9\u01ba\7G\2\2\u01ba\u01bb\7Z\2\2\u01bb\u01bc\7K\2\2\u01bc"+
+    "\u01bd\7U\2\2\u01bd\u01be\7V\2\2\u01be\u01bf\7U\2\2\u01bf<\3\2\2\2\u01c0"+
+    "\u01c1\7G\2\2\u01c1\u01c2\7Z\2\2\u01c2\u01c3\7R\2\2\u01c3\u01c4\7N\2\2"+
+    "\u01c4\u01c5\7C\2\2\u01c5\u01c6\7K\2\2\u01c6\u01c7\7P\2\2\u01c7>\3\2\2"+
+    "\2\u01c8\u01c9\7G\2\2\u01c9\u01ca\7Z\2\2\u01ca\u01cb\7V\2\2\u01cb\u01cc"+
+    "\7T\2\2\u01cc\u01cd\7C\2\2\u01cd\u01ce\7E\2\2\u01ce\u01cf\7V\2\2\u01cf"+
+    "@\3\2\2\2\u01d0\u01d1\7H\2\2\u01d1\u01d2\7C\2\2\u01d2\u01d3\7N\2\2\u01d3"+
+    "\u01d4\7U\2\2\u01d4\u01d5\7G\2\2\u01d5B\3\2\2\2\u01d6\u01d7\7H\2\2\u01d7"+
+    "\u01d8\7K\2\2\u01d8\u01d9\7T\2\2\u01d9\u01da\7U\2\2\u01da\u01db\7V\2\2"+
+    "\u01dbD\3\2\2\2\u01dc\u01dd\7H\2\2\u01dd\u01de\7Q\2\2\u01de\u01df\7T\2"+
+    "\2\u01df\u01e0\7O\2\2\u01e0\u01e1\7C\2\2\u01e1\u01e2\7V\2\2\u01e2F\3\2"+
+    "\2\2\u01e3\u01e4\7H\2\2\u01e4\u01e5\7T\2\2\u01e5\u01e6\7Q\2\2\u01e6\u01e7"+
+    "\7O\2\2\u01e7H\3\2\2\2\u01e8\u01e9\7H\2\2\u01e9\u01ea\7W\2\2\u01ea\u01eb"+
+    "\7N\2\2\u01eb\u01ec\7N\2\2\u01ecJ\3\2\2\2\u01ed\u01ee\7H\2\2\u01ee\u01ef"+
+    "\7W\2\2\u01ef\u01f0\7P\2\2\u01f0\u01f1\7E\2\2\u01f1\u01f2\7V\2\2\u01f2"+
+    "\u01f3\7K\2\2\u01f3\u01f4\7Q\2\2\u01f4\u01f5\7P\2\2\u01f5\u01f6\7U\2\2"+
+    "\u01f6L\3\2\2\2\u01f7\u01f8\7I\2\2\u01f8\u01f9\7T\2\2\u01f9\u01fa\7C\2"+
+    "\2\u01fa\u01fb\7R\2\2\u01fb\u01fc\7J\2\2\u01fc\u01fd\7X\2\2\u01fd\u01fe"+
+    "\7K\2\2\u01fe\u01ff\7\\\2\2\u01ffN\3\2\2\2\u0200\u0201\7I\2\2\u0201\u0202"+
+    "\7T\2\2\u0202\u0203\7Q\2\2\u0203\u0204\7W\2\2\u0204\u0205\7R\2\2\u0205"+
+    "P\3\2\2\2\u0206\u0207\7J\2\2\u0207\u0208\7C\2\2\u0208\u0209\7X\2\2\u0209"+
+    "\u020a\7K\2\2\u020a\u020b\7P\2\2\u020b\u020c\7I\2\2\u020cR\3\2\2\2\u020d"+
+    "\u020e\7J\2\2\u020e\u020f\7Q\2\2\u020f\u0210\7W\2\2\u0210\u0211\7T\2\2"+
+    "\u0211T\3\2\2\2\u0212\u0213\7J\2\2\u0213\u0214\7Q\2\2\u0214\u0215\7W\2"+
+    "\2\u0215\u0216\7T\2\2\u0216\u0217\7U\2\2\u0217V\3\2\2\2\u0218\u0219\7"+
+    "K\2\2\u0219\u021a\7P\2\2\u021aX\3\2\2\2\u021b\u021c\7K\2\2\u021c\u021d"+
+    "\7P\2\2\u021d\u021e\7P\2\2\u021e\u021f\7G\2\2\u021f\u0220\7T\2\2\u0220"+
+    "Z\3\2\2\2\u0221\u0222\7K\2\2\u0222\u0223\7P\2\2\u0223\u0224\7V\2\2\u0224"+
+    "\u0225\7G\2\2\u0225\u0226\7T\2\2\u0226\u0227\7X\2\2\u0227\u0228\7C\2\2"+
+    "\u0228\u0229\7N\2\2\u0229\\\3\2\2\2\u022a\u022b\7K\2\2\u022b\u022c\7U"+
+    "\2\2\u022c^\3\2\2\2\u022d\u022e\7L\2\2\u022e\u022f\7Q\2\2\u022f\u0230"+
+    "\7K\2\2\u0230\u0231\7P\2\2\u0231`\3\2\2\2\u0232\u0233\7N\2\2\u0233\u0234"+
+    "\7C\2\2\u0234\u0235\7U\2\2\u0235\u0236\7V\2\2\u0236b\3\2\2\2\u0237\u0238"+
+    "\7N\2\2\u0238\u0239\7G\2\2\u0239\u023a\7H\2\2\u023a\u023b\7V\2\2\u023b"+
+    "d\3\2\2\2\u023c\u023d\7N\2\2\u023d\u023e\7K\2\2\u023e\u023f\7M\2\2\u023f"+
+    "\u0240\7G\2\2\u0240f\3\2\2\2\u0241\u0242\7N\2\2\u0242\u0243\7K\2\2\u0243"+
+    "\u0244\7O\2\2\u0244\u0245\7K\2\2\u0245\u0246\7V\2\2\u0246h\3\2\2\2\u0247"+
+    "\u0248\7O\2\2\u0248\u0249\7C\2\2\u0249\u024a\7R\2\2\u024a\u024b\7R\2\2"+
+    "\u024b\u024c\7G\2\2\u024c\u024d\7F\2\2\u024dj\3\2\2\2\u024e\u024f\7O\2"+
+    "\2\u024f\u0250\7C\2\2\u0250\u0251\7V\2\2\u0251\u0252\7E\2\2\u0252\u0253"+
+    "\7J\2\2\u0253l\3\2\2\2\u0254\u0255\7O\2\2\u0255\u0256\7K\2\2\u0256\u0257"+
+    "\7P\2\2\u0257\u0258\7W\2\2\u0258\u0259\7V\2\2\u0259\u025a\7G\2\2\u025a"+
+    "n\3\2\2\2\u025b\u025c\7O\2\2\u025c\u025d\7K\2\2\u025d\u025e\7P\2\2\u025e"+
+    "\u025f\7W\2\2\u025f\u0260\7V\2\2\u0260\u0261\7G\2\2\u0261\u0262\7U\2\2"+
+    "\u0262p\3\2\2\2\u0263\u0264\7O\2\2\u0264\u0265\7Q\2\2\u0265\u0266\7P\2"+
+    "\2\u0266\u0267\7V\2\2\u0267\u0268\7J\2\2\u0268r\3\2\2\2\u0269\u026a\7"+
+    "O\2\2\u026a\u026b\7Q\2\2\u026b\u026c\7P\2\2\u026c\u026d\7V\2\2\u026d\u026e"+
+    "\7J\2\2\u026e\u026f\7U\2\2\u026ft\3\2\2\2\u0270\u0271\7P\2\2\u0271\u0272"+
+    "\7C\2\2\u0272\u0273\7V\2\2\u0273\u0274\7W\2\2\u0274\u0275\7T\2\2\u0275"+
+    "\u0276\7C\2\2\u0276\u0277\7N\2\2\u0277v\3\2\2\2\u0278\u0279\7P\2\2\u0279"+
+    "\u027a\7Q\2\2\u027a\u027b\7V\2\2\u027bx\3\2\2\2\u027c\u027d\7P\2\2\u027d"+
+    "\u027e\7W\2\2\u027e\u027f\7N\2\2\u027f\u0280\7N\2\2\u0280z\3\2\2\2\u0281"+
+    "\u0282\7P\2\2\u0282\u0283\7W\2\2\u0283\u0284\7N\2\2\u0284\u0285\7N\2\2"+
+    "\u0285\u0286\7U\2\2\u0286|\3\2\2\2\u0287\u0288\7Q\2\2\u0288\u0289\7P\2"+
+    "\2\u0289~\3\2\2\2\u028a\u028b\7Q\2\2\u028b\u028c\7R\2\2\u028c\u028d\7"+
+    "V\2\2\u028d\u028e\7K\2\2\u028e\u028f\7O\2\2\u028f\u0290\7K\2\2\u0290\u0291"+
+    "\7\\\2\2\u0291\u0292\7G\2\2\u0292\u0293\7F\2\2\u0293\u0080\3\2\2\2\u0294"+
+    "\u0295\7Q\2\2\u0295\u0296\7T\2\2\u0296\u0082\3\2\2\2\u0297\u0298\7Q\2"+
+    "\2\u0298\u0299\7T\2\2\u0299\u029a\7F\2\2\u029a\u029b\7G\2\2\u029b\u029c"+
+    "\7T\2\2\u029c\u0084\3\2\2\2\u029d\u029e\7Q\2\2\u029e\u029f\7W\2\2\u029f"+
+    "\u02a0\7V\2\2\u02a0\u02a1\7G\2\2\u02a1\u02a2\7T\2\2\u02a2\u0086\3\2\2"+
+    "\2\u02a3\u02a4\7R\2\2\u02a4\u02a5\7C\2\2\u02a5\u02a6\7T\2\2\u02a6\u02a7"+
+    "\7U\2\2\u02a7\u02a8\7G\2\2\u02a8\u02a9\7F\2\2\u02a9\u0088\3\2\2\2\u02aa"+
+    "\u02ab\7R\2\2\u02ab\u02ac\7J\2\2\u02ac\u02ad\7[\2\2\u02ad\u02ae\7U\2\2"+
+    "\u02ae\u02af\7K\2\2\u02af\u02b0\7E\2\2\u02b0\u02b1\7C\2\2\u02b1\u02b2"+
+    "\7N\2\2\u02b2\u008a\3\2\2\2\u02b3\u02b4\7R\2\2\u02b4\u02b5\7N\2\2\u02b5"+
+    "\u02b6\7C\2\2\u02b6\u02b7\7P\2\2\u02b7\u008c\3\2\2\2\u02b8\u02b9\7T\2"+
+    "\2\u02b9\u02ba\7K\2\2\u02ba\u02bb\7I\2\2\u02bb\u02bc\7J\2\2\u02bc\u02bd"+
+    "\7V\2\2\u02bd\u008e\3\2\2\2\u02be\u02bf\7T\2\2\u02bf\u02c0\7N\2\2\u02c0"+
+    "\u02c1\7K\2\2\u02c1\u02c2\7M\2\2\u02c2\u02c3\7G\2\2\u02c3\u0090\3\2\2"+
+    "\2\u02c4\u02c5\7S\2\2\u02c5\u02c6\7W\2\2\u02c6\u02c7\7G\2\2\u02c7\u02c8"+
+    "\7T\2\2\u02c8\u02c9\7[\2\2\u02c9\u0092\3\2\2\2\u02ca\u02cb\7U\2\2\u02cb"+
+    "\u02cc\7E\2\2\u02cc\u02cd\7J\2\2\u02cd\u02ce\7G\2\2\u02ce\u02cf\7O\2\2"+
+    "\u02cf\u02d0\7C\2\2\u02d0\u02d1\7U\2\2\u02d1\u0094\3\2\2\2\u02d2\u02d3"+
+    "\7U\2\2\u02d3\u02d4\7G\2\2\u02d4\u02d5\7E\2\2\u02d5\u02d6\7Q\2\2\u02d6"+
+    "\u02d7\7P\2\2\u02d7\u02d8\7F\2\2\u02d8\u0096\3\2\2\2\u02d9\u02da\7U\2"+
+    "\2\u02da\u02db\7G\2\2\u02db\u02dc\7E\2\2\u02dc\u02dd\7Q\2\2\u02dd\u02de"+
+    "\7P\2\2\u02de\u02df\7F\2\2\u02df\u02e0\7U\2\2\u02e0\u0098\3\2\2\2\u02e1"+
+    "\u02e2\7U\2\2\u02e2\u02e3\7G\2\2\u02e3\u02e4\7N\2\2\u02e4\u02e5\7G\2\2"+
+    "\u02e5\u02e6\7E\2\2\u02e6\u02e7\7V\2\2\u02e7\u009a\3\2\2\2\u02e8\u02e9"+
+    "\7U\2\2\u02e9\u02ea\7J\2\2\u02ea\u02eb\7Q\2\2\u02eb\u02ec\7Y\2\2\u02ec"+
+    "\u009c\3\2\2\2\u02ed\u02ee\7U\2\2\u02ee\u02ef\7[\2\2\u02ef\u02f0\7U\2"+
+    "\2\u02f0\u009e\3\2\2\2\u02f1\u02f2\7V\2\2\u02f2\u02f3\7C\2\2\u02f3\u02f4"+
+    "\7D\2\2\u02f4\u02f5\7N\2\2\u02f5\u02f6\7G\2\2\u02f6\u00a0\3\2\2\2\u02f7"+
+    "\u02f8\7V\2\2\u02f8\u02f9\7C\2\2\u02f9\u02fa\7D\2\2\u02fa\u02fb\7N\2\2"+
+    "\u02fb\u02fc\7G\2\2\u02fc\u02fd\7U\2\2\u02fd\u00a2\3\2\2\2\u02fe\u02ff"+
+    "\7V\2\2\u02ff\u0300\7G\2\2\u0300\u0301\7Z\2\2\u0301\u0302\7V\2\2\u0302"+
+    "\u00a4\3\2\2\2\u0303\u0304\7V\2\2\u0304\u0305\7T\2\2\u0305\u0306\7W\2"+
+    "\2\u0306\u0307\7G\2\2\u0307\u00a6\3\2\2\2\u0308\u0309\7V\2\2\u0309\u030a"+
+    "\7Q\2\2\u030a\u00a8\3\2\2\2\u030b\u030c\7V\2\2\u030c\u030d\7[\2\2\u030d"+
+    "\u030e\7R\2\2\u030e\u030f\7G\2\2\u030f\u00aa\3\2\2\2\u0310\u0311\7V\2"+
+    "\2\u0311\u0312\7[\2\2\u0312\u0313\7R\2\2\u0313\u0314\7G\2\2\u0314\u0315"+
+    "\7U\2\2\u0315\u00ac\3\2\2\2\u0316\u0317\7W\2\2\u0317\u0318\7U\2\2\u0318"+
+    "\u0319\7K\2\2\u0319\u031a\7P\2\2\u031a\u031b\7I\2\2\u031b\u00ae\3\2\2"+
+    "\2\u031c\u031d\7X\2\2\u031d\u031e\7G\2\2\u031e\u031f\7T\2\2\u031f\u0320"+
+    "\7K\2\2\u0320\u0321\7H\2\2\u0321\u0322\7[\2\2\u0322\u00b0\3\2\2\2\u0323"+
+    "\u0324\7Y\2\2\u0324\u0325\7J\2\2\u0325\u0326\7G\2\2\u0326\u0327\7T\2\2"+
+    "\u0327\u0328\7G\2\2\u0328\u00b2\3\2\2\2\u0329\u032a\7Y\2\2\u032a\u032b"+
+    "\7K\2\2\u032b\u032c\7V\2\2\u032c\u032d\7J\2\2\u032d\u00b4\3\2\2\2\u032e"+
+    "\u032f\7[\2\2\u032f\u0330\7G\2\2\u0330\u0331\7C\2\2\u0331\u0332\7T\2\2"+
+    "\u0332\u00b6\3\2\2\2\u0333\u0334\7[\2\2\u0334\u0335\7G\2\2\u0335\u0336"+
+    "\7C\2\2\u0336\u0337\7T\2\2\u0337\u0338\7U\2\2\u0338\u00b8\3\2\2\2\u0339"+
+    "\u033a\7}\2\2\u033a\u033b\7G\2\2\u033b\u033c\7U\2\2\u033c\u033d\7E\2\2"+
+    "\u033d\u033e\7C\2\2\u033e\u033f\7R\2\2\u033f\u0340\7G\2\2\u0340\u00ba"+
+    "\3\2\2\2\u0341\u0342\7}\2\2\u0342\u0343\7H\2\2\u0343\u0344\7P\2\2\u0344"+
+    "\u00bc\3\2\2\2\u0345\u0346\7}\2\2\u0346\u0347\7N\2\2\u0347\u0348\7K\2"+
+    "\2\u0348\u0349\7O\2\2\u0349\u034a\7K\2\2\u034a\u034b\7V\2\2\u034b\u00be"+
+    "\3\2\2\2\u034c\u034d\7}\2\2\u034d\u034e\7F\2\2\u034e\u00c0\3\2\2\2\u034f"+
+    "\u0350\7}\2\2\u0350\u0351\7V\2\2\u0351\u00c2\3\2\2\2\u0352\u0353\7}\2"+
+    "\2\u0353\u0354\7V\2\2\u0354\u0355\7U\2\2\u0355\u00c4\3\2\2\2\u0356\u0357"+
+    "\7}\2\2\u0357\u0358\7I\2\2\u0358\u0359\7W\2\2\u0359\u035a\7K\2\2\u035a"+
+    "\u035b\7F\2\2\u035b\u00c6\3\2\2\2\u035c\u035d\7\177\2\2\u035d\u00c8\3"+
+    "\2\2\2\u035e\u035f\7?\2\2\u035f\u00ca\3\2\2\2\u0360\u0361\7>\2\2\u0361"+
+    "\u0362\7?\2\2\u0362\u0363\7@\2\2\u0363\u00cc\3\2\2\2\u0364\u0365\7>\2"+
+    "\2\u0365\u0369\7@\2\2\u0366\u0367\7#\2\2\u0367\u0369\7?\2\2\u0368\u0364"+
+    "\3\2\2\2\u0368\u0366\3\2\2\2\u0369\u00ce\3\2\2\2\u036a\u036b\7>\2\2\u036b"+
+    "\u00d0\3\2\2\2\u036c\u036d\7>\2\2\u036d\u036e\7?\2\2\u036e\u00d2\3\2\2"+
+    "\2\u036f\u0370\7@\2\2\u0370\u00d4\3\2\2\2\u0371\u0372\7@\2\2\u0372\u0373"+
+    "\7?\2\2\u0373\u00d6\3\2\2\2\u0374\u0375\7-\2\2\u0375\u00d8\3\2\2\2\u0376"+
+    "\u0377\7/\2\2\u0377\u00da\3\2\2\2\u0378\u0379\7,\2\2\u0379\u00dc\3\2\2"+
+    "\2\u037a\u037b\7\61\2\2\u037b\u00de\3\2\2\2\u037c\u037d\7\'\2\2\u037d"+
+    "\u00e0\3\2\2\2\u037e\u037f\7~\2\2\u037f\u0380\7~\2\2\u0380\u00e2\3\2\2"+
+    "\2\u0381\u0382\7\60\2\2\u0382\u00e4\3\2\2\2\u0383\u0384\7A\2\2\u0384\u00e6"+
+    "\3\2\2\2\u0385\u038b\7)\2\2\u0386\u038a\n\2\2\2\u0387\u0388\7)\2\2\u0388"+
+    "\u038a\7)\2\2\u0389\u0386\3\2\2\2\u0389\u0387\3\2\2\2\u038a\u038d\3\2"+
+    "\2\2\u038b\u0389\3\2\2\2\u038b\u038c\3\2\2\2\u038c\u038e\3\2\2\2\u038d"+
+    "\u038b\3\2\2\2\u038e\u038f\7)\2\2\u038f\u00e8\3\2\2\2\u0390\u0392\5\u00f9"+
     "}\2\u0391\u0390\3\2\2\2\u0392\u0393\3\2\2\2\u0393\u0391\3\2\2\2\u0393"+
-    "\u0394\3\2\2\2\u0394\u0395\3\2\2\2\u0395\u0399\5\u00e3r\2\u0396\u0398"+
-    "\5\u00f9}\2\u0397\u0396\3\2\2\2\u0398\u039b\3\2\2\2\u0399\u0397\3\2\2"+
-    "\2\u0399\u039a\3\2\2\2\u039a\u03bb\3\2\2\2\u039b\u0399\3\2\2\2\u039c\u039e"+
-    "\5\u00e3r\2\u039d\u039f\5\u00f9}\2\u039e\u039d\3\2\2\2\u039f\u03a0\3\2"+
-    "\2\2\u03a0\u039e\3\2\2\2\u03a0\u03a1\3\2\2\2\u03a1\u03bb\3\2\2\2\u03a2"+
-    "\u03a4\5\u00f9}\2\u03a3\u03a2\3\2\2\2\u03a4\u03a5\3\2\2\2\u03a5\u03a3"+
-    "\3\2\2\2\u03a5\u03a6\3\2\2\2\u03a6\u03ae\3\2\2\2\u03a7\u03ab\5\u00e3r"+
-    "\2\u03a8\u03aa\5\u00f9}\2\u03a9\u03a8\3\2\2\2\u03aa\u03ad\3\2\2\2\u03ab"+
-    "\u03a9\3\2\2\2\u03ab\u03ac\3\2\2\2\u03ac\u03af\3\2\2\2\u03ad\u03ab\3\2"+
-    "\2\2\u03ae\u03a7\3\2\2\2\u03ae\u03af\3\2\2\2\u03af\u03b0\3\2\2\2\u03b0"+
-    "\u03b1\5\u00f7|\2\u03b1\u03bb\3\2\2\2\u03b2\u03b4\5\u00e3r\2\u03b3\u03b5"+
-    "\5\u00f9}\2\u03b4\u03b3\3\2\2\2\u03b5\u03b6\3\2\2\2\u03b6\u03b4\3\2\2"+
-    "\2\u03b6\u03b7\3\2\2\2\u03b7\u03b8\3\2\2\2\u03b8\u03b9\5\u00f7|\2\u03b9"+
-    "\u03bb\3\2\2\2\u03ba\u0391\3\2\2\2\u03ba\u039c\3\2\2\2\u03ba\u03a3\3\2"+
-    "\2\2\u03ba\u03b2\3\2\2\2\u03bb\u00ec\3\2\2\2\u03bc\u03bf\5\u00fb~\2\u03bd"+
-    "\u03bf\7a\2\2\u03be\u03bc\3\2\2\2\u03be\u03bd\3\2\2\2\u03bf\u03c5\3\2"+
-    "\2\2\u03c0\u03c4\5\u00fb~\2\u03c1\u03c4\5\u00f9}\2\u03c2\u03c4\t\3\2\2"+
-    "\u03c3\u03c0\3\2\2\2\u03c3\u03c1\3\2\2\2\u03c3\u03c2\3\2\2\2\u03c4\u03c7"+
-    "\3\2\2\2\u03c5\u03c3\3\2\2\2\u03c5\u03c6\3\2\2\2\u03c6\u00ee\3\2\2\2\u03c7"+
-    "\u03c5\3\2\2\2\u03c8\u03cc\5\u00f9}\2\u03c9\u03cd\5\u00fb~\2\u03ca\u03cd"+
-    "\5\u00f9}\2\u03cb\u03cd\t\4\2\2\u03cc\u03c9\3\2\2\2\u03cc\u03ca\3\2\2"+
-    "\2\u03cc\u03cb\3\2\2\2\u03cd\u03ce\3\2\2\2\u03ce\u03cc\3\2\2\2\u03ce\u03cf"+
-    "\3\2\2\2\u03cf\u00f0\3\2\2\2\u03d0\u03d4\5\u00fb~\2\u03d1\u03d4\5\u00f9"+
-    "}\2\u03d2\u03d4\7a\2\2\u03d3\u03d0\3\2\2\2\u03d3\u03d1\3\2\2\2\u03d3\u03d2"+
-    "\3\2\2\2\u03d4\u03d5\3\2\2\2\u03d5\u03d3\3\2\2\2\u03d5\u03d6\3\2\2\2\u03d6"+
-    "\u00f2\3\2\2\2\u03d7\u03dd\7$\2\2\u03d8\u03dc\n\5\2\2\u03d9\u03da\7$\2"+
-    "\2\u03da\u03dc\7$\2\2\u03db\u03d8\3\2\2\2\u03db\u03d9\3\2\2\2\u03dc\u03df"+
-    "\3\2\2\2\u03dd\u03db\3\2\2\2\u03dd\u03de\3\2\2\2\u03de\u03e0\3\2\2\2\u03df"+
-    "\u03dd\3\2\2\2\u03e0\u03e1\7$\2\2\u03e1\u00f4\3\2\2\2\u03e2\u03e8\7b\2"+
-    "\2\u03e3\u03e7\n\6\2\2\u03e4\u03e5\7b\2\2\u03e5\u03e7\7b\2\2\u03e6\u03e3"+
-    "\3\2\2\2\u03e6\u03e4\3\2\2\2\u03e7\u03ea\3\2\2\2\u03e8\u03e6\3\2\2\2\u03e8"+
-    "\u03e9\3\2\2\2\u03e9\u03eb\3\2\2\2\u03ea\u03e8\3\2\2\2\u03eb\u03ec\7b"+
-    "\2\2\u03ec\u00f6\3\2\2\2\u03ed\u03ef\7G\2\2\u03ee\u03f0\t\7\2\2\u03ef"+
-    "\u03ee\3\2\2\2\u03ef\u03f0\3\2\2\2\u03f0\u03f2\3\2\2\2\u03f1\u03f3\5\u00f9"+
-    "}\2\u03f2\u03f1\3\2\2\2\u03f3\u03f4\3\2\2\2\u03f4\u03f2\3\2\2\2\u03f4"+
-    "\u03f5\3\2\2\2\u03f5\u00f8\3\2\2\2\u03f6\u03f7\t\b\2\2\u03f7\u00fa\3\2"+
-    "\2\2\u03f8\u03f9\t\t\2\2\u03f9\u00fc\3\2\2\2\u03fa\u03fb\7/\2\2\u03fb"+
-    "\u03fc\7/\2\2\u03fc\u0400\3\2\2\2\u03fd\u03ff\n\n\2\2\u03fe\u03fd\3\2"+
-    "\2\2\u03ff\u0402\3\2\2\2\u0400\u03fe\3\2\2\2\u0400\u0401\3\2\2\2\u0401"+
-    "\u0404\3\2\2\2\u0402\u0400\3\2\2\2\u0403\u0405\7\17\2\2\u0404\u0403\3"+
-    "\2\2\2\u0404\u0405\3\2\2\2\u0405\u0407\3\2\2\2\u0406\u0408\7\f\2\2\u0407"+
-    "\u0406\3\2\2\2\u0407\u0408\3\2\2\2\u0408\u0409\3\2\2\2\u0409\u040a\b\177"+
-    "\2\2\u040a\u00fe\3\2\2\2\u040b\u040c\7\61\2\2\u040c\u040d\7,\2\2\u040d"+
-    "\u0412\3\2\2\2\u040e\u0411\5\u00ff\u0080\2\u040f\u0411\13\2\2\2\u0410"+
-    "\u040e\3\2\2\2\u0410\u040f\3\2\2\2\u0411\u0414\3\2\2\2\u0412\u0413\3\2"+
-    "\2\2\u0412\u0410\3\2\2\2\u0413\u0415\3\2\2\2\u0414\u0412\3\2\2\2\u0415"+
-    "\u0416\7,\2\2\u0416\u0417\7\61\2\2\u0417\u0418\3\2\2\2\u0418\u0419\b\u0080"+
-    "\2\2\u0419\u0100\3\2\2\2\u041a\u041c\t\13\2\2\u041b\u041a\3\2\2\2\u041c"+
-    "\u041d\3\2\2\2\u041d\u041b\3\2\2\2\u041d\u041e\3\2\2\2\u041e\u041f\3\2"+
-    "\2\2\u041f\u0420\b\u0081\2\2\u0420\u0102\3\2\2\2\u0421\u0422\13\2\2\2"+
-    "\u0422\u0104\3\2\2\2\"\2\u0363\u0384\u0386\u038e\u0393\u0399\u03a0\u03a5"+
-    "\u03ab\u03ae\u03b6\u03ba\u03be\u03c3\u03c5\u03cc\u03ce\u03d3\u03d5\u03db"+
-    "\u03dd\u03e6\u03e8\u03ef\u03f4\u0400\u0404\u0407\u0410\u0412\u041d\3\2"+
-    "\3\2";
+    "\u0394\3\2\2\2\u0394\u00ea\3\2\2\2\u0395\u0397\5\u00f9}\2\u0396\u0395"+
+    "\3\2\2\2\u0397\u0398\3\2\2\2\u0398\u0396\3\2\2\2\u0398\u0399\3\2\2\2\u0399"+
+    "\u039a\3\2\2\2\u039a\u039e\5\u00e3r\2\u039b\u039d\5\u00f9}\2\u039c\u039b"+
+    "\3\2\2\2\u039d\u03a0\3\2\2\2\u039e\u039c\3\2\2\2\u039e\u039f\3\2\2\2\u039f"+
+    "\u03c0\3\2\2\2\u03a0\u039e\3\2\2\2\u03a1\u03a3\5\u00e3r\2\u03a2\u03a4"+
+    "\5\u00f9}\2\u03a3\u03a2\3\2\2\2\u03a4\u03a5\3\2\2\2\u03a5\u03a3\3\2\2"+
+    "\2\u03a5\u03a6\3\2\2\2\u03a6\u03c0\3\2\2\2\u03a7\u03a9\5\u00f9}\2\u03a8"+
+    "\u03a7\3\2\2\2\u03a9\u03aa\3\2\2\2\u03aa\u03a8\3\2\2\2\u03aa\u03ab\3\2"+
+    "\2\2\u03ab\u03b3\3\2\2\2\u03ac\u03b0\5\u00e3r\2\u03ad\u03af\5\u00f9}\2"+
+    "\u03ae\u03ad\3\2\2\2\u03af\u03b2\3\2\2\2\u03b0\u03ae\3\2\2\2\u03b0\u03b1"+
+    "\3\2\2\2\u03b1\u03b4\3\2\2\2\u03b2\u03b0\3\2\2\2\u03b3\u03ac\3\2\2\2\u03b3"+
+    "\u03b4\3\2\2\2\u03b4\u03b5\3\2\2\2\u03b5\u03b6\5\u00f7|\2\u03b6\u03c0"+
+    "\3\2\2\2\u03b7\u03b9\5\u00e3r\2\u03b8\u03ba\5\u00f9}\2\u03b9\u03b8\3\2"+
+    "\2\2\u03ba\u03bb\3\2\2\2\u03bb\u03b9\3\2\2\2\u03bb\u03bc\3\2\2\2\u03bc"+
+    "\u03bd\3\2\2\2\u03bd\u03be\5\u00f7|\2\u03be\u03c0\3\2\2\2\u03bf\u0396"+
+    "\3\2\2\2\u03bf\u03a1\3\2\2\2\u03bf\u03a8\3\2\2\2\u03bf\u03b7\3\2\2\2\u03c0"+
+    "\u00ec\3\2\2\2\u03c1\u03c4\5\u00fb~\2\u03c2\u03c4\7a\2\2\u03c3\u03c1\3"+
+    "\2\2\2\u03c3\u03c2\3\2\2\2\u03c4\u03ca\3\2\2\2\u03c5\u03c9\5\u00fb~\2"+
+    "\u03c6\u03c9\5\u00f9}\2\u03c7\u03c9\t\3\2\2\u03c8\u03c5\3\2\2\2\u03c8"+
+    "\u03c6\3\2\2\2\u03c8\u03c7\3\2\2\2\u03c9\u03cc\3\2\2\2\u03ca\u03c8\3\2"+
+    "\2\2\u03ca\u03cb\3\2\2\2\u03cb\u00ee\3\2\2\2\u03cc\u03ca\3\2\2\2\u03cd"+
+    "\u03d1\5\u00f9}\2\u03ce\u03d2\5\u00fb~\2\u03cf\u03d2\5\u00f9}\2\u03d0"+
+    "\u03d2\t\4\2\2\u03d1\u03ce\3\2\2\2\u03d1\u03cf\3\2\2\2\u03d1\u03d0\3\2"+
+    "\2\2\u03d2\u03d3\3\2\2\2\u03d3\u03d1\3\2\2\2\u03d3\u03d4\3\2\2\2\u03d4"+
+    "\u00f0\3\2\2\2\u03d5\u03d9\5\u00fb~\2\u03d6\u03d9\5\u00f9}\2\u03d7\u03d9"+
+    "\7a\2\2\u03d8\u03d5\3\2\2\2\u03d8\u03d6\3\2\2\2\u03d8\u03d7\3\2\2\2\u03d9"+
+    "\u03da\3\2\2\2\u03da\u03d8\3\2\2\2\u03da\u03db\3\2\2\2\u03db\u00f2\3\2"+
+    "\2\2\u03dc\u03e2\7$\2\2\u03dd\u03e1\n\5\2\2\u03de\u03df\7$\2\2\u03df\u03e1"+
+    "\7$\2\2\u03e0\u03dd\3\2\2\2\u03e0\u03de\3\2\2\2\u03e1\u03e4\3\2\2\2\u03e2"+
+    "\u03e0\3\2\2\2\u03e2\u03e3\3\2\2\2\u03e3\u03e5\3\2\2\2\u03e4\u03e2\3\2"+
+    "\2\2\u03e5\u03e6\7$\2\2\u03e6\u00f4\3\2\2\2\u03e7\u03ed\7b\2\2\u03e8\u03ec"+
+    "\n\6\2\2\u03e9\u03ea\7b\2\2\u03ea\u03ec\7b\2\2\u03eb\u03e8\3\2\2\2\u03eb"+
+    "\u03e9\3\2\2\2\u03ec\u03ef\3\2\2\2\u03ed\u03eb\3\2\2\2\u03ed\u03ee\3\2"+
+    "\2\2\u03ee\u03f0\3\2\2\2\u03ef\u03ed\3\2\2\2\u03f0\u03f1\7b\2\2\u03f1"+
+    "\u00f6\3\2\2\2\u03f2\u03f4\7G\2\2\u03f3\u03f5\t\7\2\2\u03f4\u03f3\3\2"+
+    "\2\2\u03f4\u03f5\3\2\2\2\u03f5\u03f7\3\2\2\2\u03f6\u03f8\5\u00f9}\2\u03f7"+
+    "\u03f6\3\2\2\2\u03f8\u03f9\3\2\2\2\u03f9\u03f7\3\2\2\2\u03f9\u03fa\3\2"+
+    "\2\2\u03fa\u00f8\3\2\2\2\u03fb\u03fc\t\b\2\2\u03fc\u00fa\3\2\2\2\u03fd"+
+    "\u03fe\t\t\2\2\u03fe\u00fc\3\2\2\2\u03ff\u0400\7/\2\2\u0400\u0401\7/\2"+
+    "\2\u0401\u0405\3\2\2\2\u0402\u0404\n\n\2\2\u0403\u0402\3\2\2\2\u0404\u0407"+
+    "\3\2\2\2\u0405\u0403\3\2\2\2\u0405\u0406\3\2\2\2\u0406\u0409\3\2\2\2\u0407"+
+    "\u0405\3\2\2\2\u0408\u040a\7\17\2\2\u0409\u0408\3\2\2\2\u0409\u040a\3"+
+    "\2\2\2\u040a\u040c\3\2\2\2\u040b\u040d\7\f\2\2\u040c\u040b\3\2\2\2\u040c"+
+    "\u040d\3\2\2\2\u040d\u040e\3\2\2\2\u040e\u040f\b\177\2\2\u040f\u00fe\3"+
+    "\2\2\2\u0410\u0411\7\61\2\2\u0411\u0412\7,\2\2\u0412\u0417\3\2\2\2\u0413"+
+    "\u0416\5\u00ff\u0080\2\u0414\u0416\13\2\2\2\u0415\u0413\3\2\2\2\u0415"+
+    "\u0414\3\2\2\2\u0416\u0419\3\2\2\2\u0417\u0418\3\2\2\2\u0417\u0415\3\2"+
+    "\2\2\u0418\u041a\3\2\2\2\u0419\u0417\3\2\2\2\u041a\u041b\7,\2\2\u041b"+
+    "\u041c\7\61\2\2\u041c\u041d\3\2\2\2\u041d\u041e\b\u0080\2\2\u041e\u0100"+
+    "\3\2\2\2\u041f\u0421\t\13\2\2\u0420\u041f\3\2\2\2\u0421\u0422\3\2\2\2"+
+    "\u0422\u0420\3\2\2\2\u0422\u0423\3\2\2\2\u0423\u0424\3\2\2\2\u0424\u0425"+
+    "\b\u0081\2\2\u0425\u0102\3\2\2\2\u0426\u0427\13\2\2\2\u0427\u0104\3\2"+
+    "\2\2\"\2\u0368\u0389\u038b\u0393\u0398\u039e\u03a5\u03aa\u03b0\u03b3\u03bb"+
+    "\u03bf\u03c3\u03c8\u03ca\u03d1\u03d3\u03d8\u03da\u03e0\u03e2\u03eb\u03ed"+
+    "\u03f4\u03f9\u0405\u0409\u040c\u0415\u0417\u0422\3\2\3\2";
   public static final ATN _ATN =
     new ATNDeserializer().deserialize(_serializedATN.toCharArray());
   static {

File diff suppressed because it is too large
+ 277 - 259
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseParser.java


+ 46 - 0
x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/CurrentDateTests.java

@@ -0,0 +1,46 @@
+/*
+ * 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.sql.expression.function.scalar.datetime;
+
+import org.elasticsearch.xpack.sql.expression.Expression;
+import org.elasticsearch.xpack.sql.proto.Mode;
+import org.elasticsearch.xpack.sql.proto.Protocol;
+import org.elasticsearch.xpack.sql.session.Configuration;
+import org.elasticsearch.xpack.sql.tree.AbstractNodeTestCase;
+import org.elasticsearch.xpack.sql.tree.Source;
+
+public class CurrentDateTests extends AbstractNodeTestCase<CurrentDate, Expression> {
+
+    public static CurrentDate randomCurrentDate() {
+        return new CurrentDate(Source.EMPTY, new Configuration(randomZone(), Protocol.FETCH_SIZE,
+            Protocol.REQUEST_TIMEOUT, Protocol.PAGE_TIMEOUT, null, Mode.PLAIN, null, null, null));
+    }
+
+    @Override
+    protected CurrentDate randomInstance() {
+        return randomCurrentDate();
+    }
+
+    @Override
+    protected CurrentDate copy(CurrentDate instance) {
+        return new CurrentDate(instance.source(), instance.configuration());
+    }
+
+    @Override
+    protected CurrentDate mutate(CurrentDate instance) {
+        return new CurrentDate(instance.source(), new Configuration(randomZone(), Protocol.FETCH_SIZE,
+            Protocol.REQUEST_TIMEOUT, Protocol.PAGE_TIMEOUT, null, Mode.PLAIN, null, null, null));
+    }
+
+    @Override
+    public void testTransform() {
+    }
+
+    @Override
+    public void testReplaceChildren() {
+    }
+}

+ 51 - 13
x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/CurrentDateTimeTests.java

@@ -6,23 +6,61 @@
 
 package org.elasticsearch.xpack.sql.expression.function.scalar.datetime;
 
-import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.xpack.sql.expression.Expression;
+import org.elasticsearch.xpack.sql.expression.Literal;
+import org.elasticsearch.xpack.sql.proto.Mode;
+import org.elasticsearch.xpack.sql.proto.Protocol;
+import org.elasticsearch.xpack.sql.session.Configuration;
+import org.elasticsearch.xpack.sql.tree.AbstractNodeTestCase;
 
 import java.time.ZonedDateTime;
 
-public class CurrentDateTimeTests extends ESTestCase {
+import static org.elasticsearch.xpack.sql.tree.Source.EMPTY;
 
-    public void testNanoPrecision() throws Exception {
+public class CurrentDateTimeTests extends AbstractNodeTestCase<CurrentDateTime, Expression> {
+
+    public static CurrentDateTime randomCurrentDateTime() {
+        return new CurrentDateTime(EMPTY, Literal.of(EMPTY, randomInt(10)),
+            new Configuration(randomZone(), Protocol.FETCH_SIZE,
+                Protocol.REQUEST_TIMEOUT, Protocol.PAGE_TIMEOUT, null, Mode.PLAIN, null, null, null));
+    }
+
+    @Override
+    protected CurrentDateTime randomInstance() {
+        return randomCurrentDateTime();
+    }
+
+    @Override
+    protected CurrentDateTime copy(CurrentDateTime instance) {
+        return new CurrentDateTime(instance.source(), instance.precision(), instance.configuration());
+    }
+
+    @Override
+    protected CurrentDateTime mutate(CurrentDateTime instance) {
+        return new CurrentDateTime(instance.source(), Literal.of(EMPTY, randomInt(10)),
+            new Configuration(randomZone(), Protocol.FETCH_SIZE,
+                Protocol.REQUEST_TIMEOUT, Protocol.PAGE_TIMEOUT, null, Mode.PLAIN, null, null, null));
+    }
+
+    @Override
+    public void testTransform() {
+    }
+
+    @Override
+    public void testReplaceChildren() {
+    }
+
+    public void testNanoPrecision() {
         ZonedDateTime zdt = ZonedDateTime.parse("2018-01-23T12:34:45.123456789Z");
-        assertEquals(000_000_000, CurrentDateTime.nanoPrecision(zdt, 0).getNano());
-        assertEquals(100_000_000, CurrentDateTime.nanoPrecision(zdt, 1).getNano());
-        assertEquals(120_000_000, CurrentDateTime.nanoPrecision(zdt, 2).getNano());
-        assertEquals(123_000_000, CurrentDateTime.nanoPrecision(zdt, 3).getNano());
-        assertEquals(123_400_000, CurrentDateTime.nanoPrecision(zdt, 4).getNano());
-        assertEquals(123_450_000, CurrentDateTime.nanoPrecision(zdt, 5).getNano());
-        assertEquals(123_456_000, CurrentDateTime.nanoPrecision(zdt, 6).getNano());
-        assertEquals(123_456_700, CurrentDateTime.nanoPrecision(zdt, 7).getNano());
-        assertEquals(123_456_780, CurrentDateTime.nanoPrecision(zdt, 8).getNano());
-        assertEquals(123_456_789, CurrentDateTime.nanoPrecision(zdt, 9).getNano());
+        assertEquals(000_000_000, CurrentDateTime.nanoPrecision(zdt, Literal.of(EMPTY, 0)).getNano());
+        assertEquals(100_000_000, CurrentDateTime.nanoPrecision(zdt, Literal.of(EMPTY, 1)).getNano());
+        assertEquals(120_000_000, CurrentDateTime.nanoPrecision(zdt, Literal.of(EMPTY, 2)).getNano());
+        assertEquals(123_000_000, CurrentDateTime.nanoPrecision(zdt, Literal.of(EMPTY, 3)).getNano());
+        assertEquals(123_400_000, CurrentDateTime.nanoPrecision(zdt, Literal.of(EMPTY, 4)).getNano());
+        assertEquals(123_450_000, CurrentDateTime.nanoPrecision(zdt, Literal.of(EMPTY, 5)).getNano());
+        assertEquals(123_456_000, CurrentDateTime.nanoPrecision(zdt, Literal.of(EMPTY, 6)).getNano());
+        assertEquals(123_456_700, CurrentDateTime.nanoPrecision(zdt, Literal.of(EMPTY, 7)).getNano());
+        assertEquals(123_456_780, CurrentDateTime.nanoPrecision(zdt, Literal.of(EMPTY, 8)).getNano());
+        assertEquals(123_456_789, CurrentDateTime.nanoPrecision(zdt, Literal.of(EMPTY, 9)).getNano());
     }
 }

+ 17 - 1
x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/parser/ExpressionTests.java

@@ -338,6 +338,22 @@ public class ExpressionTests extends ESTestCase {
         assertEquals("line 1:13: Invalid data type [INVALID] provided", ex.getMessage());
     }
 
+    public void testCurrentDate() {
+        Expression expr = parser.createExpression("CURRENT_DATE");
+        assertEquals(UnresolvedFunction.class, expr.getClass());
+        UnresolvedFunction ur = (UnresolvedFunction) expr;
+        assertEquals("CURRENT_DATE", ur.sourceText());
+        assertEquals(0, ur.children().size());
+    }
+
+    public void testCurrentDateWithParentheses() {
+        Expression expr = parser.createExpression("CURRENT_DATE(  )");
+        assertEquals(UnresolvedFunction.class, expr.getClass());
+        UnresolvedFunction ur = (UnresolvedFunction) expr;
+        assertEquals("CURRENT_DATE(  )", ur.sourceText());
+        assertEquals(0, ur.children().size());
+    }
+
     public void testCurrentTimestamp() {
         Expression expr = parser.createExpression("CURRENT_TIMESTAMP");
         assertEquals(UnresolvedFunction.class, expr.getClass());
@@ -373,4 +389,4 @@ public class ExpressionTests extends ESTestCase {
         Expression expr = parser.createExpression(s);
         assertEquals(s, expr.sourceText());
     }
-}
+}

+ 2 - 5
x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/tree/NodeSubclassTests.java

@@ -92,8 +92,7 @@ import static org.mockito.Mockito.mock;
  */
 public class NodeSubclassTests<T extends B, B extends Node<B>> extends ESTestCase {
 
-
-    private static final List<Class<?>> CLASSES_WITH_MIN_TWO_CHILDREN = Arrays.<Class<?>> asList(IfNull.class, In.class, InPipe.class,
+    private static final List<Class<?>> CLASSES_WITH_MIN_TWO_CHILDREN = Arrays.asList(IfNull.class, In.class, InPipe.class,
             Percentile.class, Percentiles.class, PercentileRanks.class);
 
     private final Class<T> subclass;
@@ -138,9 +137,7 @@ public class NodeSubclassTests<T extends B, B extends Node<B>> extends ESTestCas
             Type changedArgType = argTypes[changedArgOffset];
             Object changedArgValue = randomValueOtherThan(nodeCtorArgs[changedArgOffset], () -> makeArg(changedArgType));
 
-            B transformed = node.transformNodeProps(prop -> {
-                return Objects.equals(prop, originalArgValue) ? changedArgValue : prop;
-            }, Object.class);
+            B transformed = node.transformNodeProps(prop -> Objects.equals(prop, originalArgValue) ? changedArgValue : prop, Object.class);
 
             if (node.children().contains(originalArgValue) || node.children().equals(originalArgValue)) {
                 if (node.children().equals(emptyList()) && originalArgValue.equals(emptyList())) {

Some files were not shown because too many files changed in this diff