queryparser-python3 0.7.1__py3-none-any.whl → 0.7.2__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -10,7 +10,7 @@ else:
10
10
 
11
11
  def serializedATN():
12
12
  return [
13
- 4,1,228,1170,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,
13
+ 4,1,238,1170,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,
14
14
  7,6,2,7,7,7,2,8,7,8,2,9,7,9,2,10,7,10,2,11,7,11,2,12,7,12,2,13,7,
15
15
  13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,7,17,2,18,7,18,2,19,7,19,2,
16
16
  20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,2,24,7,24,2,25,7,25,2,26,7,
@@ -115,63 +115,63 @@ def serializedATN():
115
115
  78,80,82,84,86,88,90,92,94,96,98,100,102,104,106,108,110,112,114,
116
116
  116,118,120,122,124,126,128,130,132,134,136,138,140,142,144,146,
117
117
  148,150,152,154,156,158,160,162,164,166,168,170,172,174,176,178,
118
- 180,182,184,186,188,190,192,194,196,198,0,24,2,0,186,189,207,208,
119
- 2,0,51,51,140,140,1,0,201,202,2,0,220,220,223,223,9,0,15,15,25,28,
120
- 73,74,79,81,110,113,117,118,133,133,145,145,159,159,9,0,10,10,14,
121
- 14,16,16,32,32,82,82,85,85,128,130,134,134,152,154,21,0,1,2,6,6,
118
+ 180,182,184,186,188,190,192,194,196,198,0,24,2,0,196,199,217,218,
119
+ 2,0,51,51,140,140,1,0,211,212,2,0,230,230,233,233,9,0,15,15,25,28,
120
+ 73,74,79,81,110,113,117,118,133,133,155,155,169,169,9,0,10,10,14,
121
+ 14,16,16,32,32,82,82,85,85,128,130,134,134,162,164,21,0,1,2,6,6,
122
122
  8,9,21,23,30,31,39,39,41,41,49,49,54,54,77,78,86,86,101,101,103,
123
123
  104,106,107,115,115,122,122,124,124,126,127,131,131,136,136,141,
124
- 141,2,0,45,45,83,83,6,0,34,35,91,91,119,119,138,139,148,150,158,
125
- 158,2,0,58,58,100,100,2,0,3,3,42,42,2,0,62,62,75,75,2,0,68,68,90,
126
- 90,1,0,190,191,3,0,180,181,196,196,206,206,3,0,13,13,184,185,201,
127
- 203,3,0,3,3,42,42,196,196,2,0,5,5,40,40,2,0,63,63,71,71,2,0,52,52,
128
- 72,72,1,0,207,208,4,0,33,33,64,64,73,73,113,113,2,0,73,73,113,113,
129
- 3,0,183,184,203,203,209,215,1278,0,200,1,0,0,0,2,234,1,0,0,0,4,236,
130
- 1,0,0,0,6,238,1,0,0,0,8,240,1,0,0,0,10,243,1,0,0,0,12,247,1,0,0,
131
- 0,14,249,1,0,0,0,16,251,1,0,0,0,18,253,1,0,0,0,20,255,1,0,0,0,22,
132
- 257,1,0,0,0,24,259,1,0,0,0,26,261,1,0,0,0,28,263,1,0,0,0,30,272,
133
- 1,0,0,0,32,280,1,0,0,0,34,282,1,0,0,0,36,320,1,0,0,0,38,324,1,0,
134
- 0,0,40,343,1,0,0,0,42,345,1,0,0,0,44,361,1,0,0,0,46,365,1,0,0,0,
135
- 48,375,1,0,0,0,50,386,1,0,0,0,52,396,1,0,0,0,54,418,1,0,0,0,56,428,
136
- 1,0,0,0,58,430,1,0,0,0,60,439,1,0,0,0,62,443,1,0,0,0,64,461,1,0,
137
- 0,0,66,469,1,0,0,0,68,480,1,0,0,0,70,485,1,0,0,0,72,490,1,0,0,0,
138
- 74,498,1,0,0,0,76,507,1,0,0,0,78,567,1,0,0,0,80,569,1,0,0,0,82,586,
139
- 1,0,0,0,84,591,1,0,0,0,86,614,1,0,0,0,88,616,1,0,0,0,90,624,1,0,
140
- 0,0,92,626,1,0,0,0,94,634,1,0,0,0,96,645,1,0,0,0,98,652,1,0,0,0,
141
- 100,665,1,0,0,0,102,667,1,0,0,0,104,669,1,0,0,0,106,672,1,0,0,0,
142
- 108,674,1,0,0,0,110,698,1,0,0,0,112,700,1,0,0,0,114,705,1,0,0,0,
143
- 116,707,1,0,0,0,118,716,1,0,0,0,120,747,1,0,0,0,122,755,1,0,0,0,
144
- 124,761,1,0,0,0,126,764,1,0,0,0,128,795,1,0,0,0,130,797,1,0,0,0,
145
- 132,805,1,0,0,0,134,827,1,0,0,0,136,836,1,0,0,0,138,840,1,0,0,0,
146
- 140,870,1,0,0,0,142,872,1,0,0,0,144,874,1,0,0,0,146,888,1,0,0,0,
147
- 148,897,1,0,0,0,150,911,1,0,0,0,152,932,1,0,0,0,154,934,1,0,0,0,
148
- 156,945,1,0,0,0,158,949,1,0,0,0,160,958,1,0,0,0,162,961,1,0,0,0,
149
- 164,1037,1,0,0,0,166,1039,1,0,0,0,168,1046,1,0,0,0,170,1067,1,0,
150
- 0,0,172,1069,1,0,0,0,174,1080,1,0,0,0,176,1098,1,0,0,0,178,1107,
124
+ 141,2,0,45,45,83,83,6,0,34,35,91,91,119,119,138,139,158,160,168,
125
+ 168,3,0,58,58,100,100,142,151,2,0,3,3,42,42,2,0,62,62,75,75,2,0,
126
+ 68,68,90,90,1,0,200,201,3,0,190,191,206,206,216,216,3,0,13,13,194,
127
+ 195,211,213,3,0,3,3,42,42,206,206,2,0,5,5,40,40,2,0,63,63,71,71,
128
+ 2,0,52,52,72,72,1,0,217,218,4,0,33,33,64,64,73,73,113,113,2,0,73,
129
+ 73,113,113,3,0,193,194,213,213,219,225,1278,0,200,1,0,0,0,2,234,
130
+ 1,0,0,0,4,236,1,0,0,0,6,238,1,0,0,0,8,240,1,0,0,0,10,243,1,0,0,0,
131
+ 12,247,1,0,0,0,14,249,1,0,0,0,16,251,1,0,0,0,18,253,1,0,0,0,20,255,
132
+ 1,0,0,0,22,257,1,0,0,0,24,259,1,0,0,0,26,261,1,0,0,0,28,263,1,0,
133
+ 0,0,30,272,1,0,0,0,32,280,1,0,0,0,34,282,1,0,0,0,36,320,1,0,0,0,
134
+ 38,324,1,0,0,0,40,343,1,0,0,0,42,345,1,0,0,0,44,361,1,0,0,0,46,365,
135
+ 1,0,0,0,48,375,1,0,0,0,50,386,1,0,0,0,52,396,1,0,0,0,54,418,1,0,
136
+ 0,0,56,428,1,0,0,0,58,430,1,0,0,0,60,439,1,0,0,0,62,443,1,0,0,0,
137
+ 64,461,1,0,0,0,66,469,1,0,0,0,68,480,1,0,0,0,70,485,1,0,0,0,72,490,
138
+ 1,0,0,0,74,498,1,0,0,0,76,507,1,0,0,0,78,567,1,0,0,0,80,569,1,0,
139
+ 0,0,82,586,1,0,0,0,84,591,1,0,0,0,86,614,1,0,0,0,88,616,1,0,0,0,
140
+ 90,624,1,0,0,0,92,626,1,0,0,0,94,634,1,0,0,0,96,645,1,0,0,0,98,652,
141
+ 1,0,0,0,100,665,1,0,0,0,102,667,1,0,0,0,104,669,1,0,0,0,106,672,
142
+ 1,0,0,0,108,674,1,0,0,0,110,698,1,0,0,0,112,700,1,0,0,0,114,705,
143
+ 1,0,0,0,116,707,1,0,0,0,118,716,1,0,0,0,120,747,1,0,0,0,122,755,
144
+ 1,0,0,0,124,761,1,0,0,0,126,764,1,0,0,0,128,795,1,0,0,0,130,797,
145
+ 1,0,0,0,132,805,1,0,0,0,134,827,1,0,0,0,136,836,1,0,0,0,138,840,
146
+ 1,0,0,0,140,870,1,0,0,0,142,872,1,0,0,0,144,874,1,0,0,0,146,888,
147
+ 1,0,0,0,148,897,1,0,0,0,150,911,1,0,0,0,152,932,1,0,0,0,154,934,
148
+ 1,0,0,0,156,945,1,0,0,0,158,949,1,0,0,0,160,958,1,0,0,0,162,961,
149
+ 1,0,0,0,164,1037,1,0,0,0,166,1039,1,0,0,0,168,1046,1,0,0,0,170,1067,
150
+ 1,0,0,0,172,1069,1,0,0,0,174,1080,1,0,0,0,176,1098,1,0,0,0,178,1107,
151
151
  1,0,0,0,180,1109,1,0,0,0,182,1120,1,0,0,0,184,1125,1,0,0,0,186,1130,
152
152
  1,0,0,0,188,1135,1,0,0,0,190,1140,1,0,0,0,192,1145,1,0,0,0,194,1150,
153
153
  1,0,0,0,196,1155,1,0,0,0,198,1167,1,0,0,0,200,201,7,0,0,0,201,1,
154
- 1,0,0,0,202,206,5,13,0,0,203,204,5,198,0,0,204,205,5,220,0,0,205,
155
- 207,5,197,0,0,206,203,1,0,0,0,206,207,1,0,0,0,207,235,1,0,0,0,208,
156
- 212,5,24,0,0,209,210,5,198,0,0,210,211,5,220,0,0,211,213,5,197,0,
154
+ 1,0,0,0,202,206,5,13,0,0,203,204,5,208,0,0,204,205,5,230,0,0,205,
155
+ 207,5,207,0,0,206,203,1,0,0,0,206,207,1,0,0,0,207,235,1,0,0,0,208,
156
+ 212,5,24,0,0,209,210,5,208,0,0,210,211,5,230,0,0,211,213,5,207,0,
157
157
  0,212,209,1,0,0,0,212,213,1,0,0,0,213,235,1,0,0,0,214,235,5,35,0,
158
158
  0,215,235,5,36,0,0,216,235,5,138,0,0,217,235,5,139,0,0,218,235,5,
159
- 66,0,0,219,227,5,38,0,0,220,221,5,198,0,0,221,224,5,220,0,0,222,
160
- 223,5,195,0,0,223,225,5,220,0,0,224,222,1,0,0,0,224,225,1,0,0,0,
161
- 225,226,1,0,0,0,226,228,5,197,0,0,227,220,1,0,0,0,227,228,1,0,0,
159
+ 66,0,0,219,227,5,38,0,0,220,221,5,208,0,0,221,224,5,230,0,0,222,
160
+ 223,5,205,0,0,223,225,5,230,0,0,224,222,1,0,0,0,224,225,1,0,0,0,
161
+ 225,226,1,0,0,0,226,228,5,207,0,0,227,220,1,0,0,0,227,228,1,0,0,
162
162
  0,228,235,1,0,0,0,229,235,5,65,0,0,230,235,5,12,0,0,231,235,5,53,
163
163
  0,0,232,235,5,108,0,0,233,235,5,43,0,0,234,202,1,0,0,0,234,208,1,
164
164
  0,0,0,234,214,1,0,0,0,234,215,1,0,0,0,234,216,1,0,0,0,234,217,1,
165
165
  0,0,0,234,218,1,0,0,0,234,219,1,0,0,0,234,229,1,0,0,0,234,230,1,
166
166
  0,0,0,234,231,1,0,0,0,234,232,1,0,0,0,234,233,1,0,0,0,235,3,1,0,
167
- 0,0,236,237,5,222,0,0,237,5,1,0,0,0,238,239,7,1,0,0,239,7,1,0,0,
168
- 0,240,241,5,221,0,0,241,9,1,0,0,0,242,244,7,2,0,0,243,242,1,0,0,
167
+ 0,0,236,237,5,232,0,0,237,5,1,0,0,0,238,239,7,1,0,0,239,7,1,0,0,
168
+ 0,240,241,5,231,0,0,241,9,1,0,0,0,242,244,7,2,0,0,243,242,1,0,0,
169
169
  0,243,244,1,0,0,0,244,245,1,0,0,0,245,246,7,3,0,0,246,11,1,0,0,0,
170
- 247,248,5,225,0,0,248,13,1,0,0,0,249,250,7,4,0,0,250,15,1,0,0,0,
170
+ 247,248,5,235,0,0,248,13,1,0,0,0,249,250,7,4,0,0,250,15,1,0,0,0,
171
171
  251,252,7,5,0,0,252,17,1,0,0,0,253,254,7,6,0,0,254,19,1,0,0,0,255,
172
172
  256,7,7,0,0,256,21,1,0,0,0,257,258,7,8,0,0,258,23,1,0,0,0,259,260,
173
- 5,171,0,0,260,25,1,0,0,0,261,262,7,9,0,0,262,27,1,0,0,0,263,264,
174
- 5,170,0,0,264,29,1,0,0,0,265,273,3,18,9,0,266,273,3,14,7,0,267,273,
173
+ 5,181,0,0,260,25,1,0,0,0,261,262,7,9,0,0,262,27,1,0,0,0,263,264,
174
+ 5,180,0,0,264,29,1,0,0,0,265,273,3,18,9,0,266,273,3,14,7,0,267,273,
175
175
  3,22,11,0,268,273,3,20,10,0,269,273,3,28,14,0,270,273,3,24,12,0,
176
176
  271,273,3,26,13,0,272,265,1,0,0,0,272,266,1,0,0,0,272,267,1,0,0,
177
177
  0,272,268,1,0,0,0,272,269,1,0,0,0,272,270,1,0,0,0,272,271,1,0,0,
@@ -188,11 +188,11 @@ def serializedATN():
188
188
  302,1,0,0,0,302,304,1,0,0,0,303,305,3,108,54,0,304,303,1,0,0,0,304,
189
189
  305,1,0,0,0,305,307,1,0,0,0,306,308,3,100,50,0,307,306,1,0,0,0,307,
190
190
  308,1,0,0,0,308,310,1,0,0,0,309,311,3,104,52,0,310,309,1,0,0,0,310,
191
- 311,1,0,0,0,311,314,1,0,0,0,312,313,5,55,0,0,313,315,5,144,0,0,314,
192
- 312,1,0,0,0,314,315,1,0,0,0,315,317,1,0,0,0,316,318,5,192,0,0,317,
191
+ 311,1,0,0,0,311,314,1,0,0,0,312,313,5,55,0,0,313,315,5,154,0,0,314,
192
+ 312,1,0,0,0,314,315,1,0,0,0,315,317,1,0,0,0,316,318,5,202,0,0,317,
193
193
  316,1,0,0,0,317,318,1,0,0,0,318,35,1,0,0,0,319,321,5,7,0,0,320,319,
194
- 1,0,0,0,320,321,1,0,0,0,321,322,1,0,0,0,322,323,5,226,0,0,323,37,
195
- 1,0,0,0,324,327,3,68,34,0,325,326,5,204,0,0,326,328,3,68,34,0,327,
194
+ 1,0,0,0,320,321,1,0,0,0,321,322,1,0,0,0,322,323,5,236,0,0,323,37,
195
+ 1,0,0,0,324,327,3,68,34,0,325,326,5,214,0,0,326,328,3,68,34,0,327,
196
196
  325,1,0,0,0,327,328,1,0,0,0,328,39,1,0,0,0,329,336,3,122,61,0,330,
197
197
  332,3,0,0,0,331,333,5,4,0,0,332,331,1,0,0,0,332,333,1,0,0,0,333,
198
198
  334,1,0,0,0,334,335,3,122,61,0,335,337,1,0,0,0,336,330,1,0,0,0,336,
@@ -202,23 +202,23 @@ def serializedATN():
202
202
  346,349,3,44,22,0,347,349,3,46,23,0,348,346,1,0,0,0,348,347,1,0,
203
203
  0,0,349,352,1,0,0,0,350,351,5,44,0,0,351,353,3,38,19,0,352,350,1,
204
204
  0,0,0,352,353,1,0,0,0,353,354,1,0,0,0,354,355,5,46,0,0,355,43,1,
205
- 0,0,0,356,357,5,155,0,0,357,358,3,64,32,0,358,359,5,137,0,0,359,
205
+ 0,0,0,356,357,5,165,0,0,357,358,3,64,32,0,358,359,5,137,0,0,359,
206
206
  360,3,38,19,0,360,362,1,0,0,0,361,356,1,0,0,0,362,363,1,0,0,0,363,
207
207
  361,1,0,0,0,363,364,1,0,0,0,364,45,1,0,0,0,365,371,3,38,19,0,366,
208
- 367,5,155,0,0,367,368,3,38,19,0,368,369,5,137,0,0,369,370,3,38,19,
208
+ 367,5,165,0,0,367,368,3,38,19,0,368,369,5,137,0,0,369,370,3,38,19,
209
209
  0,370,372,1,0,0,0,371,366,1,0,0,0,372,373,1,0,0,0,373,371,1,0,0,
210
- 0,373,374,1,0,0,0,374,47,1,0,0,0,375,376,5,198,0,0,376,381,3,52,
211
- 26,0,377,378,5,195,0,0,378,380,3,52,26,0,379,377,1,0,0,0,380,383,
210
+ 0,373,374,1,0,0,0,374,47,1,0,0,0,375,376,5,208,0,0,376,381,3,52,
211
+ 26,0,377,378,5,205,0,0,378,380,3,52,26,0,379,377,1,0,0,0,380,383,
212
212
  1,0,0,0,381,379,1,0,0,0,381,382,1,0,0,0,382,384,1,0,0,0,383,381,
213
- 1,0,0,0,384,385,5,197,0,0,385,49,1,0,0,0,386,387,5,226,0,0,387,51,
214
- 1,0,0,0,388,389,3,126,63,0,389,390,5,194,0,0,390,392,1,0,0,0,391,
213
+ 1,0,0,0,384,385,5,207,0,0,385,49,1,0,0,0,386,387,5,236,0,0,387,51,
214
+ 1,0,0,0,388,389,3,126,63,0,389,390,5,204,0,0,390,392,1,0,0,0,391,
215
215
  388,1,0,0,0,391,392,1,0,0,0,392,393,1,0,0,0,393,394,3,142,71,0,394,
216
- 395,5,194,0,0,395,397,1,0,0,0,396,391,1,0,0,0,396,397,1,0,0,0,397,
216
+ 395,5,204,0,0,395,397,1,0,0,0,396,391,1,0,0,0,396,397,1,0,0,0,397,
217
217
  398,1,0,0,0,398,400,3,50,25,0,399,401,3,136,68,0,400,399,1,0,0,0,
218
- 400,401,1,0,0,0,401,53,1,0,0,0,402,403,3,156,78,0,403,404,5,194,
219
- 0,0,404,405,5,196,0,0,405,419,1,0,0,0,406,410,3,38,19,0,407,410,
218
+ 400,401,1,0,0,0,401,53,1,0,0,0,402,403,3,156,78,0,403,404,5,204,
219
+ 0,0,404,405,5,206,0,0,405,419,1,0,0,0,406,410,3,38,19,0,407,410,
220
220
  3,164,82,0,408,410,3,56,28,0,409,406,1,0,0,0,409,407,1,0,0,0,409,
221
- 408,1,0,0,0,410,413,1,0,0,0,411,412,7,11,0,0,412,414,5,225,0,0,413,
221
+ 408,1,0,0,0,410,413,1,0,0,0,411,412,7,11,0,0,412,414,5,235,0,0,413,
222
222
  411,1,0,0,0,413,414,1,0,0,0,414,416,1,0,0,0,415,417,3,36,18,0,416,
223
223
  415,1,0,0,0,416,417,1,0,0,0,417,419,1,0,0,0,418,402,1,0,0,0,418,
224
224
  409,1,0,0,0,419,55,1,0,0,0,420,429,3,184,92,0,421,429,3,182,91,0,
@@ -226,7 +226,7 @@ def serializedATN():
226
226
  3,190,95,0,426,429,3,196,98,0,427,429,3,194,97,0,428,420,1,0,0,0,
227
227
  428,421,1,0,0,0,428,422,1,0,0,0,428,423,1,0,0,0,428,424,1,0,0,0,
228
228
  428,425,1,0,0,0,428,426,1,0,0,0,428,427,1,0,0,0,429,57,1,0,0,0,430,
229
- 435,3,60,30,0,431,432,5,183,0,0,432,434,3,60,30,0,433,431,1,0,0,
229
+ 435,3,60,30,0,431,432,5,193,0,0,432,434,3,60,30,0,433,431,1,0,0,
230
230
  0,434,437,1,0,0,0,435,433,1,0,0,0,435,436,1,0,0,0,436,59,1,0,0,0,
231
231
  437,435,1,0,0,0,438,440,5,89,0,0,439,438,1,0,0,0,439,440,1,0,0,0,
232
232
  440,441,1,0,0,0,441,442,3,62,31,0,442,61,1,0,0,0,443,459,3,40,20,
@@ -236,12 +236,12 @@ def serializedATN():
236
236
  0,0,453,455,1,0,0,0,454,444,1,0,0,0,454,455,1,0,0,0,455,460,1,0,
237
237
  0,0,456,458,7,12,0,0,457,456,1,0,0,0,457,458,1,0,0,0,458,460,1,0,
238
238
  0,0,459,454,1,0,0,0,459,457,1,0,0,0,460,63,1,0,0,0,461,466,3,58,
239
- 29,0,462,463,5,182,0,0,463,465,3,58,29,0,464,462,1,0,0,0,465,468,
239
+ 29,0,462,463,5,192,0,0,463,465,3,58,29,0,464,462,1,0,0,0,465,468,
240
240
  1,0,0,0,466,464,1,0,0,0,466,467,1,0,0,0,467,65,1,0,0,0,468,466,1,
241
- 0,0,0,469,470,5,198,0,0,470,475,3,64,32,0,471,472,5,195,0,0,472,
241
+ 0,0,0,469,470,5,208,0,0,470,475,3,64,32,0,471,472,5,205,0,0,472,
242
242
  474,3,64,32,0,473,471,1,0,0,0,474,477,1,0,0,0,475,473,1,0,0,0,475,
243
- 476,1,0,0,0,476,478,1,0,0,0,477,475,1,0,0,0,478,479,5,197,0,0,479,
244
- 67,1,0,0,0,480,483,3,70,35,0,481,482,5,205,0,0,482,484,3,70,35,0,
243
+ 476,1,0,0,0,476,478,1,0,0,0,477,475,1,0,0,0,478,479,5,207,0,0,479,
244
+ 67,1,0,0,0,480,483,3,70,35,0,481,482,5,215,0,0,482,484,3,70,35,0,
245
245
  483,481,1,0,0,0,483,484,1,0,0,0,484,69,1,0,0,0,485,488,3,72,36,0,
246
246
  486,487,7,13,0,0,487,489,3,72,36,0,488,486,1,0,0,0,488,489,1,0,0,
247
247
  0,489,71,1,0,0,0,490,495,3,74,37,0,491,492,7,2,0,0,492,494,3,74,
@@ -252,65 +252,65 @@ def serializedATN():
252
252
  0,0,507,506,1,0,0,0,507,508,1,0,0,0,508,509,1,0,0,0,509,511,3,134,
253
253
  67,0,510,512,5,89,0,0,511,510,1,0,0,0,511,512,1,0,0,0,512,515,1,
254
254
  0,0,0,513,514,7,2,0,0,514,516,3,96,48,0,515,513,1,0,0,0,515,516,
255
- 1,0,0,0,516,77,1,0,0,0,517,530,3,30,15,0,518,527,5,198,0,0,519,524,
256
- 3,64,32,0,520,521,5,195,0,0,521,523,3,64,32,0,522,520,1,0,0,0,523,
255
+ 1,0,0,0,516,77,1,0,0,0,517,530,3,30,15,0,518,527,5,208,0,0,519,524,
256
+ 3,64,32,0,520,521,5,205,0,0,521,523,3,64,32,0,522,520,1,0,0,0,523,
257
257
  526,1,0,0,0,524,522,1,0,0,0,524,525,1,0,0,0,525,528,1,0,0,0,526,
258
258
  524,1,0,0,0,527,519,1,0,0,0,527,528,1,0,0,0,528,529,1,0,0,0,529,
259
- 531,5,197,0,0,530,518,1,0,0,0,530,531,1,0,0,0,531,568,1,0,0,0,532,
260
- 533,5,20,0,0,533,534,5,198,0,0,534,535,3,64,32,0,535,536,5,7,0,0,
261
- 536,537,3,2,1,0,537,538,5,197,0,0,538,568,1,0,0,0,539,540,5,29,0,
262
- 0,540,541,5,198,0,0,541,542,5,225,0,0,542,543,5,195,0,0,543,544,
263
- 5,225,0,0,544,545,5,195,0,0,545,546,5,225,0,0,546,568,5,197,0,0,
264
- 547,548,5,102,0,0,548,549,5,198,0,0,549,550,3,64,32,0,550,551,5,
265
- 67,0,0,551,552,3,64,32,0,552,553,5,197,0,0,553,568,1,0,0,0,554,555,
266
- 3,16,8,0,555,557,5,198,0,0,556,558,7,16,0,0,557,556,1,0,0,0,557,
259
+ 531,5,207,0,0,530,518,1,0,0,0,530,531,1,0,0,0,531,568,1,0,0,0,532,
260
+ 533,5,20,0,0,533,534,5,208,0,0,534,535,3,64,32,0,535,536,5,7,0,0,
261
+ 536,537,3,2,1,0,537,538,5,207,0,0,538,568,1,0,0,0,539,540,5,29,0,
262
+ 0,540,541,5,208,0,0,541,542,5,235,0,0,542,543,5,205,0,0,543,544,
263
+ 5,235,0,0,544,545,5,205,0,0,545,546,5,235,0,0,546,568,5,207,0,0,
264
+ 547,548,5,102,0,0,548,549,5,208,0,0,549,550,3,64,32,0,550,551,5,
265
+ 67,0,0,551,552,3,64,32,0,552,553,5,207,0,0,553,568,1,0,0,0,554,555,
266
+ 3,16,8,0,555,557,5,208,0,0,556,558,7,16,0,0,557,556,1,0,0,0,557,
267
267
  558,1,0,0,0,558,563,1,0,0,0,559,562,3,38,19,0,560,562,3,164,82,0,
268
268
  561,559,1,0,0,0,561,560,1,0,0,0,562,564,1,0,0,0,563,561,1,0,0,0,
269
- 563,564,1,0,0,0,564,565,1,0,0,0,565,566,5,197,0,0,566,568,1,0,0,
269
+ 563,564,1,0,0,0,564,565,1,0,0,0,565,566,5,207,0,0,566,568,1,0,0,
270
270
  0,567,517,1,0,0,0,567,532,1,0,0,0,567,539,1,0,0,0,567,547,1,0,0,
271
271
  0,567,554,1,0,0,0,568,79,1,0,0,0,569,570,5,59,0,0,570,571,5,18,0,
272
- 0,571,576,3,82,41,0,572,573,5,195,0,0,573,575,3,82,41,0,574,572,
272
+ 0,571,576,3,82,41,0,572,573,5,205,0,0,573,575,3,82,41,0,574,572,
273
273
  1,0,0,0,575,578,1,0,0,0,576,574,1,0,0,0,576,577,1,0,0,0,577,581,
274
- 1,0,0,0,578,576,1,0,0,0,579,580,5,157,0,0,580,582,5,114,0,0,581,
274
+ 1,0,0,0,578,576,1,0,0,0,579,580,5,167,0,0,580,582,5,114,0,0,581,
275
275
  579,1,0,0,0,581,582,1,0,0,0,582,81,1,0,0,0,583,587,3,52,26,0,584,
276
- 587,5,220,0,0,585,587,3,38,19,0,586,583,1,0,0,0,586,584,1,0,0,0,
276
+ 587,5,230,0,0,585,587,3,38,19,0,586,583,1,0,0,0,586,584,1,0,0,0,
277
277
  586,585,1,0,0,0,587,589,1,0,0,0,588,590,7,17,0,0,589,588,1,0,0,0,
278
278
  589,590,1,0,0,0,590,83,1,0,0,0,591,592,5,60,0,0,592,593,3,64,32,
279
- 0,593,85,1,0,0,0,594,595,5,146,0,0,595,596,3,94,47,0,596,598,5,198,
279
+ 0,593,85,1,0,0,0,594,595,5,156,0,0,595,596,3,94,47,0,596,598,5,208,
280
280
  0,0,597,599,3,92,46,0,598,597,1,0,0,0,598,599,1,0,0,0,599,600,1,
281
- 0,0,0,600,601,5,197,0,0,601,615,1,0,0,0,602,603,5,61,0,0,603,604,
282
- 3,94,47,0,604,605,5,198,0,0,605,606,3,92,46,0,606,607,5,197,0,0,
283
- 607,615,1,0,0,0,608,609,5,56,0,0,609,610,3,94,47,0,610,611,5,198,
284
- 0,0,611,612,3,92,46,0,612,613,5,197,0,0,613,615,1,0,0,0,614,594,
281
+ 0,0,0,600,601,5,207,0,0,601,615,1,0,0,0,602,603,5,61,0,0,603,604,
282
+ 3,94,47,0,604,605,5,208,0,0,605,606,3,92,46,0,606,607,5,207,0,0,
283
+ 607,615,1,0,0,0,608,609,5,56,0,0,609,610,3,94,47,0,610,611,5,208,
284
+ 0,0,611,612,3,92,46,0,612,613,5,207,0,0,613,615,1,0,0,0,614,594,
285
285
  1,0,0,0,614,602,1,0,0,0,614,608,1,0,0,0,615,87,1,0,0,0,616,621,3,
286
- 86,43,0,617,618,5,195,0,0,618,620,3,86,43,0,619,617,1,0,0,0,620,
286
+ 86,43,0,617,618,5,205,0,0,618,620,3,86,43,0,619,617,1,0,0,0,620,
287
287
  623,1,0,0,0,621,619,1,0,0,0,621,622,1,0,0,0,622,89,1,0,0,0,623,621,
288
- 1,0,0,0,624,625,5,226,0,0,625,91,1,0,0,0,626,631,3,90,45,0,627,628,
289
- 5,195,0,0,628,630,3,90,45,0,629,627,1,0,0,0,630,633,1,0,0,0,631,
288
+ 1,0,0,0,624,625,5,236,0,0,625,91,1,0,0,0,626,631,3,90,45,0,627,628,
289
+ 5,205,0,0,628,630,3,90,45,0,629,627,1,0,0,0,630,633,1,0,0,0,631,
290
290
  629,1,0,0,0,631,632,1,0,0,0,632,93,1,0,0,0,633,631,1,0,0,0,634,643,
291
291
  7,18,0,0,635,641,5,55,0,0,636,642,5,70,0,0,637,638,5,97,0,0,638,
292
292
  642,5,18,0,0,639,640,5,59,0,0,640,642,5,18,0,0,641,636,1,0,0,0,641,
293
293
  637,1,0,0,0,641,639,1,0,0,0,642,644,1,0,0,0,643,635,1,0,0,0,643,
294
294
  644,1,0,0,0,644,95,1,0,0,0,645,646,5,66,0,0,646,647,3,12,6,0,647,
295
- 97,1,0,0,0,648,649,5,96,0,0,649,653,3,64,32,0,650,651,5,147,0,0,
295
+ 97,1,0,0,0,648,649,5,96,0,0,649,653,3,64,32,0,650,651,5,157,0,0,
296
296
  651,653,3,48,24,0,652,648,1,0,0,0,652,650,1,0,0,0,653,99,1,0,0,0,
297
297
  654,655,5,76,0,0,655,658,3,106,53,0,656,657,5,94,0,0,657,659,3,102,
298
298
  51,0,658,656,1,0,0,0,658,659,1,0,0,0,659,666,1,0,0,0,660,661,5,94,
299
299
  0,0,661,662,3,102,51,0,662,663,5,76,0,0,663,664,3,106,53,0,664,666,
300
300
  1,0,0,0,665,654,1,0,0,0,665,660,1,0,0,0,666,101,1,0,0,0,667,668,
301
- 5,220,0,0,668,103,1,0,0,0,669,670,5,94,0,0,670,671,3,102,51,0,671,
302
- 105,1,0,0,0,672,673,5,220,0,0,673,107,1,0,0,0,674,675,5,97,0,0,675,
303
- 676,5,18,0,0,676,681,3,110,55,0,677,678,5,195,0,0,678,680,3,110,
301
+ 5,230,0,0,668,103,1,0,0,0,669,670,5,94,0,0,670,671,3,102,51,0,671,
302
+ 105,1,0,0,0,672,673,5,230,0,0,673,107,1,0,0,0,674,675,5,97,0,0,675,
303
+ 676,5,18,0,0,676,681,3,110,55,0,677,678,5,205,0,0,678,680,3,110,
304
304
  55,0,679,677,1,0,0,0,680,683,1,0,0,0,681,679,1,0,0,0,681,682,1,0,
305
305
  0,0,682,109,1,0,0,0,683,681,1,0,0,0,684,692,3,82,41,0,685,687,7,
306
306
  17,0,0,686,685,1,0,0,0,686,687,1,0,0,0,687,693,1,0,0,0,688,689,5,
307
307
  93,0,0,689,691,7,19,0,0,690,688,1,0,0,0,690,691,1,0,0,0,691,693,
308
308
  1,0,0,0,692,686,1,0,0,0,692,690,1,0,0,0,693,699,1,0,0,0,694,695,
309
- 3,82,41,0,695,696,5,147,0,0,696,697,7,20,0,0,697,699,1,0,0,0,698,
309
+ 3,82,41,0,695,696,5,157,0,0,696,697,7,20,0,0,697,699,1,0,0,0,698,
310
310
  684,1,0,0,0,698,694,1,0,0,0,699,111,1,0,0,0,700,701,5,99,0,0,701,
311
- 702,5,198,0,0,702,703,3,116,58,0,703,704,5,197,0,0,704,113,1,0,0,
312
- 0,705,706,5,226,0,0,706,115,1,0,0,0,707,712,3,114,57,0,708,709,5,
313
- 195,0,0,709,711,3,114,57,0,710,708,1,0,0,0,711,714,1,0,0,0,712,710,
311
+ 702,5,208,0,0,702,703,3,116,58,0,703,704,5,207,0,0,704,113,1,0,0,
312
+ 0,705,706,5,236,0,0,706,115,1,0,0,0,707,712,3,114,57,0,708,709,5,
313
+ 205,0,0,709,711,3,114,57,0,710,708,1,0,0,0,711,714,1,0,0,0,712,710,
314
314
  1,0,0,0,712,713,1,0,0,0,713,117,1,0,0,0,714,712,1,0,0,0,715,717,
315
315
  5,89,0,0,716,715,1,0,0,0,716,717,1,0,0,0,717,745,1,0,0,0,718,721,
316
316
  5,67,0,0,719,722,3,138,69,0,720,722,3,66,33,0,721,719,1,0,0,0,721,
@@ -320,27 +320,27 @@ def serializedATN():
320
320
  3,164,82,0,732,730,1,0,0,0,732,731,1,0,0,0,733,746,1,0,0,0,734,736,
321
321
  5,11,0,0,735,737,5,135,0,0,736,735,1,0,0,0,736,737,1,0,0,0,737,740,
322
322
  1,0,0,0,738,741,3,38,19,0,739,741,3,164,82,0,740,738,1,0,0,0,740,
323
- 739,1,0,0,0,741,742,1,0,0,0,742,743,5,183,0,0,743,744,3,122,61,0,
323
+ 739,1,0,0,0,741,742,1,0,0,0,742,743,5,193,0,0,743,744,3,122,61,0,
324
324
  744,746,1,0,0,0,745,718,1,0,0,0,745,723,1,0,0,0,745,729,1,0,0,0,
325
325
  745,734,1,0,0,0,746,119,1,0,0,0,747,748,5,125,0,0,748,751,7,11,0,
326
326
  0,749,752,3,38,19,0,750,752,3,164,82,0,751,749,1,0,0,0,751,750,1,
327
327
  0,0,0,752,121,1,0,0,0,753,756,3,38,19,0,754,756,3,164,82,0,755,753,
328
328
  1,0,0,0,755,754,1,0,0,0,756,759,1,0,0,0,757,760,3,118,59,0,758,760,
329
329
  3,120,60,0,759,757,1,0,0,0,759,758,1,0,0,0,759,760,1,0,0,0,760,123,
330
- 1,0,0,0,761,762,3,132,66,0,762,763,5,192,0,0,763,125,1,0,0,0,764,
331
- 765,5,226,0,0,765,127,1,0,0,0,766,771,3,54,27,0,767,768,5,195,0,
330
+ 1,0,0,0,761,762,3,132,66,0,762,763,5,202,0,0,763,125,1,0,0,0,764,
331
+ 765,5,236,0,0,765,127,1,0,0,0,766,771,3,54,27,0,767,768,5,205,0,
332
332
  0,768,770,3,54,27,0,769,767,1,0,0,0,770,773,1,0,0,0,771,769,1,0,
333
- 0,0,771,772,1,0,0,0,772,796,1,0,0,0,773,771,1,0,0,0,774,784,5,196,
334
- 0,0,775,776,5,195,0,0,776,781,3,54,27,0,777,778,5,195,0,0,778,780,
333
+ 0,0,771,772,1,0,0,0,772,796,1,0,0,0,773,771,1,0,0,0,774,784,5,206,
334
+ 0,0,775,776,5,205,0,0,776,781,3,54,27,0,777,778,5,205,0,0,778,780,
335
335
  3,54,27,0,779,777,1,0,0,0,780,783,1,0,0,0,781,779,1,0,0,0,781,782,
336
336
  1,0,0,0,782,785,1,0,0,0,783,781,1,0,0,0,784,775,1,0,0,0,784,785,
337
337
  1,0,0,0,785,796,1,0,0,0,786,787,5,96,0,0,787,792,3,130,65,0,788,
338
- 789,5,195,0,0,789,791,3,54,27,0,790,788,1,0,0,0,791,794,1,0,0,0,
338
+ 789,5,205,0,0,789,791,3,54,27,0,790,788,1,0,0,0,791,794,1,0,0,0,
339
339
  792,790,1,0,0,0,792,793,1,0,0,0,793,796,1,0,0,0,794,792,1,0,0,0,
340
340
  795,766,1,0,0,0,795,774,1,0,0,0,795,786,1,0,0,0,796,129,1,0,0,0,
341
- 797,802,3,54,27,0,798,799,5,195,0,0,799,801,3,54,27,0,800,798,1,
341
+ 797,802,3,54,27,0,798,799,5,205,0,0,799,801,3,54,27,0,800,798,1,
342
342
  0,0,0,801,804,1,0,0,0,802,800,1,0,0,0,802,803,1,0,0,0,803,131,1,
343
- 0,0,0,804,802,1,0,0,0,805,813,3,34,17,0,806,808,5,142,0,0,807,809,
343
+ 0,0,0,804,802,1,0,0,0,805,813,3,34,17,0,806,808,5,152,0,0,807,809,
344
344
  5,3,0,0,808,807,1,0,0,0,808,809,1,0,0,0,809,810,1,0,0,0,810,812,
345
345
  3,34,17,0,811,806,1,0,0,0,812,815,1,0,0,0,813,811,1,0,0,0,813,814,
346
346
  1,0,0,0,814,133,1,0,0,0,815,813,1,0,0,0,816,828,3,32,16,0,817,828,
@@ -349,20 +349,20 @@ def serializedATN():
349
349
  138,69,0,825,828,3,96,48,0,826,828,3,42,21,0,827,816,1,0,0,0,827,
350
350
  817,1,0,0,0,827,818,1,0,0,0,827,819,1,0,0,0,827,820,1,0,0,0,827,
351
351
  822,1,0,0,0,827,823,1,0,0,0,827,825,1,0,0,0,827,826,1,0,0,0,828,
352
- 135,1,0,0,0,829,830,5,200,0,0,830,833,5,220,0,0,831,832,5,193,0,
353
- 0,832,834,5,220,0,0,833,831,1,0,0,0,833,834,1,0,0,0,834,835,1,0,
354
- 0,0,835,837,5,199,0,0,836,829,1,0,0,0,837,838,1,0,0,0,838,836,1,
355
- 0,0,0,838,839,1,0,0,0,839,137,1,0,0,0,840,841,5,198,0,0,841,842,
356
- 3,132,66,0,842,843,5,197,0,0,843,139,1,0,0,0,844,846,3,156,78,0,
352
+ 135,1,0,0,0,829,830,5,210,0,0,830,833,5,230,0,0,831,832,5,203,0,
353
+ 0,832,834,5,230,0,0,833,831,1,0,0,0,833,834,1,0,0,0,834,835,1,0,
354
+ 0,0,835,837,5,209,0,0,836,829,1,0,0,0,837,838,1,0,0,0,838,836,1,
355
+ 0,0,0,838,839,1,0,0,0,839,137,1,0,0,0,840,841,5,208,0,0,841,842,
356
+ 3,132,66,0,842,843,5,207,0,0,843,139,1,0,0,0,844,846,3,156,78,0,
357
357
  845,847,3,112,56,0,846,845,1,0,0,0,846,847,1,0,0,0,847,849,1,0,0,
358
358
  0,848,850,3,36,18,0,849,848,1,0,0,0,849,850,1,0,0,0,850,852,1,0,
359
359
  0,0,851,853,3,88,44,0,852,851,1,0,0,0,852,853,1,0,0,0,853,871,1,
360
360
  0,0,0,854,855,3,138,69,0,855,856,3,36,18,0,856,871,1,0,0,0,857,858,
361
- 5,198,0,0,858,859,3,154,77,0,859,860,5,197,0,0,860,871,1,0,0,0,861,
361
+ 5,208,0,0,858,859,3,154,77,0,859,860,5,207,0,0,860,871,1,0,0,0,861,
362
362
  862,5,95,0,0,862,863,3,152,76,0,863,864,5,73,0,0,864,865,5,98,0,
363
363
  0,865,866,5,70,0,0,866,867,3,152,76,0,867,868,5,96,0,0,868,869,3,
364
364
  64,32,0,869,871,1,0,0,0,870,844,1,0,0,0,870,854,1,0,0,0,870,857,
365
- 1,0,0,0,870,861,1,0,0,0,871,141,1,0,0,0,872,873,5,226,0,0,873,143,
365
+ 1,0,0,0,870,861,1,0,0,0,871,141,1,0,0,0,872,873,5,236,0,0,873,143,
366
366
  1,0,0,0,874,885,3,146,73,0,875,877,7,21,0,0,876,875,1,0,0,0,876,
367
367
  877,1,0,0,0,877,878,1,0,0,0,878,879,5,70,0,0,879,881,3,140,70,0,
368
368
  880,882,3,98,49,0,881,880,1,0,0,0,881,882,1,0,0,0,882,884,1,0,0,
@@ -378,37 +378,37 @@ def serializedATN():
378
378
  0,0,913,915,7,22,0,0,914,916,5,98,0,0,915,914,1,0,0,0,915,916,1,
379
379
  0,0,0,916,918,1,0,0,0,917,913,1,0,0,0,917,918,1,0,0,0,918,919,1,
380
380
  0,0,0,919,920,5,70,0,0,920,922,3,140,70,0,921,912,1,0,0,0,921,922,
381
- 1,0,0,0,922,151,1,0,0,0,923,933,3,144,72,0,924,925,5,198,0,0,925,
382
- 926,3,158,79,0,926,927,5,197,0,0,927,928,1,0,0,0,928,930,3,36,18,
381
+ 1,0,0,0,922,151,1,0,0,0,923,933,3,144,72,0,924,925,5,208,0,0,925,
382
+ 926,3,158,79,0,926,927,5,207,0,0,927,928,1,0,0,0,928,930,3,36,18,
383
383
  0,929,931,3,48,24,0,930,929,1,0,0,0,930,931,1,0,0,0,931,933,1,0,
384
384
  0,0,932,923,1,0,0,0,932,924,1,0,0,0,933,153,1,0,0,0,934,939,3,152,
385
- 76,0,935,936,5,195,0,0,936,938,3,152,76,0,937,935,1,0,0,0,938,941,
385
+ 76,0,935,936,5,205,0,0,936,938,3,152,76,0,937,935,1,0,0,0,938,941,
386
386
  1,0,0,0,939,937,1,0,0,0,939,940,1,0,0,0,940,155,1,0,0,0,941,939,
387
- 1,0,0,0,942,943,3,126,63,0,943,944,5,194,0,0,944,946,1,0,0,0,945,
387
+ 1,0,0,0,942,943,3,126,63,0,943,944,5,204,0,0,944,946,1,0,0,0,945,
388
388
  942,1,0,0,0,945,946,1,0,0,0,946,947,1,0,0,0,947,948,3,142,71,0,948,
389
- 157,1,0,0,0,949,950,5,151,0,0,950,955,3,66,33,0,951,952,5,195,0,
389
+ 157,1,0,0,0,949,950,5,161,0,0,950,955,3,66,33,0,951,952,5,205,0,
390
390
  0,952,954,3,66,33,0,953,951,1,0,0,0,954,957,1,0,0,0,955,953,1,0,
391
- 0,0,955,956,1,0,0,0,956,159,1,0,0,0,957,955,1,0,0,0,958,959,5,156,
391
+ 0,0,955,956,1,0,0,0,956,159,1,0,0,0,957,955,1,0,0,0,958,959,5,166,
392
392
  0,0,959,960,3,64,32,0,960,161,1,0,0,0,961,962,7,23,0,0,962,163,1,
393
393
  0,0,0,963,966,3,198,99,0,964,966,3,166,83,0,965,963,1,0,0,0,965,
394
394
  964,1,0,0,0,966,1038,1,0,0,0,967,970,3,166,83,0,968,970,3,134,67,
395
395
  0,969,967,1,0,0,0,969,968,1,0,0,0,970,971,1,0,0,0,971,972,3,162,
396
396
  81,0,972,973,3,198,99,0,973,1038,1,0,0,0,974,975,3,198,99,0,975,
397
- 976,5,186,0,0,976,977,3,198,99,0,977,1038,1,0,0,0,978,979,3,198,
397
+ 976,5,196,0,0,976,977,3,198,99,0,977,1038,1,0,0,0,978,979,3,198,
398
398
  99,0,979,980,3,162,81,0,980,981,3,198,99,0,981,1038,1,0,0,0,982,
399
- 989,3,170,85,0,983,984,3,134,67,0,984,985,5,216,0,0,985,986,3,170,
399
+ 989,3,170,85,0,983,984,3,134,67,0,984,985,5,226,0,0,985,986,3,170,
400
400
  85,0,986,989,1,0,0,0,987,989,3,134,67,0,988,982,1,0,0,0,988,983,
401
401
  1,0,0,0,988,987,1,0,0,0,989,1038,1,0,0,0,990,994,3,166,83,0,991,
402
402
  994,3,168,84,0,992,994,3,134,67,0,993,990,1,0,0,0,993,991,1,0,0,
403
- 0,993,992,1,0,0,0,994,995,1,0,0,0,995,999,5,217,0,0,996,1000,3,166,
403
+ 0,993,992,1,0,0,0,994,995,1,0,0,0,995,999,5,227,0,0,996,1000,3,166,
404
404
  83,0,997,1000,3,168,84,0,998,1000,3,134,67,0,999,996,1,0,0,0,999,
405
- 997,1,0,0,0,999,998,1,0,0,0,1000,1038,1,0,0,0,1001,1006,5,218,0,
405
+ 997,1,0,0,0,999,998,1,0,0,0,1000,1038,1,0,0,0,1001,1006,5,228,0,
406
406
  0,1002,1007,3,168,84,0,1003,1007,3,174,87,0,1004,1007,3,176,88,0,
407
407
  1005,1007,3,134,67,0,1006,1002,1,0,0,0,1006,1003,1,0,0,0,1006,1004,
408
- 1,0,0,0,1006,1005,1,0,0,0,1007,1038,1,0,0,0,1008,1012,5,219,0,0,
408
+ 1,0,0,0,1006,1005,1,0,0,0,1007,1038,1,0,0,0,1008,1012,5,229,0,0,
409
409
  1009,1013,3,168,84,0,1010,1013,3,172,86,0,1011,1013,3,134,67,0,1012,
410
410
  1009,1,0,0,0,1012,1010,1,0,0,0,1012,1011,1,0,0,0,1013,1038,1,0,0,
411
- 0,1014,1018,5,202,0,0,1015,1019,3,170,85,0,1016,1019,3,178,89,0,
411
+ 0,1014,1018,5,212,0,0,1015,1019,3,170,85,0,1016,1019,3,178,89,0,
412
412
  1017,1019,3,134,67,0,1018,1015,1,0,0,0,1018,1016,1,0,0,0,1018,1017,
413
413
  1,0,0,0,1019,1038,1,0,0,0,1020,1028,3,166,83,0,1021,1028,3,168,84,
414
414
  0,1022,1028,3,170,85,0,1023,1028,3,172,86,0,1024,1028,3,176,88,0,
@@ -420,44 +420,44 @@ def serializedATN():
420
420
  0,0,0,1035,1036,1,0,0,0,1036,1038,1,0,0,0,1037,965,1,0,0,0,1037,
421
421
  969,1,0,0,0,1037,974,1,0,0,0,1037,978,1,0,0,0,1037,988,1,0,0,0,1037,
422
422
  993,1,0,0,0,1037,1001,1,0,0,0,1037,1008,1,0,0,0,1037,1014,1,0,0,
423
- 0,1037,1027,1,0,0,0,1038,165,1,0,0,0,1039,1040,5,162,0,0,1040,1041,
424
- 5,198,0,0,1041,1042,3,38,19,0,1042,1043,5,195,0,0,1043,1044,3,38,
425
- 19,0,1044,1045,5,197,0,0,1045,167,1,0,0,0,1046,1047,5,163,0,0,1047,
426
- 1048,5,198,0,0,1048,1049,3,166,83,0,1049,1050,5,195,0,0,1050,1051,
427
- 3,38,19,0,1051,1052,5,197,0,0,1052,169,1,0,0,0,1053,1054,5,164,0,
428
- 0,1054,1055,5,198,0,0,1055,1056,3,166,83,0,1056,1057,5,195,0,0,1057,
429
- 1058,3,166,83,0,1058,1059,5,197,0,0,1059,1068,1,0,0,0,1060,1061,
430
- 5,164,0,0,1061,1062,5,198,0,0,1062,1063,3,180,90,0,1063,1064,5,195,
431
- 0,0,1064,1065,3,38,19,0,1065,1066,5,197,0,0,1066,1068,1,0,0,0,1067,
432
- 1053,1,0,0,0,1067,1060,1,0,0,0,1068,171,1,0,0,0,1069,1070,5,165,
433
- 0,0,1070,1071,5,198,0,0,1071,1072,3,166,83,0,1072,1073,5,195,0,0,
434
- 1073,1074,3,38,19,0,1074,1075,5,195,0,0,1075,1076,3,38,19,0,1076,
435
- 1077,5,195,0,0,1077,1078,3,38,19,0,1078,1079,5,197,0,0,1079,173,
436
- 1,0,0,0,1080,1081,5,168,0,0,1081,1082,5,198,0,0,1082,1083,3,166,
437
- 83,0,1083,1084,5,195,0,0,1084,1085,3,166,83,0,1085,1086,5,197,0,
438
- 0,1086,175,1,0,0,0,1087,1088,5,166,0,0,1088,1099,5,225,0,0,1089,
439
- 1090,5,166,0,0,1090,1091,5,198,0,0,1091,1092,3,52,26,0,1092,1093,
440
- 5,197,0,0,1093,1099,1,0,0,0,1094,1095,5,166,0,0,1095,1096,5,198,
441
- 0,0,1096,1097,5,225,0,0,1097,1099,5,197,0,0,1098,1087,1,0,0,0,1098,
442
- 1089,1,0,0,0,1098,1094,1,0,0,0,1099,177,1,0,0,0,1100,1101,5,167,
443
- 0,0,1101,1108,5,225,0,0,1102,1103,5,167,0,0,1103,1104,5,198,0,0,
444
- 1104,1105,3,52,26,0,1105,1106,5,197,0,0,1106,1108,1,0,0,0,1107,1100,
445
- 1,0,0,0,1107,1102,1,0,0,0,1108,179,1,0,0,0,1109,1110,5,169,0,0,1110,
446
- 1111,5,198,0,0,1111,1112,3,38,19,0,1112,1113,5,195,0,0,1113,1114,
447
- 3,38,19,0,1114,1115,5,195,0,0,1115,1116,3,38,19,0,1116,1117,5,195,
448
- 0,0,1117,1118,5,224,0,0,1118,1119,5,197,0,0,1119,181,1,0,0,0,1120,
449
- 1121,5,172,0,0,1121,1122,5,198,0,0,1122,1123,3,166,83,0,1123,1124,
450
- 5,197,0,0,1124,183,1,0,0,0,1125,1126,5,176,0,0,1126,1127,5,198,0,
451
- 0,1127,1128,3,166,83,0,1128,1129,5,197,0,0,1129,185,1,0,0,0,1130,
452
- 1131,5,173,0,0,1131,1132,5,198,0,0,1132,1133,3,174,87,0,1133,1134,
453
- 5,197,0,0,1134,187,1,0,0,0,1135,1136,5,177,0,0,1136,1137,5,198,0,
454
- 0,1137,1138,3,174,87,0,1138,1139,5,197,0,0,1139,189,1,0,0,0,1140,
455
- 1141,5,174,0,0,1141,1142,5,198,0,0,1142,1143,3,168,84,0,1143,1144,
456
- 5,197,0,0,1144,191,1,0,0,0,1145,1146,5,178,0,0,1146,1147,5,198,0,
457
- 0,1147,1148,3,168,84,0,1148,1149,5,197,0,0,1149,193,1,0,0,0,1150,
458
- 1151,5,175,0,0,1151,1152,5,198,0,0,1152,1153,3,176,88,0,1153,1154,
459
- 5,197,0,0,1154,195,1,0,0,0,1155,1156,5,179,0,0,1156,1157,5,198,0,
460
- 0,1157,1158,3,176,88,0,1158,1159,5,197,0,0,1159,197,1,0,0,0,1160,
423
+ 0,1037,1027,1,0,0,0,1038,165,1,0,0,0,1039,1040,5,172,0,0,1040,1041,
424
+ 5,208,0,0,1041,1042,3,38,19,0,1042,1043,5,205,0,0,1043,1044,3,38,
425
+ 19,0,1044,1045,5,207,0,0,1045,167,1,0,0,0,1046,1047,5,173,0,0,1047,
426
+ 1048,5,208,0,0,1048,1049,3,166,83,0,1049,1050,5,205,0,0,1050,1051,
427
+ 3,38,19,0,1051,1052,5,207,0,0,1052,169,1,0,0,0,1053,1054,5,174,0,
428
+ 0,1054,1055,5,208,0,0,1055,1056,3,166,83,0,1056,1057,5,205,0,0,1057,
429
+ 1058,3,166,83,0,1058,1059,5,207,0,0,1059,1068,1,0,0,0,1060,1061,
430
+ 5,174,0,0,1061,1062,5,208,0,0,1062,1063,3,180,90,0,1063,1064,5,205,
431
+ 0,0,1064,1065,3,38,19,0,1065,1066,5,207,0,0,1066,1068,1,0,0,0,1067,
432
+ 1053,1,0,0,0,1067,1060,1,0,0,0,1068,171,1,0,0,0,1069,1070,5,175,
433
+ 0,0,1070,1071,5,208,0,0,1071,1072,3,166,83,0,1072,1073,5,205,0,0,
434
+ 1073,1074,3,38,19,0,1074,1075,5,205,0,0,1075,1076,3,38,19,0,1076,
435
+ 1077,5,205,0,0,1077,1078,3,38,19,0,1078,1079,5,207,0,0,1079,173,
436
+ 1,0,0,0,1080,1081,5,178,0,0,1081,1082,5,208,0,0,1082,1083,3,166,
437
+ 83,0,1083,1084,5,205,0,0,1084,1085,3,166,83,0,1085,1086,5,207,0,
438
+ 0,1086,175,1,0,0,0,1087,1088,5,176,0,0,1088,1099,5,235,0,0,1089,
439
+ 1090,5,176,0,0,1090,1091,5,208,0,0,1091,1092,3,52,26,0,1092,1093,
440
+ 5,207,0,0,1093,1099,1,0,0,0,1094,1095,5,176,0,0,1095,1096,5,208,
441
+ 0,0,1096,1097,5,235,0,0,1097,1099,5,207,0,0,1098,1087,1,0,0,0,1098,
442
+ 1089,1,0,0,0,1098,1094,1,0,0,0,1099,177,1,0,0,0,1100,1101,5,177,
443
+ 0,0,1101,1108,5,235,0,0,1102,1103,5,177,0,0,1103,1104,5,208,0,0,
444
+ 1104,1105,3,52,26,0,1105,1106,5,207,0,0,1106,1108,1,0,0,0,1107,1100,
445
+ 1,0,0,0,1107,1102,1,0,0,0,1108,179,1,0,0,0,1109,1110,5,179,0,0,1110,
446
+ 1111,5,208,0,0,1111,1112,3,38,19,0,1112,1113,5,205,0,0,1113,1114,
447
+ 3,38,19,0,1114,1115,5,205,0,0,1115,1116,3,38,19,0,1116,1117,5,205,
448
+ 0,0,1117,1118,5,234,0,0,1118,1119,5,207,0,0,1119,181,1,0,0,0,1120,
449
+ 1121,5,182,0,0,1121,1122,5,208,0,0,1122,1123,3,166,83,0,1123,1124,
450
+ 5,207,0,0,1124,183,1,0,0,0,1125,1126,5,186,0,0,1126,1127,5,208,0,
451
+ 0,1127,1128,3,166,83,0,1128,1129,5,207,0,0,1129,185,1,0,0,0,1130,
452
+ 1131,5,183,0,0,1131,1132,5,208,0,0,1132,1133,3,174,87,0,1133,1134,
453
+ 5,207,0,0,1134,187,1,0,0,0,1135,1136,5,187,0,0,1136,1137,5,208,0,
454
+ 0,1137,1138,3,174,87,0,1138,1139,5,207,0,0,1139,189,1,0,0,0,1140,
455
+ 1141,5,184,0,0,1141,1142,5,208,0,0,1142,1143,3,168,84,0,1143,1144,
456
+ 5,207,0,0,1144,191,1,0,0,0,1145,1146,5,188,0,0,1146,1147,5,208,0,
457
+ 0,1147,1148,3,168,84,0,1148,1149,5,207,0,0,1149,193,1,0,0,0,1150,
458
+ 1151,5,185,0,0,1151,1152,5,208,0,0,1152,1153,3,176,88,0,1153,1154,
459
+ 5,207,0,0,1154,195,1,0,0,0,1155,1156,5,189,0,0,1156,1157,5,208,0,
460
+ 0,1157,1158,3,176,88,0,1158,1159,5,207,0,0,1159,197,1,0,0,0,1160,
461
461
  1168,3,168,84,0,1161,1168,3,170,85,0,1162,1168,3,172,86,0,1163,1168,
462
462
  3,174,87,0,1164,1168,3,176,88,0,1165,1168,3,178,89,0,1166,1168,3,
463
463
  134,67,0,1167,1160,1,0,0,0,1167,1161,1,0,0,0,1167,1162,1,0,0,0,1167,
@@ -529,12 +529,14 @@ class PostgreSQLParser ( Parser ):
529
529
  "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>",
530
530
  "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>",
531
531
  "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>",
532
- "'@'", "'!!'", "<INVALID>", "<INVALID>", "'<='", "'>='",
533
- "'<<'", "'>>'", "';'", "':'", "'.'", "','", "'*'",
534
- "')'", "'('", "']'", "'['", "'+'", "'-'", "'~'", "'|'",
535
- "'&'", "'^'", "'>'", "'<'", "'<@'", "'@>'", "'!@'",
536
- "'!<@'", "'!~'", "'!@>'", "'!&&'", "'#'", "'<->'",
537
- "'@-@'", "'@@'" ]
532
+ "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>",
533
+ "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>",
534
+ "<INVALID>", "<INVALID>", "'@'", "'!!'", "<INVALID>",
535
+ "<INVALID>", "'<='", "'>='", "'<<'", "'>>'", "';'",
536
+ "':'", "'.'", "','", "'*'", "')'", "'('", "']'", "'['",
537
+ "'+'", "'-'", "'~'", "'|'", "'&'", "'^'", "'>'", "'<'",
538
+ "'<@'", "'@>'", "'!@'", "'!<@'", "'!~'", "'!@>'", "'!&&'",
539
+ "'#'", "'<->'", "'@-@'", "'@@'" ]
538
540
 
