Add underscore support for float

agrestio · Jan 31, 2024 · d5eee64 · d5eee64
1 parent ad55b8f
commit d5eee64
Show file tree

Hide file tree

Showing 5 changed files with 443 additions and 347 deletions.
diff --git a/agrest-engine/src/main/java/io/agrest/exp/parser/AgExpressionParser.java b/agrest-engine/src/main/java/io/agrest/exp/parser/AgExpressionParser.java
@@ -2486,7 +2486,7 @@ final public Token getToken(int index) {
   /** Generate ParseException. */
   public ParseException generateParseException() {
 	 jj_expentries.clear();
-	 boolean[] la1tokens = new boolean[87];
+	 boolean[] la1tokens = new boolean[88];
 	 if (jj_kind >= 0) {
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
@@ -2506,7 +2506,7 @@ public ParseException generateParseException() {
 		 }
 	   }
 	 }
-	 for (int i = 0; i < 87; i++) {
+	 for (int i = 0; i < 88; i++) {
 	   if (la1tokens[i]) {
 		 jj_expentry = new int[1];
 		 jj_expentry[0] = i;

diff --git a/agrest-engine/src/main/java/io/agrest/exp/parser/AgExpressionParserConstants.java b/agrest-engine/src/main/java/io/agrest/exp/parser/AgExpressionParserConstants.java
@@ -99,11 +99,13 @@ public interface AgExpressionParserConstants {
   /** RegularExpression Id. */
   int DEC_FLT = 83;
   /** RegularExpression Id. */
-  int EXPONENT = 84;
+  int DEC_DIGITS_INNER_UNDERSCORE = 84;
   /** RegularExpression Id. */
-  int INT_SUFF = 85;
+  int EXPONENT = 85;
   /** RegularExpression Id. */
-  int FLT_SUFF = 86;
+  int INT_SUFF = 86;
+  /** RegularExpression Id. */
+  int FLT_SUFF = 87;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -198,6 +200,7 @@ public interface AgExpressionParserConstants {
     "<HEX_DIGIT_UNDERSCORE>",
     "<HEX_DIGIT>",
     "<DEC_FLT>",
+    "<DEC_DIGITS_INNER_UNDERSCORE>",
     "<EXPONENT>",
     "<INT_SUFF>",
     "<FLT_SUFF>",