@sap/cds-compiler 6.7.3 → 6.8.0

package/lib/gen/CdlParser.js

@@ -1,4 +1,4 @@
-// Parser generated by redepage v0.3.2
+// Parser generated by redepage v0.3.4
 'use strict;'
 const { XsnSource, XsnArtifact, XsnName } = require( '../compiler/xsn-model' )
 const { isValidEnumValue } = require( '../compiler/base' )
@@ -134,7 +134,7 @@ EOF:3,
 },
 ['m',0,'}',,,'afterBrace'],
 'artifactDefOrExtend',
-{'@':[10,769],'':11},
+{'@':[10,767],'':11},
 {
 type:12,view:12,event:12,action:12,aspect:12,entity:12,context:12,service:12,abstract:12,function:12,annotation:12,
 define:['ck',12],
@@ -199,22 +199,22 @@ Id:[22,31],
 'serviceDef',
 ['mk',44,'service',,,'vocabularyRestriction'],
 [45,35],
-{'@':[45,775],'':46},
+{'@':[45,773],'':46},
 {'{':[0,5],'':0},
 'contextDef',
 ['mk',49,'context',,,'vocabularyRestriction'],
 [50,35],
-{'@':[50,775],'':51},
+{'@':[50,773],'':51},
 {'{':[0,5],'':0},
 'annotationDef',
 ['mk',54,'annotation'],
 [55,35],
-{'@':[55,775],'':56},
+{'@':[55,773],'':56},
 [0,347],
 'typeDef',
 ['mk',59,'type'],
 [60,35],
-{'@':[60,775],'':61},
+{'@':[60,773],'':61},
 [0,347],
 'aspectDef',
 {
@@ -223,7 +223,7 @@ abstract:['ck',64,,'hide_'],
 },
 ['mk',65,'entity'],
 [66,35],
-{'@':[66,775],'':67},
+{'@':[66,773],'':67},
 {
 '{':[71,158],
 ':':['c',68],
@@ -240,7 +240,7 @@ abstract:['ck',64,,'hide_'],
 'entityDef',
 ['mk',74,'entity'],
 [75,35],
-{'@':[75,775],'':76},
+{'@':[75,773],'':76},
 {'(':[77,142],'':77},
 {
 '{':81,
@@ -259,14 +259,14 @@ as:['ck',82],
 projection:['g',83,,,'sloppy','afterBrace'],
 },
 [84,445],
-{group:[85,605],where:'group',having:'group','':85},
-{limit:[86,617],order:'limit','':86},
+{group:[85,604],where:'group',having:'group','':85},
+{limit:[86,616],order:'limit','':86},
 ['g',87,,,'normal','afterBrace'],
 {actions:[0,125],'':0},
 'viewDef',
 ['mk',90,'view'],
 [91,35],
-{'@':[91,775],'':92},
+{'@':[91,773],'':92},
 {
 '(':[98,142],
 with:['ck',93,,'hide_'],
@@ -282,7 +282,7 @@ with:['ck',93,,'hide_'],
 'eventDef',
 ['mk',102,'event'],
 [103,35],
-{'@':[103,775],'':104},
+{'@':[103,773],'':104},
 {
 '{':[0,158],
 ':':['c',105],
@@ -300,17 +300,17 @@ projection:[0,445,1],
 '{':110,
 },
 [0,158],
-{'@':[111,769],'':0},
+{'@':[111,767],'':0},
 'actionMainDef',
 ['mk',114,'action'],
 [115,35],
-{'@':[115,775],'':116},
+{'@':[115,773],'':116},
 [117,142],
 {returns:[0,154],'':0},
 'functionMainDef',
 ['mk',120,'function'],
 [121,35],
-{'@':[121,775],'':122},
+{'@':[121,773],'':122},
 [123,142],
 [0,154],
 'actionsBlock',
@@ -324,17 +324,17 @@ projection:[0,445,1],
 },
 ['m',0,'}',,,'afterBrace'],
 'boundActionFunctionDef',
-{'@':[131,769],'':132},
+{'@':[131,767],'':132},
 {
 action:['ck',133],
 function:['ck',137],
 },
 ['mi',134],
-{'@':[134,775],'':135},
+{'@':[134,773],'':135},
 [136,142],
 {returns:[0,154],'':0},
 ['mi',138],
-{'@':[138,775],'':139},
+{'@':[138,773],'':139},
 [140,142],
 [0,154],
 'paramsList',
@@ -346,9 +346,9 @@ function:['ck',137],
 },
 ['m',0,')'],
 'paramDef',
-{'@':[147,769],'':148},
+{'@':[147,767],'':148},
 ['miA',149],
-{'@':[149,775],'':150},
+{'@':[149,773],'':150},
 {
 '{':[151,158],
 ':':['c',152],
@@ -357,7 +357,7 @@ function:['ck',137],
 [0,357],
 'returnsSpec',
 ['mk',155,'returns',,'default','elementRestriction'],
-{'@':[155,769],'':156},
+{'@':[155,767],'':156},
 [0,357],
 'elementsBlock',
 ['m',159,'{'],
@@ -369,13 +369,13 @@ Id:['g',159,,'afterBrace'],'@':'Id',key:'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'elementDef',
-{'@':[163,769],'':164},
+{'@':[163,767],'':164},
 {virtual:['ck',165,1],'':165},
 {key:['ck',166],'':166},
 {masked:['ck',167,1,'hide_'],'':167},
 {element:['ck',168,1,'hide_'],'':168},
 ['mi',169,,,'elem','elementRestriction'],
-{'@':[169,775],'':170},
+{'@':[169,773],'':170},
 {
 '{':[171,158],
 ':':['c',172],
@@ -384,10 +384,10 @@ Id:['g',159,,'afterBrace'],'@':'Id',key:'Id',
 {not:[173,438],null:'not','':173},
 [173,357],
 {'=':['c',174,,'elementRestriction','calc'],'':0},
-[175,639],
+[175,638],
 {stored:['ck',176],'':176},
 ['g',177],
-{'@':[177,769,,'elementRestriction','anno'],'':0},
+{'@':[177,767,,'elementRestriction','anno'],'':0},
 'enumSymbolsBlock',
 ['mk',180,'enum'],
 ['m',181,'{'],
@@ -398,19 +398,19 @@ Id:['g',159,,'afterBrace'],'@':'Id',key:'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'enumSymbolDef',
-{'@':[185,769],'':186},
+{'@':[185,767],'':186},
 ['mi',187],
-{'@':[187,769],'':188},
+{'@':[187,767],'':188},
 {'=':['c',189],'':0},
 {
 String:['c',191],
 Number:['c',191],
 '+':['c',190],'-':'+',
-Id:[191,766,,'hide_'],'#':'Id',QuotedLiteral:'Id',
+Id:[191,764,,'hide_'],'#':'Id',QuotedLiteral:'Id',
 },
 ['m',191,'Number'],
 ['g',192],
-{'@':[192,769],'':0},
+{'@':[192,767],'':0},
 'foreignKeysBlock',
 ['m',195,'{'],
 {Id:[196,199],'@':'Id','':197},
@@ -420,7 +420,7 @@ Id:[191,766,,'hide_'],'#':'Id',QuotedLiteral:'Id',
 },
 ['m',0,'}'],
 'foreignKeyDef',
-{'@':[199,769],'':200},
+{'@':[199,767],'':200},
 [201,39],
 {as:['ck',202],'':0},
 ['mi',0],
@@ -438,7 +438,7 @@ composition:['ck',209],
 {one:['ck',212,1,'noRepeatedCardinality'],many:'one','':212},
 [213,39],
 ['mk',214,'on'],
-[0,637],
+[0,636],
 'annotateArtifact',
 [217,35],
 {
@@ -449,10 +449,10 @@ with:['ck',223],
 [219,35],
 {with:['ck',220],'':220},
 ['g',221],
-{'@':[221,769],'':222},
+{'@':[221,767],'':222},
 {'{':[0,321],'':0},
 ['g',224],
-{'@':[224,769],'':225},
+{'@':[224,767],'':225},
 {'(':[226,308],'':226},
 {
 returns:[0,317],
@@ -470,7 +470,7 @@ with:['ck',240],
 [232,35],
 {with:['ck',233],'':233},
 ['g',234],
-{'@':[234,769],'':235},
+{'@':[234,767],'':235},
 {
 '{':236,
 elements:['ck',236],
@@ -479,10 +479,10 @@ enum:[0,179],
 '':0
 },
 [0,331],
-{'@':[237,769],'':238},
+{'@':[237,767],'':238},
 {'{':[239,331],'':0},
 {actions:[0,125],'':0},
-{'@':[240,769],'':241},
+{'@':[240,767],'':241},
 {
 Id:[242,39],
 '{':246,
@@ -500,29 +500,29 @@ definitions:['ck',249,1],
 {actions:[0,125],'':0},
 [247,331],
 {actions:[0,125],'':0},
-[0,555],
+[0,554],
 [0,5],
 'extendService',
 ['mk',252,'service'],
 [253,35],
 {with:['ck',254],'':254},
 ['g',255],
-{'@':[255,769],'':256},
+{'@':[255,767],'':256},
 {'{':[0,5],'':0},
 'extendContext',
 ['mk',259,'context'],
 [260,35],
 {with:['ck',261],'':261},
 ['g',262],
-{'@':[262,769],'':263},
+{'@':[262,767],'':263},
 {'{':[0,5],'':0},
 'extendType',
 ['mk',266,'type'],
 [267,35],
 {with:['ck',270],'':268},
-{'@':[268,769],'':269},
+{'@':[268,767],'':269},
 {'{':[0,331],'':0},
-{'@':[270,769],'':271},
+{'@':[270,767],'':271},
 {
 Id:[272,39],
 '{':275,
@@ -539,8 +539,8 @@ enum:[0,179,1],
 {aspect:['ck',278],entity:'aspect'},
 [279,35],
 {with:['ck',281],'':280},
-{'@':[280,769],'':285},
-{'@':[281,769],'':282},
+{'@':[280,767],'':285},
+{'@':[281,767],'':282},
 {
 Id:[283,39],
 actions:['g',285,1],
@@ -555,8 +555,8 @@ actions:['g',285,1],
 [290,35],
 {with:['ck',291],'':291},
 ['g',292],
-{'@':[292,769],'':293},
-{'{':[294,555],'':294},
+{'@':[292,767],'':293},
+{'{':[294,554],'':294},
 {actions:[0,125],'':0},
 'annotateActionsBlock',
 ['mk',297,'actions'],
@@ -569,11 +569,11 @@ Id:['g',298,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'annotateBoundAction',
-{'@':[302,769],'':303},
+{'@':[302,767],'':303},
 ['mi',304],
-{'@':[304,769],'':305},
+{'@':[304,767],'':305},
 {'(':[306,308],'':306},
-{returns:[0,317,1],'':0},
+{returns:[0,317],'':0},
 'annotateParamsBlock',
 ['m',309,'('],
 {Id:[310,313],'@':'Id','':311},
@@ -583,12 +583,12 @@ Id:['g',298,,'afterBrace'],'@':'Id',
 },
 ['m',0,')'],
 'annotateParam',
-{'@':[313,769],'':314},
+{'@':[313,767],'':314},
 ['mi',315],
-{'@':[315,769],'':0},
+{'@':[315,767],'':0},
 'annotateReturns',
 ['mk',318,'returns'],
-{'@':[318,769],'':319},
+{'@':[318,767],'':319},
 {'{':[0,321],'':0},
 'annotateElementsBlock',
 ['m',322,'{'],
@@ -600,9 +600,9 @@ Id:['g',322,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'annotateElement',
-{'@':[326,769],'':327},
+{'@':[326,767],'':327},
 ['mi',328],
-{'@':[328,769],'':329},
+{'@':[328,767],'':329},
 {'{':[0,321],'':0},
 'extendElementsBlock',
 ['m',332,'{'],
@@ -614,7 +614,7 @@ Id:['g',332,,'afterBrace'],'@':'Id',key:'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'elementDefOrExtend',
-{'@':[336,769],'':337},
+{'@':[336,767],'':337},
 {
 Id:[0,163],'@':'Id',key:'Id',
 extend:['ck',338,1],
@@ -622,9 +622,9 @@ extend:['ck',338,1],
 {element:['ck',339,1],'':339},
 ['mi',340],
 {with:['ck',343],'':341},
-{'@':[341,769],'':342},
+{'@':[341,767],'':342},
 {'{':[0,331],'':0},
-{'@':[343,769],'':344},
+{'@':[343,767],'':344},
 {
 '{':345,
 elements:['ck',345],
@@ -670,9 +670,9 @@ many:['ck',378,1,,'calc','elementRestriction'],
 '{':[383,158,,,'calc','elementRestriction'],
 },
 ['g',359],
-{'@':[359,769],'':360},
+{'@':[359,767],'':360},
 {not:[361,438,,'elementRestriction','notNull'],null:'not','':362},
-{'@':[361,769],'':362},
+{'@':[361,767],'':362},
 {
 enum:[363,179,,,'anno','elementRestriction'],
 '@':[0,392],not:'@',null:'@',default:'@',
@@ -680,7 +680,7 @@ enum:[363,179,,,'anno','elementRestriction'],
 },
 {not:[364,438,,'elementRestriction','notNull'],null:'not','':364},
 {default:['ck',365,,'elementRestriction','default'],'':366},
-[366,639],
+[366,638],
 {not:[0,438,,'elementRestriction','notNull'],null:'not','':0},
 [368,403],
 {'@':[0,392],not:'@',null:'@',default:'@','':0},
@@ -703,29 +703,29 @@ type:[379,395,1],
 },
 {not:[380,438,,'elementRestriction','notNull'],null:'not','':380},
 {enum:[382,179],'':381},
-{'@':[381,769],'':0},
+{'@':[381,767],'':0},
 {not:[0,438,,'elementRestriction','notNull'],null:'not','':0},
 {not:[0,438],null:'not','':0},
 'typeAssocProperties',
 [386,39],
-{'@':[386,769],'':387},
+{'@':[386,767],'':387},
 {
 on:['ck',388],
 '{':[390,194],
 '@':[0,392],not:'@',null:'@',default:'@',
 '':0
 },
-[389,637],
-{'@':[389,769],'':0},
+[389,636],
+{'@':[389,767],'':0},
 {'@':[0,392],not:'@',null:'@',default:'@','':0},
 'typeProperties',
 {
-'@':[392,769],
+'@':[392,767],
 not:[392,438,,'elementRestriction','notNull'],null:'not',
 default:['ck',393,,'elementRestriction','default'],
 '':0
 },
-[392,639],
+[392,638],
 'typeTypeOf',
 ['mk',396,'type'],
 ['mk',397,'of'],
@@ -816,9 +816,9 @@ not:['ck',439],
 'projectionSpec',
 ['mk',446,'projection'],
 ['mk',447,'on'],
-[448,511],
-{'{':[449,555],'':449},
-{excluding:[0,548],'':0},
+[448,510],
+{'{':[449,554],'':449},
+{excluding:[0,547],'':0},
 'queryExpression',
 {
 '(':['c',452],
@@ -835,7 +835,7 @@ union:['ck',456,,'precLeft_',2],
 {distinct:['ck',457],'':457},
 {all:['ck',457],distinct:'all','':457},
 [454,451,,,,'orderByLimitRestriction'],
-{limit:[0,617,,'orderByLimitRestriction'],order:'limit','':0},
+{limit:[0,616,,'orderByLimitRestriction'],order:'limit','':0},
 'selectQuery',
 ['mk',461,'select'],
 {
@@ -854,21 +854,21 @@ all:['ck',472],distinct:'all',
 ['m',468,'}'],
 ['mk',469,'into'],
 {all:['ck',470],distinct:'all','':470},
-{'{':[471,555],'':471},
-{excluding:[478,548],'':478},
+{'{':[471,554],'':471},
+{excluding:[478,547],'':478},
 ['g',473,,,'sqlStyle','inSelectItem'],
 {
 '*':['c',474],
-Id:[474,565],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+Id:[474,564],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
 },
 {',':['c',475],'':476},
 {
 '*':['c',474],
-Id:[474,565],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+Id:[474,564],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
 },
 ['mk',477,'from'],
 [478,480],
-{group:[0,605],where:'group',having:'group','':0},
+{group:[0,604],where:'group',having:'group','':0},
 'querySource',
 [481,485],
 {',':482,'':0},
@@ -876,469 +876,471 @@ Id:[474,565],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':
 [482,485],
 'tableExpression',
 {
-'(':[486,498],
-Id:[487,511],
+'(':[486,497],
+Id:[486,510],
 },
-['g',487],
 {
-cross:['ck',488],
-inner:['ck',491],
-full:['ck',490],left:'full',right:'full',
-join:['ck',493],
+cross:['ck',487],
+inner:['ck',490],
+full:['ck',489],left:'full',right:'full',
+join:['ck',492],
 '':0
 },
-['mk',489,'join'],
+['mk',488,'join'],
 {
-'(':[487,498],
-Id:[487,511],
+'(':[486,497],
+Id:[486,510],
 },
-{outer:['ck',491],'':491},
-{one:[492,505],many:'one',exact:'one','':492},
-['mk',493,'join'],
-['g',494],
-[495,485],
-['mk',496,'on'],
-[487,637],
+{outer:['ck',490],'':490},
+{one:[491,504],many:'one',exact:'one','':491},
+['mk',492,'join'],
+['g',493],
+[494,485],
+['mk',495,'on'],
+[486,636],
 'tableOrQueryParens',
-['m',499,'(',,,'queryOnLeft'],
+['m',498,'(',,,'queryOnLeft'],
 {
-'(':[500,498],
-Id:[501,485,,,'table','queryOnLeft'],
-select:[501,451],
+'(':[499,497],
+Id:[500,485,,,'table','queryOnLeft'],
+select:[500,451],
 },
 {
-full:[501,486,,,'table','queryOnLeft'],join:'full',left:'full',cross:'full',inner:'full',right:'full',
-limit:[501,454,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
-'':501
+full:[500,486,,,'table','queryOnLeft'],join:'full',left:'full',cross:'full',inner:'full',right:'full',
+limit:[500,454,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
+'':500
 },
-['m',502,')'],
+['m',501,')'],
 {
-as:['ck',503,,'queryOnLeft','table'],
+as:['ck',502,,'queryOnLeft','table'],
 Id:['ci',0,,'queryOnLeftSloppyAlias'],
 '':0
 },
 ['mi',0],
 'joinCardinality',
 {
-one:506,
-exact:['ck',506],
-many:['ck',507],
+one:505,
+exact:['ck',505],
+many:['ck',506],
 },
-['mk',507,'one'],
-['mk',508,'to'],
+['mk',506,'one'],
+['mk',507,'to'],
 {
-one:509,
-exact:['ck',509],
+one:508,
+exact:['ck',508],
 many:['ck',0],
 },
 ['mk',0,'one'],
 'fromRefWithOptAlias',
-[512,518],
-{':':['c',513],'':514},
-[514,518],
+[511,517],
+{':':['c',512],'':513},
+[513,517],
 {
-as:['ck',515],
+as:['ck',514],
 Id:['ci',0,,'isNoKeywordInRuleFollow'],
-'':516
+'':515
 },
 ['mi',0],
 ['g',0],
 'fromPath',
-['mi',519],
-{'(':[520,524],'[':'(','':520},
-{'.':['c',521,,'notAfterEntityArgOrFilter'],'':0},
-['miA',522],
-{'(':[520,524],'[':'(','':520},
+['mi',518],
+{'(':[519,523],'[':'(','':519},
+{'.':['c',520,,'notAfterEntityArgOrFilter'],'':0},
+['miA',521],
+{'(':[519,523],'[':'(','':519},
 'fromArgumentsAndFilter',
-{'(':['c',525],'':529},
-{Id:526},
-{Id:[527,531],'':528},
+{'(':['c',524],'':528},
+{Id:525},
+{Id:[526,530],'':527},
 {
-',':['c',526],
-')':528,
+',':['c',525],
+')':527,
 },
-['m',529,')'],
-{'[':[0,535],'':0},
+['m',528,')'],
+{'[':[0,534],'':0},
 'fromNamedArgument',
-['mi',532],
-['m',533,':'],
-[0,639],
+['mi',531],
+['m',532,':'],
+[0,638],
 'cardinalityAndFilter',
-['m',536,'['],
-{Number:['c',537,,'beforeColon'],'':538},
-['m',538,':'],
+['m',535,'['],
+{Number:['c',536,,'beforeColon'],'':537},
+['m',537,':'],
 {
-group:['g',540,1],limit:'group',order:'group',having:'group',
-where:['ck',539],
+group:['g',539,1],limit:'group',order:'group',having:'group',
+where:['ck',538],
 ']':['c',0],
-'':539
+'':538
 },
-[540,637],
-{group:['g',541,,'hide_'],'':542},
-[542,611],
-{having:['ck',543,,'hide_'],'':544},
-[544,637],
-{Id:['g',545,,'hide_'],'':546},
-[546,617],
+[539,636],
+{group:['g',540,,'hide_'],'':541},
+[541,610],
+{having:['ck',542,,'hide_'],'':543},
+[543,636],
+{Id:['g',544,,'hide_'],'':545},
+[545,616],
 ['m',0,']'],
 'excludingClause',
-['mk',549,'excluding'],
-['m',550,'{'],
-{Id:551},
-{Id:['ciA',552],'':553},
+['mk',548,'excluding'],
+['m',549,'{'],
+{Id:550},
+{Id:['ciA',551],'':552},
 {
-',':['c',551],
-'}':553,
+',':['c',550],
+'}':552,
 },
 ['m',0,'}',,,'afterBrace'],
 'selectItemsList',
-['m',556,'{',,'top','inSelectItem'],
+['m',555,'{',,'top','inSelectItem'],
 {
-'*':['c',557],
-Id:[557,565],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'':558
+'*':['c',556],
+Id:[556,564],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'':557
 },
 {
-',':['c',556],
-'}':558,
+',':['c',555],
+'}':557,
 },
 ['m',0,'}',,,'afterBrace'],
 'nestedSelectItemsList',
-['m',561,'{',,,'inSelectItem'],
+['m',560,'{',,,'inSelectItem'],
 {
-'*':['c',562],
-Id:[562,565],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'':563
+'*':['c',561],
+Id:[561,564],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'':562
 },
 {
-',':['c',561],
-'}':563,
+',':['c',560],
+'}':562,
 },
 ['m',0,'}',,,'afterBrace'],
 'selectItemDef',
-{'@':[565,772],'':566},
-{virtual:['ck',567,1,'modifierRestriction'],'':567},
-['g',568,,,'key','columnExpr'],
-{key:['ck',569,,'modifierRestriction'],'':569},
+{'@':[564,770],'':565},
+{virtual:['ck',566,1,'modifierRestriction'],'':566},
+['g',567,,,'key','columnExpr'],
+{key:['ck',568,,'modifierRestriction'],'':568},
 {
-'#':[570,639,1],'(':'#','+':'#','-':'#',':':'#','?':'#',new:'#',not:'#',case:'#',cast:'#',null:'#',true:'#',false:'#',Number:'#',String:'#',exists:'#',QuotedLiteral:'#',
-Id:[572,668],
-'{':[583,560],
+'#':[569,638,1],'(':'#','+':'#','-':'#',':':'#','?':'#',new:'#',not:'#',case:'#',cast:'#',null:'#',true:'#',false:'#',Number:'#',String:'#',exists:'#',QuotedLiteral:'#',
+Id:[571,666],
+'{':[582,559],
 },
 {
-as:['ck',571],
-Id:['ci',580,,'hide_'],
-'':580
+as:['ck',570],
+Id:['ci',579,,'hide_'],
+'':579
 },
-['mi',580],
+['mi',579],
 {
-over:['ck',573],
-'*':[575,640],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
-as:['ck',577],
-Id:['ci',580,,'hide_',,'nestedExpand'],
-'.':['c',578],
-'':580
+over:['ck',572],
+'*':[574,649],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
+as:['ck',576],
+Id:['ci',579,,'hide_',,'nestedExpand'],
+'.':['c',577],
+'':579
 },
-[574,730],
-{'*':[575,640],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*','':575},
+[573,728],
+{'*':[574,649],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*','':574},
 {
-as:['ck',576],
-Id:['ci',580,,'hide_'],
-'':580
+as:['ck',575],
+Id:['ci',579,,'hide_'],
+'':579
 },
-['mi',580],
-['mi',580,,,,'nestedExpand'],
+['mi',579],
+['mi',579,,,,'nestedExpand'],
 {
-'{':[579,560],
+'{':[578,559],
 '*':['c',0],
 },
-{excluding:[0,548],'':0},
-{'{':['g',581,,'nestedExpand'],'':586},
-[582,560],
-{excluding:[586,548],'':586},
-{excluding:[584,548],'':584},
-['mk',585,'as'],
-['mi',586],
-['g',587,,,,'columnExpr'],
-{'@':[587,775],'':588},
-{':':['c',589],'':0},
+{excluding:[0,547],'':0},
+{'{':['g',580,,'nestedExpand'],'':585},
+[581,559],
+{excluding:[585,547],'':585},
+{excluding:[583,547],'':583},
+['mk',584,'as'],
+['mi',585],
+['g',586,,,,'columnExpr'],
+{'@':[586,773],'':587},
+{':':['c',588],'':0},
 {
-Id:[602,357],'{':'Id',
-redirected:['ck',590,1],
-association:['ck',594,1,'columnExpr'],
-composition:['ck',596,1,'columnExpr'],
+Id:[601,357],'{':'Id',
+redirected:['ck',589,1],
+association:['ck',593,1,'columnExpr'],
+composition:['ck',595,1,'columnExpr'],
 },
-['mk',591,'to'],
-[592,39],
+['mk',590,'to'],
+[591,39],
 {
-on:['ck',593],
-'{':[602,194],
-'':602
+on:['ck',592],
+'{':[601,194],
+'':601
 },
-[602,637],
-{'[':[595,426],'':595},
-['mk',598,'to'],
-{'[':[597,426],'':597},
-['mk',598,'of'],
-{one:['ck',599,1,'noRepeatedCardinality'],many:'one','':599},
-[600,39],
-['mk',601,'on'],
-[602,637],
-['g',603],
-{'@':[603,769],'':0},
+[601,636],
+{'[':[594,426],'':594},
+['mk',597,'to'],
+{'[':[596,426],'':596},
+['mk',597,'of'],
+{one:['ck',598,1,'noRepeatedCardinality'],many:'one','':598},
+[599,39],
+['mk',600,'on'],
+[601,636],
+['g',602],
+{'@':[602,767],'':0},
 'whereGroupByHaving',
-{where:['ck',606],'':607},
-[607,637],
-{group:[608,611],'':608},
-{having:['ck',609],'':0},
-[0,637],
+{where:['ck',605],'':606},
+[606,636],
+{group:[607,610],'':607},
+{having:['ck',608],'':0},
+[0,636],
 'groupByClause',
-['mk',612,'group'],
-['mk',613,'by'],
-[614,639],
-{',':['c',615],'':0},
-[614,639],
+['mk',611,'group'],
+['mk',612,'by'],
+[613,638],
+{',':['c',614],'':0},
+[613,638],
 'orderByLimitOffset',
-{order:[618,623],'':618},
-{limit:['ck',619],'':0},
-[620,639],
-{offset:['ck',621],'':0},
-[0,639],
+{order:[617,622],'':617},
+{limit:['ck',618],'':0},
+[619,638],
+{offset:['ck',620],'':0},
+[0,638],
 'orderByClause',
-['mk',624,'order'],
-['mk',625,'by'],
-[626,629],
-{',':['c',627],'':0},
-[626,629],
+['mk',623,'order'],
+['mk',624,'by'],
+[625,628],
+{',':['c',626],'':0},
+[625,628],
 'orderByExpression',
-[630,639],
-{asc:['ck',631],desc:'asc','':631},
-{nulls:['ck',632],'':0},
+[629,638],
+{asc:['ck',630],desc:'asc','':630},
+{nulls:['ck',631],'':0},
 {last:['ck',0],first:'last'},
 'conditionEOF',
-[635,639],
+[634,638],
 ['m',0,'EOF'],
 'condition',
-[0,639],
+[0,638],
 'expression',
 {
-'(':[640,674],
-'#':[651,766],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
-':':['c',641],
-'?':['c',651,,'hide_'],
-Id:[643,668],
-new:['ck',646,1],
-exists:['ck',647],
-case:[651,686],
-cast:[651,697],
-'+':['c',650,,'precRight_',30],'-':'+',
-not:['ck',650,,'precRight_',8],
+'(':[649,672],
+'#':[649,764],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
+':':['c',639],
+'?':['c',649,,'hide_'],
+Id:[641,666],
+new:['ck',644,1],
+exists:['ck',645],
+case:[649,684],
+cast:[649,695],
+'+':['c',648,,'precRight_',30],'-':'+',
+not:['ck',648,,'precRight_',8],
 },
-['g',651],
 {
-Id:['ciA',642],
-Number:['c',651,,'hide_'],
+Id:['ciA',640],
+Number:['c',649,,'hide_'],
 },
-{'.':[651,670],'':651},
-{over:['ck',644],'':645},
-[645,730],
-['g',651],
-[651,668],
+{'.':[649,668],'':649},
+{over:['ck',642],'':643},
+[643,728],
+['g',649],
+[649,666],
 {
-'(':['c',648],
-Id:[651,668],
-'?':['c',651,,'hide_'],
+'(':['c',646],
+Id:[649,666],
+'?':['c',649,,'hide_'],
 },
-[649,451],
-['m',651,')'],
-[651,639],
+[647,451],
+['m',649,')'],
+[649,638],
 {
-'*':['c',655,,'precLeft_',24],'/':'*',
-'+':['c',655,,'precLeft_',22],'-':'+',
-'||':['c',655,,'precLeft_',20],
-and:['ck',655,,'precLeft_',4],
-or:['ck',655,,'precLeft_',2],
-'?':['c',652,,'precRight_',0],
-'<':['c',654,,'precNone_',10],'=':'<','>':'<','!=':'<','<=':'<','<>':'<','>=':'<',
-'==':['c',655,,'precNone_',10],
-is:['ck',656,,'precNone_',10],
-not:['ck',658,,'isNegatedRelation',10],
-in:['g',658,,'precNone_',10],like:'in',between:'in',
+'*':['c',653,,'precLeft_',24],'/':'*',
+'+':['c',653,,'precLeft_',22],'-':'+',
+'||':['c',653,,'precLeft_',20],
+and:['ck',653,,'precLeft_',4],
+or:['ck',653,,'precLeft_',2],
+'?':['c',650,,'precRight_',0],
+'<':['c',652,,'precNone_',10],'=':'<','>':'<','!=':'<','<=':'<','<>':'<','>=':'<',
+'==':['c',653,,'precNone_',10],
+is:['ck',654,,'precNone_',10],
+not:['ck',656,,'isNegatedRelation',10],
+in:['g',656,,'precNone_',10],like:'in',between:'in',
 '':0
 },
-[653,639],
-['m',655,':'],
-{all:['ck',655],any:'all',some:'all','':655},
-[666,639],
-{not:['ck',657],'':657},
-['mk',666,'null'],
+[651,638],
+['m',653,':'],
+{all:['ck',653],any:'all',some:'all','':653},
+[664,638],
+{not:['ck',655],'':655},
+['mk',664,'null'],
 {
-between:['ck',659],
-in:['ck',662],
-like:['ck',663],
+between:['ck',657],
+in:['ck',660],
+like:['ck',661],
 },
-[660,639],
-['mk',661,'and'],
-[666,639],
-[666,639],
-[664,639],
-{escape:['ck',665],'':666},
-[666,639],
-['g',651],
+[658,638],
+['mk',659,'and'],
+[664,638],
+[664,638],
+[662,638],
+{escape:['ck',663],'':664},
+[664,638],
+['g',649],
 'valuePath',
-['mi',669],
-{'(':[670,704],'[':'(','':670},
-{'.':['c',671,,'isDotForPath'],'':0},
-['miA',672],
-{'(':[670,704],'[':'(','':670},
+['mi',667],
+{'(':[668,702],'[':'(','':668},
+{'.':['c',669,,'isDotForPath'],'':0},
+['miA',670],
+{'(':[668,702],'[':'(','':668},
 'expressionOrQueryParens',
-['m',675,'(',,,'queryOnLeft'],
+['m',673,'(',,,'queryOnLeft'],
 {
-'(':[676,674],
-Id:[678,639,,,'expr','queryOnLeft'],'#':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id',
-select:[679,451],
+'(':[674,672],
+Id:[676,638,,,'expr','queryOnLeft'],'#':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id',
+select:[677,451],
 },
 {
-'*':[677,640,,,'expr','queryOnLeft'],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
-',':[679,681,,,'expr','queryOnLeft'],
-limit:[679,454,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
-'':679
+'*':[675,649,,,'expr','queryOnLeft'],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
+',':[677,679,,,'expr','queryOnLeft'],
+limit:[677,454,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
+'':677
 },
-{',':[679,681],'':679},
-{',':[679,681],'':679},
+{',':[677,679],'':677},
+{',':[677,679],'':677},
 ['m',0,')'],
 'continueExpressionslist',
-['m',682,','],
-{Id:683,'#':683,'(':683,'+':683,'-':683,':':683,'?':683,not:683,case:683,cast:683,null:683,true:683,false:683,Number:683,String:683,exists:683,QuotedLiteral:683},
-{Id:[684,639],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id','':0},
-{',':['c',683],'':0},
+['m',680,','],
+{Id:681,'#':681,'(':681,'+':681,'-':681,':':681,'?':681,not:681,case:681,cast:681,null:681,true:681,false:681,Number:681,String:681,exists:681,QuotedLiteral:681},
+{Id:[682,638],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id','':0},
+{',':['c',681],'':0},
 'caseExpression',
-['mk',687,'case'],
-{Id:[688,639],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id','':688},
-{when:689},
-{when:['ck',690],'':693},
-[691,639],
-['mk',692,'then'],
-[689,639],
-{else:['ck',694],'':695},
-[695,639],
+['mk',685,'case'],
+{
+Id:[686,638],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id',
+when:['g',686,1],
+'':686
+},
+{when:687},
+{when:['ck',688],'':691},
+[689,638],
+['mk',690,'then'],
+[687,638],
+{else:['ck',692],'':693},
+[693,638],
 ['mk',0,'end'],
 'castFunction',
-['mk',698,'cast'],
-['m',699,'('],
-[700,639],
-['mk',701,'as'],
-[702,403],
+['mk',696,'cast'],
+['m',697,'('],
+[698,638],
+['mk',699,'as'],
+[700,403],
 ['m',0,')'],
 'argumentsAndFilter',
-{'(':['c',705,,,,'prepareSpecialFunction'],'':723},
+{'(':['c',703,,,,'prepareSpecialFunction'],'':721},
 {
-')':722,
-Id:['ciA',706,,'isNamedArg'],
-'':715
+')':720,
+Id:['ciA',704,,'isNamedArg'],
+'':713
 },
 {
-':':['c',707],
-'=>':['c',711],
+':':['c',705],
+'=>':['c',709],
 },
-[708,639],
+[706,638],
 {
-',':['c',709],
-')':722,
+',':['c',707],
+')':720,
 },
 {
-Id:['ciA',710],
-')':722,
+Id:['ciA',708],
+')':720,
 },
-['m',707,':'],
-[712,639],
+['m',705,':'],
+[710,638],
 {
-',':['c',713],
-')':722,
+',':['c',711],
+')':720,
 },
 {
-Id:['ciA',714],
-')':722,
+Id:['ciA',712],
+')':720,
 },
-['m',711,'=>'],
-[716,725],
-{',':['c',717,,,,'nextFunctionArgument'],'':719},
-{')':['c',718],'':715},
-{'[':[0,535],'':0},
-{order:['ck',720],'':722},
-['mk',721,'by'],
-[722,745],
-['m',723,')'],
-{'[':[0,535],'':0},
+['m',709,'=>'],
+[714,723],
+{',':['c',715,,,,'nextFunctionArgument'],'':717},
+{')':['c',716],'':713},
+{'[':[0,534],'':0},
+{order:['ck',718],'':720},
+['mk',719,'by'],
+[720,743],
+['m',721,')'],
+{'[':[0,534],'':0},
 'funcExpression',
 {
 ' lookahead':'lGenericIntroOrExpr',
-Id:[727,639],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-GenericExpr:['ckA',727],
-GenericIntro:['ckA',726],
+Id:[725,638],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+GenericExpr:['ckA',725],
+GenericIntro:['ckA',724],
 },
-[727,639],
+[725,638],
 {
 ' lookahead':'lGenericSeparator',
-GenericSeparator:['ckA',728],
+GenericSeparator:['ckA',726],
 '':0
 },
 {
 ' lookahead':'lGenericExpr',
-Id:[727,639],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-GenericExpr:['ckA',727],
+Id:[725,638],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+GenericExpr:['ckA',725],
 },
 'overClause',
-['m',731,'('],
-{partition:['ck',732],'':734},
-['mk',733,'by'],
-[734,741],
-{order:['ck',735],'':737},
-['mk',736,'by'],
-[737,745],
-{rows:['ck',738],'':739},
-[739,754],
+['m',729,'('],
+{partition:['ck',730],'':732},
+['mk',731,'by'],
+[732,739],
+{order:['ck',733],'':735},
+['mk',734,'by'],
+[735,743],
+{rows:['ck',736],'':737},
+[737,752],
 ['m',0,')'],
 'expressionsAsXpr',
-[742,639],
-{',':['c',743],'':0},
-[742,639],
+[740,638],
+{',':['c',741],'':0},
+[740,638],
 'orderByClauseAsXpr',
-[746,749],
-{',':['c',747],'':0},
-[746,749],
+[744,747],
+{',':['c',745],'':0},
+[744,747],
 'orderBySpecAsXpr',
-[750,639],
-{asc:['ck',751],desc:'asc','':751},
-{nulls:['ck',752],'':0},
+[748,638],
+{asc:['ck',749],desc:'asc','':749},
+{nulls:['ck',750],'':0},
 {last:['ck',0],first:'last'},
 'windowFrameClause',
 {
-unbounded:['ck',755],
-Number:['c',755],
-current:['ck',756],
-between:['ck',757],
+unbounded:['ck',753],
+Number:['c',753],
+current:['ck',754],
+between:['ck',755],
 },
 ['mk',0,'preceding'],
 ['mk',0,'row'],
-[758,761],
-['mk',759,'and'],
-[0,761],
+[756,759],
+['mk',757,'and'],
+[0,759],
 'windowFrameBoundSpec',
 {
-unbounded:['ck',762],
-Number:['c',762],
-current:['ck',764],
+unbounded:['ck',760],
+Number:['c',760],
+current:['ck',762],
 },
 {
-following:['ck',763],
-preceding:['ck',763],
+following:['ck',761],
+preceding:['ck',761],
 },
 ['g',0],
 ['mk',0,'row'],
 'literalValue',
 {
-'#':['c',767],
+'#':['c',765],
 null:['ck',0],
 true:['ck',0],false:'true',
 Number:['c',0],
@@ -1347,101 +1349,101 @@ QuotedLiteral:['c',0],
 },
 ['miA',0],
 'annoAssignStd',
-['m',770,'@',,,'annoInSameLine'],
+['m',768,'@',,,'annoInSameLine'],
 {
-'(':[0,778],
-Id:[0,783],
+'(':[0,776],
+Id:[0,781],
 },
 'annoAssignCol',
-['m',773,'@'],
+['m',771,'@'],
 {
-'(':[0,778],
-Id:[0,783],
+'(':[0,776],
+Id:[0,781],
 },
 'annoAssignMid',
-['m',776,'@',,,'annoInSameLine'],
+['m',774,'@',,,'annoInSameLine'],
 {
-'(':[0,778],
-Id:[0,787],
+'(':[0,776],
+Id:[0,785],
 },
 'annoAssignParen',
-['m',779,'(',,,'annoInSameLine'],
-{Id:[780,783],'':781},
+['m',777,'(',,,'annoInSameLine'],
+{Id:[778,781],'':779},
 {
-',':['c',779],
-')':781,
+',':['c',777],
+')':779,
 },
 ['m',0,')'],
 'annoAssignBase',
-[784,787],
-{':':['c',785,,'annoInSameLine'],'':0},
-[0,809],
+[782,785],
+{':':['c',783,,'annoInSameLine'],'':0},
+[0,807],
 'annoNamePath',
-['miA',788],
-{'.':['c',789],'':791},
+['miA',786],
+{'.':['c',787],'':789},
 {
-Id:['ciA',788],
-'@':['c',790],
+Id:['ciA',786],
+'@':['c',788],
 },
-['miA',788],
-{'#':[0,800,,'annoInSameLine'],'':0},
+['miA',786],
+{'#':[0,798,,'annoInSameLine'],'':0},
 'annoPath',
 {
-Id:['ciA',795],
-'@':['c',794],
+Id:['ciA',793],
+'@':['c',792],
 },
-['miA',795],
-{'.':['c',796],'':798},
+['miA',793],
+{'.':['c',794],'':796},
 {
-Id:['ciA',795],
-'@':['c',797],
+Id:['ciA',793],
+'@':['c',795],
 },
-['miA',795],
-{'#':[0,800],'':0},
+['miA',793],
+{'#':[0,798],'':0},
 'annoPathVariant',
-['m',801,'#'],
-['miA',802],
-{'.':['c',803],'':0},
-['miA',802],
+['m',799,'#'],
+['miA',800],
+{'.':['c',801],'':0},
+['miA',800],
 'annoStructValue',
-[806,793],
-{':':['c',807],'':0},
-[0,809],
+[804,791],
+{':':['c',805],'':0},
+[0,807],
 'annoValue',
 {
-'#':[0,766],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
-'+':['c',810],'-':'+',
-Id:[0,793],'@':'Id',
-'{':['c',811],
-'[':['c',814,,,,'arrayAnno'],
-'(':['c',820],
+'#':[0,764],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
+'+':['c',808],'-':'+',
+Id:[0,791],'@':'Id',
+'{':['c',809],
+'[':['c',812,,,,'arrayAnno'],
+'(':['c',818],
 },
 ['m',0,'Number'],
-{Id:[812,805],'@':'Id','':813},
+{Id:[810,803],'@':'Id','':811},
 {
-',':['c',811],
-'}':813,
-Id:['g',811,,'fail'],'@':'Id',
+',':['c',809],
+'}':811,
+Id:['g',809,,'fail'],'@':'Id',
 },
 ['m',0,'}','arrayAnno','orNotEmpty'],
 {
-Id:[818,809],'#':'Id','(':'Id','+':'Id','-':'Id','@':'Id','[':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'...':['c',815,,'arrayAnno','ellipsis'],
-'':819
+Id:[816,807],'#':'Id','(':'Id','+':'Id','-':'Id','@':'Id','[':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'...':['c',813,,'arrayAnno','ellipsis'],
+'':817
 },
 {
-up:['ck',816],
-',':818,']':818,
+up:['ck',814],
+',':816,']':816,
 },
-['mk',817,'to'],
-[818,809],
+['mk',815,'to'],
+[816,807],
 {
-',':['c',814],
-']':819,
+',':['c',812],
+']':817,
 },
 ['m',0,']','arrayAnno','bracket'],
-{')':['c',0,,'fail'],'':821},
-[822,637],
+{')':['c',0,,'fail'],'':819},
+[820,636],
 ['m',0,')'],
 ]
 class CdlParser extends AstBuildingParser{
@@ -2581,7 +2583,7 @@ case'(':this.annotateParamsBlock({art},306);continue
 default:this.s=306;continue
 }
 case 306:switch(this.lk()){
-case'returns':this.lP()&&this.annotateReturns({outer:art},0);continue
+case'returns':this.annotateReturns({outer:art},0);continue
 default:this.gr([';']);continue
 }
 default:
@@ -3280,88 +3282,87 @@ let join;let tab;let card;let cond;let _
 this.rule_($startState??485,$next)
 for(;;)switch(this.s){
 case 485:switch(this.l()){
-case'(':this.tableOrQueryParens($,486);continue
-case'Id':this.fromRefWithOptAlias($,487);continue
+case'(':if(this.tableOrQueryParens($,486)){ $.expr = this.taggedIfQuery( $.expr ); }continue
+case'Id':this.fromRefWithOptAlias($,486);continue
 default:this.e();continue
 }
-case 486:this.s=487;{ $.expr = this.taggedIfQuery( $.expr ); }continue
-case 487:switch(this.lk()){
-case'cross':if(this.ck(488))join=this.lb();continue
-case'inner':if(this.ck(491))join=this.lb();continue
-case'full':case'left':case'right':if(this.ck(490))join=this.lb();continue
-case'join':if(this.ck(493)){ join = undefined; }continue
+case 486:switch(this.lk()){
+case'cross':if(this.ck(487))join=this.lb();continue
+case'inner':if(this.ck(490))join=this.lb();continue
+case'full':case'left':case'right':if(this.ck(489))join=this.lb();continue
+case'join':if(this.ck(492)){ join = undefined; }continue
 default:this.gr();continue
 }
-case 488:if(this.mk(489,'join')){ if ($.expr?.join?.val !== 'cross' || $.expr.$parens) $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( undefined, join ), args: [ $.expr ] }; }continue
-case 489:switch(this.l()){
-case'(':if(this.tableOrQueryParens(_={},487)){tab=_.expr; const r = this.taggedIfQuery( tab ); if (r) $.expr.args.push( r );
+case 487:if(this.mk(488,'join')){ if ($.expr?.join?.val !== 'cross' || $.expr.$parens) $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( undefined, join ), args: [ $.expr ] }; }continue
+case 488:switch(this.l()){
+case'(':if(this.tableOrQueryParens(_={},486)){tab=_.expr; const r = this.taggedIfQuery( tab ); if (r) $.expr.args.push( r );
 this.attachLocation( $.expr ); }continue
-case'Id':if(this.fromRefWithOptAlias(_={},487)){tab=_.expr; if (tab) $.expr.args.push( tab );
+case'Id':if(this.fromRefWithOptAlias(_={},486)){tab=_.expr; if (tab) $.expr.args.push( tab );
 this.attachLocation( $.expr ); }continue
 default:this.e();continue
 }
+case 489:switch(this.lk()){
+case'outer':this.ck(490);continue
+default:this.s=490;continue
+}
 case 490:switch(this.lk()){
-case'outer':this.ck(491);continue
+case'one':case'many':case'exact':this.joinCardinality(card={},491);continue
 default:this.s=491;continue
 }
-case 491:switch(this.lk()){
-case'one':case'many':case'exact':this.joinCardinality(card={},492);continue
-default:this.s=492;continue
-}
-case 492:this.mk(493,'join');continue
-case 493:this.s=494;{ $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( join?.keyword || 'inner', join ), args: [ $.expr ] }; if (card) $.expr.cardinality = card; card = undefined; }continue
-case 494:if(this.tableExpression(_={},495)){tab=_.expr; $.expr.args.push( tab ); this.attachLocation( $.expr ); }continue
-case 495:this.mk(496,'on');continue
-case 496:if(this.condition(_={},487)){cond=_.expr; $.expr.on = cond;
+case 491:this.mk(492,'join');continue
+case 492:this.s=493;{ $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( join?.keyword || 'inner', join ), args: [ $.expr ] }; if (card) $.expr.cardinality = card; card = undefined; }continue
+case 493:if(this.tableExpression(_={},494)){tab=_.expr; $.expr.args.push( tab ); this.attachLocation( $.expr ); }continue
+case 494:this.mk(495,'on');continue
+case 495:if(this.condition(_={},486)){cond=_.expr; $.expr.on = cond;
 this.attachLocation( $.expr ); }continue
 default:return this.exit_()
 }
 }
 tableOrQueryParens($,$next){
 $.expr??=undefined
-this.rule_(498,$next)
+this.rule_(497,$next)
 for(;;)switch(this.s){
-case 498:if(this.m(499,'(')){this.queryOnLeft()}continue;
-case 499:switch(this.lk()){
-case'(':this.tableOrQueryParens($,500);continue
-case'Id':if(this.tableExpression($,501)){this.queryOnLeft('table')}continue;
-case'select':this.queryExpression($,501);continue
+case 497:if(this.m(498,'(')){this.queryOnLeft()}continue;
+case 498:switch(this.lk()){
+case'(':this.tableOrQueryParens($,499);continue
+case'Id':if(this.tableExpression($,500)){this.queryOnLeft('table')}continue;
+case'select':this.queryExpression($,500);continue
 default:this.ei();continue
 }
-case 500:switch(this.lk()){
-case'full':case'join':case'left':case'cross':case'inner':case'right':if(this.tableExpression($,501,486)){this.queryOnLeft('table')}continue;
-case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(501,'queryOnLeft')&&this.queryExpression($,501,454);continue
-default:this.s=501;continue
+case 499:switch(this.lk()){
+case'full':case'join':case'left':case'cross':case'inner':case'right':if(this.tableExpression(( $.expr = this.taggedIfQuery( $.expr ), $ ),500,486)){this.queryOnLeft('table')}continue;
+case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(500,'queryOnLeft')&&this.queryExpression($,500,454);continue
+default:this.s=500;continue
 }
-case 501:if(this.m(502,')')){ this.surroundByParens( $.expr ); }continue
-case 502:switch(this.lk()){
-case'as':this.gc(0,'queryOnLeft','table')&&this.ck(503);continue
+case 500:if(this.m(501,')')){ this.surroundByParens( $.expr ); }continue
+case 501:switch(this.lk()){
+case'as':this.gc(0,'queryOnLeft','table')&&this.ck(502);continue
 case'Id':if(this.gc(0,'queryOnLeftSloppyAlias')&&this.ci(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.fragileAlias(); }continue
 default:this.gi(0,['full','join','left','cross','inner','right']);continue
 }
-case 503:if(this.mi(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.identAst(); }continue
+case 502:if(this.mi(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.identAst(); }continue
 default:return this.exit_()
 }
 }
 joinCardinality($,$next){
 $.sourceMax??=undefined;$.targetMax??=undefined
-this.rule_(505,$next)
+this.rule_(504,$next)
 for(;;)switch(this.s){
-case 505:switch(this.lk()){
-case'one':this.s=506;continue
-case'exact':if(this.ck(506)){ $.sourceMin = this.valueWithLocation( 1 ); }continue
-case'many':if(this.ck(507)){ $.sourceMax = this.valueWithLocation( '*' ); }continue
+case 504:switch(this.lk()){
+case'one':this.s=505;continue
+case'exact':if(this.ck(505)){ $.sourceMin = this.valueWithLocation( 1 ); }continue
+case'many':if(this.ck(506)){ $.sourceMax = this.valueWithLocation( '*' ); }continue
 default:this.e();continue
 }
-case 506:if(this.mk(507,'one')){ $.sourceMax = this.valueWithLocation( 1 ); }continue
-case 507:this.mk(508,'to');continue
-case 508:switch(this.lk()){
-case'one':this.s=509;continue
-case'exact':if(this.ck(509)){ $.targetMin = this.valueWithLocation( 1 ); }continue
+case 505:if(this.mk(506,'one')){ $.sourceMax = this.valueWithLocation( 1 ); }continue
+case 506:this.mk(507,'to');continue
+case 507:switch(this.lk()){
+case'one':this.s=508;continue
+case'exact':if(this.ck(508)){ $.targetMin = this.valueWithLocation( 1 ); }continue
 case'many':if(this.ck(0)){ $.targetMax = this.valueWithLocation( '*' ); }continue
 default:this.e();continue
 }
-case 509:if(this.mk(0,'one')){ $.targetMax = this.valueWithLocation( 1 ); }continue
+case 508:if(this.mk(0,'one')){ $.targetMax = this.valueWithLocation( 1 ); }continue
 default:
 this.attachLocation( $ )
 return this.exit_()
@@ -3369,25 +3370,25 @@ return this.exit_()
 }
 fromRefWithOptAlias($,$next){
 $.expr??={}
-this.rule_(511,$next)
+this.rule_(510,$next)
 { $.expr.path = []; }
 for(;;)switch(this.s){
-case 511:this.fromPath({table:$.expr,category:'artref'},512);continue
-case 512:switch(this.l()){
-case':':if(this.c(513)){ if (!$.expr.scope) $.expr.scope = $.expr.path.length; else {
+case 510:this.fromPath({table:$.expr,category:'artref'},511);continue
+case 511:switch(this.l()){
+case':':if(this.c(512)){ if (!$.expr.scope) $.expr.scope = $.expr.path.length; else {
 this.warning( 'syntax-invalid-path-separator', this.lb(),
 { '#': 'colon', code: ':', newcode: '.' } );
 } }continue
-default:this.s=514;continue
+default:this.s=513;continue
 }
-case 513:this.fromPath({table:$.expr,category:'ref'},514);continue
-case 514:switch(this.lk()){
-case'as':this.ck(515);continue
-case'Id':if(this.gc(516,'isNoKeywordInRuleFollow')&&this.ci(0,'FromAlias')){ $.expr.name = this.fragileAlias(); }continue
-default:this.gi(516);continue
+case 512:this.fromPath({table:$.expr,category:'ref'},513);continue
+case 513:switch(this.lk()){
+case'as':this.ck(514);continue
+case'Id':if(this.gc(515,'isNoKeywordInRuleFollow')&&this.ci(0,'FromAlias')){ $.expr.name = this.fragileAlias(); }continue
+default:this.gi(515);continue
 }
-case 515:if(this.mi(0,'FromAlias')){ $.expr.name = this.identAst(); }continue
-case 516:if(this.gr()){ this.classifyImplicitName( $.expr.scope ? 'FromElemImplicit' : 'FromImplicit', $.expr ); }continue
+case 514:if(this.mi(0,'FromAlias')){ $.expr.name = this.identAst(); }continue
+case 515:if(this.gr()){ this.classifyImplicitName( $.expr.scope ? 'FromElemImplicit' : 'FromImplicit', $.expr ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -3395,25 +3396,25 @@ return this.exit_()
 }
 fromPath($,$next){
 let pathItem
-this.rule_(518,$next)
+this.rule_(517,$next)
 for(;;)switch(this.s){
-case 518:if(this.mi(519,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
-case 519:switch(this.l()){
-case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},520)){ pathItem = null; }continue
-default:this.s=520;continue
+case 517:if(this.mi(518,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
+case 518:switch(this.l()){
+case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},519)){ pathItem = null; }continue
+default:this.s=519;continue
 }
-case 520:switch(this.l()){
-case'.':if(this.gc(0,'notAfterEntityArgOrFilter')&&this.c(521)){ if (!pathItem && !$.table.scope) {
+case 519:switch(this.l()){
+case'.':if(this.gc(0,'notAfterEntityArgOrFilter')&&this.c(520)){ if (!pathItem && !$.table.scope) {
 $.table.scope = $.table.path.length; $.category = 'ref';
 this.warning( 'syntax-invalid-path-separator', this.lb(),
 { '#': 'dot', code: '.', newcode: ':' } );
 } }continue
 default:this.gr(['Id','as']);continue
 }
-case 521:if(this.miA(522,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
-case 522:switch(this.l()){
-case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},520)){ pathItem = null; }continue
-default:this.s=520;continue
+case 520:if(this.miA(521,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
+case 521:switch(this.l()){
+case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},519)){ pathItem = null; }continue
+default:this.s=519;continue
 }
 default:
 this.attachLocation( $.table.path )
@@ -3421,27 +3422,27 @@ return this.exit_()
 }
 }
 fromArgumentsAndFilter($,$next){
-this.rule_(524,$next)
+this.rule_(523,$next)
 for(;;)switch(this.s){
-case 524:switch(this.l()){
-case'(':if(this.c(525)){ $.pathStep.args = this.createDict(); $.pathStep.$syntax = ':'; }continue
-default:this.s=529;continue
+case 523:switch(this.l()){
+case'(':if(this.c(524)){ $.pathStep.args = this.createDict(); $.pathStep.$syntax = ':'; }continue
+default:this.s=528;continue
 }
-case 525:switch(this.lk()){
-case'Id':this.s=526;continue
+case 524:switch(this.lk()){
+case'Id':this.s=525;continue
 default:this.ei();continue
 }
-case 526:switch(this.l()){
-case'Id':this.fromNamedArgument($,527);continue
-default:this.s=528;continue
+case 525:switch(this.l()){
+case'Id':this.fromNamedArgument($,526);continue
+default:this.s=527;continue
 }
-case 527:switch(this.l()){
-case',':this.c(526);continue
-case')':this.s=528;continue
+case 526:switch(this.l()){
+case',':this.c(525);continue
+case')':this.s=527;continue
 default:this.e();continue
 }
-case 528:this.m(529,')');continue
-case 529:switch(this.l()){
+case 527:this.m(528,')');continue
+case 528:switch(this.l()){
 case'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['Id','.','as']);continue
 }
@@ -3450,229 +3451,229 @@ default:return this.exit_()
 }
 fromNamedArgument($,$next){
 let name;let expr;let _
-this.rule_(531,$next)
+this.rule_(530,$next)
 for(;;)switch(this.s){
-case 531:if(this.mi(532,'paramname'))name=this.lb();continue
-case 532:this.m(533,':');continue
-case 533:if(this.expression(_={},0)){expr=_.expr; this.addDef( expr, $.pathStep, 'args', 0, this.identAst( name ) ); }continue
+case 530:if(this.mi(531,'paramname'))name=this.lb();continue
+case 531:this.m(532,':');continue
+case 532:if(this.expression(_={},0)){expr=_.expr; this.addDef( expr, $.pathStep, 'args', 0, this.identAst( name ) ); }continue
 default:return this.exit_()
 }
 }
 cardinalityAndFilter($,$next){
 let cond;let _
-this.rule_(535,$next)
+this.rule_(534,$next)
 for(;;)switch(this.s){
-case 535:this.m(536,'[');continue
-case 536:switch(this.l()){
-case'Number':if(this.gc(538,'beforeColon')&&this.c(537)){ $.pathStep.cardinality = { targetMax: this.unsignedIntegerLiteral(), location: this.lb().location }; }continue
-default:this.s=538;continue
-}
-case 537:this.m(538,':');continue
-case 538:switch(this.lk()){
-case'group':case'limit':case'order':case'having':this.gP(540);continue
-case'where':this.ck(539);continue
+case 534:this.m(535,'[');continue
+case 535:switch(this.l()){
+case'Number':if(this.gc(537,'beforeColon')&&this.c(536)){ $.pathStep.cardinality = { targetMax: this.unsignedIntegerLiteral(), location: this.lb().location }; }continue
+default:this.s=537;continue
+}
+case 536:this.m(537,':');continue
+case 537:switch(this.lk()){
+case'group':case'limit':case'order':case'having':this.gP(539);continue
+case'where':this.ck(538);continue
 case']':if(this.c(0)){ $.pathStep.where ??= { args: [] }; }continue
-default:this.s=539;continue
+default:this.s=538;continue
 }
-case 539:if(this.condition(_={},540)){cond=_.expr; $.pathStep.where = cond; }continue
-case 540:switch(this.lk()){
-case'group':this.s=541;{ this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'group by' }); }continue
-default:this.s=542;continue
+case 538:if(this.condition(_={},539)){cond=_.expr; $.pathStep.where = cond; }continue
+case 539:switch(this.lk()){
+case'group':this.s=540;{ this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'group by' }); }continue
+default:this.s=541;continue
 }
-case 541:this.groupByClause({query:$.pathStep},542);continue
-case 542:switch(this.lk()){
-case'having':if(this.ck(543)){ this.csnParseOnly('syntax-unexpected-sql-clause', -1, { keyword: 'having' }); }continue
-default:this.s=544;continue
+case 540:this.groupByClause({query:$.pathStep},541);continue
+case 541:switch(this.lk()){
+case'having':if(this.ck(542)){ this.csnParseOnly('syntax-unexpected-sql-clause', -1, { keyword: 'having' }); }continue
+default:this.s=543;continue
 }
-case 543:if(this.condition(_={},544)){cond=_.expr; $.pathStep.having = cond; }continue
-case 544:switch(this.l()){
-case'Id':this.s=545;{ if (this.lk() === 'limit') this.csnParseOnly('syntax-unexpected-sql-clause', 0, { keyword: 'limit' } ); else this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'order by' } ); }continue
-default:this.s=546;continue
+case 542:if(this.condition(_={},543)){cond=_.expr; $.pathStep.having = cond; }continue
+case 543:switch(this.l()){
+case'Id':this.s=544;{ if (this.lk() === 'limit') this.csnParseOnly('syntax-unexpected-sql-clause', 0, { keyword: 'limit' } ); else this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'order by' } ); }continue
+default:this.s=545;continue
 }
-case 545:this.orderByLimitOffset({query:$.pathStep},546);continue
-case 546:this.m(0,']');continue
+case 544:this.orderByLimitOffset({query:$.pathStep},545);continue
+case 545:this.m(0,']');continue
 default:return this.exit_()
 }
 }
 excludingClause($,$next){
-this.rule_(548,$next)
+this.rule_(547,$next)
 for(;;)switch(this.s){
-case 548:if(this.mk(549,'excluding')){ $.query.excludingDict = this.createDict(); }continue
-case 549:this.m(550,'{');continue
-case 550:switch(this.l()){
-case'Id':this.s=551;continue
+case 547:if(this.mk(548,'excluding')){ $.query.excludingDict = this.createDict(); }continue
+case 548:this.m(549,'{');continue
+case 549:switch(this.l()){
+case'Id':this.s=550;continue
 default:this.e();continue
 }
-case 551:switch(this.l()){
-case'Id':if(this.ciA(552,'ref')){ this.addDef( { location: this.lb().location }, $.query, 'excludingDict', '', this.identAst() ); }continue
-default:this.s=553;continue
+case 550:switch(this.l()){
+case'Id':if(this.ciA(551,'ref')){ this.addDef( { location: this.lb().location }, $.query, 'excludingDict', '', this.identAst() ); }continue
+default:this.s=552;continue
 }
-case 552:switch(this.l()){
-case',':this.c(551);continue
-case'}':this.s=553;continue
+case 551:switch(this.l()){
+case',':this.c(550);continue
+case'}':this.s=552;continue
 default:this.e();continue
 }
-case 553:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.excludingDict ); }continue
+case 552:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.excludingDict ); }continue
 default:return this.exit_()
 }
 }
 selectItemsList($,$next){
-this.rule_(555,$next)
+this.rule_(554,$next)
 for(;;)switch(this.s){
-case 555:if(this.m(556,'{')){this.inSelectItem('top'); $.query.columns = this.createArray( $.start ); }continue
-case 556:switch(this.l()){
-case'*':if(this.c(557)){ $.query.columns.push( this.valueWithLocation() ); }continue
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query.columns},557);continue
-default:this.s=558;continue
+case 554:if(this.m(555,'{')){this.inSelectItem('top'); $.query.columns = this.createArray( $.start ); }continue
+case 555:switch(this.l()){
+case'*':if(this.c(556)){ $.query.columns.push( this.valueWithLocation() ); }continue
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query.columns},556);continue
+default:this.s=557;continue
 }
-case 557:switch(this.l()){
-case',':this.c(556);continue
-case'}':this.s=558;continue
+case 556:switch(this.l()){
+case',':this.c(555);continue
+case'}':this.s=557;continue
 default:this.e();continue
 }
-case 558:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.columns ); }continue
+case 557:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.columns ); }continue
 default:return this.exit_()
 }
 }
 nestedSelectItemsList($,$next){
-this.rule_(560,$next)
+this.rule_(559,$next)
 for(;;)switch(this.s){
-case 560:if(this.m(561,'{')){this.inSelectItem(); $.query[$.clause] = this.createArray(); }continue
-case 561:switch(this.l()){
-case'*':if(this.c(562)){ $.query[$.clause].push( this.valueWithLocation() ); }continue
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query[$.clause]},562);continue
-default:this.s=563;continue
+case 559:if(this.m(560,'{')){this.inSelectItem(); $.query[$.clause] = this.createArray(); }continue
+case 560:switch(this.l()){
+case'*':if(this.c(561)){ $.query[$.clause].push( this.valueWithLocation() ); }continue
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query[$.clause]},561);continue
+default:this.s=562;continue
 }
-case 562:switch(this.l()){
-case',':this.c(561);continue
-case'}':this.s=563;continue
+case 561:switch(this.l()){
+case',':this.c(560);continue
+case'}':this.s=562;continue
 default:this.e();continue
 }
-case 563:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query[$.clause] ); }continue
+case 562:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query[$.clause] ); }continue
 default:return this.exit_()
 }
 }
 selectItemDef($,$next){
 let art=new XsnArtifact()
 let expr;let e;let target;let cond;let assoc;let card;let _
-this.rule_(565,$next)
+this.rule_(564,$next)
 { $.columns.push( art );
 this.docComment( art ); }
 for(;;)switch(this.s){
-case 565:switch(this.l()){
-case'@':this.annoAssignCol({art},565);continue
+case 564:switch(this.l()){
+case'@':this.annoAssignCol({art},564);continue
+default:this.s=565;continue
+}
+case 565:switch(this.lk()){
+case'virtual':if(this.lP(['Id','#','(','+','-',':','?','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'])&&this.gc(566,'modifierRestriction')&&this.ck(566)){ art.virtual = this.valueWithLocation( true ); }continue
 default:this.s=566;continue
 }
-case 566:switch(this.lk()){
-case'virtual':if(this.lP(['Id','#','(','+','-',':','?','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'])&&this.gc(567,'modifierRestriction')&&this.ck(567)){ art.virtual = this.valueWithLocation( true ); }continue
-default:this.s=567;continue
+case 566:this.s=567;{this.columnExpr('key')}continue;
+case 567:switch(this.lk()){
+case'key':if(this.gc(568,'modifierRestriction')&&this.ck(568)){ art.key = this.valueWithLocation( true ); }continue
+default:this.s=568;continue
 }
-case 567:this.s=568;{this.columnExpr('key')}continue;
 case 568:switch(this.lk()){
-case'key':if(this.gc(569,'modifierRestriction')&&this.ck(569)){ art.key = this.valueWithLocation( true ); }continue
-default:this.s=569;continue
-}
-case 569:switch(this.lk()){
-case'#':case'(':case'+':case'-':case':':case'?':case'new':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.lP()&&this.expression(_={},570)){expr=_.expr; art.value = expr; }continue
-case'Id':if(this.valuePath(_={},572)){expr=_.expr; expr = this.valuePathAst( expr ); art.value = expr; }continue
-case'{':this.nestedSelectItemsList({query:art,clause:'expand'},583);continue
+case'#':case'(':case'+':case'-':case':':case'?':case'new':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.lP()&&this.expression(_={},569)){expr=_.expr; art.value = expr; }continue
+case'Id':if(this.valuePath(_={},571)){expr=_.expr; expr = this.valuePathAst( expr ); art.value = expr; }continue
+case'{':this.nestedSelectItemsList({query:art,clause:'expand'},582);continue
 default:this.ei();continue
 }
-case 570:switch(this.lk()){
-case'as':this.ck(571);continue
-case'Id':if(this.ci(580,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
-default:this.gi(580);continue
-}
-case 571:if(this.mi(580,'ItemAlias')){ art.name = this.identAst(); }continue
-case 572:switch(this.lk()){
-case'over':if(this.ck(573)){ this.pushXprToken( expr.suffix = [] ); }continue
-case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },575,640)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
-case'as':this.ck(577);continue
-case'Id':if(this.ci(580,'ItemAlias')){this.nestedExpand(); art.name = this.fragileAlias( true ); }continue
-case'.':if(this.c(578)){ this.reportUnexpectedSpace( this.lb(), this.la().location, true );
+case 569:switch(this.lk()){
+case'as':this.ck(570);continue
+case'Id':if(this.ci(579,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
+default:this.gi(579);continue
+}
+case 570:if(this.mi(579,'ItemAlias')){ art.name = this.identAst(); }continue
+case 571:switch(this.lk()){
+case'over':if(this.ck(572)){ this.pushXprToken( expr.suffix = [] ); }continue
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },574,649)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
+case'as':this.ck(576);continue
+case'Id':if(this.ci(579,'ItemAlias')){this.nestedExpand(); art.name = this.fragileAlias( true ); }continue
+case'.':if(this.c(577)){ this.reportUnexpectedSpace( this.lb(), this.la().location, true );
 this.reportExpandInline( art, true ); }continue
-default:if(this.gi(580)){this.nestedExpand(); this.virtualOrImplicit( art ); }continue
+default:if(this.gi(579)){this.nestedExpand(); this.virtualOrImplicit( art ); }continue
 }
-case 573:this.overClause({outer:expr.suffix},574);continue
-case 574:switch(this.lk()){
-case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },575,640)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
-default:this.s=575;continue
-}
-case 575:switch(this.lk()){
-case'as':this.ck(576);continue
-case'Id':if(this.ci(580,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
-default:this.gi(580);continue
+case 572:this.overClause({outer:expr.suffix},573);continue
+case 573:switch(this.lk()){
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },574,649)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
+default:this.s=574;continue
 }
-case 576:if(this.mi(580,'ItemAlias')){ art.name = this.identAst(); }continue
-case 577:if(this.mi(580,'ItemAlias')){this.nestedExpand(); art.name = this.identAst(); }continue
-case 578:switch(this.l()){
-case'{':this.nestedSelectItemsList({query:art,clause:'inline'},579);continue
+case 574:switch(this.lk()){
+case'as':this.ck(575);continue
+case'Id':if(this.ci(579,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
+default:this.gi(579);continue
+}
+case 575:if(this.mi(579,'ItemAlias')){ art.name = this.identAst(); }continue
+case 576:if(this.mi(579,'ItemAlias')){this.nestedExpand(); art.name = this.identAst(); }continue
+case 577:switch(this.l()){
+case'{':this.nestedSelectItemsList({query:art,clause:'inline'},578);continue
 case'*':if(this.c(0)){ art.inline = [ this.valueWithLocation() ]; }continue
 default:this.e();continue
 }
-case 579:switch(this.lk()){
+case 578:switch(this.lk()){
 case'excluding':this.excludingClause({query:art},0);continue
 default:this.gr([',']);continue
 }
-case 580:switch(this.l()){
-case'{':if(this.gc(586,'nestedExpand')&&this.g(581)){ if (!this.nestedExpand(0,true)) this.reportExpandInline( art, false ); }continue
-default:this.s=586;continue
+case 579:switch(this.l()){
+case'{':if(this.gc(585,'nestedExpand')&&this.g(580)){ if (!this.nestedExpand(0,true)) this.reportExpandInline( art, false ); }continue
+default:this.s=585;continue
+}
+case 580:this.nestedSelectItemsList({query:art,clause:'expand'},581);continue
+case 581:switch(this.lk()){
+case'excluding':this.excludingClause({query:art},585);continue
+default:this.s=585;continue
 }
-case 581:this.nestedSelectItemsList({query:art,clause:'expand'},582);continue
 case 582:switch(this.lk()){
-case'excluding':this.excludingClause({query:art},586);continue
-default:this.s=586;continue
+case'excluding':this.excludingClause({query:art},583);continue
+default:this.s=583;continue
 }
-case 583:switch(this.lk()){
-case'excluding':this.excludingClause({query:art},584);continue
-default:this.s=584;continue
+case 583:this.mk(584,'as');continue
+case 584:if(this.mi(585,'ItemAlias')){ art.name = this.identAst(); }continue
+case 585:this.s=586;{this.columnExpr(); this.docComment( art ); }continue
+case 586:switch(this.l()){
+case'@':this.annoAssignMid({art},586);continue
+default:this.s=587;continue
 }
-case 584:this.mk(585,'as');continue
-case 585:if(this.mi(586,'ItemAlias')){ art.name = this.identAst(); }continue
-case 586:this.s=587;{this.columnExpr(); this.docComment( art ); }continue
 case 587:switch(this.l()){
-case'@':this.annoAssignMid({art},587);continue
-default:this.s=588;continue
-}
-case 588:switch(this.l()){
-case':':this.c(589);continue
+case':':this.c(588);continue
 default:this.gr([',']);continue
 }
-case 589:switch(this.lk()){
-case'Id':case'{':this.typeExpression({art},602);continue
-case'redirected':this.ckP(590,['to']);continue
-case'association':if(this.lP(['[','to'])&&this.ec('columnExpr')&&this.ck(594)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
-case'composition':if(this.lP(['[','of'])&&this.ec('columnExpr')&&this.ck(596)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
+case 588:switch(this.lk()){
+case'Id':case'{':this.typeExpression({art},601);continue
+case'redirected':this.ckP(589,['to']);continue
+case'association':if(this.lP(['[','to'])&&this.ec('columnExpr')&&this.ck(593)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
+case'composition':if(this.lP(['[','of'])&&this.ec('columnExpr')&&this.ck(595)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
 default:this.ei();continue
 }
-case 590:this.mk(591,'to');continue
-case 591:if(this.simplePath(_={category:'artref'},592)){target=_.ref; art.target = target; }continue
-case 592:switch(this.lk()){
-case'on':this.ck(593);continue
-case'{':this.foreignKeysBlock({art},602);continue
-default:this.s=602;continue
-}
-case 593:if(this.condition(_={},602)){cond=_.expr; art.on = cond; }continue
-case 594:switch(this.l()){
-case'[':this.cardinality({art},595);continue
-default:this.s=595;continue
-}
-case 595:this.mk(598,'to');continue
-case 596:switch(this.l()){
-case'[':this.cardinality({art},597);continue
-default:this.s=597;continue
-}
-case 597:this.mk(598,'of');continue
-case 598:switch(this.lk()){
-case'one':case'many':if(this.lP(['Id'])&&this.gc(599,'noRepeatedCardinality')&&this.ck(599))card=this.lb();continue
-default:this.s=599;continue
-}
-case 599:if(this.simplePath(_={category:'artref'},600)){target=_.ref; this.setAssocAndComposition( art, assoc, card, target ); }continue
-case 600:this.mk(601,'on');continue
-case 601:if(this.condition(_={},602)){expr=_.expr; art.on = expr; }continue
-case 602:this.s=603;{ this.docComment( art ); }continue
-case 603:switch(this.l()){
-case'@':this.annoAssignStd({art},603);continue
+case 589:this.mk(590,'to');continue
+case 590:if(this.simplePath(_={category:'artref'},591)){target=_.ref; art.target = target; }continue
+case 591:switch(this.lk()){
+case'on':this.ck(592);continue
+case'{':this.foreignKeysBlock({art},601);continue
+default:this.s=601;continue
+}
+case 592:if(this.condition(_={},601)){cond=_.expr; art.on = cond; }continue
+case 593:switch(this.l()){
+case'[':this.cardinality({art},594);continue
+default:this.s=594;continue
+}
+case 594:this.mk(597,'to');continue
+case 595:switch(this.l()){
+case'[':this.cardinality({art},596);continue
+default:this.s=596;continue
+}
+case 596:this.mk(597,'of');continue
+case 597:switch(this.lk()){
+case'one':case'many':if(this.lP(['Id'])&&this.gc(598,'noRepeatedCardinality')&&this.ck(598))card=this.lb();continue
+default:this.s=598;continue
+}
+case 598:if(this.simplePath(_={category:'artref'},599)){target=_.ref; this.setAssocAndComposition( art, assoc, card, target ); }continue
+case 599:this.mk(600,'on');continue
+case 600:if(this.condition(_={},601)){expr=_.expr; art.on = expr; }continue
+case 601:this.s=602;{ this.docComment( art ); }continue
+case 602:switch(this.l()){
+case'@':this.annoAssignStd({art},602);continue
 default:this.gr([',']);continue
 }
 default:
@@ -3682,90 +3683,90 @@ return this.exit_()
 }
 whereGroupByHaving($,$next){
 let cond;let _
-this.rule_(605,$next)
+this.rule_(604,$next)
 for(;;)switch(this.s){
-case 605:switch(this.lk()){
-case'where':this.ck(606);continue
+case 604:switch(this.lk()){
+case'where':this.ck(605);continue
+default:this.s=606;continue
+}
+case 605:if(this.condition(_={},606)){cond=_.expr; $.query.where = cond; }continue
+case 606:switch(this.lk()){
+case'group':this.groupByClause($,607);continue
 default:this.s=607;continue
 }
-case 606:if(this.condition(_={},607)){cond=_.expr; $.query.where = cond; }continue
 case 607:switch(this.lk()){
-case'group':this.groupByClause($,608);continue
-default:this.s=608;continue
-}
-case 608:switch(this.lk()){
-case'having':this.ck(609);continue
+case'having':this.ck(608);continue
 default:this.gr(['limit','order']);continue
 }
-case 609:if(this.condition(_={},0)){cond=_.expr; $.query.having = cond; }continue
+case 608:if(this.condition(_={},0)){cond=_.expr; $.query.having = cond; }continue
 default:return this.exit_()
 }
 }
 groupByClause($,$next){
 let expr;let _
-this.rule_(611,$next)
+this.rule_(610,$next)
 for(;;)switch(this.s){
-case 611:this.mk(612,'group');continue
-case 612:this.mk(613,'by');continue
-case 613:if(this.expression(_={},614)){expr=_.expr; $.query.groupBy = [ expr ]; }continue
-case 614:switch(this.l()){
-case',':this.c(615);continue
+case 610:this.mk(611,'group');continue
+case 611:this.mk(612,'by');continue
+case 612:if(this.expression(_={},613)){expr=_.expr; $.query.groupBy = [ expr ]; }continue
+case 613:switch(this.l()){
+case',':this.c(614);continue
 default:this.gr(['limit','order','having']);continue
 }
-case 615:if(this.expression(_={},614)){expr=_.expr; $.query.groupBy.push( expr ); }continue
+case 614:if(this.expression(_={},613)){expr=_.expr; $.query.groupBy.push( expr ); }continue
 default:return this.exit_()
 }
 }
 orderByLimitOffset($,$next){
 let expr;let _
-this.rule_(617,$next)
+this.rule_(616,$next)
 for(;;)switch(this.s){
-case 617:switch(this.lk()){
-case'order':this.orderByClause($,618);continue
-default:this.s=618;continue
+case 616:switch(this.lk()){
+case'order':this.orderByClause($,617);continue
+default:this.s=617;continue
 }
-case 618:switch(this.lk()){
-case'limit':this.ck(619);continue
+case 617:switch(this.lk()){
+case'limit':this.ck(618);continue
 default:this.gr();continue
 }
-case 619:if(this.expression(_={},620)){expr=_.expr; $.query.limit = { rows: expr }; }continue
-case 620:switch(this.lk()){
-case'offset':this.ck(621);continue
+case 618:if(this.expression(_={},619)){expr=_.expr; $.query.limit = { rows: expr }; }continue
+case 619:switch(this.lk()){
+case'offset':this.ck(620);continue
 default:this.gr();continue
 }
-case 621:if(this.expression(_={},0)){expr=_.expr; $.query.limit.offset = expr; }continue
+case 620:if(this.expression(_={},0)){expr=_.expr; $.query.limit.offset = expr; }continue
 default:return this.exit_()
 }
 }
 orderByClause($,$next){
 let expr;let _
-this.rule_(623,$next)
+this.rule_(622,$next)
 for(;;)switch(this.s){
-case 623:this.mk(624,'order');continue
-case 624:this.mk(625,'by');continue
-case 625:if(this.orderByExpression(_={},626)){expr=_.expr; $.query.orderBy = [ expr ]; }continue
-case 626:switch(this.l()){
-case',':this.c(627);continue
+case 622:this.mk(623,'order');continue
+case 623:this.mk(624,'by');continue
+case 624:if(this.orderByExpression(_={},625)){expr=_.expr; $.query.orderBy = [ expr ]; }continue
+case 625:switch(this.l()){
+case',':this.c(626);continue
 default:this.gr(['limit']);continue
 }
-case 627:if(this.orderByExpression(_={},626)){expr=_.expr; $.query.orderBy.push( expr ); }continue
+case 626:if(this.orderByExpression(_={},625)){expr=_.expr; $.query.orderBy.push( expr ); }continue
 default:return this.exit_()
 }
 }
 orderByExpression($,$next){
 $.expr??=undefined
-this.rule_(629,$next)
+this.rule_(628,$next)
 for(;;)switch(this.s){
-case 629:this.expression($,630);continue
-case 630:switch(this.lk()){
-case'asc':case'desc':if(this.ck(631)){ $.expr.sort = this.valueWithLocation(); }continue
-default:this.s=631;continue
+case 628:this.expression($,629);continue
+case 629:switch(this.lk()){
+case'asc':case'desc':if(this.ck(630)){ $.expr.sort = this.valueWithLocation(); }continue
+default:this.s=630;continue
 }
-case 631:switch(this.lk()){
-case'nulls':this.ck(632);continue
+case 630:switch(this.lk()){
+case'nulls':this.ck(631);continue
 default:this.gr([',','limit']);continue
 }
-case 632:switch(this.lk()){
+case 631:switch(this.lk()){
 case'last':case'first':if(this.ck(0)){ $.expr.nulls = this.valueWithLocation(); }continue
 default:this.e();continue
 }
@@ -3775,114 +3776,113 @@ default:return this.exit_()
 conditionEOF($,$next){
 $.cond??=undefined
 let _
-this.rule_(634,$next)
+this.rule_(633,$next)
 for(;;)switch(this.s){
-case 634:if(this.expression(_={},635))$.cond=_.expr;continue
-case 635:this.m(0,'EOF');continue
+case 633:if(this.expression(_={},634))$.cond=_.expr;continue
+case 634:this.m(0,'EOF');continue
 default:return this.exit_()
 }
 }
 condition($,$next){
 $.expr??=undefined
-this.rule_(637,$next)
+this.rule_(636,$next)
 for(;;)switch(this.s){
-case 637:this.expression($,0);continue
+case 636:this.expression($,0);continue
 default:return this.exit_()
 }
 }
 expression($,$next,$startState){
 $.expr??={}
 let e;let open;let _
-this.rule_($startState??639,$next)
+this.rule_($startState??638,$next)
 for(;;)switch(this.s){
-case 639:switch(this.lk()){
-case'(':this.expressionOrQueryParens($,640);continue
-case'#':case'null':case'true':case'false':case'Number':case'String':case'QuotedLiteral':this.literalValue($,651);continue
-case':':if(this.c(641)){ this.reportUnexpectedSpace(); }continue
-case'?':if(this.c(651)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
+case 638:switch(this.lk()){
+case'(':if(this.expressionOrQueryParens($,649)){ $.expr = this.taggedIfQuery( $.expr ); }continue
+case'#':case'null':case'true':case'false':case'Number':case'String':case'QuotedLiteral':this.literalValue($,649);continue
+case':':if(this.c(639)){ this.reportUnexpectedSpace(); }continue
+case'?':if(this.c(649)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
 $.expr = this.attachLocation({ param: this.valueWithLocation(), scope: 'param' }); }continue
-case'Id':if(this.valuePath(_={},643)){e=_.expr; $.expr = this.valuePathAst( e ); }continue
-case'new':if(this.ckP(646,['Id'])){ $.expr = this.applyOpToken(); }continue
-case'exists':if(this.ck(647)){ $.expr = this.applyOpToken(); }continue
-case'case':this.caseExpression($,651);continue
-case'cast':this.castFunction($,651);continue
-case'+':case'-':if(this.ec('precRight_',30)&&this.c(650)){ $.expr = this.applyOpToken(); }continue
-case'not':if(this.ec('precRight_',8)&&this.ck(650)){ $.expr = this.applyOpToken(); }continue
+case'Id':if(this.valuePath(_={},641)){e=_.expr; $.expr = this.valuePathAst( e ); }continue
+case'new':if(this.ckP(644,['Id'])){ $.expr = this.applyOpToken(); }continue
+case'exists':if(this.ck(645)){ $.expr = this.applyOpToken(); }continue
+case'case':this.caseExpression($,649);continue
+case'cast':this.castFunction($,649);continue
+case'+':case'-':if(this.ec('precRight_',30)&&this.c(648)){ $.expr = this.applyOpToken(); }continue
+case'not':if(this.ec('precRight_',8)&&this.ck(648)){ $.expr = this.applyOpToken(); }continue
 default:this.ei();continue
 }
-case 640:this.s=651;{ $.expr = this.taggedIfQuery( $.expr ); }continue
-case 641:switch(this.l()){
-case'Id':if(this.ciA(642,'paramref')){ $.expr = { path: [ this.identAst() ], location: this.startLocation(), scope: 'param' }; }continue
-case'Number':if(this.c(651)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'positional', code: ':' + this.lb().text } );
+case 639:switch(this.l()){
+case'Id':if(this.ciA(640,'paramref')){ $.expr = { path: [ this.identAst() ], location: this.startLocation(), scope: 'param' }; }continue
+case'Number':if(this.c(649)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'positional', code: ':' + this.lb().text } );
 $.expr = this.attachLocation({ param: this.unsignedIntegerLiteral(), scope: 'param' }); }continue
 default:this.e();continue
 }
-case 642:switch(this.l()){
-case'.':if(this.valuePath($,651,670)){ $.expr = this.valuePathAst( $.expr ); }continue
-default:this.s=651;{ this.attachLocation( $.expr ); }continue
+case 640:switch(this.l()){
+case'.':if(this.valuePath($,649,668)){ $.expr = this.valuePathAst( $.expr ); }continue
+default:this.s=649;{ this.attachLocation( $.expr ); }continue
 }
-case 643:switch(this.lk()){
-case'over':if(this.ck(644)){ this.pushXprToken( $.expr.suffix = [] ); }continue
-default:this.s=645;continue
+case 641:switch(this.lk()){
+case'over':if(this.ck(642)){ this.pushXprToken( $.expr.suffix = [] ); }continue
+default:this.s=643;continue
 }
-case 644:this.overClause(e={outer:$.expr.suffix},645);continue
-case 645:this.s=651;{ this.attachLocation( $.expr ); }continue
-case 646:if(this.valuePath(_={},651)){e=_.expr; this.valuePathAstWithNew( $.expr, e ); }continue
-case 647:switch(this.l()){
-case'(':if(this.c(648))open=this.lb();continue
-case'Id':if(this.valuePath(_={},651)){e=_.expr; e = this.valuePathAst( e ); e.$syntax = 'after-exists';
+case 642:this.overClause(e={outer:$.expr.suffix},643);continue
+case 643:this.s=649;{ this.attachLocation( $.expr ); }continue
+case 644:if(this.valuePath(_={},649)){e=_.expr; this.valuePathAstWithNew( $.expr, e ); }continue
+case 645:switch(this.l()){
+case'(':if(this.c(646))open=this.lb();continue
+case'Id':if(this.valuePath(_={},649)){e=_.expr; e = this.valuePathAst( e ); e.$syntax = 'after-exists';
 $.expr.args.push( e ); this.attachLocation( $.expr ); }continue
-case'?':if(this.c(651)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
+case'?':if(this.c(649)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
 $.expr.args.push( { param: this.valueWithLocation(), scope: 'param' } ); this.attachLocation( $.expr ); }continue
 default:this.e();continue
 }
-case 648:if(this.queryExpression(_={},649))e=_.expr;continue
-case 649:if(this.m(651,')')){ $.expr.args.push( this.taggedIfQuery( this.surroundByParens( e, open ) ) );
+case 646:if(this.queryExpression(_={},647))e=_.expr;continue
+case 647:if(this.m(649,')')){ $.expr.args.push( this.taggedIfQuery( this.surroundByParens( e, open ) ) );
 this.attachLocation( $.expr ); }continue
-case 650:if(this.expression(_={},651)){e=_.expr; $.expr = this.signedExpression( $.expr, e ); }continue
-case 651:switch(this.lk()){
-case'*':case'/':if(this.gc(0,'precLeft_',24)&&this.c(655)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'+':case'-':if(this.gc(0,'precLeft_',22)&&this.c(655)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'||':if(this.gc(0,'precLeft_',20)&&this.c(655)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'and':if(this.gc(0,'precLeft_',4)&&this.ck(655)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'or':if(this.gc(0,'precLeft_',2)&&this.ck(655)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'?':if(this.gc(0,'precRight_',0)&&this.c(652)){ $.expr = this.applyOpToken( $.expr, '?:' ); }continue
-case'<':case'=':case'>':case'!=':case'<=':case'<>':case'>=':if(this.gc(0,'precNone_',10)&&this.c(654)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'==':if(this.gc(0,'precNone_',10)&&this.c(655)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'is':if(this.gc(0,'precNone_',10)&&this.ck(656)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'not':if(this.gc(0,'isNegatedRelation',10)&&this.ck(658)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'in':case'like':case'between':if(this.gc(0,'precNone_',10)&&this.g(658)){ $.expr = { op: { val: 'ixpr', location: this.la().location }, args: [ $.expr ] }; }continue
+case 648:if(this.expression(_={},649)){e=_.expr; $.expr = this.signedExpression( $.expr, e ); }continue
+case 649:switch(this.lk()){
+case'*':case'/':if(this.gc(0,'precLeft_',24)&&this.c(653)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'+':case'-':if(this.gc(0,'precLeft_',22)&&this.c(653)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'||':if(this.gc(0,'precLeft_',20)&&this.c(653)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'and':if(this.gc(0,'precLeft_',4)&&this.ck(653)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'or':if(this.gc(0,'precLeft_',2)&&this.ck(653)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'?':if(this.gc(0,'precRight_',0)&&this.c(650)){ $.expr = this.applyOpToken( $.expr, '?:' ); }continue
+case'<':case'=':case'>':case'!=':case'<=':case'<>':case'>=':if(this.gc(0,'precNone_',10)&&this.c(652)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'==':if(this.gc(0,'precNone_',10)&&this.c(653)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'is':if(this.gc(0,'precNone_',10)&&this.ck(654)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'not':if(this.gc(0,'isNegatedRelation',10)&&this.ck(656)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'in':case'like':case'between':if(this.gc(0,'precNone_',10)&&this.g(656)){ $.expr = { op: { val: 'ixpr', location: this.la().location }, args: [ $.expr ] }; }continue
 default:this.gr();continue
 }
-case 652:if(this.expression(_={},653)){e=_.expr; $.expr.args.push( e ); }continue
-case 653:if(this.m(655,':')){ this.pushXprToken( $.expr ); }continue
+case 650:if(this.expression(_={},651)){e=_.expr; $.expr.args.push( e ); }continue
+case 651:if(this.m(653,':')){ this.pushXprToken( $.expr ); }continue
+case 652:switch(this.lk()){
+case'all':case'any':case'some':if(this.ck(653)){ this.pushXprToken( $.expr ); }continue
+default:this.s=653;continue
+}
+case 653:if(this.expression(_={},664)){e=_.expr; $.expr.args.push( e ); }continue
 case 654:switch(this.lk()){
-case'all':case'any':case'some':if(this.ck(655)){ this.pushXprToken( $.expr ); }continue
+case'not':if(this.ck(655)){ this.pushXprToken( $.expr ); }continue
 default:this.s=655;continue
 }
-case 655:if(this.expression(_={},666)){e=_.expr; $.expr.args.push( e ); }continue
+case 655:if(this.mk(664,'null')){ this.pushXprToken( $.expr ); }continue
 case 656:switch(this.lk()){
-case'not':if(this.ck(657)){ this.pushXprToken( $.expr ); }continue
-default:this.s=657;continue
-}
-case 657:if(this.mk(666,'null')){ this.pushXprToken( $.expr ); }continue
-case 658:switch(this.lk()){
-case'between':if(this.ck(659)){ this.pushXprToken( $.expr ); }continue
-case'in':if(this.ck(662)){ this.pushXprToken( $.expr ); }continue
-case'like':if(this.ck(663)){ this.pushXprToken( $.expr ); }continue
+case'between':if(this.ck(657)){ this.pushXprToken( $.expr ); }continue
+case'in':if(this.ck(660)){ this.pushXprToken( $.expr ); }continue
+case'like':if(this.ck(661)){ this.pushXprToken( $.expr ); }continue
 default:this.e();continue
 }
-case 659:if(this.expression(_={},660)){e=_.expr; $.expr.args?.push( e ); }continue
-case 660:if(this.mk(661,'and')){ this.pushXprToken( $.expr ); }continue
-case 661:if(this.expression(_={},666)){e=_.expr; $.expr.args?.push( e ); }continue
-case 662:if(this.expression(_={},666)){e=_.expr; $.expr.args?.push( this.secureParens( e ) ); }continue
-case 663:if(this.expression(_={},664)){e=_.expr; $.expr.args?.push( e ); }continue
-case 664:switch(this.lk()){
-case'escape':if(this.ck(665)){ this.pushXprToken( $.expr ); }continue
-default:this.s=666;continue
+case 657:if(this.expression(_={},658)){e=_.expr; $.expr.args?.push( e ); }continue
+case 658:if(this.mk(659,'and')){ this.pushXprToken( $.expr ); }continue
+case 659:if(this.expression(_={},664)){e=_.expr; $.expr.args?.push( e ); }continue
+case 660:if(this.expression(_={},664)){e=_.expr; $.expr.args?.push( this.secureParens( e ) ); }continue
+case 661:if(this.expression(_={},662)){e=_.expr; $.expr.args?.push( e ); }continue
+case 662:switch(this.lk()){
+case'escape':if(this.ck(663)){ this.pushXprToken( $.expr ); }continue
+default:this.s=664;continue
 }
-case 665:if(this.expression(_={},666)){e=_.expr; $.expr.args?.push( e ); }continue
-case 666:this.s=651;{ this.attachLocation( $.expr ); }continue
+case 663:if(this.expression(_={},664)){e=_.expr; $.expr.args?.push( e ); }continue
+case 664:this.s=649;{ this.attachLocation( $.expr ); }continue
 default:
 if (this.s == null) this.attachLocation( $.expr )
 return this.exit_()
@@ -3891,21 +3891,21 @@ return this.exit_()
 valuePath($,$next,$startState){
 $.expr??={ path: [] }
 let pathItem
-this.rule_($startState??668,$next)
+this.rule_($startState??666,$next)
 for(;;)switch(this.s){
-case 668:if(this.mi(669,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
-case 669:switch(this.l()){
-case'(':case'[':this.argumentsAndFilter({pathStep:pathItem},670);continue
-default:this.s=670;continue
+case 666:if(this.mi(667,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
+case 667:switch(this.l()){
+case'(':case'[':this.argumentsAndFilter({pathStep:pathItem},668);continue
+default:this.s=668;continue
 }
-case 670:switch(this.l()){
-case'.':this.gc(0,'isDotForPath')&&this.c(671);continue
+case 668:switch(this.l()){
+case'.':this.gc(0,'isDotForPath')&&this.c(669);continue
 default:this.gr(['*','+','-','/','<','=','>','?','!=','<=','<>','==','>=','in','is','or','||','and','not','like','between']);continue
 }
-case 671:if(this.miA(672,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
-case 672:switch(this.l()){
-case'(':case'[':if(this.argumentsAndFilter({pathStep:pathItem},670)){ pathItem = null; }continue
-default:this.s=670;continue
+case 669:if(this.miA(670,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
+case 670:switch(this.l()){
+case'(':case'[':if(this.argumentsAndFilter({pathStep:pathItem},668)){ pathItem = null; }continue
+default:this.s=668;continue
 }
 default:
 this.attachLocation( $.expr )
@@ -3914,48 +3914,48 @@ return this.exit_()
 }
 expressionOrQueryParens($,$next){
 $.expr??=undefined
-this.rule_(674,$next)
+this.rule_(672,$next)
 for(;;)switch(this.s){
-case 674:if(this.m(675,'(')){this.queryOnLeft()}continue;
-case 675:switch(this.lk()){
-case'(':this.expressionOrQueryParens($,676);continue
-case'Id':case'#':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression($,678)){this.queryOnLeft('expr')}continue;
-case'select':this.queryExpression($,679);continue
+case 672:if(this.m(673,'(')){this.queryOnLeft()}continue;
+case 673:switch(this.lk()){
+case'(':this.expressionOrQueryParens($,674);continue
+case'Id':case'#':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression($,676)){this.queryOnLeft('expr')}continue;
+case'select':this.queryExpression($,677);continue
 default:this.ei();continue
 }
-case 676:switch(this.lk()){
-case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression($,677,640)){this.queryOnLeft('expr')}continue;
-case',':if(this.continueExpressionslist($,679)){this.queryOnLeft('expr')}continue;
-case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(679,'queryOnLeft')&&this.queryExpression($,679,454);continue
-default:this.s=679;continue
+case 674:switch(this.lk()){
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(( $.expr = this.taggedIfQuery( $.expr ), $ ),675,649)){this.queryOnLeft('expr')}continue;
+case',':if(this.continueExpressionslist($,677)){this.queryOnLeft('expr')}continue;
+case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(677,'queryOnLeft')&&this.queryExpression($,677,454);continue
+default:this.s=677;continue
 }
-case 677:switch(this.l()){
-case',':this.continueExpressionslist($,679);continue
-default:this.s=679;continue
+case 675:switch(this.l()){
+case',':this.continueExpressionslist($,677);continue
+default:this.s=677;continue
 }
-case 678:switch(this.l()){
-case',':this.continueExpressionslist($,679);continue
-default:this.s=679;continue
+case 676:switch(this.l()){
+case',':this.continueExpressionslist($,677);continue
+default:this.s=677;continue
 }
-case 679:if(this.m(0,')')){ if ($.expr.op?.val !== 'list' || $.expr.location) this.surroundByParens( $.expr ); else this.attachLocation( $.expr ); }continue
+case 677:if(this.m(0,')')){ if ($.expr.op?.val !== 'list' || $.expr.location) this.surroundByParens( $.expr ); else this.attachLocation( $.expr ); }continue
 default:return this.exit_()
 }
 }
 continueExpressionslist($,$next){
 let e;let _
-this.rule_(681,$next)
+this.rule_(679,$next)
 for(;;)switch(this.s){
-case 681:if(this.m(682,',')){ $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: null }; }continue
-case 682:switch(this.lk()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':this.s=683;continue
+case 679:if(this.m(680,',')){ $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: null }; }continue
+case 680:switch(this.lk()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':this.s=681;continue
 default:this.ei();continue
 }
-case 683:switch(this.l()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},684)){e=_.expr; $.expr.args.push( e ); }continue
+case 681:switch(this.l()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},682)){e=_.expr; $.expr.args.push( e ); }continue
 default:this.gr([')']);continue
 }
-case 684:switch(this.l()){
-case',':this.c(683);continue
+case 682:switch(this.l()){
+case',':this.c(681);continue
 default:this.gr([')']);continue
 }
 default:return this.exit_()
@@ -3964,30 +3964,31 @@ default:return this.exit_()
 caseExpression($,$next){
 $.expr??=undefined
 let e;let _
-this.rule_(686,$next)
+this.rule_(684,$next)
 for(;;)switch(this.s){
-case 686:if(this.mk(687,'case')){ $.expr.op = { val: 'ixpr', location: this.lb().location }; $.expr.args = []; this.pushXprToken( $.expr ); }continue
-case 687:switch(this.lk()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression(_={},688)){e=_.expr; $.expr.args.push( e ); }continue
-default:this.gi(688);continue
-}
-case 688:switch(this.lk()){
-case'when':this.s=689;continue
+case 684:if(this.mk(685,'case')){ $.expr.op = { val: 'ixpr', location: this.lb().location }; $.expr.args = []; this.pushXprToken( $.expr ); }continue
+case 685:switch(this.lk()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression(_={},686)){e=_.expr; $.expr.args.push( e ); }continue
+case'when':this.gP(686);continue
+default:this.gi(686);continue
+}
+case 686:switch(this.lk()){
+case'when':this.s=687;continue
 default:this.e();continue
 }
-case 689:switch(this.lk()){
-case'when':if(this.ck(690)){ this.pushXprToken( $.expr ); }continue
+case 687:switch(this.lk()){
+case'when':if(this.ck(688)){ this.pushXprToken( $.expr ); }continue
+default:this.s=691;continue
+}
+case 688:if(this.expression(_={},689)){e=_.expr; $.expr.args.push( e ); }continue
+case 689:if(this.mk(690,'then')){ this.pushXprToken( $.expr ); }continue
+case 690:if(this.expression(_={},687)){e=_.expr; $.expr.args.push( e ); }continue
+case 691:switch(this.lk()){
+case'else':if(this.ck(692)){ this.pushXprToken( $.expr ); }continue
 default:this.s=693;continue
 }
-case 690:if(this.expression(_={},691)){e=_.expr; $.expr.args.push( e ); }continue
-case 691:if(this.mk(692,'then')){ this.pushXprToken( $.expr ); }continue
-case 692:if(this.expression(_={},689)){e=_.expr; $.expr.args.push( e ); }continue
-case 693:switch(this.lk()){
-case'else':if(this.ck(694)){ this.pushXprToken( $.expr ); }continue
-default:this.s=695;continue
-}
-case 694:if(this.expression(_={},695)){e=_.expr; $.expr.args.push( e ); }continue
-case 695:if(this.mk(0,'end')){ this.pushXprToken( $.expr ); }continue
+case 692:if(this.expression(_={},693)){e=_.expr; $.expr.args.push( e ); }continue
+case 693:if(this.mk(0,'end')){ this.pushXprToken( $.expr ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -3996,14 +3997,14 @@ return this.exit_()
 castFunction($,$next){
 $.expr??=undefined
 let arg;let _
-this.rule_(697,$next)
+this.rule_(695,$next)
 for(;;)switch(this.s){
-case 697:if(this.mk(698,'cast')){ $.expr.op = this.valueWithLocation(); }continue
-case 698:if(this.m(699,'(')){ $.expr.args = this.createArray(); }continue
-case 699:if(this.expression(_={},700)){arg=_.expr; $.expr.args?.push( arg ); }continue
-case 700:this.mk(701,'as');continue
-case 701:this.typeRefOptArgs({art:$.expr},702);continue
-case 702:if(this.m(0,')')){ this.finalizeDictOrArray( $.expr.args ); }continue
+case 695:if(this.mk(696,'cast')){ $.expr.op = this.valueWithLocation(); }continue
+case 696:if(this.m(697,'(')){ $.expr.args = this.createArray(); }continue
+case 697:if(this.expression(_={},698)){arg=_.expr; $.expr.args?.push( arg ); }continue
+case 698:this.mk(699,'as');continue
+case 699:this.typeRefOptArgs({art:$.expr},700);continue
+case 700:if(this.m(0,')')){ this.finalizeDictOrArray( $.expr.args ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -4011,67 +4012,67 @@ return this.exit_()
 }
 argumentsAndFilter($,$next){
 let open;let id;let expr;let _
-this.rule_(704,$next)
+this.rule_(702,$next)
 for(;;)switch(this.s){
-case 704:switch(this.l()){
-case'(':if(this.c(705)){open=this.lb();this.prepareSpecialFunction(); $.pathStep.args = this.createArray(); }continue
-default:this.s=723;continue
+case 702:switch(this.l()){
+case'(':if(this.c(703)){open=this.lb();this.prepareSpecialFunction(); $.pathStep.args = this.createArray(); }continue
+default:this.s=721;continue
 }
-case 705:switch(this.l()){
-case')':this.s=722;continue
-case'Id':if(this.gc(715,'isNamedArg')&&this.ciA(706,'paramname'))id=this.lb();continue
-default:this.s=715;continue
+case 703:switch(this.l()){
+case')':this.s=720;continue
+case'Id':if(this.gc(713,'isNamedArg')&&this.ciA(704,'paramname'))id=this.lb();continue
+default:this.s=713;continue
 }
-case 706:switch(this.l()){
-case':':if(this.c(707)){ $.pathStep.args = this.createDict( open ); $.pathStep.$syntax = ':'; }continue
-case'=>':if(this.c(711)){ $.pathStep.args = this.createDict(); }continue
+case 704:switch(this.l()){
+case':':if(this.c(705)){ $.pathStep.args = this.createDict( open ); $.pathStep.$syntax = ':'; }continue
+case'=>':if(this.c(709)){ $.pathStep.args = this.createDict(); }continue
 default:this.e();continue
 }
-case 707:if(this.expression(_={},708)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 708:switch(this.l()){
-case',':this.c(709);continue
-case')':this.s=722;continue
+case 705:if(this.expression(_={},706)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
+case 706:switch(this.l()){
+case',':this.c(707);continue
+case')':this.s=720;continue
 default:this.e();continue
 }
-case 709:switch(this.l()){
-case'Id':if(this.ciA(710,'paramname'))id=this.lb();continue
-case')':this.s=722;continue
+case 707:switch(this.l()){
+case'Id':if(this.ciA(708,'paramname'))id=this.lb();continue
+case')':this.s=720;continue
 default:this.e();continue
 }
-case 710:this.m(707,':');continue
-case 711:if(this.expression(_={},712)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 712:switch(this.l()){
-case',':this.c(713);continue
-case')':this.s=722;continue
+case 708:this.m(705,':');continue
+case 709:if(this.expression(_={},710)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
+case 710:switch(this.l()){
+case',':this.c(711);continue
+case')':this.s=720;continue
 default:this.e();continue
 }
-case 713:switch(this.l()){
-case'Id':if(this.ciA(714,'paramname'))id=this.lb();continue
-case')':this.s=722;continue
+case 711:switch(this.l()){
+case'Id':if(this.ciA(712,'paramname'))id=this.lb();continue
+case')':this.s=720;continue
 default:this.e();continue
 }
-case 714:this.m(711,'=>');continue
-case 715:if(this.funcExpression(_={},716)){expr=_.expr; $.pathStep.args.push( expr ); }continue
-case 716:switch(this.l()){
-case',':if(this.c(717)){this.nextFunctionArgument()}continue;
-default:this.s=719;continue
+case 712:this.m(709,'=>');continue
+case 713:if(this.funcExpression(_={},714)){expr=_.expr; $.pathStep.args.push( expr ); }continue
+case 714:switch(this.l()){
+case',':if(this.c(715)){this.nextFunctionArgument()}continue;
+default:this.s=717;continue
 }
-case 717:switch(this.l()){
-case')':this.c(718);continue
-default:this.s=715;continue
+case 715:switch(this.l()){
+case')':this.c(716);continue
+default:this.s=713;continue
 }
-case 718:switch(this.l()){
+case 716:switch(this.l()){
 case'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['*','+','-','.','/','<','=','>','?','!=','<=','<>','==','>=','in','is','or','||','and','not','like','between']);continue
 }
-case 719:switch(this.lk()){
-case'order':if(this.ck(720)){ expr = $.pathStep.args[$.pathStep.args.length - 1] = this.applyOpToken( expr ); }continue
-default:this.s=722;continue
+case 717:switch(this.lk()){
+case'order':if(this.ck(718)){ expr = $.pathStep.args[$.pathStep.args.length - 1] = this.applyOpToken( expr ); }continue
+default:this.s=720;continue
 }
-case 720:if(this.mk(721,'by')){ this.pushXprToken( expr ); }continue
-case 721:if(this.orderByClauseAsXpr({outer:expr.args},722)){ this.attachLocation( expr ); }continue
-case 722:if(this.m(723,')')){ this.finalizeDictOrArray( $.pathStep.args ); }continue
-case 723:switch(this.l()){
+case 718:if(this.mk(719,'by')){ this.pushXprToken( expr ); }continue
+case 719:if(this.orderByClauseAsXpr({outer:expr.args},720)){ this.attachLocation( expr ); }continue
+case 720:if(this.m(721,')')){ this.finalizeDictOrArray( $.pathStep.args ); }continue
+case 721:switch(this.l()){
 case'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['*','+','-','.','/','<','=','>','?','!=','<=','<>','==','>=','in','is','or','||','and','not','like','between']);continue
 }
@@ -4082,22 +4083,22 @@ funcExpression($,$next){
 $.expr??=undefined
 let args
 let tok;let e;let _
-this.rule_(725,$next)
+this.rule_(723,$next)
 for(;;)switch(this.s){
-case 725:switch(this.lGenericIntroOrExpr()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},727))$.expr=_.expr;continue
-case'GenericExpr':if(this.ckA(727)){tok=this.lb(); $.expr = { val: tok.keyword ?? tok.type, location: tok.location, literal: 'token' }; }continue
-case'GenericIntro':if(this.ckA(726)){ $.expr = this.applyOpToken(); args = $.expr.args; }continue
+case 723:switch(this.lGenericIntroOrExpr()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},725))$.expr=_.expr;continue
+case'GenericExpr':if(this.ckA(725)){tok=this.lb(); $.expr = { val: tok.keyword ?? tok.type, location: tok.location, literal: 'token' }; }continue
+case'GenericIntro':if(this.ckA(724)){ $.expr = this.applyOpToken(); args = $.expr.args; }continue
 default:this.e();continue
 }
-case 726:if(this.expression(_={},727)){e=_.expr; $.expr.args.push( e ); }continue
-case 727:switch(this.lGenericSeparator()){
-case'GenericSeparator':if(this.ckA(728)){ if (args) this.pushXprToken( args ); else { $.expr= this.applyOpToken( $.expr ); args = $.expr.args; } }continue
+case 724:if(this.expression(_={},725)){e=_.expr; $.expr.args.push( e ); }continue
+case 725:switch(this.lGenericSeparator()){
+case'GenericSeparator':if(this.ckA(726)){ if (args) this.pushXprToken( args ); else { $.expr= this.applyOpToken( $.expr ); args = $.expr.args; } }continue
 default:this.gr([')',',','order']);continue
 }
-case 728:switch(this.lGenericExpr()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},727)){e=_.expr; args.push( e ); }continue
-case'GenericExpr':if(this.ckA(727)){ this.pushXprToken( args ); }continue
+case 726:switch(this.lGenericExpr()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},725)){e=_.expr; args.push( e ); }continue
+case'GenericExpr':if(this.ckA(725)){ this.pushXprToken( args ); }continue
 default:this.e();continue
 }
 default:
@@ -4107,27 +4108,27 @@ return this.exit_()
 }
 overClause($,$next){
 let over=[]
-this.rule_(730,$next)
+this.rule_(728,$next)
 for(;;)switch(this.s){
-case 730:this.m(731,'(');continue
-case 731:switch(this.lk()){
-case'partition':if(this.ck(732)){ this.pushXprToken( over ); }continue
-default:this.s=734;continue
-}
-case 732:if(this.mk(733,'by')){ this.pushXprToken( over ); }continue
-case 733:this.expressionsAsXpr({outer:over},734);continue
-case 734:switch(this.lk()){
-case'order':if(this.ck(735)){ this.pushXprToken( over ); }continue
+case 728:this.m(729,'(');continue
+case 729:switch(this.lk()){
+case'partition':if(this.ck(730)){ this.pushXprToken( over ); }continue
+default:this.s=732;continue
+}
+case 730:if(this.mk(731,'by')){ this.pushXprToken( over ); }continue
+case 731:this.expressionsAsXpr({outer:over},732);continue
+case 732:switch(this.lk()){
+case'order':if(this.ck(733)){ this.pushXprToken( over ); }continue
+default:this.s=735;continue
+}
+case 733:if(this.mk(734,'by')){ this.pushXprToken( over ); }continue
+case 734:this.orderByClauseAsXpr({outer:over},735);continue
+case 735:switch(this.lk()){
+case'rows':if(this.ck(736)){ this.pushXprToken( over ); }continue
 default:this.s=737;continue
 }
-case 735:if(this.mk(736,'by')){ this.pushXprToken( over ); }continue
-case 736:this.orderByClauseAsXpr({outer:over},737);continue
-case 737:switch(this.lk()){
-case'rows':if(this.ck(738)){ this.pushXprToken( over ); }continue
-default:this.s=739;continue
-}
-case 738:this.windowFrameClause({outer:over},739);continue
-case 739:this.m(0,')');continue
+case 736:this.windowFrameClause({outer:over},737);continue
+case 737:this.m(0,')');continue
 default:
 $.outer.push( this.surroundByParens( this.ixprAst( over ) ) )
 return this.exit_()
@@ -4136,14 +4137,14 @@ return this.exit_()
 expressionsAsXpr($,$next){
 let args=[]
 let expr;let _
-this.rule_(741,$next)
+this.rule_(739,$next)
 for(;;)switch(this.s){
-case 741:if(this.expression(_={},742)){expr=_.expr; args.push( expr ); }continue
-case 742:switch(this.l()){
-case',':if(this.c(743)){ this.pushXprToken( args ); }continue
+case 739:if(this.expression(_={},740)){expr=_.expr; args.push( expr ); }continue
+case 740:switch(this.l()){
+case',':if(this.c(741)){ this.pushXprToken( args ); }continue
 default:this.gr([')','rows','order']);continue
 }
-case 743:if(this.expression(_={},742)){expr=_.expr; args.push( expr ); }continue
+case 741:if(this.expression(_={},740)){expr=_.expr; args.push( expr ); }continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
@@ -4151,14 +4152,14 @@ return this.exit_()
 }
 orderByClauseAsXpr($,$next){
 let args=[]
-this.rule_(745,$next)
+this.rule_(743,$next)
 for(;;)switch(this.s){
-case 745:this.orderBySpecAsXpr({args},746);continue
-case 746:switch(this.l()){
-case',':if(this.c(747)){ this.pushXprToken( args ); }continue
+case 743:this.orderBySpecAsXpr({args},744);continue
+case 744:switch(this.l()){
+case',':if(this.c(745)){ this.pushXprToken( args ); }continue
 default:this.gr([')']);continue
 }
-case 747:this.orderBySpecAsXpr({args},746);continue
+case 745:this.orderBySpecAsXpr({args},744);continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
@@ -4166,18 +4167,18 @@ return this.exit_()
 }
 orderBySpecAsXpr($,$next){
 let expr;let _
-this.rule_(749,$next)
+this.rule_(747,$next)
 for(;;)switch(this.s){
-case 749:if(this.expression(_={},750)){expr=_.expr; $.args.push( expr ); }continue
-case 750:switch(this.lk()){
-case'asc':case'desc':if(this.ck(751)){ this.pushXprToken( $.args ); }continue
-default:this.s=751;continue
+case 747:if(this.expression(_={},748)){expr=_.expr; $.args.push( expr ); }continue
+case 748:switch(this.lk()){
+case'asc':case'desc':if(this.ck(749)){ this.pushXprToken( $.args ); }continue
+default:this.s=749;continue
 }
-case 751:switch(this.lk()){
-case'nulls':if(this.ck(752)){ this.pushXprToken( $.args ); }continue
+case 749:switch(this.lk()){
+case'nulls':if(this.ck(750)){ this.pushXprToken( $.args ); }continue
 default:this.gr([')',',']);continue
 }
-case 752:switch(this.lk()){
+case 750:switch(this.lk()){
 case'last':case'first':if(this.ck(0)){ this.pushXprToken( $.args ); }continue
 default:this.e();continue
 }
@@ -4186,50 +4187,50 @@ default:return this.exit_()
 }
 windowFrameClause($,$next){
 let args=[]
-this.rule_(754,$next)
+this.rule_(752,$next)
 for(;;)switch(this.s){
-case 754:switch(this.lk()){
-case'unbounded':if(this.ck(755)){ this.pushXprToken( args ); }continue
-case'Number':if(this.c(755)){ args.push( this.unsignedIntegerLiteral() ); }continue
-case'current':if(this.ck(756)){ this.pushXprToken( args ); }continue
-case'between':if(this.ck(757)){ this.pushXprToken( args ); }continue
+case 752:switch(this.lk()){
+case'unbounded':if(this.ck(753)){ this.pushXprToken( args ); }continue
+case'Number':if(this.c(753)){ args.push( this.unsignedIntegerLiteral() ); }continue
+case'current':if(this.ck(754)){ this.pushXprToken( args ); }continue
+case'between':if(this.ck(755)){ this.pushXprToken( args ); }continue
 default:this.e();continue
 }
-case 755:if(this.mk(0,'preceding')){ this.pushXprToken( args ); }continue
-case 756:if(this.mk(0,'row')){ this.pushXprToken( args ); }continue
-case 757:this.windowFrameBoundSpec({args},758);continue
-case 758:if(this.mk(759,'and')){ this.pushXprToken( args ); }continue
-case 759:this.windowFrameBoundSpec({args},0);continue
+case 753:if(this.mk(0,'preceding')){ this.pushXprToken( args ); }continue
+case 754:if(this.mk(0,'row')){ this.pushXprToken( args ); }continue
+case 755:this.windowFrameBoundSpec({args},756);continue
+case 756:if(this.mk(757,'and')){ this.pushXprToken( args ); }continue
+case 757:this.windowFrameBoundSpec({args},0);continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
 }
 }
 windowFrameBoundSpec($,$next){
-this.rule_(761,$next)
+this.rule_(759,$next)
 for(;;)switch(this.s){
-case 761:switch(this.lk()){
-case'unbounded':if(this.ck(762)){ this.pushXprToken( $.args ); }continue
-case'Number':if(this.c(762)){ $.args.push( this.unsignedIntegerLiteral() ); }continue
-case'current':if(this.ck(764)){ this.pushXprToken( $.args ); }continue
+case 759:switch(this.lk()){
+case'unbounded':if(this.ck(760)){ this.pushXprToken( $.args ); }continue
+case'Number':if(this.c(760)){ $.args.push( this.unsignedIntegerLiteral() ); }continue
+case'current':if(this.ck(762)){ this.pushXprToken( $.args ); }continue
 default:this.e();continue
 }
-case 762:switch(this.lk()){
-case'following':this.ck(763);continue
-case'preceding':this.ck(763);continue
+case 760:switch(this.lk()){
+case'following':this.ck(761);continue
+case'preceding':this.ck(761);continue
 default:this.e();continue
 }
-case 763:if(this.gr()){ this.pushXprToken( $.args ); }continue
-case 764:if(this.mk(0,'row')){ this.pushXprToken( $.args ); }continue
+case 761:if(this.gr()){ this.pushXprToken( $.args ); }continue
+case 762:if(this.mk(0,'row')){ this.pushXprToken( $.args ); }continue
 default:return this.exit_()
 }
 }
 literalValue($,$next){
 $.expr??={}
-this.rule_(766,$next)
+this.rule_(764,$next)
 for(;;)switch(this.s){
-case 766:switch(this.lk()){
-case'#':if(this.c(767)){ this.reportUnexpectedSpace(); }continue
+case 764:switch(this.lk()){
+case'#':if(this.c(765)){ this.reportUnexpectedSpace(); }continue
 case'null':if(this.ck(0)){ $.expr = { literal: 'null', val: null }; }continue
 case'true':case'false':if(this.ck(0)){ $.expr = { literal: 'boolean', val: this.lb().keyword === 'true' }; }continue
 case'Number':if(this.c(0)){ $.expr = this.numberLiteral(); }continue
@@ -4237,17 +4238,17 @@ case'String':if(this.c(0)){ $.expr = this.quotedLiteral(); }continue
 case'QuotedLiteral':if(this.c(0)){ $.expr = this.quotedLiteral(); }continue
 default:this.e();continue
 }
-case 767:if(this.miA(0,'enumref')){ $.expr = { literal: 'enum', sym: this.identAst() } }continue
+case 765:if(this.miA(0,'enumref')){ $.expr = { literal: 'enum', sym: this.identAst() } }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
 }
 }
 annoAssignStd($,$next){
-this.rule_(769,$next)
+this.rule_(767,$next)
 for(;;)switch(this.s){
-case 769:if(this.m(770,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
-case 770:switch(this.l()){
+case 767:if(this.m(768,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
+case 768:switch(this.l()){
 case'(':this.annoAssignParen($,0);continue
 case'Id':this.annoAssignBase($,0);continue
 default:this.e();continue
@@ -4258,10 +4259,10 @@ return this.exit_()
 }
 }
 annoAssignCol($,$next){
-this.rule_(772,$next)
+this.rule_(770,$next)
 for(;;)switch(this.s){
-case 772:if(this.m(773,'@')){ this.reportDubiousAnnoSpacing(); }continue
-case 773:switch(this.l()){
+case 770:if(this.m(771,'@')){ this.reportDubiousAnnoSpacing(); }continue
+case 771:switch(this.l()){
 case'(':this.annoAssignParen($,0);continue
 case'Id':this.annoAssignBase($,0);continue
 default:this.e();continue
@@ -4273,10 +4274,10 @@ return this.exit_()
 }
 annoAssignMid($,$next){
 let name;let _
-this.rule_(775,$next)
+this.rule_(773,$next)
 for(;;)switch(this.s){
-case 775:if(this.m(776,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
-case 776:switch(this.l()){
+case 773:if(this.m(774,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
+case 774:switch(this.l()){
 case'(':this.annoAssignParen($,0);continue
 case'Id':if(this.annoNamePath(_={category:'anno'},0)){name=_.name; this.assignAnnotation( $.art, {}, name ); this.warnIfColonFollows( name ); }continue
 default:this.e();continue
@@ -4287,33 +4288,33 @@ return this.exit_()
 }
 }
 annoAssignParen($,$next){
-this.rule_(778,$next)
+this.rule_(776,$next)
 for(;;)switch(this.s){
-case 778:if(this.m(779,'(')){this.annoInSameLine()}continue;
-case 779:switch(this.l()){
-case'Id':this.annoAssignBase({art:$.art},780);continue
-default:this.s=781;continue
-}
-case 780:switch(this.l()){
-case',':this.c(779);continue
-case')':this.s=781;continue
+case 776:if(this.m(777,'(')){this.annoInSameLine()}continue;
+case 777:switch(this.l()){
+case'Id':this.annoAssignBase({art:$.art},778);continue
+default:this.s=779;continue
+}
+case 778:switch(this.l()){
+case',':this.c(777);continue
+case')':this.s=779;continue
 default:this.e();continue
 }
-case 781:this.m(0,')');continue
+case 779:this.m(0,')');continue
 default:return this.exit_()
 }
 }
 annoAssignBase($,$next){
 let value={}
 let name;let _
-this.rule_(783,$next)
+this.rule_(781,$next)
 for(;;)switch(this.s){
-case 783:if(this.annoNamePath(_={category:'anno'},784))name=_.name;continue
-case 784:switch(this.l()){
-case':':this.gc(0,'annoInSameLine')&&this.c(785);continue
+case 781:if(this.annoNamePath(_={category:'anno'},782))name=_.name;continue
+case 782:switch(this.l()){
+case':':this.gc(0,'annoInSameLine')&&this.c(783);continue
 default:this.gr();continue
 }
-case 785:if(this.annoValue(_={},0))value=_.value;continue
+case 783:if(this.annoValue(_={},0))value=_.value;continue
 default:
 this.assignAnnotation( $.art, value, name || {} )
 return this.exit_()
@@ -4322,20 +4323,20 @@ return this.exit_()
 annoNamePath($,$next){
 $.name??=new XsnName()
 let at
-this.rule_(787,$next)
+this.rule_(785,$next)
 for(;;)switch(this.s){
-case 787:if(this.miA(788,$.category)){ $.name.path = [ this.identAst() ]; }continue
-case 788:switch(this.l()){
-case'.':this.c(789);continue
-default:this.s=791;continue
-}
-case 789:switch(this.l()){
-case'Id':if(this.ciA(788,$.category)){ $.name.path.push( this.identAst() ); }continue
-case'@':if(this.c(790))at=this.lb();continue
+case 785:if(this.miA(786,$.category)){ $.name.path = [ this.identAst() ]; }continue
+case 786:switch(this.l()){
+case'.':this.c(787);continue
+default:this.s=789;continue
+}
+case 787:switch(this.l()){
+case'Id':if(this.ciA(786,$.category)){ $.name.path.push( this.identAst() ); }continue
+case'@':if(this.c(788))at=this.lb();continue
 default:this.e();continue
 }
-case 790:if(this.miA(788,$.category)){ $.name.path.push( this.identAstWithPrefix( at ) ); }continue
-case 791:switch(this.l()){
+case 788:if(this.miA(786,$.category)){ $.name.path.push( this.identAstWithPrefix( at ) ); }continue
+case 789:switch(this.l()){
 case'#':this.gc(0,'annoInSameLine')&&this.annoPathVariant({nameOrRef:$.name},0);continue
 default:this.gr();continue
 }
@@ -4346,25 +4347,25 @@ return this.exit_()
 }
 annoPath($,$next){
 let at
-this.rule_(793,$next)
+this.rule_(791,$next)
 for(;;)switch(this.s){
-case 793:switch(this.l()){
-case'Id':if(this.ciA(795,$.category)){ $.nameOrRef.path = [ this.identAst() ]; }continue
-case'@':if(this.c(794))at=this.lb();continue
+case 791:switch(this.l()){
+case'Id':if(this.ciA(793,$.category)){ $.nameOrRef.path = [ this.identAst() ]; }continue
+case'@':if(this.c(792))at=this.lb();continue
 default:this.e();continue
 }
-case 794:if(this.miA(795,$.category)){ $.nameOrRef.path = [ this.identAstWithPrefix( at ) ]; }continue
-case 795:switch(this.l()){
-case'.':this.c(796);continue
-default:this.s=798;continue
+case 792:if(this.miA(793,$.category)){ $.nameOrRef.path = [ this.identAstWithPrefix( at ) ]; }continue
+case 793:switch(this.l()){
+case'.':this.c(794);continue
+default:this.s=796;continue
 }
-case 796:switch(this.l()){
-case'Id':if(this.ciA(795,$.category)){ $.nameOrRef.path.push( this.identAst() ); }continue
-case'@':if(this.c(797))at=this.lb();continue
+case 794:switch(this.l()){
+case'Id':if(this.ciA(793,$.category)){ $.nameOrRef.path.push( this.identAst() ); }continue
+case'@':if(this.c(795))at=this.lb();continue
 default:this.e();continue
 }
-case 797:if(this.miA(795,$.category)){ $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); }continue
-case 798:switch(this.l()){
+case 795:if(this.miA(793,$.category)){ $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); }continue
+case 796:switch(this.l()){
 case'#':this.annoPathVariant({nameOrRef:$.nameOrRef},0);continue
 default:this.gr();continue
 }
@@ -4374,15 +4375,15 @@ return this.exit_()
 }
 }
 annoPathVariant($,$next){
-this.rule_(800,$next)
+this.rule_(798,$next)
 for(;;)switch(this.s){
-case 800:if(this.m(801,'#')){ this.reportUnexpectedSpace(); }continue
-case 801:if(this.miA(802,'variant')){ $.nameOrRef.variant = { path: [ this.identAst() ] }; }continue
-case 802:switch(this.l()){
-case'.':this.c(803);continue
+case 798:if(this.m(799,'#')){ this.reportUnexpectedSpace(); }continue
+case 799:if(this.miA(800,'variant')){ $.nameOrRef.variant = { path: [ this.identAst() ] }; }continue
+case 800:switch(this.l()){
+case'.':this.c(801);continue
 default:this.gr();continue
 }
-case 803:if(this.miA(802,'variant')){ $.nameOrRef.variant.path.push( this.identAst() ); }continue
+case 801:if(this.miA(800,'variant')){ $.nameOrRef.variant.path.push( this.identAst() ); }continue
 default:
 this.attachLocation( $.nameOrRef.variant )
 return this.exit_()
@@ -4392,14 +4393,14 @@ annoStructValue($,$next){
 $.value??={}
 let name=new XsnName()
 let _
-this.rule_(805,$next)
+this.rule_(803,$next)
 for(;;)switch(this.s){
-case 805:if(this.annoPath({nameOrRef:name,category:'name'},806)){ this.attachLocation( name ); }continue
-case 806:switch(this.l()){
-case':':this.c(807);continue
+case 803:if(this.annoPath({nameOrRef:name,category:'name'},804)){ this.attachLocation( name ); }continue
+case 804:switch(this.l()){
+case':':this.c(805);continue
 default:if(this.gr(['Id',',','@','}'])){ this.attachLocation( $.value ); }continue
 }
-case 807:if(this.annoValue(_={},0))$.value=_.value;continue
+case 805:if(this.annoValue(_={},0))$.value=_.value;continue
 default:
 $.value.name = name
 return this.exit_()
@@ -4408,55 +4409,55 @@ return this.exit_()
 annoValue($,$next){
 $.value??={}
 let sign;let sub;let ellipsis;let upTo;let _
-this.rule_(809,$next)
+this.rule_(807,$next)
 for(;;)switch(this.s){
-case 809:switch(this.lk()){
+case 807:switch(this.lk()){
 case'#':case'null':case'true':case'false':case'Number':case'String':case'QuotedLiteral':if(this.literalValue(_={},0)){$.value=_.expr; this.adjustAnnoNumber( $.value ); }continue
-case'+':case'-':if(this.c(810))sign=this.lb();continue
+case'+':case'-':if(this.c(808))sign=this.lb();continue
 case'Id':case'@':this.annoPath({nameOrRef:$.value,category:'annoref'},0);continue
-case'{':if(this.c(811)){ if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
+case'{':if(this.c(809)){ if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
 else { $.value.struct = Object.create(null); $.value.literal = 'struct'; } }continue
-case'[':if(this.c(814)){this.arrayAnno(); $.value.val = []; $.value.literal = 'array' }continue
-case'(':this.c(820);continue
+case'[':if(this.c(812)){this.arrayAnno(); $.value.val = []; $.value.literal = 'array' }continue
+case'(':this.c(818);continue
 default:this.ei();continue
 }
-case 810:if(this.m(0,'Number')){ this.adjustAnnoNumber( $.value = this.numberLiteral( sign ) ); }continue
-case 811:switch(this.l()){
-case'Id':case'@':if(this.annoStructValue(_={},812)){sub=_.value; if ($.value.$flatten) $.value.$flatten.push( sub );
+case 808:if(this.m(0,'Number')){ this.adjustAnnoNumber( $.value = this.numberLiteral( sign ) ); }continue
+case 809:switch(this.l()){
+case'Id':case'@':if(this.annoStructValue(_={},810)){sub=_.value; if ($.value.$flatten) $.value.$flatten.push( sub );
 else this.addDef( sub, $.value, 'struct', null, sub.name ); }continue
-default:this.s=813;continue
+default:this.s=811;continue
 }
-case 812:switch(this.lk()){
-case',':this.c(811);continue
-case'}':this.s=813;continue
-case'Id':case'@':this.ec('fail')&&this.g(811);continue
+case 810:switch(this.lk()){
+case',':this.c(809);continue
+case'}':this.s=811;continue
+case'Id':case'@':this.ec('fail')&&this.g(809);continue
 default:this.ei();continue
 }
-case 813:this.ec('arrayAnno','orNotEmpty')&&this.m(0,'}');continue
-case 814:switch(this.l()){
-case'Id':case'#':case'(':case'+':case'-':case'@':case'[':case'{':case'Number':case'String':case'QuotedLiteral':if(this.annoValue(_={},818)){sub=_.value; $.value.val.push( sub ) }continue
-case'...':if(this.gc(819,'arrayAnno','ellipsis')&&this.c(815))ellipsis=this.lb();continue
-default:this.s=819;continue
+case 811:this.ec('arrayAnno','orNotEmpty')&&this.m(0,'}');continue
+case 812:switch(this.l()){
+case'Id':case'#':case'(':case'+':case'-':case'@':case'[':case'{':case'Number':case'String':case'QuotedLiteral':if(this.annoValue(_={},816)){sub=_.value; $.value.val.push( sub ) }continue
+case'...':if(this.gc(817,'arrayAnno','ellipsis')&&this.c(813))ellipsis=this.lb();continue
+default:this.s=817;continue
 }
-case 815:switch(this.lk()){
-case'up':this.ck(816);continue
-case',':case']':this.s=818;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location } ); }continue
+case 813:switch(this.lk()){
+case'up':this.ck(814);continue
+case',':case']':this.s=816;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location } ); }continue
 default:this.e();continue
 }
-case 816:this.mk(817,'to');continue
-case 817:if(this.annoValue(_={},818)){upTo=_.value; $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location, upTo: upTo } ); }continue
-case 818:switch(this.l()){
-case',':this.c(814);continue
-case']':this.s=819;continue
+case 814:this.mk(815,'to');continue
+case 815:if(this.annoValue(_={},816)){upTo=_.value; $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location, upTo: upTo } ); }continue
+case 816:switch(this.l()){
+case',':this.c(812);continue
+case']':this.s=817;continue
 default:this.e();continue
 }
-case 819:this.ec('arrayAnno','bracket')&&this.m(0,']');continue
-case 820:switch(this.l()){
-case')':this.gc(821,'fail')&&this.c(0);continue
-default:this.s=821;continue
+case 817:this.ec('arrayAnno','bracket')&&this.m(0,']');continue
+case 818:switch(this.l()){
+case')':this.gc(819,'fail')&&this.c(0);continue
+default:this.s=819;continue
 }
-case 821:if(this.condition(_={},822)){$.value=_.expr; $.value.$tokenTexts = this.ruleTokensText(); }continue
-case 822:this.m(0,')');continue
+case 819:if(this.condition(_={},820)){$.value=_.expr; $.value.$tokenTexts = this.ruleTokensText(); }continue
+case 820:this.m(0,')');continue
 default:
 this.attachLocation( $.value )
 return this.exit_()