539
541
  symbolicNames = [ "<INVALID>", "ABS", "ACOS", "ALL", "ANY", "ASC", "ASIN",
540
542
  "AS_SYM", "ATAN", "ATAN2", "AVG", "BETWEEN", "BIGINT",
@@ -564,25 +566,27 @@ class PostgreSQLParser ( Parser ):
564
566
  "SQRT", "STDDEV", "STDDEV_POP", "STDDEV_SAMP", "STERADIANS",
565
567
  "STRAIGHT_JOIN", "SUBSTRING", "SUM", "SYMMETRIC",
566
568
  "TAN", "THEN_SYM", "TIME_SYM", "TIMESTAMP", "TRUE_SYM",
567
- "TRUNCATE", "UNION_SYM", "UNSIGNED_SYM", "UPDATE",
568
- "UPPER", "USE_SYM", "USING_SYM", "UTC_DATE", "UTC_TIME",
569
- "UTC_TIMESTAMP", "VALUES", "VARIANCE", "VAR_POP",
570
- "VAR_SAMP", "WHEN_SYM", "WHERE", "WITH", "YEAR", "ASCII_SYM",
571
- "LATIN1", "UTF8", "SPOINT", "SCIRCLE", "SLINE", "SELLIPSE",
572
- "SPOLY", "SPATH", "SBOX", "STRANS", "AREA", "ARRAY_LENGTH",
573
- "SPOINT_TO_ARRAY", "SBOX_TO_ARRAY", "SCIRCLE_TO_ARRAY",
574
- "SPOLY_TO_ARRAY", "SPOINT_TO_ARRAY_DEG", "SBOX_TO_ARRAY_DEG",
575
- "SCIRCLE_TO_ARRAY_DEG", "SPOLY_TO_ARRAY_DEG", "DIVIDE",
576
- "MOD_SYM", "OR_SYM", "AND_SYM", "ABS_VAL_OR_SCONTAINS",
577
- "DFACTORIAL", "EQ", "NOT_EQ", "LET", "GET", "SHIFT_LEFT",
578
- "SHIFT_RIGHT", "SEMI", "COLON", "DOT", "COMMA", "ASTERISK",
579
- "RPAREN", "LPAREN", "RBRACK", "LBRACK", "PLUS", "MINUS",
580
- "NEGATION", "VERTBAR", "BITAND", "POWER_OP", "GTH",
581
- "LTH", "SCONTAINS2", "SLEFTCONTAINS2", "SNOTCONTAINS",
582
- "SNOTCONTAINS2", "SLEFTNOTCONTAINS", "SLEFTNOTCONTAINS2",
583
- "SNOTOVERLAP", "SCROSS", "SDISTANCE", "SLENGTH", "SCENTER",
584
- "INTEGER_NUM", "HEX_DIGIT", "BIT_NUM", "REAL_NUMBER",
585
- "TRANS", "TEXT_STRING", "ID", "COMMENT", "WS" ]
569
+ "TRUNCATE", "UDF_0", "UDF_1", "UDF_2", "UDF_3", "UDF_4",
570
+ "UDF_5", "UDF_6", "UDF_7", "UDF_8", "UDF_9", "UNION_SYM",
571
+ "UNSIGNED_SYM", "UPDATE", "UPPER", "USE_SYM", "USING_SYM",
572
+ "UTC_DATE", "UTC_TIME", "UTC_TIMESTAMP", "VALUES",
573
+ "VARIANCE", "VAR_POP", "VAR_SAMP", "WHEN_SYM", "WHERE",
574
+ "WITH", "YEAR", "ASCII_SYM", "LATIN1", "UTF8", "SPOINT",
575
+ "SCIRCLE", "SLINE", "SELLIPSE", "SPOLY", "SPATH",
576
+ "SBOX", "STRANS", "AREA", "ARRAY_LENGTH", "SPOINT_TO_ARRAY",
577
+ "SBOX_TO_ARRAY", "SCIRCLE_TO_ARRAY", "SPOLY_TO_ARRAY",
578
+ "SPOINT_TO_ARRAY_DEG", "SBOX_TO_ARRAY_DEG", "SCIRCLE_TO_ARRAY_DEG",
579
+ "SPOLY_TO_ARRAY_DEG", "DIVIDE", "MOD_SYM", "OR_SYM",
580
+ "AND_SYM", "ABS_VAL_OR_SCONTAINS", "DFACTORIAL", "EQ",
581
+ "NOT_EQ", "LET", "GET", "SHIFT_LEFT", "SHIFT_RIGHT",
582
+ "SEMI", "COLON", "DOT", "COMMA", "ASTERISK", "RPAREN",
583
+ "LPAREN", "RBRACK", "LBRACK", "PLUS", "MINUS", "NEGATION",
584
+ "VERTBAR", "BITAND", "POWER_OP", "GTH", "LTH", "SCONTAINS2",
585
+ "SLEFTCONTAINS2", "SNOTCONTAINS", "SNOTCONTAINS2",
586
+ "SLEFTNOTCONTAINS", "SLEFTNOTCONTAINS2", "SNOTOVERLAP",
587
+ "SCROSS", "SDISTANCE", "SLENGTH", "SCENTER", "INTEGER_NUM",
588
+ "HEX_DIGIT", "BIT_NUM", "REAL_NUMBER", "TRANS", "TEXT_STRING",
589
+ "ID", "COMMENT", "WS" ]
586
590
 
