Skip to content

Commit 3d42ac9

Browse files
dr-jtsdr-jts
committed
Support colons in CQl property names
1 parent cd3ae95 commit 3d42ac9

File tree

5 files changed

+129
-118
lines changed

5 files changed

+129
-118
lines changed

‎NEWS.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
## Version ??
44
*Released: TBD*
55

6+
### Improvements
7+
8+
* Allow colons in property names
9+
610
### Bug Fixes
711

812
* Fix CQL parser to allow multiple AND/OR terms (#162)

‎hugo/content/usage/cql.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ The basic elements of filter expressions are values obtained
2424
from feature collection properties, and literals (constants).
2525

2626
**Properties** are referred to by name.
27-
Property names can be quoted, to support including special characters.
27+
Property names can be quoted, to support including special characters `_`, `$` and `:`.
2828

2929
```
3030
propname
31-
"quoted_name$"
31+
"ns:Quoted_name$"
3232
```
3333

3434
**Literals** can be numbers, boolean or text values.

‎internal/cql/CqlLexer.g4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ CharacterStringLiteralStart : QUOTE -> more, mode(STR);// (Character)* QUOTE;
127127

128128
Identifier : IdentifierStart IdentifierPart* | DOUBLEQUOTE Identifier DOUBLEQUOTE;
129129
IdentifierStart : ALPHA;
130-
IdentifierPart : ALPHA | DIGIT | UNDERSCORE | DOLLAR;
130+
IdentifierPart : ALPHA | DIGIT | UNDERSCORE | DOLLAR | COLON;
131131

132132
ALPHA : [A-Za-z];
133133

‎internal/cql/cql_lexer.go‎

Lines changed: 116 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var _ = fmt.Printf
1414
var _ = unicode.IsLetter
1515

1616
var serializedLexerAtn = []uint16{
17-
3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 85, 760,
17+
3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 85, 761,
1818
8, 1, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6,
1919
4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12,
2020
9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9,
@@ -69,27 +69,27 @@ var serializedLexerAtn = []uint16{
6969
55, 3, 55, 3, 56, 3, 56, 5, 56, 538, 10, 56, 3, 57, 3, 57, 3, 57, 3, 57,
7070
3, 57, 3, 58, 3, 58, 7, 58, 547, 10, 58, 12, 58, 14, 58, 550, 11, 58, 3,
7171
58, 3, 58, 3, 58, 3, 58, 5, 58, 556, 10, 58, 3, 59, 3, 59, 3, 60, 3, 60,
72-
3, 60, 3, 60, 5, 60, 564, 10, 60, 3, 61, 3, 61, 3, 62, 3, 62, 3, 63, 3,
73-
63, 3, 64, 3, 64, 3, 65, 3, 65, 3, 66, 3, 66, 3, 67, 3, 67, 3, 68, 3, 68,
74-
3, 69, 3, 69, 3, 70, 3, 70, 3, 71, 3, 71, 3, 72, 3, 72, 3, 73, 3, 73, 3,
75-
74, 3, 74, 3, 75, 3, 75, 3, 76, 3, 76, 3, 77, 3, 77, 3, 78, 3, 78, 3, 79,
76-
3, 79, 3, 80, 3, 80, 3, 81, 3, 81, 3, 81, 3, 82, 3, 82, 3, 83, 3, 83, 3,
77-
84, 3, 84, 3, 85, 3, 85, 3, 86, 3, 86, 3, 87, 3, 87, 3, 87, 3, 87, 3, 87,
78-
3, 87, 3, 87, 5, 87, 626, 10, 87, 3, 88, 3, 88, 5, 88, 630, 10, 88, 3,
79-
89, 5, 89, 633, 10, 89, 3, 89, 3, 89, 5, 89, 637, 10, 89, 3, 90, 3, 90,
80-
3, 90, 5, 90, 642, 10, 90, 5, 90, 644, 10, 90, 3, 90, 3, 90, 3, 90, 5,
81-
90, 649, 10, 90, 3, 91, 3, 91, 3, 91, 3, 91, 3, 92, 3, 92, 3, 93, 3, 93,
82-
3, 94, 5, 94, 660, 10, 94, 3, 94, 3, 94, 3, 95, 6, 95, 665, 10, 95, 13,
83-
95, 14, 95, 666, 3, 96, 3, 96, 5, 96, 671, 10, 96, 3, 97, 3, 97, 3, 98,
84-
3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 5, 98, 684, 10,
85-
98, 3, 99, 3, 99, 3, 99, 3, 99, 3, 99, 3, 99, 3, 100, 3, 100, 3, 100, 3,
86-
100, 3, 100, 3, 101, 3, 101, 3, 101, 3, 102, 3, 102, 3, 102, 3, 103, 3,
87-
103, 3, 103, 3, 103, 3, 103, 5, 103, 708, 10, 103, 3, 103, 5, 103, 711,
88-
10, 103, 3, 104, 3, 104, 3, 104, 3, 104, 3, 104, 3, 104, 5, 104, 719, 10,
72+
3, 60, 3, 60, 3, 60, 5, 60, 565, 10, 60, 3, 61, 3, 61, 3, 62, 3, 62, 3,
73+
63, 3, 63, 3, 64, 3, 64, 3, 65, 3, 65, 3, 66, 3, 66, 3, 67, 3, 67, 3, 68,
74+
3, 68, 3, 69, 3, 69, 3, 70, 3, 70, 3, 71, 3, 71, 3, 72, 3, 72, 3, 73, 3,
75+
73, 3, 74, 3, 74, 3, 75, 3, 75, 3, 76, 3, 76, 3, 77, 3, 77, 3, 78, 3, 78,
76+
3, 79, 3, 79, 3, 80, 3, 80, 3, 81, 3, 81, 3, 81, 3, 82, 3, 82, 3, 83, 3,
77+
83, 3, 84, 3, 84, 3, 85, 3, 85, 3, 86, 3, 86, 3, 87, 3, 87, 3, 87, 3, 87,
78+
3, 87, 3, 87, 3, 87, 5, 87, 627, 10, 87, 3, 88, 3, 88, 5, 88, 631, 10,
79+
88, 3, 89, 5, 89, 634, 10, 89, 3, 89, 3, 89, 5, 89, 638, 10, 89, 3, 90,
80+
3, 90, 3, 90, 5, 90, 643, 10, 90, 5, 90, 645, 10, 90, 3, 90, 3, 90, 3,
81+
90, 5, 90, 650, 10, 90, 3, 91, 3, 91, 3, 91, 3, 91, 3, 92, 3, 92, 3, 93,
82+
3, 93, 3, 94, 5, 94, 661, 10, 94, 3, 94, 3, 94, 3, 95, 6, 95, 666, 10,
83+
95, 13, 95, 14, 95, 667, 3, 96, 3, 96, 5, 96, 672, 10, 96, 3, 97, 3, 97,
84+
3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 5, 98, 685,
85+
10, 98, 3, 99, 3, 99, 3, 99, 3, 99, 3, 99, 3, 99, 3, 100, 3, 100, 3, 100,
86+
3, 100, 3, 100, 3, 101, 3, 101, 3, 101, 3, 102, 3, 102, 3, 102, 3, 103,
87+
3, 103, 3, 103, 3, 103, 3, 103, 5, 103, 709, 10, 103, 3, 103, 5, 103, 712,
88+
10, 103, 3, 104, 3, 104, 3, 104, 3, 104, 3, 104, 3, 104, 5, 104, 720, 10,
8989
104, 3, 105, 3, 105, 3, 105, 3, 106, 3, 106, 3, 106, 3, 107, 3, 107, 3,
90-
107, 3, 107, 6, 107, 731, 10, 107, 13, 107, 14, 107, 732, 5, 107, 735,
91-
10, 107, 3, 108, 3, 108, 3, 108, 3, 108, 3, 109, 6, 109, 742, 10, 109,
92-
13, 109, 14, 109, 743, 3, 109, 3, 109, 3, 110, 3, 110, 3, 110, 3, 110,
90+
107, 3, 107, 6, 107, 732, 10, 107, 13, 107, 14, 107, 733, 5, 107, 736,
91+
10, 107, 3, 108, 3, 108, 3, 108, 3, 108, 3, 109, 6, 109, 743, 10, 109,
92+
13, 109, 14, 109, 744, 3, 109, 3, 109, 3, 110, 3, 110, 3, 110, 3, 110,
9393
3, 111, 3, 111, 3, 111, 3, 111, 3, 111, 3, 112, 3, 112, 3, 112, 3, 112,
9494
2, 2, 113, 4, 2, 6, 2, 8, 2, 10, 2, 12, 2, 14, 2, 16, 2, 18, 2, 20, 2,
9595
22, 2, 24, 2, 26, 2, 28, 2, 30, 2, 32, 2, 34, 2, 36, 2, 38, 2, 40, 2, 42,
@@ -113,7 +113,7 @@ var serializedLexerAtn = []uint16{
113113
85, 85, 117, 117, 4, 2, 86, 86, 118, 118, 4, 2, 87, 87, 119, 119, 4, 2,
114114
88, 88, 120, 120, 4, 2, 89, 89, 121, 121, 4, 2, 90, 90, 122, 122, 4, 2,
115115
91, 91, 123, 123, 4, 2, 92, 92, 124, 124, 4, 2, 67, 92, 99, 124, 3, 2,
116-
50, 59, 5, 2, 11, 12, 15, 15, 34, 34, 3, 2, 41, 41, 2, 780, 2, 56, 3, 2,
116+
50, 59, 5, 2, 11, 12, 15, 15, 34, 34, 3, 2, 41, 41, 2, 782, 2, 56, 3, 2,
117117
2, 2, 2, 58, 3, 2, 2, 2, 2, 60, 3, 2, 2, 2, 2, 62, 3, 2, 2, 2, 2, 64, 3,
118118
2, 2, 2, 2, 66, 3, 2, 2, 2, 2, 68, 3, 2, 2, 2, 2, 70, 3, 2, 2, 2, 2, 72,
119119
3, 2, 2, 2, 2, 74, 3, 2, 2, 2, 2, 76, 3, 2, 2, 2, 2, 78, 3, 2, 2, 2, 2,
@@ -153,23 +153,23 @@ var serializedLexerAtn = []uint16{
153153
3, 2, 2, 2, 96, 442, 3, 2, 2, 2, 98, 448, 3, 2, 2, 2, 100, 459, 3, 2, 2,
154154
2, 102, 467, 3, 2, 2, 2, 104, 478, 3, 2, 2, 2, 106, 494, 3, 2, 2, 2, 108,
155155
507, 3, 2, 2, 2, 110, 526, 3, 2, 2, 2, 112, 537, 3, 2, 2, 2, 114, 539,
156-
3, 2, 2, 2, 116, 555, 3, 2, 2, 2, 118, 557, 3, 2, 2, 2, 120, 563, 3, 2,
157-
2, 2, 122, 565, 3, 2, 2, 2, 124, 567, 3, 2, 2, 2, 126, 569, 3, 2, 2, 2,
158-
128, 571, 3, 2, 2, 2, 130, 573, 3, 2, 2, 2, 132, 575, 3, 2, 2, 2, 134,
159-
577, 3, 2, 2, 2, 136, 579, 3, 2, 2, 2, 138, 581, 3, 2, 2, 2, 140, 583,
160-
3, 2, 2, 2, 142, 585, 3, 2, 2, 2, 144, 587, 3, 2, 2, 2, 146, 589, 3, 2,
161-
2, 2, 148, 591, 3, 2, 2, 2, 150, 593, 3, 2, 2, 2, 152, 595, 3, 2, 2, 2,
162-
154, 597, 3, 2, 2, 2, 156, 599, 3, 2, 2, 2, 158, 601, 3, 2, 2, 2, 160,
163-
603, 3, 2, 2, 2, 162, 605, 3, 2, 2, 2, 164, 608, 3, 2, 2, 2, 166, 610,
164-
3, 2, 2, 2, 168, 612, 3, 2, 2, 2, 170, 614, 3, 2, 2, 2, 172, 616, 3, 2,
165-
2, 2, 174, 625, 3, 2, 2, 2, 176, 629, 3, 2, 2, 2, 178, 636, 3, 2, 2, 2,
166-
180, 648, 3, 2, 2, 2, 182, 650, 3, 2, 2, 2, 184, 654, 3, 2, 2, 2, 186,
167-
656, 3, 2, 2, 2, 188, 659, 3, 2, 2, 2, 190, 664, 3, 2, 2, 2, 192, 670,
168-
3, 2, 2, 2, 194, 672, 3, 2, 2, 2, 196, 683, 3, 2, 2, 2, 198, 685, 3, 2,
169-
2, 2, 200, 691, 3, 2, 2, 2, 202, 696, 3, 2, 2, 2, 204, 699, 3, 2, 2, 2,
170-
206, 702, 3, 2, 2, 2, 208, 718, 3, 2, 2, 2, 210, 720, 3, 2, 2, 2, 212,
171-
723, 3, 2, 2, 2, 214, 726, 3, 2, 2, 2, 216, 736, 3, 2, 2, 2, 218, 741,
172-
3, 2, 2, 2, 220, 747, 3, 2, 2, 2, 222, 751, 3, 2, 2, 2, 224, 756, 3, 2,
156+
3, 2, 2, 2, 116, 555, 3, 2, 2, 2, 118, 557, 3, 2, 2, 2, 120, 564, 3, 2,
157+
2, 2, 122, 566, 3, 2, 2, 2, 124, 568, 3, 2, 2, 2, 126, 570, 3, 2, 2, 2,
158+
128, 572, 3, 2, 2, 2, 130, 574, 3, 2, 2, 2, 132, 576, 3, 2, 2, 2, 134,
159+
578, 3, 2, 2, 2, 136, 580, 3, 2, 2, 2, 138, 582, 3, 2, 2, 2, 140, 584,
160+
3, 2, 2, 2, 142, 586, 3, 2, 2, 2, 144, 588, 3, 2, 2, 2, 146, 590, 3, 2,
161+
2, 2, 148, 592, 3, 2, 2, 2, 150, 594, 3, 2, 2, 2, 152, 596, 3, 2, 2, 2,
162+
154, 598, 3, 2, 2, 2, 156, 600, 3, 2, 2, 2, 158, 602, 3, 2, 2, 2, 160,
163+
604, 3, 2, 2, 2, 162, 606, 3, 2, 2, 2, 164, 609, 3, 2, 2, 2, 166, 611,
164+
3, 2, 2, 2, 168, 613, 3, 2, 2, 2, 170, 615, 3, 2, 2, 2, 172, 617, 3, 2,
165+
2, 2, 174, 626, 3, 2, 2, 2, 176, 630, 3, 2, 2, 2, 178, 637, 3, 2, 2, 2,
166+
180, 649, 3, 2, 2, 2, 182, 651, 3, 2, 2, 2, 184, 655, 3, 2, 2, 2, 186,
167+
657, 3, 2, 2, 2, 188, 660, 3, 2, 2, 2, 190, 665, 3, 2, 2, 2, 192, 671,
168+
3, 2, 2, 2, 194, 673, 3, 2, 2, 2, 196, 684, 3, 2, 2, 2, 198, 686, 3, 2,
169+
2, 2, 200, 692, 3, 2, 2, 2, 202, 697, 3, 2, 2, 2, 204, 700, 3, 2, 2, 2,
170+
206, 703, 3, 2, 2, 2, 208, 719, 3, 2, 2, 2, 210, 721, 3, 2, 2, 2, 212,
171+
724, 3, 2, 2, 2, 214, 727, 3, 2, 2, 2, 216, 737, 3, 2, 2, 2, 218, 742,
172+
3, 2, 2, 2, 220, 748, 3, 2, 2, 2, 222, 752, 3, 2, 2, 2, 224, 757, 3, 2,
173173
2, 2, 226, 227, 9, 2, 2, 2, 227, 5, 3, 2, 2, 2, 228, 229, 9, 3, 2, 2, 229,
174174
7, 3, 2, 2, 2, 230, 231, 9, 4, 2, 2, 231, 9, 3, 2, 2, 2, 232, 233, 9, 5,
175175
2, 2, 233, 11, 3, 2, 2, 2, 234, 235, 9, 6, 2, 2, 235, 13, 3, 2, 2, 2, 236,
@@ -282,82 +282,83 @@ var serializedLexerAtn = []uint16{
282282
2, 2, 548, 549, 3, 2, 2, 2, 549, 556, 3, 2, 2, 2, 550, 548, 3, 2, 2, 2,
283283
551, 552, 5, 132, 66, 2, 552, 553, 5, 116, 58, 2, 553, 554, 5, 132, 66,
284284
2, 554, 556, 3, 2, 2, 2, 555, 544, 3, 2, 2, 2, 555, 551, 3, 2, 2, 2, 556,
285-
117, 3, 2, 2, 2, 557, 558, 5, 122, 61, 2, 558, 119, 3, 2, 2, 2, 559, 564,
286-
5, 122, 61, 2, 560, 564, 5, 124, 62, 2, 561, 564, 5, 130, 65, 2, 562, 564,
287-
5, 128, 64, 2, 563, 559, 3, 2, 2, 2, 563, 560, 3, 2, 2, 2, 563, 561, 3,
288-
2, 2, 2, 563, 562, 3, 2, 2, 2, 564, 121, 3, 2, 2, 2, 565, 566, 9, 28, 2,
289-
2, 566, 123, 3, 2, 2, 2, 567, 568, 9, 29, 2, 2, 568, 125, 3, 2, 2, 2, 569,
290-
570, 7, 37, 2, 2, 570, 127, 3, 2, 2, 2, 571, 572, 7, 38, 2, 2, 572, 129,
291-
3, 2, 2, 2, 573, 574, 7, 97, 2, 2, 574, 131, 3, 2, 2, 2, 575, 576, 7, 36,
292-
2, 2, 576, 133, 3, 2, 2, 2, 577, 578, 7, 39, 2, 2, 578, 135, 3, 2, 2, 2,
293-
579, 580, 7, 40, 2, 2, 580, 137, 3, 2, 2, 2, 581, 582, 7, 41, 2, 2, 582,
294-
139, 3, 2, 2, 2, 583, 584, 7, 42, 2, 2, 584, 141, 3, 2, 2, 2, 585, 586,
295-
7, 43, 2, 2, 586, 143, 3, 2, 2, 2, 587, 588, 7, 93, 2, 2, 588, 145, 3,
296-
2, 2, 2, 589, 590, 7, 95, 2, 2, 590, 147, 3, 2, 2, 2, 591, 592, 7, 44,
297-
2, 2, 592, 149, 3, 2, 2, 2, 593, 594, 7, 45, 2, 2, 594, 151, 3, 2, 2, 2,
298-
595, 596, 7, 46, 2, 2, 596, 153, 3, 2, 2, 2, 597, 598, 7, 47, 2, 2, 598,
299-
155, 3, 2, 2, 2, 599, 600, 7, 48, 2, 2, 600, 157, 3, 2, 2, 2, 601, 602,
300-
7, 49, 2, 2, 602, 159, 3, 2, 2, 2, 603, 604, 7, 96, 2, 2, 604, 161, 3,
301-
2, 2, 2, 605, 606, 7, 126, 2, 2, 606, 607, 7, 126, 2, 2, 607, 163, 3, 2,
302-
2, 2, 608, 609, 7, 60, 2, 2, 609, 165, 3, 2, 2, 2, 610, 611, 7, 61, 2,
303-
2, 611, 167, 3, 2, 2, 2, 612, 613, 7, 65, 2, 2, 613, 169, 3, 2, 2, 2, 614,
304-
615, 7, 126, 2, 2, 615, 171, 3, 2, 2, 2, 616, 617, 4, 50, 51, 2, 617, 173,
305-
3, 2, 2, 2, 618, 626, 5, 124, 62, 2, 619, 626, 5, 4, 2, 2, 620, 626, 5,
306-
6, 3, 2, 621, 626, 5, 8, 4, 2, 622, 626, 5, 10, 5, 2, 623, 626, 5, 12,
307-
6, 2, 624, 626, 5, 14, 7, 2, 625, 618, 3, 2, 2, 2, 625, 619, 3, 2, 2, 2,
308-
625, 620, 3, 2, 2, 2, 625, 621, 3, 2, 2, 2, 625, 622, 3, 2, 2, 2, 625,
309-
623, 3, 2, 2, 2, 625, 624, 3, 2, 2, 2, 626, 175, 3, 2, 2, 2, 627, 630,
310-
5, 180, 90, 2, 628, 630, 5, 182, 91, 2, 629, 627, 3, 2, 2, 2, 629, 628,
311-
3, 2, 2, 2, 630, 177, 3, 2, 2, 2, 631, 633, 5, 192, 96, 2, 632, 631, 3,
312-
2, 2, 2, 632, 633, 3, 2, 2, 2, 633, 634, 3, 2, 2, 2, 634, 637, 5, 180,
313-
90, 2, 635, 637, 5, 182, 91, 2, 636, 632, 3, 2, 2, 2, 636, 635, 3, 2, 2,
314-
2, 637, 179, 3, 2, 2, 2, 638, 643, 5, 190, 95, 2, 639, 641, 5, 156, 78,
315-
2, 640, 642, 5, 190, 95, 2, 641, 640, 3, 2, 2, 2, 641, 642, 3, 2, 2, 2,
316-
642, 644, 3, 2, 2, 2, 643, 639, 3, 2, 2, 2, 643, 644, 3, 2, 2, 2, 644,
317-
649, 3, 2, 2, 2, 645, 646, 5, 156, 78, 2, 646, 647, 5, 190, 95, 2, 647,
318-
649, 3, 2, 2, 2, 648, 638, 3, 2, 2, 2, 648, 645, 3, 2, 2, 2, 649, 181,
319-
3, 2, 2, 2, 650, 651, 5, 184, 92, 2, 651, 652, 9, 6, 2, 2, 652, 653, 5,
320-
186, 93, 2, 653, 183, 3, 2, 2, 2, 654, 655, 5, 180, 90, 2, 655, 185, 3,
321-
2, 2, 2, 656, 657, 5, 188, 94, 2, 657, 187, 3, 2, 2, 2, 658, 660, 5, 192,
322-
96, 2, 659, 658, 3, 2, 2, 2, 659, 660, 3, 2, 2, 2, 660, 661, 3, 2, 2, 2,
323-
661, 662, 5, 190, 95, 2, 662, 189, 3, 2, 2, 2, 663, 665, 5, 124, 62, 2,
324-
664, 663, 3, 2, 2, 2, 665, 666, 3, 2, 2, 2, 666, 664, 3, 2, 2, 2, 666,
325-
667, 3, 2, 2, 2, 667, 191, 3, 2, 2, 2, 668, 671, 5, 150, 75, 2, 669, 671,
326-
5, 154, 77, 2, 670, 668, 3, 2, 2, 2, 670, 669, 3, 2, 2, 2, 671, 193, 3,
327-
2, 2, 2, 672, 673, 5, 196, 98, 2, 673, 195, 3, 2, 2, 2, 674, 684, 5, 198,
328-
99, 2, 675, 676, 5, 198, 99, 2, 676, 677, 7, 86, 2, 2, 677, 678, 5, 206,
329-
103, 2, 678, 684, 3, 2, 2, 2, 679, 680, 5, 216, 108, 2, 680, 681, 5, 140,
330-
70, 2, 681, 682, 5, 142, 71, 2, 682, 684, 3, 2, 2, 2, 683, 674, 3, 2, 2,
331-
2, 683, 675, 3, 2, 2, 2, 683, 679, 3, 2, 2, 2, 684, 197, 3, 2, 2, 2, 685,
332-
686, 5, 200, 100, 2, 686, 687, 7, 47, 2, 2, 687, 688, 5, 202, 101, 2, 688,
333-
689, 7, 47, 2, 2, 689, 690, 5, 204, 102, 2, 690, 199, 3, 2, 2, 2, 691,
334-
692, 5, 124, 62, 2, 692, 693, 5, 124, 62, 2, 693, 694, 5, 124, 62, 2, 694,
335-
695, 5, 124, 62, 2, 695, 201, 3, 2, 2, 2, 696, 697, 5, 124, 62, 2, 697,
336-
698, 5, 124, 62, 2, 698, 203, 3, 2, 2, 2, 699, 700, 5, 124, 62, 2, 700,
337-
701, 5, 124, 62, 2, 701, 205, 3, 2, 2, 2, 702, 703, 5, 210, 105, 2, 703,
338-
704, 7, 60, 2, 2, 704, 707, 5, 212, 106, 2, 705, 706, 7, 60, 2, 2, 706,
339-
708, 5, 214, 107, 2, 707, 705, 3, 2, 2, 2, 707, 708, 3, 2, 2, 2, 708, 710,
340-
3, 2, 2, 2, 709, 711, 5, 208, 104, 2, 710, 709, 3, 2, 2, 2, 710, 711, 3,
341-
2, 2, 2, 711, 207, 3, 2, 2, 2, 712, 719, 7, 92, 2, 2, 713, 714, 5, 192,
342-
96, 2, 714, 715, 5, 210, 105, 2, 715, 716, 7, 60, 2, 2, 716, 717, 5, 212,
343-
106, 2, 717, 719, 3, 2, 2, 2, 718, 712, 3, 2, 2, 2, 718, 713, 3, 2, 2,
344-
2, 719, 209, 3, 2, 2, 2, 720, 721, 5, 124, 62, 2, 721, 722, 5, 124, 62,
345-
2, 722, 211, 3, 2, 2, 2, 723, 724, 5, 124, 62, 2, 724, 725, 5, 124, 62,
346-
2, 725, 213, 3, 2, 2, 2, 726, 727, 5, 124, 62, 2, 727, 734, 5, 124, 62,
347-
2, 728, 730, 5, 156, 78, 2, 729, 731, 5, 124, 62, 2, 730, 729, 3, 2, 2,
348-
2, 731, 732, 3, 2, 2, 2, 732, 730, 3, 2, 2, 2, 732, 733, 3, 2, 2, 2, 733,
349-
735, 3, 2, 2, 2, 734, 728, 3, 2, 2, 2, 734, 735, 3, 2, 2, 2, 735, 215,
350-
3, 2, 2, 2, 736, 737, 5, 30, 15, 2, 737, 738, 5, 32, 16, 2, 738, 739, 5,
351-
48, 24, 2, 739, 217, 3, 2, 2, 2, 740, 742, 9, 30, 2, 2, 741, 740, 3, 2,
352-
2, 2, 742, 743, 3, 2, 2, 2, 743, 741, 3, 2, 2, 2, 743, 744, 3, 2, 2, 2,
353-
744, 745, 3, 2, 2, 2, 745, 746, 8, 109, 4, 2, 746, 219, 3, 2, 2, 2, 747,
354-
748, 7, 41, 2, 2, 748, 749, 3, 2, 2, 2, 749, 750, 8, 110, 5, 2, 750, 221,
355-
3, 2, 2, 2, 751, 752, 7, 41, 2, 2, 752, 753, 7, 41, 2, 2, 753, 754, 3,
356-
2, 2, 2, 754, 755, 8, 111, 2, 2, 755, 223, 3, 2, 2, 2, 756, 757, 10, 31,
357-
2, 2, 757, 758, 3, 2, 2, 2, 758, 759, 8, 112, 2, 2, 759, 225, 3, 2, 2,
358-
2, 29, 2, 3, 284, 312, 362, 432, 537, 548, 555, 563, 625, 629, 632, 636,
359-
641, 643, 648, 659, 666, 670, 683, 707, 710, 718, 732, 734, 743, 6, 5,
360-
2, 2, 4, 3, 2, 8, 2, 2, 4, 2, 2,
285+
117, 3, 2, 2, 2, 557, 558, 5, 122, 61, 2, 558, 119, 3, 2, 2, 2, 559, 565,
286+
5, 122, 61, 2, 560, 565, 5, 124, 62, 2, 561, 565, 5, 130, 65, 2, 562, 565,
287+
5, 128, 64, 2, 563, 565, 5, 164, 82, 2, 564, 559, 3, 2, 2, 2, 564, 560,
288+
3, 2, 2, 2, 564, 561, 3, 2, 2, 2, 564, 562, 3, 2, 2, 2, 564, 563, 3, 2,
289+
2, 2, 565, 121, 3, 2, 2, 2, 566, 567, 9, 28, 2, 2, 567, 123, 3, 2, 2, 2,
290+
568, 569, 9, 29, 2, 2, 569, 125, 3, 2, 2, 2, 570, 571, 7, 37, 2, 2, 571,
291+
127, 3, 2, 2, 2, 572, 573, 7, 38, 2, 2, 573, 129, 3, 2, 2, 2, 574, 575,
292+
7, 97, 2, 2, 575, 131, 3, 2, 2, 2, 576, 577, 7, 36, 2, 2, 577, 133, 3,
293+
2, 2, 2, 578, 579, 7, 39, 2, 2, 579, 135, 3, 2, 2, 2, 580, 581, 7, 40,
294+
2, 2, 581, 137, 3, 2, 2, 2, 582, 583, 7, 41, 2, 2, 583, 139, 3, 2, 2, 2,
295+
584, 585, 7, 42, 2, 2, 585, 141, 3, 2, 2, 2, 586, 587, 7, 43, 2, 2, 587,
296+
143, 3, 2, 2, 2, 588, 589, 7, 93, 2, 2, 589, 145, 3, 2, 2, 2, 590, 591,
297+
7, 95, 2, 2, 591, 147, 3, 2, 2, 2, 592, 593, 7, 44, 2, 2, 593, 149, 3,
298+
2, 2, 2, 594, 595, 7, 45, 2, 2, 595, 151, 3, 2, 2, 2, 596, 597, 7, 46,
299+
2, 2, 597, 153, 3, 2, 2, 2, 598, 599, 7, 47, 2, 2, 599, 155, 3, 2, 2, 2,
300+
600, 601, 7, 48, 2, 2, 601, 157, 3, 2, 2, 2, 602, 603, 7, 49, 2, 2, 603,
301+
159, 3, 2, 2, 2, 604, 605, 7, 96, 2, 2, 605, 161, 3, 2, 2, 2, 606, 607,
302+
7, 126, 2, 2, 607, 608, 7, 126, 2, 2, 608, 163, 3, 2, 2, 2, 609, 610, 7,
303+
60, 2, 2, 610, 165, 3, 2, 2, 2, 611, 612, 7, 61, 2, 2, 612, 167, 3, 2,
304+
2, 2, 613, 614, 7, 65, 2, 2, 614, 169, 3, 2, 2, 2, 615, 616, 7, 126, 2,
305+
2, 616, 171, 3, 2, 2, 2, 617, 618, 4, 50, 51, 2, 618, 173, 3, 2, 2, 2,
306+
619, 627, 5, 124, 62, 2, 620, 627, 5, 4, 2, 2, 621, 627, 5, 6, 3, 2, 622,
307+
627, 5, 8, 4, 2, 623, 627, 5, 10, 5, 2, 624, 627, 5, 12, 6, 2, 625, 627,
308+
5, 14, 7, 2, 626, 619, 3, 2, 2, 2, 626, 620, 3, 2, 2, 2, 626, 621, 3, 2,
309+
2, 2, 626, 622, 3, 2, 2, 2, 626, 623, 3, 2, 2, 2, 626, 624, 3, 2, 2, 2,
310+
626, 625, 3, 2, 2, 2, 627, 175, 3, 2, 2, 2, 628, 631, 5, 180, 90, 2, 629,
311+
631, 5, 182, 91, 2, 630, 628, 3, 2, 2, 2, 630, 629, 3, 2, 2, 2, 631, 177,
312+
3, 2, 2, 2, 632, 634, 5, 192, 96, 2, 633, 632, 3, 2, 2, 2, 633, 634, 3,
313+
2, 2, 2, 634, 635, 3, 2, 2, 2, 635, 638, 5, 180, 90, 2, 636, 638, 5, 182,
314+
91, 2, 637, 633, 3, 2, 2, 2, 637, 636, 3, 2, 2, 2, 638, 179, 3, 2, 2, 2,
315+
639, 644, 5, 190, 95, 2, 640, 642, 5, 156, 78, 2, 641, 643, 5, 190, 95,
316+
2, 642, 641, 3, 2, 2, 2, 642, 643, 3, 2, 2, 2, 643, 645, 3, 2, 2, 2, 644,
317+
640, 3, 2, 2, 2, 644, 645, 3, 2, 2, 2, 645, 650, 3, 2, 2, 2, 646, 647,
318+
5, 156, 78, 2, 647, 648, 5, 190, 95, 2, 648, 650, 3, 2, 2, 2, 649, 639,
319+
3, 2, 2, 2, 649, 646, 3, 2, 2, 2, 650, 181, 3, 2, 2, 2, 651, 652, 5, 184,
320+
92, 2, 652, 653, 9, 6, 2, 2, 653, 654, 5, 186, 93, 2, 654, 183, 3, 2, 2,
321+
2, 655, 656, 5, 180, 90, 2, 656, 185, 3, 2, 2, 2, 657, 658, 5, 188, 94,
322+
2, 658, 187, 3, 2, 2, 2, 659, 661, 5, 192, 96, 2, 660, 659, 3, 2, 2, 2,
323+
660, 661, 3, 2, 2, 2, 661, 662, 3, 2, 2, 2, 662, 663, 5, 190, 95, 2, 663,
324+
189, 3, 2, 2, 2, 664, 666, 5, 124, 62, 2, 665, 664, 3, 2, 2, 2, 666, 667,
325+
3, 2, 2, 2, 667, 665, 3, 2, 2, 2, 667, 668, 3, 2, 2, 2, 668, 191, 3, 2,
326+
2, 2, 669, 672, 5, 150, 75, 2, 670, 672, 5, 154, 77, 2, 671, 669, 3, 2,
327+
2, 2, 671, 670, 3, 2, 2, 2, 672, 193, 3, 2, 2, 2, 673, 674, 5, 196, 98,
328+
2, 674, 195, 3, 2, 2, 2, 675, 685, 5, 198, 99, 2, 676, 677, 5, 198, 99,
329+
2, 677, 678, 7, 86, 2, 2, 678, 679, 5, 206, 103, 2, 679, 685, 3, 2, 2,
330+
2, 680, 681, 5, 216, 108, 2, 681, 682, 5, 140, 70, 2, 682, 683, 5, 142,
331+
71, 2, 683, 685, 3, 2, 2, 2, 684, 675, 3, 2, 2, 2, 684, 676, 3, 2, 2, 2,
332+
684, 680, 3, 2, 2, 2, 685, 197, 3, 2, 2, 2, 686, 687, 5, 200, 100, 2, 687,
333+
688, 7, 47, 2, 2, 688, 689, 5, 202, 101, 2, 689, 690, 7, 47, 2, 2, 690,
334+
691, 5, 204, 102, 2, 691, 199, 3, 2, 2, 2, 692, 693, 5, 124, 62, 2, 693,
335+
694, 5, 124, 62, 2, 694, 695, 5, 124, 62, 2, 695, 696, 5, 124, 62, 2, 696,
336+
201, 3, 2, 2, 2, 697, 698, 5, 124, 62, 2, 698, 699, 5, 124, 62, 2, 699,
337+
203, 3, 2, 2, 2, 700, 701, 5, 124, 62, 2, 701, 702, 5, 124, 62, 2, 702,
338+
205, 3, 2, 2, 2, 703, 704, 5, 210, 105, 2, 704, 705, 7, 60, 2, 2, 705,
339+
708, 5, 212, 106, 2, 706, 707, 7, 60, 2, 2, 707, 709, 5, 214, 107, 2, 708,
340+
706, 3, 2, 2, 2, 708, 709, 3, 2, 2, 2, 709, 711, 3, 2, 2, 2, 710, 712,
341+
5, 208, 104, 2, 711, 710, 3, 2, 2, 2, 711, 712, 3, 2, 2, 2, 712, 207, 3,
342+
2, 2, 2, 713, 720, 7, 92, 2, 2, 714, 715, 5, 192, 96, 2, 715, 716, 5, 210,
343+
105, 2, 716, 717, 7, 60, 2, 2, 717, 718, 5, 212, 106, 2, 718, 720, 3, 2,
344+
2, 2, 719, 713, 3, 2, 2, 2, 719, 714, 3, 2, 2, 2, 720, 209, 3, 2, 2, 2,
345+
721, 722, 5, 124, 62, 2, 722, 723, 5, 124, 62, 2, 723, 211, 3, 2, 2, 2,
346+
724, 725, 5, 124, 62, 2, 725, 726, 5, 124, 62, 2, 726, 213, 3, 2, 2, 2,
347+
727, 728, 5, 124, 62, 2, 728, 735, 5, 124, 62, 2, 729, 731, 5, 156, 78,
348+
2, 730, 732, 5, 124, 62, 2, 731, 730, 3, 2, 2, 2, 732, 733, 3, 2, 2, 2,
349+
733, 731, 3, 2, 2, 2, 733, 734, 3, 2, 2, 2, 734, 736, 3, 2, 2, 2, 735,
350+
729, 3, 2, 2, 2, 735, 736, 3, 2, 2, 2, 736, 215, 3, 2, 2, 2, 737, 738,
351+
5, 30, 15, 2, 738, 739, 5, 32, 16, 2, 739, 740, 5, 48, 24, 2, 740, 217,
352+
3, 2, 2, 2, 741, 743, 9, 30, 2, 2, 742, 741, 3, 2, 2, 2, 743, 744, 3, 2,
353+
2, 2, 744, 742, 3, 2, 2, 2, 744, 745, 3, 2, 2, 2, 745, 746, 3, 2, 2, 2,
354+
746, 747, 8, 109, 4, 2, 747, 219, 3, 2, 2, 2, 748, 749, 7, 41, 2, 2, 749,
355+
750, 3, 2, 2, 2, 750, 751, 8, 110, 5, 2, 751, 221, 3, 2, 2, 2, 752, 753,
356+
7, 41, 2, 2, 753, 754, 7, 41, 2, 2, 754, 755, 3, 2, 2, 2, 755, 756, 8,
357+
111, 2, 2, 756, 223, 3, 2, 2, 2, 757, 758, 10, 31, 2, 2, 758, 759, 3, 2,
358+
2, 2, 759, 760, 8, 112, 2, 2, 760, 225, 3, 2, 2, 2, 29, 2, 3, 284, 312,
359+
362, 432, 537, 548, 555, 564, 626, 630, 633, 637, 642, 644, 649, 660, 667,
360+
671, 684, 708, 711, 719, 733, 735, 744, 6, 5, 2, 2, 4, 3, 2, 8, 2, 2, 4,
361+
2, 2,
361362
}
362363

363364
var lexerDeserializer = antlr.NewATNDeserializer(nil)

0 commit comments

Comments
 (0)