From 1929b634a1f746d6ae774a8e6102949474822f01 Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <evgeniy@nspcc.ru>
Date: Fri, 9 Sep 2022 14:34:49 +0300
Subject: [PATCH] [#332] netmap/parser: Disallow trailing garbage

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
---
 netmap/parser/Query.g4               |   2 +-
 netmap/parser/Query.interp           | Bin 4346 -> 4300 bytes
 netmap/parser/QueryLexer.interp      | Bin 7060 -> 6957 bytes
 netmap/parser/query_base_listener.go |   2 +-
 netmap/parser/query_base_visitor.go  |   2 +-
 netmap/parser/query_lexer.go         | 303 +++++++------
 netmap/parser/query_listener.go      |   2 +-
 netmap/parser/query_parser.go        | 643 +++++++++++++++++++--------
 netmap/parser/query_visitor.go       |   2 +-
 netmap/policy_test.go                |   1 +
 10 files changed, 617 insertions(+), 340 deletions(-)

diff --git a/netmap/parser/Query.g4 b/netmap/parser/Query.g4
index fc74c6fc..52fcb4fa 100644
--- a/netmap/parser/Query.g4
+++ b/netmap/parser/Query.g4
@@ -4,7 +4,7 @@ options {
     tokenVocab = QueryLexer;
 }
 
-policy: repStmt+ cbfStmt? selectStmt* filterStmt*;
+policy: repStmt+ cbfStmt? selectStmt* filterStmt* EOF;
 
 repStmt:
     REP Count = NUMBER1     // number of object replicas
diff --git a/netmap/parser/Query.interp b/netmap/parser/Query.interp
index 9512ecb628462c54d2fb7c893a4d88015cbb1ffc..298ddaebe73fcd27e8b70021fc7ba1a1add1ab2d 100644
GIT binary patch
literal 4300
zcmaKvTTdfL5QX3SSMWv>5y|bl_bFbOjjR|O+1?-}iV(1~5?XVSF-rLN`<<$p@pQ96
z8oIkqpQ<`lGoESokKf9NqwU?k++A;v9<J}p=MUlGWxEZ>)5Y0wI9{%fD|=O3V9yo|
z(>25C$4`vwVqTnXSbSP7&o#~Fn*yKXU$i+rFPP3|>&<Lote-G{=I^&Es;BC-t*|#u
z&#(74kK4Q3L=>8?mKR~U(zu?TU(5@wkQQc(FkJ^k1(y^gD7c((Ih&uIPFH8)bUyvO
zF0Lf3Uf1fv{OV%5Di&c?&C^YoofV5sSbRSJSgd0Bt5_|=db64>eh-)H5Oy!yvX=KG
zt*>EMKCSon`*3^n)#m4NTi)&++Frjrm*MN(mSz|KJ?*NcZI%c7kMgzJ`SW`FQqukV
zn{pSvm9PIk?!JV(FXhAD$IH_Y!u9^)L-@OYauiRFy8OjnhsDVe<H$zVz^p~Ei?uI$
zhBIOk0i2Qbz}Aechqh*94Z$zgV_P$_p4gg^b@arVWL2p>cLX7TChd88O>Dy_IivIw
zmQl`{;0nib00-IVt9WK(3I(cAEUwDCk1GNNwAg)8{*aBzHrss|e|UKT1J~mWmFGp)
zqm!}`lWXWIn!O4|1KJvtc-h){Bc_H&BzQiehxI!nj?(P@@9^4Dpm9xr$SEH>s)>Sy
zlbOB=uqWr8QO|)t4gWJDOPr3k!Rh4m%&s}=2?2AM#F)(pMeE3;%f7=>3#Xp66vZdM
zXQ~8OO|k1Y#@3jEebUNERr145D*?_}#9`qgEUyBCNLR$YD-M`)b-^$_nj(pNuv8{>
z0J4_`?K#->GTHVEbf7r3?S2ELZb6uX%#l<hiEObXek?(4413~t+Y>68{5n|*tF~(U
zfvJLG=B|Fk=(oFJszFh;x09=5vD>uA$!cNj=I$iYYXxpofLhg+fL1xi0Z1^6ysdf_
zspAO`yO*`BM?$@(nAm|J4XlJGzQVFTm|s?LkK*)#!(A(nN3Ft>cyRQ>OE6;fvcB}d
z`e<tNWcM>IiY0Esqa3|HRSHWK$PufLl@KBIv&2duZo(6m6(YNz-6X|&BTxk+kPxWw
ziewYNokG8b0e~{qOtZ1T^mBCg0W}QJ2iSx(8w=Q<JR=X}npJF=;??1l);$x5;szAM
z4r7&AHZtUWP*VXlN#Q7NsM%g_?kjt!m~G!78HZUVL)|ZQ0~6UhA&&62K*QKhFzlf+
zw8Y3BB0TMkq$qpB6b3WFu!rbKFzlh<PsXY|RwEQD3t{wLWMia1TqU7q%GOsg)gxcA
z+j$IwmSEVKM7;_}WB_(8N{Wr5#1jQ0Rbz5~^(_IT>IQnN<qR;wTd6S#B@kfjmR^di
zxCH16-Oe+{5GGj4oT&2Dm)cW~U?L|NUK8*HBg&YR($Z)YF!oX!u55k#l^HG!kq|J}
z4Fq9>kxRgsg4icng<+@OB%6rL+~mMEjHn5Qq2on@5n9|gnDo_I6;C!mf+=^_2Yt#W
zRmr&dC18S>L(Pf^F!8&}c16UV_)TrSAcP#g;m(X5=GZ|F3H52LVQJKXhg_`?u_K)w
zKxu$ZA`4)WsDmgh>mX`U$05B#$Zuq&QtWmU{5x%GYJcOB!;>bcoE0Sj$zaDY1SFDG
zwt9|(KIxS>JtMIrpBfV2s5}xBD?bQCI})h}Sw3rVjaw26740-4Jky~%s&k!7GaZJi
ztBDRnvq#U)mHCOp&n;?tyU$U8{cDy)Rk`X6)aDmrKz^i&=BwtaW<3fnFWOqT1QNyz
z@gvcjd=}L_YN9HZcUSHSC_rbUtjB(~0=I_L9)8+-8$>NIkD6%t)QWa<1nO=gz)nVV
hMIU#4LhbXzo?g;=lj)akzgRn5+B0L1qgOWi=R3Yv5C8xG