587
591
  RULE_relational_op = 0
588
592
  RULE_cast_data_type = 1
@@ -855,93 +859,103 @@ class PostgreSQLParser ( Parser ):
855
859
  TIMESTAMP=139
856
860
  TRUE_SYM=140
857
861
  TRUNCATE=141
858
- UNION_SYM=142
859
- UNSIGNED_SYM=143
860
- UPDATE=144
861
- UPPER=145
862
- USE_SYM=146
863
- USING_SYM=147
864
- UTC_DATE=148
865
- UTC_TIME=149
866
- UTC_TIMESTAMP=150
867
- VALUES=151
868
- VARIANCE=152
869
- VAR_POP=153
870
- VAR_SAMP=154
871
- WHEN_SYM=155
872
- WHERE=156
873
- WITH=157
874
- YEAR=158
875
- ASCII_SYM=159
876
- LATIN1=160
877
- UTF8=161
878
- SPOINT=162
879
- SCIRCLE=163
880
- SLINE=164
881
- SELLIPSE=165
882
- SPOLY=166
883
- SPATH=167
884
- SBOX=168
885
- STRANS=169
886
- AREA=170
887
- ARRAY_LENGTH=171
888
- SPOINT_TO_ARRAY=172
889
- SBOX_TO_ARRAY=173
890
- SCIRCLE_TO_ARRAY=174
891
- SPOLY_TO_ARRAY=175
892
- SPOINT_TO_ARRAY_DEG=176
893
- SBOX_TO_ARRAY_DEG=177
894
- SCIRCLE_TO_ARRAY_DEG=178
895
- SPOLY_TO_ARRAY_DEG=179
896
- DIVIDE=180
897
- MOD_SYM=181
898
- OR_SYM=182
899
- AND_SYM=183
900
- ABS_VAL_OR_SCONTAINS=184
901
- DFACTORIAL=185
902
- EQ=186
903
- NOT_EQ=187
904
- LET=188
905
- GET=189
906
- SHIFT_LEFT=190
907
- SHIFT_RIGHT=191
908
- SEMI=192
909
- COLON=193
910
- DOT=194
911
- COMMA=195
912
- ASTERISK=196
913
- RPAREN=197
914
- LPAREN=198
915
- RBRACK=199
916
- LBRACK=200
917
- PLUS=201
918
- MINUS=202
919
- NEGATION=203
920
- VERTBAR=204
921
- BITAND=205
922
- POWER_OP=206
923
- GTH=207
924
- LTH=208
925
- SCONTAINS2=209
926
- SLEFTCONTAINS2=210
927
- SNOTCONTAINS=211
928
- SNOTCONTAINS2=212
929
- SLEFTNOTCONTAINS=213
930
- SLEFTNOTCONTAINS2=214
931
- SNOTOVERLAP=215
932
- SCROSS=216
933
- SDISTANCE=217
934
- SLENGTH=218
935
- SCENTER=219
936
- INTEGER_NUM=220
937
- HEX_DIGIT=221
938
- BIT_NUM=222
939
- REAL_NUMBER=223
940
- TRANS=224
941
- TEXT_STRING=225
942
- ID=226
943
- COMMENT=227
944
- WS=228
862
+ UDF_0=142
863
+ UDF_1=143
864
+ UDF_2=144
865
+ UDF_3=145
866
+ UDF_4=146
867
+ UDF_5=147
868
+ UDF_6=148
869
+ UDF_7=149
870
+ UDF_8=150
871
+ UDF_9=151
872
+ UNION_SYM=152
873
+ UNSIGNED_SYM=153
874
+ UPDATE=154
875
+ UPPER=155
876
+ USE_SYM=156
877
+ USING_SYM=157
878
+ UTC_DATE=158
879
+ UTC_TIME=159
880
+ UTC_TIMESTAMP=160
881
+ VALUES=161
882
+ VARIANCE=162
883
+ VAR_POP=163
884
+ VAR_SAMP=164
885
+ WHEN_SYM=165
886
+ WHERE=166
887
+ WITH=167
888
+ YEAR=168
889
+ ASCII_SYM=169
890
+ LATIN1=170
891
+ UTF8=171
892
+ SPOINT=172
893
+ SCIRCLE=173
894
+ SLINE=174
895
+ SELLIPSE=175
896
+ SPOLY=176
897
+ SPATH=177
898
+ SBOX=178
899
+ STRANS=179
900
+ AREA=180
901
+ ARRAY_LENGTH=181
902
+ SPOINT_TO_ARRAY=182
903
+ SBOX_TO_ARRAY=183
904
+ SCIRCLE_TO_ARRAY=184
905
+ SPOLY_TO_ARRAY=185
906
+ SPOINT_TO_ARRAY_DEG=186
907
+ SBOX_TO_ARRAY_DEG=187
908
+ SCIRCLE_TO_ARRAY_DEG=188
909
+ SPOLY_TO_ARRAY_DEG=189
910
+ DIVIDE=190
911
+ MOD_SYM=191
912
+ OR_SYM=192
913
+ AND_SYM=193
914
+ ABS_VAL_OR_SCONTAINS=194
915
+ DFACTORIAL=195
916
+ EQ=196
917
+ NOT_EQ=197
918
+ LET=198
919
+ GET=199
920
+ SHIFT_LEFT=200
921
+ SHIFT_RIGHT=201
922
+ SEMI=202
923
+ COLON=203
924
+ DOT=204
925
+ COMMA=205
926
+ ASTERISK=206
927
+ RPAREN=207
928
+ LPAREN=208
929
+ RBRACK=209
930
+ LBRACK=210
931
+ PLUS=211
932
+ MINUS=212
933
+ NEGATION=213
934
+ VERTBAR=214
935
+ BITAND=215
936
+ POWER_OP=216
937
+ GTH=217
938
+ LTH=218
939
+ SCONTAINS2=219
940
+ SLEFTCONTAINS2=220
941
+ SNOTCONTAINS=221
942
+ SNOTCONTAINS2=222
943
+ SLEFTNOTCONTAINS=223
944
+ SLEFTNOTCONTAINS2=224
945
+ SNOTOVERLAP=225
946
+ SCROSS=226
947
+ SDISTANCE=227
948
+ SLENGTH=228
949
+ SCENTER=229
950
+ INTEGER_NUM=230
951
+ HEX_DIGIT=231
952
+ BIT_NUM=232
953
+ REAL_NUMBER=233
954
+ TRANS=234
955
+ TEXT_STRING=235
956
+ ID=236
957
+ COMMENT=237
958
+ WS=238
945
959
 
