@sap/cds-compiler 6.3.6 → 6.4.2

package/lib/gen/CdlParser.js

@@ -1,4 +1,4 @@
-// Parser generated by redepage v0.3.0
+// Parser generated by redepage v0.3.1
 'use strict;'
 const { XsnSource, XsnArtifact, XsnName } = require( '../compiler/xsn-model' )
 const AstBuildingParser = require('../parsers/AstBuildingParser')
@@ -120,7 +120,7 @@ using:[2,19],
 {
 ';':['c',1],
 EOF:3,
-Id:['g',1,,'afterBrace'],'@':'Id',
+'@':['g',1,,'afterBrace'],type:'@',view:'@',event:'@',using:'@',action:'@',aspect:'@',define:'@',entity:'@',extend:'@',context:'@',service:'@',abstract:'@',annotate:'@',function:'@',namespace:'@',annotation:'@',
 },
 ['m',0,'EOF'],
 'artifactsBlock',
@@ -129,11 +129,11 @@ Id:['g',1,,'afterBrace'],'@':'Id',
 {
 ';':['c',6],
 '}':8,
-Id:['g',6,,'afterBrace'],'@':'Id',
+'@':['g',6,,'afterBrace'],type:'@',view:'@',event:'@',action:'@',aspect:'@',define:'@',entity:'@',extend:'@',context:'@',service:'@',abstract:'@',annotate:'@',function:'@',annotation:'@',
 },
 ['m',0,'}',,,'afterBrace'],
 'artifactDefOrExtend',