literal 4346
zcmaKv-A)@x5QXpiDSXH7ii>I6<DXou1J24?FvxZmX;&*ml8J<3NCZZ^ynVh?)gDhb
z2x;8ib^27*shXi@*nR)j-1oM(yXN6$+q=KHYaZW)`={+T9L<)eN8#vVb(HMY{1SVy
zWSFfPPTqfDT+h$uCmR+YRu|`*7H69|K1aW4b9O#wI$f+ci>0xC!Tgoq?<uOMs=8L#
znWo3*yHDS@x1TdnXu7_*3>Pbn>&5xy*<356g~c+=)&Wt$B?SozE+<?q&Q4EetJ83D
zHv71qUrX42y;m2`t}kb+`7*51JlllD>3q2f%a7;p=c^e0p06&#db3(A{|Hy>5FVbk
z&0gLQX?+e4&5!l&ZWlg(`fBrIvu!@_9NOMIJvQO%?UrWG|NrrjmbTd(>_405wDZ@^
z_Nk%!cb}Sv@U40N@B71-aQmgX-}!iT5<<Ay-M<U}432yK;W*aEy<vYm9Uk`vgK8{m
zTu;Zxy*L_=0AoEE01m2pI>DhonTW}XUmR4>Ss(YNHu@H8Hd%AA_60FmEBtY9WNSv&
zWCCYoO#;@8tXcTQI+6xMldR|#lPpiJNfwF4^!yP-7L)c|f+n`%BY<(hPmwh_F1|Lf
z9Kb`in&L!<v4Mv`dw)!><UfQZt#Y+7@k#qSUs78>E-x>aUNb3z?<1B)cT6n9+cgU=
zyQ8?4a4M~ZiCC;LxyEcLwQo`hwvR+${l+M7Zf*+j2C*9k8rPJrC@V|dXHC?r4JNgW
zC0;x@Z;W)8-8V)A>JC&2PcmnwKBt;BMJ2Qa1`%cE6M>8q)1BTk{6SC!;`8fFe*aXK
zyj50TgYu;<aPgVM(63Ly#yD&pQYbkV&Mfvs0E;bQV12^(!IY{mzOenx-E%#-SYlJG
z$YoTK^@qeY@P4?#2)*`BwGgRlew5QfWUjsAEu_-Mcz0=P-h^L<!I>UZT2OC&kwYa%
zMeTa4s(3gPQg)^o{i#X_VaXF?AyRFNIt#OyO4KjhbyliHC~b?fUKN7GIUGHn-Rz>T
zhP9CrPj*qYo!)36FFOzvU!0<4hLxJJhh<)h)0v06ZkoqaSFpNG5JyK~hACFjLB$_R
zlST46WDg51idAYEQqGWCP@(4<1#-mFMix+|mx)yz+>9rzEX3`MMyOJs9`c%6h(I#0
zLw1c6F#GE<yk@T^8lZ5;uyw3+*%O72SWIGfQyW&OPM#S}UGWTPO-Zn8icwa?CeVS*
z7mpDHc=~H`o`4ZSGv^WYjc^4NZr6xOuNgGT+j}9BHo9pHgP391qoO+5Bf>LvdLu1L
zpLq*|nPJ$Y;*QE5Q6yVBo0Dz<ER}|R9SK-t^#Kl4Kxdjwj$Dv@#qK6I3?RcWNR>fU
ztuHTN&!AA)>BVut)PGkZ=`N7f7-<5$*K!s>G{unVOn`~X0d#~d0eUBQ<xGeyOx}ca
zRXTOYSQ$|PAZHlH6g<PIZ<4gM8U;+SkkWEx>t%n?&F(}$-4UX)!KkzV6O^$>@PuLK
z-U_Dzp|m;R8rID#jI{O<ypJX<aWh|G02zjn-skN4rC4Pj^p=`>$torhB@!`*n!yF=
zdz*<d5m`+sQ9Zy%2cDQ9<?Aa}6dfxn!rxx>Mm5B~Z}JeaB2KI*LK?`D{^|{i6?t5q
z%P=5TP!&aq$YTNIt*@tUYhop-((?+6SB^^VivSX&97=bnJ60-OI1cs^<0_;*R`_I*
z9mOL@@h)HJQFkWlxi9kR2Di94{ESL}3@>!38{*^{4F!4yB~Ff_LEl?Bs21rSb!#!8
z{0Om6m8cs8)t?np4bVqL7FB8NgHtuD9^Z}XtKrH@7)(RhjxVIye}wYLLn}4zIjA=1
zlvTdYJ+-xP<!e3cQ!2g`Es{K1qG`js-))XSF#BABY@Zu=>OE?2ATS-%I^T3I=x^2^
OT6<>vLz@hU`1dDLSRRG|

diff --git a/netmap/parser/QueryLexer.interp b/netmap/parser/QueryLexer.interp
index d453ff6e05930c0ed8b54aaca3ea4cceb2712edd..80a47ce78550f67276c2402cfc6719ca56b462ca 100644
GIT binary patch
literal 6957
zcmc(jTW=dT5QX3OSLn@c;R2#{&r=m^-3XN>Lz0oAMPay!(HeDZAaNf0?{mHxa(Bs1
zgA{!zpylOoICEymC1>^g^w-_v;NkxH?)~k<;PLj|-G>*|<Hv`G>SVcHom3~g{YmWa
z>nruwTNTTLiu0EjDi8IhK0m5)vEN-%tvAP7b56cvaCup)TCESq_12`mQTJOtKSZr=
zYS`^n&&KJ)-|v2Zdbod+krJny-Bq>QQy$irSDTuas8#E2wLDZJRXL>!LY330UavQ+
z^W}b3oo|-chx!I$sh!wWo13fUzTQ^*STB#&dR1?a)%N=GWxWs8FZF&`9gh3;_Q&e=
zp{m}0e7H;W{vT$m`#<iVtL@X{TW@@ZXni=ZuD9#+-Kwr$)jwB<<wZ^BYPa4V4{~Kw
z=h$j@{ZbeXzWMX^@$s(N7pwYWdA&K_9Cts}+ne)O%k8$_RIk=6MX9RZJ-uzBkt8p%
zTHQWBzNmg3pALqngR^it2#fjYV0t?EUhOkOXFjH((}CKKYe;RC`i-ouQf(;`u2SuZ
zwN<Jujlxx`t%m>9mNB(es=ctbO0|RNXn=}dH0`#75XMw7=H{vBIRPqqPJxP^lc1vK
z9H{6y5h{94g-X3M=R!r#xlqy5g9e)VITtE=&V`DebD^T=T&U<d7b>ZhozIp6i=U<n
z`H!WOoym4|-d0q4HBglDL`b)kH$u9lJQC6`-M6nPMME0?snnWi^lM5sk3>^NQ@<}&
z9!WM9QvbU0fUy&q?qN!mhlriXn1`oRfdh_w8LSO`FnCap1>kp_?4e};qS3>ZDi06)
z7sd3(5<rGFim6ddJ&^)x9&INNTdGhlu&t!gdK1@ZZB4OS8m*p6T-vPtg(|6<y4Rmo
zHFK{!s@Sm5nW-TTX~dU{Hxa(7kfS$?MB|7r5AP^)U#ffsd4G{4l5ORS!21g*{*toy
zcOi|iVqM}8f%dVe%GV4?&JjCJkgR^1EMb{a!<8zGSk@S}9A+CaMG|S<(h6WwLS~YA
zD8wA}kVQ47q-=zo#zw+4ovlZOl$4K=QhSUB;bWH?yVO`C0@*oKlA)4FTn+WyCpFl5
z6YQAKR6+}(3u+#Xgt%%5OEJQ(e<a%Ws0%Ty^DGo3d!(8RD-2m&D{OarLA34tvscDk
zHVTOlRBU@efyvHLEC><yc#^GrFcQlLC2f`^O5jJR)N?kJA!#L|)==Aj2&T3pk}MF&
z<uaJbk$9>#dew->PzLpt$KxZD>Z@-TwGoUjPSaN-z9AXZCvUqjXKx#_fclZKjhRc?
z9xb5$M7Cu&UTU+$x{xMuWOX4;n)%z^IHXCOC0!}SYR=Z{kYFw5rAZl>7gKo^**@7^
znOGF@w_|z8UhWvN6)9KU)}&l_Ta|b(G@jUzU`1CahRfx#wJ8_KP7W(N(>X>$xgs1Y
zfg_|#-d2+Hqzl^2Nf8g5IV(YC&WeC=Duh`PIu4Uit_5dSm?PdH&j}Xh#dO;^<r1-V
zxcWqb^TR`GfMyF|heS}oR81rs5TNjfoi`Q6WKHqO08^0?$Oem`fWq&o`tZO=I~i5*
z)a1s?sdh6LEn_Vm0a3CuUBmQ{Y^Mw8NpgB3l1Tz2>tg5BSwt>uBt;~G0{W7gGm}^@
zNzci*JW+)I4M*63>FHtesl;I4!^E?Pl{Q4AG$HjYo@lnq1u&Nlfh}nO76nN){RdDG
zM9n+~OjVRqYc4iKL-G-Xo|;|SZ2Gx4Vp>lW6u`!3tW_z%GQlJzS&k}R24-tG&KAJM
z4Jbtp+D-1>5X}e*h<R^|$sJOo%r?Nn-Dv{^Kw_X@yHhMvi2jI2v?GA@0Y(i?08#=B
zNmG<0xRUOM$j;fJ#xd0J3?O0XF11T(h~)@KHw<Fl;eN3{T~8PaDbL(sXE>=qVNl&L
zbl-SGk_zY!-McmphJ<11pCMrwm#jli&A{G}jgB)QF~4_fDudl7>;%b<RryG;Oj6x$
z=z?7`EHQdp&Yo-u)34oj!M=J3zu-=gJS%e#+vN|WBr)gikYfS43DK-}B8Pu?g65Wo
z`NkC~xI@n_O;SzZW^Z`%$=z8f5fUH*+?q6MT&nuDyDr!@%jbaLu5KamBcXN1Z(m<S
zKI)<~d<DcWfewg=BlV@1D>BN0@H7Z*zpLFp&c!4vgfujl#k-L#s<unoJq%>q_7w^)
zo2-WErj1}J&o;G5$(~6Y%9IS%bo+|UQCSWnCS<aP;(Ue*=ouq~=1L}N`2_pe9f+|2
z=-IL?V=Twvm&^qK0@NUwv8;u(LZVWYw8EaRiXv#1l#EN)5VUXZTr<AfgrwH&flg?3
zQ2_Hg10@nH<H=AKp6rJGBg2s~2(if3vi1{Mlq^wBvaBN+4s+Dz4T8}G$0CkC_PODN
zv6pmP%577UVv{8nW$JAlLYbpGO8%6QHh^p?M+pY5<S1e>3+XsWo)tJ%@LO|a0xOnU
z@QN3HbFzhqlT7mJn>_I-^O0c5h)qd~O_msy`G;}v37M?LsOJj+saEEpsl=5WMJ)N<
zI%tXYghlU~Gt@$op#-5P3J}vW^5hsevN!wJ#bcLH!oxv|CXI075(?%Ao01f?C{r?2
z(|hj|*Kvq>mfarFAW$H)!k}b0xf2w)4NIKe!F5sM>IcsB5*K9ea+jffZIF4%E4ODR
z1@zux`v$R8%XVI3Ef>qrApbHU*V3R=MN!MfWF!mGLcKs@B?9^-QGBzZ1Zlv;0{K?1
z0igWsaWT@cTozzaE|UQyVjAGGOC;3nodCXV$Z-4;up`%wF+VX_Tz`k;d$7%EJ0{YO
H(fI8X@5$ho

literal 7060
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
ZY=^#Qupz~}<*$b?PhTC0HXd|+|0k~h`(OY7

diff --git a/netmap/parser/query_base_listener.go b/netmap/parser/query_base_listener.go
index d872ae1d..ae77aae8 100644
--- a/netmap/parser/query_base_listener.go
+++ b/netmap/parser/query_base_listener.go
@@ -1,4 +1,4 @@
-// Code generated from Query.g4 by ANTLR 4.9.2. DO NOT EDIT.
+// Code generated from Query.g4 by ANTLR 4.10.1. DO NOT EDIT.
 
 package parser // Query
 
diff --git a/netmap/parser/query_base_visitor.go b/netmap/parser/query_base_visitor.go
index 69c59f7d..a7e3599e 100644
--- a/netmap/parser/query_base_visitor.go
+++ b/netmap/parser/query_base_visitor.go
@@ -1,4 +1,4 @@
-// Code generated from Query.g4 by ANTLR 4.9.2. DO NOT EDIT.
+// Code generated from Query.g4 by ANTLR 4.10.1. DO NOT EDIT.
 
 package parser // Query
 
diff --git a/netmap/parser/query_lexer.go b/netmap/parser/query_lexer.go
index 05d8f212..f4b08b8f 100644
--- a/netmap/parser/query_lexer.go
+++ b/netmap/parser/query_lexer.go
@@ -1,9 +1,10 @@
-// Code generated from QueryLexer.g4 by ANTLR 4.9.2. DO NOT EDIT.
+// Code generated from QueryLexer.g4 by ANTLR 4.10.1. DO NOT EDIT.
 
 package parser
 
 import (
 	"fmt"
+	"sync"
 	"unicode"
 
 	"github.com/antlr/antlr4/runtime/Go/antlr"
@@ -11,127 +12,9 @@ import (
 
 // Suppress unused import error
 var _ = fmt.Printf
+var _ = sync.Once{}
 var _ = unicode.IsLetter
 
-var serializedLexerAtn = []uint16{
-	3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 23, 200,
-	8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7,
-	9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12,
-	4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4,
-	18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23,
-	9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9,
-	28, 4, 29, 9, 29, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4,
-	3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 5, 4, 79, 10,
-	4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3,
-	8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 10, 3, 10,
-	3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3,
-	12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14,
-	3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 16, 3, 16, 3, 17, 3,
-	17, 3, 18, 3, 18, 3, 18, 7, 18, 139, 10, 18, 12, 18, 14, 18, 142, 11, 18,
-	3, 19, 3, 19, 3, 20, 3, 20, 3, 21, 3, 21, 7, 21, 150, 10, 21, 12, 21, 14,
-	21, 153, 11, 21, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 7, 23, 160, 10, 23,
-	12, 23, 14, 23, 163, 11, 23, 3, 23, 3, 23, 3, 23, 3, 23, 7, 23, 169, 10,
-	23, 12, 23, 14, 23, 172, 11, 23, 3, 23, 5, 23, 175, 10, 23, 3, 24, 3, 24,
-	3, 24, 5, 24, 180, 10, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3,
-	26, 3, 26, 3, 27, 3, 27, 3, 28, 3, 28, 3, 29, 6, 29, 195, 10, 29, 13, 29,
-	14, 29, 196, 3, 29, 3, 29, 2, 2, 30, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13,
-	8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17,
-	33, 18, 35, 19, 37, 2, 39, 2, 41, 20, 43, 21, 45, 22, 47, 2, 49, 2, 51,
-	2, 53, 2, 55, 2, 57, 23, 3, 2, 10, 3, 2, 50, 59, 5, 2, 67, 92, 97, 97,
-	99, 124, 3, 2, 51, 59, 11, 2, 36, 36, 41, 41, 49, 49, 94, 94, 100, 100,
-	104, 104, 112, 112, 116, 116, 118, 118, 5, 2, 50, 59, 67, 72, 99, 104,
-	5, 2, 2, 33, 41, 41, 94, 94, 5, 2, 2, 33, 36, 36, 94, 94, 5, 2, 11, 12,
-	15, 15, 34, 34, 2, 207, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2,
-	2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3,
-	2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23,
-	3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2,
-	31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2,
-	2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 3, 59, 3, 2, 2,
-	2, 5, 63, 3, 2, 2, 2, 7, 78, 3, 2, 2, 2, 9, 80, 3, 2, 2, 2, 11, 84, 3,
-	2, 2, 2, 13, 87, 3, 2, 2, 2, 15, 90, 3, 2, 2, 2, 17, 94, 3, 2, 2, 2, 19,
-	101, 3, 2, 2, 2, 21, 106, 3, 2, 2, 2, 23, 113, 3, 2, 2, 2, 25, 115, 3,
-	2, 2, 2, 27, 120, 3, 2, 2, 2, 29, 129, 3, 2, 2, 2, 31, 131, 3, 2, 2, 2,
-	33, 133, 3, 2, 2, 2, 35, 135, 3, 2, 2, 2, 37, 143, 3, 2, 2, 2, 39, 145,
-	3, 2, 2, 2, 41, 147, 3, 2, 2, 2, 43, 154, 3, 2, 2, 2, 45, 174, 3, 2, 2,
-	2, 47, 176, 3, 2, 2, 2, 49, 181, 3, 2, 2, 2, 51, 187, 3, 2, 2, 2, 53, 189,
-	3, 2, 2, 2, 55, 191, 3, 2, 2, 2, 57, 194, 3, 2, 2, 2, 59, 60, 7, 67, 2,
-	2, 60, 61, 7, 80, 2, 2, 61, 62, 7, 70, 2, 2, 62, 4, 3, 2, 2, 2, 63, 64,
-	7, 81, 2, 2, 64, 65, 7, 84, 2, 2, 65, 6, 3, 2, 2, 2, 66, 67, 7, 71, 2,
-	2, 67, 79, 7, 83, 2, 2, 68, 69, 7, 80, 2, 2, 69, 79, 7, 71, 2, 2, 70, 71,
-	7, 73, 2, 2, 71, 79, 7, 71, 2, 2, 72, 73, 7, 73, 2, 2, 73, 79, 7, 86, 2,
-	2, 74, 75, 7, 78, 2, 2, 75, 79, 7, 86, 2, 2, 76, 77, 7, 78, 2, 2, 77, 79,
-	7, 71, 2, 2, 78, 66, 3, 2, 2, 2, 78, 68, 3, 2, 2, 2, 78, 70, 3, 2, 2, 2,
-	78, 72, 3, 2, 2, 2, 78, 74, 3, 2, 2, 2, 78, 76, 3, 2, 2, 2, 79, 8, 3, 2,
-	2, 2, 80, 81, 7, 84, 2, 2, 81, 82, 7, 71, 2, 2, 82, 83, 7, 82, 2, 2, 83,
-	10, 3, 2, 2, 2, 84, 85, 7, 75, 2, 2, 85, 86, 7, 80, 2, 2, 86, 12, 3, 2,
-	2, 2, 87, 88, 7, 67, 2, 2, 88, 89, 7, 85, 2, 2, 89, 14, 3, 2, 2, 2, 90,
-	91, 7, 69, 2, 2, 91, 92, 7, 68, 2, 2, 92, 93, 7, 72, 2, 2, 93, 16, 3, 2,
-	2, 2, 94, 95, 7, 85, 2, 2, 95, 96, 7, 71, 2, 2, 96, 97, 7, 78, 2, 2, 97,
-	98, 7, 71, 2, 2, 98, 99, 7, 69, 2, 2, 99, 100, 7, 86, 2, 2, 100, 18, 3,
-	2, 2, 2, 101, 102, 7, 72, 2, 2, 102, 103, 7, 84, 2, 2, 103, 104, 7, 81,
-	2, 2, 104, 105, 7, 79, 2, 2, 105, 20, 3, 2, 2, 2, 106, 107, 7, 72, 2, 2,
-	107, 108, 7, 75, 2, 2, 108, 109, 7, 78, 2, 2, 109, 110, 7, 86, 2, 2, 110,
-	111, 7, 71, 2, 2, 111, 112, 7, 84, 2, 2, 112, 22, 3, 2, 2, 2, 113, 114,
-	7, 44, 2, 2, 114, 24, 3, 2, 2, 2, 115, 116, 7, 85, 2, 2, 116, 117, 7, 67,
-	2, 2, 117, 118, 7, 79, 2, 2, 118, 119, 7, 71, 2, 2, 119, 26, 3, 2, 2, 2,
-	120, 121, 7, 70, 2, 2, 121, 122, 7, 75, 2, 2, 122, 123, 7, 85, 2, 2, 123,
-	124, 7, 86, 2, 2, 124, 125, 7, 75, 2, 2, 125, 126, 7, 80, 2, 2, 126, 127,
-	7, 69, 2, 2, 127, 128, 7, 86, 2, 2, 128, 28, 3, 2, 2, 2, 129, 130, 7, 42,
-	2, 2, 130, 30, 3, 2, 2, 2, 131, 132, 7, 43, 2, 2, 132, 32, 3, 2, 2, 2,
-	133, 134, 7, 66, 2, 2, 134, 34, 3, 2, 2, 2, 135, 140, 5, 39, 20, 2, 136,
-	139, 5, 37, 19, 2, 137, 139, 5, 39, 20, 2, 138, 136, 3, 2, 2, 2, 138, 137,
-	3, 2, 2, 2, 139, 142, 3, 2, 2, 2, 140, 138, 3, 2, 2, 2, 140, 141, 3, 2,
-	2, 2, 141, 36, 3, 2, 2, 2, 142, 140, 3, 2, 2, 2, 143, 144, 9, 2, 2, 2,
-	144, 38, 3, 2, 2, 2, 145, 146, 9, 3, 2, 2, 146, 40, 3, 2, 2, 2, 147, 151,
-	9, 4, 2, 2, 148, 150, 5, 37, 19, 2, 149, 148, 3, 2, 2, 2, 150, 153, 3,
-	2, 2, 2, 151, 149, 3, 2, 2, 2, 151, 152, 3, 2, 2, 2, 152, 42, 3, 2, 2,
-	2, 153, 151, 3, 2, 2, 2, 154, 155, 7, 50, 2, 2, 155, 44, 3, 2, 2, 2, 156,
-	161, 7, 36, 2, 2, 157, 160, 5, 47, 24, 2, 158, 160, 5, 55, 28, 2, 159,
-	157, 3, 2, 2, 2, 159, 158, 3, 2, 2, 2, 160, 163, 3, 2, 2, 2, 161, 159,
-	3, 2, 2, 2, 161, 162, 3, 2, 2, 2, 162, 164, 3, 2, 2, 2, 163, 161, 3, 2,
-	2, 2, 164, 175, 7, 36, 2, 2, 165, 170, 7, 41, 2, 2, 166, 169, 5, 47, 24,
-	2, 167, 169, 5, 53, 27, 2, 168, 166, 3, 2, 2, 2, 168, 167, 3, 2, 2, 2,
-	169, 172, 3, 2, 2, 2, 170, 168, 3, 2, 2, 2, 170, 171, 3, 2, 2, 2, 171,
-	173, 3, 2, 2, 2, 172, 170, 3, 2, 2, 2, 173, 175, 7, 41, 2, 2, 174, 156,
-	3, 2, 2, 2, 174, 165, 3, 2, 2, 2, 175, 46, 3, 2, 2, 2, 176, 179, 7, 94,
-	2, 2, 177, 180, 9, 5, 2, 2, 178, 180, 5, 49, 25, 2, 179, 177, 3, 2, 2,
-	2, 179, 178, 3, 2, 2, 2, 180, 48, 3, 2, 2, 2, 181, 182, 7, 119, 2, 2, 182,
-	183, 5, 51, 26, 2, 183, 184, 5, 51, 26, 2, 184, 185, 5, 51, 26, 2, 185,
-	186, 5, 51, 26, 2, 186, 50, 3, 2, 2, 2, 187, 188, 9, 6, 2, 2, 188, 52,
-	3, 2, 2, 2, 189, 190, 10, 7, 2, 2, 190, 54, 3, 2, 2, 2, 191, 192, 10, 8,
-	2, 2, 192, 56, 3, 2, 2, 2, 193, 195, 9, 9, 2, 2, 194, 193, 3, 2, 2, 2,
-	195, 196, 3, 2, 2, 2, 196, 194, 3, 2, 2, 2, 196, 197, 3, 2, 2, 2, 197,
-	198, 3, 2, 2, 2, 198, 199, 8, 29, 2, 2, 199, 58, 3, 2, 2, 2, 14, 2, 78,
-	138, 140, 151, 159, 161, 168, 170, 174, 179, 196, 3, 8, 2, 2,
-}
-
-var lexerChannelNames = []string{
-	"DEFAULT_TOKEN_CHANNEL", "HIDDEN",
-}
-
-var lexerModeNames = []string{
-	"DEFAULT_MODE",
-}
-
-var lexerLiteralNames = []string{
-	"", "'AND'", "'OR'", "", "'REP'", "'IN'", "'AS'", "'CBF'", "'SELECT'",
-	"'FROM'", "'FILTER'", "'*'", "'SAME'", "'DISTINCT'", "'('", "')'", "'@'",
-	"", "", "'0'",
-}
-
-var lexerSymbolicNames = []string{
-	"", "AND_OP", "OR_OP", "SIMPLE_OP", "REP", "IN", "AS", "CBF", "SELECT",
-	"FROM", "FILTER", "WILDCARD", "CLAUSE_SAME", "CLAUSE_DISTINCT", "L_PAREN",
-	"R_PAREN", "AT", "IDENT", "NUMBER1", "ZERO", "STRING", "WS",
-}
-
-var lexerRuleNames = []string{
-	"AND_OP", "OR_OP", "SIMPLE_OP", "REP", "IN", "AS", "CBF", "SELECT", "FROM",
-	"FILTER", "WILDCARD", "CLAUSE_SAME", "CLAUSE_DISTINCT", "L_PAREN", "R_PAREN",
-	"AT", "IDENT", "Digit", "Nondigit", "NUMBER1", "ZERO", "STRING", "ESC",
-	"UNICODE", "HEX", "SAFECODEPOINTSINGLE", "SAFECODEPOINTDOUBLE", "WS",
-}
-
 type QueryLexer struct {
 	*antlr.BaseLexer
 	channelNames []string
@@ -139,28 +22,166 @@ type QueryLexer struct {
 	// TODO: EOF string
 }
 
-// NewQueryLexer produces a new lexer instance for the optional input antlr.CharStream.
-//
-// The *QueryLexer instance produced may be reused by calling the SetInputStream method.
-// The initial lexer configuration is expensive to construct, and the object is not thread-safe;
-// however, if used within a Golang sync.Pool, the construction cost amortizes well and the
-// objects can be used in a thread-safe manner.
-func NewQueryLexer(input antlr.CharStream) *QueryLexer {
-	l := new(QueryLexer)
-	lexerDeserializer := antlr.NewATNDeserializer(nil)
-	lexerAtn := lexerDeserializer.DeserializeFromUInt16(serializedLexerAtn)
-	lexerDecisionToDFA := make([]*antlr.DFA, len(lexerAtn.DecisionToState))
-	for index, ds := range lexerAtn.DecisionToState {
-		lexerDecisionToDFA[index] = antlr.NewDFA(ds, index)
-	}
-	l.BaseLexer = antlr.NewBaseLexer(input)
-	l.Interpreter = antlr.NewLexerATNSimulator(l, lexerAtn, lexerDecisionToDFA, antlr.NewPredictionContextCache())
+var querylexerLexerStaticData struct {
+	once                   sync.Once
+	serializedATN          []int32
+	channelNames           []string
+	modeNames              []string
+	literalNames           []string
+	symbolicNames          []string
+	ruleNames              []string
+	predictionContextCache *antlr.PredictionContextCache
+	atn                    *antlr.ATN
+	decisionToDFA          []*antlr.DFA
+}
 
-	l.channelNames = lexerChannelNames
-	l.modeNames = lexerModeNames
-	l.RuleNames = lexerRuleNames
-	l.LiteralNames = lexerLiteralNames
-	l.SymbolicNames = lexerSymbolicNames
+func querylexerLexerInit() {
+	staticData := &querylexerLexerStaticData
+	staticData.channelNames = []string{
+		"DEFAULT_TOKEN_CHANNEL", "HIDDEN",
+	}
+	staticData.modeNames = []string{
+		"DEFAULT_MODE",
+	}
+	staticData.literalNames = []string{
+		"", "'AND'", "'OR'", "", "'REP'", "'IN'", "'AS'", "'CBF'", "'SELECT'",
+		"'FROM'", "'FILTER'", "'*'", "'SAME'", "'DISTINCT'", "'('", "')'", "'@'",
+		"", "", "'0'",
+	}
+	staticData.symbolicNames = []string{
+		"", "AND_OP", "OR_OP", "SIMPLE_OP", "REP", "IN", "AS", "CBF", "SELECT",
+		"FROM", "FILTER", "WILDCARD", "CLAUSE_SAME", "CLAUSE_DISTINCT", "L_PAREN",
+		"R_PAREN", "AT", "IDENT", "NUMBER1", "ZERO", "STRING", "WS",
+	}
+	staticData.ruleNames = []string{
+		"AND_OP", "OR_OP", "SIMPLE_OP", "REP", "IN", "AS", "CBF", "SELECT",
+		"FROM", "FILTER", "WILDCARD", "CLAUSE_SAME", "CLAUSE_DISTINCT", "L_PAREN",
+		"R_PAREN", "AT", "IDENT", "Digit", "Nondigit", "NUMBER1", "ZERO", "STRING",
+		"ESC", "UNICODE", "HEX", "SAFECODEPOINTSINGLE", "SAFECODEPOINTDOUBLE",
+		"WS",
+	}
+	staticData.predictionContextCache = antlr.NewPredictionContextCache()
+	staticData.serializedATN = []int32{
+		4, 0, 21, 198, 6, -1, 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, 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, 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, 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, 26, 2, 27, 7, 27, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+		2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3,
+		2, 77, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5,
+		1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8,
+		1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 10,
+		1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1,
+		12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 14, 1, 14, 1, 15, 1, 15,
+		1, 16, 1, 16, 1, 16, 5, 16, 137, 8, 16, 10, 16, 12, 16, 140, 9, 16, 1,
+		17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 5, 19, 148, 8, 19, 10, 19, 12, 19,
+		151, 9, 19, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 5, 21, 158, 8, 21, 10, 21,
+		12, 21, 161, 9, 21, 1, 21, 1, 21, 1, 21, 1, 21, 5, 21, 167, 8, 21, 10,
+		21, 12, 21, 170, 9, 21, 1, 21, 3, 21, 173, 8, 21, 1, 22, 1, 22, 1, 22,
+		3, 22, 178, 8, 22, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 24, 1,
+		24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 4, 27, 193, 8, 27, 11, 27, 12, 27,
+		194, 1, 27, 1, 27, 0, 0, 28, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7,
+		15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33,
+		17, 35, 0, 37, 0, 39, 18, 41, 19, 43, 20, 45, 0, 47, 0, 49, 0, 51, 0, 53,
+		0, 55, 21, 1, 0, 8, 1, 0, 48, 57, 3, 0, 65, 90, 95, 95, 97, 122, 1, 0,
+		49, 57, 9, 0, 34, 34, 39, 39, 47, 47, 92, 92, 98, 98, 102, 102, 110, 110,
+		114, 114, 116, 116, 3, 0, 48, 57, 65, 70, 97, 102, 3, 0, 0, 31, 39, 39,
+		92, 92, 3, 0, 0, 31, 34, 34, 92, 92, 3, 0, 9, 10, 13, 13, 32, 32, 205,
+		0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0,
+		0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0,
+		0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0,
+		0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1,
+		0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43,
+		1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 1, 57, 1, 0, 0, 0, 3, 61, 1, 0, 0, 0, 5,
+		76, 1, 0, 0, 0, 7, 78, 1, 0, 0, 0, 9, 82, 1, 0, 0, 0, 11, 85, 1, 0, 0,
+		0, 13, 88, 1, 0, 0, 0, 15, 92, 1, 0, 0, 0, 17, 99, 1, 0, 0, 0, 19, 104,
+		1, 0, 0, 0, 21, 111, 1, 0, 0, 0, 23, 113, 1, 0, 0, 0, 25, 118, 1, 0, 0,
+		0, 27, 127, 1, 0, 0, 0, 29, 129, 1, 0, 0, 0, 31, 131, 1, 0, 0, 0, 33, 133,
+		1, 0, 0, 0, 35, 141, 1, 0, 0, 0, 37, 143, 1, 0, 0, 0, 39, 145, 1, 0, 0,
+		0, 41, 152, 1, 0, 0, 0, 43, 172, 1, 0, 0, 0, 45, 174, 1, 0, 0, 0, 47, 179,
+		1, 0, 0, 0, 49, 185, 1, 0, 0, 0, 51, 187, 1, 0, 0, 0, 53, 189, 1, 0, 0,
+		0, 55, 192, 1, 0, 0, 0, 57, 58, 5, 65, 0, 0, 58, 59, 5, 78, 0, 0, 59, 60,
+		5, 68, 0, 0, 60, 2, 1, 0, 0, 0, 61, 62, 5, 79, 0, 0, 62, 63, 5, 82, 0,
+		0, 63, 4, 1, 0, 0, 0, 64, 65, 5, 69, 0, 0, 65, 77, 5, 81, 0, 0, 66, 67,
+		5, 78, 0, 0, 67, 77, 5, 69, 0, 0, 68, 69, 5, 71, 0, 0, 69, 77, 5, 69, 0,
+		0, 70, 71, 5, 71, 0, 0, 71, 77, 5, 84, 0, 0, 72, 73, 5, 76, 0, 0, 73, 77,
+		5, 84, 0, 0, 74, 75, 5, 76, 0, 0, 75, 77, 5, 69, 0, 0, 76, 64, 1, 0, 0,
+		0, 76, 66, 1, 0, 0, 0, 76, 68, 1, 0, 0, 0, 76, 70, 1, 0, 0, 0, 76, 72,
+		1, 0, 0, 0, 76, 74, 1, 0, 0, 0, 77, 6, 1, 0, 0, 0, 78, 79, 5, 82, 0, 0,
+		79, 80, 5, 69, 0, 0, 80, 81, 5, 80, 0, 0, 81, 8, 1, 0, 0, 0, 82, 83, 5,
+		73, 0, 0, 83, 84, 5, 78, 0, 0, 84, 10, 1, 0, 0, 0, 85, 86, 5, 65, 0, 0,
+		86, 87, 5, 83, 0, 0, 87, 12, 1, 0, 0, 0, 88, 89, 5, 67, 0, 0, 89, 90, 5,
+		66, 0, 0, 90, 91, 5, 70, 0, 0, 91, 14, 1, 0, 0, 0, 92, 93, 5, 83, 0, 0,
+		93, 94, 5, 69, 0, 0, 94, 95, 5, 76, 0, 0, 95, 96, 5, 69, 0, 0, 96, 97,
+		5, 67, 0, 0, 97, 98, 5, 84, 0, 0, 98, 16, 1, 0, 0, 0, 99, 100, 5, 70, 0,
+		0, 100, 101, 5, 82, 0, 0, 101, 102, 5, 79, 0, 0, 102, 103, 5, 77, 0, 0,
+		103, 18, 1, 0, 0, 0, 104, 105, 5, 70, 0, 0, 105, 106, 5, 73, 0, 0, 106,
+		107, 5, 76, 0, 0, 107, 108, 5, 84, 0, 0, 108, 109, 5, 69, 0, 0, 109, 110,
+		5, 82, 0, 0, 110, 20, 1, 0, 0, 0, 111, 112, 5, 42, 0, 0, 112, 22, 1, 0,
+		0, 0, 113, 114, 5, 83, 0, 0, 114, 115, 5, 65, 0, 0, 115, 116, 5, 77, 0,
+		0, 116, 117, 5, 69, 0, 0, 117, 24, 1, 0, 0, 0, 118, 119, 5, 68, 0, 0, 119,
+		120, 5, 73, 0, 0, 120, 121, 5, 83, 0, 0, 121, 122, 5, 84, 0, 0, 122, 123,
+		5, 73, 0, 0, 123, 124, 5, 78, 0, 0, 124, 125, 5, 67, 0, 0, 125, 126, 5,
+		84, 0, 0, 126, 26, 1, 0, 0, 0, 127, 128, 5, 40, 0, 0, 128, 28, 1, 0, 0,
+		0, 129, 130, 5, 41, 0, 0, 130, 30, 1, 0, 0, 0, 131, 132, 5, 64, 0, 0, 132,
+		32, 1, 0, 0, 0, 133, 138, 3, 37, 18, 0, 134, 137, 3, 35, 17, 0, 135, 137,
+		3, 37, 18, 0, 136, 134, 1, 0, 0, 0, 136, 135, 1, 0, 0, 0, 137, 140, 1,
+		0, 0, 0, 138, 136, 1, 0, 0, 0, 138, 139, 1, 0, 0, 0, 139, 34, 1, 0, 0,
+		0, 140, 138, 1, 0, 0, 0, 141, 142, 7, 0, 0, 0, 142, 36, 1, 0, 0, 0, 143,
+		144, 7, 1, 0, 0, 144, 38, 1, 0, 0, 0, 145, 149, 7, 2, 0, 0, 146, 148, 3,
+		35, 17, 0, 147, 146, 1, 0, 0, 0, 148, 151, 1, 0, 0, 0, 149, 147, 1, 0,
+		0, 0, 149, 150, 1, 0, 0, 0, 150, 40, 1, 0, 0, 0, 151, 149, 1, 0, 0, 0,
+		152, 153, 5, 48, 0, 0, 153, 42, 1, 0, 0, 0, 154, 159, 5, 34, 0, 0, 155,
+		158, 3, 45, 22, 0, 156, 158, 3, 53, 26, 0, 157, 155, 1, 0, 0, 0, 157, 156,
+		1, 0, 0, 0, 158, 161, 1, 0, 0, 0, 159, 157, 1, 0, 0, 0, 159, 160, 1, 0,
+		0, 0, 160, 162, 1, 0, 0, 0, 161, 159, 1, 0, 0, 0, 162, 173, 5, 34, 0, 0,
+		163, 168, 5, 39, 0, 0, 164, 167, 3, 45, 22, 0, 165, 167, 3, 51, 25, 0,
+		166, 164, 1, 0, 0, 0, 166, 165, 1, 0, 0, 0, 167, 170, 1, 0, 0, 0, 168,
+		166, 1, 0, 0, 0, 168, 169, 1, 0, 0, 0, 169, 171, 1, 0, 0, 0, 170, 168,
+		1, 0, 0, 0, 171, 173, 5, 39, 0, 0, 172, 154, 1, 0, 0, 0, 172, 163, 1, 0,
+		0, 0, 173, 44, 1, 0, 0, 0, 174, 177, 5, 92, 0, 0, 175, 178, 7, 3, 0, 0,
+		176, 178, 3, 47, 23, 0, 177, 175, 1, 0, 0, 0, 177, 176, 1, 0, 0, 0, 178,
+		46, 1, 0, 0, 0, 179, 180, 5, 117, 0, 0, 180, 181, 3, 49, 24, 0, 181, 182,
+		3, 49, 24, 0, 182, 183, 3, 49, 24, 0, 183, 184, 3, 49, 24, 0, 184, 48,
+		1, 0, 0, 0, 185, 186, 7, 4, 0, 0, 186, 50, 1, 0, 0, 0, 187, 188, 8, 5,
+		0, 0, 188, 52, 1, 0, 0, 0, 189, 190, 8, 6, 0, 0, 190, 54, 1, 0, 0, 0, 191,
+		193, 7, 7, 0, 0, 192, 191, 1, 0, 0, 0, 193, 194, 1, 0, 0, 0, 194, 192,
+		1, 0, 0, 0, 194, 195, 1, 0, 0, 0, 195, 196, 1, 0, 0, 0, 196, 197, 6, 27,
+		0, 0, 197, 56, 1, 0, 0, 0, 12, 0, 76, 136, 138, 149, 157, 159, 166, 168,
+		172, 177, 194, 1, 6, 0, 0,
+	}
+	deserializer := antlr.NewATNDeserializer(nil)
+	staticData.atn = deserializer.Deserialize(staticData.serializedATN)
+	atn := staticData.atn
+	staticData.decisionToDFA = make([]*antlr.DFA, len(atn.DecisionToState))
+	decisionToDFA := staticData.decisionToDFA
+	for index, state := range atn.DecisionToState {
+		decisionToDFA[index] = antlr.NewDFA(state, index)
+	}
+}
+
+// QueryLexerInit initializes any static state used to implement QueryLexer. By default the
+// static state used to implement the lexer is lazily initialized during the first call to
+// NewQueryLexer(). You can call this function if you wish to initialize the static state ahead
+// of time.
+func QueryLexerInit() {
+	staticData := &querylexerLexerStaticData
+	staticData.once.Do(querylexerLexerInit)
+}
+
+// NewQueryLexer produces a new lexer instance for the optional input antlr.CharStream.
+func NewQueryLexer(input antlr.CharStream) *QueryLexer {
+	QueryLexerInit()
+	l := new(QueryLexer)
+	l.BaseLexer = antlr.NewBaseLexer(input)
+	staticData := &querylexerLexerStaticData
+	l.Interpreter = antlr.NewLexerATNSimulator(l, staticData.atn, staticData.decisionToDFA, staticData.predictionContextCache)
+	l.channelNames = staticData.channelNames
+	l.modeNames = staticData.modeNames
+	l.RuleNames = staticData.ruleNames
+	l.LiteralNames = staticData.literalNames
+	l.SymbolicNames = staticData.symbolicNames
 	l.GrammarFileName = "QueryLexer.g4"
 	// TODO: l.EOF = antlr.TokenEOF
 
diff --git a/netmap/parser/query_listener.go b/netmap/parser/query_listener.go
index 3e77af59..87888d69 100644
--- a/netmap/parser/query_listener.go
+++ b/netmap/parser/query_listener.go
@@ -1,4 +1,4 @@
-// Code generated from Query.g4 by ANTLR 4.9.2. DO NOT EDIT.
+// Code generated from Query.g4 by ANTLR 4.10.1. DO NOT EDIT.
 
 package parser // Query
 
diff --git a/netmap/parser/query_parser.go b/netmap/parser/query_parser.go
index c78c0f44..555ba583 100644
--- a/netmap/parser/query_parser.go
+++ b/netmap/parser/query_parser.go
@@ -1,116 +1,138 @@
-// Code generated from Query.g4 by ANTLR 4.9.2. DO NOT EDIT.
+// Code generated from Query.g4 by ANTLR 4.10.1. DO NOT EDIT.
 
 package parser // Query
 
 import (
 	"fmt"
-	"reflect"
 	"strconv"
+	"sync"
 
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 )
 
 // Suppress unused import errors
 var _ = fmt.Printf
-var _ = reflect.Copy
 var _ = strconv.Itoa
-
-var parserATN = []uint16{
-	3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 23, 130,
-	4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7,
-	4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13,
-	9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 3, 2, 6, 2, 32, 10, 2, 13, 2, 14, 2,
-	33, 3, 2, 5, 2, 37, 10, 2, 3, 2, 7, 2, 40, 10, 2, 12, 2, 14, 2, 43, 11,
-	2, 3, 2, 7, 2, 46, 10, 2, 12, 2, 14, 2, 49, 11, 2, 3, 3, 3, 3, 3, 3, 3,
-	3, 5, 3, 55, 10, 3, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 5, 5, 64,
-	10, 5, 3, 5, 5, 5, 67, 10, 5, 3, 5, 3, 5, 3, 5, 3, 5, 5, 5, 73, 10, 5,
-	3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 5, 7, 83, 10, 7, 3, 7,
-	3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 7, 7, 91, 10, 7, 12, 7, 14, 7, 94, 11, 7,
-	3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 5, 9,
-	107, 10, 9, 3, 10, 3, 10, 5, 10, 111, 10, 10, 3, 11, 3, 11, 3, 11, 5, 11,
-	116, 10, 11, 3, 12, 3, 12, 3, 13, 3, 13, 3, 14, 3, 14, 5, 14, 124, 10,
-	14, 3, 15, 3, 15, 5, 15, 128, 10, 15, 3, 15, 2, 3, 12, 16, 2, 4, 6, 8,
-	10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 2, 5, 3, 2, 14, 15, 3, 2, 20, 21,
-	4, 2, 6, 8, 10, 12, 2, 132, 2, 31, 3, 2, 2, 2, 4, 50, 3, 2, 2, 2, 6, 56,
-	3, 2, 2, 2, 8, 59, 3, 2, 2, 2, 10, 74, 3, 2, 2, 2, 12, 82, 3, 2, 2, 2,
-	14, 95, 3, 2, 2, 2, 16, 106, 3, 2, 2, 2, 18, 110, 3, 2, 2, 2, 20, 115,
-	3, 2, 2, 2, 22, 117, 3, 2, 2, 2, 24, 119, 3, 2, 2, 2, 26, 123, 3, 2, 2,
-	2, 28, 127, 3, 2, 2, 2, 30, 32, 5, 4, 3, 2, 31, 30, 3, 2, 2, 2, 32, 33,
-	3, 2, 2, 2, 33, 31, 3, 2, 2, 2, 33, 34, 3, 2, 2, 2, 34, 36, 3, 2, 2, 2,
-	35, 37, 5, 6, 4, 2, 36, 35, 3, 2, 2, 2, 36, 37, 3, 2, 2, 2, 37, 41, 3,
-	2, 2, 2, 38, 40, 5, 8, 5, 2, 39, 38, 3, 2, 2, 2, 40, 43, 3, 2, 2, 2, 41,
-	39, 3, 2, 2, 2, 41, 42, 3, 2, 2, 2, 42, 47, 3, 2, 2, 2, 43, 41, 3, 2, 2,
-	2, 44, 46, 5, 14, 8, 2, 45, 44, 3, 2, 2, 2, 46, 49, 3, 2, 2, 2, 47, 45,
-	3, 2, 2, 2, 47, 48, 3, 2, 2, 2, 48, 3, 3, 2, 2, 2, 49, 47, 3, 2, 2, 2,
-	50, 51, 7, 6, 2, 2, 51, 54, 7, 20, 2, 2, 52, 53, 7, 7, 2, 2, 53, 55, 5,
-	26, 14, 2, 54, 52, 3, 2, 2, 2, 54, 55, 3, 2, 2, 2, 55, 5, 3, 2, 2, 2, 56,
-	57, 7, 9, 2, 2, 57, 58, 7, 20, 2, 2, 58, 7, 3, 2, 2, 2, 59, 60, 7, 10,
-	2, 2, 60, 66, 7, 20, 2, 2, 61, 63, 7, 7, 2, 2, 62, 64, 5, 10, 6, 2, 63,
-	62, 3, 2, 2, 2, 63, 64, 3, 2, 2, 2, 64, 65, 3, 2, 2, 2, 65, 67, 5, 26,
-	14, 2, 66, 61, 3, 2, 2, 2, 66, 67, 3, 2, 2, 2, 67, 68, 3, 2, 2, 2, 68,
-	69, 7, 11, 2, 2, 69, 72, 5, 28, 15, 2, 70, 71, 7, 8, 2, 2, 71, 73, 5, 26,
-	14, 2, 72, 70, 3, 2, 2, 2, 72, 73, 3, 2, 2, 2, 73, 9, 3, 2, 2, 2, 74, 75,
-	9, 2, 2, 2, 75, 11, 3, 2, 2, 2, 76, 77, 8, 7, 1, 2, 77, 78, 7, 16, 2, 2,
-	78, 79, 5, 12, 7, 2, 79, 80, 7, 17, 2, 2, 80, 83, 3, 2, 2, 2, 81, 83, 5,
-	16, 9, 2, 82, 76, 3, 2, 2, 2, 82, 81, 3, 2, 2, 2, 83, 92, 3, 2, 2, 2, 84,
-	85, 12, 6, 2, 2, 85, 86, 7, 3, 2, 2, 86, 91, 5, 12, 7, 7, 87, 88, 12, 5,
-	2, 2, 88, 89, 7, 4, 2, 2, 89, 91, 5, 12, 7, 6, 90, 84, 3, 2, 2, 2, 90,
-	87, 3, 2, 2, 2, 91, 94, 3, 2, 2, 2, 92, 90, 3, 2, 2, 2, 92, 93, 3, 2, 2,
-	2, 93, 13, 3, 2, 2, 2, 94, 92, 3, 2, 2, 2, 95, 96, 7, 12, 2, 2, 96, 97,
-	5, 12, 7, 2, 97, 98, 7, 8, 2, 2, 98, 99, 5, 26, 14, 2, 99, 15, 3, 2, 2,
-	2, 100, 101, 7, 18, 2, 2, 101, 107, 5, 26, 14, 2, 102, 103, 5, 18, 10,
-	2, 103, 104, 7, 5, 2, 2, 104, 105, 5, 20, 11, 2, 105, 107, 3, 2, 2, 2,
-	106, 100, 3, 2, 2, 2, 106, 102, 3, 2, 2, 2, 107, 17, 3, 2, 2, 2, 108, 111,
-	5, 26, 14, 2, 109, 111, 7, 22, 2, 2, 110, 108, 3, 2, 2, 2, 110, 109, 3,
-	2, 2, 2, 111, 19, 3, 2, 2, 2, 112, 116, 5, 26, 14, 2, 113, 116, 5, 22,
-	12, 2, 114, 116, 7, 22, 2, 2, 115, 112, 3, 2, 2, 2, 115, 113, 3, 2, 2,
-	2, 115, 114, 3, 2, 2, 2, 116, 21, 3, 2, 2, 2, 117, 118, 9, 3, 2, 2, 118,
-	23, 3, 2, 2, 2, 119, 120, 9, 4, 2, 2, 120, 25, 3, 2, 2, 2, 121, 124, 5,
-	24, 13, 2, 122, 124, 7, 19, 2, 2, 123, 121, 3, 2, 2, 2, 123, 122, 3, 2,
-	2, 2, 124, 27, 3, 2, 2, 2, 125, 128, 5, 26, 14, 2, 126, 128, 7, 13, 2,
-	2, 127, 125, 3, 2, 2, 2, 127, 126, 3, 2, 2, 2, 128, 29, 3, 2, 2, 2, 18,
-	33, 36, 41, 47, 54, 63, 66, 72, 82, 90, 92, 106, 110, 115, 123, 127,
-}
-var literalNames = []string{
-	"", "'AND'", "'OR'", "", "'REP'", "'IN'", "'AS'", "'CBF'", "'SELECT'",
-	"'FROM'", "'FILTER'", "'*'", "'SAME'", "'DISTINCT'", "'('", "')'", "'@'",
-	"", "", "'0'",
-}
-var symbolicNames = []string{
-	"", "AND_OP", "OR_OP", "SIMPLE_OP", "REP", "IN", "AS", "CBF", "SELECT",
-	"FROM", "FILTER", "WILDCARD", "CLAUSE_SAME", "CLAUSE_DISTINCT", "L_PAREN",
-	"R_PAREN", "AT", "IDENT", "NUMBER1", "ZERO", "STRING", "WS",
-}
-
-var ruleNames = []string{
-	"policy", "repStmt", "cbfStmt", "selectStmt", "clause", "filterExpr", "filterStmt",
-	"expr", "filterKey", "filterValue", "number", "keyword", "ident", "identWC",
-}
+var _ = sync.Once{}
 
 type Query struct {
 	*antlr.BaseParser
 }
 
-// NewQuery produces a new parser instance for the optional input antlr.TokenStream.
-//
-// The *Query instance produced may be reused by calling the SetInputStream method.
-// The initial parser configuration is expensive to construct, and the object is not thread-safe;
-// however, if used within a Golang sync.Pool, the construction cost amortizes well and the
-// objects can be used in a thread-safe manner.
-func NewQuery(input antlr.TokenStream) *Query {
-	this := new(Query)
-	deserializer := antlr.NewATNDeserializer(nil)
-	deserializedATN := deserializer.DeserializeFromUInt16(parserATN)
-	decisionToDFA := make([]*antlr.DFA, len(deserializedATN.DecisionToState))
-	for index, ds := range deserializedATN.DecisionToState {
-		decisionToDFA[index] = antlr.NewDFA(ds, index)
-	}
-	this.BaseParser = antlr.NewBaseParser(input)
+var queryParserStaticData struct {
+	once                   sync.Once
+	serializedATN          []int32
+	literalNames           []string
+	symbolicNames          []string
+	ruleNames              []string
+	predictionContextCache *antlr.PredictionContextCache
+	atn                    *antlr.ATN
+	decisionToDFA          []*antlr.DFA
+}
 
-	this.Interpreter = antlr.NewParserATNSimulator(this, deserializedATN, decisionToDFA, antlr.NewPredictionContextCache())
-	this.RuleNames = ruleNames
-	this.LiteralNames = literalNames
-	this.SymbolicNames = symbolicNames
+func queryParserInit() {
+	staticData := &queryParserStaticData
+	staticData.literalNames = []string{
+		"", "'AND'", "'OR'", "", "'REP'", "'IN'", "'AS'", "'CBF'", "'SELECT'",
+		"'FROM'", "'FILTER'", "'*'", "'SAME'", "'DISTINCT'", "'('", "')'", "'@'",
+		"", "", "'0'",
+	}
+	staticData.symbolicNames = []string{
+		"", "AND_OP", "OR_OP", "SIMPLE_OP", "REP", "IN", "AS", "CBF", "SELECT",
+		"FROM", "FILTER", "WILDCARD", "CLAUSE_SAME", "CLAUSE_DISTINCT", "L_PAREN",
+		"R_PAREN", "AT", "IDENT", "NUMBER1", "ZERO", "STRING", "WS",
+	}
+	staticData.ruleNames = []string{
+		"policy", "repStmt", "cbfStmt", "selectStmt", "clause", "filterExpr",
+		"filterStmt", "expr", "filterKey", "filterValue", "number", "keyword",
+		"ident", "identWC",
+	}
+	staticData.predictionContextCache = antlr.NewPredictionContextCache()
+	staticData.serializedATN = []int32{
+		4, 1, 21, 130, 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, 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, 13, 1, 0, 4, 0, 30, 8, 0, 11,
+		0, 12, 0, 31, 1, 0, 3, 0, 35, 8, 0, 1, 0, 5, 0, 38, 8, 0, 10, 0, 12, 0,
+		41, 9, 0, 1, 0, 5, 0, 44, 8, 0, 10, 0, 12, 0, 47, 9, 0, 1, 0, 1, 0, 1,
+		1, 1, 1, 1, 1, 1, 1, 3, 1, 55, 8, 1, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3,
+		1, 3, 3, 3, 64, 8, 3, 1, 3, 3, 3, 67, 8, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3,
+		3, 73, 8, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 83,
+		8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 91, 8, 5, 10, 5, 12, 5,
+		94, 9, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1,
+		7, 3, 7, 107, 8, 7, 1, 8, 1, 8, 3, 8, 111, 8, 8, 1, 9, 1, 9, 1, 9, 3, 9,
+		116, 8, 9, 1, 10, 1, 10, 1, 11, 1, 11, 1, 12, 1, 12, 3, 12, 124, 8, 12,
+		1, 13, 1, 13, 3, 13, 128, 8, 13, 1, 13, 0, 1, 10, 14, 0, 2, 4, 6, 8, 10,
+		12, 14, 16, 18, 20, 22, 24, 26, 0, 3, 1, 0, 12, 13, 1, 0, 18, 19, 2, 0,
+		4, 6, 8, 10, 132, 0, 29, 1, 0, 0, 0, 2, 50, 1, 0, 0, 0, 4, 56, 1, 0, 0,
+		0, 6, 59, 1, 0, 0, 0, 8, 74, 1, 0, 0, 0, 10, 82, 1, 0, 0, 0, 12, 95, 1,
+		0, 0, 0, 14, 106, 1, 0, 0, 0, 16, 110, 1, 0, 0, 0, 18, 115, 1, 0, 0, 0,
+		20, 117, 1, 0, 0, 0, 22, 119, 1, 0, 0, 0, 24, 123, 1, 0, 0, 0, 26, 127,
+		1, 0, 0, 0, 28, 30, 3, 2, 1, 0, 29, 28, 1, 0, 0, 0, 30, 31, 1, 0, 0, 0,
+		31, 29, 1, 0, 0, 0, 31, 32, 1, 0, 0, 0, 32, 34, 1, 0, 0, 0, 33, 35, 3,
+		4, 2, 0, 34, 33, 1, 0, 0, 0, 34, 35, 1, 0, 0, 0, 35, 39, 1, 0, 0, 0, 36,
+		38, 3, 6, 3, 0, 37, 36, 1, 0, 0, 0, 38, 41, 1, 0, 0, 0, 39, 37, 1, 0, 0,
+		0, 39, 40, 1, 0, 0, 0, 40, 45, 1, 0, 0, 0, 41, 39, 1, 0, 0, 0, 42, 44,
+		3, 12, 6, 0, 43, 42, 1, 0, 0, 0, 44, 47, 1, 0, 0, 0, 45, 43, 1, 0, 0, 0,
+		45, 46, 1, 0, 0, 0, 46, 48, 1, 0, 0, 0, 47, 45, 1, 0, 0, 0, 48, 49, 5,
+		0, 0, 1, 49, 1, 1, 0, 0, 0, 50, 51, 5, 4, 0, 0, 51, 54, 5, 18, 0, 0, 52,
+		53, 5, 5, 0, 0, 53, 55, 3, 24, 12, 0, 54, 52, 1, 0, 0, 0, 54, 55, 1, 0,
+		0, 0, 55, 3, 1, 0, 0, 0, 56, 57, 5, 7, 0, 0, 57, 58, 5, 18, 0, 0, 58, 5,
+		1, 0, 0, 0, 59, 60, 5, 8, 0, 0, 60, 66, 5, 18, 0, 0, 61, 63, 5, 5, 0, 0,
+		62, 64, 3, 8, 4, 0, 63, 62, 1, 0, 0, 0, 63, 64, 1, 0, 0, 0, 64, 65, 1,
+		0, 0, 0, 65, 67, 3, 24, 12, 0, 66, 61, 1, 0, 0, 0, 66, 67, 1, 0, 0, 0,
+		67, 68, 1, 0, 0, 0, 68, 69, 5, 9, 0, 0, 69, 72, 3, 26, 13, 0, 70, 71, 5,
+		6, 0, 0, 71, 73, 3, 24, 12, 0, 72, 70, 1, 0, 0, 0, 72, 73, 1, 0, 0, 0,
+		73, 7, 1, 0, 0, 0, 74, 75, 7, 0, 0, 0, 75, 9, 1, 0, 0, 0, 76, 77, 6, 5,
+		-1, 0, 77, 78, 5, 14, 0, 0, 78, 79, 3, 10, 5, 0, 79, 80, 5, 15, 0, 0, 80,
+		83, 1, 0, 0, 0, 81, 83, 3, 14, 7, 0, 82, 76, 1, 0, 0, 0, 82, 81, 1, 0,
+		0, 0, 83, 92, 1, 0, 0, 0, 84, 85, 10, 4, 0, 0, 85, 86, 5, 1, 0, 0, 86,
+		91, 3, 10, 5, 5, 87, 88, 10, 3, 0, 0, 88, 89, 5, 2, 0, 0, 89, 91, 3, 10,
+		5, 4, 90, 84, 1, 0, 0, 0, 90, 87, 1, 0, 0, 0, 91, 94, 1, 0, 0, 0, 92, 90,
+		1, 0, 0, 0, 92, 93, 1, 0, 0, 0, 93, 11, 1, 0, 0, 0, 94, 92, 1, 0, 0, 0,
+		95, 96, 5, 10, 0, 0, 96, 97, 3, 10, 5, 0, 97, 98, 5, 6, 0, 0, 98, 99, 3,
+		24, 12, 0, 99, 13, 1, 0, 0, 0, 100, 101, 5, 16, 0, 0, 101, 107, 3, 24,
+		12, 0, 102, 103, 3, 16, 8, 0, 103, 104, 5, 3, 0, 0, 104, 105, 3, 18, 9,
+		0, 105, 107, 1, 0, 0, 0, 106, 100, 1, 0, 0, 0, 106, 102, 1, 0, 0, 0, 107,
+		15, 1, 0, 0, 0, 108, 111, 3, 24, 12, 0, 109, 111, 5, 20, 0, 0, 110, 108,
+		1, 0, 0, 0, 110, 109, 1, 0, 0, 0, 111, 17, 1, 0, 0, 0, 112, 116, 3, 24,
+		12, 0, 113, 116, 3, 20, 10, 0, 114, 116, 5, 20, 0, 0, 115, 112, 1, 0, 0,
+		0, 115, 113, 1, 0, 0, 0, 115, 114, 1, 0, 0, 0, 116, 19, 1, 0, 0, 0, 117,
+		118, 7, 1, 0, 0, 118, 21, 1, 0, 0, 0, 119, 120, 7, 2, 0, 0, 120, 23, 1,
+		0, 0, 0, 121, 124, 3, 22, 11, 0, 122, 124, 5, 17, 0, 0, 123, 121, 1, 0,
+		0, 0, 123, 122, 1, 0, 0, 0, 124, 25, 1, 0, 0, 0, 125, 128, 3, 24, 12, 0,
+		126, 128, 5, 11, 0, 0, 127, 125, 1, 0, 0, 0, 127, 126, 1, 0, 0, 0, 128,
+		27, 1, 0, 0, 0, 16, 31, 34, 39, 45, 54, 63, 66, 72, 82, 90, 92, 106, 110,
+		115, 123, 127,
+	}
+	deserializer := antlr.NewATNDeserializer(nil)
+	staticData.atn = deserializer.Deserialize(staticData.serializedATN)
+	atn := staticData.atn
+	staticData.decisionToDFA = make([]*antlr.DFA, len(atn.DecisionToState))
+	decisionToDFA := staticData.decisionToDFA
+	for index, state := range atn.DecisionToState {
+		decisionToDFA[index] = antlr.NewDFA(state, index)
+	}
+}
+
+// QueryInit initializes any static state used to implement Query. By default the
+// static state used to implement the parser is lazily initialized during the first call to
+// NewQuery(). You can call this function if you wish to initialize the static state ahead
+// of time.
+func QueryInit() {
+	staticData := &queryParserStaticData
+	staticData.once.Do(queryParserInit)
+}
+
+// NewQuery produces a new parser instance for the optional input antlr.TokenStream.
+func NewQuery(input antlr.TokenStream) *Query {
+	QueryInit()
+	this := new(Query)
+	this.BaseParser = antlr.NewBaseParser(input)
+	staticData := &queryParserStaticData
+	this.Interpreter = antlr.NewParserATNSimulator(this, staticData.atn, staticData.decisionToDFA, staticData.predictionContextCache)
+	this.RuleNames = staticData.ruleNames
+	this.LiteralNames = staticData.literalNames
+	this.SymbolicNames = staticData.symbolicNames
 	this.GrammarFileName = "Query.g4"
 
 	return this
@@ -198,13 +220,25 @@ func NewPolicyContext(parser antlr.Parser, parent antlr.ParserRuleContext, invok
 
 func (s *PolicyContext) GetParser() antlr.Parser { return s.parser }
 
-func (s *PolicyContext) AllRepStmt() []IRepStmtContext {
-	var ts = s.GetTypedRuleContexts(reflect.TypeOf((*IRepStmtContext)(nil)).Elem())
-	var tst = make([]IRepStmtContext, len(ts))
+func (s *PolicyContext) EOF() antlr.TerminalNode {
+	return s.GetToken(QueryEOF, 0)
+}
 
-	for i, t := range ts {
-		if t != nil {
+func (s *PolicyContext) AllRepStmt() []IRepStmtContext {
+	children := s.GetChildren()
+	len := 0
+	for _, ctx := range children {
+		if _, ok := ctx.(IRepStmtContext); ok {
+			len++
+		}
+	}
+
+	tst := make([]IRepStmtContext, len)
+	i := 0
+	for _, ctx := range children {
+		if t, ok := ctx.(IRepStmtContext); ok {
 			tst[i] = t.(IRepStmtContext)
+			i++
 		}
 	}
 
@@ -212,7 +246,17 @@ func (s *PolicyContext) AllRepStmt() []IRepStmtContext {
 }
 
 func (s *PolicyContext) RepStmt(i int) IRepStmtContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IRepStmtContext)(nil)).Elem(), i)
+	var t antlr.RuleContext
+	j := 0
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IRepStmtContext); ok {
+			if j == i {
+				t = ctx.(antlr.RuleContext)
+				break
+			}
+			j++
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -222,7 +266,13 @@ func (s *PolicyContext) RepStmt(i int) IRepStmtContext {
 }
 
 func (s *PolicyContext) CbfStmt() ICbfStmtContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*ICbfStmtContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(ICbfStmtContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -232,12 +282,20 @@ func (s *PolicyContext) CbfStmt() ICbfStmtContext {
 }
 
 func (s *PolicyContext) AllSelectStmt() []ISelectStmtContext {
-	var ts = s.GetTypedRuleContexts(reflect.TypeOf((*ISelectStmtContext)(nil)).Elem())
-	var tst = make([]ISelectStmtContext, len(ts))
+	children := s.GetChildren()
+	len := 0
+	for _, ctx := range children {
+		if _, ok := ctx.(ISelectStmtContext); ok {
+			len++
+		}
+	}
 
-	for i, t := range ts {
-		if t != nil {
+	tst := make([]ISelectStmtContext, len)
+	i := 0
+	for _, ctx := range children {
+		if t, ok := ctx.(ISelectStmtContext); ok {
 			tst[i] = t.(ISelectStmtContext)
+			i++
 		}
 	}
 
@@ -245,7 +303,17 @@ func (s *PolicyContext) AllSelectStmt() []ISelectStmtContext {
 }
 
 func (s *PolicyContext) SelectStmt(i int) ISelectStmtContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*ISelectStmtContext)(nil)).Elem(), i)
+	var t antlr.RuleContext
+	j := 0
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(ISelectStmtContext); ok {
+			if j == i {
+				t = ctx.(antlr.RuleContext)
+				break
+			}
+			j++
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -255,12 +323,20 @@ func (s *PolicyContext) SelectStmt(i int) ISelectStmtContext {
 }
 
 func (s *PolicyContext) AllFilterStmt() []IFilterStmtContext {
-	var ts = s.GetTypedRuleContexts(reflect.TypeOf((*IFilterStmtContext)(nil)).Elem())
-	var tst = make([]IFilterStmtContext, len(ts))
+	children := s.GetChildren()
+	len := 0
+	for _, ctx := range children {
+		if _, ok := ctx.(IFilterStmtContext); ok {
+			len++
+		}
+	}
 
-	for i, t := range ts {
-		if t != nil {
+	tst := make([]IFilterStmtContext, len)
+	i := 0
+	for _, ctx := range children {
+		if t, ok := ctx.(IFilterStmtContext); ok {
 			tst[i] = t.(IFilterStmtContext)
+			i++
 		}
 	}
 
@@ -268,7 +344,17 @@ func (s *PolicyContext) AllFilterStmt() []IFilterStmtContext {
 }
 
 func (s *PolicyContext) FilterStmt(i int) IFilterStmtContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IFilterStmtContext)(nil)).Elem(), i)
+	var t antlr.RuleContext
+	j := 0
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IFilterStmtContext); ok {
+			if j == i {
+				t = ctx.(antlr.RuleContext)
+				break
+			}
+			j++
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -308,6 +394,9 @@ func (s *PolicyContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 }
 
 func (p *Query) Policy() (localctx IPolicyContext) {
+	this := p
+	_ = this
+
 	localctx = NewPolicyContext(p, p.GetParserRuleContext(), p.GetState())
 	p.EnterRule(localctx, 0, QueryRULE_policy)
 	var _la int
@@ -382,6 +471,10 @@ func (p *Query) Policy() (localctx IPolicyContext) {
 		p.GetErrorHandler().Sync(p)
 		_la = p.GetTokenStream().LA(1)
 	}
+	{
+		p.SetState(48)
+		p.Match(QueryEOF)
+	}
 
 	return localctx
 }
@@ -459,7 +552,13 @@ func (s *RepStmtContext) IN() antlr.TerminalNode {
 }
 
 func (s *RepStmtContext) Ident() IIdentContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IIdentContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IIdentContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -499,6 +598,9 @@ func (s *RepStmtContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 }
 
 func (p *Query) RepStmt() (localctx IRepStmtContext) {
+	this := p
+	_ = this
+
 	localctx = NewRepStmtContext(p, p.GetParserRuleContext(), p.GetState())
 	p.EnterRule(localctx, 2, QueryRULE_repStmt)
 	var _la int
@@ -521,27 +623,27 @@ func (p *Query) RepStmt() (localctx IRepStmtContext) {
 
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(48)
+		p.SetState(50)
 		p.Match(QueryREP)
 	}
 	{
-		p.SetState(49)
+		p.SetState(51)
 
 		var _m = p.Match(QueryNUMBER1)
 
 		localctx.(*RepStmtContext).Count = _m
 	}
-	p.SetState(52)
+	p.SetState(54)
 	p.GetErrorHandler().Sync(p)
 	_la = p.GetTokenStream().LA(1)
 
 	if _la == QueryIN {
 		{
-			p.SetState(50)
+			p.SetState(52)
 			p.Match(QueryIN)
 		}
 		{
-			p.SetState(51)
+			p.SetState(53)
 
 			var _x = p.Ident()
 
@@ -641,6 +743,9 @@ func (s *CbfStmtContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 }
 
 func (p *Query) CbfStmt() (localctx ICbfStmtContext) {
+	this := p
+	_ = this
+
 	localctx = NewCbfStmtContext(p, p.GetParserRuleContext(), p.GetState())
 	p.EnterRule(localctx, 4, QueryRULE_cbfStmt)
 
@@ -662,11 +767,11 @@ func (p *Query) CbfStmt() (localctx ICbfStmtContext) {
 
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(54)
+		p.SetState(56)
 		p.Match(QueryCBF)
 	}
 	{
-		p.SetState(55)
+		p.SetState(57)
 
 		var _m = p.Match(QueryNUMBER1)
 
@@ -771,7 +876,13 @@ func (s *SelectStmtContext) NUMBER1() antlr.TerminalNode {
 }
 
 func (s *SelectStmtContext) IdentWC() IIdentWCContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IIdentWCContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IIdentWCContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -789,12 +900,20 @@ func (s *SelectStmtContext) AS() antlr.TerminalNode {
 }
 
 func (s *SelectStmtContext) AllIdent() []IIdentContext {
-	var ts = s.GetTypedRuleContexts(reflect.TypeOf((*IIdentContext)(nil)).Elem())
-	var tst = make([]IIdentContext, len(ts))
+	children := s.GetChildren()
+	len := 0
+	for _, ctx := range children {
+		if _, ok := ctx.(IIdentContext); ok {
+			len++
+		}
+	}
 
-	for i, t := range ts {
-		if t != nil {
+	tst := make([]IIdentContext, len)
+	i := 0
+	for _, ctx := range children {
+		if t, ok := ctx.(IIdentContext); ok {
 			tst[i] = t.(IIdentContext)
+			i++
 		}
 	}
 
@@ -802,7 +921,17 @@ func (s *SelectStmtContext) AllIdent() []IIdentContext {
 }
 
 func (s *SelectStmtContext) Ident(i int) IIdentContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IIdentContext)(nil)).Elem(), i)
+	var t antlr.RuleContext
+	j := 0
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IIdentContext); ok {
+			if j == i {
+				t = ctx.(antlr.RuleContext)
+				break
+			}
+			j++
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -812,7 +941,13 @@ func (s *SelectStmtContext) Ident(i int) IIdentContext {
 }
 
 func (s *SelectStmtContext) Clause() IClauseContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IClauseContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IClauseContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -852,6 +987,9 @@ func (s *SelectStmtContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 }
 
 func (p *Query) SelectStmt() (localctx ISelectStmtContext) {
+	this := p
+	_ = this
+
 	localctx = NewSelectStmtContext(p, p.GetParserRuleContext(), p.GetState())
 	p.EnterRule(localctx, 6, QueryRULE_selectStmt)
 	var _la int
@@ -874,38 +1012,38 @@ func (p *Query) SelectStmt() (localctx ISelectStmtContext) {
 
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(57)
+		p.SetState(59)
 		p.Match(QuerySELECT)
 	}
 	{
-		p.SetState(58)
+		p.SetState(60)
 
 		var _m = p.Match(QueryNUMBER1)
 
 		localctx.(*SelectStmtContext).Count = _m
 	}
-	p.SetState(64)
+	p.SetState(66)
 	p.GetErrorHandler().Sync(p)
 	_la = p.GetTokenStream().LA(1)
 
 	if _la == QueryIN {
 		{
-			p.SetState(59)
+			p.SetState(61)
 			p.Match(QueryIN)
 		}
-		p.SetState(61)
+		p.SetState(63)
 		p.GetErrorHandler().Sync(p)
 		_la = p.GetTokenStream().LA(1)
 
 		if _la == QueryCLAUSE_SAME || _la == QueryCLAUSE_DISTINCT {
 			{
-				p.SetState(60)
+				p.SetState(62)
 				p.Clause()
 			}
 
 		}
 		{
-			p.SetState(63)
+			p.SetState(65)
 
 			var _x = p.Ident()
 
@@ -914,27 +1052,27 @@ func (p *Query) SelectStmt() (localctx ISelectStmtContext) {
 
 	}
 	{
-		p.SetState(66)
+		p.SetState(68)
 		p.Match(QueryFROM)
 	}
 	{
-		p.SetState(67)
+		p.SetState(69)
 
 		var _x = p.IdentWC()
 
 		localctx.(*SelectStmtContext).Filter = _x
 	}
-	p.SetState(70)
+	p.SetState(72)
 	p.GetErrorHandler().Sync(p)
 	_la = p.GetTokenStream().LA(1)
 
 	if _la == QueryAS {
 		{
-			p.SetState(68)
+			p.SetState(70)
 			p.Match(QueryAS)
 		}
 		{
-			p.SetState(69)
+			p.SetState(71)
 
 			var _x = p.Ident()
 
@@ -1023,6 +1161,9 @@ func (s *ClauseContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 }
 
 func (p *Query) Clause() (localctx IClauseContext) {
+	this := p
+	_ = this
+
 	localctx = NewClauseContext(p, p.GetParserRuleContext(), p.GetState())
 	p.EnterRule(localctx, 8, QueryRULE_clause)
 	var _la int
@@ -1045,7 +1186,7 @@ func (p *Query) Clause() (localctx IClauseContext) {
 
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(72)
+		p.SetState(74)
 		_la = p.GetTokenStream().LA(1)
 
 		if !(_la == QueryCLAUSE_SAME || _la == QueryCLAUSE_DISTINCT) {
@@ -1150,12 +1291,20 @@ func (s *FilterExprContext) R_PAREN() antlr.TerminalNode {
 }
 
 func (s *FilterExprContext) AllFilterExpr() []IFilterExprContext {
-	var ts = s.GetTypedRuleContexts(reflect.TypeOf((*IFilterExprContext)(nil)).Elem())
-	var tst = make([]IFilterExprContext, len(ts))
+	children := s.GetChildren()
+	len := 0
+	for _, ctx := range children {
+		if _, ok := ctx.(IFilterExprContext); ok {
+			len++
+		}
+	}
 
-	for i, t := range ts {
-		if t != nil {
+	tst := make([]IFilterExprContext, len)
+	i := 0
+	for _, ctx := range children {
+		if t, ok := ctx.(IFilterExprContext); ok {
 			tst[i] = t.(IFilterExprContext)
+			i++
 		}
 	}
 
@@ -1163,7 +1312,17 @@ func (s *FilterExprContext) AllFilterExpr() []IFilterExprContext {
 }
 
 func (s *FilterExprContext) FilterExpr(i int) IFilterExprContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IFilterExprContext)(nil)).Elem(), i)
+	var t antlr.RuleContext
+	j := 0
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IFilterExprContext); ok {
+			if j == i {
+				t = ctx.(antlr.RuleContext)
+				break
+			}
+			j++
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -1173,7 +1332,13 @@ func (s *FilterExprContext) FilterExpr(i int) IFilterExprContext {
 }
 
 func (s *FilterExprContext) Expr() IExprContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IExprContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IExprContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -1225,6 +1390,9 @@ func (p *Query) FilterExpr() (localctx IFilterExprContext) {
 }
 
 func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
+	this := p
+	_ = this
+
 	var _parentctx antlr.ParserRuleContext = p.GetParserRuleContext()
 	_parentState := p.GetState()
 	localctx = NewFilterExprContext(p, p.GetParserRuleContext(), _parentState)
@@ -1252,30 +1420,30 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 	var _alt int
 
 	p.EnterOuterAlt(localctx, 1)
-	p.SetState(80)
+	p.SetState(82)
 	p.GetErrorHandler().Sync(p)
 
 	switch p.GetTokenStream().LA(1) {
 	case QueryL_PAREN:
 		{
-			p.SetState(75)
+			p.SetState(77)
 			p.Match(QueryL_PAREN)
 		}
 		{
-			p.SetState(76)
+			p.SetState(78)
 
 			var _x = p.filterExpr(0)
 
 			localctx.(*FilterExprContext).Inner = _x
 		}
 		{
-			p.SetState(77)
+			p.SetState(79)
 			p.Match(QueryR_PAREN)
 		}
 
 	case QueryREP, QueryIN, QueryAS, QuerySELECT, QueryFROM, QueryFILTER, QueryAT, QueryIDENT, QuerySTRING:
 		{
-			p.SetState(79)
+			p.SetState(81)
 			p.Expr()
 		}
 
@@ -1283,7 +1451,7 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 		panic(antlr.NewNoViableAltException(p, nil, nil, nil, nil, nil))
 	}
 	p.GetParserRuleContext().SetStop(p.GetTokenStream().LT(-1))
-	p.SetState(90)
+	p.SetState(92)
 	p.GetErrorHandler().Sync(p)
 	_alt = p.GetInterpreter().AdaptivePredict(p.GetTokenStream(), 10, p.GetParserRuleContext())
 
@@ -1293,27 +1461,27 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 				p.TriggerExitRuleEvent()
 			}
 			_prevctx = localctx
-			p.SetState(88)
+			p.SetState(90)
 			p.GetErrorHandler().Sync(p)
 			switch p.GetInterpreter().AdaptivePredict(p.GetTokenStream(), 9, p.GetParserRuleContext()) {
 			case 1:
 				localctx = NewFilterExprContext(p, _parentctx, _parentState)
 				localctx.(*FilterExprContext).F1 = _prevctx
 				p.PushNewRecursionContext(localctx, _startState, QueryRULE_filterExpr)
-				p.SetState(82)
+				p.SetState(84)
 
 				if !(p.Precpred(p.GetParserRuleContext(), 4)) {
 					panic(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 4)", ""))
 				}
 				{
-					p.SetState(83)
+					p.SetState(85)
 
 					var _m = p.Match(QueryAND_OP)
 
 					localctx.(*FilterExprContext).Op = _m
 				}
 				{
-					p.SetState(84)
+					p.SetState(86)
 
 					var _x = p.filterExpr(5)
 
@@ -1324,20 +1492,20 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 				localctx = NewFilterExprContext(p, _parentctx, _parentState)
 				localctx.(*FilterExprContext).F1 = _prevctx
 				p.PushNewRecursionContext(localctx, _startState, QueryRULE_filterExpr)
-				p.SetState(85)
+				p.SetState(87)
 
 				if !(p.Precpred(p.GetParserRuleContext(), 3)) {
 					panic(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 3)", ""))
 				}
 				{
-					p.SetState(86)
+					p.SetState(88)
 
 					var _m = p.Match(QueryOR_OP)
 
 					localctx.(*FilterExprContext).Op = _m
 				}
 				{
-					p.SetState(87)
+					p.SetState(89)
 
 					var _x = p.filterExpr(4)
 
@@ -1347,7 +1515,7 @@ func (p *Query) filterExpr(_p int) (localctx IFilterExprContext) {
 			}
 
 		}
-		p.SetState(92)
+		p.SetState(94)
 		p.GetErrorHandler().Sync(p)
 		_alt = p.GetInterpreter().AdaptivePredict(p.GetTokenStream(), 10, p.GetParserRuleContext())
 	}
@@ -1424,7 +1592,13 @@ func (s *FilterStmtContext) AS() antlr.TerminalNode {
 }
 
 func (s *FilterStmtContext) FilterExpr() IFilterExprContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IFilterExprContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IFilterExprContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -1434,7 +1608,13 @@ func (s *FilterStmtContext) FilterExpr() IFilterExprContext {
 }
 
 func (s *FilterStmtContext) Ident() IIdentContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IIdentContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IIdentContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -1474,6 +1654,9 @@ func (s *FilterStmtContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 }
 
 func (p *Query) FilterStmt() (localctx IFilterStmtContext) {
+	this := p
+	_ = this
+
 	localctx = NewFilterStmtContext(p, p.GetParserRuleContext(), p.GetState())
 	p.EnterRule(localctx, 12, QueryRULE_filterStmt)
 
@@ -1495,22 +1678,22 @@ func (p *Query) FilterStmt() (localctx IFilterStmtContext) {
 
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(93)
+		p.SetState(95)
 		p.Match(QueryFILTER)
 	}
 	{
-		p.SetState(94)
+		p.SetState(96)
 
 		var _x = p.filterExpr(0)
 
 		localctx.(*FilterStmtContext).Expr = _x
 	}
 	{
-		p.SetState(95)
+		p.SetState(97)
 		p.Match(QueryAS)
 	}
 	{
-		p.SetState(96)
+		p.SetState(98)
 
 		var _x = p.Ident()
 
@@ -1596,7 +1779,13 @@ func (s *ExprContext) AT() antlr.TerminalNode {
 }
 
 func (s *ExprContext) Ident() IIdentContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IIdentContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IIdentContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -1610,7 +1799,13 @@ func (s *ExprContext) SIMPLE_OP() antlr.TerminalNode {
 }
 
 func (s *ExprContext) FilterKey() IFilterKeyContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IFilterKeyContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IFilterKeyContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -1620,7 +1815,13 @@ func (s *ExprContext) FilterKey() IFilterKeyContext {
 }
 
 func (s *ExprContext) FilterValue() IFilterValueContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IFilterValueContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IFilterValueContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -1660,6 +1861,9 @@ func (s *ExprContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 }
 
 func (p *Query) Expr() (localctx IExprContext) {
+	this := p
+	_ = this
+
 	localctx = NewExprContext(p, p.GetParserRuleContext(), p.GetState())
 	p.EnterRule(localctx, 14, QueryRULE_expr)
 
@@ -1679,18 +1883,18 @@ func (p *Query) Expr() (localctx IExprContext) {
 		}
 	}()
 
-	p.SetState(104)
+	p.SetState(106)
 	p.GetErrorHandler().Sync(p)
 
 	switch p.GetTokenStream().LA(1) {
 	case QueryAT:
 		p.EnterOuterAlt(localctx, 1)
 		{
-			p.SetState(98)
+			p.SetState(100)
 			p.Match(QueryAT)
 		}
 		{
-			p.SetState(99)
+			p.SetState(101)
 
 			var _x = p.Ident()
 
@@ -1700,18 +1904,18 @@ func (p *Query) Expr() (localctx IExprContext) {
 	case QueryREP, QueryIN, QueryAS, QuerySELECT, QueryFROM, QueryFILTER, QueryIDENT, QuerySTRING:
 		p.EnterOuterAlt(localctx, 2)
 		{
-			p.SetState(100)
+			p.SetState(102)
 
 			var _x = p.FilterKey()
 
 			localctx.(*ExprContext).Key = _x
 		}
 		{
-			p.SetState(101)
+			p.SetState(103)
 			p.Match(QuerySIMPLE_OP)
 		}
 		{
-			p.SetState(102)
+			p.SetState(104)
 
 			var _x = p.FilterValue()
 
@@ -1764,7 +1968,13 @@ func NewFilterKeyContext(parser antlr.Parser, parent antlr.ParserRuleContext, in
 func (s *FilterKeyContext) GetParser() antlr.Parser { return s.parser }
 
 func (s *FilterKeyContext) Ident() IIdentContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IIdentContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IIdentContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -1808,6 +2018,9 @@ func (s *FilterKeyContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 }
 
 func (p *Query) FilterKey() (localctx IFilterKeyContext) {
+	this := p
+	_ = this
+
 	localctx = NewFilterKeyContext(p, p.GetParserRuleContext(), p.GetState())
 	p.EnterRule(localctx, 16, QueryRULE_filterKey)
 
@@ -1827,21 +2040,21 @@ func (p *Query) FilterKey() (localctx IFilterKeyContext) {
 		}
 	}()
 
-	p.SetState(108)
+	p.SetState(110)
 	p.GetErrorHandler().Sync(p)
 
 	switch p.GetTokenStream().LA(1) {
 	case QueryREP, QueryIN, QueryAS, QuerySELECT, QueryFROM, QueryFILTER, QueryIDENT:
 		p.EnterOuterAlt(localctx, 1)
 		{
-			p.SetState(106)
+			p.SetState(108)
 			p.Ident()
 		}
 
 	case QuerySTRING:
 		p.EnterOuterAlt(localctx, 2)
 		{
-			p.SetState(107)
+			p.SetState(109)
 			p.Match(QuerySTRING)
 		}
 
@@ -1891,7 +2104,13 @@ func NewFilterValueContext(parser antlr.Parser, parent antlr.ParserRuleContext,
 func (s *FilterValueContext) GetParser() antlr.Parser { return s.parser }
 
 func (s *FilterValueContext) Ident() IIdentContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IIdentContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IIdentContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -1901,7 +2120,13 @@ func (s *FilterValueContext) Ident() IIdentContext {
 }
 
 func (s *FilterValueContext) Number() INumberContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*INumberContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(INumberContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -1945,6 +2170,9 @@ func (s *FilterValueContext) Accept(visitor antlr.ParseTreeVisitor) interface{}
 }
 
 func (p *Query) FilterValue() (localctx IFilterValueContext) {
+	this := p
+	_ = this
+
 	localctx = NewFilterValueContext(p, p.GetParserRuleContext(), p.GetState())
 	p.EnterRule(localctx, 18, QueryRULE_filterValue)
 
@@ -1964,28 +2192,28 @@ func (p *Query) FilterValue() (localctx IFilterValueContext) {
 		}
 	}()
 
-	p.SetState(113)
+	p.SetState(115)
 	p.GetErrorHandler().Sync(p)
 
 	switch p.GetTokenStream().LA(1) {
 	case QueryREP, QueryIN, QueryAS, QuerySELECT, QueryFROM, QueryFILTER, QueryIDENT:
 		p.EnterOuterAlt(localctx, 1)
 		{
-			p.SetState(110)
+			p.SetState(112)
 			p.Ident()
 		}
 
 	case QueryNUMBER1, QueryZERO:
 		p.EnterOuterAlt(localctx, 2)
 		{
-			p.SetState(111)
+			p.SetState(113)
 			p.Number()
 		}
 
 	case QuerySTRING:
 		p.EnterOuterAlt(localctx, 3)
 		{
-			p.SetState(112)
+			p.SetState(114)
 			p.Match(QuerySTRING)
 		}
 
@@ -2073,6 +2301,9 @@ func (s *NumberContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 }
 
 func (p *Query) Number() (localctx INumberContext) {
+	this := p
+	_ = this
+
 	localctx = NewNumberContext(p, p.GetParserRuleContext(), p.GetState())
 	p.EnterRule(localctx, 20, QueryRULE_number)
 	var _la int
@@ -2095,7 +2326,7 @@ func (p *Query) Number() (localctx INumberContext) {
 
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(115)
+		p.SetState(117)
 		_la = p.GetTokenStream().LA(1)
 
 		if !(_la == QueryNUMBER1 || _la == QueryZERO) {
@@ -2202,6 +2433,9 @@ func (s *KeywordContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 }
 
 func (p *Query) Keyword() (localctx IKeywordContext) {
+	this := p
+	_ = this
+
 	localctx = NewKeywordContext(p, p.GetParserRuleContext(), p.GetState())
 	p.EnterRule(localctx, 22, QueryRULE_keyword)
 	var _la int
@@ -2224,7 +2458,7 @@ func (p *Query) Keyword() (localctx IKeywordContext) {
 
 	p.EnterOuterAlt(localctx, 1)
 	{
-		p.SetState(117)
+		p.SetState(119)
 		_la = p.GetTokenStream().LA(1)
 
 		if !(((_la)&-(0x1f+1)) == 0 && ((1<<uint(_la))&((1<<QueryREP)|(1<<QueryIN)|(1<<QueryAS)|(1<<QuerySELECT)|(1<<QueryFROM)|(1<<QueryFILTER))) != 0) {
@@ -2277,7 +2511,13 @@ func NewIdentContext(parser antlr.Parser, parent antlr.ParserRuleContext, invoki
 func (s *IdentContext) GetParser() antlr.Parser { return s.parser }
 
 func (s *IdentContext) Keyword() IKeywordContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IKeywordContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IKeywordContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -2321,6 +2561,9 @@ func (s *IdentContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 }
 
 func (p *Query) Ident() (localctx IIdentContext) {
+	this := p
+	_ = this
+
 	localctx = NewIdentContext(p, p.GetParserRuleContext(), p.GetState())
 	p.EnterRule(localctx, 24, QueryRULE_ident)
 
@@ -2340,21 +2583,21 @@ func (p *Query) Ident() (localctx IIdentContext) {
 		}
 	}()
 
-	p.SetState(121)
+	p.SetState(123)
 	p.GetErrorHandler().Sync(p)
 
 	switch p.GetTokenStream().LA(1) {
 	case QueryREP, QueryIN, QueryAS, QuerySELECT, QueryFROM, QueryFILTER:
 		p.EnterOuterAlt(localctx, 1)
 		{
-			p.SetState(119)
+			p.SetState(121)
 			p.Keyword()
 		}
 
 	case QueryIDENT:
 		p.EnterOuterAlt(localctx, 2)
 		{
-			p.SetState(120)
+			p.SetState(122)
 			p.Match(QueryIDENT)
 		}
 
@@ -2404,7 +2647,13 @@ func NewIdentWCContext(parser antlr.Parser, parent antlr.ParserRuleContext, invo
 func (s *IdentWCContext) GetParser() antlr.Parser { return s.parser }
 
 func (s *IdentWCContext) Ident() IIdentContext {
-	var t = s.GetTypedRuleContext(reflect.TypeOf((*IIdentContext)(nil)).Elem(), 0)
+	var t antlr.RuleContext
+	for _, ctx := range s.GetChildren() {
+		if _, ok := ctx.(IIdentContext); ok {
+			t = ctx.(antlr.RuleContext)
+			break
+		}
+	}
 
 	if t == nil {
 		return nil
@@ -2448,6 +2697,9 @@ func (s *IdentWCContext) Accept(visitor antlr.ParseTreeVisitor) interface{} {
 }
 
 func (p *Query) IdentWC() (localctx IIdentWCContext) {
+	this := p
+	_ = this
+
 	localctx = NewIdentWCContext(p, p.GetParserRuleContext(), p.GetState())
 	p.EnterRule(localctx, 26, QueryRULE_identWC)
 
@@ -2467,21 +2719,21 @@ func (p *Query) IdentWC() (localctx IIdentWCContext) {
 		}
 	}()
 
-	p.SetState(125)
+	p.SetState(127)
 	p.GetErrorHandler().Sync(p)
 
 	switch p.GetTokenStream().LA(1) {
 	case QueryREP, QueryIN, QueryAS, QuerySELECT, QueryFROM, QueryFILTER, QueryIDENT:
 		p.EnterOuterAlt(localctx, 1)
 		{
-			p.SetState(123)
+			p.SetState(125)
 			p.Ident()
 		}
 
 	case QueryWILDCARD:
 		p.EnterOuterAlt(localctx, 2)
 		{
-			p.SetState(124)
+			p.SetState(126)
 			p.Match(QueryWILDCARD)
 		}
 
@@ -2507,6 +2759,9 @@ func (p *Query) Sempred(localctx antlr.RuleContext, ruleIndex, predIndex int) bo
 }
 
 func (p *Query) FilterExpr_Sempred(localctx antlr.RuleContext, predIndex int) bool {
+	this := p
+	_ = this
+
 	switch predIndex {
 	case 0:
 		return p.Precpred(p.GetParserRuleContext(), 4)
diff --git a/netmap/parser/query_visitor.go b/netmap/parser/query_visitor.go
index b6128a56..9f69f65e 100644
--- a/netmap/parser/query_visitor.go
+++ b/netmap/parser/query_visitor.go
@@ -1,4 +1,4 @@
-// Code generated from Query.g4 by ANTLR 4.9.2. DO NOT EDIT.
+// Code generated from Query.g4 by ANTLR 4.10.1. DO NOT EDIT.
 
 package parser // Query
 
diff --git a/netmap/policy_test.go b/netmap/policy_test.go
index 2d04313f..91161c9d 100644
--- a/netmap/policy_test.go
+++ b/netmap/policy_test.go
@@ -39,6 +39,7 @@ FILTER City EQ SPB AND SSD EQ true OR City EQ SPB AND Rating GE 5 AS SPBSSD`,
 
 	invalidTestCases := []string{
 		`?REP 1`,
+		`REP 1 trailing garbage`,
 	}
 
 	for i := range invalidTestCases {