946
960
  def __init__(self, input:TokenStream, output:TextIO = sys.stdout):
947
961
  super().__init__(input, output)
@@ -1000,7 +1014,7 @@ class PostgreSQLParser ( Parser ):
1000
1014
  self.enterOuterAlt(localctx, 1)
1001
1015
  self.state = 200
1002
1016
  _la = self._input.LA(1)
1003
- if not(((((_la - 186)) & ~0x3f) == 0 and ((1 << (_la - 186)) & 6291471) != 0)):
1017
+ if not(((((_la - 196)) & ~0x3f) == 0 and ((1 << (_la - 196)) & 6291471) != 0)):
1004
1018
  self._errHandler.recoverInline(self)
1005
1019
  else:
1006
1020
  self._errHandler.reportMatch(self)
@@ -1105,7 +1119,7 @@ class PostgreSQLParser ( Parser ):
1105
1119
  self.state = 206
1106
1120
  self._errHandler.sync(self)
1107
1121
  _la = self._input.LA(1)
1108
- if _la==198:
1122
+ if _la==208:
1109
1123
  self.state = 203
1110
1124
  self.match(PostgreSQLParser.LPAREN)
1111
1125
  self.state = 204
@@ -1122,7 +1136,7 @@ class PostgreSQLParser ( Parser ):
1122
1136
  self.state = 212