-{'@':[10,772],'':11},
+{'@':[10,769],'':11},
 {
 type:12,view:12,event:12,action:12,aspect:12,entity:12,context:12,service:12,abstract:12,function:12,annotation:12,
 define:['ck',12],
@@ -198,22 +198,22 @@ Id:[22,31],
 'serviceDef',
 ['mk',44,'service',,,'vocabularyRestriction'],
 [45,35],
-{'@':[45,778],'':46},
+{'@':[45,775],'':46},
 {'{':[0,5],'':0},
 'contextDef',
 ['mk',49,'context',,,'vocabularyRestriction'],
 [50,35],
-{'@':[50,778],'':51},
+{'@':[50,775],'':51},
 {'{':[0,5],'':0},
 'annotationDef',
 ['mk',54,'annotation'],
 [55,35],
-{'@':[55,778],'':56},
+{'@':[55,775],'':56},
 [0,347],
 'typeDef',
 ['mk',59,'type'],
 [60,35],
-{'@':[60,778],'':61},
+{'@':[60,775],'':61},
 [0,347],
 'aspectDef',
 {
@@ -222,7 +222,7 @@ abstract:['ck',64,,'hide_'],
 },
 ['mk',65,'entity'],
 [66,35],
-{'@':[66,778],'':67},
+{'@':[66,775],'':67},
 {
 '{':[71,158],
 ':':['c',68],
@@ -239,7 +239,7 @@ abstract:['ck',64,,'hide_'],
 'entityDef',
 ['mk',74,'entity'],
 [75,35],
-{'@':[75,778],'':76},
+{'@':[75,775],'':76},
 {'(':[77,142],'':77},
 {
 '{':81,
@@ -254,18 +254,18 @@ as:['ck',82],
 },
 [87,158],
 {
-'(':[87,452],select:'(',
+'(':[87,451],select:'(',
 projection:['g',83,,,'sloppy','afterBrace'],
 },
-[84,446],
-{group:[85,608],where:'group',having:'group','':85},
-{limit:[86,620],order:'limit','':86},
+[84,445],
+{group:[85,605],where:'group',having:'group','':85},
+{limit:[86,617],order:'limit','':86},
 ['g',87,,,'normal','afterBrace'],
 {actions:[0,125],'':0},
 'viewDef',
 ['mk',90,'view'],
 [91,35],
-{'@':[91,778],'':92},
+{'@':[91,775],'':92},
 {
 '(':[98,142],
 with:['ck',93,,'hide_'],
@@ -277,11 +277,11 @@ with:['ck',93,,'hide_'],
 [95,147],
 ['g',98],
 ['mk',99,'as'],
-[0,452],
+[0,451],
 'eventDef',
 ['mk',102,'event'],
 [103,35],
-{'@':[103,778],'':104},
+{'@':[103,775],'':104},
 {
 '{':[0,158],
 ':':['c',105],
@@ -289,7 +289,7 @@ with:['ck',93,,'hide_'],
 {
 '{':[0,158],
 Id:[106,39],
-projection:[0,446,1],
+projection:[0,445,1],
 },
 {',':107,'{':107,'':111},
 {',':['c',108],'':110},
@@ -299,17 +299,17 @@ projection:[0,446,1],
 '{':110,
 },
 [0,158],
-{'@':[111,772],'':0},
+{'@':[111,769],'':0},
 'actionMainDef',
 ['mk',114,'action'],
 [115,35],
-{'@':[115,778],'':116},
+{'@':[115,775],'':116},
 [117,142],
 {returns:[0,154],'':0},
 'functionMainDef',
 ['mk',120,'function'],
 [121,35],
-{'@':[121,778],'':122},
+{'@':[121,775],'':122},
 [123,142],
 [0,154],
 'actionsBlock',
@@ -319,21 +319,21 @@ projection:[0,446,1],
 {
 ';':['c',127],
 '}':129,
-Id:['g',127,,'afterBrace'],'@':'Id',
+'@':['g',127,,'afterBrace'],action:'@',function:'@',
 },
 ['m',0,'}',,,'afterBrace'],
 'boundActionFunctionDef',
-{'@':[131,772],'':132},
+{'@':[131,769],'':132},
 {
 action:['ck',133],
 function:['ck',137],
 },
 ['mi',134],
-{'@':[134,778],'':135},
+{'@':[134,775],'':135},
 [136,142],
 {returns:[0,154],'':0},
 ['mi',138],
-{'@':[138,778],'':139},
+{'@':[138,775],'':139},
 [140,142],
 [0,154],
 'paramsList',
@@ -345,48 +345,48 @@ function:['ck',137],
 },
 ['m',0,')'],
 'paramDef',
-{'@':[147,772],'':148},
+{'@':[147,769],'':148},
 ['miA',149],
-{'@':[149,778],'':150},
+{'@':[149,775],'':150},
 {
 '{':[151,158],
 ':':['c',152],
 },
-{not:[0,439],null:'not','':0},
-[0,358],
+{not:[0,438],null:'not','':0},
+[0,357],
 'returnsSpec',
 ['mk',155,'returns',,'default','elementRestriction'],
-{'@':[155,772],'':156},
-[0,358],
+{'@':[155,769],'':156},
+[0,357],
 'elementsBlock',
 ['m',159,'{'],
 {Id:[160,163],'@':'Id','':161},
 {
 ';':['c',159],
 '}':161,
-Id:['g',159,,'afterBrace'],'@':'Id',
+Id:['g',159,,'afterBrace'],'@':'Id',key:'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'elementDef',
-{'@':[163,772],'':164},
+{'@':[163,769],'':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,778],'':170},
+{'@':[169,775],'':170},
 {
 '{':[171,158],
 ':':['c',172],
 '':173
 },
-{not:[173,439],null:'not','':173},
-[173,358],
+{not:[173,438],null:'not','':173},
+[173,357],
 {'=':['c',174,,'elementRestriction','calc'],'':0},
-[175,642],
+[175,639],
 {stored:['ck',176],'':176},
 ['g',177],
-{'@':[177,772,,'elementRestriction','anno'],'':0},
+{'@':[177,769,,'elementRestriction','anno'],'':0},
 'enumSymbolsBlock',
 ['mk',180,'enum'],
 ['m',181,'{'],
@@ -397,19 +397,19 @@ Id:['g',159,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'enumSymbolDef',
-{'@':[185,772],'':186},
+{'@':[185,769],'':186},
 ['mi',187],
-{'@':[187,772],'':188},
+{'@':[187,769],'':188},
 {'=':['c',189],'':0},
 {
 String:['c',191],
 Number:['c',191],
 '+':['c',190],'-':'+',
-Id:[191,769,,'hide_'],'#':'Id',QuotedLiteral:'Id',
+Id:[191,766,,'hide_'],'#':'Id',QuotedLiteral:'Id',
 },
 ['m',191,'Number'],
 ['g',192],
-{'@':[192,772],'':0},
+{'@':[192,769],'':0},
 'foreignKeysBlock',
 ['m',195,'{'],
 {Id:[196,199],'@':'Id','':197},
@@ -419,7 +419,7 @@ Id:[191,769,,'hide_'],'#':'Id',QuotedLiteral:'Id',
 },
 ['m',0,'}'],
 'foreignKeyDef',
-{'@':[199,772],'':200},
+{'@':[199,769],'':200},
 [201,39],
 {as:['ck',202],'':0},
 ['mi',0],
@@ -430,14 +430,14 @@ Id:[191,769,,'hide_'],'#':'Id',QuotedLiteral:'Id',
 association:['ck',207],
 composition:['ck',209],
 },
-{'[':[208,427],'':208},
+{'[':[208,426],'':208},
 ['mk',211,'to'],
-{'[':[210,427],'':210},
+{'[':[210,426],'':210},
 ['mk',211,'of'],
 {one:['ck',212,1,'noRepeatedCardinality'],many:'one','':212},
 [213,39],
 ['mk',214,'on'],
-[0,640],
+[0,637],
 'annotateArtifact',
 [217,35],
 {
@@ -448,10 +448,10 @@ with:['ck',223],
 [219,35],
 {with:['ck',220],'':220},
 ['g',221],
-{'@':[221,772],'':222},
+{'@':[221,769],'':222},
 {'{':[0,321],'':0},
 ['g',224],
-{'@':[224,772],'':225},
+{'@':[224,769],'':225},
 {'(':[226,308],'':226},
 {
 returns:[0,317],
@@ -469,26 +469,26 @@ with:['ck',240],
 [232,35],
 {with:['ck',233],'':233},
 ['g',234],
-{'@':[234,772],'':235},
+{'@':[234,769],'':235},
 {
 '{':236,
 elements:['ck',236],
 enum:[0,179],
-'(':[0,418],
+'(':[0,417],
 '':0
 },
 [0,331],
-{'@':[237,772],'':238},
+{'@':[237,769],'':238},
 {'{':[239,331],'':0},
 {actions:[0,125],'':0},
-{'@':[240,772],'':241},
+{'@':[240,769],'':241},
 {
 Id:[242,39],
 '{':246,
 elements:['ck',246,1],
 actions:[0,125,1],
 enum:[0,179,1],
-'(':[0,418],
+'(':[0,417],
 columns:['ck',248,1],
 definitions:['ck',249,1],
 '':0
@@ -499,35 +499,35 @@ definitions:['ck',249,1],
 {actions:[0,125],'':0},
 [247,331],
 {actions:[0,125],'':0},
-[0,558],
+[0,555],
 [0,5],
 'extendService',
 ['mk',252,'service'],
 [253,35],
 {with:['ck',254],'':254},
 ['g',255],
-{'@':[255,772],'':256},
+{'@':[255,769],'':256},
 {'{':[0,5],'':0},
 'extendContext',
 ['mk',259,'context'],
 [260,35],
 {with:['ck',261],'':261},
 ['g',262],
-{'@':[262,772],'':263},
+{'@':[262,769],'':263},
 {'{':[0,5],'':0},
 'extendType',
 ['mk',266,'type'],
 [267,35],
 {with:['ck',270],'':268},
-{'@':[268,772],'':269},
+{'@':[268,769],'':269},
 {'{':[0,331],'':0},
-{'@':[270,772],'':271},
+{'@':[270,769],'':271},
 {
 Id:[272,39],
 '{':275,
 elements:['ck',275,1],
 enum:[0,179,1],
-'(':[0,418],
+'(':[0,417],
 '':0
 },
 {',':['c',273],'':274},
@@ -538,8 +538,8 @@ enum:[0,179,1],
 {aspect:['ck',278],entity:'aspect'},
 [279,35],
 {with:['ck',281],'':280},
-{'@':[280,772],'':285},
-{'@':[281,772],'':282},
+{'@':[280,769],'':285},
+{'@':[281,769],'':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,772],'':293},
-{'{':[294,558],'':294},
+{'@':[292,769],'':293},
+{'{':[294,555],'':294},
 {actions:[0,125],'':0},
 'annotateActionsBlock',
 ['mk',297,'actions'],
@@ -568,9 +568,9 @@ Id:['g',298,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'annotateBoundAction',
-{'@':[302,772],'':303},
+{'@':[302,769],'':303},
 ['mi',304],
-{'@':[304,772],'':305},
+{'@':[304,769],'':305},
 {'(':[306,308],'':306},
 {returns:[0,317,1],'':0},
 'annotateParamsBlock',
@@ -582,12 +582,12 @@ Id:['g',298,,'afterBrace'],'@':'Id',
 },
 ['m',0,')'],
 'annotateParam',
-{'@':[313,772],'':314},
+{'@':[313,769],'':314},
 ['mi',315],
-{'@':[315,772],'':0},
+{'@':[315,769],'':0},
 'annotateReturns',
 ['mk',318,'returns'],
-{'@':[318,772],'':319},
+{'@':[318,769],'':319},
 {'{':[0,321],'':0},
 'annotateElementsBlock',
 ['m',322,'{'],
@@ -599,9 +599,9 @@ Id:['g',322,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'annotateElement',
-{'@':[326,772],'':327},
+{'@':[326,769],'':327},
 ['mi',328],
-{'@':[328,772],'':329},
+{'@':[328,769],'':329},
 {'{':[0,321],'':0},
 'extendElementsBlock',
 ['m',332,'{'],
@@ -609,11 +609,11 @@ Id:['g',322,,'afterBrace'],'@':'Id',
 {
 ';':['c',332],
 '}':334,
-Id:['g',332,,'afterBrace'],'@':'Id',
+Id:['g',332,,'afterBrace'],'@':'Id',key:'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'elementDefOrExtend',
-{'@':[336,772],'':337},
+{'@':[336,769],'':337},
 {
 Id:[0,163],'@':'Id',key:'Id',
 extend:['ck',338,1],
@@ -621,14 +621,14 @@ extend:['ck',338,1],
 {element:['ck',339,1],'':339},
 ['mi',340],
 {with:['ck',343],'':341},
-{'@':[341,772],'':342},
+{'@':[341,769],'':342},
 {'{':[0,331],'':0},
-{'@':[343,772],'':344},
+{'@':[343,769],'':344},
 {
 '{':345,
 elements:['ck',345],
 enum:[0,179],
-'(':[0,418],
+'(':[0,417],
 '':0
 },
 [0,331],
@@ -637,168 +637,167 @@ enum:[0,179],
 '{':[348,158],
 ':':['c',349],
 },
-{not:[0,439],null:'not','':0},
+{not:[0,438],null:'not','':0},
 {
-projection:[0,446,1],
-'{':[0,358,1],many:'{',type:'{',array:'{',localized:'{',association:'{',composition:'{',
+projection:[0,445,1],
+'{':[0,357,1],many:'{',type:'{',array:'{',localized:'{',association:'{',composition:'{',
 Id:[350,39],
 },
 {
-'(':[351,405],':':'(',
-'@':[0,359],not:'@',enum:'@',null:'@',default:'@',
-',':352,'{':352,
+',':351,'{':351,
+'(':[355,404],':':'(',
+'@':[0,358],not:'@',enum:'@',null:'@',default:'@',
 '':0
 },
-{'@':[0,359],not:'@',enum:'@',null:'@',default:'@','':0},
-{',':['c',353],'':355},
-{Id:[354,39],'':355},
+{',':['c',352],'':353},
 {
-',':['c',353],
-'{':355,
+Id:[351,39],
+'{':353,
 },
-[356,158],
-{not:[0,439],null:'not','':0},
+[354,158],
+{not:[0,438],null:'not','':0},
+{'@':[0,358],not:'@',enum:'@',null:'@',default:'@','':0},
 'typeExpression',
 {
-Id:[359,404],
-type:[359,396,1],
-localized:['ck',368,1],
-association:['ck',370,1,,'calc','elementRestriction'],
-composition:['ck',374,1,,'calc','elementRestriction'],
-array:['ck',378,1,,'calc','elementRestriction'],
-many:['ck',379,1,,'calc','elementRestriction'],
-'{':[384,158,,,'calc','elementRestriction'],
+Id:[358,403],
+type:[358,395,1],
+localized:['ck',367,1],
+association:['ck',369,1,,'calc','elementRestriction'],
+composition:['ck',373,1,,'calc','elementRestriction'],
+array:['ck',377,1,,'calc','elementRestriction'],
+many:['ck',378,1,,'calc','elementRestriction'],
+'{':[383,158,,,'calc','elementRestriction'],
 },
-['g',360],
-{'@':[360,772],'':361},
-{not:[362,439,,'elementRestriction','notNull'],null:'not','':363},
-{'@':[362,772],'':363},
+['g',359],
+{'@':[359,769],'':360},
+{not:[361,438,,'elementRestriction','notNull'],null:'not','':362},
+{'@':[361,769],'':362},
 {
-enum:[364,179,,,'anno','elementRestriction'],
-'@':[0,393],not:'@',null:'@',default:'@',
+enum:[363,179,,,'anno','elementRestriction'],
+'@':[0,392],not:'@',null:'@',default:'@',
 '':0
 },
-{not:[365,439,,'elementRestriction','notNull'],null:'not','':365},
-{default:['ck',366,,'elementRestriction','default'],'':367},
-[367,642],
-{not:[0,439,,'elementRestriction','notNull'],null:'not','':0},
-[369,404],
-{'@':[0,393],not:'@',null:'@',default:'@','':0},
-{'[':[371,427],'':371},
-['mk',372,'to'],
-{one:['ck',373,1,'noRepeatedCardinality'],many:'one','':373},
-[0,386],
-{'[':[375,427],'':375},
-['mk',376,'of'],
-{one:['ck',377,1,'noRepeatedCardinality'],many:'one','':377},
+{not:[364,438,,'elementRestriction','notNull'],null:'not','':364},
+{default:['ck',365,,'elementRestriction','default'],'':366},
+[366,639],
+{not:[0,438,,'elementRestriction','notNull'],null:'not','':0},
+[368,403],
+{'@':[0,392],not:'@',null:'@',default:'@','':0},
+{'[':[370,426],'':370},
+['mk',371,'to'],
+{one:['ck',372,1,'noRepeatedCardinality'],many:'one','':372},
+[0,385],
+{'[':[374,426],'':374},
+['mk',375,'of'],
+{one:['ck',376,1,'noRepeatedCardinality'],many:'one','':376},
 {
-Id:[0,386],
+Id:[0,385],
 '{':[0,158],
 },
-['mk',379,'of'],
+['mk',378,'of'],
 {
-Id:[380,404],
-type:[380,396,1],
-'{':[383,158],
+Id:[379,403],
+type:[379,395,1],
+'{':[382,158],
 },
-{not:[381,439,,'elementRestriction','notNull'],null:'not','':381},
-{enum:[383,179],'':382},
-{'@':[382,772],'':0},
-{not:[0,439,,'elementRestriction','notNull'],null:'not','':0},
-{not:[0,439],null:'not','':0},
+{not:[380,438,,'elementRestriction','notNull'],null:'not','':380},
+{enum:[382,179],'':381},
+{'@':[381,769],'':0},
+{not:[0,438,,'elementRestriction','notNull'],null:'not','':0},
+{not:[0,438],null:'not','':0},
 'typeAssocProperties',
-[387,39],
-{'@':[387,772],'':388},
+[386,39],
+{'@':[386,769],'':387},
 {
-on:['ck',389],
-'{':[391,194],
-'@':[0,393],not:'@',null:'@',default:'@',
+on:['ck',388],
+'{':[390,194],
+'@':[0,392],not:'@',null:'@',default:'@',
 '':0
 },
-[390,640],
-{'@':[390,772],'':0},
-{'@':[0,393],not:'@',null:'@',default:'@','':0},
+[389,637],
+{'@':[389,769],'':0},
+{'@':[0,392],not:'@',null:'@',default:'@','':0},
 'typeProperties',
 {
-'@':[393,772],
-not:[393,439,,'elementRestriction','notNull'],null:'not',
-default:['ck',394,,'elementRestriction','default'],
+'@':[392,769],
+not:[392,438,,'elementRestriction','notNull'],null:'not',
+default:['ck',393,,'elementRestriction','default'],
 '':0
 },
-[393,642],
+[392,639],
 'typeTypeOf',
-['mk',397,'type'],
-['mk',398,'of'],
-[399,39],
-{':':['c',400],'':0},
-['miA',401],
-{'.':['c',402],'':0},
-['miA',401],
+['mk',396,'type'],
+['mk',397,'of'],
+[398,39],
+{':':['c',399],'':0},
+['miA',400],
+{'.':['c',401],'':0},
+['miA',400],
 'typeRefOptArgs',
-[405,39],
+[404,39],
 {
-':':['c',406],
-'(':['c',410],
+':':['c',405],
+'(':['c',409],
 '':0
 },
-['miA',407],
-{'.':['c',408],'':409},
-['miA',407],
+['miA',406],
+{'.':['c',407],'':408},
+['miA',406],
 ['g',0],
 {
-Number:['c',411],
-Id:414,
+Number:['c',410],
+Id:413,
 },
-{',':['c',412],'':413},
+{',':['c',411],'':412},
 {
-Number:['c',411],
-floating:['ck',411],variable:'floating',
-')':413,
+Number:['c',410],
+floating:['ck',410],variable:'floating',
+')':412,
 },
-['g',416],
-{Id:[415,423],'':416},
+['g',415],
+{Id:[414,422],'':415},
 {
-',':['c',414],
-')':416,
+',':['c',413],
+')':415,
 },
 ['m',0,')'],
 'typeNamedArgsList',
-['m',419,'('],
-{Id:[420,423],'':421},
+['m',418,'('],
+{Id:[419,422],'':420},
 {
-',':['c',419],
-')':421,
+',':['c',418],
+')':420,
 },
 ['m',0,')'],
 'typeNamedArg',
-['mi',424],
-['m',425,':'],
+['mi',423],
+['m',424,':'],
 {
 Number:['c',0],
 floating:['ck',0],variable:'floating',
 },
 'cardinality',
-['m',428,'['],
+['m',427,'['],
 {
-'*':['c',429],
-Number:['c',431],
-']':433,
+'*':['c',428],
+Number:['c',430],
+']':432,
 },
-{',':['c',430],'':433},
-[433,435],
+{',':['c',429],'':432},
+[432,434],
 {
-',':['c',432],
-'..':[433,436],
-'':433
+',':['c',431],
+'..':[432,435],
+'':432
 },
-[433,435],
+[432,434],
 ['m',0,']'],
 'targetCardinality',
 {
 '*':['c',0],
-Number:['c',436],
+Number:['c',435],
 },
-{'..':['c',437],'':0},
+{'..':['c',436],'':0},
 {
 '*':['c',0],
 Number:['c',0],
@@ -806,541 +805,539 @@ Number:['c',0],
 'nullability',
 {
 null:['ck',0],
-not:['ck',440],
+not:['ck',439],
 },
 ['mk',0,'null'],
 'queryEOF',
-[443,452],
-{';':['c',444],'':444},
+[442,451],
+{';':['c',443],'':443},
 ['m',0,'EOF'],
 'projectionSpec',
-['mk',447,'projection'],
-['mk',448,'on'],
-[449,512],
-{'{':[450,558],'':450},
-{excluding:[0,551],'':0},
+['mk',446,'projection'],
+['mk',447,'on'],
+[448,511],
+{'{':[449,555],'':449},
+{excluding:[0,548],'':0},
 'queryExpression',
 {
-'(':['c',453],
-Id:[455,461,,,,'orderByLimitRestriction'],
+'(':['c',452],
+Id:[454,460,,,,'orderByLimitRestriction'],
 },
-[454,452],
-['m',455,')'],
+[453,451],
+['m',454,')'],
 {
-intersect:['ck',456,,'precLeft_',4],
-minus:['ck',456,,'precLeft_',2],except:'minus',
-union:['ck',457,,'precLeft_',2],
-'':459
+intersect:['ck',455,,'precLeft_',4],
+minus:['ck',455,,'precLeft_',2],except:'minus',
+union:['ck',456,,'precLeft_',2],
+'':458
 },
-{distinct:['ck',458],'':458},
-{all:['ck',458],distinct:'all','':458},
-[455,452,,,,'orderByLimitRestriction'],
-{limit:[0,620,,'orderByLimitRestriction'],order:'limit','':0},
+{distinct:['ck',457],'':457},
+{all:['ck',457],distinct:'all','':457},
+[454,451,,,,'orderByLimitRestriction'],
+{limit:[0,617,,'orderByLimitRestriction'],order:'limit','':0},
 'selectQuery',
-['mk',462,'select'],
+['mk',461,'select'],
 {
-from:['ck',463],
-Id:473,'#':473,'(':473,'*':473,'+':473,'-':473,':':473,'?':473,'@':473,'{':473,key:473,not:473,case:473,cast:473,null:473,true:473,false:473,Number:473,String:473,exists:473,QuotedLiteral:473,
-all:['ck',473],distinct:'all',
+from:['ck',462],
+Id:472,'#':472,'(':472,'*':472,'+':472,'-':472,':':472,'?':472,'@':472,'{':472,key:472,not:472,case:472,cast:472,null:472,true:472,false:472,Number:472,String:472,exists:472,QuotedLiteral:472,
+all:['ck',472],distinct:'all',
 },
-[464,481],
-{mixin:['ck',465],'':470},
-['m',466,'{'],
-{Id:[467,204],'':468},
+[463,480],
+{mixin:['ck',464],'':469},
+['m',465,'{'],
+{Id:[466,204],'':467},
 {
-';':['c',466],
-'}':468,
+';':['c',465],
+'}':467,
 },
-['m',469,'}'],
-['mk',470,'into'],
-{all:['ck',471],distinct:'all','':471},
-{'{':[472,558],'':472},
-{excluding:[479,551],'':479},
-['g',474,,,'sqlStyle','inSelectItem'],
+['m',468,'}'],
+['mk',469,'into'],
+{all:['ck',470],distinct:'all','':470},
+{'{':[471,555],'':471},
+{excluding:[478,548],'':478},
+['g',473,,,'sqlStyle','inSelectItem'],
 {
-'*':['c',475],
-Id:[475,568],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'*':['c',474],
+Id:[474,565],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
 },
-{',':['c',476],'':477},
+{',':['c',475],'':476},
 {
-'*':['c',475],
-Id:[475,568],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'*':['c',474],
+Id:[474,565],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
 },
-['mk',478,'from'],
-[479,481],
-{group:[0,608],where:'group',having:'group','':0},
+['mk',477,'from'],
+[478,480],
+{group:[0,605],where:'group',having:'group','':0},
 'querySource',
-[482,486],
-{',':483,'':0},
-{',':['c',484],'':0},
-[483,486],
+[481,485],
+{',':482,'':0},
+{',':['c',483],'':0},
+[482,485],
 'tableExpression',
 {
-'(':[487,499],
-Id:[488,512],
+'(':[486,498],
+Id:[487,511],
 },
-['g',488],
+['g',487],
 {
-cross:['ck',489],
-inner:['ck',492],
-full:['ck',491],left:'full',right:'full',
-join:['ck',494],
+cross:['ck',488],
+inner:['ck',491],
+full:['ck',490],left:'full',right:'full',
+join:['ck',493],
 '':0
 },
-['mk',490,'join'],
+['mk',489,'join'],
 {
-'(':[488,499],
-Id:[488,512],
+'(':[487,498],
+Id:[487,511],
 },
-{outer:['ck',492],'':492},
-{one:[493,506],many:'one',exact:'one','':493},
-['mk',494,'join'],
-['g',495],
-[496,486],
-['mk',497,'on'],
-[488,640],
+{outer:['ck',491],'':491},
+{one:[492,505],many:'one',exact:'one','':492},
+['mk',493,'join'],
+['g',494],
+[495,485],
+['mk',496,'on'],
+[487,637],
 'tableOrQueryParens',
-['m',500,'(',,,'queryOnLeft'],
+['m',499,'(',,,'queryOnLeft'],
 {
-'(':[501,499],
-Id:[502,486,,,'table','queryOnLeft'],
-select:[502,452],
+'(':[500,498],
+Id:[501,485,,,'table','queryOnLeft'],
+select:[501,451],
 },
 {
-full:[502,487,,,'table','queryOnLeft'],join:'full',left:'full',cross:'full',inner:'full',right:'full',
-limit:[502,455,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
-'':502
+full:[501,486,,,'table','queryOnLeft'],join:'full',left:'full',cross:'full',inner:'full',right:'full',
+limit:[501,454,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
+'':501
 },
-['m',503,')'],
+['m',502,')'],
 {
-as:['ck',504,,'queryOnLeft','table'],
+as:['ck',503,,'queryOnLeft','table'],
 Id:['ci',0,,'queryOnLeftSloppyAlias'],
 '':0
 },
 ['mi',0],
 'joinCardinality',
 {
-one:507,
-exact:['ck',507],
-many:['ck',508],
+one:506,
+exact:['ck',506],
+many:['ck',507],
 },
-['mk',508,'one'],
-['mk',509,'to'],
+['mk',507,'one'],
+['mk',508,'to'],
 {
-one:510,
-exact:['ck',510],
+one:509,
+exact:['ck',509],
 many:['ck',0],
 },
 ['mk',0,'one'],
 'fromRefWithOptAlias',
-[513,519],
-{':':['c',514],'':515},
-[515,519],
+[512,518],
+{':':['c',513],'':514},
+[514,518],
 {
-as:['ck',516],
+as:['ck',515],
 Id:['ci',0,,'isNoKeywordInRuleFollow'],
-'':517
+'':516
 },
 ['mi',0],
 ['g',0],
 'fromPath',
-['mi',520],
-{'(':[521,525],'[':'(','':521},
-{'.':['c',522,,'notAfterEntityArgOrFilter'],'':0},
-['miA',523],
-{'(':[521,525],'[':'(','':521},
+['mi',519],
+{'(':[520,524],'[':'(','':520},
+{'.':['c',521,,'notAfterEntityArgOrFilter'],'':0},
+['miA',522],
+{'(':[520,524],'[':'(','':520},
 'fromArgumentsAndFilter',
-{'(':['c',526],'':530},
-{Id:527},
-{Id:[528,532],'':529},
+{'(':['c',525],'':529},
+{Id:526},
+{Id:[527,531],'':528},
 {
-',':['c',527],
-')':529,
+',':['c',526],
+')':528,
 },
-['m',530,')'],
-{'[':[0,536],'':0},
+['m',529,')'],
+{'[':[0,535],'':0},
 'fromNamedArgument',
-['mi',533],
-['m',534,':'],
-[0,642],
+['mi',532],
+['m',533,':'],
+[0,639],
 'cardinalityAndFilter',
-['m',537,'['],
-{Number:['c',538,,'beforeColon'],'':539},
-['m',539,':'],
-[540,542],
-['m',0,']'],
-'filterClauses',
+['m',536,'['],
+{Number:['c',537,,'beforeColon'],'':538},
+['m',538,':'],
 {
-Id:543,'#':543,'(':543,'+':543,'-':543,':':543,'?':543,not:543,case:543,cast:543,null:543,true:543,false:543,Number:543,String:543,exists:543,QuotedLiteral:543,
-where:['ck',543],
-group:['g',544,1],limit:'group',order:'group',having:'group',
-'':544
+group:['g',540,1],limit:'group',order:'group',having:'group',
+where:['ck',539],
+']':['c',0],
+'':539
 },
-[544,640],
-{group:['g',545,,'hide_'],'':546},
-[546,614],
-{having:['ck',547,,'hide_'],'':548},
-[548,640],
-{Id:['g',549,,'hide_'],'':0},
-[0,620],
+[540,637],
+{group:['g',541,,'hide_'],'':542},
+[542,611],
+{having:['ck',543,,'hide_'],'':544},
+[544,637],
+{Id:['g',545,,'hide_'],'':546},
+[546,617],
+['m',0,']'],
 'excludingClause',
-['mk',552,'excluding'],
-['m',553,'{'],
-{Id:554},
-{Id:['ciA',555],'':556},
+['mk',549,'excluding'],
+['m',550,'{'],
+{Id:551},
+{Id:['ciA',552],'':553},
 {
-',':['c',554],
-'}':556,
+',':['c',551],
+'}':553,
 },
 ['m',0,'}',,,'afterBrace'],
 'selectItemsList',
-['m',559,'{',,'top','inSelectItem'],
+['m',556,'{',,'top','inSelectItem'],
 {
-'*':['c',560],
-Id:[560,568],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'':561
+'*':['c',557],
+Id:[557,565],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'':558
 },
 {
-',':['c',559],
-'}':561,
+',':['c',556],
+'}':558,
 },
 ['m',0,'}',,,'afterBrace'],
 'nestedSelectItemsList',
-['m',564,'{',,,'inSelectItem'],
+['m',561,'{',,,'inSelectItem'],
 {
-'*':['c',565],
-Id:[565,568],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'':566
+'*':['c',562],
+Id:[562,565],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'':563
 },
 {
-',':['c',564],
-'}':566,
+',':['c',561],
+'}':563,
 },
 ['m',0,'}',,,'afterBrace'],
 'selectItemDef',
-{'@':[568,775],'':569},
-{virtual:['ck',570,1,'modifierRestriction'],'':570},
-['g',571,,,'key','columnExpr'],
-{key:['ck',572,,'modifierRestriction'],'':572},
+{'@':[565,772],'':566},
+{virtual:['ck',567,1,'modifierRestriction'],'':567},
+['g',568,,,'key','columnExpr'],
+{key:['ck',569,,'modifierRestriction'],'':569},
 {
-'#':[573,642,1],'(':'#','+':'#','-':'#',':':'#','?':'#',new:'#',not:'#',case:'#',cast:'#',null:'#',true:'#',false:'#',Number:'#',String:'#',exists:'#',QuotedLiteral:'#',
-Id:[575,671],
-'{':[586,563],
+'#':[570,639,1],'(':'#','+':'#','-':'#',':':'#','?':'#',new:'#',not:'#',case:'#',cast:'#',null:'#',true:'#',false:'#',Number:'#',String:'#',exists:'#',QuotedLiteral:'#',
+Id:[572,668],
+'{':[583,560],
 },
 {
-as:['ck',574],
-Id:['ci',583],
-'':583
+as:['ck',571],
+Id:['ci',580,,'hide_'],
+'':580
 },
-['mi',583],
+['mi',580],
 {
-over:['ck',576],
-'*':[578,643],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
-as:['ck',580],
-Id:['ci',583,,,,'nestedExpand'],
-'.':['c',581],
-'':583
+over:['ck',573],
+'*':[575,640],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
+as:['ck',577],
+Id:['ci',580,,'hide_',,'nestedExpand'],
+'.':['c',578],
+'':580
 },
-[577,733],
-{'*':[578,643],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*','':578},
+[574,730],
+{'*':[575,640],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*','':575},
 {
-as:['ck',579],
-Id:['ci',583],
-'':583
+as:['ck',576],
+Id:['ci',580,,'hide_'],
+'':580
 },
-['mi',583],
-['mi',583,,,,'nestedExpand'],
+['mi',580],
+['mi',580,,,,'nestedExpand'],
 {
-'{':[582,563],
+'{':[579,560],
 '*':['c',0],
 },
-{excluding:[0,551],'':0},
-{'{':['g',584,,'nestedExpand'],'':589},
-[585,563],
-{excluding:[589,551],'':589},
-{excluding:[587,551],'':587},
-['mk',588,'as'],
-['mi',589],
-['g',590,,,,'columnExpr'],
-{'@':[590,778],'':591},
-{':':['c',592],'':0},
+{excluding:[0,548],'':0},
+{'{':['g',581,,'nestedExpand'],'':586},
+[582,560],
+{excluding:[586,548],'':586},
+{excluding:[584,548],'':584},
+['mk',585,'as'],
+['mi',586],
+['g',587,,,,'columnExpr'],
+{'@':[587,775],'':588},
+{':':['c',589],'':0},
 {
-Id:[605,358],'{':'Id',
-redirected:['ck',593,1],
-association:['ck',597,1,'columnExpr'],
-composition:['ck',599,1,'columnExpr'],
+Id:[602,357],'{':'Id',
+redirected:['ck',590,1],
+association:['ck',594,1,'columnExpr'],
+composition:['ck',596,1,'columnExpr'],
 },
-['mk',594,'to'],
-[595,39],
+['mk',591,'to'],
+[592,39],
 {
-on:['ck',596],
-'{':[605,194],
-'':605
+on:['ck',593],
+'{':[602,194],
+'':602
 },
-[605,640],
-{'[':[598,427],'':598},
-['mk',601,'to'],
-{'[':[600,427],'':600},
-['mk',601,'of'],
-{one:['ck',602,1,'noRepeatedCardinality'],many:'one','':602},
-[603,39],
-['mk',604,'on'],
-[605,640],
-['g',606],
-{'@':[606,772],'':0},
+[602,637],
+{'[':[595,426],'':595},
+['mk',598,'to'],
+{'[':[597,426],'':597},
+['mk',598,'of'],
+{one:['ck',599,1,'noRepeatedCardinality'],many:'one','':599},
+[600,39],
+['mk',601,'on'],
+[602,637],
+['g',603],
+{'@':[603,769],'':0},
 'whereGroupByHaving',
-{where:['ck',609],'':610},
-[610,640],
-{group:[611,614],'':611},
-{having:['ck',612],'':0},
-[0,640],
+{where:['ck',606],'':607},
+[607,637],
+{group:[608,611],'':608},
+{having:['ck',609],'':0},
+[0,637],
 'groupByClause',
-['mk',615,'group'],
-['mk',616,'by'],
-[617,642],
-{',':['c',618],'':0},
-[617,642],
+['mk',612,'group'],
+['mk',613,'by'],
+[614,639],
+{',':['c',615],'':0},
+[614,639],
 'orderByLimitOffset',
-{order:[621,626],'':621},
-{limit:['ck',622],'':0},
-[623,642],
-{offset:['ck',624],'':0},
-[0,642],
+{order:[618,623],'':618},
+{limit:['ck',619],'':0},
+[620,639],
+{offset:['ck',621],'':0},
+[0,639],
 'orderByClause',
-['mk',627,'order'],
-['mk',628,'by'],
-[629,632],
-{',':['c',630],'':0},
-[629,632],
+['mk',624,'order'],
+['mk',625,'by'],
+[626,629],
+{',':['c',627],'':0},
+[626,629],
 'orderByExpression',
-[633,642],
-{asc:['ck',634],desc:'asc','':634},
-{nulls:['ck',635],'':0},
+[630,639],
+{asc:['ck',631],desc:'asc','':631},
+{nulls:['ck',632],'':0},
 {last:['ck',0],first:'last'},
 'conditionEOF',
-[638,642],
+[635,639],
 ['m',0,'EOF'],
 'condition',
-[0,642],
+[0,639],
 'expression',
 {
-'(':[643,677],
-'#':[654,769],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
-':':['c',644],
-'?':['c',654,,'hide_'],
-Id:[646,671],
-new:['ck',649,1],
-exists:['ck',650],
-case:[654,689],
-cast:[654,700],
-'+':['c',653,,'precRight_',30],'-':'+',
-not:['ck',653,,'precRight_',8],
+'(':[640,674],
+'#':[651,766],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
+':':['c',641],
+'?':['c',651,,'hide_'],
+Id:[643,668],
+new:['ck',646,1],
+exists:['ck',647],
+case:[651,686],
+cast:[651,697],
+'+':['c',650,,'precRight_',30],'-':'+',
+not:['ck',650,,'precRight_',8],
 },
-['g',654],
+['g',651],
 {
-Id:['ciA',645],
-Number:['c',654,,'hide_'],
+Id:['ciA',642],
+Number:['c',651,,'hide_'],
 },
-{'.':[654,673],'':654},
-{over:['ck',647],'':648},
-[648,733],
-['g',654],
-[654,671],
+{'.':[651,670],'':651},
+{over:['ck',644],'':645},
+[645,730],
+['g',651],
+[651,668],
 {
-'(':['c',651],
-Id:[654,671],
-'?':['c',654,,'hide_'],
+'(':['c',648],
+Id:[651,668],
+'?':['c',651,,'hide_'],
 },
-[652,452],
-['m',654,')'],
-[654,642],
+[649,451],
+['m',651,')'],
+[651,639],
 {
-'*':['c',658,,'precLeft_',24],'/':'*',
-'+':['c',658,,'precLeft_',22],'-':'+',
-'||':['c',658,,'precLeft_',20],
-and:['ck',658,,'precLeft_',4],
-or:['ck',658,,'precLeft_',2],
-'?':['c',655,,'precRight_',0],
-'<':['c',657,,'precNone_',10],'=':'<','>':'<','!=':'<','<=':'<','<>':'<','>=':'<',
-'==':['c',658,,'precNone_',10],
-is:['ck',659,,'precNone_',10],
-not:['ck',661,,'isNegatedRelation',10],
-in:['g',661,,'precNone_',10],like:'in',between:'in',
+'*':['c',655,,'precLeft_',24],'/':'*',
+'+':['c',655,,'precLeft_',22],'-':'+',
+'||':['c',655,,'precLeft_',20],
+and:['ck',655,,'precLeft_',4],
+or:['ck',655,,'precLeft_',2],
+'?':['c',652,,'precRight_',0],
+'<':['c',654,,'precNone_',10],'=':'<','>':'<','!=':'<','<=':'<','<>':'<','>=':'<',
+'==':['c',655,,'precNone_',10],
+is:['ck',656,,'precNone_',10],
+not:['ck',658,,'isNegatedRelation',10],
+in:['g',658,,'precNone_',10],like:'in',between:'in',
 '':0
 },
-[656,642],
-['m',658,':'],
-{all:['ck',658],any:'all',some:'all','':658},
-[669,642],
-{not:['ck',660],'':660},
-['mk',669,'null'],
+[653,639],
+['m',655,':'],
+{all:['ck',655],any:'all',some:'all','':655},
+[666,639],
+{not:['ck',657],'':657},
+['mk',666,'null'],
 {
-between:['ck',662],
-in:['ck',665],
-like:['ck',666],
+between:['ck',659],
+in:['ck',662],
+like:['ck',663],
 },
-[663,642],
-['mk',664,'and'],
-[669,642],
-[669,642],
-[667,642],
-{escape:['ck',668],'':669},
-[669,642],
-['g',654],
+[660,639],
+['mk',661,'and'],
+[666,639],
+[666,639],
+[664,639],
+{escape:['ck',665],'':666},
+[666,639],
+['g',651],
 'valuePath',
-['mi',672],
-{'(':[673,707],'[':'(','':673},
-{'.':['c',674,,'isDotForPath'],'':0},
-['miA',675],
-{'(':[673,707],'[':'(','':673},
+['mi',669],
+{'(':[670,704],'[':'(','':670},
+{'.':['c',671,,'isDotForPath'],'':0},
+['miA',672],
+{'(':[670,704],'[':'(','':670},
 'expressionOrQueryParens',
-['m',678,'(',,,'queryOnLeft'],
+['m',675,'(',,,'queryOnLeft'],
 {
-'(':[679,677],
-Id:[681,642,,,'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:[682,452],
+'(':[676,674],
+Id:[678,639,,,'expr','queryOnLeft'],'#':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id',
+select:[679,451],
 },
 {
-'*':[680,643,,,'expr','queryOnLeft'],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
-',':[682,684,,,'expr','queryOnLeft'],
-limit:[682,455,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
-'':682
+'*':[677,640,,,'expr','queryOnLeft'],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
+',':[679,681,,,'expr','queryOnLeft'],
+limit:[679,454,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
+'':679
 },
-{',':[682,684],'':682},
-{',':[682,684],'':682},
+{',':[679,681],'':679},
+{',':[679,681],'':679},
 ['m',0,')'],
 'continueExpressionslist',
-['m',685,','],
-{Id:686,'#':686,'(':686,'+':686,'-':686,':':686,'?':686,not:686,case:686,cast:686,null:686,true:686,false:686,Number:686,String:686,exists:686,QuotedLiteral:686},
-{Id:[687,642],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id','':0},
-{',':['c',686],'':0},
+['m',682,','],
+{Id:683,'#':683,'(':683,'+':683,'-':683,':':683,'?':683,not:683,case:683,cast:683,null:683,true:683,false:683,Number:683,String:683,exists:683,QuotedLiteral:683},
+{Id:[684,639],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id','':0},
+{',':['c',683],'':0},
 'caseExpression',
-['mk',690,'case'],
-{Id:[691,642],'#':'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','':691},
-{when:692},
-{when:['ck',693],'':696},
-[694,642],
-['mk',695,'then'],
-[692,642],
-{else:['ck',697],'':698},
-[698,642],
+['mk',687,'case'],
+{Id:[688,639],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id','':688},
+{when:689},
+{when:['ck',690],'':693},
+[691,639],
+['mk',692,'then'],
+[689,639],
+{else:['ck',694],'':695},
+[695,639],
 ['mk',0,'end'],
 'castFunction',
-['mk',701,'cast'],
-['m',702,'('],
-[703,642],
-['mk',704,'as'],
-[705,404],
+['mk',698,'cast'],
+['m',699,'('],
+[700,639],
+['mk',701,'as'],
+[702,403],
 ['m',0,')'],
 'argumentsAndFilter',
-{'(':['c',708,,,,'prepareSpecialFunction'],'':726},
+{'(':['c',705,,,,'prepareSpecialFunction'],'':723},
 {
-')':725,
-Id:['ciA',709,,'isNamedArg'],
-'':718
+')':722,
+Id:['ciA',706,,'isNamedArg'],
+'':715
 },
 {
-':':['c',710],
-'=>':['c',714],
+':':['c',707],
+'=>':['c',711],
 },
-[711,642],
+[708,639],
 {
-',':['c',712],
-')':725,
+',':['c',709],
+')':722,
 },
 {
-Id:['ciA',713],
-')':725,
+Id:['ciA',710],
+')':722,
 },
-['m',710,':'],
-[715,642],
+['m',707,':'],
+[712,639],
 {
-',':['c',716],
-')':725,
+',':['c',713],
+')':722,
 },
 {
-Id:['ciA',717],
-')':725,
+Id:['ciA',714],
+')':722,
 },
-['m',714,'=>'],
-[719,728],
-{',':['c',720,,,,'nextFunctionArgument'],'':722},
-{')':['c',721],'':718},
-{'[':[0,536],'':0},
-{order:['ck',723],'':725},
-['mk',724,'by'],
-[725,748],
-['m',726,')'],
-{'[':[0,536],'':0},
+['m',711,'=>'],
+[716,725],
+{',':['c',717,,,,'nextFunctionArgument'],'':719},
+{')':['c',718],'':715},
+{'[':[0,535],'':0},
+{order:['ck',720],'':722},
+['mk',721,'by'],
+[722,745],
+['m',723,')'],
+{'[':[0,535],'':0},
 'funcExpression',
 {
 ' lookahead':'lGenericIntroOrExpr',
-Id:[730,642],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-GenericExpr:['ckA',730],
-GenericIntro:['ckA',729],
+Id:[727,639],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+GenericExpr:['ckA',727],
+GenericIntro:['ckA',726],
 },
-[730,642],
+[727,639],
 {
 ' lookahead':'lGenericSeparator',
-GenericSeparator:['ckA',731],
+GenericSeparator:['ckA',728],
 '':0
 },
 {
 ' lookahead':'lGenericExpr',
-Id:[730,642],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-GenericExpr:['ckA',730],
+Id:[727,639],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+GenericExpr:['ckA',727],
 },
 'overClause',
-['m',734,'('],
-{partition:['ck',735],'':737},
+['m',731,'('],
+{partition:['ck',732],'':734},
+['mk',733,'by'],
+[734,741],
+{order:['ck',735],'':737},
 ['mk',736,'by'],
-[737,744],
-{order:['ck',738],'':740},
-['mk',739,'by'],
-[740,748],
-{rows:['ck',741],'':742},
-[742,757],
+[737,745],
+{rows:['ck',738],'':739},
+[739,754],
 ['m',0,')'],
 'expressionsAsXpr',
-[745,642],
-{',':['c',746],'':0},
-[745,642],
+[742,639],
+{',':['c',743],'':0},
+[742,639],
 'orderByClauseAsXpr',
-[749,752],
-{',':['c',750],'':0},
-[749,752],
+[746,749],
+{',':['c',747],'':0},
+[746,749],
 'orderBySpecAsXpr',
-[753,642],
-{asc:['ck',754],desc:'asc','':754},
-{nulls:['ck',755],'':0},
+[750,639],
+{asc:['ck',751],desc:'asc','':751},
+{nulls:['ck',752],'':0},
 {last:['ck',0],first:'last'},
 'windowFrameClause',
 {
-unbounded:['ck',758],
-Number:['c',758],
-current:['ck',759],
-between:['ck',760],
+unbounded:['ck',755],
+Number:['c',755],
+current:['ck',756],
+between:['ck',757],
 },
 ['mk',0,'preceding'],
 ['mk',0,'row'],
-[761,764],
-['mk',762,'and'],
-[0,764],
+[758,761],
+['mk',759,'and'],
+[0,761],
 'windowFrameBoundSpec',
 {
-unbounded:['ck',765],
-Number:['c',765],
-current:['ck',767],
+unbounded:['ck',762],
+Number:['c',762],
+current:['ck',764],
 },
 {
-following:['ck',766],
-preceding:['ck',766],
+following:['ck',763],
+preceding:['ck',763],
 },
 ['g',0],
 ['mk',0,'row'],
 'literalValue',
 {
-'#':['c',770],
+'#':['c',767],
 null:['ck',0],
 true:['ck',0],false:'true',
 Number:['c',0],
@@ -1349,100 +1346,101 @@ QuotedLiteral:['c',0],
 },
 ['miA',0],
 'annoAssignStd',
-['m',773,'@',,,'annoInSameLine'],
+['m',770,'@',,,'annoInSameLine'],
 {
-'(':[0,781],
-Id:[0,786],
+'(':[0,778],
+Id:[0,783],
 },
 'annoAssignCol',
-['m',776,'@'],
+['m',773,'@'],
 {
-'(':[0,781],
-Id:[0,786],
+'(':[0,778],
+Id:[0,783],
 },
 'annoAssignMid',
-['m',779,'@',,,'annoInSameLine'],
+['m',776,'@',,,'annoInSameLine'],
 {
-'(':[0,781],
-Id:[0,790],
+'(':[0,778],
+Id:[0,787],
 },
 'annoAssignParen',
-['m',782,'(',,,'annoInSameLine'],
-{Id:[783,786],'':784},
+['m',779,'(',,,'annoInSameLine'],
+{Id:[780,783],'':781},
 {
-',':['c',782],
-')':784,
+',':['c',779],
+')':781,
 },
 ['m',0,')'],
 'annoAssignBase',
-[787,790],
-{':':['c',788,,'annoInSameLine'],'':0},
-[0,812],
+[784,787],
+{':':['c',785,,'annoInSameLine'],'':0},
+[0,809],
 'annoNamePath',
-['miA',791],
-{'.':['c',792],'':794},
+['miA',788],
+{'.':['c',789],'':791},
 {
-Id:['ciA',791],
-'@':['c',793],
+Id:['ciA',788],
+'@':['c',790],
 },
-['miA',791],
-{'#':[0,803,,'annoInSameLine'],'':0},
+['miA',788],
+{'#':[0,800,,'annoInSameLine'],'':0},
 'annoPath',
 {
-Id:['ciA',798],
-'@':['c',797],
+Id:['ciA',795],
+'@':['c',794],
 },
-['miA',798],
-{'.':['c',799],'':801},
+['miA',795],
+{'.':['c',796],'':798},
 {
-Id:['ciA',798],
-'@':['c',800],
+Id:['ciA',795],
+'@':['c',797],
 },
-['miA',798],
-{'#':[0,803],'':0},
+['miA',795],
+{'#':[0,800],'':0},
 'annoPathVariant',
-['m',804,'#'],
-['miA',805],
-{'.':['c',806],'':0},
-['miA',805],
+['m',801,'#'],
+['miA',802],
+{'.':['c',803],'':0},
+['miA',802],
 'annoStructValue',
-[809,796],
-{':':['c',810],'':0},
-[0,812],
+[806,793],
+{':':['c',807],'':0},
+[0,809],
 'annoValue',
 {
-'#':[0,769],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
-'+':['c',813],'-':'+',
-Id:[0,796],'@':'Id',
-'{':['c',814],
-'[':['c',817,,,,'arrayAnno'],
-'(':['c',823],
+'#':[0,766],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
+'+':['c',810],'-':'+',
+Id:[0,793],'@':'Id',
+'{':['c',811],
+'[':['c',814,,,,'arrayAnno'],
+'(':['c',820],
 },
 ['m',0,'Number'],
-{Id:[815,808],'@':'Id','':816},
+{Id:[812,805],'@':'Id','':813},
 {
-',':['c',814],
-'}':816,
-Id:['g',814,,'fail'],'@':'Id',
+',':['c',811],
+'}':813,
+Id:['g',811,,'fail'],'@':'Id',
 },
 ['m',0,'}','arrayAnno','orNotEmpty'],
 {
-Id:[821,812],'#':'Id','(':'Id','+':'Id','-':'Id','@':'Id','[':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'...':['c',818,,'arrayAnno','ellipsis'],
-'':822
+Id:[818,809],'#':'Id','(':'Id','+':'Id','-':'Id','@':'Id','[':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'...':['c',815,,'arrayAnno','ellipsis'],
+'':819
 },
 {
-up:['ck',819],
-',':821,']':821,
+up:['ck',816],
+',':818,']':818,
 },
-['mk',820,'to'],
-[821,812],
+['mk',817,'to'],
+[818,809],
 {
-',':['c',817],
-']':822,
+',':['c',814],
+']':819,
 },
 ['m',0,']','arrayAnno','bracket'],
-[824,640],
+{')':['c',0,,'fail'],'':821},
+[822,637],
 ['m',0,')'],
 ]
 class CdlParser extends AstBuildingParser{
@@ -1458,10 +1456,10 @@ case'using':this.usingDeclaration({source:$.source},2);continue
 case'@':case'type':case'view':case'event':case'action':case'aspect':case'define':case'entity':case'extend':case'context':case'service':case'abstract':case'annotate':case'function':case'annotation':if(this.artifactDefOrExtend({outer:$.source},2)){this.namespaceRestriction()}continue;
 default:this.s=3;continue
 }
-case 2:switch(this.l()){
+case 2:switch(this.lk()){
 case';':this.c(1);continue
 case'EOF':this.s=3;continue
-case'Id':case'@':if(this.ec('afterBrace')&&this.g(1)){ this.noAssignmentInSameLine(); }continue
+case'@':case'type':case'view':case'event':case'using':case'action':case'aspect':case'define':case'entity':case'extend':case'context':case'service':case'abstract':case'annotate':case'function':case'namespace':case'annotation':if(this.ec('afterBrace')&&this.g(1)){ this.noAssignmentInSameLine(); }continue
 default:this.e();continue
 }
 case 3:if(this.m(0,'EOF')){ this.docComment( null ); }continue
@@ -1476,10 +1474,10 @@ case 6:switch(this.l()){
 case'Id':case'@':this.artifactDefOrExtend({outer:$.art},7);continue
 default:this.s=8;continue
 }
-case 7:switch(this.l()){
+case 7:switch(this.lk()){
 case';':this.c(6);continue
 case'}':this.s=8;continue
-case'Id':case'@':if(this.ec('afterBrace')&&this.g(6)){ this.noAssignmentInSameLine(); }continue
+case'@':case'type':case'view':case'event':case'action':case'aspect':case'define':case'entity':case'extend':case'context':case'service':case'abstract':case'annotate':case'function':case'annotation':if(this.ec('afterBrace')&&this.g(6)){ this.noAssignmentInSameLine(); }continue
 default:this.e();continue
 }
 case 8:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.art.artifacts ); }continue
@@ -1924,10 +1922,10 @@ case 127:switch(this.l()){
 case'Id':case'@':this.boundActionFunctionDef({outer:$.art},128);continue
 default:this.s=129;continue
 }
-case 128:switch(this.l()){
+case 128:switch(this.lk()){
 case';':this.c(127);continue
 case'}':this.s=129;continue
-case'Id':case'@':if(this.ec('afterBrace')&&this.g(127)){ this.noAssignmentInSameLine(); }continue
+case'@':case'action':case'function':if(this.ec('afterBrace')&&this.g(127)){ this.noAssignmentInSameLine(); }continue
 default:this.e();continue
 }
 case 129:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.art.actions ); }continue
@@ -2044,11 +2042,11 @@ case 159:switch(this.l()){
 case'Id':case'@':this.elementDef({outer:$.art,art:undefined},160);continue
 default:this.s=161;continue
 }
-case 160:switch(this.l()){
+case 160:switch(this.lk()){
 case';':this.c(159);continue
 case'}':this.s=161;continue
-case'Id':case'@':if(this.ec('afterBrace')&&this.g(159)){ this.noAssignmentInSameLine(); }continue
-default:this.e();continue
+case'Id':case'@':case'key':if(this.ec('afterBrace')&&this.g(159)){ this.noAssignmentInSameLine(); }continue
+default:this.ei();continue
 }
 case 161:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.art.elements ); }continue
 default:return this.exit_()
@@ -2551,11 +2549,11 @@ case 298:switch(this.l()){
 case'Id':case'@':this.annotateBoundAction({outer:$.art},299);continue
 default:this.s=300;continue
 }
-case 299:switch(this.l()){
+case 299:switch(this.lk()){
 case';':this.c(298);continue
 case'}':this.s=300;continue
 case'Id':case'@':if(this.ec('afterBrace')&&this.g(298)){ this.noAssignmentInSameLine(); }continue
-default:this.e();continue
+default:this.ei();continue
 }
 case 300:if(this.m(0,'}')){this.afterBrace(); this.finalizeExtensionsDict( $.art.actions ); }continue
 default:return this.exit_()
@@ -2654,11 +2652,11 @@ case 322:switch(this.l()){
 case'Id':case'@':this.annotateElement({outer:$.art},323);continue
 default:this.s=324;continue
 }
-case 323:switch(this.l()){
+case 323:switch(this.lk()){
 case';':this.c(322);continue
 case'}':this.s=324;continue
 case'Id':case'@':if(this.ec('afterBrace')&&this.g(322)){ this.noAssignmentInSameLine(); }continue
-default:this.e();continue
+default:this.ei();continue
 }
 case 324:if(this.m(0,'}')){this.afterBrace(); this.finalizeExtensionsDict( $.art.elements ); }continue
 default:return this.exit_()
@@ -2696,11 +2694,11 @@ case 332:switch(this.l()){
 case'Id':case'@':this.elementDefOrExtend({outer:$.art},333);continue
 default:this.s=334;continue
 }
-case 333:switch(this.l()){
+case 333:switch(this.lk()){
 case';':this.c(332);continue
 case'}':this.s=334;continue
-case'Id':case'@':if(this.ec('afterBrace')&&this.g(332)){ this.noAssignmentInSameLine(); }continue
-default:this.e();continue
+case'Id':case'@':case'key':if(this.ec('afterBrace')&&this.g(332)){ this.noAssignmentInSameLine(); }continue
+default:this.ei();continue
 }
 case 334:if(this.m(0,'}')){this.afterBrace(); this.finalizeExtensionsDict( $.art.elements ); }continue
 default:return this.exit_()
@@ -2776,135 +2774,131 @@ case'Id':if(this.simplePath(_={category:'artref'},350)){ref=_.ref; $.art.type =
 default:this.ei();continue
 }
 case 350:switch(this.lk()){
-case'(':case':':this.typeRefOptArgs({art:$.art},351,405);continue
-case'@':case'not':case'enum':case'null':case'default':this.typeExpression({art:$.art},0,359);continue
-case',':case'{':this.s=352;{ $.art.includes = [ $.art.type ]; delete $.art.type; }continue
+case',':case'{':this.s=351;{ $.art.includes = [ $.art.type ]; delete $.art.type; }continue
+case'(':case':':this.typeRefOptArgs({art:$.art},355,404);continue
+case'@':case'not':case'enum':case'null':case'default':this.typeExpression({art:$.art},0,358);continue
 default:if(this.gr([';'])){ this.docComment( $.art ); }continue
 }
-case 351:switch(this.lk()){
-case'@':case'not':case'enum':case'null':case'default':this.typeExpression({art:$.art},0,359);continue
-default:if(this.gr([';'])){ this.docComment( $.art ); }continue
+case 351:switch(this.l()){
+case',':this.c(352);continue
+default:this.s=353;continue
 }
 case 352:switch(this.l()){
-case',':this.c(353);continue
-default:this.s=355;continue
-}
-case 353:switch(this.l()){
-case'Id':if(this.simplePath(_={category:'artref'},354)){ref=_.ref; $.art.includes.push( ref ); }continue
-default:this.s=355;continue
-}
-case 354:switch(this.l()){
-case',':this.c(353);continue
-case'{':this.s=355;continue
+case'Id':if(this.simplePath(_={category:'artref'},351)){ref=_.ref; $.art.includes.push( ref ); }continue
+case'{':this.s=353;continue
 default:this.e();continue
 }
-case 355:this.elementsBlock({art:$.art},356);continue
-case 356:switch(this.lk()){
+case 353:this.elementsBlock({art:$.art},354);continue
+case 354:switch(this.lk()){
 case'not':case'null':this.nullability({art:$.art},0);continue
 default:this.gr([';']);continue
 }
+case 355:switch(this.lk()){
+case'@':case'not':case'enum':case'null':case'default':this.typeExpression({art:$.art},0,358);continue
+default:if(this.gr([';'])){ this.docComment( $.art ); }continue
+}
 default:return this.exit_()
 }
 }
 typeExpression($,$next,$startState){
 let expr;let assoc;let card;let _
-this.rule_($startState??358,$next)
+this.rule_($startState??357,$next)
 for(;;)switch(this.s){
-case 358:switch(this.lk()){
-case'Id':this.typeRefOptArgs({art:$.art},359);continue
-case'type':this.lP()&&this.typeTypeOf({art:$.art},359);continue
-case'localized':if(this.ckP(368,['Id'])){ $.art.localized = this.valueWithLocation( true ); }continue
-case'association':if(this.ckP(370,['[','to'])){assoc=this.lb();this.elementRestriction('calc')}continue;
-case'composition':if(this.ckP(374,['[','of'])){assoc=this.lb();this.elementRestriction('calc')}continue;
-case'array':if(this.ckP(378,['of'])){this.elementRestriction('calc')}continue;
-case'many':if(this.ckP(379,['Id','{'])){this.elementRestriction('calc'); $.art.items = { location: this.lb().location }; }continue
-case'{':if(this.elementsBlock({art:$.art},384)){this.elementRestriction('calc')}continue;
+case 357:switch(this.lk()){
+case'Id':this.typeRefOptArgs({art:$.art},358);continue
+case'type':this.lP()&&this.typeTypeOf({art:$.art},358);continue
+case'localized':if(this.ckP(367,['Id'])){ $.art.localized = this.valueWithLocation( true ); }continue
+case'association':if(this.ckP(369,['[','to'])){assoc=this.lb();this.elementRestriction('calc')}continue;
+case'composition':if(this.ckP(373,['[','of'])){assoc=this.lb();this.elementRestriction('calc')}continue;
+case'array':if(this.ckP(377,['of'])){this.elementRestriction('calc')}continue;
+case'many':if(this.ckP(378,['Id','{'])){this.elementRestriction('calc'); $.art.items = { location: this.lb().location }; }continue
+case'{':if(this.elementsBlock({art:$.art},383)){this.elementRestriction('calc')}continue;
 default:this.ei();continue
 }
-case 359:this.s=360;{ this.docComment( $.art ); }continue
-case 360:switch(this.l()){
-case'@':this.annoAssignStd({art:$.art},360);continue
-default:this.s=361;continue
+case 358:this.s=359;{ this.docComment( $.art ); }continue
+case 359:switch(this.l()){
+case'@':this.annoAssignStd({art:$.art},359);continue
+default:this.s=360;continue
 }
-case 361:switch(this.lk()){
-case'not':case'null':if(this.gc(363,'elementRestriction','notNull')&&this.nullability({art:$.art},362)){ this.docComment( $.art ); }continue
-default:this.s=363;continue
+case 360:switch(this.lk()){
+case'not':case'null':if(this.gc(362,'elementRestriction','notNull')&&this.nullability({art:$.art},361)){ this.docComment( $.art ); }continue
+default:this.s=362;continue
 }
-case 362:switch(this.l()){
-case'@':this.annoAssignStd({art:$.art},362);continue
-default:this.s=363;continue
+case 361:switch(this.l()){
+case'@':this.annoAssignStd({art:$.art},361);continue
+default:this.s=362;continue
 }
-case 363:switch(this.lk()){
-case'enum':if(this.enumSymbolsBlock({art:$.art},364)){this.elementRestriction('anno')}continue;
+case 362:switch(this.lk()){
+case'enum':if(this.enumSymbolsBlock({art:$.art},363)){this.elementRestriction('anno')}continue;
 case'@':case'not':case'null':case'default':this.typeProperties({art:$.art},0);continue
 default:this.gr();continue
 }
-case 364:switch(this.lk()){
-case'not':case'null':this.gc(365,'elementRestriction','notNull')&&this.nullability({art:$.art},365);continue
-default:this.s=365;continue
+case 363:switch(this.lk()){
+case'not':case'null':this.gc(364,'elementRestriction','notNull')&&this.nullability({art:$.art},364);continue
+default:this.s=364;continue
 }
-case 365:switch(this.lk()){
-case'default':this.gc(367,'elementRestriction','default')&&this.ck(366);continue
-default:this.s=367;continue
+case 364:switch(this.lk()){
+case'default':this.gc(366,'elementRestriction','default')&&this.ck(365);continue
+default:this.s=366;continue
 }
-case 366:if(this.expression(_={},367)){expr=_.expr; $.art.default = expr; }continue
-case 367:switch(this.lk()){
+case 365:if(this.expression(_={},366)){expr=_.expr; $.art.default = expr; }continue
+case 366:switch(this.lk()){
 case'not':case'null':this.gc(0,'elementRestriction','notNull')&&this.nullability({art:$.art},0);continue
 default:this.gr();continue
 }
-case 368:if(this.typeRefOptArgs({art:$.art},369)){ this.docComment( $.art ); }continue
-case 369:switch(this.lk()){
+case 367:if(this.typeRefOptArgs({art:$.art},368)){ this.docComment( $.art ); }continue
+case 368:switch(this.lk()){
 case'@':case'not':case'null':case'default':this.typeProperties({art:$.art},0);continue
 default:this.gr();continue
 }
-case 370:switch(this.l()){
-case'[':this.cardinality({art:$.art},371);continue
-default:this.s=371;continue
+case 369:switch(this.l()){
+case'[':this.cardinality({art:$.art},370);continue
+default:this.s=370;continue
 }
-case 371:this.mk(372,'to');continue
-case 372:switch(this.lk()){
-case'one':case'many':if(this.lP(['Id'])&&this.gc(373,'noRepeatedCardinality')&&this.ck(373))card=this.lb();continue
-default:this.s=373;continue
+case 370:this.mk(371,'to');continue
+case 371:switch(this.lk()){
+case'one':case'many':if(this.lP(['Id'])&&this.gc(372,'noRepeatedCardinality')&&this.ck(372))card=this.lb();continue
+default:this.s=372;continue
 }
-case 373:this.typeAssocProperties({art:$.art,assoc,card},0);continue
-case 374:switch(this.l()){
-case'[':this.cardinality({art:$.art},375);continue
-default:this.s=375;continue
+case 372:this.typeAssocProperties({art:$.art,assoc,card},0);continue
+case 373:switch(this.l()){
+case'[':this.cardinality({art:$.art},374);continue
+default:this.s=374;continue
 }
-case 375:this.mk(376,'of');continue
-case 376:switch(this.lk()){
-case'one':case'many':if(this.lP(['Id','{'])&&this.gc(377,'noRepeatedCardinality')&&this.ck(377))card=this.lb();continue
-default:this.s=377;continue
+case 374:this.mk(375,'of');continue
+case 375:switch(this.lk()){
+case'one':case'many':if(this.lP(['Id','{'])&&this.gc(376,'noRepeatedCardinality')&&this.ck(376))card=this.lb();continue
+default:this.s=376;continue
 }
-case 377:switch(this.l()){
+case 376:switch(this.l()){
 case'Id':this.typeAssocProperties({art:$.art,assoc,card},0);continue
 case'{':if(this.elementsBlock({art:this.setAssocAndComposition( $.art, assoc, card )},0)){ $.art.target.location = $.art.target.elements[Symbol.for('cds.$location')]; }continue
 default:this.e();continue
 }
-case 378:if(this.mk(379,'of')){ $.art.items = { location: this.locationOfPrevTokens( 2 ) }; }continue
-case 379:switch(this.lk()){
-case'Id':this.typeRefOptArgs({art:$.art.items},380);continue
-case'type':this.lP()&&this.typeTypeOf({art:$.art.items},380);continue
-case'{':this.elementsBlock({art:$.art.items},383);continue
+case 377:if(this.mk(378,'of')){ $.art.items = { location: this.locationOfPrevTokens( 2 ) }; }continue
+case 378:switch(this.lk()){
+case'Id':this.typeRefOptArgs({art:$.art.items},379);continue
+case'type':this.lP()&&this.typeTypeOf({art:$.art.items},379);continue
+case'{':this.elementsBlock({art:$.art.items},382);continue
 default:this.ei();continue
 }
-case 380:switch(this.lk()){
-case'not':case'null':this.gc(381,'elementRestriction','notNull')&&this.nullability({art:$.art.items},381);continue
-default:this.s=381;continue
+case 379:switch(this.lk()){
+case'not':case'null':this.gc(380,'elementRestriction','notNull')&&this.nullability({art:$.art.items},380);continue
+default:this.s=380;continue
 }
-case 381:switch(this.lk()){
-case'enum':this.enumSymbolsBlock({art:$.art.items},383);continue
-default:this.s=382;{ this.docComment( $.art ); }continue
+case 380:switch(this.lk()){
+case'enum':this.enumSymbolsBlock({art:$.art.items},382);continue
+default:this.s=381;{ this.docComment( $.art ); }continue
 }
-case 382:switch(this.l()){
-case'@':this.annoAssignStd({art:$.art},382);continue
+case 381:switch(this.l()){
+case'@':this.annoAssignStd({art:$.art},381);continue
 default:this.gr();continue
 }
-case 383:switch(this.lk()){
+case 382:switch(this.lk()){
 case'not':case'null':this.gc(0,'elementRestriction','notNull')&&this.nullability({art:$.art.items},0);continue
 default:this.gr();continue
 }
-case 384:switch(this.lk()){
+case 383:switch(this.lk()){
 case'not':case'null':this.nullability({art:$.art},0);continue
 default:this.gr();continue
 }
@@ -2913,27 +2907,27 @@ default:return this.exit_()
 }
 typeAssocProperties($,$next){
 let target;let cond;let _
-this.rule_(386,$next)
+this.rule_(385,$next)
 for(;;)switch(this.s){
-case 386:if(this.simplePath(_={category:'artref'},387)){target=_.ref; this.setAssocAndComposition( $.art, $.assoc, $.card, target );
+case 385:if(this.simplePath(_={category:'artref'},386)){target=_.ref; this.setAssocAndComposition( $.art, $.assoc, $.card, target );
 this.docComment( $.art ); }continue
-case 387:switch(this.l()){
-case'@':this.annoAssignStd({art:$.art},387);continue
-default:this.s=388;continue
+case 386:switch(this.l()){
+case'@':this.annoAssignStd({art:$.art},386);continue
+default:this.s=387;continue
 }
-case 388:switch(this.lk()){
-case'on':this.ck(389);continue
-case'{':if(this.foreignKeysBlock({art:$.art},391)){ this.docComment( $.art ); }continue
+case 387:switch(this.lk()){
+case'on':this.ck(388);continue
+case'{':if(this.foreignKeysBlock({art:$.art},390)){ this.docComment( $.art ); }continue
 case'@':case'not':case'null':case'default':this.typeProperties({art:$.art},0);continue
 default:this.gr();continue
 }
-case 389:if(this.condition(_={},390)){cond=_.expr; $.art.on = cond;
+case 388:if(this.condition(_={},389)){cond=_.expr; $.art.on = cond;
 this.docComment( $.art ); }continue
-case 390:switch(this.l()){
-case'@':this.annoAssignStd({art:$.art},390);continue
+case 389:switch(this.l()){
+case'@':this.annoAssignStd({art:$.art},389);continue
 default:this.gr();continue
 }
-case 391:switch(this.lk()){
+case 390:switch(this.lk()){
 case'@':case'not':case'null':case'default':this.typeProperties({art:$.art},0);continue
 default:this.gr();continue
 }
@@ -2942,113 +2936,113 @@ default:return this.exit_()
 }
 typeProperties($,$next){
 let expr;let _
-this.rule_(393,$next)
+this.rule_(392,$next)
 for(;;)switch(this.s){
-case 393:switch(this.lk()){
-case'@':this.annoAssignStd({art:$.art},393);continue
-case'not':case'null':if(this.gc(0,'elementRestriction','notNull')&&this.nullability({art:$.art},393)){ this.docComment( $.art ); }continue
-case'default':this.gc(0,'elementRestriction','default')&&this.ck(394);continue
+case 392:switch(this.lk()){
+case'@':this.annoAssignStd({art:$.art},392);continue
+case'not':case'null':if(this.gc(0,'elementRestriction','notNull')&&this.nullability({art:$.art},392)){ this.docComment( $.art ); }continue
+case'default':this.gc(0,'elementRestriction','default')&&this.ck(393);continue
 default:this.gr();continue
 }
-case 394:if(this.expression(_={},393)){expr=_.expr; $.art.default = expr; this.docComment( $.art ); }continue
+case 393:if(this.expression(_={},392)){expr=_.expr; $.art.default = expr; this.docComment( $.art ); }continue
 default:return this.exit_()
 }
 }
 typeTypeOf($,$next){
 let location
 let type;let _
-this.rule_(396,$next)
+this.rule_(395,$next)
 for(;;)switch(this.s){
-case 396:this.mk(397,'type');continue
-case 397:if(this.mk(398,'of')){ location = this.locationOfPrevTokens( 2 ); }continue
-case 398:if(this.simplePath(_={category:'ref'},399)){type=_.ref; $.art.type = type; }continue
-case 399:switch(this.l()){
-case':':if(this.c(400)){ type.scope = type.path.length; }continue
+case 395:this.mk(396,'type');continue
+case 396:if(this.mk(397,'of')){ location = this.locationOfPrevTokens( 2 ); }continue
+case 397:if(this.simplePath(_={category:'ref'},398)){type=_.ref; $.art.type = type; }continue
+case 398:switch(this.l()){
+case':':if(this.c(399)){ type.scope = type.path.length; }continue
 default:if(this.gr(['@','not','enum','null'])){ type.scope = 'typeOf'; type.path.unshift( { id: 'type of', location } ); }continue
 }
-case 400:if(this.miA(401,'ref')){ type.path.push( this.identAst() ); }continue
-case 401:switch(this.l()){
-case'.':this.c(402);continue
+case 399:if(this.miA(400,'ref')){ type.path.push( this.identAst() ); }continue
+case 400:switch(this.l()){
+case'.':this.c(401);continue
 default:this.gr(['@','not','enum','null']);continue
 }
-case 402:if(this.miA(401,'ref')){ type.path.push( this.identAst() ); }continue
-case 0:
+case 401:if(this.miA(400,'ref')){ type.path.push( this.identAst() ); }continue
+default:
 this.attachLocation( $.art.type )
-default:return this.exit_()
+return this.exit_()
 }
 }
 typeRefOptArgs($,$next,$startState){
 let type=$.art.type
 let open;let tok;let _
-this.rule_($startState??404,$next)
+this.rule_($startState??403,$next)
 for(;;)switch(this.s){
-case 404:if(this.simplePath(_={category:'artref'},405)){type=_.ref; $.art.type = type; }continue
-case 405:switch(this.l()){
-case':':if(this.c(406)){ type.scope = type.path.length; }continue
-case'(':if(this.c(410))open=this.lb();continue
+case 403:if(this.simplePath(_={category:'artref'},404)){type=_.ref; $.art.type = type; }continue
+case 404:switch(this.l()){
+case':':if(this.c(405)){ type.scope = type.path.length; }continue
+case'(':if(this.c(409))open=this.lb();continue
 default:this.gr();continue
 }
-case 406:if(this.miA(407,'ref')){ type.path.push( this.identAst() ); }continue
-case 407:switch(this.l()){
-case'.':this.c(408);continue
-default:this.s=409;continue
+case 405:if(this.miA(406,'ref')){ type.path.push( this.identAst() ); }continue
+case 406:switch(this.l()){
+case'.':this.c(407);continue
+default:this.s=408;continue
 }
-case 408:if(this.miA(407,'ref')){ type.path.push( this.identAst() ); }continue
-case 409:if(this.gr()){ this.attachLocation( $.art.type ); }continue
-case 410:switch(this.lk()){
-case'Number':if(this.c(411)){ $.art.$typeArgs = this.createArray( open );
+case 407:if(this.miA(406,'ref')){ type.path.push( this.identAst() ); }continue
+case 408:if(this.gr()){ this.attachLocation( $.art.type ); }continue
+case 409:switch(this.lk()){
+case'Number':if(this.c(410)){ $.art.$typeArgs = this.createArray( open );
 $.art.$typeArgs.push( this.unsignedIntegerLiteral() ); }continue
-case'Id':this.s=414;{ $.art.$typeArgs = this.createDict( open ); }continue
+case'Id':this.s=413;{ $.art.$typeArgs = this.createDict( open ); }continue
 default:this.ei();continue
 }
-case 411:switch(this.l()){
-case',':this.c(412);continue
-default:this.s=413;continue
+case 410:switch(this.l()){
+case',':this.c(411);continue
+default:this.s=412;continue
 }
-case 412:switch(this.lk()){
-case'Number':if(this.c(411)){ $.art.$typeArgs.push( this.unsignedIntegerLiteral() ); }continue
-case'floating':case'variable':if(this.ck(411)){tok=this.lb(); $.art.$typeArgs.push( { literal: 'string', val: tok.keyword, location: tok.location } ); }continue
-case')':this.s=413;continue
+case 411:switch(this.lk()){
+case'Number':if(this.c(410)){ $.art.$typeArgs.push( this.unsignedIntegerLiteral() ); }continue
+case'floating':case'variable':if(this.ck(410)){tok=this.lb(); $.art.$typeArgs.push( { literal: 'string', val: tok.keyword, location: tok.location } ); }continue
+case')':this.s=412;continue
 default:this.e();continue
 }
-case 413:this.s=416;{ this.checkTypeArgs( $.art ); }continue
-case 414:switch(this.l()){
-case'Id':this.typeNamedArg({art:$.art},415);continue
-default:this.s=416;continue
+case 412:this.s=415;{ this.checkTypeArgs( $.art ); }continue
+case 413:switch(this.l()){
+case'Id':this.typeNamedArg({art:$.art},414);continue
+default:this.s=415;continue
 }
-case 415:switch(this.l()){
-case',':this.c(414);continue
-case')':this.s=416;continue
+case 414:switch(this.l()){
+case',':this.c(413);continue
+case')':this.s=415;continue
 default:this.e();continue
 }
-case 416:if(this.m(0,')')){ if ($.art.$typeArgs) this.finalizeDictOrArray( $.art.$typeArgs ); }continue
+case 415:if(this.m(0,')')){ if ($.art.$typeArgs) this.finalizeDictOrArray( $.art.$typeArgs ); }continue
 default:return this.exit_()
 }
 }
 typeNamedArgsList($,$next){
-this.rule_(418,$next)
+this.rule_(417,$next)
 for(;;)switch(this.s){
-case 418:if(this.m(419,'(')){ $.art.$typeArgs = this.createDict(); }continue
-case 419:switch(this.l()){
-case'Id':this.typeNamedArg({art:$.art},420);continue
-default:this.s=421;continue
+case 417:if(this.m(418,'(')){ $.art.$typeArgs = this.createDict(); }continue
+case 418:switch(this.l()){
+case'Id':this.typeNamedArg({art:$.art},419);continue
+default:this.s=420;continue
 }
-case 420:switch(this.l()){
-case',':this.c(419);continue
-case')':this.s=421;continue
+case 419:switch(this.l()){
+case',':this.c(418);continue
+case')':this.s=420;continue
 default:this.e();continue
 }
-case 421:if(this.m(0,')')){ this.finalizeDictOrArray( $.art.$typeArgs ); }continue
+case 420:if(this.m(0,')')){ this.finalizeDictOrArray( $.art.$typeArgs ); }continue
 default:return this.exit_()
 }
 }
 typeNamedArg($,$next){
 let name;let tok
-this.rule_(423,$next)
+this.rule_(422,$next)
 for(;;)switch(this.s){
-case 423:if(this.mi(424,'typeparamname'))name=this.lb();continue
-case 424:this.m(425,':');continue
-case 425:switch(this.lk()){
+case 422:if(this.mi(423,'typeparamname'))name=this.lb();continue
+case 423:this.m(424,':');continue
+case 424:switch(this.lk()){
 case'Number':if(this.c(0)){ this.setTypeFacet( $.art, name, this.unsignedIntegerLiteral() ); }continue
 case'floating':case'variable':if(this.ck(0)){tok=this.lb(); this.setTypeFacet( $.art, name, { literal: 'string', val: tok.keyword, location: tok.location } ); }continue
 default:this.e();continue
@@ -3058,45 +3052,45 @@ default:return this.exit_()
 }
 cardinality($,$next){
 let card={}
-this.rule_(427,$next)
+this.rule_(426,$next)
 for(;;)switch(this.s){
-case 427:this.m(428,'[');continue
-case 428:switch(this.l()){
-case'*':if(this.c(429)){ card.targetMax = this.valueWithLocation(); }continue
-case'Number':if(this.c(431)){ card.targetMax = this.unsignedIntegerLiteral(); }continue
-case']':this.s=433;{ card.targetMax = this.valueWithLocation( '*' ); }continue
+case 426:this.m(427,'[');continue
+case 427:switch(this.l()){
+case'*':if(this.c(428)){ card.targetMax = this.valueWithLocation(); }continue
+case'Number':if(this.c(430)){ card.targetMax = this.unsignedIntegerLiteral(); }continue
+case']':this.s=432;{ card.targetMax = this.valueWithLocation( '*' ); }continue
 default:this.e();continue
 }
-case 429:switch(this.l()){
-case',':this.c(430);continue
-default:this.s=433;continue
+case 428:switch(this.l()){
+case',':this.c(429);continue
+default:this.s=432;continue
 }
-case 430:this.targetCardinality({card,atAlt:false},433);continue
-case 431:switch(this.l()){
-case',':this.c(432);continue
-case'..':this.targetCardinality({card,atAlt:false},433,436);continue
-default:this.s=433;continue
+case 429:this.targetCardinality({card,atAlt:false},432);continue
+case 430:switch(this.l()){
+case',':this.c(431);continue
+case'..':this.targetCardinality({card,atAlt:false},432,435);continue
+default:this.s=432;continue
 }
-case 432:this.targetCardinality({card,atAlt:false},433);continue
-case 433:this.m(0,']');continue
+case 431:this.targetCardinality({card,atAlt:false},432);continue
+case 432:this.m(0,']');continue
 default:
 $.art.cardinality = this.attachLocation(card)
 return this.exit_()
 }
 }
 targetCardinality($,$next,$startState){
-this.rule_($startState??435,$next)
+this.rule_($startState??434,$next)
 for(;;)switch(this.s){
-case 435:switch(this.l()){
+case 434:switch(this.l()){
 case'*':if(this.c(0)){ $.card.sourceMax = $.card.targetMax; $.card.targetMax = this.valueWithLocation(); }continue
-case'Number':if(this.c(436)){ $.card.sourceMax = $.card.targetMax; $.card.targetMax = this.unsignedIntegerLiteral(); }continue
+case'Number':if(this.c(435)){ $.card.sourceMax = $.card.targetMax; $.card.targetMax = this.unsignedIntegerLiteral(); }continue
 default:this.e();continue
 }
-case 436:switch(this.l()){
-case'..':if(this.c(437)){ $.card.targetMin = $.card.targetMax; }continue
+case 435:switch(this.l()){
+case'..':if(this.c(436)){ $.card.targetMin = $.card.targetMax; }continue
 default:this.gr([']']);continue
 }
-case 437:switch(this.l()){
+case 436:switch(this.l()){
 case'*':if(this.c(0)){ $.card.targetMax = this.valueWithLocation(); }continue
 case'Number':if(this.c(0)){ $.card.targetMax = this.unsignedIntegerLiteral(); }continue
 default:this.e();continue
@@ -3105,44 +3099,44 @@ default:return this.exit_()
 }
 }
 nullability($,$next){
-this.rule_(439,$next)
+this.rule_(438,$next)
 for(;;)switch(this.s){
-case 439:switch(this.lk()){
+case 438:switch(this.lk()){
 case'null':if(this.ck(0)){ this.setNullability( $.art, false ); }continue
-case'not':this.ck(440);continue
+case'not':this.ck(439);continue
 default:this.e();continue
 }
-case 440:if(this.mk(0,'null')){ this.setNullability( $.art, true, this.locationOfPrevTokens( 2 ) ); }continue
+case 439:if(this.mk(0,'null')){ this.setNullability( $.art, true, this.locationOfPrevTokens( 2 ) ); }continue
 default:return this.exit_()
 }
 }
 queryEOF($,$next){
 $.query??=undefined
 let _
-this.rule_(442,$next)
+this.rule_(441,$next)
 for(;;)switch(this.s){
-case 442:if(this.queryExpression(_={},443))$.query=_.expr;continue
-case 443:switch(this.l()){
-case';':this.c(444);continue
-default:this.s=444;continue
+case 441:if(this.queryExpression(_={},442))$.query=_.expr;continue
+case 442:switch(this.l()){
+case';':this.c(443);continue
+default:this.s=443;continue
 }
-case 444:this.m(0,'EOF');continue
+case 443:this.m(0,'EOF');continue
 default:return this.exit_()
 }
 }
 projectionSpec($,$next){
 $.query??={}
 let tab;let _
-this.rule_(446,$next)
+this.rule_(445,$next)
 for(;;)switch(this.s){
-case 446:if(this.mk(447,'projection')){ $.query = { op: this.valueWithLocation( 'SELECT' ) }; }continue
-case 447:this.mk(448,'on');continue
-case 448:if(this.fromRefWithOptAlias(_={},449)){tab=_.expr; $.query.from = tab; }continue
-case 449:switch(this.l()){
-case'{':this.selectItemsList({query:$.query,start:undefined},450);continue
-default:this.s=450;continue
-}
-case 450:switch(this.lk()){
+case 445:if(this.mk(446,'projection')){ $.query = { op: this.valueWithLocation( 'SELECT' ) }; }continue
+case 446:this.mk(447,'on');continue
+case 447:if(this.fromRefWithOptAlias(_={},448)){tab=_.expr; $.query.from = tab; }continue
+case 448:switch(this.l()){
+case'{':this.selectItemsList({query:$.query,start:undefined},449);continue
+default:this.s=449;continue
+}
+case 449:switch(this.lk()){
 case'excluding':this.excludingClause({query:$.query},0);continue
 default:this.gr([';']);continue
 }
@@ -3155,33 +3149,33 @@ queryExpression($,$next,$startState){
 $.expr??={}
 let op;let quantifier
 let query;let _
-this.rule_($startState??452,$next)
+this.rule_($startState??451,$next)
 for(;;)switch(this.s){
-case 452:switch(this.l()){
-case'(':this.c(453);continue
-case'Id':if(this.selectQuery(_={},455)){$.expr=_.query;this.orderByLimitRestriction()}continue;
+case 451:switch(this.l()){
+case'(':this.c(452);continue
+case'Id':if(this.selectQuery(_={},454)){$.expr=_.query;this.orderByLimitRestriction()}continue;
 default:this.e();continue
 }
-case 453:this.queryExpression($,454);continue
-case 454:if(this.m(455,')')){ this.surroundByParens( $.expr ); }continue
+case 452:this.queryExpression($,453);continue
+case 453:if(this.m(454,')')){ this.surroundByParens( $.expr ); }continue
+case 454:switch(this.lk()){
+case'intersect':if(this.gc(458,'precLeft_',4)&&this.ck(455)){ op = this.valueWithLocation(); }continue
+case'minus':case'except':if(this.gc(458,'precLeft_',2)&&this.ck(455)){ op = this.valueWithLocation(); }continue
+case'union':if(this.gc(458,'precLeft_',2)&&this.ck(456)){ op = this.valueWithLocation(); }continue
+default:this.s=458;continue
+}
 case 455:switch(this.lk()){
-case'intersect':if(this.gc(459,'precLeft_',4)&&this.ck(456)){ op = this.valueWithLocation(); }continue
-case'minus':case'except':if(this.gc(459,'precLeft_',2)&&this.ck(456)){ op = this.valueWithLocation(); }continue
-case'union':if(this.gc(459,'precLeft_',2)&&this.ck(457)){ op = this.valueWithLocation(); }continue
-default:this.s=459;continue
+case'distinct':if(this.ck(457)){ quantifier = this.valueWithLocation(); }continue
+default:this.s=457;continue
 }
 case 456:switch(this.lk()){
-case'distinct':if(this.ck(458)){ quantifier = this.valueWithLocation(); }continue
-default:this.s=458;continue
+case'all':case'distinct':if(this.ck(457)){ quantifier = this.valueWithLocation(); }continue
+default:this.s=457;continue
 }
-case 457:switch(this.lk()){
-case'all':case'distinct':if(this.ck(458)){ quantifier = this.valueWithLocation(); }continue
-default:this.s=458;continue
-}
-case 458:if(this.queryExpression(_={},455)){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 } };
+case 457:if(this.queryExpression(_={},454)){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 459:switch(this.lk()){
+case 458:switch(this.lk()){
 case'limit':case'order':this.gc(0,'orderByLimitRestriction')&&this.orderByLimitOffset({query:$.expr},0);continue
 default:this.gr();continue
 }
@@ -3192,62 +3186,62 @@ return this.exit_()
 }
 selectQuery($,$next){
 $.query??={}
-this.rule_(461,$next)
+this.rule_(460,$next)
 for(;;)switch(this.s){
-case 461:if(this.mk(462,'select')){ $.query = { op: this.valueWithLocation( 'SELECT' ) }; }continue
-case 462:switch(this.lk()){
-case'from':this.ck(463);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=473;continue
-case'all':case'distinct':if(this.ck(473)){ $.query.quantifier = this.valueWithLocation(); }continue
+case 460:if(this.mk(461,'select')){ $.query = { op: this.valueWithLocation( 'SELECT' ) }; }continue
+case 461:switch(this.lk()){
+case'from':this.ck(462);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=472;continue
+case'all':case'distinct':if(this.ck(472)){ $.query.quantifier = this.valueWithLocation(); }continue
 default:this.ei();continue
 }
-case 463:this.querySource({query:$.query},464);continue
-case 464:switch(this.lk()){
-case'mixin':this.ck(465);continue
-default:this.s=470;continue
+case 462:this.querySource({query:$.query},463);continue
+case 463:switch(this.lk()){
+case'mixin':this.ck(464);continue
+default:this.s=469;continue
 }
-case 465:if(this.m(466,'{')){ $.query.mixin = this.createDict(); }continue
-case 466:switch(this.l()){
-case'Id':this.mixinElementDef({outer:$.query},467);continue
-default:this.s=468;continue
+case 464:if(this.m(465,'{')){ $.query.mixin = this.createDict(); }continue
+case 465:switch(this.l()){
+case'Id':this.mixinElementDef({outer:$.query},466);continue
+default:this.s=467;continue
 }
-case 467:switch(this.l()){
-case';':this.c(466);continue
-case'}':this.s=468;continue
+case 466:switch(this.l()){
+case';':this.c(465);continue
+case'}':this.s=467;continue
 default:this.e();continue
 }
-case 468:if(this.m(469,'}')){ this.finalizeDictOrArray( $.query.mixin ); }continue
-case 469:this.mk(470,'into');continue
-case 470:switch(this.lk()){
-case'all':case'distinct':if(this.ck(471)){ $.query.quantifier = this.valueWithLocation(); }continue
+case 467:if(this.m(468,'}')){ this.finalizeDictOrArray( $.query.mixin ); }continue
+case 468:this.mk(469,'into');continue
+case 469:switch(this.lk()){
+case'all':case'distinct':if(this.ck(470)){ $.query.quantifier = this.valueWithLocation(); }continue
+default:this.s=470;continue
+}
+case 470:switch(this.l()){
+case'{':this.selectItemsList({query:$.query,start:undefined},471);continue
 default:this.s=471;continue
 }
-case 471:switch(this.l()){
-case'{':this.selectItemsList({query:$.query,start:undefined},472);continue
-default:this.s=472;continue
+case 471:switch(this.lk()){
+case'excluding':this.excludingClause({query:$.query},478);continue
+default:this.s=478;continue
 }
-case 472:switch(this.lk()){
-case'excluding':this.excludingClause({query:$.query},479);continue
-default:this.s=479;continue
+case 472:this.s=473;{this.inSelectItem('sqlStyle')}continue;
+case 473:switch(this.l()){
+case'*':if(this.c(474)){ $.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 = [])},474);continue
+default:this.e();continue
 }
-case 473:this.s=474;{this.inSelectItem('sqlStyle')}continue;
 case 474:switch(this.l()){
-case'*':if(this.c(475)){ $.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 = [])},475);continue
-default:this.e();continue
+case',':this.c(475);continue
+default:this.s=476;continue
 }
 case 475:switch(this.l()){
-case',':this.c(476);continue
-default:this.s=477;continue
-}
-case 476:switch(this.l()){
-case'*':if(this.c(475)){ $.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},475);continue
+case'*':if(this.c(474)){ $.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},474);continue
 default:this.e();continue
 }
-case 477:this.mk(478,'from');continue
-case 478:this.querySource({query:$.query},479);continue
-case 479:switch(this.lk()){
+case 476:this.mk(477,'from');continue
+case 477:this.querySource({query:$.query},478);continue
+case 478: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
 }
@@ -3258,112 +3252,112 @@ return this.exit_()
 }
 querySource($,$next){
 let tab;let _
-this.rule_(481,$next)
+this.rule_(480,$next)
 for(;;)switch(this.s){
-case 481:if(this.tableExpression(_={},482)){tab=_.expr; $.query.from = tab; }continue
-case 482:switch(this.l()){
-case',':this.s=483;{ const { location } = this.la();
+case 480:if(this.tableExpression(_={},481)){tab=_.expr; $.query.from = tab; }continue
+case 481:switch(this.l()){
+case',':this.s=482;{ 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 483:switch(this.l()){
-case',':this.c(484);continue
+case 482:switch(this.l()){
+case',':this.c(483);continue
 default:this.gr(['group','limit','minus','order','union','where','except','having','intersect']);continue
 }
-case 484:if(this.tableExpression(_={},483)){tab=_.expr; $.query.from.args.push( tab ); }continue
-case 0:
+case 483:if(this.tableExpression(_={},482)){tab=_.expr; $.query.from.args.push( tab ); }continue
+default:
 this.attachLocation($.query.from)
-default:return this.exit_()
+return this.exit_()
 }
 }
 tableExpression($,$next,$startState){
 $.expr??={}
 let join;let tab;let card;let cond;let _
-this.rule_($startState??486,$next)
+this.rule_($startState??485,$next)
 for(;;)switch(this.s){
-case 486:switch(this.l()){
-case'(':this.tableOrQueryParens($,487);continue
-case'Id':this.fromRefWithOptAlias($,488);continue
+case 485:switch(this.l()){
+case'(':this.tableOrQueryParens($,486);continue
+case'Id':this.fromRefWithOptAlias($,487);continue
 default:this.e();continue
 }
-case 487:this.s=488;{ $.expr = this.taggedIfQuery( $.expr ); }continue
-case 488:switch(this.lk()){
-case'cross':if(this.ck(489))join=this.lb();continue
-case'inner':if(this.ck(492))join=this.lb();continue
-case'full':case'left':case'right':if(this.ck(491))join=this.lb();continue
-case'join':if(this.ck(494)){ join = undefined; }continue
+case 486:this.s=487;{ $.expr = this.taggedIfQuery( $.expr ); }continue
+case 487:switch(this.lk()){
+case'cross':if(this.ck(488))join=this.lb();continue
+case'inner':if(this.ck(491))join=this.lb();continue
+case'full':case'left':case'right':if(this.ck(490))join=this.lb();continue
+case'join':if(this.ck(493)){ join = undefined; }continue
 default:this.gr();continue
 }
-case 489:if(this.mk(490,'join')){ if ($.expr?.join?.val !== 'cross' || $.expr.$parens) $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( undefined, join ), args: [ $.expr ] }; }continue
-case 490:switch(this.l()){
-case'(':if(this.tableOrQueryParens(_={},488)){tab=_.expr; const r = this.taggedIfQuery( tab ); if (r) $.expr.args.push( r );
+case 488:if(this.mk(489,'join')){ if ($.expr?.join?.val !== 'cross' || $.expr.$parens) $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( undefined, join ), args: [ $.expr ] }; }continue
+case 489:switch(this.l()){
+case'(':if(this.tableOrQueryParens(_={},487)){tab=_.expr; const r = this.taggedIfQuery( tab ); if (r) $.expr.args.push( r );
 this.attachLocation( $.expr ); }continue
-case'Id':if(this.fromRefWithOptAlias(_={},488)){tab=_.expr; if (tab) $.expr.args.push( tab );
+case'Id':if(this.fromRefWithOptAlias(_={},487)){tab=_.expr; if (tab) $.expr.args.push( tab );
 this.attachLocation( $.expr ); }continue
 default:this.e();continue
 }
+case 490:switch(this.lk()){
+case'outer':this.ck(491);continue
+default:this.s=491;continue
+}
 case 491:switch(this.lk()){
-case'outer':this.ck(492);continue
+case'one':case'many':case'exact':this.joinCardinality(card={},492);continue
 default:this.s=492;continue
 }
-case 492:switch(this.lk()){
-case'one':case'many':case'exact':this.joinCardinality(card={},493);continue
-default:this.s=493;continue
-}
-case 493:this.mk(494,'join');continue
-case 494:this.s=495;{ $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( join?.keyword || 'inner', join ), args: [ $.expr ] }; if (card) $.expr.cardinality = card; card = undefined; }continue
-case 495:if(this.tableExpression(_={},496)){tab=_.expr; $.expr.args.push( tab ); this.attachLocation( $.expr ); }continue
-case 496:this.mk(497,'on');continue
-case 497:if(this.condition(_={},488)){cond=_.expr; $.expr.on = cond;
+case 492:this.mk(493,'join');continue
+case 493:this.s=494;{ $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( join?.keyword || 'inner', join ), args: [ $.expr ] }; if (card) $.expr.cardinality = card; card = undefined; }continue
+case 494:if(this.tableExpression(_={},495)){tab=_.expr; $.expr.args.push( tab ); this.attachLocation( $.expr ); }continue
+case 495:this.mk(496,'on');continue
+case 496:if(this.condition(_={},487)){cond=_.expr; $.expr.on = cond;
 this.attachLocation( $.expr ); }continue
 default:return this.exit_()
 }
 }
 tableOrQueryParens($,$next){
 $.expr??=undefined
-this.rule_(499,$next)
+this.rule_(498,$next)
 for(;;)switch(this.s){
-case 499:if(this.m(500,'(')){this.queryOnLeft()}continue;
-case 500:switch(this.lk()){
-case'(':this.tableOrQueryParens($,501);continue
-case'Id':if(this.tableExpression($,502)){this.queryOnLeft('table')}continue;
-case'select':this.queryExpression($,502);continue
+case 498:if(this.m(499,'(')){this.queryOnLeft()}continue;
+case 499:switch(this.lk()){
+case'(':this.tableOrQueryParens($,500);continue
+case'Id':if(this.tableExpression($,501)){this.queryOnLeft('table')}continue;
+case'select':this.queryExpression($,501);continue
 default:this.ei();continue
 }
-case 501:switch(this.lk()){
-case'full':case'join':case'left':case'cross':case'inner':case'right':if(this.tableExpression($,502,487)){this.queryOnLeft('table')}continue;
-case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(502,'queryOnLeft')&&this.queryExpression($,502,455);continue
-default:this.s=502;continue
+case 500:switch(this.lk()){
+case'full':case'join':case'left':case'cross':case'inner':case'right':if(this.tableExpression($,501,486)){this.queryOnLeft('table')}continue;
+case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(501,'queryOnLeft')&&this.queryExpression($,501,454);continue
+default:this.s=501;continue
 }
-case 502:if(this.m(503,')')){ this.surroundByParens( $.expr ); }continue
-case 503:switch(this.lk()){
-case'as':this.gc(0,'queryOnLeft','table')&&this.ck(504);continue
+case 501:if(this.m(502,')')){ this.surroundByParens( $.expr ); }continue
+case 502:switch(this.lk()){
+case'as':this.gc(0,'queryOnLeft','table')&&this.ck(503);continue
 case'Id':if(this.gc(0,'queryOnLeftSloppyAlias')&&this.ci(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.fragileAlias(); }continue
 default:this.gi(0,['full','join','left','cross','inner','right']);continue
 }
-case 504:if(this.mi(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.identAst(); }continue
+case 503: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_(506,$next)
+this.rule_(505,$next)
 for(;;)switch(this.s){
-case 506:switch(this.lk()){
-case'one':this.s=507;continue
-case'exact':if(this.ck(507)){ $.sourceMin = this.valueWithLocation( 1 ); }continue
-case'many':if(this.ck(508)){ $.sourceMax = this.valueWithLocation( '*' ); }continue
+case 505:switch(this.lk()){
+case'one':this.s=506;continue
+case'exact':if(this.ck(506)){ $.sourceMin = this.valueWithLocation( 1 ); }continue
+case'many':if(this.ck(507)){ $.sourceMax = this.valueWithLocation( '*' ); }continue
 default:this.e();continue
 }
-case 507:if(this.mk(508,'one')){ $.sourceMax = this.valueWithLocation( 1 ); }continue
-case 508:this.mk(509,'to');continue
-case 509:switch(this.lk()){
-case'one':this.s=510;continue
-case'exact':if(this.ck(510)){ $.targetMin = this.valueWithLocation( 1 ); }continue
+case 506:if(this.mk(507,'one')){ $.sourceMax = this.valueWithLocation( 1 ); }continue
+case 507:this.mk(508,'to');continue
+case 508:switch(this.lk()){
+case'one':this.s=509;continue
+case'exact':if(this.ck(509)){ $.targetMin = this.valueWithLocation( 1 ); }continue
 case'many':if(this.ck(0)){ $.targetMax = this.valueWithLocation( '*' ); }continue
 default:this.e();continue
 }
-case 510:if(this.mk(0,'one')){ $.targetMax = this.valueWithLocation( 1 ); }continue
+case 509:if(this.mk(0,'one')){ $.targetMax = this.valueWithLocation( 1 ); }continue
 default:
 this.attachLocation( $ )
 return this.exit_()
@@ -3371,25 +3365,25 @@ return this.exit_()
 }
 fromRefWithOptAlias($,$next){
 $.expr??={}
-this.rule_(512,$next)
+this.rule_(511,$next)
 { $.expr.path = []; }
 for(;;)switch(this.s){
-case 512:this.fromPath({table:$.expr,category:'artref'},513);continue
-case 513:switch(this.l()){
-case':':if(this.c(514)){ if (!$.expr.scope) $.expr.scope = $.expr.path.length; else {
+case 511:this.fromPath({table:$.expr,category:'artref'},512);continue
+case 512:switch(this.l()){
+case':':if(this.c(513)){ if (!$.expr.scope) $.expr.scope = $.expr.path.length; else {
 this.warning( 'syntax-invalid-path-separator', this.lb(),
 { '#': 'colon', code: ':', newcode: '.' } );
 } }continue
-default:this.s=515;continue
+default:this.s=514;continue
 }
-case 514:this.fromPath({table:$.expr,category:'ref'},515);continue
-case 515:switch(this.lk()){
-case'as':this.ck(516);continue
-case'Id':if(this.gc(517,'isNoKeywordInRuleFollow')&&this.ci(0,'FromAlias')){ $.expr.name = this.fragileAlias(); }continue
-default:this.gi(517);continue
+case 513:this.fromPath({table:$.expr,category:'ref'},514);continue
+case 514:switch(this.lk()){
+case'as':this.ck(515);continue
+case'Id':if(this.gc(516,'isNoKeywordInRuleFollow')&&this.ci(0,'FromAlias')){ $.expr.name = this.fragileAlias(); }continue
+default:this.gi(516);continue
 }
-case 516:if(this.mi(0,'FromAlias')){ $.expr.name = this.identAst(); }continue
-case 517:if(this.gr()){ this.classifyImplicitName( $.expr.scope ? 'FromElemImplicit' : 'FromImplicit', $.expr ); }continue
+case 515:if(this.mi(0,'FromAlias')){ $.expr.name = this.identAst(); }continue
+case 516:if(this.gr()){ this.classifyImplicitName( $.expr.scope ? 'FromElemImplicit' : 'FromImplicit', $.expr ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -3397,25 +3391,25 @@ return this.exit_()
 }
 fromPath($,$next){
 let pathItem
-this.rule_(519,$next)
+this.rule_(518,$next)
 for(;;)switch(this.s){
-case 519:if(this.mi(520,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
-case 520:switch(this.l()){
-case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},521)){ pathItem = null; }continue
-default:this.s=521;continue
+case 518:if(this.mi(519,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
+case 519:switch(this.l()){
+case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},520)){ pathItem = null; }continue
+default:this.s=520;continue
 }
-case 521:switch(this.l()){
-case'.':if(this.gc(0,'notAfterEntityArgOrFilter')&&this.c(522)){ if (!pathItem && !$.table.scope) {
+case 520:switch(this.l()){
+case'.':if(this.gc(0,'notAfterEntityArgOrFilter')&&this.c(521)){ 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 522:if(this.miA(523,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
-case 523:switch(this.l()){
-case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},521)){ pathItem = null; }continue
-default:this.s=521;continue
+case 521:if(this.miA(522,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
+case 522:switch(this.l()){
+case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},520)){ pathItem = null; }continue
+default:this.s=520;continue
 }
 default:
 this.attachLocation( $.table.path )
@@ -3423,27 +3417,27 @@ return this.exit_()
 }
 }
 fromArgumentsAndFilter($,$next){
-this.rule_(525,$next)
+this.rule_(524,$next)
 for(;;)switch(this.s){
-case 525:switch(this.l()){
-case'(':if(this.c(526)){ $.pathStep.args = this.createDict(); $.pathStep.$syntax = ':'; }continue
-default:this.s=530;continue
+case 524:switch(this.l()){
+case'(':if(this.c(525)){ $.pathStep.args = this.createDict(); $.pathStep.$syntax = ':'; }continue
+default:this.s=529;continue
 }
-case 526:switch(this.lk()){
-case'Id':this.s=527;continue
+case 525:switch(this.lk()){
+case'Id':this.s=526;continue
 default:this.ei();continue
 }
-case 527:switch(this.l()){
-case'Id':this.fromNamedArgument($,528);continue
-default:this.s=529;continue
+case 526:switch(this.l()){
+case'Id':this.fromNamedArgument($,527);continue
+default:this.s=528;continue
 }
-case 528:switch(this.l()){
-case',':this.c(527);continue
-case')':this.s=529;continue
+case 527:switch(this.l()){
+case',':this.c(526);continue
+case')':this.s=528;continue
 default:this.e();continue
 }
-case 529:this.m(530,')');continue
-case 530:switch(this.l()){
+case 528:this.m(529,')');continue
+case 529:switch(this.l()){
 case'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['Id','.','as']);continue
 }
@@ -3452,236 +3446,229 @@ default:return this.exit_()
 }
 fromNamedArgument($,$next){
 let name;let expr;let _
-this.rule_(532,$next)
+this.rule_(531,$next)
 for(;;)switch(this.s){
-case 532:if(this.mi(533,'paramname'))name=this.lb();continue
-case 533:this.m(534,':');continue
-case 534:if(this.expression(_={},0)){expr=_.expr; this.addDef( expr, $.pathStep, 'args', 0, this.identAst( name ) ); }continue
+case 531:if(this.mi(532,'paramname'))name=this.lb();continue
+case 532:this.m(533,':');continue
+case 533:if(this.expression(_={},0)){expr=_.expr; this.addDef( expr, $.pathStep, 'args', 0, this.identAst( name ) ); }continue
 default:return this.exit_()
 }
 }
 cardinalityAndFilter($,$next){
-this.rule_(536,$next)
+let cond;let _
+this.rule_(535,$next)
 for(;;)switch(this.s){
-case 536:this.m(537,'[');continue
-case 537:switch(this.l()){
-case'Number':if(this.gc(539,'beforeColon')&&this.c(538)){ $.pathStep.cardinality = { targetMax: this.unsignedIntegerLiteral(), location: this.lb().location }; }continue
+case 535:this.m(536,'[');continue
+case 536:switch(this.l()){
+case'Number':if(this.gc(538,'beforeColon')&&this.c(537)){ $.pathStep.cardinality = { targetMax: this.unsignedIntegerLiteral(), location: this.lb().location }; }continue
+default:this.s=538;continue
+}
+case 537:this.m(538,':');continue
+case 538:switch(this.lk()){
+case'group':case'limit':case'order':case'having':this.gP(540);continue
+case'where':this.ck(539);continue
+case']':if(this.c(0)){ $.pathStep.where ??= { args: [] }; }continue
 default:this.s=539;continue
 }
-case 538:this.m(539,':');continue
-case 539:this.filterClauses({pathStep:$.pathStep},540);continue
-case 540:this.m(0,']');continue
-default:return this.exit_()
+case 539:if(this.condition(_={},540)){cond=_.expr; $.pathStep.where = cond; }continue
+case 540:switch(this.lk()){
+case'group':this.s=541;{ this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'group by' }); }continue
+default:this.s=542;continue
 }
-}
-filterClauses($,$next){
-let cond;let _
-this.rule_(542,$next)
-for(;;)switch(this.s){
+case 541:this.groupByClause({query:$.pathStep},542);continue
 case 542:switch(this.lk()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':this.s=543;continue
-case'where':this.ck(543);continue
-case'group':case'limit':case'order':case'having':this.gP(544);continue
-default:this.gi(544);continue
-}
-case 543:if(this.condition(_={},544)){cond=_.expr; $.pathStep.where = cond; }continue
-case 544:switch(this.lk()){
-case'group':this.s=545;{ this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'group by' }); }continue
-default:this.s=546;continue
+case'having':if(this.ck(543)){ this.csnParseOnly('syntax-unexpected-sql-clause', -1, { keyword: 'having' }); }continue
+default:this.s=544;continue
 }
-case 545:this.groupByClause({query:$.pathStep},546);continue
-case 546:switch(this.lk()){
-case'having':if(this.ck(547)){ this.csnParseOnly('syntax-unexpected-sql-clause', -1, { keyword: 'having' }); }continue
-default:this.s=548;continue
-}
-case 547:if(this.condition(_={},548)){cond=_.expr; $.pathStep.having = cond; }continue
-case 548:switch(this.l()){
-case'Id':this.s=549;{ 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 543:if(this.condition(_={},544)){cond=_.expr; $.pathStep.having = cond; }continue
+case 544:switch(this.l()){
+case'Id':this.s=545;{ if (this.lk() === 'limit') this.csnParseOnly('syntax-unexpected-sql-clause', 0, { keyword: 'limit' } ); else this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'order by' } ); }continue
+default:this.s=546;continue
 }
-case 549:this.orderByLimitOffset({query:$.pathStep},0);continue
+case 545:this.orderByLimitOffset({query:$.pathStep},546);continue
+case 546:this.m(0,']');continue
 default:return this.exit_()
 }
 }
 excludingClause($,$next){
-this.rule_(551,$next)
+this.rule_(548,$next)
 for(;;)switch(this.s){
-case 551:if(this.mk(552,'excluding')){ $.query.excludingDict = this.createDict(); }continue
-case 552:this.m(553,'{');continue
-case 553:switch(this.l()){
-case'Id':this.s=554;continue
+case 548:if(this.mk(549,'excluding')){ $.query.excludingDict = this.createDict(); }continue
+case 549:this.m(550,'{');continue
+case 550:switch(this.l()){
+case'Id':this.s=551;continue
 default:this.e();continue
 }
-case 554:switch(this.l()){
-case'Id':if(this.ciA(555,'ref')){ this.addDef( { location: this.lb().location }, $.query, 'excludingDict', '', this.identAst() ); }continue
-default:this.s=556;continue
+case 551:switch(this.l()){
+case'Id':if(this.ciA(552,'ref')){ this.addDef( { location: this.lb().location }, $.query, 'excludingDict', '', this.identAst() ); }continue
+default:this.s=553;continue
 }
-case 555:switch(this.l()){
-case',':this.c(554);continue
-case'}':this.s=556;continue
+case 552:switch(this.l()){
+case',':this.c(551);continue
+case'}':this.s=553;continue
 default:this.e();continue
 }
-case 556:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.excludingDict ); }continue
+case 553:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.excludingDict ); }continue
 default:return this.exit_()
 }
 }
 selectItemsList($,$next){
-this.rule_(558,$next)
+this.rule_(555,$next)
 for(;;)switch(this.s){
-case 558:if(this.m(559,'{')){this.inSelectItem('top'); $.query.columns = this.createArray( $.start ); }continue
-case 559:switch(this.l()){
-case'*':if(this.c(560)){ $.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},560);continue
-default:this.s=561;continue
-}
-case 560:switch(this.l()){
-case',':this.c(559);continue
-case'}':this.s=561;continue
+case 555:if(this.m(556,'{')){this.inSelectItem('top'); $.query.columns = this.createArray( $.start ); }continue
+case 556:switch(this.l()){
+case'*':if(this.c(557)){ $.query.columns.push( this.valueWithLocation() ); }continue
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query.columns},557);continue
+default:this.s=558;continue
+}
+case 557:switch(this.l()){
+case',':this.c(556);continue
+case'}':this.s=558;continue
 default:this.e();continue
 }
-case 561:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.columns ); }continue
+case 558:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.columns ); }continue
 default:return this.exit_()
 }
 }
 nestedSelectItemsList($,$next){
-this.rule_(563,$next)
+this.rule_(560,$next)
 for(;;)switch(this.s){
-case 563:if(this.m(564,'{')){this.inSelectItem(); $.query[$.clause] = this.createArray(); }continue
-case 564:switch(this.l()){
-case'*':if(this.c(565)){ $.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]},565);continue
-default:this.s=566;continue
-}
-case 565:switch(this.l()){
-case',':this.c(564);continue
-case'}':this.s=566;continue
+case 560:if(this.m(561,'{')){this.inSelectItem(); $.query[$.clause] = this.createArray(); }continue
+case 561:switch(this.l()){
+case'*':if(this.c(562)){ $.query[$.clause].push( this.valueWithLocation() ); }continue
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query[$.clause]},562);continue
+default:this.s=563;continue
+}
+case 562:switch(this.l()){
+case',':this.c(561);continue
+case'}':this.s=563;continue
 default:this.e();continue
 }
-case 566:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query[$.clause] ); }continue
+case 563: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_(568,$next)
+this.rule_(565,$next)
 { $.columns.push( art );
 this.docComment( art ); }
 for(;;)switch(this.s){
-case 568:switch(this.l()){
-case'@':this.annoAssignCol({art},568);continue
+case 565:switch(this.l()){
+case'@':this.annoAssignCol({art},565);continue
+default:this.s=566;continue
+}
+case 566:switch(this.lk()){
+case'virtual':if(this.lP(['Id','#','(','+','-',':','?','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'])&&this.gc(567,'modifierRestriction')&&this.ck(567)){ art.virtual = this.valueWithLocation( true ); }continue
+default:this.s=567;continue
+}
+case 567:this.s=568;{this.columnExpr('key')}continue;
+case 568:switch(this.lk()){
+case'key':if(this.gc(569,'modifierRestriction')&&this.ck(569)){ art.key = this.valueWithLocation( true ); }continue
 default:this.s=569;continue
 }
 case 569:switch(this.lk()){
-case'virtual':if(this.lP(['Id','#','(','+','-',':','?','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'])&&this.gc(570,'modifierRestriction')&&this.ck(570)){ art.virtual = this.valueWithLocation( true ); }continue
-default:this.s=570;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(_={},570)){expr=_.expr; art.value = expr; }continue
+case'Id':if(this.valuePath(_={},572)){expr=_.expr; expr = this.valuePathAst( expr ); art.value = expr; }continue
+case'{':this.nestedSelectItemsList({query:art,clause:'expand'},583);continue
+default:this.ei();continue
 }
-case 570:this.s=571;{this.columnExpr('key')}continue;
-case 571:switch(this.lk()){
-case'key':if(this.gc(572,'modifierRestriction')&&this.ck(572)){ art.key = this.valueWithLocation( true ); }continue
-default:this.s=572;continue
+case 570:switch(this.lk()){
+case'as':this.ck(571);continue
+case'Id':if(this.ci(580,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
+default:this.gi(580);continue
 }
+case 571:if(this.mi(580,'ItemAlias')){ art.name = this.identAst(); }continue
 case 572:switch(this.lk()){
-case'#':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(_={},573)){expr=_.expr; art.value = expr; }continue
-case'Id':if(this.valuePath(_={},575)){expr=_.expr; expr = this.valuePathAst( expr ); art.value = expr; }continue
-case'{':this.nestedSelectItemsList({query:art,clause:'expand'},586);continue
-default:this.ei();continue
+case'over':if(this.ck(573)){ this.pushXprToken( expr.suffix = [] ); }continue
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },575,640)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
+case'as':this.ck(577);continue
+case'Id':if(this.ci(580,'ItemAlias')){this.nestedExpand(); art.name = this.fragileAlias( true ); }continue
+case'.':if(this.c(578)){ this.reportUnexpectedSpace( this.lb(), this.la().location, true );
+this.reportExpandInline( art, true ); }continue
+default:if(this.gi(580)){this.nestedExpand(); this.virtualOrImplicit( art ); }continue
 }
-case 573:switch(this.lk()){
-case'as':this.ck(574);continue
-case'Id':if(this.ci(583,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
-default:this.gi(583);continue
+case 573:this.overClause({outer:expr.suffix},574);continue
+case 574:switch(this.lk()){
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },575,640)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
+default:this.s=575;continue
 }
-case 574:if(this.mi(583,'ItemAlias')){ art.name = this.identAst(); }continue
 case 575:switch(this.lk()){
-case'over':if(this.ck(576)){ 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 },578,643)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
-case'as':this.ck(580);continue
-case'Id':if(this.ci(583,'ItemAlias')){this.nestedExpand(); art.name = this.fragileAlias( true ); }continue
-case'.':if(this.c(581)){ this.reportUnexpectedSpace( this.lb(), this.la().location, true );
-this.reportExpandInline( art, true ); }continue
-default:if(this.gi(583)){this.nestedExpand(); this.virtualOrImplicit( art ); }continue
-}
-case 576:this.overClause({outer:expr.suffix},577);continue
-case 577: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 },578,643)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
-default:this.s=578;continue
-}
-case 578:switch(this.lk()){
-case'as':this.ck(579);continue
-case'Id':if(this.ci(583,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
-default:this.gi(583);continue
-}
-case 579:if(this.mi(583,'ItemAlias')){ art.name = this.identAst(); }continue
-case 580:if(this.mi(583,'ItemAlias')){this.nestedExpand(); art.name = this.identAst(); }continue
-case 581:switch(this.l()){
-case'{':this.nestedSelectItemsList({query:art,clause:'inline'},582);continue
+case'as':this.ck(576);continue
+case'Id':if(this.ci(580,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
+default:this.gi(580);continue
+}
+case 576:if(this.mi(580,'ItemAlias')){ art.name = this.identAst(); }continue
+case 577:if(this.mi(580,'ItemAlias')){this.nestedExpand(); art.name = this.identAst(); }continue
+case 578:switch(this.l()){
+case'{':this.nestedSelectItemsList({query:art,clause:'inline'},579);continue
 case'*':if(this.c(0)){ art.inline = [ this.valueWithLocation() ]; }continue
 default:this.e();continue
 }
-case 582:switch(this.lk()){
+case 579:switch(this.lk()){
 case'excluding':this.excludingClause({query:art},0);continue
 default:this.gr([',']);continue
 }
-case 583:switch(this.l()){
-case'{':if(this.gc(589,'nestedExpand')&&this.g(584)){ if (!this.nestedExpand(0,true)) this.reportExpandInline( art, false ); }continue
-default:this.s=589;continue
+case 580:switch(this.l()){
+case'{':if(this.gc(586,'nestedExpand')&&this.g(581)){ if (!this.nestedExpand(0,true)) this.reportExpandInline( art, false ); }continue
+default:this.s=586;continue
 }
-case 584:this.nestedSelectItemsList({query:art,clause:'expand'},585);continue
-case 585:switch(this.lk()){
-case'excluding':this.excludingClause({query:art},589);continue
-default:this.s=589;continue
-}
-case 586:switch(this.lk()){
-case'excluding':this.excludingClause({query:art},587);continue
-default:this.s=587;continue
-}
-case 587:this.mk(588,'as');continue
-case 588:if(this.mi(589,'ItemAlias')){ art.name = this.identAst(); }continue
-case 589:this.s=590;{this.columnExpr(); this.docComment( art ); }continue
-case 590:switch(this.l()){
-case'@':this.annoAssignMid({art},590);continue
-default:this.s=591;continue
-}
-case 591:switch(this.l()){
-case':':this.c(592);continue
+case 581:this.nestedSelectItemsList({query:art,clause:'expand'},582);continue
+case 582:switch(this.lk()){
+case'excluding':this.excludingClause({query:art},586);continue
+default:this.s=586;continue
+}
+case 583:switch(this.lk()){
+case'excluding':this.excludingClause({query:art},584);continue
+default:this.s=584;continue
+}
+case 584:this.mk(585,'as');continue
+case 585:if(this.mi(586,'ItemAlias')){ art.name = this.identAst(); }continue
+case 586:this.s=587;{this.columnExpr(); this.docComment( art ); }continue
+case 587:switch(this.l()){
+case'@':this.annoAssignMid({art},587);continue
+default:this.s=588;continue
+}
+case 588:switch(this.l()){
+case':':this.c(589);continue
 default:this.gr([',']);continue
 }
-case 592:switch(this.lk()){
-case'Id':case'{':this.typeExpression({art},605);continue
-case'redirected':this.ckP(593,['to']);continue
-case'association':if(this.lP(['[','to'])&&this.ec('columnExpr')&&this.ck(597)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
-case'composition':if(this.lP(['[','of'])&&this.ec('columnExpr')&&this.ck(599)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
+case 589:switch(this.lk()){
+case'Id':case'{':this.typeExpression({art},602);continue
+case'redirected':this.ckP(590,['to']);continue
+case'association':if(this.lP(['[','to'])&&this.ec('columnExpr')&&this.ck(594)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
+case'composition':if(this.lP(['[','of'])&&this.ec('columnExpr')&&this.ck(596)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
 default:this.ei();continue
 }
-case 593:this.mk(594,'to');continue
-case 594:if(this.simplePath(_={category:'artref'},595)){target=_.ref; art.target = target; }continue
-case 595:switch(this.lk()){
-case'on':this.ck(596);continue
-case'{':this.foreignKeysBlock({art},605);continue
-default:this.s=605;continue
-}
-case 596:if(this.condition(_={},605)){cond=_.expr; art.on = cond; }continue
-case 597:switch(this.l()){
-case'[':this.cardinality({art},598);continue
-default:this.s=598;continue
-}
-case 598:this.mk(601,'to');continue
-case 599:switch(this.l()){
-case'[':this.cardinality({art},600);continue
-default:this.s=600;continue
-}
-case 600:this.mk(601,'of');continue
-case 601:switch(this.lk()){
-case'one':case'many':if(this.lP(['Id'])&&this.gc(602,'noRepeatedCardinality')&&this.ck(602))card=this.lb();continue
+case 590:this.mk(591,'to');continue
+case 591:if(this.simplePath(_={category:'artref'},592)){target=_.ref; art.target = target; }continue
+case 592:switch(this.lk()){
+case'on':this.ck(593);continue
+case'{':this.foreignKeysBlock({art},602);continue
 default:this.s=602;continue
 }
-case 602:if(this.simplePath(_={category:'artref'},603)){target=_.ref; this.setAssocAndComposition( art, assoc, card, target ); }continue
-case 603:this.mk(604,'on');continue
-case 604:if(this.condition(_={},605)){expr=_.expr; art.on = expr; }continue
-case 605:this.s=606;{ this.docComment( art ); }continue
-case 606:switch(this.l()){
-case'@':this.annoAssignStd({art},606);continue
+case 593:if(this.condition(_={},602)){cond=_.expr; art.on = cond; }continue
+case 594:switch(this.l()){
+case'[':this.cardinality({art},595);continue
+default:this.s=595;continue
+}
+case 595:this.mk(598,'to');continue
+case 596:switch(this.l()){
+case'[':this.cardinality({art},597);continue
+default:this.s=597;continue
+}
+case 597:this.mk(598,'of');continue
+case 598:switch(this.lk()){
+case'one':case'many':if(this.lP(['Id'])&&this.gc(599,'noRepeatedCardinality')&&this.ck(599))card=this.lb();continue
+default:this.s=599;continue
+}
+case 599:if(this.simplePath(_={category:'artref'},600)){target=_.ref; this.setAssocAndComposition( art, assoc, card, target ); }continue
+case 600:this.mk(601,'on');continue
+case 601:if(this.condition(_={},602)){expr=_.expr; art.on = expr; }continue
+case 602:this.s=603;{ this.docComment( art ); }continue
+case 603:switch(this.l()){
+case'@':this.annoAssignStd({art},603);continue
 default:this.gr([',']);continue
 }
 default:
@@ -3691,90 +3678,90 @@ return this.exit_()
 }
 whereGroupByHaving($,$next){
 let cond;let _
-this.rule_(608,$next)
+this.rule_(605,$next)
 for(;;)switch(this.s){
-case 608:switch(this.lk()){
-case'where':this.ck(609);continue
-default:this.s=610;continue
+case 605:switch(this.lk()){
+case'where':this.ck(606);continue
+default:this.s=607;continue
 }
-case 609:if(this.condition(_={},610)){cond=_.expr; $.query.where = cond; }continue
-case 610:switch(this.lk()){
-case'group':this.groupByClause($,611);continue
-default:this.s=611;continue
+case 606:if(this.condition(_={},607)){cond=_.expr; $.query.where = cond; }continue
+case 607:switch(this.lk()){
+case'group':this.groupByClause($,608);continue
+default:this.s=608;continue
 }
-case 611:switch(this.lk()){
-case'having':this.ck(612);continue
+case 608:switch(this.lk()){
+case'having':this.ck(609);continue
 default:this.gr(['limit','order']);continue
 }
-case 612:if(this.condition(_={},0)){cond=_.expr; $.query.having = cond; }continue
+case 609:if(this.condition(_={},0)){cond=_.expr; $.query.having = cond; }continue
 default:return this.exit_()
 }
 }
 groupByClause($,$next){
 let expr;let _
-this.rule_(614,$next)
+this.rule_(611,$next)
 for(;;)switch(this.s){
-case 614:this.mk(615,'group');continue
-case 615:this.mk(616,'by');continue
-case 616:if(this.expression(_={},617)){expr=_.expr; $.query.groupBy = [ expr ]; }continue
-case 617:switch(this.l()){
-case',':this.c(618);continue
+case 611:this.mk(612,'group');continue
+case 612:this.mk(613,'by');continue
+case 613:if(this.expression(_={},614)){expr=_.expr; $.query.groupBy = [ expr ]; }continue
+case 614:switch(this.l()){
+case',':this.c(615);continue
 default:this.gr(['limit','order','having']);continue
 }
-case 618:if(this.expression(_={},617)){expr=_.expr; $.query.groupBy.push( expr ); }continue
+case 615:if(this.expression(_={},614)){expr=_.expr; $.query.groupBy.push( expr ); }continue
 default:return this.exit_()
 }
 }
 orderByLimitOffset($,$next){
 let expr;let _
-this.rule_(620,$next)
+this.rule_(617,$next)
 for(;;)switch(this.s){
-case 620:switch(this.lk()){
-case'order':this.orderByClause($,621);continue
-default:this.s=621;continue
+case 617:switch(this.lk()){
+case'order':this.orderByClause($,618);continue
+default:this.s=618;continue
 }
-case 621:switch(this.lk()){
-case'limit':this.ck(622);continue
+case 618:switch(this.lk()){
+case'limit':this.ck(619);continue
 default:this.gr();continue
 }
-case 622:if(this.expression(_={},623)){expr=_.expr; $.query.limit = { rows: expr }; }continue
-case 623:switch(this.lk()){
-case'offset':this.ck(624);continue
+case 619:if(this.expression(_={},620)){expr=_.expr; $.query.limit = { rows: expr }; }continue
+case 620:switch(this.lk()){
+case'offset':this.ck(621);continue
 default:this.gr();continue
 }
-case 624:if(this.expression(_={},0)){expr=_.expr; $.query.limit.offset = expr; }continue
+case 621:if(this.expression(_={},0)){expr=_.expr; $.query.limit.offset = expr; }continue
 default:return this.exit_()
 }
 }
 orderByClause($,$next){
 let expr;let _
-this.rule_(626,$next)
+this.rule_(623,$next)
 for(;;)switch(this.s){
-case 626:this.mk(627,'order');continue
-case 627:this.mk(628,'by');continue
-case 628:if(this.orderByExpression(_={},629)){expr=_.expr; $.query.orderBy = [ expr ]; }continue
-case 629:switch(this.l()){
-case',':this.c(630);continue
+case 623:this.mk(624,'order');continue
+case 624:this.mk(625,'by');continue
+case 625:if(this.orderByExpression(_={},626)){expr=_.expr; $.query.orderBy = [ expr ]; }continue
+case 626:switch(this.l()){
+case',':this.c(627);continue
 default:this.gr(['limit']);continue
 }
-case 630:if(this.orderByExpression(_={},629)){expr=_.expr; $.query.orderBy.push( expr ); }continue
+case 627:if(this.orderByExpression(_={},626)){expr=_.expr; $.query.orderBy.push( expr ); }continue
 default:return this.exit_()
 }
 }
 orderByExpression($,$next){
 $.expr??=undefined
-this.rule_(632,$next)
+this.rule_(629,$next)
 for(;;)switch(this.s){
-case 632:this.expression($,633);continue
-case 633:switch(this.lk()){
-case'asc':case'desc':if(this.ck(634)){ $.expr.sort = this.valueWithLocation(); }continue
-default:this.s=634;continue
+case 629:this.expression($,630);continue
+case 630:switch(this.lk()){
+case'asc':case'desc':if(this.ck(631)){ $.expr.sort = this.valueWithLocation(); }continue
+default:this.s=631;continue
 }
-case 634:switch(this.lk()){
-case'nulls':this.ck(635);continue
+case 631:switch(this.lk()){
+case'nulls':this.ck(632);continue
 default:this.gr([',','limit']);continue
 }
-case 635:switch(this.lk()){
+case 632:switch(this.lk()){
 case'last':case'first':if(this.ck(0)){ $.expr.nulls = this.valueWithLocation(); }continue
 default:this.e();continue
 }
@@ -3784,114 +3771,114 @@ default:return this.exit_()
 conditionEOF($,$next){
 $.cond??=undefined
 let _
-this.rule_(637,$next)
+this.rule_(634,$next)
 for(;;)switch(this.s){
-case 637:if(this.expression(_={},638))$.cond=_.expr;continue
-case 638:this.m(0,'EOF');continue
+case 634:if(this.expression(_={},635))$.cond=_.expr;continue
+case 635:this.m(0,'EOF');continue
 default:return this.exit_()
 }
 }
 condition($,$next){
 $.expr??=undefined
-this.rule_(640,$next)
+this.rule_(637,$next)
 for(;;)switch(this.s){
-case 640:this.expression($,0);continue
+case 637:this.expression($,0);continue
 default:return this.exit_()
 }
 }
 expression($,$next,$startState){
 $.expr??={}
 let e;let open;let _
-this.rule_($startState??642,$next)
+this.rule_($startState??639,$next)
 for(;;)switch(this.s){
-case 642:switch(this.lk()){
-case'(':this.expressionOrQueryParens($,643);continue
-case'#':case'null':case'true':case'false':case'Number':case'String':case'QuotedLiteral':this.literalValue($,654);continue
-case':':if(this.c(644)){ this.reportUnexpectedSpace(); }continue
-case'?':if(this.c(654)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
+case 639:switch(this.lk()){
+case'(':this.expressionOrQueryParens($,640);continue
+case'#':case'null':case'true':case'false':case'Number':case'String':case'QuotedLiteral':this.literalValue($,651);continue
+case':':if(this.c(641)){ this.reportUnexpectedSpace(); }continue
+case'?':if(this.c(651)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
 $.expr = this.attachLocation({ param: this.valueWithLocation(), scope: 'param' }); }continue
-case'Id':if(this.valuePath(_={},646)){e=_.expr; $.expr = this.valuePathAst( e ); }continue
-case'new':if(this.ckP(649,['Id'])){ $.expr = this.applyOpToken(); }continue
-case'exists':if(this.ck(650)){ $.expr = this.applyOpToken(); }continue
-case'case':this.caseExpression($,654);continue
-case'cast':this.castFunction($,654);continue
-case'+':case'-':if(this.ec('precRight_',30)&&this.c(653)){ $.expr = this.applyOpToken(); }continue
-case'not':if(this.ec('precRight_',8)&&this.ck(653)){ $.expr = this.applyOpToken(); }continue
+case'Id':if(this.valuePath(_={},643)){e=_.expr; $.expr = this.valuePathAst( e ); }continue
+case'new':if(this.ckP(646,['Id'])){ $.expr = this.applyOpToken(); }continue
+case'exists':if(this.ck(647)){ $.expr = this.applyOpToken(); }continue
+case'case':this.caseExpression($,651);continue
+case'cast':this.castFunction($,651);continue
+case'+':case'-':if(this.ec('precRight_',30)&&this.c(650)){ $.expr = this.applyOpToken(); }continue
+case'not':if(this.ec('precRight_',8)&&this.ck(650)){ $.expr = this.applyOpToken(); }continue
 default:this.ei();continue
 }
-case 643:this.s=654;{ $.expr = this.taggedIfQuery( $.expr ); }continue
-case 644:switch(this.l()){
-case'Id':if(this.ciA(645,'paramref')){ $.expr = { path: [ this.identAst() ], location: this.startLocation(), scope: 'param' }; }continue
-case'Number':if(this.c(654)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'positional', code: ':' + this.lb().text } );
+case 640:this.s=651;{ $.expr = this.taggedIfQuery( $.expr ); }continue
+case 641:switch(this.l()){
+case'Id':if(this.ciA(642,'paramref')){ $.expr = { path: [ this.identAst() ], location: this.startLocation(), scope: 'param' }; }continue
+case'Number':if(this.c(651)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'positional', code: ':' + this.lb().text } );
 $.expr = this.attachLocation({ param: this.unsignedIntegerLiteral(), scope: 'param' }); }continue
 default:this.e();continue
 }
-case 645:switch(this.l()){
-case'.':if(this.valuePath($,654,673)){ $.expr = this.valuePathAst( $.expr ); }continue
-default:this.s=654;{ this.attachLocation( $.expr ); }continue
+case 642:switch(this.l()){
+case'.':if(this.valuePath($,651,670)){ $.expr = this.valuePathAst( $.expr ); }continue
+default:this.s=651;{ this.attachLocation( $.expr ); }continue
 }
-case 646:switch(this.lk()){
-case'over':if(this.ck(647)){ this.pushXprToken( $.expr.suffix = [] ); }continue
-default:this.s=648;continue
+case 643:switch(this.lk()){
+case'over':if(this.ck(644)){ this.pushXprToken( $.expr.suffix = [] ); }continue
+default:this.s=645;continue
 }
-case 647:this.overClause(e={outer:$.expr.suffix},648);continue
-case 648:this.s=654;{ this.attachLocation( $.expr ); }continue
-case 649:if(this.valuePath(_={},654)){e=_.expr; this.valuePathAstWithNew( $.expr, e ); }continue
-case 650:switch(this.l()){
-case'(':if(this.c(651))open=this.lb();continue
-case'Id':if(this.valuePath(_={},654)){e=_.expr; e = this.valuePathAst( e ); e.$expected = 'exists';
+case 644:this.overClause(e={outer:$.expr.suffix},645);continue
+case 645:this.s=651;{ this.attachLocation( $.expr ); }continue
+case 646:if(this.valuePath(_={},651)){e=_.expr; this.valuePathAstWithNew( $.expr, e ); }continue
+case 647:switch(this.l()){
+case'(':if(this.c(648))open=this.lb();continue
+case'Id':if(this.valuePath(_={},651)){e=_.expr; e = this.valuePathAst( e ); e.$expected = 'exists';
 $.expr.args.push( e ); this.attachLocation( $.expr ); }continue
-case'?':if(this.c(654)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
+case'?':if(this.c(651)){ 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 651:if(this.queryExpression(_={},652))e=_.expr;continue
-case 652:if(this.m(654,')')){ $.expr.args.push( this.taggedIfQuery( this.surroundByParens( e, open ) ) );
+case 648:if(this.queryExpression(_={},649))e=_.expr;continue
+case 649:if(this.m(651,')')){ $.expr.args.push( this.taggedIfQuery( this.surroundByParens( e, open ) ) );
 this.attachLocation( $.expr ); }continue
-case 653:if(this.expression(_={},654)){e=_.expr; $.expr = this.signedExpression( $.expr, e ); }continue
-case 654:switch(this.lk()){
-case'*':case'/':if(this.gc(0,'precLeft_',24)&&this.c(658)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'+':case'-':if(this.gc(0,'precLeft_',22)&&this.c(658)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'||':if(this.gc(0,'precLeft_',20)&&this.c(658)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'and':if(this.gc(0,'precLeft_',4)&&this.ck(658)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'or':if(this.gc(0,'precLeft_',2)&&this.ck(658)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'?':if(this.gc(0,'precRight_',0)&&this.c(655)){ $.expr = this.applyOpToken( $.expr, '?:' ); }continue
-case'<':case'=':case'>':case'!=':case'<=':case'<>':case'>=':if(this.gc(0,'precNone_',10)&&this.c(657)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'==':if(this.gc(0,'precNone_',10)&&this.c(658)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'is':if(this.gc(0,'precNone_',10)&&this.ck(659)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'not':if(this.gc(0,'isNegatedRelation',10)&&this.ck(661)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'in':case'like':case'between':if(this.gc(0,'precNone_',10)&&this.g(661)){ $.expr = { op: { val: 'ixpr', location: this.la().location }, args: [ $.expr ] }; }continue
+case 650:if(this.expression(_={},651)){e=_.expr; $.expr = this.signedExpression( $.expr, e ); }continue
+case 651:switch(this.lk()){
+case'*':case'/':if(this.gc(0,'precLeft_',24)&&this.c(655)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'+':case'-':if(this.gc(0,'precLeft_',22)&&this.c(655)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'||':if(this.gc(0,'precLeft_',20)&&this.c(655)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'and':if(this.gc(0,'precLeft_',4)&&this.ck(655)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'or':if(this.gc(0,'precLeft_',2)&&this.ck(655)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'?':if(this.gc(0,'precRight_',0)&&this.c(652)){ $.expr = this.applyOpToken( $.expr, '?:' ); }continue
+case'<':case'=':case'>':case'!=':case'<=':case'<>':case'>=':if(this.gc(0,'precNone_',10)&&this.c(654)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'==':if(this.gc(0,'precNone_',10)&&this.c(655)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'is':if(this.gc(0,'precNone_',10)&&this.ck(656)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'not':if(this.gc(0,'isNegatedRelation',10)&&this.ck(658)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'in':case'like':case'between':if(this.gc(0,'precNone_',10)&&this.g(658)){ $.expr = { op: { val: 'ixpr', location: this.la().location }, args: [ $.expr ] }; }continue
 default:this.gr();continue
 }
-case 655:if(this.expression(_={},656)){e=_.expr; $.expr.args.push( e ); }continue
-case 656:if(this.m(658,':')){ this.pushXprToken( $.expr ); }continue
-case 657:switch(this.lk()){
-case'all':case'any':case'some':if(this.ck(658)){ this.pushXprToken( $.expr ); }continue
-default:this.s=658;continue
-}
-case 658:if(this.expression(_={},669)){e=_.expr; $.expr.args.push( e ); }continue
-case 659:switch(this.lk()){
-case'not':if(this.ck(660)){ this.pushXprToken( $.expr ); }continue
-default:this.s=660;continue
-}
-case 660:if(this.mk(669,'null')){ this.pushXprToken( $.expr ); }continue
-case 661:switch(this.lk()){
-case'between':if(this.ck(662)){ this.pushXprToken( $.expr ); }continue
-case'in':if(this.ck(665)){ this.pushXprToken( $.expr ); }continue
-case'like':if(this.ck(666)){ this.pushXprToken( $.expr ); }continue
+case 652:if(this.expression(_={},653)){e=_.expr; $.expr.args.push( e ); }continue
+case 653:if(this.m(655,':')){ this.pushXprToken( $.expr ); }continue
+case 654:switch(this.lk()){
+case'all':case'any':case'some':if(this.ck(655)){ this.pushXprToken( $.expr ); }continue
+default:this.s=655;continue
+}
+case 655:if(this.expression(_={},666)){e=_.expr; $.expr.args.push( e ); }continue
+case 656:switch(this.lk()){
+case'not':if(this.ck(657)){ this.pushXprToken( $.expr ); }continue
+default:this.s=657;continue
+}
+case 657:if(this.mk(666,'null')){ this.pushXprToken( $.expr ); }continue
+case 658:switch(this.lk()){
+case'between':if(this.ck(659)){ this.pushXprToken( $.expr ); }continue
+case'in':if(this.ck(662)){ this.pushXprToken( $.expr ); }continue
+case'like':if(this.ck(663)){ this.pushXprToken( $.expr ); }continue
 default:this.e();continue
 }
-case 662:if(this.expression(_={},663)){e=_.expr; $.expr.args?.push( e ); }continue
-case 663:if(this.mk(664,'and')){ this.pushXprToken( $.expr ); }continue
-case 664:if(this.expression(_={},669)){e=_.expr; $.expr.args?.push( e ); }continue
-case 665:if(this.expression(_={},669)){e=_.expr; $.expr.args?.push( this.secureParens( e ) ); }continue
-case 666:if(this.expression(_={},667)){e=_.expr; $.expr.args?.push( e ); }continue
-case 667:switch(this.lk()){
-case'escape':if(this.ck(668)){ this.pushXprToken( $.expr ); }continue
-default:this.s=669;continue
-}
-case 668:if(this.expression(_={},669)){e=_.expr; $.expr.args?.push( e ); }continue
-case 669:this.s=654;{ this.attachLocation( $.expr ); }continue
+case 659:if(this.expression(_={},660)){e=_.expr; $.expr.args?.push( e ); }continue
+case 660:if(this.mk(661,'and')){ this.pushXprToken( $.expr ); }continue
+case 661:if(this.expression(_={},666)){e=_.expr; $.expr.args?.push( e ); }continue
+case 662:if(this.expression(_={},666)){e=_.expr; $.expr.args?.push( this.secureParens( e ) ); }continue
+case 663:if(this.expression(_={},664)){e=_.expr; $.expr.args?.push( e ); }continue
+case 664:switch(this.lk()){
+case'escape':if(this.ck(665)){ this.pushXprToken( $.expr ); }continue
+default:this.s=666;continue
+}
+case 665:if(this.expression(_={},666)){e=_.expr; $.expr.args?.push( e ); }continue
+case 666:this.s=651;{ this.attachLocation( $.expr ); }continue
 default:
 if (this.s == null) this.attachLocation( $.expr )
 return this.exit_()
@@ -3900,21 +3887,21 @@ return this.exit_()
 valuePath($,$next,$startState){
 $.expr??={ path: [] }
 let pathItem
-this.rule_($startState??671,$next)
+this.rule_($startState??668,$next)
 for(;;)switch(this.s){
-case 671:if(this.mi(672,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
-case 672:switch(this.l()){
-case'(':case'[':this.argumentsAndFilter({pathStep:pathItem},673);continue
-default:this.s=673;continue
+case 668:if(this.mi(669,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
+case 669:switch(this.l()){
+case'(':case'[':this.argumentsAndFilter({pathStep:pathItem},670);continue
+default:this.s=670;continue
 }
-case 673:switch(this.l()){
-case'.':this.gc(0,'isDotForPath')&&this.c(674);continue
+case 670:switch(this.l()){
+case'.':this.gc(0,'isDotForPath')&&this.c(671);continue
 default:this.gr(['*','+','-','/','<','=','>','?','!=','<=','<>','==','>=','in','is','or','||','and','not','like','between']);continue
 }
-case 674:if(this.miA(675,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
-case 675:switch(this.l()){
-case'(':case'[':if(this.argumentsAndFilter({pathStep:pathItem},673)){ pathItem = null; }continue
-default:this.s=673;continue
+case 671:if(this.miA(672,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
+case 672:switch(this.l()){
+case'(':case'[':if(this.argumentsAndFilter({pathStep:pathItem},670)){ pathItem = null; }continue
+default:this.s=670;continue
 }
 default:
 this.attachLocation( $.expr )
@@ -3923,48 +3910,48 @@ return this.exit_()
 }
 expressionOrQueryParens($,$next){
 $.expr??=undefined
-this.rule_(677,$next)
+this.rule_(674,$next)
 for(;;)switch(this.s){
-case 677:if(this.m(678,'(')){this.queryOnLeft()}continue;
-case 678:switch(this.lk()){
-case'(':this.expressionOrQueryParens($,679);continue
-case'Id':case'#':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression($,681)){this.queryOnLeft('expr')}continue;
-case'select':this.queryExpression($,682);continue
+case 674:if(this.m(675,'(')){this.queryOnLeft()}continue;
+case 675:switch(this.lk()){
+case'(':this.expressionOrQueryParens($,676);continue
+case'Id':case'#':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression($,678)){this.queryOnLeft('expr')}continue;
+case'select':this.queryExpression($,679);continue
 default:this.ei();continue
 }
-case 679: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($,680,643)){this.queryOnLeft('expr')}continue;
-case',':if(this.continueExpressionslist($,682)){this.queryOnLeft('expr')}continue;
-case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(682,'queryOnLeft')&&this.queryExpression($,682,455);continue
-default:this.s=682;continue
+case 676:switch(this.lk()){
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression($,677,640)){this.queryOnLeft('expr')}continue;
+case',':if(this.continueExpressionslist($,679)){this.queryOnLeft('expr')}continue;
+case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(679,'queryOnLeft')&&this.queryExpression($,679,454);continue
+default:this.s=679;continue
 }
-case 680:switch(this.l()){
-case',':this.continueExpressionslist($,682);continue
-default:this.s=682;continue
+case 677:switch(this.l()){
+case',':this.continueExpressionslist($,679);continue
+default:this.s=679;continue
 }
-case 681:switch(this.l()){
-case',':this.continueExpressionslist($,682);continue
-default:this.s=682;continue
+case 678:switch(this.l()){
+case',':this.continueExpressionslist($,679);continue
+default:this.s=679;continue
 }
-case 682:if(this.m(0,')')){ if ($.expr.op?.val !== 'list' || $.expr.location) this.surroundByParens( $.expr ); else this.attachLocation( $.expr ); }continue
+case 679:if(this.m(0,')')){ if ($.expr.op?.val !== 'list' || $.expr.location) this.surroundByParens( $.expr ); else this.attachLocation( $.expr ); }continue
 default:return this.exit_()
 }
 }
 continueExpressionslist($,$next){
 let e;let _
-this.rule_(684,$next)
+this.rule_(681,$next)
 for(;;)switch(this.s){
-case 684:if(this.m(685,',')){ $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: null }; }continue
-case 685:switch(this.lk()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':this.s=686;continue
+case 681:if(this.m(682,',')){ $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: null }; }continue
+case 682:switch(this.lk()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':this.s=683;continue
 default:this.ei();continue
 }
-case 686:switch(this.l()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},687)){e=_.expr; $.expr.args.push( e ); }continue
+case 683:switch(this.l()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},684)){e=_.expr; $.expr.args.push( e ); }continue
 default:this.gr([')']);continue
 }
-case 687:switch(this.l()){
-case',':this.c(686);continue
+case 684:switch(this.l()){
+case',':this.c(683);continue
 default:this.gr([')']);continue
 }
 default:return this.exit_()
@@ -3973,30 +3960,30 @@ default:return this.exit_()
 caseExpression($,$next){
 $.expr??=undefined
 let e;let _
-this.rule_(689,$next)
+this.rule_(686,$next)
 for(;;)switch(this.s){
-case 689:if(this.mk(690,'case')){ $.expr.op = { val: 'ixpr', location: this.lb().location }; $.expr.args = []; this.pushXprToken( $.expr ); }continue
-case 690: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(_={},691)){e=_.expr; $.expr.args.push( e ); }continue
-default:this.gi(691);continue
+case 686:if(this.mk(687,'case')){ $.expr.op = { val: 'ixpr', location: this.lb().location }; $.expr.args = []; this.pushXprToken( $.expr ); }continue
+case 687:switch(this.lk()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression(_={},688)){e=_.expr; $.expr.args.push( e ); }continue
+default:this.gi(688);continue
 }
-case 691:switch(this.lk()){
-case'when':this.s=692;continue
+case 688:switch(this.lk()){
+case'when':this.s=689;continue
 default:this.e();continue
 }
-case 692:switch(this.lk()){
-case'when':if(this.ck(693)){ this.pushXprToken( $.expr ); }continue
-default:this.s=696;continue
+case 689:switch(this.lk()){
+case'when':if(this.ck(690)){ this.pushXprToken( $.expr ); }continue
+default:this.s=693;continue
 }
-case 693:if(this.expression(_={},694)){e=_.expr; $.expr.args.push( e ); }continue
-case 694:if(this.mk(695,'then')){ this.pushXprToken( $.expr ); }continue
-case 695:if(this.expression(_={},692)){e=_.expr; $.expr.args.push( e ); }continue
-case 696:switch(this.lk()){
-case'else':if(this.ck(697)){ this.pushXprToken( $.expr ); }continue
-default:this.s=698;continue
+case 690:if(this.expression(_={},691)){e=_.expr; $.expr.args.push( e ); }continue
+case 691:if(this.mk(692,'then')){ this.pushXprToken( $.expr ); }continue
+case 692:if(this.expression(_={},689)){e=_.expr; $.expr.args.push( e ); }continue
+case 693:switch(this.lk()){
+case'else':if(this.ck(694)){ this.pushXprToken( $.expr ); }continue
+default:this.s=695;continue
 }
-case 697:if(this.expression(_={},698)){e=_.expr; $.expr.args.push( e ); }continue
-case 698:if(this.mk(0,'end')){ this.pushXprToken( $.expr ); }continue
+case 694:if(this.expression(_={},695)){e=_.expr; $.expr.args.push( e ); }continue
+case 695:if(this.mk(0,'end')){ this.pushXprToken( $.expr ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -4005,14 +3992,14 @@ return this.exit_()
 castFunction($,$next){
 $.expr??=undefined
 let arg;let _
-this.rule_(700,$next)
+this.rule_(697,$next)
 for(;;)switch(this.s){
-case 700:if(this.mk(701,'cast')){ $.expr.op = this.valueWithLocation(); }continue
-case 701:if(this.m(702,'(')){ $.expr.args = this.createArray(); }continue
-case 702:if(this.expression(_={},703)){arg=_.expr; $.expr.args?.push( arg ); }continue
-case 703:this.mk(704,'as');continue
-case 704:this.typeRefOptArgs({art:$.expr},705);continue
-case 705:if(this.m(0,')')){ this.finalizeDictOrArray( $.expr.args ); }continue
+case 697:if(this.mk(698,'cast')){ $.expr.op = this.valueWithLocation(); }continue
+case 698:if(this.m(699,'(')){ $.expr.args = this.createArray(); }continue
+case 699:if(this.expression(_={},700)){arg=_.expr; $.expr.args?.push( arg ); }continue
+case 700:this.mk(701,'as');continue
+case 701:this.typeRefOptArgs({art:$.expr},702);continue
+case 702:if(this.m(0,')')){ this.finalizeDictOrArray( $.expr.args ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -4020,67 +4007,67 @@ return this.exit_()
 }
 argumentsAndFilter($,$next){
 let open;let id;let expr;let _
-this.rule_(707,$next)
+this.rule_(704,$next)
 for(;;)switch(this.s){
-case 707:switch(this.l()){
-case'(':if(this.c(708)){open=this.lb();this.prepareSpecialFunction(); $.pathStep.args = this.createArray(); }continue
-default:this.s=726;continue
+case 704:switch(this.l()){
+case'(':if(this.c(705)){open=this.lb();this.prepareSpecialFunction(); $.pathStep.args = this.createArray(); }continue
+default:this.s=723;continue
+}
+case 705:switch(this.l()){
+case')':this.s=722;continue
+case'Id':if(this.gc(715,'isNamedArg')&&this.ciA(706,'paramname'))id=this.lb();continue
+default:this.s=715;continue
+}
+case 706:switch(this.l()){
+case':':if(this.c(707)){ $.pathStep.args = this.createDict( open ); $.pathStep.$syntax = ':'; }continue
+case'=>':if(this.c(711)){ $.pathStep.args = this.createDict(); }continue
+default:this.e();continue
 }
+case 707:if(this.expression(_={},708)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
 case 708:switch(this.l()){
-case')':this.s=725;continue
-case'Id':if(this.gc(718,'isNamedArg')&&this.ciA(709,'paramname'))id=this.lb();continue
-default:this.s=718;continue
-}
-case 709:switch(this.l()){
-case':':if(this.c(710)){ $.pathStep.args = this.createDict( open ); $.pathStep.$syntax = ':'; }continue
-case'=>':if(this.c(714)){ $.pathStep.args = this.createDict(); }continue
+case',':this.c(709);continue
+case')':this.s=722;continue
 default:this.e();continue
 }
-case 710:if(this.expression(_={},711)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 711:switch(this.l()){
-case',':this.c(712);continue
-case')':this.s=725;continue
+case 709:switch(this.l()){
+case'Id':if(this.ciA(710,'paramname'))id=this.lb();continue
+case')':this.s=722;continue
 default:this.e();continue
 }
+case 710:this.m(707,':');continue
+case 711:if(this.expression(_={},712)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
 case 712:switch(this.l()){
-case'Id':if(this.ciA(713,'paramname'))id=this.lb();continue
-case')':this.s=725;continue
+case',':this.c(713);continue
+case')':this.s=722;continue
 default:this.e();continue
 }
-case 713:this.m(710,':');continue
-case 714:if(this.expression(_={},715)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 715:switch(this.l()){
-case',':this.c(716);continue
-case')':this.s=725;continue
+case 713:switch(this.l()){
+case'Id':if(this.ciA(714,'paramname'))id=this.lb();continue
+case')':this.s=722;continue
 default:this.e();continue
 }
+case 714:this.m(711,'=>');continue
+case 715:if(this.funcExpression(_={},716)){expr=_.expr; $.pathStep.args.push( expr ); }continue
 case 716:switch(this.l()){
-case'Id':if(this.ciA(717,'paramname'))id=this.lb();continue
-case')':this.s=725;continue
-default:this.e();continue
-}
-case 717:this.m(714,'=>');continue
-case 718:if(this.funcExpression(_={},719)){expr=_.expr; $.pathStep.args.push( expr ); }continue
-case 719:switch(this.l()){
-case',':if(this.c(720)){this.nextFunctionArgument()}continue;
-default:this.s=722;continue
+case',':if(this.c(717)){this.nextFunctionArgument()}continue;
+default:this.s=719;continue
 }
-case 720:switch(this.l()){
-case')':this.c(721);continue
-default:this.s=718;continue
+case 717:switch(this.l()){
+case')':this.c(718);continue
+default:this.s=715;continue
 }
-case 721:switch(this.l()){
+case 718:switch(this.l()){
 case'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['*','+','-','.','/','<','=','>','?','!=','<=','<>','==','>=','in','is','or','||','and','not','like','between']);continue
 }
-case 722:switch(this.lk()){
-case'order':if(this.ck(723)){ expr = $.pathStep.args[$.pathStep.args.length - 1] = this.applyOpToken( expr ); }continue
-default:this.s=725;continue
+case 719:switch(this.lk()){
+case'order':if(this.ck(720)){ expr = $.pathStep.args[$.pathStep.args.length - 1] = this.applyOpToken( expr ); }continue
+default:this.s=722;continue
 }
-case 723:if(this.mk(724,'by')){ this.pushXprToken( expr ); }continue
-case 724:if(this.orderByClauseAsXpr({outer:expr.args},725)){ this.attachLocation( expr ); }continue
-case 725:if(this.m(726,')')){ this.finalizeDictOrArray( $.pathStep.args ); }continue
-case 726:switch(this.l()){
+case 720:if(this.mk(721,'by')){ this.pushXprToken( expr ); }continue
+case 721:if(this.orderByClauseAsXpr({outer:expr.args},722)){ this.attachLocation( expr ); }continue
+case 722:if(this.m(723,')')){ this.finalizeDictOrArray( $.pathStep.args ); }continue
+case 723:switch(this.l()){
 case'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['*','+','-','.','/','<','=','>','?','!=','<=','<>','==','>=','in','is','or','||','and','not','like','between']);continue
 }
@@ -4091,22 +4078,22 @@ funcExpression($,$next){
 $.expr??=undefined
 let args
 let tok;let e;let _
-this.rule_(728,$next)
+this.rule_(725,$next)
 for(;;)switch(this.s){
-case 728:switch(this.lGenericIntroOrExpr()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},730))$.expr=_.expr;continue
-case'GenericExpr':if(this.ckA(730)){tok=this.lb(); $.expr = { val: tok.keyword ?? tok.type, location: tok.location, literal: 'token' }; }continue
-case'GenericIntro':if(this.ckA(729)){ $.expr = this.applyOpToken(); args = $.expr.args; }continue
+case 725:switch(this.lGenericIntroOrExpr()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},727))$.expr=_.expr;continue
+case'GenericExpr':if(this.ckA(727)){tok=this.lb(); $.expr = { val: tok.keyword ?? tok.type, location: tok.location, literal: 'token' }; }continue
+case'GenericIntro':if(this.ckA(726)){ $.expr = this.applyOpToken(); args = $.expr.args; }continue
 default:this.e();continue
 }
-case 729:if(this.expression(_={},730)){e=_.expr; $.expr.args.push( e ); }continue
-case 730:switch(this.lGenericSeparator()){
-case'GenericSeparator':if(this.ckA(731)){ if (args) this.pushXprToken( args ); else { $.expr= this.applyOpToken( $.expr ); args = $.expr.args; } }continue
+case 726:if(this.expression(_={},727)){e=_.expr; $.expr.args.push( e ); }continue
+case 727:switch(this.lGenericSeparator()){
+case'GenericSeparator':if(this.ckA(728)){ if (args) this.pushXprToken( args ); else { $.expr= this.applyOpToken( $.expr ); args = $.expr.args; } }continue
 default:this.gr([')',',','order']);continue
 }
-case 731:switch(this.lGenericExpr()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},730)){e=_.expr; args.push( e ); }continue
-case'GenericExpr':if(this.ckA(730)){ this.pushXprToken( args ); }continue
+case 728:switch(this.lGenericExpr()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},727)){e=_.expr; args.push( e ); }continue
+case'GenericExpr':if(this.ckA(727)){ this.pushXprToken( args ); }continue
 default:this.e();continue
 }
 default:
@@ -4116,27 +4103,27 @@ return this.exit_()
 }
 overClause($,$next){
 let over=[]
-this.rule_(733,$next)
+this.rule_(730,$next)
 for(;;)switch(this.s){
-case 733:this.m(734,'(');continue
+case 730:this.m(731,'(');continue
+case 731:switch(this.lk()){
+case'partition':if(this.ck(732)){ this.pushXprToken( over ); }continue
+default:this.s=734;continue
+}
+case 732:if(this.mk(733,'by')){ this.pushXprToken( over ); }continue
+case 733:this.expressionsAsXpr({outer:over},734);continue
 case 734:switch(this.lk()){
-case'partition':if(this.ck(735)){ this.pushXprToken( over ); }continue
+case'order':if(this.ck(735)){ this.pushXprToken( over ); }continue
 default:this.s=737;continue
 }
 case 735:if(this.mk(736,'by')){ this.pushXprToken( over ); }continue
-case 736:this.expressionsAsXpr({outer:over},737);continue
+case 736:this.orderByClauseAsXpr({outer:over},737);continue
 case 737:switch(this.lk()){
-case'order':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.orderByClauseAsXpr({outer:over},740);continue
-case 740:switch(this.lk()){
-case'rows':if(this.ck(741)){ this.pushXprToken( over ); }continue
-default:this.s=742;continue
+case'rows':if(this.ck(738)){ this.pushXprToken( over ); }continue
+default:this.s=739;continue
 }
-case 741:this.windowFrameClause({outer:over},742);continue
-case 742:this.m(0,')');continue
+case 738:this.windowFrameClause({outer:over},739);continue
+case 739:this.m(0,')');continue
 default:
 $.outer.push( this.surroundByParens( this.ixprAst( over ) ) )
 return this.exit_()
@@ -4145,14 +4132,14 @@ return this.exit_()
 expressionsAsXpr($,$next){
 let args=[]
 let expr;let _
-this.rule_(744,$next)
+this.rule_(741,$next)
 for(;;)switch(this.s){
-case 744:if(this.expression(_={},745)){expr=_.expr; args.push( expr ); }continue
-case 745:switch(this.l()){
-case',':if(this.c(746)){ this.pushXprToken( args ); }continue
+case 741:if(this.expression(_={},742)){expr=_.expr; args.push( expr ); }continue
+case 742:switch(this.l()){
+case',':if(this.c(743)){ this.pushXprToken( args ); }continue
 default:this.gr([')','rows','order']);continue
 }
-case 746:if(this.expression(_={},745)){expr=_.expr; args.push( expr ); }continue
+case 743:if(this.expression(_={},742)){expr=_.expr; args.push( expr ); }continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
@@ -4160,14 +4147,14 @@ return this.exit_()
 }
 orderByClauseAsXpr($,$next){
 let args=[]
-this.rule_(748,$next)
+this.rule_(745,$next)
 for(;;)switch(this.s){
-case 748:this.orderBySpecAsXpr({args},749);continue
-case 749:switch(this.l()){
-case',':if(this.c(750)){ this.pushXprToken( args ); }continue
+case 745:this.orderBySpecAsXpr({args},746);continue
+case 746:switch(this.l()){
+case',':if(this.c(747)){ this.pushXprToken( args ); }continue
 default:this.gr([')']);continue
 }
-case 750:this.orderBySpecAsXpr({args},749);continue
+case 747:this.orderBySpecAsXpr({args},746);continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
@@ -4175,18 +4162,18 @@ return this.exit_()
 }
 orderBySpecAsXpr($,$next){
 let expr;let _
-this.rule_(752,$next)
+this.rule_(749,$next)
 for(;;)switch(this.s){
-case 752:if(this.expression(_={},753)){expr=_.expr; $.args.push( expr ); }continue
-case 753:switch(this.lk()){
-case'asc':case'desc':if(this.ck(754)){ this.pushXprToken( $.args ); }continue
-default:this.s=754;continue
+case 749:if(this.expression(_={},750)){expr=_.expr; $.args.push( expr ); }continue
+case 750:switch(this.lk()){
+case'asc':case'desc':if(this.ck(751)){ this.pushXprToken( $.args ); }continue
+default:this.s=751;continue
 }
-case 754:switch(this.lk()){
-case'nulls':if(this.ck(755)){ this.pushXprToken( $.args ); }continue
+case 751:switch(this.lk()){
+case'nulls':if(this.ck(752)){ this.pushXprToken( $.args ); }continue
 default:this.gr([')',',']);continue
 }
-case 755:switch(this.lk()){
+case 752:switch(this.lk()){
 case'last':case'first':if(this.ck(0)){ this.pushXprToken( $.args ); }continue
 default:this.e();continue
 }
@@ -4195,50 +4182,50 @@ default:return this.exit_()
 }
 windowFrameClause($,$next){
 let args=[]
-this.rule_(757,$next)
+this.rule_(754,$next)
 for(;;)switch(this.s){
-case 757:switch(this.lk()){
-case'unbounded':if(this.ck(758)){ this.pushXprToken( args ); }continue
-case'Number':if(this.c(758)){ args.push( this.unsignedIntegerLiteral() ); }continue
-case'current':if(this.ck(759)){ this.pushXprToken( args ); }continue
-case'between':if(this.ck(760)){ this.pushXprToken( args ); }continue
+case 754:switch(this.lk()){
+case'unbounded':if(this.ck(755)){ this.pushXprToken( args ); }continue
+case'Number':if(this.c(755)){ args.push( this.unsignedIntegerLiteral() ); }continue
+case'current':if(this.ck(756)){ this.pushXprToken( args ); }continue
+case'between':if(this.ck(757)){ this.pushXprToken( args ); }continue
 default:this.e();continue
 }
-case 758:if(this.mk(0,'preceding')){ this.pushXprToken( args ); }continue
-case 759:if(this.mk(0,'row')){ this.pushXprToken( args ); }continue
-case 760:this.windowFrameBoundSpec({args},761);continue
-case 761:if(this.mk(762,'and')){ this.pushXprToken( args ); }continue
-case 762:this.windowFrameBoundSpec({args},0);continue
+case 755:if(this.mk(0,'preceding')){ this.pushXprToken( args ); }continue
+case 756:if(this.mk(0,'row')){ this.pushXprToken( args ); }continue
+case 757:this.windowFrameBoundSpec({args},758);continue
+case 758:if(this.mk(759,'and')){ this.pushXprToken( args ); }continue
+case 759:this.windowFrameBoundSpec({args},0);continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
 }
 }
 windowFrameBoundSpec($,$next){
-this.rule_(764,$next)
+this.rule_(761,$next)
 for(;;)switch(this.s){
-case 764:switch(this.lk()){
-case'unbounded':if(this.ck(765)){ this.pushXprToken( $.args ); }continue
-case'Number':if(this.c(765)){ $.args.push( this.unsignedIntegerLiteral() ); }continue
-case'current':if(this.ck(767)){ this.pushXprToken( $.args ); }continue
+case 761:switch(this.lk()){
+case'unbounded':if(this.ck(762)){ this.pushXprToken( $.args ); }continue
+case'Number':if(this.c(762)){ $.args.push( this.unsignedIntegerLiteral() ); }continue
+case'current':if(this.ck(764)){ this.pushXprToken( $.args ); }continue
 default:this.e();continue
 }
-case 765:switch(this.lk()){
-case'following':this.ck(766);continue
-case'preceding':this.ck(766);continue
+case 762:switch(this.lk()){
+case'following':this.ck(763);continue
+case'preceding':this.ck(763);continue
 default:this.e();continue
 }
-case 766:if(this.gr()){ this.pushXprToken( $.args ); }continue
-case 767:if(this.mk(0,'row')){ this.pushXprToken( $.args ); }continue
+case 763:if(this.gr()){ this.pushXprToken( $.args ); }continue
+case 764:if(this.mk(0,'row')){ this.pushXprToken( $.args ); }continue
 default:return this.exit_()
 }
 }
 literalValue($,$next){
 $.expr??={}
-this.rule_(769,$next)
+this.rule_(766,$next)
 for(;;)switch(this.s){
-case 769:switch(this.lk()){
-case'#':if(this.c(770)){ this.reportUnexpectedSpace(); }continue
+case 766:switch(this.lk()){
+case'#':if(this.c(767)){ 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
@@ -4246,17 +4233,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 770:if(this.miA(0,'enumref')){ $.expr = { literal: 'enum', sym: this.identAst() } }continue
+case 767:if(this.miA(0,'enumref')){ $.expr = { literal: 'enum', sym: this.identAst() } }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
 }
 }
 annoAssignStd($,$next){
-this.rule_(772,$next)
+this.rule_(769,$next)
 for(;;)switch(this.s){
-case 772:if(this.m(773,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
-case 773:switch(this.l()){
+case 769:if(this.m(770,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
+case 770:switch(this.l()){
 case'(':this.annoAssignParen($,0);continue
 case'Id':this.annoAssignBase($,0);continue
 default:this.e();continue
@@ -4267,10 +4254,10 @@ return this.exit_()
 }
 }
 annoAssignCol($,$next){
-this.rule_(775,$next)
+this.rule_(772,$next)
 for(;;)switch(this.s){
-case 775:if(this.m(776,'@')){ this.reportDubiousAnnoSpacing(); }continue
-case 776:switch(this.l()){
+case 772:if(this.m(773,'@')){ this.reportDubiousAnnoSpacing(); }continue
+case 773:switch(this.l()){
 case'(':this.annoAssignParen($,0);continue
 case'Id':this.annoAssignBase($,0);continue
 default:this.e();continue
@@ -4282,10 +4269,10 @@ return this.exit_()
 }
 annoAssignMid($,$next){
 let name;let _
-this.rule_(778,$next)
+this.rule_(775,$next)
 for(;;)switch(this.s){
-case 778:if(this.m(779,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }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':if(this.annoNamePath(_={category:'anno'},0)){name=_.name; this.assignAnnotation( $.art, {}, name ); this.warnIfColonFollows( name ); }continue
 default:this.e();continue
@@ -4296,33 +4283,33 @@ return this.exit_()
 }
 }
 annoAssignParen($,$next){
-this.rule_(781,$next)
+this.rule_(778,$next)
 for(;;)switch(this.s){
-case 781:if(this.m(782,'(')){this.annoInSameLine()}continue;
-case 782:switch(this.l()){
-case'Id':this.annoAssignBase({art:$.art},783);continue
-default:this.s=784;continue
-}
-case 783:switch(this.l()){
-case',':this.c(782);continue
-case')':this.s=784;continue
+case 778:if(this.m(779,'(')){this.annoInSameLine()}continue;
+case 779:switch(this.l()){
+case'Id':this.annoAssignBase({art:$.art},780);continue
+default:this.s=781;continue
+}
+case 780:switch(this.l()){
+case',':this.c(779);continue
+case')':this.s=781;continue
 default:this.e();continue
 }
-case 784:this.m(0,')');continue
+case 781:this.m(0,')');continue
 default:return this.exit_()
 }
 }
 annoAssignBase($,$next){
 let value={}
 let name;let _
-this.rule_(786,$next)
+this.rule_(783,$next)
 for(;;)switch(this.s){
-case 786:if(this.annoNamePath(_={category:'anno'},787))name=_.name;continue
-case 787:switch(this.l()){
-case':':this.gc(0,'annoInSameLine')&&this.c(788);continue
+case 783:if(this.annoNamePath(_={category:'anno'},784))name=_.name;continue
+case 784:switch(this.l()){
+case':':this.gc(0,'annoInSameLine')&&this.c(785);continue
 default:this.gr();continue
 }
-case 788:if(this.annoValue(_={},0))value=_.value;continue
+case 785:if(this.annoValue(_={},0))value=_.value;continue
 default:
 this.assignAnnotation( $.art, value, name || {} )
 return this.exit_()
@@ -4331,20 +4318,20 @@ return this.exit_()
 annoNamePath($,$next){
 $.name??=new XsnName()
 let at
-this.rule_(790,$next)
+this.rule_(787,$next)
 for(;;)switch(this.s){
-case 790:if(this.miA(791,$.category)){ $.name.path = [ this.identAst() ]; }continue
-case 791:switch(this.l()){
-case'.':this.c(792);continue
-default:this.s=794;continue
-}
-case 792:switch(this.l()){
-case'Id':if(this.ciA(791,$.category)){ $.name.path.push( this.identAst() ); }continue
-case'@':if(this.c(793))at=this.lb();continue
+case 787:if(this.miA(788,$.category)){ $.name.path = [ this.identAst() ]; }continue
+case 788:switch(this.l()){
+case'.':this.c(789);continue
+default:this.s=791;continue
+}
+case 789:switch(this.l()){
+case'Id':if(this.ciA(788,$.category)){ $.name.path.push( this.identAst() ); }continue
+case'@':if(this.c(790))at=this.lb();continue
 default:this.e();continue
 }
-case 793:if(this.miA(791,$.category)){ $.name.path.push( this.identAstWithPrefix( at ) ); }continue
-case 794:switch(this.l()){
+case 790:if(this.miA(788,$.category)){ $.name.path.push( this.identAstWithPrefix( at ) ); }continue
+case 791:switch(this.l()){
 case'#':this.gc(0,'annoInSameLine')&&this.annoPathVariant({nameOrRef:$.name},0);continue
 default:this.gr();continue
 }
@@ -4355,25 +4342,25 @@ return this.exit_()
 }
 annoPath($,$next){
 let at
-this.rule_(796,$next)
+this.rule_(793,$next)
 for(;;)switch(this.s){
-case 796:switch(this.l()){
-case'Id':if(this.ciA(798,$.category)){ $.nameOrRef.path = [ this.identAst() ]; }continue
-case'@':if(this.c(797))at=this.lb();continue
+case 793:switch(this.l()){
+case'Id':if(this.ciA(795,$.category)){ $.nameOrRef.path = [ this.identAst() ]; }continue
+case'@':if(this.c(794))at=this.lb();continue
 default:this.e();continue
 }
-case 797:if(this.miA(798,$.category)){ $.nameOrRef.path = [ this.identAstWithPrefix( at ) ]; }continue
-case 798:switch(this.l()){
-case'.':this.c(799);continue
-default:this.s=801;continue
+case 794:if(this.miA(795,$.category)){ $.nameOrRef.path = [ this.identAstWithPrefix( at ) ]; }continue
+case 795:switch(this.l()){
+case'.':this.c(796);continue
+default:this.s=798;continue
 }
-case 799:switch(this.l()){
-case'Id':if(this.ciA(798,$.category)){ $.nameOrRef.path.push( this.identAst() ); }continue
-case'@':if(this.c(800))at=this.lb();continue
+case 796:switch(this.l()){
+case'Id':if(this.ciA(795,$.category)){ $.nameOrRef.path.push( this.identAst() ); }continue
+case'@':if(this.c(797))at=this.lb();continue
 default:this.e();continue
 }
-case 800:if(this.miA(798,$.category)){ $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); }continue
-case 801:switch(this.l()){
+case 797:if(this.miA(795,$.category)){ $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); }continue
+case 798:switch(this.l()){
 case'#':this.annoPathVariant({nameOrRef:$.nameOrRef},0);continue
 default:this.gr();continue
 }
@@ -4383,15 +4370,15 @@ return this.exit_()
 }
 }
 annoPathVariant($,$next){
-this.rule_(803,$next)
+this.rule_(800,$next)
 for(;;)switch(this.s){
-case 803:if(this.m(804,'#')){ this.reportUnexpectedSpace(); }continue
-case 804:if(this.miA(805,'variant')){ $.nameOrRef.variant = { path: [ this.identAst() ] }; }continue
-case 805:switch(this.l()){
-case'.':this.c(806);continue
+case 800:if(this.m(801,'#')){ this.reportUnexpectedSpace(); }continue
+case 801:if(this.miA(802,'variant')){ $.nameOrRef.variant = { path: [ this.identAst() ] }; }continue
+case 802:switch(this.l()){
+case'.':this.c(803);continue
 default:this.gr();continue
 }
-case 806:if(this.miA(805,'variant')){ $.nameOrRef.variant.path.push( this.identAst() ); }continue
+case 803:if(this.miA(802,'variant')){ $.nameOrRef.variant.path.push( this.identAst() ); }continue
 default:
 this.attachLocation( $.nameOrRef.variant )
 return this.exit_()
@@ -4401,14 +4388,14 @@ annoStructValue($,$next){
 $.value??={}
 let name=new XsnName()
 let _
-this.rule_(808,$next)
+this.rule_(805,$next)
 for(;;)switch(this.s){
-case 808:if(this.annoPath({nameOrRef:name,category:'name'},809)){ this.attachLocation( name ); }continue
-case 809:switch(this.l()){
-case':':this.c(810);continue
+case 805:if(this.annoPath({nameOrRef:name,category:'name'},806)){ this.attachLocation( name ); }continue
+case 806:switch(this.l()){
+case':':this.c(807);continue
 default:if(this.gr(['Id',',','@','}'])){ this.attachLocation( $.value ); }continue
 }
-case 810:if(this.annoValue(_={},0))$.value=_.value;continue
+case 807:if(this.annoValue(_={},0))$.value=_.value;continue
 default:
 $.value.name = name
 return this.exit_()
@@ -4417,51 +4404,55 @@ return this.exit_()
 annoValue($,$next){
 $.value??={}
 let sign;let sub;let ellipsis;let upTo;let _
-this.rule_(812,$next)
+this.rule_(809,$next)
 for(;;)switch(this.s){
-case 812:switch(this.lk()){
+case 809: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(813))sign=this.lb();continue
+case'+':case'-':if(this.c(810))sign=this.lb();continue
 case'Id':case'@':this.annoPath({nameOrRef:$.value,category:'annoref'},0);continue
-case'{':if(this.c(814)){ if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
+case'{':if(this.c(811)){ if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
 else { $.value.struct = Object.create(null); $.value.literal = 'struct'; } }continue
-case'[':if(this.c(817)){this.arrayAnno(); $.value.val = []; $.value.literal = 'array' }continue
-case'(':this.c(823);continue
+case'[':if(this.c(814)){this.arrayAnno(); $.value.val = []; $.value.literal = 'array' }continue
+case'(':this.c(820);continue
 default:this.ei();continue
 }
-case 813:if(this.m(0,'Number')){ this.adjustAnnoNumber( $.value = this.numberLiteral( sign ) ); }continue
-case 814:switch(this.l()){
-case'Id':case'@':if(this.annoStructValue(_={},815)){sub=_.value; if ($.value.$flatten) $.value.$flatten.push( sub );
+case 810:if(this.m(0,'Number')){ this.adjustAnnoNumber( $.value = this.numberLiteral( sign ) ); }continue
+case 811:switch(this.l()){
+case'Id':case'@':if(this.annoStructValue(_={},812)){sub=_.value; if ($.value.$flatten) $.value.$flatten.push( sub );
 else this.addDef( sub, $.value, 'struct', null, sub.name ); }continue
-default:this.s=816;continue
+default:this.s=813;continue
 }
-case 815:switch(this.l()){
-case',':this.c(814);continue
-case'}':this.s=816;continue
-case'Id':case'@':this.ec('fail')&&this.g(814);continue
-default:this.e();continue
+case 812:switch(this.lk()){
+case',':this.c(811);continue
+case'}':this.s=813;continue
+case'Id':case'@':this.ec('fail')&&this.g(811);continue
+default:this.ei();continue
 }
-case 816:this.ec('arrayAnno','orNotEmpty')&&this.m(0,'}');continue
-case 817:switch(this.l()){
-case'Id':case'#':case'(':case'+':case'-':case'@':case'[':case'{':case'Number':case'String':case'QuotedLiteral':if(this.annoValue(_={},821)){sub=_.value; $.value.val.push( sub ) }continue
-case'...':if(this.gc(822,'arrayAnno','ellipsis')&&this.c(818))ellipsis=this.lb();continue
-default:this.s=822;continue
+case 813:this.ec('arrayAnno','orNotEmpty')&&this.m(0,'}');continue
+case 814:switch(this.l()){
+case'Id':case'#':case'(':case'+':case'-':case'@':case'[':case'{':case'Number':case'String':case'QuotedLiteral':if(this.annoValue(_={},818)){sub=_.value; $.value.val.push( sub ) }continue
+case'...':if(this.gc(819,'arrayAnno','ellipsis')&&this.c(815))ellipsis=this.lb();continue
+default:this.s=819;continue
 }
-case 818:switch(this.lk()){
-case'up':this.ck(819);continue
-case',':case']':this.s=821;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location } ); }continue
+case 815:switch(this.lk()){
+case'up':this.ck(816);continue
+case',':case']':this.s=818;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location } ); }continue
 default:this.e();continue
 }
-case 819:this.mk(820,'to');continue
-case 820:if(this.annoValue(_={},821)){upTo=_.value; $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location, upTo: upTo } ); }continue
-case 821:switch(this.l()){
-case',':this.c(817);continue
-case']':this.s=822;continue
+case 816:this.mk(817,'to');continue
+case 817:if(this.annoValue(_={},818)){upTo=_.value; $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location, upTo: upTo } ); }continue
+case 818:switch(this.l()){
+case',':this.c(814);continue
+case']':this.s=819;continue
 default:this.e();continue
 }
-case 822:this.ec('arrayAnno','bracket')&&this.m(0,']');continue
-case 823:if(this.condition(_={},824))$.value=_.expr;continue
-case 824:if(this.m(0,')')){ $.value.$tokenTexts = this.ruleTokensText(); }continue
+case 819:this.ec('arrayAnno','bracket')&&this.m(0,']');continue
+case 820:switch(this.l()){
+case')':this.gc(821,'fail')&&this.c(0);continue
+default:this.s=821;continue
+}
+case 821:if(this.condition(_={},822))$.value=_.expr;continue
+case 822:if(this.m(0,')')){ $.value.$tokenTexts = this.ruleTokensText(); }continue
 default:
 this.attachLocation( $.value )
 return this.exit_()