#119 Fixing EOL in antlr grammar for conditions. (#136)

philterd · Aug 27, 2024 · e09e1fc · e09e1fc
1 parent 1f9c76f
commit e09e1fc
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 88 deletions.
diff --git a/phileas-model/src/main/antlr4/FilterCondition.g4 b/phileas-model/src/main/antlr4/FilterCondition.g4
@@ -10,7 +10,7 @@ expression: (
     | 'context' COMPARATOR WORD (AND expression)?
     | 'classification' COMPARATOR WORD (AND expression)?
     | 'sentiment' COMPARATOR NUMBER (AND expression)?
-    );
+    ) EOF;
 
 TYPE: (
     | 'PER' | 'per'
@@ -41,5 +41,5 @@ NUMBER: (
 WORD: '"' (~('"' | '\\' | '\r' | '\n') | '\\' ('"' | '\\'))* '"';
 
 WS
-    :   [ \t\r\n]+ -> skip
+    :   [ ]+ -> skip
     ;
diff --git a/...as-model/src/main/java/ai/philterd/phileas/model/conditions/parser/FilterCondition.interp b/...as-model/src/main/java/ai/philterd/phileas/model/conditions/parser/FilterCondition.interp
@@ -35,4 +35,4 @@ expression
 
 
 atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 15, 57, 4, 2, 9, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 11, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 18, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 25, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 32, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 39, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 46, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 53, 10, 2, 5, 2, 55, 10, 2, 3, 2, 2, 2, 3, 2, 2, 2, 2, 69, 2, 54, 3, 2, 2, 2, 4, 55, 3, 2, 2, 2, 5, 6, 7, 3, 2, 2, 6, 7, 7, 12, 2, 2, 7, 10, 7, 13, 2, 2, 8, 9, 7, 11, 2, 2, 9, 11, 5, 2, 2, 2, 10, 8, 3, 2, 2, 2, 10, 11, 3, 2, 2, 2, 11, 55, 3, 2, 2, 2, 12, 13, 7, 4, 2, 2, 13, 14, 7, 12, 2, 2, 14, 17, 7, 14, 2, 2, 15, 16, 7, 11, 2, 2, 16, 18, 5, 2, 2, 2, 17, 15, 3, 2, 2, 2, 17, 18, 3, 2, 2, 2, 18, 55, 3, 2, 2, 2, 19, 20, 7, 5, 2, 2, 20, 21, 7, 12, 2, 2, 21, 24, 7, 10, 2, 2, 22, 23, 7, 11, 2, 2, 23, 25, 5, 2, 2, 2, 24, 22, 3, 2, 2, 2, 24, 25, 3, 2, 2, 2, 25, 55, 3, 2, 2, 2, 26, 27, 7, 6, 2, 2, 27, 28, 7, 12, 2, 2, 28, 31, 7, 13, 2, 2, 29, 30, 7, 11, 2, 2, 30, 32, 5, 2, 2, 2, 31, 29, 3, 2, 2, 2, 31, 32, 3, 2, 2, 2, 32, 55, 3, 2, 2, 2, 33, 34, 7, 7, 2, 2, 34, 35, 7, 12, 2, 2, 35, 38, 7, 14, 2, 2, 36, 37, 7, 11, 2, 2, 37, 39, 5, 2, 2, 2, 38, 36, 3, 2, 2, 2, 38, 39, 3, 2, 2, 2, 39, 55, 3, 2, 2, 2, 40, 41, 7, 8, 2, 2, 41, 42, 7, 12, 2, 2, 42, 45, 7, 14, 2, 2, 43, 44, 7, 11, 2, 2, 44, 46, 5, 2, 2, 2, 45, 43, 3, 2, 2, 2, 45, 46, 3, 2, 2, 2, 46, 55, 3, 2, 2, 2, 47, 48, 7, 9, 2, 2, 48, 49, 7, 12, 2, 2, 49, 52, 7, 13, 2, 2, 50, 51, 7, 11, 2, 2, 51, 53, 5, 2, 2, 2, 52, 50, 3, 2, 2, 2, 52, 53, 3, 2, 2, 2, 53, 55, 3, 2, 2, 2, 54, 4, 3, 2, 2, 2, 54, 5, 3, 2, 2, 2, 54, 12, 3, 2, 2, 2, 54, 19, 3, 2, 2, 2, 54, 26, 3, 2, 2, 2, 54, 33, 3, 2, 2, 2, 54, 40, 3, 2, 2, 2, 54, 47, 3, 2, 2, 2, 55, 3, 3, 2, 2, 2, 10, 10, 17, 24, 31, 38, 45, 52, 54]
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 15, 59, 4, 2, 9, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 11, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 18, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 25, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 32, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 39, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 46, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 53, 10, 2, 5, 2, 55, 10, 2, 3, 2, 3, 2, 3, 2, 2, 2, 3, 2, 2, 2, 2, 71, 2, 54, 3, 2, 2, 2, 4, 55, 3, 2, 2, 2, 5, 6, 7, 3, 2, 2, 6, 7, 7, 12, 2, 2, 7, 10, 7, 13, 2, 2, 8, 9, 7, 11, 2, 2, 9, 11, 5, 2, 2, 2, 10, 8, 3, 2, 2, 2, 10, 11, 3, 2, 2, 2, 11, 55, 3, 2, 2, 2, 12, 13, 7, 4, 2, 2, 13, 14, 7, 12, 2, 2, 14, 17, 7, 14, 2, 2, 15, 16, 7, 11, 2, 2, 16, 18, 5, 2, 2, 2, 17, 15, 3, 2, 2, 2, 17, 18, 3, 2, 2, 2, 18, 55, 3, 2, 2, 2, 19, 20, 7, 5, 2, 2, 20, 21, 7, 12, 2, 2, 21, 24, 7, 10, 2, 2, 22, 23, 7, 11, 2, 2, 23, 25, 5, 2, 2, 2, 24, 22, 3, 2, 2, 2, 24, 25, 3, 2, 2, 2, 25, 55, 3, 2, 2, 2, 26, 27, 7, 6, 2, 2, 27, 28, 7, 12, 2, 2, 28, 31, 7, 13, 2, 2, 29, 30, 7, 11, 2, 2, 30, 32, 5, 2, 2, 2, 31, 29, 3, 2, 2, 2, 31, 32, 3, 2, 2, 2, 32, 55, 3, 2, 2, 2, 33, 34, 7, 7, 2, 2, 34, 35, 7, 12, 2, 2, 35, 38, 7, 14, 2, 2, 36, 37, 7, 11, 2, 2, 37, 39, 5, 2, 2, 2, 38, 36, 3, 2, 2, 2, 38, 39, 3, 2, 2, 2, 39, 55, 3, 2, 2, 2, 40, 41, 7, 8, 2, 2, 41, 42, 7, 12, 2, 2, 42, 45, 7, 14, 2, 2, 43, 44, 7, 11, 2, 2, 44, 46, 5, 2, 2, 2, 45, 43, 3, 2, 2, 2, 45, 46, 3, 2, 2, 2, 46, 55, 3, 2, 2, 2, 47, 48, 7, 9, 2, 2, 48, 49, 7, 12, 2, 2, 49, 52, 7, 13, 2, 2, 50, 51, 7, 11, 2, 2, 51, 53, 5, 2, 2, 2, 52, 50, 3, 2, 2, 2, 52, 53, 3, 2, 2, 2, 53, 55, 3, 2, 2, 2, 54, 4, 3, 2, 2, 2, 54, 5, 3, 2, 2, 2, 54, 12, 3, 2, 2, 2, 54, 19, 3, 2, 2, 2, 54, 26, 3, 2, 2, 2, 54, 33, 3, 2, 2, 2, 54, 40, 3, 2, 2, 2, 54, 47, 3, 2, 2, 2, 55, 56, 3, 2, 2, 2, 56, 57, 7, 2, 2, 3, 57, 3, 3, 2, 2, 2, 10, 10, 17, 24, 31, 38, 45, 52, 54]
diff --git a/...del/src/main/java/ai/philterd/phileas/model/conditions/parser/FilterConditionLexer.interp b/...del/src/main/java/ai/philterd/phileas/model/conditions/parser/FilterConditionLexer.interp
@@ -53,4 +53,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 15, 180, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 5, 9, 109, 10, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 5, 10, 118, 10, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 5, 11, 148, 10, 11, 3, 12, 6, 12, 151, 10, 12, 13, 12, 14, 12, 152, 3, 12, 3, 12, 6, 12, 157, 10, 12, 13, 12, 14, 12, 158, 5, 12, 161, 10, 12, 3, 13, 3, 13, 3, 13, 3, 13, 7, 13, 167, 10, 13, 12, 13, 14, 13, 170, 11, 13, 3, 13, 3, 13, 3, 14, 6, 14, 175, 10, 14, 13, 14, 14, 14, 176, 3, 14, 3, 14, 2, 2, 15, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 3, 2, 6, 4, 2, 62, 62, 64, 64, 6, 2, 12, 12, 15, 15, 36, 36, 94, 94, 4, 2, 36, 36, 94, 94, 5, 2, 11, 12, 15, 15, 34, 34, 2, 199, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 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, 3, 29, 3, 2, 2, 2, 5, 40, 3, 2, 2, 2, 7, 46, 3, 2, 2, 2, 9, 51, 3, 2, 2, 2, 11, 62, 3, 2, 2, 2, 13, 70, 3, 2, 2, 2, 15, 85, 3, 2, 2, 2, 17, 108, 3, 2, 2, 2, 19, 117, 3, 2, 2, 2, 21, 147, 3, 2, 2, 2, 23, 150, 3, 2, 2, 2, 25, 162, 3, 2, 2, 2, 27, 174, 3, 2, 2, 2, 29, 30, 7, 114, 2, 2, 30, 31, 7, 113, 2, 2, 31, 32, 7, 114, 2, 2, 32, 33, 7, 119, 2, 2, 33, 34, 7, 110, 2, 2, 34, 35, 7, 99, 2, 2, 35, 36, 7, 118, 2, 2, 36, 37, 7, 107, 2, 2, 37, 38, 7, 113, 2, 2, 38, 39, 7, 112, 2, 2, 39, 4, 3, 2, 2, 2, 40, 41, 7, 118, 2, 2, 41, 42, 7, 113, 2, 2, 42, 43, 7, 109, 2, 2, 43, 44, 7, 103, 2, 2, 44, 45, 7, 112, 2, 2, 45, 6, 3, 2, 2, 2, 46, 47, 7, 118, 2, 2, 47, 48, 7, 123, 2, 2, 48, 49, 7, 114, 2, 2, 49, 50, 7, 103, 2, 2, 50, 8, 3, 2, 2, 2, 51, 52, 7, 101, 2, 2, 52, 53, 7, 113, 2, 2, 53, 54, 7, 112, 2, 2, 54, 55, 7, 104, 2, 2, 55, 56, 7, 107, 2, 2, 56, 57, 7, 102, 2, 2, 57, 58, 7, 103, 2, 2, 58, 59, 7, 112, 2, 2, 59, 60, 7, 101, 2, 2, 60, 61, 7, 103, 2, 2, 61, 10, 3, 2, 2, 2, 62, 63, 7, 101, 2, 2, 63, 64, 7, 113, 2, 2, 64, 65, 7, 112, 2, 2, 65, 66, 7, 118, 2, 2, 66, 67, 7, 103, 2, 2, 67, 68, 7, 122, 2, 2, 68, 69, 7, 118, 2, 2, 69, 12, 3, 2, 2, 2, 70, 71, 7, 101, 2, 2, 71, 72, 7, 110, 2, 2, 72, 73, 7, 99, 2, 2, 73, 74, 7, 117, 2, 2, 74, 75, 7, 117, 2, 2, 75, 76, 7, 107, 2, 2, 76, 77, 7, 104, 2, 2, 77, 78, 7, 107, 2, 2, 78, 79, 7, 101, 2, 2, 79, 80, 7, 99, 2, 2, 80, 81, 7, 118, 2, 2, 81, 82, 7, 107, 2, 2, 82, 83, 7, 113, 2, 2, 83, 84, 7, 112, 2, 2, 84, 14, 3, 2, 2, 2, 85, 86, 7, 117, 2, 2, 86, 87, 7, 103, 2, 2, 87, 88, 7, 112, 2, 2, 88, 89, 7, 118, 2, 2, 89, 90, 7, 107, 2, 2, 90, 91, 7, 111, 2, 2, 91, 92, 7, 103, 2, 2, 92, 93, 7, 112, 2, 2, 93, 94, 7, 118, 2, 2, 94, 16, 3, 2, 2, 2, 95, 109, 3, 2, 2, 2, 96, 97, 7, 82, 2, 2, 97, 98, 7, 71, 2, 2, 98, 109, 7, 84, 2, 2, 99, 100, 7, 114, 2, 2, 100, 101, 7, 103, 2, 2, 101, 109, 7, 116, 2, 2, 102, 103, 7, 78, 2, 2, 103, 104, 7, 81, 2, 2, 104, 109, 7, 69, 2, 2, 105, 106, 7, 110, 2, 2, 106, 107, 7, 113, 2, 2, 107, 109, 7, 101, 2, 2, 108, 95, 3, 2, 2, 2, 108, 96, 3, 2, 2, 2, 108, 99, 3, 2, 2, 2, 108, 102, 3, 2, 2, 2, 108, 105, 3, 2, 2, 2, 109, 18, 3, 2, 2, 2, 110, 118, 3, 2, 2, 2, 111, 112, 7, 67, 2, 2, 112, 113, 7, 80, 2, 2, 113, 118, 7, 70, 2, 2, 114, 115, 7, 99, 2, 2, 115, 116, 7, 112, 2, 2, 116, 118, 7, 102, 2, 2, 117, 110, 3, 2, 2, 2, 117, 111, 3, 2, 2, 2, 117, 114, 3, 2, 2, 2, 118, 20, 3, 2, 2, 2, 119, 148, 3, 2, 2, 2, 120, 148, 9, 2, 2, 2, 121, 122, 7, 62, 2, 2, 122, 148, 7, 63, 2, 2, 123, 124, 7, 63, 2, 2, 124, 148, 7, 64, 2, 2, 125, 126, 7, 63, 2, 2, 126, 148, 7, 63, 2, 2, 127, 128, 7, 35, 2, 2, 128, 148, 7, 63, 2, 2, 129, 130, 7, 117, 2, 2, 130, 131, 7, 118, 2, 2, 131, 132, 7, 99, 2, 2, 132, 133, 7, 116, 2, 2, 133, 134, 7, 118, 2, 2, 134, 135, 7, 117, 2, 2, 135, 136, 7, 121, 2, 2, 136, 137, 7, 107, 2, 2, 137, 138, 7, 118, 2, 2, 138, 148, 7, 106, 2, 2, 139, 140, 7, 107, 2, 2, 140, 148, 7, 117, 2, 2, 141, 142, 7, 107, 2, 2, 142, 143, 7, 117, 2, 2, 143, 144, 7, 34, 2, 2, 144, 145, 7, 112, 2, 2, 145, 146, 7, 113, 2, 2, 146, 148, 7, 118, 2, 2, 147, 119, 3, 2, 2, 2, 147, 120, 3, 2, 2, 2, 147, 121, 3, 2, 2, 2, 147, 123, 3, 2, 2, 2, 147, 125, 3, 2, 2, 2, 147, 127, 3, 2, 2, 2, 147, 129, 3, 2, 2, 2, 147, 139, 3, 2, 2, 2, 147, 141, 3, 2, 2, 2, 148, 22, 3, 2, 2, 2, 149, 151, 4, 50, 59, 2, 150, 149, 3, 2, 2, 2, 151, 152, 3, 2, 2, 2, 152, 150, 3, 2, 2, 2, 152, 153, 3, 2, 2, 2, 153, 160, 3, 2, 2, 2, 154, 156, 7, 48, 2, 2, 155, 157, 4, 50, 59, 2, 156, 155, 3, 2, 2, 2, 157, 158, 3, 2, 2, 2, 158, 156, 3, 2, 2, 2, 158, 159, 3, 2, 2, 2, 159, 161, 3, 2, 2, 2, 160, 154, 3, 2, 2, 2, 160, 161, 3, 2, 2, 2, 161, 24, 3, 2, 2, 2, 162, 168, 7, 36, 2, 2, 163, 167, 10, 3, 2, 2, 164, 165, 7, 94, 2, 2, 165, 167, 9, 4, 2, 2, 166, 163, 3, 2, 2, 2, 166, 164, 3, 2, 2, 2, 167, 170, 3, 2, 2, 2, 168, 166, 3, 2, 2, 2, 168, 169, 3, 2, 2, 2, 169, 171, 3, 2, 2, 2, 170, 168, 3, 2, 2, 2, 171, 172, 7, 36, 2, 2, 172, 26, 3, 2, 2, 2, 173, 175, 9, 5, 2, 2, 174, 173, 3, 2, 2, 2, 175, 176, 3, 2, 2, 2, 176, 174, 3, 2, 2, 2, 176, 177, 3, 2, 2, 2, 177, 178, 3, 2, 2, 2, 178, 179, 8, 14, 2, 2, 179, 28, 3, 2, 2, 2, 12, 2, 108, 117, 147, 152, 158, 160, 166, 168, 176, 3, 8, 2, 2]
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 15, 180, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 5, 9, 109, 10, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 5, 10, 118, 10, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 5, 11, 148, 10, 11, 3, 12, 6, 12, 151, 10, 12, 13, 12, 14, 12, 152, 3, 12, 3, 12, 6, 12, 157, 10, 12, 13, 12, 14, 12, 158, 5, 12, 161, 10, 12, 3, 13, 3, 13, 3, 13, 3, 13, 7, 13, 167, 10, 13, 12, 13, 14, 13, 170, 11, 13, 3, 13, 3, 13, 3, 14, 6, 14, 175, 10, 14, 13, 14, 14, 14, 176, 3, 14, 3, 14, 2, 2, 15, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 3, 2, 6, 4, 2, 62, 62, 64, 64, 6, 2, 12, 12, 15, 15, 36, 36, 94, 94, 4, 2, 36, 36, 94, 94, 3, 2, 34, 34, 2, 199, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 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, 3, 29, 3, 2, 2, 2, 5, 40, 3, 2, 2, 2, 7, 46, 3, 2, 2, 2, 9, 51, 3, 2, 2, 2, 11, 62, 3, 2, 2, 2, 13, 70, 3, 2, 2, 2, 15, 85, 3, 2, 2, 2, 17, 108, 3, 2, 2, 2, 19, 117, 3, 2, 2, 2, 21, 147, 3, 2, 2, 2, 23, 150, 3, 2, 2, 2, 25, 162, 3, 2, 2, 2, 27, 174, 3, 2, 2, 2, 29, 30, 7, 114, 2, 2, 30, 31, 7, 113, 2, 2, 31, 32, 7, 114, 2, 2, 32, 33, 7, 119, 2, 2, 33, 34, 7, 110, 2, 2, 34, 35, 7, 99, 2, 2, 35, 36, 7, 118, 2, 2, 36, 37, 7, 107, 2, 2, 37, 38, 7, 113, 2, 2, 38, 39, 7, 112, 2, 2, 39, 4, 3, 2, 2, 2, 40, 41, 7, 118, 2, 2, 41, 42, 7, 113, 2, 2, 42, 43, 7, 109, 2, 2, 43, 44, 7, 103, 2, 2, 44, 45, 7, 112, 2, 2, 45, 6, 3, 2, 2, 2, 46, 47, 7, 118, 2, 2, 47, 48, 7, 123, 2, 2, 48, 49, 7, 114, 2, 2, 49, 50, 7, 103, 2, 2, 50, 8, 3, 2, 2, 2, 51, 52, 7, 101, 2, 2, 52, 53, 7, 113, 2, 2, 53, 54, 7, 112, 2, 2, 54, 55, 7, 104, 2, 2, 55, 56, 7, 107, 2, 2, 56, 57, 7, 102, 2, 2, 57, 58, 7, 103, 2, 2, 58, 59, 7, 112, 2, 2, 59, 60, 7, 101, 2, 2, 60, 61, 7, 103, 2, 2, 61, 10, 3, 2, 2, 2, 62, 63, 7, 101, 2, 2, 63, 64, 7, 113, 2, 2, 64, 65, 7, 112, 2, 2, 65, 66, 7, 118, 2, 2, 66, 67, 7, 103, 2, 2, 67, 68, 7, 122, 2, 2, 68, 69, 7, 118, 2, 2, 69, 12, 3, 2, 2, 2, 70, 71, 7, 101, 2, 2, 71, 72, 7, 110, 2, 2, 72, 73, 7, 99, 2, 2, 73, 74, 7, 117, 2, 2, 74, 75, 7, 117, 2, 2, 75, 76, 7, 107, 2, 2, 76, 77, 7, 104, 2, 2, 77, 78, 7, 107, 2, 2, 78, 79, 7, 101, 2, 2, 79, 80, 7, 99, 2, 2, 80, 81, 7, 118, 2, 2, 81, 82, 7, 107, 2, 2, 82, 83, 7, 113, 2, 2, 83, 84, 7, 112, 2, 2, 84, 14, 3, 2, 2, 2, 85, 86, 7, 117, 2, 2, 86, 87, 7, 103, 2, 2, 87, 88, 7, 112, 2, 2, 88, 89, 7, 118, 2, 2, 89, 90, 7, 107, 2, 2, 90, 91, 7, 111, 2, 2, 91, 92, 7, 103, 2, 2, 92, 93, 7, 112, 2, 2, 93, 94, 7, 118, 2, 2, 94, 16, 3, 2, 2, 2, 95, 109, 3, 2, 2, 2, 96, 97, 7, 82, 2, 2, 97, 98, 7, 71, 2, 2, 98, 109, 7, 84, 2, 2, 99, 100, 7, 114, 2, 2, 100, 101, 7, 103, 2, 2, 101, 109, 7, 116, 2, 2, 102, 103, 7, 78, 2, 2, 103, 104, 7, 81, 2, 2, 104, 109, 7, 69, 2, 2, 105, 106, 7, 110, 2, 2, 106, 107, 7, 113, 2, 2, 107, 109, 7, 101, 2, 2, 108, 95, 3, 2, 2, 2, 108, 96, 3, 2, 2, 2, 108, 99, 3, 2, 2, 2, 108, 102, 3, 2, 2, 2, 108, 105, 3, 2, 2, 2, 109, 18, 3, 2, 2, 2, 110, 118, 3, 2, 2, 2, 111, 112, 7, 67, 2, 2, 112, 113, 7, 80, 2, 2, 113, 118, 7, 70, 2, 2, 114, 115, 7, 99, 2, 2, 115, 116, 7, 112, 2, 2, 116, 118, 7, 102, 2, 2, 117, 110, 3, 2, 2, 2, 117, 111, 3, 2, 2, 2, 117, 114, 3, 2, 2, 2, 118, 20, 3, 2, 2, 2, 119, 148, 3, 2, 2, 2, 120, 148, 9, 2, 2, 2, 121, 122, 7, 62, 2, 2, 122, 148, 7, 63, 2, 2, 123, 124, 7, 63, 2, 2, 124, 148, 7, 64, 2, 2, 125, 126, 7, 63, 2, 2, 126, 148, 7, 63, 2, 2, 127, 128, 7, 35, 2, 2, 128, 148, 7, 63, 2, 2, 129, 130, 7, 117, 2, 2, 130, 131, 7, 118, 2, 2, 131, 132, 7, 99, 2, 2, 132, 133, 7, 116, 2, 2, 133, 134, 7, 118, 2, 2, 134, 135, 7, 117, 2, 2, 135, 136, 7, 121, 2, 2, 136, 137, 7, 107, 2, 2, 137, 138, 7, 118, 2, 2, 138, 148, 7, 106, 2, 2, 139, 140, 7, 107, 2, 2, 140, 148, 7, 117, 2, 2, 141, 142, 7, 107, 2, 2, 142, 143, 7, 117, 2, 2, 143, 144, 7, 34, 2, 2, 144, 145, 7, 112, 2, 2, 145, 146, 7, 113, 2, 2, 146, 148, 7, 118, 2, 2, 147, 119, 3, 2, 2, 2, 147, 120, 3, 2, 2, 2, 147, 121, 3, 2, 2, 2, 147, 123, 3, 2, 2, 2, 147, 125, 3, 2, 2, 2, 147, 127, 3, 2, 2, 2, 147, 129, 3, 2, 2, 2, 147, 139, 3, 2, 2, 2, 147, 141, 3, 2, 2, 2, 148, 22, 3, 2, 2, 2, 149, 151, 4, 50, 59, 2, 150, 149, 3, 2, 2, 2, 151, 152, 3, 2, 2, 2, 152, 150, 3, 2, 2, 2, 152, 153, 3, 2, 2, 2, 153, 160, 3, 2, 2, 2, 154, 156, 7, 48, 2, 2, 155, 157, 4, 50, 59, 2, 156, 155, 3, 2, 2, 2, 157, 158, 3, 2, 2, 2, 158, 156, 3, 2, 2, 2, 158, 159, 3, 2, 2, 2, 159, 161, 3, 2, 2, 2, 160, 154, 3, 2, 2, 2, 160, 161, 3, 2, 2, 2, 161, 24, 3, 2, 2, 2, 162, 168, 7, 36, 2, 2, 163, 167, 10, 3, 2, 2, 164, 165, 7, 94, 2, 2, 165, 167, 9, 4, 2, 2, 166, 163, 3, 2, 2, 2, 166, 164, 3, 2, 2, 2, 167, 170, 3, 2, 2, 2, 168, 166, 3, 2, 2, 2, 168, 169, 3, 2, 2, 2, 169, 171, 3, 2, 2, 2, 170, 168, 3, 2, 2, 2, 171, 172, 7, 36, 2, 2, 172, 26, 3, 2, 2, 2, 173, 175, 9, 5, 2, 2, 174, 173, 3, 2, 2, 2, 175, 176, 3, 2, 2, 2, 176, 174, 3, 2, 2, 2, 176, 177, 3, 2, 2, 2, 177, 178, 3, 2, 2, 2, 178, 179, 8, 14, 2, 2, 179, 28, 3, 2, 2, 2, 12, 2, 108, 117, 147, 152, 158, 160, 166, 168, 176, 3, 8, 2, 2]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,4 +35,4 @@ expression


		atn:
		[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 15, 57, 4, 2, 9, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 11, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 18, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 25, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 32, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 39, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 46, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 53, 10, 2, 5, 2, 55, 10, 2, 3, 2, 2, 2, 3, 2, 2, 2, 2, 69, 2, 54, 3, 2, 2, 2, 4, 55, 3, 2, 2, 2, 5, 6, 7, 3, 2, 2, 6, 7, 7, 12, 2, 2, 7, 10, 7, 13, 2, 2, 8, 9, 7, 11, 2, 2, 9, 11, 5, 2, 2, 2, 10, 8, 3, 2, 2, 2, 10, 11, 3, 2, 2, 2, 11, 55, 3, 2, 2, 2, 12, 13, 7, 4, 2, 2, 13, 14, 7, 12, 2, 2, 14, 17, 7, 14, 2, 2, 15, 16, 7, 11, 2, 2, 16, 18, 5, 2, 2, 2, 17, 15, 3, 2, 2, 2, 17, 18, 3, 2, 2, 2, 18, 55, 3, 2, 2, 2, 19, 20, 7, 5, 2, 2, 20, 21, 7, 12, 2, 2, 21, 24, 7, 10, 2, 2, 22, 23, 7, 11, 2, 2, 23, 25, 5, 2, 2, 2, 24, 22, 3, 2, 2, 2, 24, 25, 3, 2, 2, 2, 25, 55, 3, 2, 2, 2, 26, 27, 7, 6, 2, 2, 27, 28, 7, 12, 2, 2, 28, 31, 7, 13, 2, 2, 29, 30, 7, 11, 2, 2, 30, 32, 5, 2, 2, 2, 31, 29, 3, 2, 2, 2, 31, 32, 3, 2, 2, 2, 32, 55, 3, 2, 2, 2, 33, 34, 7, 7, 2, 2, 34, 35, 7, 12, 2, 2, 35, 38, 7, 14, 2, 2, 36, 37, 7, 11, 2, 2, 37, 39, 5, 2, 2, 2, 38, 36, 3, 2, 2, 2, 38, 39, 3, 2, 2, 2, 39, 55, 3, 2, 2, 2, 40, 41, 7, 8, 2, 2, 41, 42, 7, 12, 2, 2, 42, 45, 7, 14, 2, 2, 43, 44, 7, 11, 2, 2, 44, 46, 5, 2, 2, 2, 45, 43, 3, 2, 2, 2, 45, 46, 3, 2, 2, 2, 46, 55, 3, 2, 2, 2, 47, 48, 7, 9, 2, 2, 48, 49, 7, 12, 2, 2, 49, 52, 7, 13, 2, 2, 50, 51, 7, 11, 2, 2, 51, 53, 5, 2, 2, 2, 52, 50, 3, 2, 2, 2, 52, 53, 3, 2, 2, 2, 53, 55, 3, 2, 2, 2, 54, 4, 3, 2, 2, 2, 54, 5, 3, 2, 2, 2, 54, 12, 3, 2, 2, 2, 54, 19, 3, 2, 2, 2, 54, 26, 3, 2, 2, 2, 54, 33, 3, 2, 2, 2, 54, 40, 3, 2, 2, 2, 54, 47, 3, 2, 2, 2, 55, 3, 3, 2, 2, 2, 10, 10, 17, 24, 31, 38, 45, 52, 54]
		[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 15, 59, 4, 2, 9, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 11, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 18, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 25, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 32, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 39, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 46, 10, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 53, 10, 2, 5, 2, 55, 10, 2, 3, 2, 3, 2, 3, 2, 2, 2, 3, 2, 2, 2, 2, 71, 2, 54, 3, 2, 2, 2, 4, 55, 3, 2, 2, 2, 5, 6, 7, 3, 2, 2, 6, 7, 7, 12, 2, 2, 7, 10, 7, 13, 2, 2, 8, 9, 7, 11, 2, 2, 9, 11, 5, 2, 2, 2, 10, 8, 3, 2, 2, 2, 10, 11, 3, 2, 2, 2, 11, 55, 3, 2, 2, 2, 12, 13, 7, 4, 2, 2, 13, 14, 7, 12, 2, 2, 14, 17, 7, 14, 2, 2, 15, 16, 7, 11, 2, 2, 16, 18, 5, 2, 2, 2, 17, 15, 3, 2, 2, 2, 17, 18, 3, 2, 2, 2, 18, 55, 3, 2, 2, 2, 19, 20, 7, 5, 2, 2, 20, 21, 7, 12, 2, 2, 21, 24, 7, 10, 2, 2, 22, 23, 7, 11, 2, 2, 23, 25, 5, 2, 2, 2, 24, 22, 3, 2, 2, 2, 24, 25, 3, 2, 2, 2, 25, 55, 3, 2, 2, 2, 26, 27, 7, 6, 2, 2, 27, 28, 7, 12, 2, 2, 28, 31, 7, 13, 2, 2, 29, 30, 7, 11, 2, 2, 30, 32, 5, 2, 2, 2, 31, 29, 3, 2, 2, 2, 31, 32, 3, 2, 2, 2, 32, 55, 3, 2, 2, 2, 33, 34, 7, 7, 2, 2, 34, 35, 7, 12, 2, 2, 35, 38, 7, 14, 2, 2, 36, 37, 7, 11, 2, 2, 37, 39, 5, 2, 2, 2, 38, 36, 3, 2, 2, 2, 38, 39, 3, 2, 2, 2, 39, 55, 3, 2, 2, 2, 40, 41, 7, 8, 2, 2, 41, 42, 7, 12, 2, 2, 42, 45, 7, 14, 2, 2, 43, 44, 7, 11, 2, 2, 44, 46, 5, 2, 2, 2, 45, 43, 3, 2, 2, 2, 45, 46, 3, 2, 2, 2, 46, 55, 3, 2, 2, 2, 47, 48, 7, 9, 2, 2, 48, 49, 7, 12, 2, 2, 49, 52, 7, 13, 2, 2, 50, 51, 7, 11, 2, 2, 51, 53, 5, 2, 2, 2, 52, 50, 3, 2, 2, 2, 52, 53, 3, 2, 2, 2, 53, 55, 3, 2, 2, 2, 54, 4, 3, 2, 2, 2, 54, 5, 3, 2, 2, 2, 54, 12, 3, 2, 2, 2, 54, 19, 3, 2, 2, 2, 54, 26, 3, 2, 2, 2, 54, 33, 3, 2, 2, 2, 54, 40, 3, 2, 2, 2, 54, 47, 3, 2, 2, 2, 55, 56, 3, 2, 2, 2, 56, 57, 7, 2, 2, 3, 57, 3, 3, 2, 2, 2, 10, 10, 17, 24, 31, 38, 45, 52, 54]