1123
1137
  self._errHandler.sync(self)
1124
1138
  _la = self._input.LA(1)
1125
- if _la==198:
1139
+ if _la==208:
1126
1140
  self.state = 209
1127
1141
  self.match(PostgreSQLParser.LPAREN)
1128
1142
  self.state = 210
@@ -1164,7 +1178,7 @@ class PostgreSQLParser ( Parser ):
1164
1178
  self.state = 227
1165
1179
  self._errHandler.sync(self)
1166
1180
  _la = self._input.LA(1)
1167
- if _la==198:
1181
+ if _la==208:
1168
1182
  self.state = 220
1169
1183
  self.match(PostgreSQLParser.LPAREN)
1170
1184
  self.state = 221
@@ -1172,7 +1186,7 @@ class PostgreSQLParser ( Parser ):
1172
1186
  self.state = 224
1173
1187
  self._errHandler.sync(self)
1174
1188
  _la = self._input.LA(1)
1175
- if _la==195:
1189
+ if _la==205:
1176
1190
  self.state = 222
1177
1191
  self.match(PostgreSQLParser.COMMA)
1178
1192
  self.state = 223
@@ -1396,10 +1410,10 @@ class PostgreSQLParser ( Parser ):
1396
1410
  self.state = 243
1397
1411
  self._errHandler.sync(self)
1398
1412
  _la = self._input.LA(1)
1399
- if _la==201 or _la==202:
1413
+ if _la==211 or _la==212:
1400
1414
  self.state = 242
1401
1415
  _la = self._input.LA(1)
1402
- if not(_la==201 or _la==202):
1416
+ if not(_la==211 or _la==212):
1403
1417
  self._errHandler.recoverInline(self)
1404
1418
  else:
1405
1419
  self._errHandler.reportMatch(self)
@@ -1408,7 +1422,7 @@ class PostgreSQLParser ( Parser ):
1408
1422
 
1409
1423
  self.state = 245
1410
1424
  _la = self._input.LA(1)
1411
- if not(_la==220 or _la==223):
1425
+ if not(_la==230 or _la==233):
1412
1426
  self._errHandler.recoverInline(self)
1413
1427
  else:
1414
1428
  self._errHandler.reportMatch(self)
@@ -1550,7 +1564,7 @@ class PostgreSQLParser ( Parser ):
1550
1564
  self.enterOuterAlt(localctx, 1)
1551
1565
  self.state = 249
1552
1566
  _la = self._input.LA(1)
1553
- if not((((_la) & ~0x3f) == 0 and ((1 << _la) & 503349248) != 0) or ((((_la - 73)) & ~0x3f) == 0 and ((1 << (_la - 73)) & 1152976342749282755) != 0) or _la==145 or _la==159):
1567
+ if not((((_la) & ~0x3f) == 0 and ((1 << _la) & 503349248) != 0) or ((((_la - 73)) & ~0x3f) == 0 and ((1 << (_la - 73)) & 1152976342749282755) != 0) or _la==155 or _la==169):
1554
1568
  self._errHandler.recoverInline(self)
