@sap/cds-compiler 5.9.2 → 6.0.10

package/lib/gen/CdlParser.js

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