1555
1569
  else:
1556
1570
  self._errHandler.reportMatch(self)
@@ -1633,7 +1647,7 @@ class PostgreSQLParser ( Parser ):
1633
1647
  self.enterOuterAlt(localctx, 1)
1634
1648
  self.state = 251
1635
1649
  _la = self._input.LA(1)
1636
- if not((((_la) & ~0x3f) == 0 and ((1 << _la) & 4295050240) != 0) or ((((_la - 82)) & ~0x3f) == 0 and ((1 << (_la - 82)) & 4996180836614153) != 0) or ((((_la - 152)) & ~0x3f) == 0 and ((1 << (_la - 152)) & 7) != 0)):
1650
+ if not((((_la) & ~0x3f) == 0 and ((1 << _la) & 4295050240) != 0) or ((((_la - 82)) & ~0x3f) == 0 and ((1 << (_la - 82)) & 4996180836614153) != 0) or ((((_la - 162)) & ~0x3f) == 0 and ((1 << (_la - 162)) & 7) != 0)):
1637
1651
  self._errHandler.recoverInline(self)
1638
1652
  else:
1639
1653
  self._errHandler.reportMatch(self)
@@ -1891,7 +1905,7 @@ class PostgreSQLParser ( Parser ):
1891
1905
  self.enterOuterAlt(localctx, 1)
1892
1906
  self.state = 257
1893
1907
  _la = self._input.LA(1)
1894
- if not(((((_la - 34)) & ~0x3f) == 0 and ((1 << (_la - 34)) & 144115188075855875) != 0) or ((((_la - 119)) & ~0x3f) == 0 and ((1 << (_la - 119)) & 553515483137) != 0)):
1908
+ if not(((((_la - 34)) & ~0x3f) == 0 and ((1 << (_la - 34)) & 144115188075855875) != 0) or ((((_la - 119)) & ~0x3f) == 0 and ((1 << (_la - 119)) & 566798245691393) != 0)):
1895
1909
  self._errHandler.recoverInline(self)
1896
1910
  else:
1897
1911
  self._errHandler.reportMatch(self)
@@ -1959,6 +1973,36 @@ class PostgreSQLParser ( Parser ):
1959
1973
  def PDIST(self):
1960
1974
  return self.getToken(PostgreSQLParser.PDIST, 0)
1961
1975
 
1976
+ def UDF_0(self):
1977
+ return self.getToken(PostgreSQLParser.UDF_0, 0)
1978
+
1979
+ def UDF_1(self):
1980
+ return self.getToken(PostgreSQLParser.UDF_1, 0)
1981
+
1982
+ def UDF_2(self):
1983
+ return self.getToken(PostgreSQLParser.UDF_2, 0)
1984
+
1985
+ def UDF_3(self):
1986
+ return self.getToken(PostgreSQLParser.UDF_3, 0)
1987
+
1988
+ def UDF_4(self):
1989
+ return self.getToken(PostgreSQLParser.UDF_4, 0)
1990
+
1991
+ def UDF_5(self):
1992
+ return self.getToken(PostgreSQLParser.UDF_5, 0)
1993
+
1994
+ def UDF_6(self):
1995
+ return self.getToken(PostgreSQLParser.UDF_6, 0)
1996
+
1997
+ def UDF_7(self):
1998
+ return self.getToken(PostgreSQLParser.UDF_7, 0)
1999
+
2000
+ def UDF_8(self):
2001
+ return self.getToken(PostgreSQLParser.UDF_8, 0)
2002
+
2003
+ def UDF_9(self):
2004
+ return self.getToken(PostgreSQLParser.UDF_9, 0)
2005
+
1962
2006
  def getRuleIndex(self):
1963
2007
  return PostgreSQLParser.RULE_custom_functions
1964
2008
 
@@ -1982,7 +2026,7 @@ class PostgreSQLParser ( Parser ):
1982
2026
  self.enterOuterAlt(localctx, 1)
1983
2027
  self.state = 261
1984
2028
  _la = self._input.LA(1)
1985
- if not(_la==58 or _la==100):
2029
+ if not(_la==58 or ((((_la - 100)) & ~0x3f) == 0 and ((1 << (_la - 100)) & 4499201580859393) != 0)):
1986
2030
  self._errHandler.recoverInline(self)
1987
2031
  else:
1988
2032
  self._errHandler.reportMatch(self)
@@ -2099,12 +2143,12 @@ class PostgreSQLParser ( Parser ):
2099
2143
  self.state = 265
2100
2144
  self.number_functions()
2101
2145
  pass
2102
- elif token in [15, 25, 26, 27, 28, 73, 74, 79, 80, 81, 110, 111, 112, 113, 117, 118, 133, 145, 159]:
2146
+ elif token in [15, 25, 26, 27, 28, 73, 74, 79, 80, 81, 110, 111, 112, 113, 117, 118, 133, 155, 169]:
2103
2147
  self.enterOuterAlt(localctx, 2)
2104
2148
  self.state = 266
2105
2149
  self.char_functions()
2106
2150
  pass
2107
- elif token in [34, 35, 91, 119, 138, 139, 148, 149, 150, 158]:
2151
+ elif token in [34, 35, 91, 119, 138, 139, 158, 159, 160, 168]:
2108
2152
  self.enterOuterAlt(localctx, 3)
2109
2153
  self.state = 267
2110
2154
  self.time_functions()
@@ -2114,17 +2158,17 @@ class PostgreSQLParser ( Parser ):
2114
2158
  self.state = 268
2115
2159
  self.other_functions()
2116
2160
  pass
2117
- elif token in [170]:
2161
+ elif token in [180]:
2118
2162
  self.enterOuterAlt(localctx, 5)
2119
2163
  self.state = 269
2120
2164
  self.pg_sphere_functions()
2121
2165
  pass
2122
- elif token in [171]:
2166
+ elif token in [181]:
2123
2167
  self.enterOuterAlt(localctx, 6)
2124
2168
  self.state = 270
2125
2169
  self.array_functions()
2126
2170
  pass
2127
- elif token in [58, 100]:
2171
+ elif token in [58, 100, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151]:
2128
2172
  self.enterOuterAlt(localctx, 7)
2129
2173
  self.state = 271
2130
2174
  self.custom_functions()
@@ -2193,17 +2237,17 @@ class PostgreSQLParser ( Parser ):
2193
2237
  self.state = 280
2194
2238
  self._errHandler.sync(self)
2195
2239
  token = self._input.LA(1)
2196
- if token in [225]:
2240
+ if token in [235]:
2197
2241
  self.enterOuterAlt(localctx, 1)
2198
2242
  self.state = 274
2199
2243
  self.string_literal()
2200
2244
  pass
2201
- elif token in [201, 202, 220, 223]:
2245
+ elif token in [211, 212, 230, 233]:
2202
2246
  self.enterOuterAlt(localctx, 2)
2203
2247
  self.state = 275
2204
2248
  self.number_literal()
2205
2249
  pass
2206
- elif token in [221]:
2250
+ elif token in [231]:
2207
2251
  self.enterOuterAlt(localctx, 3)
2208
2252
  self.state = 276
2209
2253
  self.hex_literal()
@@ -2213,7 +2257,7 @@ class PostgreSQLParser ( Parser ):
2213
2257
  self.state = 277
2214
2258
  self.boolean_literal()
2215
2259
  pass
2216
- elif token in [222]:
2260
+ elif token in [232]:
2217
2261
  self.enterOuterAlt(localctx, 5)
2218
2262
  self.state = 278
2219
2263
  self.bit_literal()
@@ -2356,7 +2400,7 @@ class PostgreSQLParser ( Parser ):
2356
2400
  self.state = 293
2357
2401
  self._errHandler.sync(self)
2358
2402
  _la = self._input.LA(1)
2359
- if _la==156:
2403
+ if _la==166:
2360
2404
  self.state = 292
2361
2405
  self.where_clause()
2362
2406
 
@@ -2526,7 +2570,7 @@ class PostgreSQLParser ( Parser ):
2526
2570
  self.state = 327
2527
2571
  self._errHandler.sync(self)
2528
2572
  _la = self._input.LA(1)
2529
- if _la==204:
2573
+ if _la==214:
2530
2574
  self.state = 325
2531
2575
  self.match(PostgreSQLParser.VERTBAR)
2532
2576
  self.state = 326
@@ -2603,7 +2647,7 @@ class PostgreSQLParser ( Parser ):
2603
2647
  self.state = 336
2604
2648
  self._errHandler.sync(self)
2605
2649
  _la = self._input.LA(1)
2606
- if ((((_la - 186)) & ~0x3f) == 0 and ((1 << (_la - 186)) & 6291471) != 0):
2650
+ if ((((_la - 196)) & ~0x3f) == 0 and ((1 << (_la - 196)) & 6291471) != 0):
2607
2651
  self.state = 330
2608
2652
  self.relational_op()
2609
2653
  self.state = 332
@@ -2700,11 +2744,11 @@ class PostgreSQLParser ( Parser ):
2700
2744
  self.state = 348
2701
2745
  self._errHandler.sync(self)
2702
2746
  token = self._input.LA(1)
2703
- if token in [155]:
2747
+ if token in [165]:
2704
2748
  self.state = 346
2705
2749
  self.case_when_statement1()
2706
2750
  pass
2707
- elif token in [1, 2, 6, 8, 9, 10, 13, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 145, 148, 149, 150, 152, 153, 154, 158, 159, 170, 171, 184, 185, 198, 201, 202, 203, 220, 221, 222, 223, 225, 226]:
2751
+ elif token in [1, 2, 6, 8, 9, 10, 13, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 155, 158, 159, 160, 162, 163, 164, 168, 169, 180, 181, 194, 195, 208, 211, 212, 213, 230, 231, 232, 233, 235, 236]:
2708
2752
  self.state = 347
2709
2753
  self.case_when_statement2()
2710
2754
  pass
@@ -2801,7 +2845,7 @@ class PostgreSQLParser ( Parser ):
2801
2845
  self.state = 363
2802
2846
  self._errHandler.sync(self)
2803
2847
  _la = self._input.LA(1)
2804
- if not (_la==155):
2848
+ if not (_la==165):
2805
2849
  break
2806
2850
 
2807
2851
  except RecognitionException as re:
@@ -2877,7 +2921,7 @@ class PostgreSQLParser ( Parser ):
2877
2921
  self.state = 373
2878
2922
  self._errHandler.sync(self)
2879
2923
  _la = self._input.LA(1)
2880
- if not (_la==155):
2924
+ if not (_la==165):
2881
2925
  break
2882
2926
 
2883
2927
  except RecognitionException as re:
@@ -2943,7 +2987,7 @@ class PostgreSQLParser ( Parser ):
2943
2987
  self.state = 381
2944
2988
  self._errHandler.sync(self)
2945
2989
  _la = self._input.LA(1)
2946
- while _la==195:
2990
+ while _la==205:
2947
2991
  self.state = 377
2948
2992
  self.match(PostgreSQLParser.COMMA)
2949
2993
  self.state = 378
@@ -3079,7 +3123,7 @@ class PostgreSQLParser ( Parser ):
3079
3123
  self.state = 400
3080
3124
  self._errHandler.sync(self)
3081
3125
  _la = self._input.LA(1)
3082
- if _la==200:
3126
+ if _la==210:
3083
3127
  self.state = 399
3084
3128
  self.slice_spec()
3085
3129
 
@@ -3207,7 +3251,7 @@ class PostgreSQLParser ( Parser ):
3207
3251
  self.state = 416
3208
3252
  self._errHandler.sync(self)
3209
3253
  _la = self._input.LA(1)
3210
- if _la==7 or _la==226:
3254
+ if _la==7 or _la==236:
3211
3255
  self.state = 415
3212
3256
  self.alias()
3213
3257
 
@@ -3286,35 +3330,35 @@ class PostgreSQLParser ( Parser ):
3286
3330
  self.state = 428
3287
3331
  self._errHandler.sync(self)
3288
3332
  token = self._input.LA(1)
3289
- if token in [176]:
3333
+ if token in [186]:
3290
3334
  self.state = 420
3291
3335
  self.spoint_to_array_deg()
3292
3336
  pass
3293
- elif token in [172]:
3337
+ elif token in [182]:
3294
3338
  self.state = 421
3295
3339
  self.spoint_to_array()
3296
3340
  pass
3297
- elif token in [177]:
3341
+ elif token in [187]:
3298
3342
  self.state = 422
3299
3343
  self.sbox_to_array_deg()
3300
3344
  pass
3301
- elif token in [173]:
3345
+ elif token in [183]:
3302
3346
  self.state = 423
3303
3347
  self.sbox_to_array()
3304
3348
  pass
3305
- elif token in [178]:
3349
+ elif token in [188]:
3306
3350
  self.state = 424
3307
3351
  self.scircle_to_array_deg()
3308
3352
  pass
3309
- elif token in [174]:
3353
+ elif token in [184]:
3310
3354
  self.state = 425
3311
3355
  self.scircle_to_array()
3312
3356
  pass
3313
- elif token in [179]:
3357
+ elif token in [189]:
3314
3358
  self.state = 426
3315
3359
  self.spoly_to_array_deg()
3316
3360
  pass
3317
- elif token in [175]:
3361
+ elif token in [185]:
3318
3362
  self.state = 427
3319
3363
  self.spoly_to_array()
3320
3364
  pass
@@ -3376,7 +3420,7 @@ class PostgreSQLParser ( Parser ):
3376
3420
  self.state = 435
3377
3421
  self._errHandler.sync(self)
3378
3422
  _la = self._input.LA(1)
3379
- while _la==183:
3423
+ while _la==193:
3380
3424
  self.state = 431
3381
3425
  self.match(PostgreSQLParser.AND_SYM)
3382
3426
  self.state = 432
@@ -3620,7 +3664,7 @@ class PostgreSQLParser ( Parser ):
3620
3664
  self.state = 466
3621
3665
  self._errHandler.sync(self)
3622
3666
  _la = self._input.LA(1)
3623
- while _la==182:
3667
+ while _la==192:
3624
3668
  self.state = 462
3625
3669
  self.match(PostgreSQLParser.OR_SYM)
3626
3670
  self.state = 463
@@ -3692,7 +3736,7 @@ class PostgreSQLParser ( Parser ):
3692
3736
  self.state = 475
3693
3737
  self._errHandler.sync(self)
3694
3738
  _la = self._input.LA(1)
3695
- while _la==195:
3739
+ while _la==205:
3696
3740
  self.state = 471
3697
3741
  self.match(PostgreSQLParser.COMMA)
3698
3742
  self.state = 472
@@ -3755,7 +3799,7 @@ class PostgreSQLParser ( Parser ):
3755
3799
  self.state = 483
3756
3800
  self._errHandler.sync(self)
3757
3801
  _la = self._input.LA(1)
3758
- if _la==205:
3802
+ if _la==215:
3759
3803
  self.state = 481
3760
3804
  self.match(PostgreSQLParser.BITAND)
3761
3805
  self.state = 482
@@ -3817,10 +3861,10 @@ class PostgreSQLParser ( Parser ):
3817
3861
  self.state = 488
3818
3862
  self._errHandler.sync(self)
3819
3863
  _la = self._input.LA(1)
3820
- if _la==190 or _la==191:
3864
+ if _la==200 or _la==201:
3821
3865
  self.state = 486
3822
3866
  _la = self._input.LA(1)
3823
- if not(_la==190 or _la==191):
3867
+ if not(_la==200 or _la==201):
3824
3868
  self._errHandler.recoverInline(self)
3825
3869
  else:
3826
3870
  self._errHandler.reportMatch(self)
@@ -3890,10 +3934,10 @@ class PostgreSQLParser ( Parser ):
3890
3934
  self.state = 495
3891
3935
  self._errHandler.sync(self)
3892
3936
  _la = self._input.LA(1)
3893
- while _la==201 or _la==202:
3937
+ while _la==211 or _la==212:
3894
3938
  self.state = 491
3895
3939
  _la = self._input.LA(1)
3896
- if not(_la==201 or _la==202):
3940
+ if not(_la==211 or _la==212):
3897
3941
  self._errHandler.recoverInline(self)
3898
3942
  else:
3899
3943
  self._errHandler.reportMatch(self)
@@ -3977,10 +4021,10 @@ class PostgreSQLParser ( Parser ):
3977
4021
  self.state = 503
3978
4022
  self._errHandler.sync(self)
3979
4023
  _la = self._input.LA(1)
3980
- while ((((_la - 180)) & ~0x3f) == 0 and ((1 << (_la - 180)) & 67174403) != 0):
4024
+ while ((((_la - 190)) & ~0x3f) == 0 and ((1 << (_la - 190)) & 67174403) != 0):
3981
4025
  self.state = 499
3982
4026
  _la = self._input.LA(1)
3983
- if not(((((_la - 180)) & ~0x3f) == 0 and ((1 << (_la - 180)) & 67174403) != 0)):
4027
+ if not(((((_la - 190)) & ~0x3f) == 0 and ((1 << (_la - 190)) & 67174403) != 0)):
3984
4028
  self._errHandler.recoverInline(self)
3985
4029
  else:
3986
4030
  self._errHandler.reportMatch(self)
@@ -4069,7 +4113,7 @@ class PostgreSQLParser ( Parser ):
4069
4113
  if la_ == 1:
4070
4114
  self.state = 506
4071
4115
  _la = self._input.LA(1)
4072
- if not(_la==13 or ((((_la - 184)) & ~0x3f) == 0 and ((1 << (_la - 184)) & 917507) != 0)):
4116
+ if not(_la==13 or ((((_la - 194)) & ~0x3f) == 0 and ((1 << (_la - 194)) & 917507) != 0)):
4073
4117
  self._errHandler.recoverInline(self)
4074
4118
  else:
4075
4119
  self._errHandler.reportMatch(self)
@@ -4092,7 +4136,7 @@ class PostgreSQLParser ( Parser ):
4092
4136
  if la_ == 1:
4093
4137
  self.state = 513
4094
4138
  _la = self._input.LA(1)
4095
- if not(_la==201 or _la==202):
4139
+ if not(_la==211 or _la==212):
4096
4140
  self._errHandler.recoverInline(self)
4097
4141
  else:
4098
4142
  self._errHandler.reportMatch(self)
@@ -4209,26 +4253,26 @@ class PostgreSQLParser ( Parser ):
4209
4253
  self.state = 567
4210
4254
  self._errHandler.sync(self)
4211
4255
  token = self._input.LA(1)
4212
- if token in [1, 2, 6, 8, 9, 15, 21, 22, 23, 25, 26, 27, 28, 30, 31, 34, 35, 39, 41, 45, 49, 54, 58, 73, 74, 77, 78, 79, 80, 81, 83, 86, 91, 100, 101, 103, 104, 106, 107, 110, 111, 112, 113, 115, 117, 118, 119, 122, 124, 126, 127, 131, 133, 136, 138, 139, 141, 145, 148, 149, 150, 158, 159, 170, 171]:
4256
+ if token in [1, 2, 6, 8, 9, 15, 21, 22, 23, 25, 26, 27, 28, 30, 31, 34, 35, 39, 41, 45, 49, 54, 58, 73, 74, 77, 78, 79, 80, 81, 83, 86, 91, 100, 101, 103, 104, 106, 107, 110, 111, 112, 113, 115, 117, 118, 119, 122, 124, 126, 127, 131, 133, 136, 138, 139, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 155, 158, 159, 160, 168, 169, 180, 181]:
4213
4257
  self.enterOuterAlt(localctx, 1)
4214
4258
  self.state = 517
4215
4259
  self.functionList()
4216
4260
  self.state = 530
4217
4261
  self._errHandler.sync(self)
4218
4262
  _la = self._input.LA(1)
4219
- if _la==198:
4263
+ if _la==208:
4220
4264
  self.state = 518
4221
4265
  self.match(PostgreSQLParser.LPAREN)
4222
4266
  self.state = 527
4223
4267
  self._errHandler.sync(self)
4224
4268
  _la = self._input.LA(1)
4225
- if (((_la) & ~0x3f) == 0 and ((1 << _la) & 309378992668534598) != 0) or ((((_la - 66)) & ~0x3f) == 0 and ((1 << (_la - 66)) & -774914371848767103) != 0) or ((((_la - 130)) & ~0x3f) == 0 and ((1 << (_la - 130)) & 54047040360714075) != 0) or ((((_la - 198)) & ~0x3f) == 0 and ((1 << (_la - 198)) & 468713529) != 0):
4269
+ if (((_la) & ~0x3f) == 0 and ((1 << _la) & 309378992668534598) != 0) or ((((_la - 66)) & ~0x3f) == 0 and ((1 << (_la - 66)) & -774914371848767103) != 0) or ((((_la - 130)) & ~0x3f) == 0 and ((1 << (_la - 130)) & 3937108242726747) != 0) or ((((_la - 194)) & ~0x3f) == 0 and ((1 << (_la - 194)) & 7679402459139) != 0):
4226
4270
  self.state = 519
4227
4271
  self.expression()
4228
4272
  self.state = 524
4229
4273
  self._errHandler.sync(self)
4230
4274
  _la = self._input.LA(1)
4231
- while _la==195:
4275
+ while _la==205:
4232
4276
  self.state = 520
4233
4277
  self.match(PostgreSQLParser.COMMA)
4234
4278
  self.state = 521
@@ -4293,7 +4337,7 @@ class PostgreSQLParser ( Parser ):
4293
4337
  self.state = 552
4294
4338
  self.match(PostgreSQLParser.RPAREN)
4295
4339
  pass
4296
- elif token in [10, 14, 16, 32, 82, 85, 128, 129, 130, 134, 152, 153, 154]:
4340
+ elif token in [10, 14, 16, 32, 82, 85, 128, 129, 130, 134, 162, 163, 164]:
4297
4341
  self.enterOuterAlt(localctx, 5)
4298
4342
  self.state = 554
4299
4343
  self.group_functions()
@@ -4302,10 +4346,10 @@ class PostgreSQLParser ( Parser ):
4302
4346
  self.state = 557
4303
4347
  self._errHandler.sync(self)
4304
4348
  _la = self._input.LA(1)
4305
- if _la==3 or _la==42 or _la==196:
4349
+ if _la==3 or _la==42 or _la==206:
4306
4350
  self.state = 556
4307
4351
  _la = self._input.LA(1)
4308
- if not(_la==3 or _la==42 or _la==196):
4352
+ if not(_la==3 or _la==42 or _la==206):
4309
4353
  self._errHandler.recoverInline(self)
4310
4354
  else:
4311
4355
  self._errHandler.reportMatch(self)
@@ -4315,7 +4359,7 @@ class PostgreSQLParser ( Parser ):
4315
4359
  self.state = 563
4316
4360
  self._errHandler.sync(self)
4317
4361
  _la = self._input.LA(1)
4318
- if (((_la) & ~0x3f) == 0 and ((1 << _la) & 309378992668534598) != 0) or ((((_la - 66)) & ~0x3f) == 0 and ((1 << (_la - 66)) & -774914371857155711) != 0) or ((((_la - 130)) & ~0x3f) == 0 and ((1 << (_la - 130)) & 54047040360714075) != 0) or ((((_la - 198)) & ~0x3f) == 0 and ((1 << (_la - 198)) & 468713529) != 0):
4362
+ if (((_la) & ~0x3f) == 0 and ((1 << _la) & 309378992668534598) != 0) or ((((_la - 66)) & ~0x3f) == 0 and ((1 << (_la - 66)) & -774914371857155711) != 0) or ((((_la - 130)) & ~0x3f) == 0 and ((1 << (_la - 130)) & 3937108242726747) != 0) or ((((_la - 194)) & ~0x3f) == 0 and ((1 << (_la - 194)) & 7679402459139) != 0):
4319
4363
  self.state = 561
4320
4364
  self._errHandler.sync(self)
4321
4365
  la_ = self._interp.adaptivePredict(self._input,58,self._ctx)
@@ -4409,7 +4453,7 @@ class PostgreSQLParser ( Parser ):
4409
4453
  self.state = 576
4410
4454
  self._errHandler.sync(self)
4411
4455
  _la = self._input.LA(1)
4412
- while _la==195:
4456
+ while _la==205:
4413
4457
  self.state = 572
4414
4458
  self.match(PostgreSQLParser.COMMA)
4415
4459
  self.state = 573
@@ -4421,7 +4465,7 @@ class PostgreSQLParser ( Parser ):
4421
4465
  self.state = 581
4422
4466
  self._errHandler.sync(self)
4423
4467
  _la = self._input.LA(1)
4424
- if _la==157:
4468
+ if _la==167:
4425
4469
  self.state = 579
4426
4470
  self.match(PostgreSQLParser.WITH)
4427
4471
  self.state = 580
@@ -4623,7 +4667,7 @@ class PostgreSQLParser ( Parser ):
4623
4667
  self.state = 614
4624
4668
  self._errHandler.sync(self)
4625
4669
  token = self._input.LA(1)
4626
- if token in [146]:
4670
+ if token in [156]:
4627
4671
  self.enterOuterAlt(localctx, 1)
4628
4672
  self.state = 594
4629
4673
  self.match(PostgreSQLParser.USE_SYM)
@@ -4634,7 +4678,7 @@ class PostgreSQLParser ( Parser ):
4634
4678
  self.state = 598
4635
4679
  self._errHandler.sync(self)
4636
4680
  _la = self._input.LA(1)
4637
- if _la==226:
4681
+ if _la==236:
4638
4682
  self.state = 597
4639
4683
  self.index_list()
4640
4684
 
@@ -4831,7 +4875,7 @@ class PostgreSQLParser ( Parser ):
4831
4875
  self.state = 631
4832
4876
  self._errHandler.sync(self)
4833
4877
  _la = self._input.LA(1)
4834
- while _la==195:
4878
+ while _la==205:
4835
4879
  self.state = 627
4836
4880
  self.match(PostgreSQLParser.COMMA)
4837
4881
  self.state = 628
@@ -5041,7 +5085,7 @@ class PostgreSQLParser ( Parser ):
5041
5085
  self.state = 649
5042
5086
  self.expression()
5043
5087
  pass
5044
- elif token in [147]:
5088
+ elif token in [157]:
5045
5089
  self.enterOuterAlt(localctx, 2)
5046
5090
  self.state = 650
5047
5091
  self.match(PostgreSQLParser.USING_SYM)
@@ -5328,7 +5372,7 @@ class PostgreSQLParser ( Parser ):
5328
5372
  self.state = 681
5329
5373
  self._errHandler.sync(self)
5330
5374
  _la = self._input.LA(1)
5331
- while _la==195:
5375
+ while _la==205:
5332
5376
  self.state = 677
5333
5377
  self.match(PostgreSQLParser.COMMA)
5334
5378
  self.state = 678
@@ -5456,7 +5500,7 @@ class PostgreSQLParser ( Parser ):
5456
5500
  self.match(PostgreSQLParser.USING_SYM)
5457
5501
  self.state = 696
5458
5502
  _la = self._input.LA(1)
5459
- if not(_la==207 or _la==208):
5503
+ if not(_la==217 or _la==218):
5460
5504
  self._errHandler.recoverInline(self)
5461
5505
  else:
5462
5506
  self._errHandler.reportMatch(self)
@@ -5617,7 +5661,7 @@ class PostgreSQLParser ( Parser ):
5617
5661
  self.state = 712
5618
5662
  self._errHandler.sync(self)
5619
5663
  _la = self._input.LA(1)
5620
- while _la==195:
5664
+ while _la==205:
5621
5665
  self.state = 708
5622
5666
  self.match(PostgreSQLParser.COMMA)
5623
5667
  self.state = 709
@@ -6123,14 +6167,14 @@ class PostgreSQLParser ( Parser ):
6123
6167
  self.state = 795
6124
6168
  self._errHandler.sync(self)
6125
6169
  token = self._input.LA(1)
6126
- if token in [1, 2, 6, 8, 9, 10, 13, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 145, 148, 149, 150, 152, 153, 154, 158, 159, 162, 163, 164, 165, 166, 167, 168, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 184, 185, 198, 201, 202, 203, 218, 219, 220, 221, 222, 223, 225, 226]:
6170
+ if token in [1, 2, 6, 8, 9, 10, 13, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 155, 158, 159, 160, 162, 163, 164, 168, 169, 172, 173, 174, 175, 176, 177, 178, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 194, 195, 208, 211, 212, 213, 228, 229, 230, 231, 232, 233, 235, 236]:
6127
6171
  self.enterOuterAlt(localctx, 1)
6128
6172
  self.state = 766
6129
6173
  self.displayed_column()
6130
6174
  self.state = 771
6131
6175
  self._errHandler.sync(self)
6132
6176
  _la = self._input.LA(1)
6133
- while _la==195:
6177
+ while _la==205:
6134
6178
  self.state = 767
6135
6179
  self.match(PostgreSQLParser.COMMA)
6136
6180
  self.state = 768
@@ -6140,14 +6184,14 @@ class PostgreSQLParser ( Parser ):
6140
6184
  _la = self._input.LA(1)
6141
6185
 
6142
6186
  pass
6143
- elif token in [196]:
6187
+ elif token in [206]:
6144
6188
  self.enterOuterAlt(localctx, 2)
6145
6189
  self.state = 774
6146
6190
  self.match(PostgreSQLParser.ASTERISK)
6147
6191
  self.state = 784
6148
6192
  self._errHandler.sync(self)
6149
6193
  _la = self._input.LA(1)
6150
- if _la==195:
6194
+ if _la==205:
6151
6195
  self.state = 775
6152
6196
  self.match(PostgreSQLParser.COMMA)
6153
6197
  self.state = 776
@@ -6155,7 +6199,7 @@ class PostgreSQLParser ( Parser ):
6155
6199
  self.state = 781
6156
6200
  self._errHandler.sync(self)
6157
6201
  _la = self._input.LA(1)
6158
- while _la==195:
6202
+ while _la==205:
6159
6203
  self.state = 777
6160
6204
  self.match(PostgreSQLParser.COMMA)
6161
6205
  self.state = 778
@@ -6177,7 +6221,7 @@ class PostgreSQLParser ( Parser ):
6177
6221
  self.state = 792
6178
6222
  self._errHandler.sync(self)
6179
6223
  _la = self._input.LA(1)
6180
- while _la==195:
6224
+ while _la==205:
6181
6225
  self.state = 788
6182
6226
  self.match(PostgreSQLParser.COMMA)
6183
6227
  self.state = 789
@@ -6315,7 +6359,7 @@ class PostgreSQLParser ( Parser ):
6315
6359
  self.state = 813
6316
6360
  self._errHandler.sync(self)
6317
6361
  _la = self._input.LA(1)
6318
- while _la==142:
6362
+ while _la==152:
6319
6363
  self.state = 806
6320
6364
  self.match(PostgreSQLParser.UNION_SYM)
6321
6365
  self.state = 808
@@ -6535,7 +6579,7 @@ class PostgreSQLParser ( Parser ):
6535
6579
  self.state = 833
6536
6580
  self._errHandler.sync(self)
6537
6581
  _la = self._input.LA(1)
6538
- if _la==193:
6582
+ if _la==203:
6539
6583
  self.state = 831
6540
6584
  self.match(PostgreSQLParser.COLON)
6541
6585
  self.state = 832
@@ -6547,7 +6591,7 @@ class PostgreSQLParser ( Parser ):
6547
6591
  self.state = 838
6548
6592
  self._errHandler.sync(self)
6549
6593
  _la = self._input.LA(1)
6550
- if not (_la==200):
6594
+ if not (_la==210):
6551
6595
  break
6552
6596
 
6553
6597
  except RecognitionException as re:
@@ -6712,7 +6756,7 @@ class PostgreSQLParser ( Parser ):
6712
6756
  self.state = 849
6713
6757
  self._errHandler.sync(self)
6714
6758
  _la = self._input.LA(1)
6715
- if _la==7 or _la==226:
6759
+ if _la==7 or _la==236:
6716
6760
  self.state = 848
6717
6761
  self.alias()
6718
6762
 
@@ -6720,7 +6764,7 @@ class PostgreSQLParser ( Parser ):
6720
6764
  self.state = 852
6721
6765
  self._errHandler.sync(self)
6722
6766
  _la = self._input.LA(1)
6723
- if _la==56 or _la==61 or _la==146:
6767
+ if _la==56 or _la==61 or _la==156:
6724
6768
  self.state = 851
6725
6769
  self.index_hint_list()
6726
6770
 
@@ -7286,7 +7330,7 @@ class PostgreSQLParser ( Parser ):
7286
7330
  self.state = 930
7287
7331
  self._errHandler.sync(self)
7288
7332
  _la = self._input.LA(1)
7289
- if _la==198:
7333
+ if _la==208:
7290
7334
  self.state = 929
7291
7335
  self.column_list()
7292
7336
 
@@ -7349,7 +7393,7 @@ class PostgreSQLParser ( Parser ):
7349
7393
  self.state = 939
7350
7394
  self._errHandler.sync(self)
7351
7395
  _la = self._input.LA(1)
7352
- while _la==195:
7396
+ while _la==205:
7353
7397
  self.state = 935
7354
7398
  self.match(PostgreSQLParser.COMMA)
7355
7399
  self.state = 936
@@ -7478,7 +7522,7 @@ class PostgreSQLParser ( Parser ):
7478
7522
  self.state = 955
7479
7523
  self._errHandler.sync(self)
7480
7524
  _la = self._input.LA(1)
7481
- while _la==195:
7525
+ while _la==205:
7482
7526
  self.state = 951
7483
7527
  self.match(PostgreSQLParser.COMMA)
7484
7528
  self.state = 952
@@ -7603,7 +7647,7 @@ class PostgreSQLParser ( Parser ):
7603
7647
  self.enterOuterAlt(localctx, 1)
7604
7648
  self.state = 961
7605
7649
  _la = self._input.LA(1)
7606
- if not(((((_la - 183)) & ~0x3f) == 0 and ((1 << (_la - 183)) & 8523874307) != 0)):
7650
+ if not(((((_la - 193)) & ~0x3f) == 0 and ((1 << (_la - 193)) & 8523874307) != 0)):
7607
7651
  self._errHandler.recoverInline(self)
7608
7652
  else:
7609
7653
  self._errHandler.reportMatch(self)
@@ -7738,11 +7782,11 @@ class PostgreSQLParser ( Parser ):
7738
7782
  self.state = 965
7739
7783
  self._errHandler.sync(self)
7740
7784
  token = self._input.LA(1)
7741
- if token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 145, 148, 149, 150, 152, 153, 154, 158, 159, 163, 164, 165, 166, 167, 168, 170, 171, 198, 201, 202, 220, 221, 222, 223, 225, 226]:
7785
+ if token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 155, 158, 159, 160, 162, 163, 164, 168, 169, 173, 174, 175, 176, 177, 178, 180, 181, 208, 211, 212, 230, 231, 232, 233, 235, 236]:
7742
7786
  self.state = 963
7743
7787
  self.pg_sphere_object()
7744
7788
  pass
7745
- elif token in [162]:
7789
+ elif token in [172]:
7746
7790
  self.state = 964
7747
7791
  self.spoint()
7748
7792
  pass
@@ -7756,11 +7800,11 @@ class PostgreSQLParser ( Parser ):
7756
7800
  self.state = 969
7757
7801
  self._errHandler.sync(self)
7758
7802
  token = self._input.LA(1)
7759
- if token in [162]:
7803
+ if token in [172]:
7760
7804
  self.state = 967
7761
7805
  self.spoint()
7762
7806
  pass
7763
- elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 145, 148, 149, 150, 152, 153, 154, 158, 159, 170, 171, 198, 201, 202, 220, 221, 222, 223, 225, 226]:
7807
+ elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 155, 158, 159, 160, 162, 163, 164, 168, 169, 180, 181, 208, 211, 212, 230, 231, 232, 233, 235, 236]:
7764
7808
  self.state = 968
7765
7809
  self.simple_expr()
7766
7810
  pass
@@ -7825,15 +7869,15 @@ class PostgreSQLParser ( Parser ):
7825
7869
  self.state = 993
7826
7870
  self._errHandler.sync(self)
7827
7871
  token = self._input.LA(1)
7828
- if token in [162]:
7872
+ if token in [172]:
7829
7873
  self.state = 990
7830
7874
  self.spoint()
7831
7875
  pass
7832
- elif token in [163]:
7876
+ elif token in [173]:
7833
7877
  self.state = 991
7834
7878
  self.scircle()
7835
7879
  pass
7836
- elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 145, 148, 149, 150, 152, 153, 154, 158, 159, 170, 171, 198, 201, 202, 220, 221, 222, 223, 225, 226]:
7880
+ elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 155, 158, 159, 160, 162, 163, 164, 168, 169, 180, 181, 208, 211, 212, 230, 231, 232, 233, 235, 236]:
7837
7881
  self.state = 992
7838
7882
  self.simple_expr()
7839
7883
  pass
@@ -7845,15 +7889,15 @@ class PostgreSQLParser ( Parser ):
7845
7889
  self.state = 999
7846
7890
  self._errHandler.sync(self)
7847
7891
  token = self._input.LA(1)
7848
- if token in [162]:
7892
+ if token in [172]:
7849
7893
  self.state = 996
7850
7894
  self.spoint()
7851
7895
  pass
7852
- elif token in [163]:
7896
+ elif token in [173]:
7853
7897
  self.state = 997
7854
7898
  self.scircle()
7855
7899
  pass
7856
- elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 145, 148, 149, 150, 152, 153, 154, 158, 159, 170, 171, 198, 201, 202, 220, 221, 222, 223, 225, 226]:
7900
+ elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 155, 158, 159, 160, 162, 163, 164, 168, 169, 180, 181, 208, 211, 212, 230, 231, 232, 233, 235, 236]:
7857
7901
  self.state = 998
7858
7902
  self.simple_expr()
7859
7903
  pass
@@ -7869,19 +7913,19 @@ class PostgreSQLParser ( Parser ):
7869
7913
  self.state = 1006
7870
7914
  self._errHandler.sync(self)
7871
7915
  token = self._input.LA(1)
7872
- if token in [163]:
7916
+ if token in [173]:
7873
7917
  self.state = 1002
7874
7918
  self.scircle()
7875
7919
  pass
7876
- elif token in [168]:
7920
+ elif token in [178]:
7877
7921
  self.state = 1003
7878
7922
  self.sbox()
7879
7923
  pass
7880
- elif token in [166]:
7924
+ elif token in [176]:
7881
7925
  self.state = 1004
7882
7926
  self.spoly()
7883
7927
  pass
7884
- elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 145, 148, 149, 150, 152, 153, 154, 158, 159, 170, 171, 198, 201, 202, 220, 221, 222, 223, 225, 226]:
7928
+ elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 155, 158, 159, 160, 162, 163, 164, 168, 169, 180, 181, 208, 211, 212, 230, 231, 232, 233, 235, 236]:
7885
7929
  self.state = 1005
7886
7930
  self.simple_expr()
7887
7931
  pass
@@ -7897,15 +7941,15 @@ class PostgreSQLParser ( Parser ):
7897
7941
  self.state = 1012
7898
7942
  self._errHandler.sync(self)
7899
7943
  token = self._input.LA(1)
7900
- if token in [163]:
7944
+ if token in [173]:
7901
7945
  self.state = 1009
7902
7946
  self.scircle()
7903
7947
  pass
7904
- elif token in [165]:
7948
+ elif token in [175]:
7905
7949
  self.state = 1010
7906
7950
  self.sellipse()
7907
7951
  pass
7908
- elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 145, 148, 149, 150, 152, 153, 154, 158, 159, 170, 171, 198, 201, 202, 220, 221, 222, 223, 225, 226]:
7952
+ elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 155, 158, 159, 160, 162, 163, 164, 168, 169, 180, 181, 208, 211, 212, 230, 231, 232, 233, 235, 236]:
7909
7953
  self.state = 1011
7910
7954
  self.simple_expr()
7911
7955
  pass
@@ -7921,15 +7965,15 @@ class PostgreSQLParser ( Parser ):
7921
7965
  self.state = 1018
7922
7966
  self._errHandler.sync(self)
7923
7967
  token = self._input.LA(1)
7924
- if token in [164]:
7968
+ if token in [174]:
7925
7969
  self.state = 1015
7926
7970
  self.sline()
7927
7971
  pass
7928
- elif token in [167]:
7972
+ elif token in [177]:
7929
7973
  self.state = 1016
7930
7974
  self.spath()
7931
7975
  pass
7932
- elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 145, 148, 149, 150, 152, 153, 154, 158, 159, 170, 171, 198, 201, 202, 220, 221, 222, 223, 225, 226]:
7976
+ elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 155, 158, 159, 160, 162, 163, 164, 168, 169, 180, 181, 208, 211, 212, 230, 231, 232, 233, 235, 236]:
7933
7977
  self.state = 1017
7934
7978
  self.simple_expr()
7935
7979
  pass
@@ -7943,31 +7987,31 @@ class PostgreSQLParser ( Parser ):
7943
7987
  self.state = 1027
7944
7988
  self._errHandler.sync(self)
7945
7989
  token = self._input.LA(1)
7946
- if token in [162]:
7990
+ if token in [172]:
7947
7991
  self.state = 1020
7948
7992
  self.spoint()
7949
7993
  pass
7950
- elif token in [163]:
7994
+ elif token in [173]:
7951
7995
  self.state = 1021
7952
7996
  self.scircle()
7953
7997
  pass
7954
- elif token in [164]:
7998
+ elif token in [174]:
7955
7999
  self.state = 1022
7956
8000
  self.sline()
7957
8001
  pass
7958
- elif token in [165]:
8002
+ elif token in [175]:
7959
8003
  self.state = 1023
7960
8004
  self.sellipse()
7961
8005
  pass
7962
- elif token in [166]:
8006
+ elif token in [176]:
7963
8007
  self.state = 1024
7964
8008
  self.spoly()
7965
8009
  pass
7966
- elif token in [167]:
8010
+ elif token in [177]:
7967
8011
  self.state = 1025
7968
8012
  self.spath()
7969
8013
  pass
7970
- elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 145, 148, 149, 150, 152, 153, 154, 158, 159, 170, 171, 198, 201, 202, 220, 221, 222, 223, 225, 226]:
8014
+ elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 155, 158, 159, 160, 162, 163, 164, 168, 169, 180, 181, 208, 211, 212, 230, 231, 232, 233, 235, 236]:
7971
8015
  self.state = 1026
7972
8016
  self.simple_expr()
7973
8017
  pass
@@ -7981,10 +8025,10 @@ class PostgreSQLParser ( Parser ):
7981
8025
  self.state = 1030
7982
8026
  self._errHandler.sync(self)
7983
8027
  _la = self._input.LA(1)
7984
- if _la==201 or _la==202:
8028
+ if _la==211 or _la==212:
7985
8029
  self.state = 1029
7986
8030
  _la = self._input.LA(1)
7987
- if not(_la==201 or _la==202):
8031
+ if not(_la==211 or _la==212):
7988
8032
  self._errHandler.recoverInline(self)
7989
8033
  else:
7990
8034
  self._errHandler.reportMatch(self)
@@ -7996,7 +8040,7 @@ class PostgreSQLParser ( Parser ):
7996
8040
  self.state = 1035
7997
8041
  self._errHandler.sync(self)
7998
8042
  _la = self._input.LA(1)
7999
- if not (((((_la - 169)) & ~0x3f) == 0 and ((1 << (_la - 169)) & 12884901889) != 0)):
8043
+ if not (((((_la - 179)) & ~0x3f) == 0 and ((1 << (_la - 179)) & 12884901889) != 0)):
8000
8044
  break
8001
8045
 
8002
8046
  pass
@@ -9149,37 +9193,37 @@ class PostgreSQLParser ( Parser ):
9149
9193
  self.state = 1167
9150
9194
  self._errHandler.sync(self)
9151
9195
  token = self._input.LA(1)
9152
- if token in [163]:
9196
+ if token in [173]:
9153
9197
  self.enterOuterAlt(localctx, 1)
9154
9198
  self.state = 1160
9155
9199
  self.scircle()
9156
9200
  pass
9157
- elif token in [164]:
9201
+ elif token in [174]:
9158
9202
  self.enterOuterAlt(localctx, 2)
9159
9203
  self.state = 1161
9160
9204
  self.sline()
9161
9205
  pass
9162
- elif token in [165]:
9206
+ elif token in [175]:
9163
9207
  self.enterOuterAlt(localctx, 3)
9164
9208
  self.state = 1162
9165
9209
  self.sellipse()
9166
9210
  pass
9167
- elif token in [168]:
9211
+ elif token in [178]:
9168
9212
  self.enterOuterAlt(localctx, 4)
9169
9213
  self.state = 1163
9170
9214
  self.sbox()
9171
9215
  pass
9172
- elif token in [166]:
9216
+ elif token in [176]:
9173
9217
  self.enterOuterAlt(localctx, 5)
9174
9218
  self.state = 1164
9175
9219
  self.spoly()
9176
9220
  pass
9177
- elif token in [167]:
9221
+ elif token in [177]:
9178
9222
  self.enterOuterAlt(localctx, 6)
9179
9223
  self.state = 1165
9180
9224
  self.spath()
9181
9225
  pass
9182
- elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 145, 148, 149, 150, 152, 153, 154, 158, 159, 170, 171, 198, 201, 202, 220, 221, 222, 223, 225, 226]:
9226
+ elif token in [1, 2, 6, 8, 9, 10, 14, 15, 16, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 39, 41, 45, 48, 49, 51, 54, 58, 66, 73, 74, 77, 78, 79, 80, 81, 82, 83, 85, 86, 91, 92, 100, 101, 102, 103, 104, 106, 107, 110, 111, 112, 113, 115, 116, 117, 118, 119, 122, 124, 126, 127, 128, 129, 130, 131, 133, 134, 136, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 155, 158, 159, 160, 162, 163, 164, 168, 169, 180, 181, 208, 211, 212, 230, 231, 232, 233, 235, 236]:
9183
9227
  self.enterOuterAlt(localctx, 7)
9184
9228
  self.state = 1166
9185
9229
  self.simple_expr()