@sap/cds-compiler 5.6.0 → 5.7.2

package/lib/gen/CdlParser.js

@@ -1,4 +1,4 @@
-// Parser generated by redepage v0.1.19
+// Parser generated by redepage v0.2.1
 'use strict;'
 const { XsnSource, XsnArtifact, XsnName } = require( '../compiler/xsn-model' )
 const AstBuildingParser = require('../parsers/AstBuildingParser')
@@ -29,7 +29,7 @@ default:0,
 define:0,
 definitions:0,
 desc:0,
-distinct:0,
+distinct:1,
 element:0,
 elements:0,
 else:0,
@@ -105,7 +105,7 @@ using:0,
 variable:0,
 view:0,
 virtual:0,
-when:0,
+when:1,
 where:1,
 with:1,
 }
@@ -124,7 +124,7 @@ Id:['g',1,,'afterBrace'],'@':'Id',
 },
 ['m',0,'EOF'],
 'artifactsBlock',
-['m',6,'{',,,'vocabularyRestriction'],
+['m',6,'{'],
 {Id:[7,10],'@':'Id','':8},
 {
 ';':['c',6],
@@ -133,7 +133,7 @@ Id:['g',6,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'artifactDefOrExtend',
-{'@':[10,770],'':11},
+{'@':[10,777],'':11},
 {
 define:['ck',12],
 type:12,view:12,event:12,action:12,aspect:12,entity:12,context:12,service:12,abstract:12,function:12,annotation:12,
@@ -141,12 +141,12 @@ extend:['ck',13,,'extensionRestriction'],
 annotate:['ck',14,,'extensionRestriction'],
 },
 {
-service:[0,44],
-context:[0,49],
-annotation:[0,54,,'vocabularyRestriction'],
-type:[0,59],
-aspect:[0,64],abstract:'aspect',
-entity:[0,74],
+service:[0,43],
+context:[0,48],
+annotation:[0,53,,'vocabularyRestriction'],
+type:[0,58],
+aspect:[0,63],abstract:'aspect',
+entity:[0,73],
 view:[0,88,,'hide_'],
 event:[0,100],
 action:[0,112],
@@ -163,108 +163,108 @@ projection:[0,287,1,'hide_'],
 [0,215],
 'namespaceDeclaration',
 ['mk',17,'namespace'],
-[0,36],
+[0,35],
 'usingDeclaration',
 ['mk',20,'using'],
 {
 from:['ck',21],
-Id:[22,32],
+Id:[22,31],
 '{':24,
 },
 ['m',0,'String'],
 {from:['ck',23],'':0},
 ['m',0,'String'],
 ['m',25,'{'],
-{Id:26},
-{Id:[27,32],'':28},
+{Id:[26,31],'':27},
 {
-',':['c',26],
-'}':28,
+',':['c',25],
+'}':27,
 },
-['m',29,'}',,,'afterBrace'],
-{from:['ck',30],'':0},
+['m',28,'}',,,'afterBrace'],
+{from:['ck',29],'':0},
 ['m',0,'String'],
 'usingProxy',
-[33,40],
-{as:['ck',34],'':0},
+[32,39],
+{as:['ck',33],'':0},
 ['mi',0],
 'namePath',
-['mi',37],
-{'.':['c',38],'':0},
-['miA',37],
+['mi',36],
+{'.':['c',37],'':0},
+['miA',36],
 'simplePath',
-['mi',41],
-{'.':['c',42],'':0},
-['miA',41],
+['mi',40],
+{'.':['c',41],'':0},
+['miA',40],
 'serviceDef',
-['mk',45,'service'],
-[46,36],
-{'@':[46,776],'':47},
+['mk',44,'service',,,'vocabularyRestriction'],
+[45,35],
+{'@':[45,783],'':46},
 {'{':[0,5],'':0},
 'contextDef',
-['mk',50,'context'],
-[51,36],
-{'@':[51,776],'':52},
+['mk',49,'context',,,'vocabularyRestriction'],
+[50,35],
+{'@':[50,783],'':51},
 {'{':[0,5],'':0},
 'annotationDef',
-['mk',55,'annotation'],
-[56,36],
-{'@':[56,776],'':57},
+['mk',54,'annotation'],
+[55,35],
+{'@':[55,783],'':56},
 [0,346],
 'typeDef',
-['mk',60,'type'],
-[61,36],
-{'@':[61,776],'':62},
+['mk',59,'type'],
+[60,35],
+{'@':[60,783],'':61},
 [0,346],
 'aspectDef',
 {
-aspect:['ck',66],
-abstract:['ck',65,,'hide_'],
+aspect:['ck',65],
+abstract:['ck',64,,'hide_'],
 },
-['mk',66,'entity'],
-[67,36],
-{'@':[67,776],'':68},
+['mk',65,'entity'],
+[66,35],
+{'@':[66,783],'':67},
 {
-'{':[72,157],
-':':['c',69],
+'{':[71,157],
+':':['c',68],
 '':0
 },
-{Id:[70,40],'':71},
+{Id:[69,39],'':70},
 {
-',':['c',69],
-'{':71,
+',':['c',68],
+'{':70,
 '':0
 },
-[72,157],
+[71,157],
 {actions:[0,124],'':0},
 'entityDef',
-['mk',75,'entity'],
-[76,36],
-{'@':[76,776],'':77},
-{'(':[78,141],'':78},
+['mk',74,'entity',,,'afterBrace'],
+[75,35],
+{'@':[75,783],'':76},
+{'(':[77,141],'':77},
 {
-':':['c',79],
-'{':82,
-as:['ck',83],
+':':['c',78],
+'{':81,
+as:['ck',82],
 },
-{Id:80},
-{Id:[81,40],'':82},
+{Id:79},
+{Id:[80,39],'':81},
 {
-',':['c',80],
-'{':82,
+',':['c',79],
+'{':81,
 },
 [86,157],
 {
-'(':[86,451],select:'(',
-projection:[84,445],
+'(':[86,452],select:'(',
+projection:[83,446],
 },
-{group:[85,603],where:'group',having:'group','':85},
-{limit:[86,615],order:'limit','':86},
+{group:[84,610],where:'group',having:'group','':84},
+{limit:[85,622],order:'limit','':85},
+['g',86,,,,'afterBrace'],
 {actions:[0,124],'':0},
 'viewDef',
 ['mk',89,'view'],
-[90,36],
-{'@':[90,776],'':91},
+[90,35],
+{'@':[90,783],'':91},
 {
 '(':[97,141],
 with:['ck',92,,'hide_'],
@@ -276,39 +276,39 @@ with:['ck',92,,'hide_'],
 [94,146],
 ['g',97],
 ['mk',98,'as'],
-[0,451],
+[0,452],
 'eventDef',
 ['mk',101,'event'],
-[102,36],
-{'@':[102,776],'':103},
+[102,35],
+{'@':[102,783],'':103},
 {
 '{':[0,157],
 ':':['c',104],
 },
 {
 '{':[0,157],
-Id:[105,40],
-projection:[0,445,1],
+Id:[105,39],
+projection:[0,446,1],
 },
 {',':106,'{':106,'':110},
 {',':['c',107],'':109},
-{Id:[108,40],'':109},
+{Id:[108,39],'':109},
 {
 ',':['c',107],
 '{':109,
 },
 [0,157],
-{'@':[110,770],'':0},
+{'@':[110,777],'':0},
 'actionMainDef',
 ['mk',113,'action'],
-[114,36],
-{'@':[114,776],'':115},
+[114,35],
+{'@':[114,783],'':115},
 [116,141],
 {returns:[0,153],'':0},
 'functionMainDef',
 ['mk',119,'function'],
-[120,36],
-{'@':[120,776],'':121},
+[120,35],
+{'@':[120,783],'':121},
 [122,141],
 [0,153],
 'actionsBlock',
@@ -322,17 +322,17 @@ Id:['g',126,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'boundActionFunctionDef',
-{'@':[130,770],'':131},
+{'@':[130,777],'':131},
 {
 action:['ck',132],
 function:['ck',136],
 },
 ['mi',133],
-{'@':[133,776],'':134},
+{'@':[133,783],'':134},
 [135,141],
 {returns:[0,153],'':0},
 ['mi',137],
-{'@':[137,776],'':138},
+{'@':[137,783],'':138},
 [139,141],
 [0,153],
 'paramsList',
@@ -344,18 +344,18 @@ function:['ck',136],
 },
 ['m',0,')'],
 'paramDef',
-{'@':[146,770],'':147},
+{'@':[146,777],'':147},
 ['miA',148],
-{'@':[148,776],'':149},
+{'@':[148,783],'':149},
 {
 '{':[150,157],
 ':':['c',151],
 },
-{not:[0,438],null:'not','':0},
+{not:[0,439],null:'not','':0},
 [0,357],
 'returnsSpec',
 ['mk',154,'returns',,'default','elementRestriction'],
-{'@':[154,770],'':155},
+{'@':[154,777],'':155},
 [0,357],
 'elementsBlock',
 ['m',158,'{'],
@@ -367,25 +367,25 @@ Id:['g',158,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'elementDef',
-{'@':[162,770],'':163},
+{'@':[162,777],'':163},
 {virtual:['ck',164,1],'':164},
 {key:['ck',165],'':165},
 {masked:['ck',166,1,'hide_'],'':166},
 {element:['ck',167,1,'hide_'],'':167},
 ['mi',168,,,'elem','elementRestriction'],
-{'@':[168,776],'':169},
+{'@':[168,783],'':169},
 {
 '{':[170,157],
 ':':['c',171],
 '':172
 },
-{not:[172,438],null:'not','':172},
+{not:[172,439],null:'not','':172},
 [172,357],
 {'=':['c',173,,'elementRestriction','calc'],'':0},
-[174,643],
+[174,650],
 {stored:['ck',175],'':175},
 ['g',176],
-{'@':[176,770,,'elementRestriction','anno'],'':0},
+{'@':[176,777,,'elementRestriction','anno'],'':0},
 'enumSymbolsBlock',
 ['mk',179,'enum'],
 ['m',180,'{'],
@@ -396,19 +396,19 @@ Id:['g',158,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'enumSymbolDef',
-{'@':[184,770],'':185},
+{'@':[184,777],'':185},
 ['mi',186],
-{'@':[186,770],'':187},
+{'@':[186,777],'':187},
 {'=':['c',188],'':0},
 {
 String:['c',190],
 Number:['c',190],
 '+':['c',189],'-':'+',
-Id:[190,767,,'hide_'],'#':'Id',QuotedLiteral:'Id',
+Id:[190,774,,'hide_'],'#':'Id',QuotedLiteral:'Id',
 },
 ['m',190,'Number'],
 ['g',191],
-{'@':[191,770],'':0},
+{'@':[191,777],'':0},
 'foreignKeysBlock',
 ['m',194,'{'],
 {Id:[195,198],'@':'Id','':196},
@@ -418,8 +418,8 @@ Id:[190,767,,'hide_'],'#':'Id',QuotedLiteral:'Id',
 },
 ['m',0,'}'],
 'foreignKeyDef',
-{'@':[198,770],'':199},
-[200,40],
+{'@':[198,777],'':199},
+[200,39],
 {as:['ck',201],'':0},
 ['mi',0],
 'mixinElementDef',
@@ -429,28 +429,28 @@ Id:[190,767,,'hide_'],'#':'Id',QuotedLiteral:'Id',
 association:['ck',206],
 composition:['ck',208],
 },
-{'[':[207,426],'':207},
+{'[':[207,427],'':207},
 ['mk',210,'to'],
-{'[':[209,426],'':209},
+{'[':[209,427],'':209},
 ['mk',210,'of'],
 {one:['ck',211,1,'noRepeatedCardinality'],many:'one','':211},
-[212,40],
+[212,39],
 ['mk',213,'on'],
-[0,635],
+[0,642],
 'annotateArtifact',
-[216,36],
+[216,35],
 {
 ':':['c',217],
 with:['ck',222],
 '':222
 },
-[218,36],
+[218,35],
 {with:['ck',219],'':219},
 ['g',220],
-{'@':[220,770],'':221},
+{'@':[220,777],'':221},
 {'{':[0,320],'':0},
 ['g',223],
-{'@':[223,770],'':224},
+{'@':[223,777],'':224},
 {'(':[225,307],'':225},
 {
 returns:[0,316],
@@ -459,102 +459,102 @@ returns:[0,316],
 },
 {actions:[0,295],'':0},
 'extendArtifact',
-[229,36],
+[229,35],
 {
 ':':['c',230],
 with:['ck',239],
 '':236
 },
-[231,36],
+[231,35],
 {with:['ck',232],'':232},
 ['g',233],
-{'@':[233,770],'':234},
+{'@':[233,777],'':234},
 {
 elements:['ck',235],
 '{':235,
 enum:[0,178],
-'(':[0,417],
+'(':[0,418],
 '':0
 },
 [0,330],
-{'@':[236,770],'':237},
+{'@':[236,777],'':237},
 {'{':[238,330],'':0},
 {actions:[0,124],'':0},
-{'@':[239,770],'':240},
+{'@':[239,777],'':240},
 {
-Id:[241,40],
+Id:[241,39],
 elements:['ck',245,1],
 '{':245,
 actions:[0,124,1],
 enum:[0,178,1],
-'(':[0,417],
+'(':[0,418],
 columns:['ck',247,1],
 definitions:['ck',248,1],
 '':0
 },
 {',':['c',242],'':243},
-[241,40],
+[241,39],
 {'{':[244,330],'':244},
 {actions:[0,124],'':0},
 [246,330],
 {actions:[0,124],'':0},
-[0,558],
+[0,559],
 [0,5],
 'extendService',
 ['mk',251,'service'],
-[252,36],
+[252,35],
 {with:['ck',253],'':253},
 ['g',254],
-{'@':[254,770],'':255},
+{'@':[254,777],'':255},
 {'{':[0,5],'':0},
 'extendContext',
 ['mk',258,'context'],
-[259,36],
+[259,35],
 {with:['ck',260],'':260},
 ['g',261],
-{'@':[261,770],'':262},
+{'@':[261,777],'':262},
 {'{':[0,5],'':0},
 'extendType',
 ['mk',265,'type'],
-[266,36],
+[266,35],
 {with:['ck',269],'':267},
-{'@':[267,770],'':268},
+{'@':[267,777],'':268},
 {'{':[0,330],'':0},
-{'@':[269,770],'':270},
+{'@':[269,777],'':270},
 {
-Id:[271,40],
+Id:[271,39],
 elements:['ck',274,1],
 '{':274,
 enum:[0,178,1],
-'(':[0,417],
+'(':[0,418],
 '':0
 },
 {',':['c',272],'':273},
-[271,40],
+[271,39],
 {'{':[0,330],'':0},
 [0,330],
 'extendEntityOrAspect',
 {aspect:['ck',277],entity:'aspect'},
-[278,36],
+[278,35],
 {with:['ck',280],'':279},
-{'@':[279,770],'':284},
-{'@':[280,770],'':281},
+{'@':[279,777],'':284},
+{'@':[280,777],'':281},
 {
-Id:[282,40],
+Id:[282,39],
 actions:['g',284,1],
 '':284
 },
 {',':['c',283],'':284},
-[282,40],
+[282,39],
 {'{':[285,330],'':285},
 {actions:[0,124],'':0},
 'extendProjection',
 ['mk',288,'projection'],
-[289,36],
+[289,35],
 {with:['ck',290],'':290},
 ['g',291],
-{'@':[291,770],'':292},
-{'{':[293,558],'':293},
+{'@':[291,777],'':292},
+{'{':[293,559],'':293},
 {actions:[0,124],'':0},
 'annotateActionsBlock',
 ['mk',296,'actions'],
@@ -567,9 +567,9 @@ Id:['g',297,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'annotateBoundAction',
-{'@':[301,770],'':302},
+{'@':[301,777],'':302},
 ['mi',303],
-{'@':[303,770],'':304},
+{'@':[303,777],'':304},
 {'(':[305,307],'':305},
 {returns:[0,316,1],'':0},
 'annotateParamsBlock',
@@ -581,12 +581,12 @@ Id:['g',297,,'afterBrace'],'@':'Id',
 },
 ['m',0,')'],
 'annotateParam',
-{'@':[312,770],'':313},
+{'@':[312,777],'':313},
 ['mi',314],
-{'@':[314,770],'':0},
+{'@':[314,777],'':0},
 'annotateReturns',
 ['mk',317,'returns'],
-{'@':[317,770],'':318},
+{'@':[317,777],'':318},
 {'{':[0,320],'':0},
 'annotateElementsBlock',
 ['m',321,'{'],
@@ -598,9 +598,9 @@ Id:['g',321,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'annotateElement',
-{'@':[325,770],'':326},
+{'@':[325,777],'':326},
 ['mi',327],
-{'@':[327,770],'':328},
+{'@':[327,777],'':328},
 {'{':[0,320],'':0},
 'extendElementsBlock',
 ['m',331,'{'],
@@ -612,7 +612,7 @@ Id:['g',331,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'elementDefOrExtend',
-{'@':[335,770],'':336},
+{'@':[335,777],'':336},
 {
 Id:[0,162],'@':'Id',key:'Id',
 extend:['ck',337,1],
@@ -620,14 +620,14 @@ extend:['ck',337,1],
 {element:['ck',338,1],'':338},
 ['mi',339],
 {with:['ck',342],'':340},
-{'@':[340,770],'':341},
+{'@':[340,777],'':341},
 {'{':[0,330],'':0},
-{'@':[342,770],'':343},
+{'@':[342,777],'':343},
 {
 elements:['ck',344],
 '{':344,
 enum:[0,178],
-'(':[0,417],
+'(':[0,418],
 '':0
 },
 [0,330],
@@ -636,10 +636,10 @@ enum:[0,178],
 '{':[347,157],
 ':':['c',348],
 },
-{not:[0,438],null:'not','':0},
+{not:[0,439],null:'not','':0},
 {
 '{':[0,357,1],many:'{',type:'{',array:'{',localized:'{',association:'{',composition:'{',
-Id:[349,40],
+Id:[349,39],
 },
 {
 '(':[350,405],':':'(',
@@ -649,13 +649,13 @@ Id:[349,40],
 },
 {'@':[0,358],not:'@',enum:'@',null:'@',default:'@','':0},
 {',':['c',352],'':354},
-{Id:[353,40],'':354},
+{Id:[353,39],'':354},
 {
 ',':['c',352],
 '{':354,
 },
 [355,157],
-{not:[0,438],null:'not','':0},
+{not:[0,439],null:'not','':0},
 'typeExpression',
 {
 Id:[358,404],
@@ -668,25 +668,25 @@ many:['ck',378,1,,'calc','elementRestriction'],
 '{':[384,157,,,'calc','elementRestriction'],
 },
 ['g',359],
-{'@':[359,770],'':360},
-{not:[361,438,,'elementRestriction','notNull'],null:'not','':362},
-{'@':[361,770],'':362},
+{'@':[359,777],'':360},
+{not:[361,439,,'elementRestriction','notNull'],null:'not','':362},
+{'@':[361,777],'':362},
 {
 enum:[363,178,,,'anno','elementRestriction'],
 '@':[0,393],not:'@',null:'@',default:'@',
 '':0
 },
-{not:[364,438,,'elementRestriction','notNull'],null:'not','':364},
+{not:[364,439,,'elementRestriction','notNull'],null:'not','':364},
 {default:['ck',365,,'elementRestriction','default'],'':366},
-[366,643],
-{not:[0,438,,'elementRestriction','notNull'],null:'not','':0},
+[366,650],
+{not:[0,439,,'elementRestriction','notNull'],null:'not','':0},
 [368,404],
 {'@':[0,393],not:'@',null:'@',default:'@','':0},
-{'[':[370,426],'':370},
+{'[':[370,427],'':370},
 ['mk',371,'to'],
 {one:['ck',372,1,'noRepeatedCardinality'],many:'one','':372},
 [0,386],
-{'[':[374,426],'':374},
+{'[':[374,427],'':374},
 ['mk',375,'of'],
 {one:['ck',376,1,'noRepeatedCardinality'],many:'one','':376},
 {
@@ -699,104 +699,105 @@ Id:[379,404],
 type:[379,396,1],
 '{':[383,157],
 },
-{not:[380,438,,'elementRestriction','notNull'],null:'not','':380},
+{not:[380,439,,'elementRestriction','notNull'],null:'not','':380},
 {enum:[383,178],'':381},
-{'@':[381,770],'':382},
+{'@':[381,777],'':382},
 ['g',0,[]],
-{not:[0,438,,'elementRestriction','notNull'],null:'not','':0},
-{not:[0,438],null:'not','':0},
+{not:[0,439,,'elementRestriction','notNull'],null:'not','':0},
+{not:[0,439],null:'not','':0},
 'typeAssocProperties',
-[387,40],
-{'@':[387,770],'':388},
+[387,39],
+{'@':[387,777],'':388},
 {
 on:['ck',389],
 '{':[391,193],
 '@':[0,393],not:'@',null:'@',default:'@',
 '':0
 },
-[390,635],
-{'@':[390,770],'':0},
+[390,642],
+{'@':[390,777],'':0},
 {'@':[0,393],not:'@',null:'@',default:'@','':0},
 'typeProperties',
 {
-'@':[393,770],
-not:[393,438,,'elementRestriction','notNull'],null:'not',
+'@':[393,777],
+not:[393,439,,'elementRestriction','notNull'],null:'not',
 default:['ck',394,,'elementRestriction','default'],
 '':0
 },
-[393,643],
+[393,650],
 'typeTypeOf',
 ['mk',397,'type'],
 ['mk',398,'of'],
-[399,40],
+[399,39],
 {':':['c',400],'':0},
 ['miA',401],
 {'.':['c',402],'':0},
 ['miA',401],
 'typeRefOptArgs',
-[405,40],
+[405,39],
 {
 ':':['c',406],
-'(':['c',409],
+'(':['c',410],
 '':0
 },
 ['miA',407],
-{'.':['c',408],'':0},
+{'.':['c',408],'':409},
 ['miA',407],
+['g',0,[]],
 {
-Number:['c',410],
-Id:413,
+Number:['c',411],
+Id:414,
 },
-{',':['c',411],'':412},
+{',':['c',412],'':413},
 {
-Number:['c',410],
-floating:['ck',410],variable:'floating',
-')':412,
+Number:['c',411],
+floating:['ck',411],variable:'floating',
+')':413,
 },
-['g',415],
-{Id:[414,422],'':415},
+['g',416],
+{Id:[415,423],'':416},
 {
-',':['c',413],
-')':415,
+',':['c',414],
+')':416,
 },
 ['m',0,')'],
 'typeNamedArgsList',
-['m',418,'('],
-{Id:[419,422],'':420},
+['m',419,'('],
+{Id:[420,423],'':421},
 {
-',':['c',418],
-')':420,
+',':['c',419],
+')':421,
 },
 ['m',0,')'],
 'typeNamedArg',
-['mi',423],
-['m',424,':'],
+['mi',424],
+['m',425,':'],
 {
 Number:['c',0],
 floating:['ck',0],variable:'floating',
 },
 'cardinality',
-['m',427,'['],
+['m',428,'['],
 {
-'*':['c',428],
-Number:['c',430],
-'':432
+'*':['c',429],
+Number:['c',431],
+'':433
 },
-{',':['c',429],'':432},
-[432,434],
+{',':['c',430],'':433},
+[433,435],
 {
-',':['c',431],
-'..':[432,435],
-'':432
+',':['c',432],
+'..':[433,436],
+'':433
 },
-[432,434],
+[433,435],
 ['m',0,']'],
 'targetCardinality',
 {
 '*':['c',0],
-Number:['c',435],
+Number:['c',436],
 },
-{'..':['c',436],'':0},
+{'..':['c',437],'':0},
 {
 '*':['c',0],
 Number:['c',0],
@@ -804,578 +805,578 @@ Number:['c',0],
 'nullability',
 {
 null:['ck',0],
-not:['ck',439],
+not:['ck',440],
 },
 ['mk',0,'null'],
 'queryEOF',
-[442,451],
-{';':['c',443],'':443},
+[443,452],
+{';':['c',444],'':444},
 ['m',0,'EOF'],
 'projectionSpec',
-['mk',446,'projection',,,'afterBrace'],
-['mk',447,'on'],
-[448,512,,,,'afterBrace'],
-{'{':[449,558],'':449},
-{excluding:[0,551],'':0},
+['mk',447,'projection',,'entity','afterBrace'],
+['mk',448,'on'],
+[449,513],
+{'{':[450,559],'':450},
+{excluding:[0,552],'':0},
 'queryExpression',
 {
-'(':['c',452],
-Id:[454,461],
+'(':['c',453],
+Id:[455,462],
 },
-[453,451],
-['m',454,')'],
+[454,452],
+['m',455,')'],
 {
-intersect:['ck',455,,'precLeft_',4],
-minus:['ck',455,,'precLeft_',2],except:'minus',
-union:['ck',456,,'precLeft_',2],
-'':458
+intersect:['ck',456,,'precLeft_',4],
+minus:['ck',456,,'precLeft_',2],except:'minus',
+union:['ck',457,,'precLeft_',2],
+'':459
 },
-{distinct:['ck',457],'':457},
-{all:['ck',457],distinct:'all','':457},
-[454,451],
-{limit:['g',459,,'precPost_',0],order:'limit','':0},
-[0,615],
+{distinct:['ck',458],'':458},
+{all:['ck',458],distinct:'all','':458},
+[455,452],
+{limit:['g',460,,'precPost_',0],order:'limit','':0},
+[0,622],
 'selectQuery',
-['mk',462,'select'],
+['mk',463,'select'],
 {
-from:['ck',463],
-all:['ck',473,1],distinct:'all',
-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,
+from:['ck',464],
+all:['ck',474],distinct:'all',
+Id:474,'#':474,'(':474,'*':474,'+':474,'-':474,':':474,'?':474,'@':474,'{':474,key:474,not:474,case:474,cast:474,null:474,true:474,false:474,Number:474,String:474,exists:474,QuotedLiteral:474,
 },
-[464,481],
-{mixin:['ck',465],'':470},
-['m',466,'{'],
-{Id:[467,203],'':468},
+[465,482],
+{mixin:['ck',466],'':471},
+['m',467,'{'],
+{Id:[468,203],'':469},
 {
-';':['c',466],
-'}':468,
+';':['c',467],
+'}':469,
 },
-['m',469,'}'],
-['mk',470,'into'],
-{all:['ck',471],distinct:'all','':471},
-{'{':[472,558],'':472},
-{excluding:[479,551],'':479},
-['g',474,,,'sqlStyle','inSelectItem'],
+['m',470,'}'],
+['mk',471,'into'],
+{all:['ck',472],distinct:'all','':472},
+{'{':[473,559],'':473},
+{excluding:[480,552],'':480},
+['g',475,,,'sqlStyle','inSelectItem'],
 {
-'*':['c',475],
-Id:[475,568],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'*':['c',476],
+Id:[476,569],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
 },
-{',':['c',476],'':477},
+{',':['c',477],'':478},
 {
-'*':['c',475],
-Id:[475,568],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'*':['c',476],
+Id:[476,569],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
 },
-['mk',478,'from'],
-[479,481],
-{group:[0,603],where:'group',having:'group','':0},
+['mk',479,'from'],
+[480,482],
+{group:[0,610],where:'group',having:'group','':0},
 'querySource',
-[482,486],
-{',':483,'':0},
-{',':['c',484],'':0},
-[483,486],
+[483,487],
+{',':484,'':0},
+{',':['c',485],'':0},
+[484,487],
 'tableExpression',
 {
-'(':[487,499],
-Id:[488,512],
+'(':[488,500],
+Id:[489,513],
 },
-['g',488],
+['g',489],
 {
-cross:['ck',489],
-inner:['ck',492],
-full:['ck',491],left:'full',right:'full',
-join:['ck',494],
+cross:['ck',490],
+inner:['ck',493],
+full:['ck',492],left:'full',right:'full',
+join:['ck',495],
 '':0
 },
-['mk',490,'join'],
+['mk',491,'join'],
 {
-'(':[488,499],
-Id:[488,512],
+'(':[489,500],
+Id:[489,513],
 },
-{outer:['ck',492],'':492},
-{one:[493,506],many:'one',exact:'one','':493},
-['mk',494,'join'],
-['g',495],
-[496,486],
-['mk',497,'on'],
-[488,635],
+{outer:['ck',493],'':493},
+{one:[494,507],many:'one',exact:'one','':494},
+['mk',495,'join'],
+['g',496],
+[497,487],
+['mk',498,'on'],
+[489,642],
 'tableOrQueryParens',
-['m',500,'(',,,'queryOnLeft'],
+['m',501,'(',,,'queryOnLeft'],
 {
-'(':[501,499],
-Id:[502,486,,,'table','queryOnLeft'],
-select:[502,451],
+'(':[502,500],
+Id:[503,487,,,'table','queryOnLeft'],
+select:[503,452],
 },
 {
-full:[502,487,,,'table','queryOnLeft'],join:'full',left:'full',cross:'full',inner:'full',right:'full',
-limit:[502,454,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
-'':502
+full:[503,488,,,'table','queryOnLeft'],join:'full',left:'full',cross:'full',inner:'full',right:'full',
+limit:[503,455,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
+'':503
 },
-['m',503,')'],
+['m',504,')'],
 {
-as:['ck',504,,'queryOnLeft','table'],
+as:['ck',505,,'queryOnLeft','table'],
 Id:['ci',0,,'queryOnLeft','tableWithoutAs'],
 '':0
 },
 ['mi',0],
 'joinCardinality',
 {
-exact:['ck',507],
-one:507,
-many:['ck',508],
+exact:['ck',508],
+one:508,
+many:['ck',509],
 },
-['mk',508,'one'],
-['mk',509,'to'],
+['mk',509,'one'],
+['mk',510,'to'],
 {
-exact:['ck',510],
-one:510,
+exact:['ck',511],
+one:511,
 many:['ck',0],
 },
 ['mk',0,'one'],
 'fromRefWithOptAlias',
-[513,519],
-{':':['c',514],'':515},
-[515,519],
+[514,520],
+{':':['c',515],'':516},
+[516,520],
 {
-as:['ck',516],
+as:['ck',517],
 Id:['ci',0],
-'':517
+'':518
 },
 ['mi',0],
 ['g',0,[]],
 'fromPath',
-['mi',520],
-{'(':[521,525],'[':'(','':521},
-{'.':['c',522,,'notAfterEntityArgOrFilter'],'':0},
-['miA',523],
-{'(':[521,525],'[':'(','':521},
+['mi',521],
+{'(':[522,526],'[':'(','':522},
+{'.':['c',523,,'notAfterEntityArgOrFilter'],'':0},
+['miA',524],
+{'(':[522,526],'[':'(','':522},
 'fromArgumentsAndFilter',
-{'(':['c',526],'':530},
-{Id:527},
-{Id:[528,532],'':529},
+{'(':['c',527],'':531},
+{Id:528},
+{Id:[529,533],'':530},
 {
-',':['c',527],
-')':529,
+',':['c',528],
+')':530,
 },
-['m',530,')'],
-{'[':[0,536],'':0},
+['m',531,')'],
+{'[':[0,537],'':0},
 'fromNamedArgument',
-['mi',533],
-['m',534,':'],
-[0,643],
+['mi',534],
+['m',535,':'],
+[0,650],
 'cardinalityAndFilter',
-['m',537,'['],
-{Number:['c',538,,'beforeColon'],'':539},
-['m',539,':'],
-[540,542],
+['m',538,'['],
+{Number:['c',539,,'beforeColon'],'':540},
+['m',540,':'],
+[541,543],
 ['m',0,']'],
 'filterClauses',
 {
-where:['ck',543],
-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,
-group:['g',544,1],limit:'group',order:'group',having:'group',
-'':544
+where:['ck',544],
+Id:544,'#':544,'(':544,'+':544,'-':544,':':544,'?':544,not:544,case:544,cast:544,null:544,true:544,false:544,Number:544,String:544,exists:544,QuotedLiteral:544,
+group:['g',545,1],limit:'group',order:'group',having:'group',
+'':545
 },
-[544,635],
-{group:['g',545,,'hide_'],'':546},
-[546,609],
-{having:['ck',547,,'hide_'],'':548},
-[548,635],
-{limit:['g',549,,'hide_'],order:'limit','':0},
-[0,615],
+[545,642],
+{group:['g',546,,'hide_'],'':547},
+[547,616],
+{having:['ck',548,,'hide_'],'':549},
+[549,642],
+{limit:['g',550,,'hide_'],order:'limit','':0},
+[0,622],
 'excludingClause',
-['mk',552,'excluding'],
-['m',553,'{'],
-{Id:554},
-{Id:['ciA',555],'':556},
+['mk',553,'excluding'],
+['m',554,'{'],
+{Id:555},
+{Id:['ciA',556],'':557},
 {
-',':['c',554],
-'}':556,
+',':['c',555],
+'}':557,
 },
 ['m',0,'}',,,'afterBrace'],
 'selectItemsList',
-['m',559,'{',,'top','inSelectItem'],
+['m',560,'{',,'top','inSelectItem'],
 {
-'*':['c',560],
-Id:[560,568],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'':561
+'*':['c',561],
+Id:[561,569],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'':562
 },
 {
-',':['c',559],
-'}':561,
+',':['c',560],
+'}':562,
 },
 ['m',0,'}',,,'afterBrace'],
 'nestedSelectItemsList',
-['m',564,'{',,'nested','inSelectItem'],
+['m',565,'{',,,'inSelectItem'],
 {
-'*':['c',565],
-Id:[565,568],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'':566
+'*':['c',566],
+Id:[566,569],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'':567
 },
 {
-',':['c',564],
-'}':566,
+',':['c',565],
+'}':567,
 },
 ['m',0,'}',,,'afterBrace'],
 'selectItemDef',
-{'@':[568,773],'':569},
-{virtual:['ck',570,1,'modifierRestriction'],'':570},
-['g',571,,,'key','columnExpr'],
-{key:['ck',572,,'modifierRestriction'],'':572},
+{'@':[569,780],'':570},
+{virtual:['ck',571,1,'modifierRestriction'],'':571},
+['g',572,,,'key','columnExpr'],
+{key:['ck',573,,'modifierRestriction'],'':573},
 {
-Id:[573,643],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'{':[580,563],
+'#':[574,650,1],'(':'#','+':'#','-':'#',':':'#','?':'#',new:'#',not:'#',case:'#',cast:'#',null:'#',true:'#',false:'#',Number:'#',String:'#',exists:'#',QuotedLiteral:'#',
+Id:[576,644],
+'{':[587,564],
 },
 {
-as:['ck',574],
-Id:['ci',577],
-'.':['c',575],
-'':577
+as:['ck',575],
+Id:['ci',584],
+'':584
 },
-['mi',577],
+['mi',584],
 {
-'{':[576,563],
-'*':['c',0],
+over:['ck',577],
+'*':[579,651],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
+as:['ck',581],
+Id:['ci',584,,,,'nestedExpand'],
+'.':['c',582],
+'':584
+},
+[578,738],
+{'*':[579,651],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*','':579},
+{
+as:['ck',580],
+Id:['ci',584],
+'':584
 },
-{excluding:[0,551],'':0},
-{'{':578,'':583},
-[579,563],
-{excluding:[583,551],'':583},
-{excluding:[581,551],'':581},
-['mk',582,'as'],
-['mi',583],
-['g',584,,,,'columnExpr'],
-{'@':[584,776],'':585},
-{':':['c',586],'':0},
+['mi',584],
+['mi',584,,,,'nestedExpand'],
 {
-type:[600,396,1],
-localized:['ck',587,1],
-Id:587,
-redirected:['ck',588,1],
-association:['ck',592,1,'columnExpr'],
-composition:['ck',594,1,'columnExpr'],
+'{':[583,564],
+'*':['c',0],
 },
-[600,404],
-['mk',589,'to'],
-[590,40],
+{excluding:[0,552],'':0},
+{'{':['g',585,,'nestedExpand'],'':590},
+[586,564],
+{excluding:[590,552],'':590},
+{excluding:[588,552],'':588},
+['mk',589,'as'],
+['mi',590],
+['g',591,,,,'columnExpr'],
+{'@':[591,783],'':592},
+{':':['c',593],'':0},
 {
-on:['ck',591],
-'{':[600,193],
-'':600
+type:[607,396,1],
+localized:['ck',594,1],
+Id:594,
+redirected:['ck',595,1],
+association:['ck',599,1,'columnExpr'],
+composition:['ck',601,1,'columnExpr'],
 },
-[600,635],
-{'[':[593,426],'':593},
+[607,404],
 ['mk',596,'to'],
-{'[':[595,426],'':595},
-['mk',596,'of'],
-{one:['ck',597,1,'noRepeatedCardinality'],many:'one','':597},
-[598,40],
-['mk',599,'on'],
-[600,635],
-['g',601],
-{'@':[601,770],'':0},
+[597,39],
+{
+on:['ck',598],
+'{':[607,193],
+'':607
+},
+[607,642],
+{'[':[600,427],'':600},
+['mk',603,'to'],
+{'[':[602,427],'':602},
+['mk',603,'of'],
+{one:['ck',604,1,'noRepeatedCardinality'],many:'one','':604},
+[605,39],
+['mk',606,'on'],
+[607,642],
+['g',608],
+{'@':[608,777],'':0},
 'whereGroupByHaving',
-{where:['ck',604],'':605},
-[605,635],
-{group:[606,609],'':606},
-{having:['ck',607],'':0},
-[0,635],
+{where:['ck',611],'':612},
+[612,642],
+{group:[613,616],'':613},
+{having:['ck',614],'':0},
+[0,642],
 'groupByClause',
-['mk',610,'group'],
-['mk',611,'by'],
-[612,643],
-{',':['c',613],'':0},
-[612,643],
+['mk',617,'group'],
+['mk',618,'by'],
+[619,650],
+{',':['c',620],'':0},
+[619,650],
 'orderByLimitOffset',
-{order:[616,621],'':616},
-{limit:['ck',617],'':0},
-[618,643],
-{offset:['ck',619],'':0},
-[0,643],
+{order:[623,628],'':623},
+{limit:['ck',624],'':0},
+[625,650],
+{offset:['ck',626],'':0},
+[0,650],
 'orderByClause',
-['mk',622,'order'],
-['mk',623,'by'],
-[624,627],
-{',':['c',625],'':0},
-[624,627],
+['mk',629,'order'],
+['mk',630,'by'],
+[631,634],
+{',':['c',632],'':0},
+[631,634],
 'orderByExpression',
-[628,643],
-{asc:['ck',629],desc:'asc','':629},
-{nulls:['ck',630],'':0},
+[635,650],
+{asc:['ck',636],desc:'asc','':636},
+{nulls:['ck',637],'':0},
 {last:['ck',0],first:'last'},
 'conditionEOF',
-[633,643],
+[640,650],
 ['m',0,'EOF'],
 'condition',
-[0,643],
+[0,650],
 'valuePath',
-['mi',638],
-{'(':[639,704],'[':'(','':639},
-{'.':['c',640,,'isDotForPath'],'':0},
-['miA',641],
-{'(':[639,704],'[':'(','':639},
+['mi',645],
+{'(':[646,711],'[':'(','':646},
+{'.':['c',647,,'isDotForPath'],'':0},
+['miA',648],
+{'(':[646,711],'[':'(','':646},
 'expression',
 {
-'(':[644,671],
-'#':[654,767],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
-':':['c',645],
-'?':['c',654,,'hide_'],
-Id:[647,637],
-new:[654,683,1],
-exists:['ck',650],
-case:[654,686],
-cast:[654,697],
-'+':['c',653,,'precRight_',30],'-':'+',
-not:['ck',653,,'precRight_',8],
+'(':[651,678],
+'#':[661,774],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
+':':['c',652],
+'?':['c',661,,'hide_'],
+Id:[654,644],
+new:[661,690,1],
+exists:['ck',657],
+case:[661,693],
+cast:[661,704],
+'+':['c',660,,'precRight_',30],'-':'+',
+not:['ck',660,,'precRight_',8],
 },
-['g',654],
+['g',661],
 {
-Id:['ciA',646],
-Number:['c',654,,'hide_'],
+Id:['ciA',653],
+Number:['c',661,,'hide_'],
 },
-{'.':[654,639],'':654},
-{over:['ck',648],'':649},
-[649,731],
-['g',654],
+{'.':[661,646],'':661},
+{over:['ck',655],'':656},
+[656,738],
+['g',661],
 {
-'(':['c',651],
-Id:[654,637],
-'?':['c',654,,'hide_'],
+'(':['c',658],
+Id:[661,644],
+'?':['c',661,,'hide_'],
 },
-[652,451],
-['m',654,')'],
-[654,643],
+[659,452],
+['m',661,')'],
+[661,650],
 {
-'*':['c',658,,'precLeft_',24],'/':'*',
-'+':['c',658,,'precLeft_',22],'-':'+',
-'||':['c',658,,'precLeft_',20],
-and:['ck',658,,'precLeft_',4],
-or:['ck',658,,'precLeft_',2],
-'?':['c',655,,'precLeft_',0],
-'<':['c',657,,'precNone_',10],'=':'<','>':'<','!=':'<','<=':'<','<>':'<','>=':'<',
-is:['ck',659,,'precNone_',10],
-not:['ck',661,,'isNegatedRelation','10'],
-in:['g',661,,'precNone_',10],like:'in',between:'in',
+'*':['c',665,,'precLeft_',24],'/':'*',
+'+':['c',665,,'precLeft_',22],'-':'+',
+'||':['c',665,,'precLeft_',20],
+and:['ck',665,,'precLeft_',4],
+or:['ck',665,,'precLeft_',2],
+'?':['c',662,,'precLeft_',0],
+'<':['c',664,,'precNone_',10],'=':'<','>':'<','!=':'<','<=':'<','<>':'<','>=':'<',
+is:['ck',666,,'precNone_',10],
+not:['ck',668,,'isNegatedRelation','10'],
+in:['g',668,,'precNone_',10],like:'in',between:'in',
 '':0
 },
-[656,643],
-['m',658,':'],
-{all:['ck',658],any:'all',some:'all','':658},
-[669,643],
-{not:['ck',660],'':660},
-['mk',669,'null'],
+[663,650],
+['m',665,':'],
+{all:['ck',665],any:'all',some:'all','':665},
+[676,650],
+{not:['ck',667],'':667},
+['mk',676,'null'],
 {
-between:['ck',662],
-in:['ck',665],
-like:['ck',666],
+between:['ck',669],
+in:['ck',672],
+like:['ck',673],
 },
-[663,643],
-['mk',664,'and'],
-[669,643],
-[669,643],
-[667,643],
-{escape:['ck',668],'':669},
-[669,643],
-['g',654],
+[670,650],
+['mk',671,'and'],
+[676,650],
+[676,650],
+[674,650],
+{escape:['ck',675],'':676},
+[676,650],
+['g',661],
 'expressionOrQueryParens',
-['m',672,'(',,,'queryOnLeft'],
+['m',679,'(',,,'queryOnLeft'],
 {
-'(':[673,671],
-Id:[675,643,,,'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:[676,451],
+'(':[680,678],
+Id:[682,650,,,'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:[683,452],
 },
 {
-'*':[674,644,,,'expr','queryOnLeft'],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
-',':[676,678,,,'expr','queryOnLeft'],
-limit:[676,454,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
-'':676
+'*':[681,651,,,'expr','queryOnLeft'],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
+',':[683,685,,,'expr','queryOnLeft'],
+limit:[683,455,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
+'':683
 },
-{',':[676,678],'':676},
-{',':[676,678],'':676},
+{',':[683,685],'':683},
+{',':[683,685],'':683},
 ['m',0,')'],
 'continueExpressionslist',
-['m',679,','],
-{Id:680,'#':680,'(':680,'+':680,'-':680,':':680,'?':680,not:680,case:680,cast:680,null:680,true:680,false:680,Number:680,String:680,exists:680,QuotedLiteral:680},
-{Id:[681,643],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id','':0},
-{',':['c',680],'':0},
+['m',686,','],
+{Id:687,'#':687,'(':687,'+':687,'-':687,':':687,'?':687,not:687,case:687,cast:687,null:687,true:687,false:687,Number:687,String:687,exists:687,QuotedLiteral:687},
+{Id:[688,650],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id','':0},
+{',':['c',687],'':0},
 'newAndValuePath',
-['mk',684,'new'],
-[0,637],
+['mk',691,'new'],
+[0,644],
 'caseExpression',
-['mk',687,'case'],
-{
-Id:[688,643],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id',
-when:['g',688,1],
-'':688
-},
-{when:689},
-{when:['ck',690],'':693},
-[691,643],
-['mk',692,'then'],
-[689,643],
-{else:['ck',694],'':695},
-[695,643],
+['mk',694,'case'],
+{Id:[695,650],'#':'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','':695},
+{when:696},
+{when:['ck',697],'':700},
+[698,650],
+['mk',699,'then'],
+[696,650],
+{else:['ck',701],'':702},
+[702,650],
 ['mk',0,'end'],
 'castFunction',
-['mk',698,'cast'],
-['m',699,'('],
-[700,643],
-['mk',701,'as'],
-[702,404],
+['mk',705,'cast'],
+['m',706,'('],
+[707,650],
+['mk',708,'as'],
+[709,404],
 ['m',0,')'],
 'argumentsAndFilter',
-{'(':['c',705,,,,'prepareSpecialFunction'],'':724},
-{Id:['ciA',712,,'isNamedArg'],'':706},
-{Id:[707,726],'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Id_all:'Id',Number:'Id',String:'Id',QuotedLiteral:'Id','':723},
-{',':['c',708,,,,'nextFunctionArgument'],'':709},
+{'(':['c',712,,,,'prepareSpecialFunction'],'':731},
+{Id:['ciA',719,,'isNamedArg'],'':713},
+{Id:[714,733],'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Id_all:'Id',Number:'Id',String:'Id',QuotedLiteral:'Id','':730},
+{',':['c',715,,,,'nextFunctionArgument'],'':716},
 {
-Id:[707,726],'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Id_all:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id',
-')':['g',709,1],order:')',
+Id:[714,733],'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Id_all:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id',
+')':['g',716,1],order:')',
 },
-{order:['ck',710],'':723},
-['mk',711,'by'],
-[723,746],
+{order:['ck',717],'':730},
+['mk',718,'by'],
+[730,753],
 {
-':':['c',713],
-'=>':['c',718],
+':':['c',720],
+'=>':['c',725],
 },
-[714,643],
-{',':['c',715],'':723},
+[721,650],
+{',':['c',722],'':730},
 {
-Id:['ciA',716],
-')':723,
+Id:['ciA',723],
+')':730,
 },
-['m',717,':'],
-[714,643],
-[719,643],
-{',':['c',720],'':723},
+['m',724,':'],
+[721,650],
+[726,650],
+{',':['c',727],'':730},
 {
-Id:['ciA',721],
-')':723,
+Id:['ciA',728],
+')':730,
 },
-['m',722,'=>'],
-[719,643],
-['m',724,')'],
-{'[':[0,536],'':0},
+['m',729,'=>'],
+[726,650],
+['m',731,')'],
+{'[':[0,537],'':0},
 'funcExpression',
 {
 ' lookahead':'lGenericIntroOrExpr',
-Id:[728,643],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-GenericExpr:['ckA',728],
-GenericIntro:['ckA',727],
+Id:[735,650],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+GenericExpr:['ckA',735],
+GenericIntro:['ckA',734],
 },
-[728,643],
+[735,650],
 {
 ' lookahead':'lGenericSeparator',
-GenericSeparator:['ckA',729],
+GenericSeparator:['ckA',736],
 '':0
 },
 {
 ' lookahead':'lGenericExpr',
-Id:[728,643],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-GenericExpr:['ckA',728],
+Id:[735,650],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+GenericExpr:['ckA',735],
 },
 'overClause',
-['m',732,'('],
-{partition:['ck',733],'':735},
-['mk',734,'by'],
-[735,742],
-{order:['ck',736],'':738},
-['mk',737,'by'],
-[738,746],
-{rows:['ck',739],'':740},
-[740,755],
+['m',739,'('],
+{partition:['ck',740],'':742},
+['mk',741,'by'],
+[742,749],
+{order:['ck',743],'':745},
+['mk',744,'by'],
+[745,753],
+{rows:['ck',746],'':747},
+[747,762],
 ['m',0,')'],
 'expressionsAsXpr',
-[743,643],
-{',':['c',744],'':0},
-[743,643],
+[750,650],
+{',':['c',751],'':0},
+[750,650],
 'orderByClauseAsXpr',
-[747,750],
-{',':['c',748],'':0},
-[747,750],
+[754,757],
+{',':['c',755],'':0},
+[754,757],
 'orderBySpecAsXpr',
-[751,643],
-{asc:['ck',752],desc:'asc','':752},
-{nulls:['ck',753],'':0},
+[758,650],
+{asc:['ck',759],desc:'asc','':759},
+{nulls:['ck',760],'':0},
 {last:['ck',0],first:'last'},
 'windowFrameClause',
 {
-unbounded:['ck',756],
-Number:['c',756],
-current:['ck',757],
-between:['ck',758],
+unbounded:['ck',763],
+Number:['c',763],
+current:['ck',764],
+between:['ck',765],
 },
 ['mk',0,'preceding'],
 ['mk',0,'row'],
-[759,762],
-['mk',760,'and'],
-[0,762],
+[766,769],
+['mk',767,'and'],
+[0,769],
 'windowFrameBoundSpec',
 {
-unbounded:['ck',763],
-Number:['c',763],
-current:['ck',765],
+unbounded:['ck',770],
+Number:['c',770],
+current:['ck',772],
 },
 {
-following:['ck',764],
-preceding:['ck',764],
+following:['ck',771],
+preceding:['ck',771],
 },
 ['g',0,[]],
 ['mk',0,'row'],
 'literalValue',
 {
-'#':['c',768],
+'#':['c',775],
 null:['ck',0],
 true:['ck',0],false:'true',
 Number:['c',0],
 String:['c',0],
 QuotedLiteral:['c',0],
 },
-['mi',0],
+['miA',0],
 'annoAssignStd',
-['m',771,'@',,,'annoInSameLine'],
+['m',778,'@',,,'annoInSameLine'],
 {
-'(':[0,779],
-Id:[0,784],
+'(':[0,786],
+Id:[0,791],
 },
 'annoAssignCol',
-['m',774,'@'],
+['m',781,'@'],
 {
-'(':[0,779],
-Id:[0,784],
+'(':[0,786],
+Id:[0,791],
 },
 'annoAssignMid',
-['m',777,'@',,,'annoInSameLine'],
+['m',784,'@',,,'annoInSameLine'],
 {
-'(':[0,779],
-Id:[0,788],
+'(':[0,786],
+Id:[0,795],
 },
 'annoAssignParen',
-['m',780,'(',,,'annoInSameLine'],
-{Id:[781,784],'':782},
+['m',787,'(',,,'annoInSameLine'],
+{Id:[788,791],'':789},
 {
-',':['c',780],
-')':782,
+',':['c',787],
+')':789,
 },
 ['m',0,')'],
 'annoAssignBase',
-[785,788],
-{':':['c',786,,'annoInSameLine'],'':0},
-[0,810],
+[792,795],
+{':':['c',793,,'annoInSameLine'],'':0},
+[0,817],
 'annoNamePath',
-['miA',789],
-{'.':['c',790],'':792},
-{
-Id:['ciA',789],
-'@':['c',791],
-},
-['miA',789],
-{'#':[0,801,,'annoInSameLine'],'':0},
-'annoPath',
-{
-Id:['ciA',796],
-'@':['c',795],
-},
 ['miA',796],
 {'.':['c',797],'':799},
 {
@@ -1383,48 +1384,62 @@ Id:['ciA',796],
 '@':['c',798],
 },
 ['miA',796],
-{'#':[0,801],'':0},
-'annoPathVariant',
-['m',802,'#'],
+{'#':[0,808,,'annoInSameLine'],'':0},
+'annoPath',
+{
+Id:['ciA',803],
+'@':['c',802],
+},
 ['miA',803],
-{'.':['c',804],'':0},
+{'.':['c',804],'':806},
+{
+Id:['ciA',803],
+'@':['c',805],
+},
 ['miA',803],
+{'#':[0,808],'':0},
+'annoPathVariant',
+['m',809,'#'],
+['miA',810],
+{'.':['c',811],'':0},
+['miA',810],
 'annoStructValue',
-[807,794],
-{':':['c',808],'':0},
-[0,810],
+[814,801],
+{':':['c',815],'':0},
+[0,817],
 'annoValue',
 {
-'#':[0,767],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
-'+':['c',811],'-':'+',
-Id:[0,794],'@':'Id',
-'{':['c',812],
-'[':['c',816,,,,'arrayAnno'],
-'(':['c',823],
+'#':[0,774],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
+'+':['c',818],'-':'+',
+Id:[0,801],'@':'Id',
+'{':['c',819],
+'[':['c',823,,,,'arrayAnno'],
+'(':['c',830],
 },
 ['m',0,'Number'],
-{Id:[813,806],'@':'Id','':814},
+{Id:[820,813],'@':'Id','':821},
 {
-',':['c',812],
-'}':814,
+',':['c',819],
+'}':821,
+Id:['g',819,,'fail'],'@':'Id',
 },
-['g',815],
+['g',822],
 ['m',0,'}'],
 {
-Id:[820,810],'#':'Id','(':'Id','+':'Id','-':'Id','@':'Id','[':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'...':['c',817,,'arrayAnno','ellipsis'],
-'':821
+Id:[827,817],'#':'Id','(':'Id','+':'Id','-':'Id','@':'Id','[':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'...':['c',824,,'arrayAnno','ellipsis'],
+'':828
 },
-{up:['ck',818],'':820},
-['mk',819,'to'],
-[820,810],
+{up:['ck',825],'':827},
+['mk',826,'to'],
+[827,817],
 {
-',':['c',816],
-']':821,
+',':['c',823],
+']':828,
 },
-['g',822],
+['g',829],
 ['m',0,']'],
-[824,635],
+[831,642],
 ['m',0,')'],
 ]
 class CdlParser extends AstBuildingParser{
@@ -1452,7 +1467,7 @@ default:return this.exit_()
 artifactsBlock($,$next){
 this.rule_(5,$next)
 for(;;)switch(this.s){
-case 5:if(this.m(6,'{')){this.vocabularyRestriction(); $.art.artifacts = this.createDict( $.start ); $.art.extensions = []; }continue
+case 5:if(this.m(6,'{')){ $.art.artifacts = this.createDict( $.start ); $.art.extensions = []; }continue
 case 6:switch(this.l()){
 case'Id':case'@':this.artifactDefOrExtend({outer:$.art},7);continue
 default:this.s=8;continue
@@ -1539,25 +1554,21 @@ default:this.gr([';']);continue
 }
 case 23:if(this.m(0,'String')){ $.source.dependencies.push( decl.fileDep = this.quotedLiteral() ); }continue
 case 24:if(this.m(25,'{')){ decl.usings = this.createArray(); }continue
-case 25:switch(this.lk()){
-case'Id':this.s=26;continue
-default:this.ei();continue
+case 25:switch(this.l()){
+case'Id':this.usingProxy({outer:decl,proxy:{ kind: 'using' }},26);continue
+default:this.s=27;continue
 }
 case 26:switch(this.l()){
-case'Id':this.usingProxy({outer:decl,proxy:{ kind: 'using' }},27);continue
-default:this.s=28;continue
-}
-case 27:switch(this.l()){
-case',':this.c(26);continue
-case'}':this.s=28;continue
+case',':this.c(25);continue
+case'}':this.s=27;continue
 default:this.e();continue
 }
-case 28:if(this.m(29,'}')){this.afterBrace(); this.finalizeDictOrArray( decl.usings ); }continue
-case 29:switch(this.lk()){
-case'from':this.ck(30);continue
+case 27:if(this.m(28,'}')){this.afterBrace(); this.finalizeDictOrArray( decl.usings ); }continue
+case 28:switch(this.lk()){
+case'from':this.ck(29);continue
 default:this.gr([';']);continue
 }
-case 30:if(this.m(0,'String')){ $.source.dependencies.push( decl.fileDep = this.quotedLiteral() ); }continue
+case 29:if(this.m(0,'String')){ $.source.dependencies.push( decl.fileDep = this.quotedLiteral() ); }continue
 default:
 this.attachLocation( decl )
 return this.exit_()
@@ -1565,14 +1576,14 @@ return this.exit_()
 }
 usingProxy($,$next){
 let extern;let _
-this.rule_(32,$next)
+this.rule_(31,$next)
 for(;;)switch(this.s){
-case 32:if(this.simplePath(_={category:'global'},33)){extern=_.ref; $.proxy.extern = extern; $.outer.usings.push( $.proxy ); }continue
-case 33:switch(this.lk()){
-case'as':this.ck(34);continue
+case 31:if(this.simplePath(_={category:'global'},32)){extern=_.ref; $.proxy.extern = extern; $.outer.usings.push( $.proxy ); }continue
+case 32:switch(this.lk()){
+case'as':this.ck(33);continue
 default:if(this.gr([])){ this.classifyImplicitName( 'Using' ); }continue
 }
-case 34:if(this.mi(0,'UsingAlias')){ $.proxy.name = this.identAst(); }continue
+case 33:if(this.mi(0,'UsingAlias')){ $.proxy.name = this.identAst(); }continue
 default:
 this.attachLocation( $.proxy )
 return this.exit_()
@@ -1580,14 +1591,14 @@ return this.exit_()
 }
 namePath($,$next){
 $.name??=new XsnName()
-this.rule_(36,$next)
+this.rule_(35,$next)
 for(;;)switch(this.s){
-case 36:if(this.mi(37,$.category)){ $.name.path = [ this.identAst() ]; }continue
-case 37:switch(this.l()){
-case'.':this.c(38);continue
+case 35:if(this.mi(36,$.category)){ $.name.path = [ this.identAst() ]; }continue
+case 36:switch(this.l()){
+case'.':this.c(37);continue
 default:this.gr(['@']);continue
 }
-case 38:if(this.miA(37,$.category)){ $.name.path.push( this.identAst() ); }continue
+case 37:if(this.miA(36,$.category)){ $.name.path.push( this.identAst() ); }continue
 default:
 this.attachLocation( $.name )
 return this.exit_()
@@ -1595,14 +1606,14 @@ return this.exit_()
 }
 simplePath($,$next){
 $.ref??={}
-this.rule_(40,$next)
+this.rule_(39,$next)
 for(;;)switch(this.s){
-case 40:if(this.mi(41,$.category)){ $.ref.path = [ this.identAst() ]; }continue
-case 41:switch(this.l()){
-case'.':this.c(42);continue
+case 39:if(this.mi(40,$.category)){ $.ref.path = [ this.identAst() ]; }continue
+case 40:switch(this.l()){
+case'.':this.c(41);continue
 default:this.gr([]);continue
 }
-case 42:if(this.miA(41,$.category)){ $.ref.path.push( this.identAst() ); }continue
+case 41:if(this.miA(40,$.category)){ $.ref.path.push( this.identAst() ); }continue
 default:
 this.attachLocation( $.ref )
 return this.exit_()
@@ -1610,16 +1621,16 @@ return this.exit_()
 }
 serviceDef($,$next){
 let name;let _
-this.rule_(44,$next)
+this.rule_(43,$next)
 for(;;)switch(this.s){
-case 44:this.mk(45,'service');continue
-case 45:if(this.namePath(_={category:'Service'},46)){name=_.name; this.addDef( $.art, $.outer, 'artifacts', 'service', name );
+case 43:if(this.mk(44,'service')){this.vocabularyRestriction()}continue;
+case 44:if(this.namePath(_={category:'Service'},45)){name=_.name; this.addDef( $.art, $.outer, 'artifacts', 'service', name );
 this.docComment( $.art ); }continue
-case 46:switch(this.l()){
-case'@':this.annoAssignMid({art:$.art},46);continue
-default:this.s=47;continue
+case 45:switch(this.l()){
+case'@':this.annoAssignMid({art:$.art},45);continue
+default:this.s=46;continue
 }
-case 47:switch(this.l()){
+case 46:switch(this.l()){
 case'{':this.artifactsBlock({art:$.art,start:undefined},0);continue
 default:this.gr([';']);continue
 }
@@ -1630,16 +1641,16 @@ return this.exit_()
 }
 contextDef($,$next){
 let name;let _
-this.rule_(49,$next)
+this.rule_(48,$next)
 for(;;)switch(this.s){
-case 49:this.mk(50,'context');continue
-case 50:if(this.namePath(_={category:'Context'},51)){name=_.name; this.addDef( $.art, $.outer, 'artifacts', 'context', name );
+case 48:if(this.mk(49,'context')){this.vocabularyRestriction()}continue;
+case 49:if(this.namePath(_={category:'Context'},50)){name=_.name; this.addDef( $.art, $.outer, 'artifacts', 'context', name );
 this.docComment( $.art ); }continue
-case 51:switch(this.l()){
-case'@':this.annoAssignMid({art:$.art},51);continue
-default:this.s=52;continue
+case 50:switch(this.l()){
+case'@':this.annoAssignMid({art:$.art},50);continue
+default:this.s=51;continue
 }
-case 52:switch(this.l()){
+case 51:switch(this.l()){
 case'{':this.artifactsBlock({art:$.art,start:undefined},0);continue
 default:this.gr([';']);continue
 }
@@ -1650,16 +1661,16 @@ return this.exit_()
 }
 annotationDef($,$next){
 let name;let _
-this.rule_(54,$next)
+this.rule_(53,$next)
 for(;;)switch(this.s){
-case 54:this.mk(55,'annotation');continue
-case 55:if(this.namePath(_={category:'AnnoDef'},56)){name=_.name; this.addDef( $.art, $.outer, ($.outer.kind === 'source' ? 'vocabularies' : 'artifacts'), 'annotation', name );
+case 53:this.mk(54,'annotation');continue
+case 54:if(this.namePath(_={category:'AnnoDef'},55)){name=_.name; this.addDef( $.art, $.outer, ($.outer.kind === 'source' ? 'vocabularies' : 'artifacts'), 'annotation', name );
 this.docComment( $.art ); }continue
-case 56:switch(this.l()){
-case'@':this.annoAssignMid({art:$.art},56);continue
-default:this.s=57;continue
+case 55:switch(this.l()){
+case'@':this.annoAssignMid({art:$.art},55);continue
+default:this.s=56;continue
 }
-case 57:this.typeOrIncludesSpec({art:$.art},0);continue
+case 56:this.typeOrIncludesSpec({art:$.art},0);continue
 default:
 this.attachLocation( $.art )
 return this.exit_()
@@ -1667,16 +1678,16 @@ return this.exit_()
 }
 typeDef($,$next){
 let name;let _
-this.rule_(59,$next)
+this.rule_(58,$next)
 for(;;)switch(this.s){
-case 59:this.mk(60,'type');continue
-case 60:if(this.namePath(_={category:'Type'},61)){name=_.name; this.addDef( $.art, $.outer, 'artifacts', 'type', name );
+case 58:this.mk(59,'type');continue
+case 59:if(this.namePath(_={category:'Type'},60)){name=_.name; this.addDef( $.art, $.outer, 'artifacts', 'type', name );
 this.docComment( $.art ); }continue
-case 61:switch(this.l()){
-case'@':this.annoAssignMid({art:$.art},61);continue
-default:this.s=62;continue
+case 60:switch(this.l()){
+case'@':this.annoAssignMid({art:$.art},60);continue
+default:this.s=61;continue
 }
-case 62:this.typeOrIncludesSpec({art:$.art},0);continue
+case 61:this.typeOrIncludesSpec({art:$.art},0);continue
 default:
 this.attachLocation( $.art )
 return this.exit_()
@@ -1684,36 +1695,36 @@ return this.exit_()
 }
 aspectDef($,$next){
 let name;let incl;let _
-this.rule_(64,$next)
+this.rule_(63,$next)
 for(;;)switch(this.s){
-case 64:switch(this.lk()){
-case'aspect':this.ck(66);continue
-case'abstract':if(this.ck(65)){ this.warning( 'syntax-deprecated-abstract', this.combineLocation( this.lb(), this.la() ) ); }continue
+case 63:switch(this.lk()){
+case'aspect':this.ck(65);continue
+case'abstract':if(this.ck(64)){ this.warning( 'syntax-deprecated-abstract', this.combineLocation( this.lb(), this.la() ) ); }continue
 default:this.e();continue
 }
-case 65:this.mk(66,'entity');continue
-case 66:if(this.namePath(_={category:'Type'},67)){name=_.name; this.addDef( $.art, $.outer, 'artifacts', 'aspect', name );
+case 64:this.mk(65,'entity');continue
+case 65:if(this.namePath(_={category:'Type'},66)){name=_.name; this.addDef( $.art, $.outer, 'artifacts', 'aspect', name );
 this.docComment( $.art ); }continue
+case 66:switch(this.l()){
+case'@':this.annoAssignMid({art:$.art},66);continue
+default:this.s=67;continue
+}
 case 67:switch(this.l()){
-case'@':this.annoAssignMid({art:$.art},67);continue
-default:this.s=68;continue
+case'{':this.elementsBlock({art:$.art},71);continue
+case':':this.c(68);continue
+default:this.gr([';']);continue
 }
 case 68:switch(this.l()){
-case'{':this.elementsBlock({art:$.art},72);continue
-case':':this.c(69);continue
-default:this.gr([';']);continue
+case'Id':if(this.simplePath(_={category:'artref'},69)){incl=_.ref; $.art.includes ??= []; $.art.includes.push( incl ); }continue
+default:this.s=70;continue
 }
 case 69:switch(this.l()){
-case'Id':if(this.simplePath(_={category:'artref'},70)){incl=_.ref; $.art.includes ??= []; $.art.includes.push( incl ); }continue
-default:this.s=71;continue
-}
-case 70:switch(this.l()){
-case',':this.c(69);continue
-case'{':this.s=71;continue
+case',':this.c(68);continue
+case'{':this.s=70;continue
 default:this.gr([';']);continue
 }
-case 71:this.elementsBlock({art:$.art},72);continue
-case 72:switch(this.lk()){
+case 70:this.elementsBlock({art:$.art},71);continue
+case 71:switch(this.lk()){
 case'actions':this.actionsBlock({art:$.art},0);continue
 default:this.gr([';']);continue
 }
@@ -1724,52 +1735,57 @@ return this.exit_()
 }
 entityDef($,$next){
 let name;let incl;let query;let _
-this.rule_(74,$next)
+this.rule_(73,$next)
 for(;;)switch(this.s){
-case 74:this.mk(75,'entity');continue
-case 75:if(this.namePath(_={category:'Entity'},76)){name=_.name; this.addDef( $.art, $.outer, 'artifacts', 'entity', name );
+case 73:if(this.mk(74,'entity')){this.afterBrace()}continue;
+case 74:if(this.namePath(_={category:'Entity'},75)){name=_.name; this.addDef( $.art, $.outer, 'artifacts', 'entity', name );
 this.docComment( $.art ); }continue
+case 75:switch(this.l()){
+case'@':this.annoAssignMid({art:$.art},75);continue
+default:this.s=76;continue
+}
 case 76:switch(this.l()){
-case'@':this.annoAssignMid({art:$.art},76);continue
+case'(':this.paramsList({art:$.art},77);continue
 default:this.s=77;continue
 }
-case 77:switch(this.l()){
-case'(':this.paramsList({art:$.art},78);continue
-default:this.s=78;continue
-}
-case 78:switch(this.lk()){
-case':':if(this.c(79)){ $.art.includes ??= []; }continue
-case'{':this.s=82;continue
-case'as':this.ck(83);continue
+case 77:switch(this.lk()){
+case':':if(this.c(78)){ $.art.includes ??= []; }continue
+case'{':this.s=81;continue
+case'as':this.ck(82);continue
 default:this.e();continue
 }
-case 79:switch(this.lk()){
-case'Id':this.s=80;continue
+case 78:switch(this.lk()){
+case'Id':this.s=79;continue
 default:this.ei();continue
 }
-case 80:switch(this.l()){
-case'Id':if(this.simplePath(_={category:'artref'},81)){incl=_.ref; $.art.includes.push( incl ); }continue
-default:this.s=82;continue
+case 79:switch(this.l()){
+case'Id':if(this.simplePath(_={category:'artref'},80)){incl=_.ref; $.art.includes.push( incl ); }continue
+default:this.s=81;continue
 }
-case 81:switch(this.l()){
-case',':this.c(80);continue
-case'{':this.s=82;continue
+case 80:switch(this.l()){
+case',':this.c(79);continue
+case'{':this.s=81;continue
 default:this.e();continue
 }
-case 82:this.elementsBlock({art:$.art},86);continue
-case 83:switch(this.lk()){
+case 81:this.elementsBlock({art:$.art},86);continue
+case 82:switch(this.lk()){
 case'(':case'select':if(this.queryExpression(_={},86)){query=_.expr; $.art.query = query; $.art.$syntax = 'entity'; }continue
-case'projection':if(this.projectionSpec(_={},84)){query=_.query; $.art.query = query; $.art.$syntax = 'projection'; }continue
+case'projection':if(this.projectionSpec(_={},83)){query=_.query; $.art.query = query; $.art.$syntax = 'projection'; }continue
 default:this.e();continue
 }
+case 83:switch(this.lk()){
+case'group':case'where':case'having':this.whereGroupByHaving({query},84);continue
+default:this.s=84;continue
+}
 case 84:switch(this.lk()){
-case'group':case'where':case'having':this.whereGroupByHaving({query},85);continue
+case'limit':case'order':this.orderByLimitOffset({query},85);continue
 default:this.s=85;continue
 }
-case 85:switch(this.lk()){
-case'limit':case'order':this.orderByLimitOffset({query},86);continue
-default:this.s=86;continue
-}
+case 85:this.s=86;{this.afterBrace(); if (this.lb().type !== '}' && ![ ';', '}', 'EOF' ].includes( this.l() ) && this.la().keyword !== 'actions') {
+this.warning( 'syntax-missing-proj-semicolon', this.la(),
+{ expecting: [ "';'" ], offending: this.antlrName( this.la() ) },
+'Missing $(EXPECTING) before $(OFFENDING)');
+} }continue
 case 86:switch(this.lk()){
 case'actions':this.actionsBlock({art:$.art},0);continue
 default:this.gr([';']);continue
@@ -2089,7 +2105,7 @@ case 174:switch(this.lk()){
 case'stored':if(this.ck(175)){ $.art.value.stored = this.valueWithLocation( true ); }continue
 default:this.s=175;continue
 }
-case 175:this.s=176;{ if (this.elementRestriction( true, 'anno' )) this.docComment( $.art ); }continue
+case 175:this.s=176;{ if (!this.elementRestriction( true, 'anno' )) this.docComment( $.art ); }continue
 case 176:switch(this.l()){
 case'@':this.gc(0,'elementRestriction','anno')&&this.annoAssignStd({art:$.art},176);continue
 default:this.gr(['Id',';','@','}','key']);continue
@@ -2954,6 +2970,8 @@ case'.':this.c(402);continue
 default:this.gr(['@']);continue
 }
 case 402:if(this.miA(401,'ref')){ type.path.push( this.identAst() ); }continue
+case 0:
+this.attachLocation( $.art.type )
 default:return this.exit_()
 }
 }
@@ -2965,69 +2983,70 @@ 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(409))open=this.lb();continue
+case'(':if(this.c(410))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.gr([]);continue
+default:this.s=409;continue
 }
 case 408:if(this.miA(407,'ref')){ type.path.push( this.identAst() ); }continue
-case 409:switch(this.lk()){
-case'Number':if(this.c(410)){ $.art.$typeArgs = this.createArray( open );
+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 );
 $.art.$typeArgs.push( this.unsignedIntegerLiteral() ); }continue
-case'Id':this.s=413;{ $.art.$typeArgs = this.createDict( open ); }continue
+case'Id':this.s=414;{ $.art.$typeArgs = this.createDict( open ); }continue
 default:this.ei();continue
 }
-case 410:switch(this.l()){
-case',':this.c(411);continue
-default:this.s=412;continue
+case 411:switch(this.l()){
+case',':this.c(412);continue
+default: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
+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
 default:this.e();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 413:this.s=416;{ this.checkTypeArgs( $.art ); }continue
 case 414:switch(this.l()){
-case',':this.c(413);continue
-case')':this.s=415;continue
+case'Id':this.typeNamedArg({art:$.art},415);continue
+default:this.s=416;continue
+}
+case 415:switch(this.l()){
+case',':this.c(414);continue
+case')':this.s=416;continue
 default:this.e();continue
 }
-case 415:if(this.m(0,')')){ if ($.art.$typeArgs) this.finalizeDictOrArray( $.art.$typeArgs ); }continue
+case 416:if(this.m(0,')')){ if ($.art.$typeArgs) this.finalizeDictOrArray( $.art.$typeArgs ); }continue
 default:return this.exit_()
 }
 }
 typeNamedArgsList($,$next){
-this.rule_(417,$next)
+this.rule_(418,$next)
 for(;;)switch(this.s){
-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 418:if(this.m(419,'(')){ $.art.$typeArgs = this.createDict(); }continue
 case 419:switch(this.l()){
-case',':this.c(418);continue
-case')':this.s=420;continue
+case'Id':this.typeNamedArg({art:$.art},420);continue
+default:this.s=421;continue
+}
+case 420:switch(this.l()){
+case',':this.c(419);continue
+case')':this.s=421;continue
 default:this.e();continue
 }
-case 420:if(this.m(0,')')){ this.finalizeDictOrArray( $.art.$typeArgs ); }continue
+case 421:if(this.m(0,')')){ this.finalizeDictOrArray( $.art.$typeArgs ); }continue
 default:return this.exit_()
 }
 }
 typeNamedArg($,$next){
 let name;let tok
-this.rule_(422,$next)
+this.rule_(423,$next)
 for(;;)switch(this.s){
-case 422:if(this.mi(423,'typeparamname'))name=this.lb();continue
-case 423:this.m(424,':');continue
-case 424:switch(this.lk()){
+case 423:if(this.mi(424,'typeparamname'))name=this.lb();continue
+case 424:this.m(425,':');continue
+case 425: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
@@ -3037,45 +3056,45 @@ default:return this.exit_()
 }
 cardinality($,$next){
 let card={}
-this.rule_(426,$next)
+this.rule_(427,$next)
 for(;;)switch(this.s){
-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
-default:this.s=432;{ card.targetMax = this.valueWithLocation( '*' ); }continue
-}
+case 427:this.m(428,'[');continue
 case 428:switch(this.l()){
-case',':this.c(429);continue
-default:this.s=432;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:true},432,435);continue
-default:this.s=432;continue
-}
-case 431:this.targetCardinality({card,atAlt:false},432);continue
-case 432:this.m(0,']');continue
+case'*':if(this.c(429)){ card.targetMax = this.valueWithLocation(); }continue
+case'Number':if(this.c(431)){ card.targetMax = this.unsignedIntegerLiteral(); }continue
+default:this.s=433;{ card.targetMax = this.valueWithLocation( '*' ); }continue
+}
+case 429:switch(this.l()){
+case',':this.c(430);continue
+default:this.s=433;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:true},433,436);continue
+default:this.s=433;continue
+}
+case 432:this.targetCardinality({card,atAlt:false},433);continue
+case 433:this.m(0,']');continue
 default:
 $.art.cardinality = this.attachLocation(card)
 return this.exit_()
 }
 }
 targetCardinality($,$next,$startState){
-this.rule_($startState??434,$next)
+this.rule_($startState??435,$next)
 { if (!$.atAlt) $.card.sourceMax = $.card.targetMax; }
 for(;;)switch(this.s){
-case 434:switch(this.l()){
+case 435:switch(this.l()){
 case'*':if(this.c(0)){ $.card.targetMax = this.valueWithLocation(); }continue
-case'Number':if(this.c(435)){ $.card.targetMax = this.unsignedIntegerLiteral(); }continue
+case'Number':if(this.c(436)){ $.card.targetMax = this.unsignedIntegerLiteral(); }continue
 default:this.e();continue
 }
-case 435:switch(this.l()){
-case'..':if(this.c(436)){ $.card.targetMin = $.card.targetMax; }continue
+case 436:switch(this.l()){
+case'..':if(this.c(437)){ $.card.targetMin = $.card.targetMax; }continue
 default:this.gr([']']);continue
 }
-case 436:switch(this.l()){
+case 437: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
@@ -3084,44 +3103,44 @@ default:return this.exit_()
 }
 }
 nullability($,$next){
-this.rule_(438,$next)
+this.rule_(439,$next)
 for(;;)switch(this.s){
-case 438:switch(this.lk()){
+case 439:switch(this.lk()){
 case'null':if(this.ck(0)){ this.setNullability( $.art, false ); }continue
-case'not':this.ck(439);continue
+case'not':this.ck(440);continue
 default:this.e();continue
 }
-case 439:if(this.mk(0,'null')){ this.setNullability( $.art, true, this.locationOfPrevTokens( 2 ) ); }continue
+case 440:if(this.mk(0,'null')){ this.setNullability( $.art, true, this.locationOfPrevTokens( 2 ) ); }continue
 default:return this.exit_()
 }
 }
 queryEOF($,$next){
 $.query??=undefined
 let _
-this.rule_(441,$next)
+this.rule_(442,$next)
 for(;;)switch(this.s){
-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 442:if(this.queryExpression(_={},443))$.query=_.expr;continue
+case 443:switch(this.l()){
+case';':this.c(444);continue
+default:this.s=444;continue
 }
-case 443:this.m(0,'EOF');continue
+case 444:this.m(0,'EOF');continue
 default:return this.exit_()
 }
 }
 projectionSpec($,$next){
 $.query??={}
 let tab;let _
-this.rule_(445,$next)
+this.rule_(446,$next)
 for(;;)switch(this.s){
-case 445:if(this.mk(446,'projection')){this.afterBrace(); $.query = { op: this.valueWithLocation( 'SELECT' ) }; }continue
-case 446:this.mk(447,'on');continue
-case 447:if(this.fromRefWithOptAlias(_={},448)){tab=_.expr;this.afterBrace(); $.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 446:if(this.mk(447,'projection')){this.afterBrace(0,'entity'); $.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'excluding':this.excludingClause({query:$.query},0);continue
 default:this.gr([';']);continue
 }
@@ -3134,37 +3153,37 @@ queryExpression($,$next,$startState){
 $.expr??={}
 let op;let quantifier
 let query;let _
-this.rule_($startState??451,$next)
+this.rule_($startState??452,$next)
 for(;;)switch(this.s){
-case 451:switch(this.l()){
-case'(':this.c(452);continue
-case'Id':if(this.selectQuery(_={},454))$.expr=_.query;continue
+case 452:switch(this.l()){
+case'(':this.c(453);continue
+case'Id':if(this.selectQuery(_={},455))$.expr=_.query;continue
 default:this.e();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 453:this.queryExpression($,454);continue
+case 454:if(this.m(455,')')){ this.surroundByParens( $.expr ); }continue
 case 455:switch(this.lk()){
-case'distinct':if(this.ck(457)){ quantifier = this.valueWithLocation(); }continue
-default:this.s=457;continue
+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 456:switch(this.lk()){
-case'all':case'distinct':if(this.ck(457)){ quantifier = this.valueWithLocation(); }continue
-default:this.s=457;continue
+case'distinct':if(this.ck(458)){ quantifier = this.valueWithLocation(); }continue
+default:this.s=458;continue
+}
+case 457:switch(this.lk()){
+case'all':case'distinct':if(this.ck(458)){ quantifier = this.valueWithLocation(); }continue
+default:this.s=458;continue
 }
-case 457:if(this.queryExpression(_={},454)){query=_.expr; if ($.expr.$parens || op.val !== $.expr.op.val || quantifier?.val !== $.expr.quantifier?.val) $.expr = { op, args: [$.expr], quantifier };
+case 458:if(this.queryExpression(_={},455)){query=_.expr; 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 458:switch(this.lk()){
-case'limit':case'order':if(this.gc(0,'precPost_',0)&&this.g(459)){ if ($.expr.$parens) { this.attachLocation( $.expr ); $.expr = { op: this.valueWithLocation( '$query', this.la() ), args: [ $.expr ] }; } }continue
+case 459:switch(this.lk()){
+case'limit':case'order':if(this.gc(0,'precPost_',0)&&this.g(460)){ if ($.expr.$parens) { this.attachLocation( $.expr ); $.expr = { op: this.valueWithLocation( '$query', this.la() ), args: [ $.expr ] }; } }continue
 default:this.gr([]);continue
 }
-case 459:this.orderByLimitOffset({query:$.expr},0);continue
+case 460:this.orderByLimitOffset({query:$.expr},0);continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -3172,62 +3191,62 @@ return this.exit_()
 }
 selectQuery($,$next){
 $.query??={}
-this.rule_(461,$next)
+this.rule_(462,$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'all':case'distinct':if(this.ckP(473,['Id','#','(','*','+','-',':','?','@','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'])){ $.query.quantifier = this.valueWithLocation(); }continue
-case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'@':case'{':case'key':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':this.s=473;continue
+case 462:if(this.mk(463,'select')){ $.query = { op: this.valueWithLocation( 'SELECT' ) }; }continue
+case 463:switch(this.lk()){
+case'from':this.ck(464);continue
+case'all':case'distinct':if(this.ck(474)){ $.query.quantifier = this.valueWithLocation(); }continue
+case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'@':case'{':case'key':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':this.s=474;continue
 default:this.ei();continue
 }
-case 463:this.querySource({query:$.query},464);continue
-case 464:switch(this.lk()){
-case'mixin':this.ck(465);continue
-default:this.s=470;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:this.querySource({query:$.query},465);continue
+case 465:switch(this.lk()){
+case'mixin':this.ck(466);continue
+default:this.s=471;continue
 }
+case 466:if(this.m(467,'{')){ $.query.mixin = this.createDict(); }continue
 case 467:switch(this.l()){
-case';':this.c(466);continue
-case'}':this.s=468;continue
-default:this.e();continue
+case'Id':this.mixinElementDef({outer:$.query},468);continue
+default:this.s=469;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
-default:this.s=471;continue
+case 468:switch(this.l()){
+case';':this.c(467);continue
+case'}':this.s=469;continue
+default:this.e();continue
 }
-case 471:switch(this.l()){
-case'{':this.selectItemsList({query:$.query,start:undefined},472);continue
+case 469:if(this.m(470,'}')){ this.finalizeDictOrArray( $.query.mixin ); }continue
+case 470:this.mk(471,'into');continue
+case 471:switch(this.lk()){
+case'all':case'distinct':if(this.ck(472)){ $.query.quantifier = this.valueWithLocation(); }continue
 default:this.s=472;continue
 }
-case 472:switch(this.lk()){
-case'excluding':this.excludingClause({query:$.query},479);continue
-default:this.s=479;continue
+case 472:switch(this.l()){
+case'{':this.selectItemsList({query:$.query,start:undefined},473);continue
+default:this.s=473;continue
 }
-case 473:this.s=474;{this.inSelectItem(0,'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 473:switch(this.lk()){
+case'excluding':this.excludingClause({query:$.query},480);continue
+default:this.s=480;continue
 }
+case 474:this.s=475;{this.inSelectItem(0,'sqlStyle'); ; }continue
 case 475:switch(this.l()){
-case',':this.c(476);continue
-default:this.s=477;continue
+case'*':if(this.c(476)){ $.query.columns = [ this.valueWithLocation() ]; }continue
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:($.query.columns = [])},476);continue
+default:this.e();continue
 }
 case 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',':this.c(477);continue
+default:this.s=478;continue
+}
+case 477:switch(this.l()){
+case'*':if(this.c(476)){ $.query.columns.push( this.valueWithLocation() ); }continue
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query.columns},476);continue
 default:this.e();continue
 }
-case 477:this.mk(478,'from');continue
-case 478:this.querySource({query:$.query},479);continue
-case 479:switch(this.lk()){
+case 478:this.mk(479,'from');continue
+case 479:this.querySource({query:$.query},480);continue
+case 480:switch(this.lk()){
 case'group':case'where':case'having':this.whereGroupByHaving({query:$.query},0);continue
 default:this.gr(['limit','minus','order','union','except','intersect']);continue
 }
@@ -3238,19 +3257,19 @@ return this.exit_()
 }
 querySource($,$next){
 let tab;let _
-this.rule_(481,$next)
+this.rule_(482,$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 482:if(this.tableExpression(_={},483)){tab=_.expr; $.query.from = tab; }continue
+case 483:switch(this.l()){
+case',':this.s=484;{ const { location } = this.la();
 $.query.from = { op: { val: 'join', location }, join: { val: 'cross', location }, args: [tab] }; }continue
 default:this.gr(['group','limit','minus','order','union','where','except','having','intersect']);continue
 }
-case 483:switch(this.l()){
-case',':this.c(484);continue
+case 484:switch(this.l()){
+case',':this.c(485);continue
 default:this.gr(['group','limit','minus','order','union','where','except','having','intersect']);continue
 }
-case 484:if(this.tableExpression(_={},483)){tab=_.expr; $.query.from.args.push( tab ); }continue
+case 485:if(this.tableExpression(_={},484)){tab=_.expr; $.query.from.args.push( tab ); }continue
 case 0:
 this.attachLocation($.query.from)
 default:return this.exit_()
@@ -3259,91 +3278,91 @@ default:return this.exit_()
 tableExpression($,$next,$startState){
 $.expr??={}
 let join;let tab;let card;let cond;let _
-this.rule_($startState??486,$next)
+this.rule_($startState??487,$next)
 for(;;)switch(this.s){
-case 486:switch(this.l()){
-case'(':this.tableOrQueryParens($,487);continue
-case'Id':this.fromRefWithOptAlias($,488);continue
+case 487:switch(this.l()){
+case'(':this.tableOrQueryParens($,488);continue
+case'Id':this.fromRefWithOptAlias($,489);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 488:this.s=489;{ $.expr = this.taggedIfQuery( $.expr ); }continue
+case 489:switch(this.lk()){
+case'cross':if(this.ck(490))join=this.lb();continue
+case'inner':if(this.ck(493))join=this.lb();continue
+case'full':case'left':case'right':if(this.ck(492))join=this.lb();continue
+case'join':if(this.ck(495)){ join = undefined; }continue
 default:this.gr([]);continue
 }
-case 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; $.expr.args.push( this.taggedIfQuery( tab ) );
+case 490:if(this.mk(491,'join')){ if ($.expr?.join?.val !== 'cross' || $.expr.$parens) $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( undefined, join ), args: [ $.expr ] }; }continue
+case 491:switch(this.l()){
+case'(':if(this.tableOrQueryParens(_={},489)){tab=_.expr; $.expr.args.push( this.taggedIfQuery( tab ) );
 this.attachLocation( $.expr ); }continue
-case'Id':if(this.fromRefWithOptAlias(_={},488)){tab=_.expr; $.expr.args.push( tab );
+case'Id':if(this.fromRefWithOptAlias(_={},489)){tab=_.expr; $.expr.args.push( tab );
 this.attachLocation( $.expr ); }continue
 default:this.e();continue
 }
-case 491:switch(this.lk()){
-case'outer':this.ck(492);continue
-default:this.s=492;continue
-}
 case 492:switch(this.lk()){
-case'one':case'many':case'exact':this.joinCardinality(card={},493);continue
+case'outer':this.ck(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 493:switch(this.lk()){
+case'one':case'many':case'exact':this.joinCardinality(card={},494);continue
+default:this.s=494;continue
+}
+case 494:this.mk(495,'join');continue
+case 495:this.s=496;{ $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( join?.keyword || 'inner', join ), args: [ $.expr ] }; if (card) $.expr.cardinality = card; card = undefined; }continue
+case 496:if(this.tableExpression(_={},497)){tab=_.expr; $.expr.args.push( tab ); this.attachLocation( $.expr ); }continue
+case 497:this.mk(498,'on');continue
+case 498:if(this.condition(_={},489)){cond=_.expr; $.expr.on = cond;
 this.attachLocation( $.expr ); }continue
 default:return this.exit_()
 }
 }
 tableOrQueryParens($,$next){
 $.expr??=undefined
-this.rule_(499,$next)
+this.rule_(500,$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(0,'table')}continue;
-case'select':this.queryExpression($,502);continue
+case 500:if(this.m(501,'(')){this.queryOnLeft()}continue;
+case 501:switch(this.lk()){
+case'(':this.tableOrQueryParens($,502);continue
+case'Id':if(this.tableExpression($,503)){this.queryOnLeft(0,'table')}continue;
+case'select':this.queryExpression($,503);continue
 default:this.ei();continue
 }
-case 501:switch(this.lk()){
-case'full':case'join':case'left':case'cross':case'inner':case'right':if(this.tableExpression($,502,487)){this.queryOnLeft(0,'table')}continue;
-case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(502,'queryOnLeft')&&this.queryExpression($,502,454);continue
-default:this.s=502;continue
+case 502:switch(this.lk()){
+case'full':case'join':case'left':case'cross':case'inner':case'right':if(this.tableExpression($,503,488)){this.queryOnLeft(0,'table')}continue;
+case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(503,'queryOnLeft')&&this.queryExpression($,503,455);continue
+default:this.s=503;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 503:if(this.m(504,')')){ this.surroundByParens( $.expr ); }continue
+case 504:switch(this.lk()){
+case'as':this.gc(0,'queryOnLeft','table')&&this.ck(505);continue
 case'Id':if(this.gc(0,'queryOnLeft','tableWithoutAs')&&this.ci(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.fragileAlias(); }continue
 default:this.gi(0,['full','join','left','cross','inner','right']);continue
 }
-case 504:if(this.mi(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.identAst(); }continue
+case 505:if(this.mi(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.identAst(); }continue
 default:return this.exit_()
 }
 }
 joinCardinality($,$next){
 $.sourceMax??=undefined;$.targetMax??=undefined
-this.rule_(506,$next)
+this.rule_(507,$next)
 for(;;)switch(this.s){
-case 506:switch(this.lk()){
-case'exact':if(this.ck(507)){ $.sourceMin = this.valueWithLocation( 1 ); }continue
-case'one':this.s=507;continue
-case'many':if(this.ck(508)){ $.sourceMax = this.valueWithLocation( '*' ); }continue
+case 507:switch(this.lk()){
+case'exact':if(this.ck(508)){ $.sourceMin = this.valueWithLocation( 1 ); }continue
+case'one':this.s=508;continue
+case'many':if(this.ck(509)){ $.sourceMax = this.valueWithLocation( '*' ); }continue
 default:this.e();continue
 }
-case 507:if(this.mk(508,'one')){ $.sourceMax = this.valueWithLocation( 1 ); }continue
-case 508:this.mk(509,'to');continue
-case 509:switch(this.lk()){
-case'exact':if(this.ck(510)){ $.targetMin = this.valueWithLocation( 1 ); }continue
-case'one':this.s=510;continue
+case 508:if(this.mk(509,'one')){ $.sourceMax = this.valueWithLocation( 1 ); }continue
+case 509:this.mk(510,'to');continue
+case 510:switch(this.lk()){
+case'exact':if(this.ck(511)){ $.targetMin = this.valueWithLocation( 1 ); }continue
+case'one':this.s=511;continue
 case'many':if(this.ck(0)){ $.targetMax = this.valueWithLocation( '*' ); }continue
 default:this.e();continue
 }
-case 510:if(this.mk(0,'one')){ $.targetMax = this.valueWithLocation( 1 ); }continue
+case 511:if(this.mk(0,'one')){ $.targetMax = this.valueWithLocation( 1 ); }continue
 default:
 this.attachLocation( $ )
 return this.exit_()
@@ -3351,25 +3370,25 @@ return this.exit_()
 }
 fromRefWithOptAlias($,$next){
 $.expr??={}
-this.rule_(512,$next)
+this.rule_(513,$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 513:this.fromPath({table:$.expr,category:'artref'},514);continue
+case 514:switch(this.l()){
+case':':if(this.c(515)){ if (!$.expr.scope) $.expr.scope = $.expr.path.length; else {
 this.warning( 'syntax-invalid-path-separator', this.lb(),
 { '#': 'colon', code: ':', newcode: '.' } );
 } }continue
-default:this.s=515;continue
+default:this.s=516;continue
 }
-case 514:this.fromPath({table:$.expr,category:'ref'},515);continue
-case 515:switch(this.lk()){
-case'as':this.ck(516);continue
+case 515:this.fromPath({table:$.expr,category:'ref'},516);continue
+case 516:switch(this.lk()){
+case'as':this.ck(517);continue
 case'Id':if(this.ci(0,'FromAlias')){ $.expr.name = this.fragileAlias(); }continue
-default:this.giR(517);continue
+default:this.giR(518);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 517:if(this.mi(0,'FromAlias')){ $.expr.name = this.identAst(); }continue
+case 518:if(this.gr([])){ this.classifyImplicitName( $.expr.scope ? 'FromElemImplicit' : 'FromImplicit', $.expr ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -3377,25 +3396,25 @@ return this.exit_()
 }
 fromPath($,$next){
 let pathItem
-this.rule_(519,$next)
+this.rule_(520,$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 520:if(this.mi(521,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
 case 521:switch(this.l()){
-case'.':if(this.gc(0,'notAfterEntityArgOrFilter')&&this.c(522)){ if (!pathItem && !$.table.scope) {
+case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},522)){ pathItem = null; }continue
+default:this.s=522;continue
+}
+case 522:switch(this.l()){
+case'.':if(this.gc(0,'notAfterEntityArgOrFilter')&&this.c(523)){ if (!pathItem && !$.table.scope) {
 $.table.scope = $.table.path.length; $.category = 'ref';
 this.warning( 'syntax-invalid-path-separator', this.lb(),
 { '#': 'dot', code: '.', newcode: ':' } );
 } }continue
 default:this.gr(['Id','as']);continue
 }
-case 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 523:if(this.miA(524,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
+case 524:switch(this.l()){
+case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},522)){ pathItem = null; }continue
+default:this.s=522;continue
 }
 default:
 this.attachLocation( $.table.path )
@@ -3403,27 +3422,27 @@ return this.exit_()
 }
 }
 fromArgumentsAndFilter($,$next){
-this.rule_(525,$next)
+this.rule_(526,$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 526:switch(this.l()){
+case'(':if(this.c(527)){ $.pathStep.args = this.createDict(); $.pathStep.$syntax = ':'; }continue
+default:this.s=531;continue
 }
-case 526:switch(this.lk()){
-case'Id':this.s=527;continue
+case 527:switch(this.lk()){
+case'Id':this.s=528;continue
 default:this.ei();continue
 }
-case 527:switch(this.l()){
-case'Id':this.fromNamedArgument($,528);continue
-default:this.s=529;continue
-}
 case 528:switch(this.l()){
-case',':this.c(527);continue
-case')':this.s=529;continue
+case'Id':this.fromNamedArgument($,529);continue
+default:this.s=530;continue
+}
+case 529:switch(this.l()){
+case',':this.c(528);continue
+case')':this.s=530;continue
 default:this.e();continue
 }
-case 529:this.m(530,')');continue
-case 530:switch(this.l()){
+case 530:this.m(531,')');continue
+case 531:switch(this.l()){
 case'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['Id','.','as']);continue
 }
@@ -3432,220 +3451,239 @@ default:return this.exit_()
 }
 fromNamedArgument($,$next){
 let name;let expr;let _
-this.rule_(532,$next)
+this.rule_(533,$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 533:if(this.mi(534,'paramname'))name=this.lb();continue
+case 534:this.m(535,':');continue
+case 535:if(this.expression(_={},0)){expr=_.expr; this.addDef( expr, $.pathStep, 'args', 0, this.identAst( name ) ); }continue
 default:return this.exit_()
 }
 }
 cardinalityAndFilter($,$next){
-this.rule_(536,$next)
+this.rule_(537,$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
-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
+case 537:this.m(538,'[');continue
+case 538:switch(this.l()){
+case'Number':if(this.gc(540,'beforeColon')&&this.c(539)){ $.pathStep.cardinality = { targetMax: this.unsignedIntegerLiteral(), location: this.lb().location }; }continue
+default:this.s=540;continue
+}
+case 539:this.m(540,':');continue
+case 540:this.filterClauses({pathStep:$.pathStep},541);continue
+case 541:this.m(0,']');continue
 default:return this.exit_()
 }
 }
 filterClauses($,$next){
 let cond;let _
-this.rule_(542,$next)
+this.rule_(543,$next)
 for(;;)switch(this.s){
-case 542:switch(this.lk()){
-case'where':this.ck(543);continue
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':this.s=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 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.lk()){
-case'limit':case'order':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
+case 543:switch(this.lk()){
+case'where':this.ck(544);continue
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':this.s=544;continue
+case'group':case'limit':case'order':case'having':this.gP(545);continue
+default:this.gi(545);continue
+}
+case 544:if(this.condition(_={},545)){cond=_.expr; $.pathStep.where = cond; }continue
+case 545:switch(this.lk()){
+case'group':this.s=546;{ this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'group by' }); }continue
+default:this.s=547;continue
+}
+case 546:this.groupByClause({query:$.pathStep},547);continue
+case 547:switch(this.lk()){
+case'having':if(this.ck(548)){ this.csnParseOnly('syntax-unexpected-sql-clause', -1, { keyword: 'having' }); }continue
+default:this.s=549;continue
+}
+case 548:if(this.condition(_={},549)){cond=_.expr; $.pathStep.having = cond; }continue
+case 549:switch(this.lk()){
+case'limit':case'order':this.s=550;{ if (this.lk() === 'limit') this.csnParseOnly('syntax-unexpected-sql-clause', 0, { keyword: 'limit' } ); else this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'order by' } ); }continue
 default:this.gr([']']);continue
 }
-case 549:this.orderByLimitOffset({query:$.pathStep},0);continue
+case 550:this.orderByLimitOffset({query:$.pathStep},0);continue
 default:return this.exit_()
 }
 }
 excludingClause($,$next){
-this.rule_(551,$next)
+this.rule_(552,$next)
 for(;;)switch(this.s){
-case 551:this.mk(552,'excluding');continue
-case 552:if(this.m(553,'{')){ $.query.excludingDict = this.createDict(); }continue
-case 553:switch(this.l()){
-case'Id':this.s=554;continue
-default:this.e();continue
-}
+case 552:this.mk(553,'excluding');continue
+case 553:if(this.m(554,'{')){ $.query.excludingDict = this.createDict(); }continue
 case 554:switch(this.l()){
-case'Id':if(this.ciA(555,'ref')){ this.addDef( { location: this.lb().location }, $.query, 'excludingDict', '', this.identAst() ); }continue
-default:this.s=556;continue
+case'Id':this.s=555;continue
+default:this.e();continue
 }
 case 555:switch(this.l()){
-case',':this.c(554);continue
-case'}':this.s=556;continue
+case'Id':if(this.ciA(556,'ref')){ this.addDef( { location: this.lb().location }, $.query, 'excludingDict', '', this.identAst() ); }continue
+default:this.s=557;continue
+}
+case 556:switch(this.l()){
+case',':this.c(555);continue
+case'}':this.s=557;continue
 default:this.e();continue
 }
-case 556:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.excludingDict ); }continue
+case 557:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.excludingDict ); }continue
 default:return this.exit_()
 }
 }
 selectItemsList($,$next){
-this.rule_(558,$next)
+this.rule_(559,$next)
 for(;;)switch(this.s){
-case 558:if(this.m(559,'{')){this.inSelectItem(0,'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 559:if(this.m(560,'{')){this.inSelectItem(0,'top'); $.query.columns = this.createArray( $.start ); }continue
 case 560:switch(this.l()){
-case',':this.c(559);continue
-case'}':this.s=561;continue
+case'*':if(this.c(561)){ $.query.columns.push( this.valueWithLocation() ); }continue
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query.columns},561);continue
+default:this.s=562;continue
+}
+case 561:switch(this.l()){
+case',':this.c(560);continue
+case'}':this.s=562;continue
 default:this.e();continue
 }
-case 561:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.columns ); }continue
+case 562:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.columns ); }continue
 default:return this.exit_()
 }
 }
 nestedSelectItemsList($,$next){
-this.rule_(563,$next)
+this.rule_(564,$next)
 for(;;)switch(this.s){
-case 563:if(this.m(564,'{')){this.inSelectItem(0,'nested'); $.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 564:if(this.m(565,'{')){this.inSelectItem(); $.query[$.clause] = this.createArray(); }continue
 case 565:switch(this.l()){
-case',':this.c(564);continue
-case'}':this.s=566;continue
+case'*':if(this.c(566)){ $.query[$.clause].push( this.valueWithLocation() ); }continue
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query[$.clause]},566);continue
+default:this.s=567;continue
+}
+case 566:switch(this.l()){
+case',':this.c(565);continue
+case'}':this.s=567;continue
 default:this.e();continue
 }
-case 566:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query[$.clause] ); }continue
+case 567:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query[$.clause] ); }continue
 default:return this.exit_()
 }
 }
 selectItemDef($,$next){
-let art=new XsnArtifact();let alias
-let expr;let as;let target;let cond;let assoc;let card;let _
-this.rule_(568,$next)
+let art=new XsnArtifact()
+let expr;let e;let target;let cond;let assoc;let card;let _
+this.rule_(569,$next)
 { $.columns.push( art );
 this.docComment( art ); }
 for(;;)switch(this.s){
-case 568:switch(this.l()){
-case'@':this.annoAssignCol({art},568);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
+case 569:switch(this.l()){
+case'@':this.annoAssignCol({art},569);continue
 default:this.s=570;continue
 }
-case 570:this.s=571;{this.columnExpr(0,'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'virtual':if(this.lP(['Id','#','(','+','-',':','?','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'])&&this.gc(571,'modifierRestriction')&&this.ck(571)){ art.virtual = this.valueWithLocation( true ); }continue
+default:this.s=571;continue
 }
-case 572:switch(this.l()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},573)){expr=_.expr; art.value = expr; }continue
-case'{':this.nestedSelectItemsList({query:art,clause:'expand'},580);continue
-default:this.e();continue
+case 571:this.s=572;{this.columnExpr(0,'key'); ; }continue
+case 572:switch(this.lk()){
+case'key':if(this.gc(573,'modifierRestriction')&&this.ck(573)){ art.key = this.valueWithLocation( true ); }continue
+default:this.s=573;continue
 }
 case 573:switch(this.lk()){
-case'as':if(this.ck(574))as=this.lb();continue
-case'Id':if(this.ci(577,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
-case'.':if(this.c(575)){ this.reportUnexpectedSpace( this.lb(), this.la().location, true );
-this.reportExpandInline( art, as || true );
-if (alias) alias.token.parsedAs = alias.parsedAs; }continue
-default:if(this.gi(577)){ alias = this.classifyImplicitName( 'ItemImplicit', expr ); }continue
-}
-case 574:if(this.mi(577,'ItemAlias')){ art.name = this.identAst(); }continue
-case 575:switch(this.l()){
-case'{':this.nestedSelectItemsList({query:art,clause:'inline'},576);continue
+case'#':case'(':case'+':case'-':case':':case'?':case'new':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.lP()&&this.expression(_={},574)){expr=_.expr; art.value = expr; }continue
+case'Id':if(this.valuePath(_={},576)){expr=_.expr; expr = this.valuePathAst( expr ); art.value = expr; }continue
+case'{':this.nestedSelectItemsList({query:art,clause:'expand'},587);continue
+default:this.ei();continue
+}
+case 574:switch(this.lk()){
+case'as':this.ck(575);continue
+case'Id':if(this.ci(584,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
+default:this.gi(584);continue
+}
+case 575:if(this.mi(584,'ItemAlias')){ art.name = this.identAst(); }continue
+case 576:switch(this.lk()){
+case'over':if(this.ck(577)){ this.pushXprToken( expr.suffix = [] ); }continue
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },579,651)){e=_.expr; Object.assign( e.location, expr.location ); art.value = this.attachLocation( e ) }continue
+case'as':this.ck(581);continue
+case'Id':if(this.ci(584,'ItemAlias')){this.nestedExpand(); art.name = this.fragileAlias( true ); }continue
+case'.':if(this.c(582)){ this.reportUnexpectedSpace( this.lb(), this.la().location, true );
+this.reportExpandInline( art, true ); }continue
+default:if(this.gi(584)){this.nestedExpand(); this.classifyImplicitName( 'ItemImplicit', expr ); }continue
+}
+case 577:this.overClause({outer:expr.suffix},578);continue
+case 578:switch(this.lk()){
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },579,651)){e=_.expr; Object.assign( e.location, expr.location ); art.value = this.attachLocation( e ) }continue
+default:this.s=579;continue
+}
+case 579:switch(this.lk()){
+case'as':this.ck(580);continue
+case'Id':if(this.ci(584,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
+default:this.gi(584);continue
+}
+case 580:if(this.mi(584,'ItemAlias')){ art.name = this.identAst(); }continue
+case 581:if(this.mi(584,'ItemAlias')){this.nestedExpand(); art.name = this.identAst(); }continue
+case 582:switch(this.l()){
+case'{':this.nestedSelectItemsList({query:art,clause:'inline'},583);continue
 case'*':if(this.c(0)){ art.inline = [ this.valueWithLocation() ]; }continue
 default:this.e();continue
 }
-case 576:switch(this.lk()){
+case 583:switch(this.lk()){
 case'excluding':this.excludingClause({query:art},0);continue
 default:this.gr([',']);continue
 }
-case 577:switch(this.l()){
-case'{':this.s=578;{ this.reportExpandInline( art, false ); }continue
-default:this.s=583;continue
+case 584:switch(this.l()){
+case'{':if(this.gc(590,'nestedExpand')&&this.g(585)){ if (!this.nestedExpand(true)) this.reportExpandInline( art, false ); }continue
+default:this.s=590;continue
 }
-case 578:this.nestedSelectItemsList({query:art,clause:'expand'},579);continue
-case 579:switch(this.lk()){
-case'excluding':this.excludingClause({query:art},583);continue
-default:this.s=583;continue
+case 585:this.nestedSelectItemsList({query:art,clause:'expand'},586);continue
+case 586:switch(this.lk()){
+case'excluding':this.excludingClause({query:art},590);continue
+default:this.s=590;continue
 }
-case 580:switch(this.lk()){
-case'excluding':this.excludingClause({query:art},581);continue
-default:this.s=581;continue
+case 587:switch(this.lk()){
+case'excluding':this.excludingClause({query:art},588);continue
+default:this.s=588;continue
 }
-case 581:this.mk(582,'as');continue
-case 582:if(this.mi(583,'ItemAlias')){ art.name = this.identAst(); }continue
-case 583:this.s=584;{this.columnExpr(); this.docComment( art ); }continue
-case 584:switch(this.l()){
-case'@':this.annoAssignMid({art},584);continue
-default:this.s=585;continue
+case 588:this.mk(589,'as');continue
+case 589:if(this.mi(590,'ItemAlias')){ art.name = this.identAst(); }continue
+case 590:this.s=591;{this.columnExpr(); this.docComment( art ); }continue
+case 591:switch(this.l()){
+case'@':this.annoAssignMid({art},591);continue
+default:this.s=592;continue
 }
-case 585:switch(this.l()){
-case':':this.c(586);continue
+case 592:switch(this.l()){
+case':':this.c(593);continue
 default:this.gr([',']);continue
 }
-case 586:switch(this.lk()){
-case'type':this.lP()&&this.typeTypeOf({art},600);continue
-case'localized':if(this.ckP(587,['Id'])){ art.localized = this.valueWithLocation( true ); }continue
-case'Id':this.s=587;continue
-case'redirected':this.ckP(588,['to']);continue
-case'association':if(this.lP(['[','to'])&&this.ec('columnExpr')&&this.ck(592)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
-case'composition':if(this.lP(['[','of'])&&this.ec('columnExpr')&&this.ck(594)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
+case 593:switch(this.lk()){
+case'type':this.lP()&&this.typeTypeOf({art},607);continue
+case'localized':if(this.ckP(594,['Id'])){ art.localized = this.valueWithLocation( true ); }continue
+case'Id':this.s=594;continue
+case'redirected':this.ckP(595,['to']);continue
+case'association':if(this.lP(['[','to'])&&this.ec('columnExpr')&&this.ck(599)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
+case'composition':if(this.lP(['[','of'])&&this.ec('columnExpr')&&this.ck(601)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
 default:this.ei();continue
 }
-case 587:this.typeRefOptArgs({art},600);continue
-case 588:this.mk(589,'to');continue
-case 589:if(this.simplePath(_={category:'artref'},590)){target=_.ref; art.target = target; }continue
-case 590:switch(this.lk()){
-case'on':this.ck(591);continue
-case'{':this.foreignKeysBlock({art},600);continue
+case 594:this.typeRefOptArgs({art},607);continue
+case 595:this.mk(596,'to');continue
+case 596:if(this.simplePath(_={category:'artref'},597)){target=_.ref; art.target = target; }continue
+case 597:switch(this.lk()){
+case'on':this.ck(598);continue
+case'{':this.foreignKeysBlock({art},607);continue
+default:this.s=607;continue
+}
+case 598:if(this.condition(_={},607)){cond=_.expr; art.on = cond; }continue
+case 599:switch(this.l()){
+case'[':this.cardinality({art},600);continue
 default:this.s=600;continue
 }
-case 591:if(this.condition(_={},600)){cond=_.expr; art.on = cond; }continue
-case 592:switch(this.l()){
-case'[':this.cardinality({art},593);continue
-default:this.s=593;continue
-}
-case 593:this.mk(596,'to');continue
-case 594:switch(this.l()){
-case'[':this.cardinality({art},595);continue
-default:this.s=595;continue
-}
-case 595:this.mk(596,'of');continue
-case 596:switch(this.lk()){
-case'one':case'many':if(this.lP(['Id'])&&this.gc(597,'noRepeatedCardinality')&&this.ck(597))card=this.lb();continue
-default:this.s=597;continue
-}
-case 597:if(this.simplePath(_={category:'artref'},598)){target=_.ref; this.setAssocAndComposition( art, assoc, card, target ); }continue
-case 598:this.mk(599,'on');continue
-case 599:if(this.condition(_={},600)){expr=_.expr; art.on = expr; }continue
-case 600:this.s=601;{ this.docComment( art ); }continue
+case 600:this.mk(603,'to');continue
 case 601:switch(this.l()){
-case'@':this.annoAssignStd({art},601);continue
+case'[':this.cardinality({art},602);continue
+default:this.s=602;continue
+}
+case 602:this.mk(603,'of');continue
+case 603:switch(this.lk()){
+case'one':case'many':if(this.lP(['Id'])&&this.gc(604,'noRepeatedCardinality')&&this.ck(604))card=this.lb();continue
+default:this.s=604;continue
+}
+case 604:if(this.simplePath(_={category:'artref'},605)){target=_.ref; this.setAssocAndComposition( art, assoc, card, target ); }continue
+case 605:this.mk(606,'on');continue
+case 606:if(this.condition(_={},607)){expr=_.expr; art.on = expr; }continue
+case 607:this.s=608;{ this.docComment( art ); }continue
+case 608:switch(this.l()){
+case'@':this.annoAssignStd({art},608);continue
 default:this.gr([',']);continue
 }
 default:
@@ -3655,90 +3693,90 @@ return this.exit_()
 }
 whereGroupByHaving($,$next){
 let cond;let _
-this.rule_(603,$next)
+this.rule_(610,$next)
 for(;;)switch(this.s){
-case 603:switch(this.lk()){
-case'where':this.ck(604);continue
-default:this.s=605;continue
+case 610:switch(this.lk()){
+case'where':this.ck(611);continue
+default:this.s=612;continue
 }
-case 604:if(this.condition(_={},605)){cond=_.expr; $.query.where = cond; }continue
-case 605:switch(this.lk()){
-case'group':this.groupByClause($,606);continue
-default:this.s=606;continue
+case 611:if(this.condition(_={},612)){cond=_.expr; $.query.where = cond; }continue
+case 612:switch(this.lk()){
+case'group':this.groupByClause($,613);continue
+default:this.s=613;continue
 }
-case 606:switch(this.lk()){
-case'having':this.ck(607);continue
+case 613:switch(this.lk()){
+case'having':this.ck(614);continue
 default:this.gr(['limit','order']);continue
 }
-case 607:if(this.condition(_={},0)){cond=_.expr; $.query.having = cond; }continue
+case 614:if(this.condition(_={},0)){cond=_.expr; $.query.having = cond; }continue
 default:return this.exit_()
 }
 }
 groupByClause($,$next){
 let expr;let _
-this.rule_(609,$next)
+this.rule_(616,$next)
 for(;;)switch(this.s){
-case 609:this.mk(610,'group');continue
-case 610:this.mk(611,'by');continue
-case 611:if(this.expression(_={},612)){expr=_.expr; $.query.groupBy = [ expr ]; }continue
-case 612:switch(this.l()){
-case',':this.c(613);continue
+case 616:this.mk(617,'group');continue
+case 617:this.mk(618,'by');continue
+case 618:if(this.expression(_={},619)){expr=_.expr; $.query.groupBy = [ expr ]; }continue
+case 619:switch(this.l()){
+case',':this.c(620);continue
 default:this.gr(['limit','order','having']);continue
 }
-case 613:if(this.expression(_={},612)){expr=_.expr; $.query.groupBy.push( expr ); }continue
+case 620:if(this.expression(_={},619)){expr=_.expr; $.query.groupBy.push( expr ); }continue
 default:return this.exit_()
 }
 }
 orderByLimitOffset($,$next){
 let expr;let _
-this.rule_(615,$next)
+this.rule_(622,$next)
 for(;;)switch(this.s){
-case 615:switch(this.lk()){
-case'order':this.orderByClause($,616);continue
-default:this.s=616;continue
+case 622:switch(this.lk()){
+case'order':this.orderByClause($,623);continue
+default:this.s=623;continue
 }
-case 616:switch(this.lk()){
-case'limit':this.ck(617);continue
+case 623:switch(this.lk()){
+case'limit':this.ck(624);continue
 default:this.gr([]);continue
 }
-case 617:if(this.expression(_={},618)){expr=_.expr; $.query.limit = { rows: expr }; }continue
-case 618:switch(this.lk()){
-case'offset':this.ck(619);continue
+case 624:if(this.expression(_={},625)){expr=_.expr; $.query.limit = { rows: expr }; }continue
+case 625:switch(this.lk()){
+case'offset':this.ck(626);continue
 default:this.gr([]);continue
 }
-case 619:if(this.expression(_={},0)){expr=_.expr; $.query.limit.offset = expr; }continue
+case 626:if(this.expression(_={},0)){expr=_.expr; $.query.limit.offset = expr; }continue
 default:return this.exit_()
 }
 }
 orderByClause($,$next){
 let expr;let _
-this.rule_(621,$next)
+this.rule_(628,$next)
 for(;;)switch(this.s){
-case 621:this.mk(622,'order');continue
-case 622:this.mk(623,'by');continue
-case 623:if(this.orderByExpression(_={},624)){expr=_.expr; $.query.orderBy = [ expr ]; }continue
-case 624:switch(this.l()){
-case',':this.c(625);continue
+case 628:this.mk(629,'order');continue
+case 629:this.mk(630,'by');continue
+case 630:if(this.orderByExpression(_={},631)){expr=_.expr; $.query.orderBy = [ expr ]; }continue
+case 631:switch(this.l()){
+case',':this.c(632);continue
 default:this.gr(['limit']);continue
 }
-case 625:if(this.orderByExpression(_={},624)){expr=_.expr; $.query.orderBy.push( expr ); }continue
+case 632:if(this.orderByExpression(_={},631)){expr=_.expr; $.query.orderBy.push( expr ); }continue
 default:return this.exit_()
 }
 }
 orderByExpression($,$next){
 $.expr??=undefined
-this.rule_(627,$next)
+this.rule_(634,$next)
 for(;;)switch(this.s){
-case 627:this.expression($,628);continue
-case 628:switch(this.lk()){
-case'asc':case'desc':if(this.ck(629)){ $.expr.sort = this.valueWithLocation(); }continue
-default:this.s=629;continue
+case 634:this.expression($,635);continue
+case 635:switch(this.lk()){
+case'asc':case'desc':if(this.ck(636)){ $.expr.sort = this.valueWithLocation(); }continue
+default:this.s=636;continue
 }
-case 629:switch(this.lk()){
-case'nulls':this.ck(630);continue
+case 636:switch(this.lk()){
+case'nulls':this.ck(637);continue
 default:this.gr([',','limit']);continue
 }
-case 630:switch(this.lk()){
+case 637:switch(this.lk()){
 case'last':case'first':if(this.ck(0)){ $.expr.nulls = this.valueWithLocation(); }continue
 default:this.e();continue
 }
@@ -3748,39 +3786,39 @@ default:return this.exit_()
 conditionEOF($,$next){
 $.cond??=undefined
 let _
-this.rule_(632,$next)
+this.rule_(639,$next)
 for(;;)switch(this.s){
-case 632:if(this.expression(_={},633))$.cond=_.expr;continue
-case 633:this.m(0,'EOF');continue
+case 639:if(this.expression(_={},640))$.cond=_.expr;continue
+case 640:this.m(0,'EOF');continue
 default:return this.exit_()
 }
 }
 condition($,$next){
 $.expr??=undefined
-this.rule_(635,$next)
+this.rule_(642,$next)
 for(;;)switch(this.s){
-case 635:this.expression($,0);continue
+case 642:this.expression($,0);continue
 default:return this.exit_()
 }
 }
 valuePath($,$next,$startState){
 $.expr??={ path: [] }
 let pathItem
-this.rule_($startState??637,$next)
+this.rule_($startState??644,$next)
 for(;;)switch(this.s){
-case 637:if(this.mi(638,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
-case 638:switch(this.l()){
-case'(':case'[':this.argumentsAndFilter({pathStep:pathItem},639);continue
-default:this.s=639;continue
+case 644:if(this.mi(645,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
+case 645:switch(this.l()){
+case'(':case'[':this.argumentsAndFilter({pathStep:pathItem},646);continue
+default:this.s=646;continue
 }
-case 639:switch(this.l()){
-case'.':this.gc(0,'isDotForPath')&&this.c(640);continue
+case 646:switch(this.l()){
+case'.':this.gc(0,'isDotForPath')&&this.c(647);continue
 default:this.gr(['*','+','-','/','<','=','>','?','!=','<=','<>','>=','in','is','or','||','and','not','like','between']);continue
 }
-case 640:if(this.miA(641,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
-case 641:switch(this.l()){
-case'(':case'[':if(this.argumentsAndFilter({pathStep:pathItem},639)){ pathItem = null; }continue
-default:this.s=639;continue
+case 647:if(this.miA(648,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
+case 648:switch(this.l()){
+case'(':case'[':if(this.argumentsAndFilter({pathStep:pathItem},646)){ pathItem = null; }continue
+default:this.s=646;continue
 }
 default:
 this.attachLocation( $.expr )
@@ -3790,141 +3828,141 @@ return this.exit_()
 expression($,$next,$startState){
 $.expr??={}
 let e;let open;let _
-this.rule_($startState??643,$next)
+this.rule_($startState??650,$next)
 for(;;)switch(this.s){
-case 643:switch(this.lk()){
-case'(':this.expressionOrQueryParens($,644);continue
-case'#':case'null':case'true':case'false':case'Number':case'String':case'QuotedLiteral':this.literalValue($,654);continue
-case':':if(this.c(645)){ this.reportUnexpectedSpace(); }continue
-case'?':if(this.c(654)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
+case 650:switch(this.lk()){
+case'(':this.expressionOrQueryParens($,651);continue
+case'#':case'null':case'true':case'false':case'Number':case'String':case'QuotedLiteral':this.literalValue($,661);continue
+case':':if(this.c(652)){ this.reportUnexpectedSpace(); }continue
+case'?':if(this.c(661)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
 $.expr = this.attachLocation({ param: this.valueWithLocation(), scope: 'param' }); }continue
-case'Id':if(this.valuePath(_={},647)){e=_.expr; $.expr = this.valuePathAst( e ); }continue
-case'new':this.lP()&&this.newAndValuePath($,654);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(_={},654)){e=_.expr; $.expr = this.valuePathAst( e ); }continue
+case'new':this.lP()&&this.newAndValuePath($,661);continue
+case'exists':if(this.ck(657)){ $.expr = this.applyOpToken(); }continue
+case'case':this.caseExpression($,661);continue
+case'cast':this.castFunction($,661);continue
+case'+':case'-':if(this.ec('precRight_',30)&&this.c(660)){ $.expr = this.applyOpToken(); }continue
+case'not':if(this.ec('precRight_',8)&&this.ck(660)){ $.expr = this.applyOpToken(); }continue
 default:this.ei();continue
 }
-case 644:this.s=654;{ $.expr = this.taggedIfQuery( $.expr ); }continue
-case 645:switch(this.l()){
-case'Id':if(this.ciA(646,'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 651:this.s=661;{ $.expr = this.taggedIfQuery( $.expr ); }continue
+case 652:switch(this.l()){
+case'Id':if(this.ciA(653,'paramref')){ $.expr = { path: [ this.identAst() ], location: this.startLocation(), scope: 'param' }; }continue
+case'Number':if(this.c(661)){ 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 646:switch(this.l()){
-case'.':if(this.valuePath($,654,639)){ $.expr = this.valuePathAst( $.expr ); }continue
-default:this.s=654;{ this.attachLocation( $.expr ); }continue
-}
-case 647:switch(this.lk()){
-case'over':if(this.ck(648)){ this.pushXprToken( $.expr.suffix = [] ); }continue
-default:this.s=649;continue
-}
-case 648:this.overClause(e={outer:$.expr.suffix},649);continue
-case 649:this.s=654;{ this.attachLocation( $.expr ); }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 653:switch(this.l()){
+case'.':if(this.valuePath($,661,646)){ $.expr = this.valuePathAst( $.expr ); }continue
+default:this.s=661;{ this.attachLocation( $.expr ); }continue
+}
+case 654:switch(this.lk()){
+case'over':if(this.ck(655)){ this.pushXprToken( $.expr.suffix = [] ); }continue
+default:this.s=656;continue
+}
+case 655:this.overClause(e={outer:$.expr.suffix},656);continue
+case 656:this.s=661;{ this.attachLocation( $.expr ); }continue
+case 657:switch(this.l()){
+case'(':if(this.c(658))open=this.lb();continue
+case'Id':if(this.valuePath(_={},661)){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(661)){ 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 658:if(this.queryExpression(_={},659))e=_.expr;continue
+case 659:if(this.m(661,')')){ $.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,'precLeft_',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'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 660:if(this.expression(_={},661)){e=_.expr; $.expr = this.signedExpression( $.expr, e ); }continue
+case 661:switch(this.lk()){
+case'*':case'/':if(this.gc(0,'precLeft_',24)&&this.c(665)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'+':case'-':if(this.gc(0,'precLeft_',22)&&this.c(665)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'||':if(this.gc(0,'precLeft_',20)&&this.c(665)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'and':if(this.gc(0,'precLeft_',4)&&this.ck(665)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'or':if(this.gc(0,'precLeft_',2)&&this.ck(665)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'?':if(this.gc(0,'precLeft_',0)&&this.c(662)){ $.expr = this.applyOpToken( $.expr, '?:' ); }continue
+case'<':case'=':case'>':case'!=':case'<=':case'<>':case'>=':if(this.gc(0,'precNone_',10)&&this.c(664)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'is':if(this.gc(0,'precNone_',10)&&this.ck(666)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'not':if(this.gc(0,'isNegatedRelation','10')&&this.ck(668)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'in':case'like':case'between':if(this.gc(0,'precNone_',10)&&this.g(668)){ $.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 662:if(this.expression(_={},663)){e=_.expr; $.expr.args.push( e ); }continue
+case 663:if(this.m(665,':')){ this.pushXprToken( $.expr ); }continue
+case 664:switch(this.lk()){
+case'all':case'any':case'some':if(this.ck(665)){ this.pushXprToken( $.expr ); }continue
+default:this.s=665;continue
+}
+case 665:if(this.expression(_={},676)){e=_.expr; $.expr.args.push( e ); }continue
+case 666:switch(this.lk()){
+case'not':if(this.ck(667)){ this.pushXprToken( $.expr ); }continue
+default:this.s=667;continue
+}
+case 667:if(this.mk(676,'null')){ this.pushXprToken( $.expr ); }continue
+case 668:switch(this.lk()){
+case'between':if(this.ck(669)){ this.pushXprToken( $.expr ); }continue
+case'in':if(this.ck(672)){ this.pushXprToken( $.expr ); }continue
+case'like':if(this.ck(673)){ 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 669:if(this.expression(_={},670)){e=_.expr; $.expr.args?.push( e ); }continue
+case 670:if(this.mk(671,'and')){ this.pushXprToken( $.expr ); }continue
+case 671:if(this.expression(_={},676)){e=_.expr; $.expr.args?.push( e ); }continue
+case 672:if(this.expression(_={},676)){e=_.expr; $.expr.args?.push( this.secureParens( e ) ); }continue
+case 673:if(this.expression(_={},674)){e=_.expr; $.expr.args?.push( e ); }continue
+case 674:switch(this.lk()){
+case'escape':if(this.ck(675)){ this.pushXprToken( $.expr ); }continue
+default:this.s=676;continue
+}
+case 675:if(this.expression(_={},676)){e=_.expr; $.expr.args?.push( e ); }continue
+case 676:this.s=661;{ this.attachLocation( $.expr ); }continue
 default:return this.exit_()
 }
 }
 expressionOrQueryParens($,$next){
 $.expr??=undefined
-this.rule_(671,$next)
+this.rule_(678,$next)
 for(;;)switch(this.s){
-case 671:if(this.m(672,'(')){this.queryOnLeft()}continue;
-case 672:switch(this.lk()){
-case'(':this.expressionOrQueryParens($,673);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($,675)){this.queryOnLeft(0,'expr')}continue;
-case'select':this.queryExpression($,676);continue
+case 678:if(this.m(679,'(')){this.queryOnLeft()}continue;
+case 679:switch(this.lk()){
+case'(':this.expressionOrQueryParens($,680);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($,682)){this.queryOnLeft(0,'expr')}continue;
+case'select':this.queryExpression($,683);continue
 default:this.ei();continue
 }
-case 673:switch(this.lk()){
-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($,674,644)){this.queryOnLeft(0,'expr')}continue;
-case',':if(this.continueExpressionslist($,676)){this.queryOnLeft(0,'expr')}continue;
-case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(676,'queryOnLeft')&&this.queryExpression($,676,454);continue
-default:this.s=676;continue
+case 680:switch(this.lk()){
+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($,681,651)){this.queryOnLeft(0,'expr')}continue;
+case',':if(this.continueExpressionslist($,683)){this.queryOnLeft(0,'expr')}continue;
+case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(683,'queryOnLeft')&&this.queryExpression($,683,455);continue
+default:this.s=683;continue
 }
-case 674:switch(this.l()){
-case',':this.continueExpressionslist($,676);continue
-default:this.s=676;continue
+case 681:switch(this.l()){
+case',':this.continueExpressionslist($,683);continue
+default:this.s=683;continue
 }
-case 675:switch(this.l()){
-case',':this.continueExpressionslist($,676);continue
-default:this.s=676;continue
+case 682:switch(this.l()){
+case',':this.continueExpressionslist($,683);continue
+default:this.s=683;continue
 }
-case 676:if(this.m(0,')')){ this.surroundByParens( $.expr ); }continue
+case 683:if(this.m(0,')')){ this.surroundByParens( $.expr ); }continue
 default:return this.exit_()
 }
 }
 continueExpressionslist($,$next){
 let e;let _
-this.rule_(678,$next)
+this.rule_(685,$next)
 for(;;)switch(this.s){
-case 678:if(this.m(679,',')){ $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: { ... $.expr.$parens?.at( -1 ) ?? $.expr.location } }; }continue
-case 679: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=680;continue
+case 685:if(this.m(686,',')){ $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: { ... $.expr.$parens?.at( -1 ) ?? $.expr.location } }; }continue
+case 686: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=687;continue
 default:this.ei();continue
 }
-case 680:switch(this.lk()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression(_={},681)){e=_.expr; $.expr.args.push( e ); }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(0,[')']);continue
 }
-case 681:switch(this.l()){
-case',':this.c(680);continue
+case 688:switch(this.l()){
+case',':this.c(687);continue
 default:this.gr([')']);continue
 }
 case 0:{ this.attachLocation( $.expr ); }
@@ -3936,10 +3974,10 @@ return this.exit_()
 newAndValuePath($,$next){
 $.expr??=undefined
 let e;let _
-this.rule_(683,$next)
+this.rule_(690,$next)
 for(;;)switch(this.s){
-case 683:if(this.mk(684,'new')){ $.expr = this.applyOpToken(); }continue
-case 684:if(this.valuePath(_={},0)){e=_.expr; e = this.valuePathAst( e );
+case 690:if(this.mk(691,'new')){ $.expr = this.applyOpToken(); }continue
+case 691:if(this.valuePath(_={},0)){e=_.expr; e = this.valuePathAst( e );
 if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.args ); }continue
 default:
 this.attachLocation( $.expr )
@@ -3949,31 +3987,30 @@ return this.exit_()
 caseExpression($,$next){
 $.expr??=undefined
 let e;let _
-this.rule_(686,$next)
+this.rule_(693,$next)
 for(;;)switch(this.s){
-case 686:if(this.mk(687,'case')){ $.expr.op = { val: 'ixpr', location: this.lb().location }; $.expr.args = []; this.pushXprToken( $.expr ); }continue
-case 687:switch(this.lk()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression(_={},688)){e=_.expr; $.expr.args.push( e ); }continue
-case'when':this.gP(688);continue
-default:this.gi(688);continue
+case 693:if(this.mk(694,'case')){ $.expr.op = { val: 'ixpr', location: this.lb().location }; $.expr.args = []; this.pushXprToken( $.expr ); }continue
+case 694: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(_={},695)){e=_.expr; $.expr.args.push( e ); }continue
+default:this.gi(695);continue
 }
-case 688:switch(this.lk()){
-case'when':this.s=689;continue
+case 695:switch(this.lk()){
+case'when':this.s=696;continue
 default:this.e();continue
 }
-case 689:switch(this.lk()){
-case'when':if(this.ck(690)){ this.pushXprToken( $.expr ); }continue
-default:this.s=693;continue
+case 696:switch(this.lk()){
+case'when':if(this.ck(697)){ this.pushXprToken( $.expr ); }continue
+default:this.s=700;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(699,'then')){ this.pushXprToken( $.expr ); }continue
+case 699:if(this.expression(_={},696)){e=_.expr; $.expr.args.push( e ); }continue
+case 700:switch(this.lk()){
+case'else':if(this.ck(701)){ this.pushXprToken( $.expr ); }continue
+default:this.s=702;continue
 }
-case 694:if(this.expression(_={},695)){e=_.expr; $.expr.args.push( e ); }continue
-case 695:if(this.mk(0,'end')){ this.pushXprToken( $.expr ); }continue
+case 701:if(this.expression(_={},702)){e=_.expr; $.expr.args.push( e ); }continue
+case 702:if(this.mk(0,'end')){ this.pushXprToken( $.expr ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -3982,14 +4019,14 @@ return this.exit_()
 castFunction($,$next){
 $.expr??=undefined
 let arg;let _
-this.rule_(697,$next)
+this.rule_(704,$next)
 for(;;)switch(this.s){
-case 697:if(this.mk(698,'cast')){ $.expr.op = this.valueWithLocation(); }continue
-case 698:if(this.m(699,'(')){ $.expr.args = this.createArray(); }continue
-case 699:if(this.expression(_={},700)){arg=_.expr; $.expr.args?.push( arg ); }continue
-case 700:this.mk(701,'as');continue
-case 701:this.typeRefOptArgs({art:$.expr},702);continue
-case 702:if(this.m(0,')')){ this.finalizeDictOrArray( $.expr.args ); }continue
+case 704:if(this.mk(705,'cast')){ $.expr.op = this.valueWithLocation(); }continue
+case 705:if(this.m(706,'(')){ $.expr.args = this.createArray(); }continue
+case 706:if(this.expression(_={},707)){arg=_.expr; $.expr.args?.push( arg ); }continue
+case 707:this.mk(708,'as');continue
+case 708:this.typeRefOptArgs({art:$.expr},709);continue
+case 709:if(this.m(0,')')){ this.finalizeDictOrArray( $.expr.args ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -3997,66 +4034,66 @@ return this.exit_()
 }
 argumentsAndFilter($,$next){
 let open;let expr;let id;let _
-this.rule_(704,$next)
+this.rule_(711,$next)
 for(;;)switch(this.s){
-case 704:switch(this.l()){
-case'(':if(this.c(705)){open=this.lb();this.prepareSpecialFunction(); $.pathStep.args = this.createArray(); }continue
-default:this.s=724;continue
+case 711:switch(this.l()){
+case'(':if(this.c(712)){open=this.lb();this.prepareSpecialFunction(); $.pathStep.args = this.createArray(); }continue
+default:this.s=731;continue
 }
-case 705:switch(this.l()){
-case'Id':if(this.gc(706,'isNamedArg')&&this.ciA(712,'paramname'))id=this.lb();continue
-default:this.s=706;continue
+case 712:switch(this.l()){
+case'Id':if(this.gc(713,'isNamedArg')&&this.ciA(719,'paramname'))id=this.lb();continue
+default:this.s=713;continue
 }
-case 706:switch(this.l()){
-case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'Id_all':case'Number':case'String':case'QuotedLiteral':if(this.funcExpression(_={},707)){expr=_.expr; $.pathStep.args.push( expr ); }continue
-default:this.s=723;continue
+case 713:switch(this.l()){
+case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'Id_all':case'Number':case'String':case'QuotedLiteral':if(this.funcExpression(_={},714)){expr=_.expr; $.pathStep.args.push( expr ); }continue
+default:this.s=730;continue
 }
-case 707:switch(this.l()){
-case',':if(this.c(708)){this.nextFunctionArgument()}continue;
-default:this.s=709;continue
+case 714:switch(this.l()){
+case',':if(this.c(715)){this.nextFunctionArgument()}continue;
+default:this.s=716;continue
 }
-case 708:switch(this.lk()){
-case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Id_all':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.funcExpression(_={},707)){expr=_.expr; $.pathStep.args.push( expr ); }continue
-case')':case'order':this.gP(709);continue
+case 715:switch(this.lk()){
+case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Id_all':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.funcExpression(_={},714)){expr=_.expr; $.pathStep.args.push( expr ); }continue
+case')':case'order':this.gP(716);continue
 default:this.ei();continue
 }
-case 709:switch(this.lk()){
-case'order':if(this.ck(710)){ expr = $.pathStep.args[$.pathStep.args.length - 1] = this.applyOpToken( expr ); }continue
-default:this.s=723;continue
+case 716:switch(this.lk()){
+case'order':if(this.ck(717)){ expr = $.pathStep.args[$.pathStep.args.length - 1] = this.applyOpToken( expr ); }continue
+default:this.s=730;continue
 }
-case 710:if(this.mk(711,'by')){ this.pushXprToken( expr ); }continue
-case 711:if(this.orderByClauseAsXpr({outer:expr.args},723)){ this.attachLocation( expr ); }continue
-case 712:switch(this.l()){
-case':':if(this.c(713)){ $.pathStep.args = this.createDict( open ); $.pathStep.$syntax = ':'; }continue
-case'=>':if(this.c(718)){ $.pathStep.args = this.createDict(); }continue
+case 717:if(this.mk(718,'by')){ this.pushXprToken( expr ); }continue
+case 718:if(this.orderByClauseAsXpr({outer:expr.args},730)){ this.attachLocation( expr ); }continue
+case 719:switch(this.l()){
+case':':if(this.c(720)){ $.pathStep.args = this.createDict( open ); $.pathStep.$syntax = ':'; }continue
+case'=>':if(this.c(725)){ $.pathStep.args = this.createDict(); }continue
 default:this.e();continue
 }
-case 713:if(this.expression(_={},714)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 714:switch(this.l()){
-case',':this.c(715);continue
-default:this.s=723;continue
+case 720:if(this.expression(_={},721)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
+case 721:switch(this.l()){
+case',':this.c(722);continue
+default:this.s=730;continue
 }
-case 715:switch(this.l()){
-case'Id':if(this.ciA(716,'paramname'))id=this.lb();continue
-case')':this.s=723;continue
+case 722:switch(this.l()){
+case'Id':if(this.ciA(723,'paramname'))id=this.lb();continue
+case')':this.s=730;continue
 default:this.e();continue
 }
-case 716:this.m(717,':');continue
-case 717:if(this.expression(_={},714)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 718:if(this.expression(_={},719)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 719:switch(this.l()){
-case',':this.c(720);continue
-default:this.s=723;continue
+case 723:this.m(724,':');continue
+case 724:if(this.expression(_={},721)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
+case 725:if(this.expression(_={},726)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
+case 726:switch(this.l()){
+case',':this.c(727);continue
+default:this.s=730;continue
 }
-case 720:switch(this.l()){
-case'Id':if(this.ciA(721,'paramname'))id=this.lb();continue
-case')':this.s=723;continue
+case 727:switch(this.l()){
+case'Id':if(this.ciA(728,'paramname'))id=this.lb();continue
+case')':this.s=730;continue
 default:this.e();continue
 }
-case 721:this.m(722,'=>');continue
-case 722:if(this.expression(_={},719)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 723:if(this.m(724,')')){ this.finalizeDictOrArray( $.pathStep.args ); }continue
-case 724:switch(this.l()){
+case 728:this.m(729,'=>');continue
+case 729:if(this.expression(_={},726)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
+case 730:if(this.m(731,')')){ this.finalizeDictOrArray( $.pathStep.args ); }continue
+case 731:switch(this.l()){
 case'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['*','+','-','.','/','<','=','>','?','!=','<=','<>','>=','in','is','or','||','and','not','like','between']);continue
 }
@@ -4067,22 +4104,22 @@ funcExpression($,$next){
 $.expr??=undefined
 let args
 let tok;let e;let _
-this.rule_(726,$next)
+this.rule_(733,$next)
 for(;;)switch(this.s){
-case 726:switch(this.lGenericIntroOrExpr()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},728))$.expr=_.expr;continue
-case'GenericExpr':if(this.ckA(728)){tok=this.lb(); $.expr = { val: tok.keyword ?? tok.type, location: tok.location, literal: 'token' }; }continue
-case'GenericIntro':if(this.ckA(727)){ $.expr = this.applyOpToken(); args = $.expr.args; }continue
+case 733:switch(this.lGenericIntroOrExpr()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},735))$.expr=_.expr;continue
+case'GenericExpr':if(this.ckA(735)){tok=this.lb(); $.expr = { val: tok.keyword ?? tok.type, location: tok.location, literal: 'token' }; }continue
+case'GenericIntro':if(this.ckA(734)){ $.expr = this.applyOpToken(); args = $.expr.args; }continue
 default:this.e();continue
 }
-case 727:if(this.expression(_={},728)){e=_.expr; $.expr.args.push( e ); }continue
-case 728:switch(this.lGenericSeparator()){
-case'GenericSeparator':if(this.ckA(729)){ if (args) this.pushXprToken( args ); else { $.expr= this.applyOpToken( $.expr ); args = $.expr.args; } }continue
+case 734:if(this.expression(_={},735)){e=_.expr; $.expr.args.push( e ); }continue
+case 735:switch(this.lGenericSeparator()){
+case'GenericSeparator':if(this.ckA(736)){ if (args) this.pushXprToken( args ); else { $.expr= this.applyOpToken( $.expr ); args = $.expr.args; } }continue
 default:this.gr([')',',','order']);continue
 }
-case 729:switch(this.lGenericExpr()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},728)){e=_.expr; args.push( e ); }continue
-case'GenericExpr':if(this.ckA(728)){ this.pushXprToken( args ); }continue
+case 736:switch(this.lGenericExpr()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},735)){e=_.expr; args.push( e ); }continue
+case'GenericExpr':if(this.ckA(735)){ this.pushXprToken( args ); }continue
 default:this.e();continue
 }
 default:
@@ -4092,27 +4129,27 @@ return this.exit_()
 }
 overClause($,$next){
 let over=[]
-this.rule_(731,$next)
+this.rule_(738,$next)
 for(;;)switch(this.s){
-case 731:this.m(732,'(');continue
-case 732:switch(this.lk()){
-case'partition':if(this.ck(733)){ this.pushXprToken( over ); }continue
-default:this.s=735;continue
-}
-case 733:if(this.mk(734,'by')){ this.pushXprToken( over ); }continue
-case 734:this.expressionsAsXpr({outer:over},735);continue
-case 735:switch(this.lk()){
-case'order':if(this.ck(736)){ this.pushXprToken( over ); }continue
-default:this.s=738;continue
-}
-case 736:if(this.mk(737,'by')){ this.pushXprToken( over ); }continue
-case 737:this.orderByClauseAsXpr({outer:over},738);continue
-case 738:switch(this.lk()){
-case'rows':if(this.ck(739)){ this.pushXprToken( over ); }continue
-default:this.s=740;continue
-}
-case 739:this.windowFrameClause({outer:over},740);continue
-case 740:this.m(0,')');continue
+case 738:this.m(739,'(');continue
+case 739:switch(this.lk()){
+case'partition':if(this.ck(740)){ this.pushXprToken( over ); }continue
+default:this.s=742;continue
+}
+case 740:if(this.mk(741,'by')){ this.pushXprToken( over ); }continue
+case 741:this.expressionsAsXpr({outer:over},742);continue
+case 742:switch(this.lk()){
+case'order':if(this.ck(743)){ this.pushXprToken( over ); }continue
+default:this.s=745;continue
+}
+case 743:if(this.mk(744,'by')){ this.pushXprToken( over ); }continue
+case 744:this.orderByClauseAsXpr({outer:over},745);continue
+case 745:switch(this.lk()){
+case'rows':if(this.ck(746)){ this.pushXprToken( over ); }continue
+default:this.s=747;continue
+}
+case 746:this.windowFrameClause({outer:over},747);continue
+case 747:this.m(0,')');continue
 default:
 $.outer.push( this.surroundByParens( this.ixprAst( over ) ) )
 return this.exit_()
@@ -4121,14 +4158,14 @@ return this.exit_()
 expressionsAsXpr($,$next){
 let args=[]
 let expr;let _
-this.rule_(742,$next)
+this.rule_(749,$next)
 for(;;)switch(this.s){
-case 742:if(this.expression(_={},743)){expr=_.expr; args.push( expr ); }continue
-case 743:switch(this.l()){
-case',':if(this.c(744)){ this.pushXprToken( args ); }continue
+case 749:if(this.expression(_={},750)){expr=_.expr; args.push( expr ); }continue
+case 750:switch(this.l()){
+case',':if(this.c(751)){ this.pushXprToken( args ); }continue
 default:this.gr([')','rows','order']);continue
 }
-case 744:if(this.expression(_={},743)){expr=_.expr; args.push( expr ); }continue
+case 751:if(this.expression(_={},750)){expr=_.expr; args.push( expr ); }continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
@@ -4136,14 +4173,14 @@ return this.exit_()
 }
 orderByClauseAsXpr($,$next){
 let args=[]
-this.rule_(746,$next)
+this.rule_(753,$next)
 for(;;)switch(this.s){
-case 746:this.orderBySpecAsXpr({args},747);continue
-case 747:switch(this.l()){
-case',':if(this.c(748)){ this.pushXprToken( args ); }continue
+case 753:this.orderBySpecAsXpr({args},754);continue
+case 754:switch(this.l()){
+case',':if(this.c(755)){ this.pushXprToken( args ); }continue
 default:this.gr([')']);continue
 }
-case 748:this.orderBySpecAsXpr({args},747);continue
+case 755:this.orderBySpecAsXpr({args},754);continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
@@ -4151,18 +4188,18 @@ return this.exit_()
 }
 orderBySpecAsXpr($,$next){
 let expr;let _
-this.rule_(750,$next)
+this.rule_(757,$next)
 for(;;)switch(this.s){
-case 750:if(this.expression(_={},751)){expr=_.expr; $.args.push( expr ); }continue
-case 751:switch(this.lk()){
-case'asc':case'desc':if(this.ck(752)){ this.pushXprToken( $.args ); }continue
-default:this.s=752;continue
+case 757:if(this.expression(_={},758)){expr=_.expr; $.args.push( expr ); }continue
+case 758:switch(this.lk()){
+case'asc':case'desc':if(this.ck(759)){ this.pushXprToken( $.args ); }continue
+default:this.s=759;continue
 }
-case 752:switch(this.lk()){
-case'nulls':if(this.ck(753)){ this.pushXprToken( $.args ); }continue
+case 759:switch(this.lk()){
+case'nulls':if(this.ck(760)){ this.pushXprToken( $.args ); }continue
 default:this.gr([')',',']);continue
 }
-case 753:switch(this.lk()){
+case 760:switch(this.lk()){
 case'last':case'first':if(this.ck(0)){ this.pushXprToken( $.args ); }continue
 default:this.e();continue
 }
@@ -4171,50 +4208,50 @@ default:return this.exit_()
 }
 windowFrameClause($,$next){
 let args=[]
-this.rule_(755,$next)
+this.rule_(762,$next)
 for(;;)switch(this.s){
-case 755:switch(this.lk()){
-case'unbounded':if(this.ck(756)){ this.pushXprToken( args ); }continue
-case'Number':if(this.c(756)){ args.push( this.unsignedIntegerLiteral() ); }continue
-case'current':if(this.ck(757)){ this.pushXprToken( args ); }continue
-case'between':if(this.ck(758)){ this.pushXprToken( args ); }continue
+case 762:switch(this.lk()){
+case'unbounded':if(this.ck(763)){ this.pushXprToken( args ); }continue
+case'Number':if(this.c(763)){ args.push( this.unsignedIntegerLiteral() ); }continue
+case'current':if(this.ck(764)){ this.pushXprToken( args ); }continue
+case'between':if(this.ck(765)){ this.pushXprToken( args ); }continue
 default:this.e();continue
 }
-case 756:if(this.mk(0,'preceding')){ this.pushXprToken( args ); }continue
-case 757:if(this.mk(0,'row')){ this.pushXprToken( args ); }continue
-case 758:this.windowFrameBoundSpec({args},759);continue
-case 759:if(this.mk(760,'and')){ this.pushXprToken( args ); }continue
-case 760:this.windowFrameBoundSpec({args},0);continue
+case 763:if(this.mk(0,'preceding')){ this.pushXprToken( args ); }continue
+case 764:if(this.mk(0,'row')){ this.pushXprToken( args ); }continue
+case 765:this.windowFrameBoundSpec({args},766);continue
+case 766:if(this.mk(767,'and')){ this.pushXprToken( args ); }continue
+case 767:this.windowFrameBoundSpec({args},0);continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
 }
 }
 windowFrameBoundSpec($,$next){
-this.rule_(762,$next)
+this.rule_(769,$next)
 for(;;)switch(this.s){
-case 762:switch(this.lk()){
-case'unbounded':if(this.ck(763)){ this.pushXprToken( $.args ); }continue
-case'Number':if(this.c(763)){ $.args.push( this.unsignedIntegerLiteral() ); }continue
-case'current':if(this.ck(765)){ this.pushXprToken( $.args ); }continue
+case 769:switch(this.lk()){
+case'unbounded':if(this.ck(770)){ this.pushXprToken( $.args ); }continue
+case'Number':if(this.c(770)){ $.args.push( this.unsignedIntegerLiteral() ); }continue
+case'current':if(this.ck(772)){ this.pushXprToken( $.args ); }continue
 default:this.e();continue
 }
-case 763:switch(this.lk()){
-case'following':this.ck(764);continue
-case'preceding':this.ck(764);continue
+case 770:switch(this.lk()){
+case'following':this.ck(771);continue
+case'preceding':this.ck(771);continue
 default:this.e();continue
 }
-case 764:if(this.gr([])){ this.pushXprToken( $.args ); }continue
-case 765:if(this.mk(0,'row')){ this.pushXprToken( $.args ); }continue
+case 771:if(this.gr([])){ this.pushXprToken( $.args ); }continue
+case 772:if(this.mk(0,'row')){ this.pushXprToken( $.args ); }continue
 default:return this.exit_()
 }
 }
 literalValue($,$next){
 $.expr??={}
-this.rule_(767,$next)
+this.rule_(774,$next)
 for(;;)switch(this.s){
-case 767:switch(this.lk()){
-case'#':if(this.c(768)){ this.reportUnexpectedSpace(); }continue
+case 774:switch(this.lk()){
+case'#':if(this.c(775)){ 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
@@ -4222,17 +4259,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 768:if(this.mi(0,'enumref')){ $.expr = { literal: 'enum', sym: this.identAst() } }continue
+case 775:if(this.miA(0,'enumref')){ $.expr = { literal: 'enum', sym: this.identAst() } }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
 }
 }
 annoAssignStd($,$next){
-this.rule_(770,$next)
+this.rule_(777,$next)
 for(;;)switch(this.s){
-case 770:if(this.m(771,'@')){this.annoInSameLine(); this.reportUnexpectedSpace(); }continue
-case 771:switch(this.l()){
+case 777:if(this.m(778,'@')){this.annoInSameLine(); this.reportUnexpectedSpace(); }continue
+case 778:switch(this.l()){
 case'(':this.annoAssignParen($,0);continue
 case'Id':this.annoAssignBase($,0);continue
 default:this.e();continue
@@ -4243,10 +4280,10 @@ return this.exit_()
 }
 }
 annoAssignCol($,$next){
-this.rule_(773,$next)
+this.rule_(780,$next)
 for(;;)switch(this.s){
-case 773:if(this.m(774,'@')){ this.reportUnexpectedSpace(); }continue
-case 774:switch(this.l()){
+case 780:if(this.m(781,'@')){ this.reportUnexpectedSpace(); }continue
+case 781:switch(this.l()){
 case'(':this.annoAssignParen($,0);continue
 case'Id':this.annoAssignBase($,0);continue
 default:this.e();continue
@@ -4258,10 +4295,10 @@ return this.exit_()
 }
 annoAssignMid($,$next){
 let name;let _
-this.rule_(776,$next)
+this.rule_(783,$next)
 for(;;)switch(this.s){
-case 776:if(this.m(777,'@')){this.annoInSameLine(); this.reportUnexpectedSpace(); }continue
-case 777:switch(this.l()){
+case 783:if(this.m(784,'@')){this.annoInSameLine(); this.reportUnexpectedSpace(); }continue
+case 784: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
@@ -4272,33 +4309,33 @@ return this.exit_()
 }
 }
 annoAssignParen($,$next){
-this.rule_(779,$next)
+this.rule_(786,$next)
 for(;;)switch(this.s){
-case 779:if(this.m(780,'(')){this.annoInSameLine()}continue;
-case 780:switch(this.l()){
-case'Id':this.annoAssignBase({art:$.art},781);continue
-default:this.s=782;continue
-}
-case 781:switch(this.l()){
-case',':this.c(780);continue
-case')':this.s=782;continue
+case 786:if(this.m(787,'(')){this.annoInSameLine()}continue;
+case 787:switch(this.l()){
+case'Id':this.annoAssignBase({art:$.art},788);continue
+default:this.s=789;continue
+}
+case 788:switch(this.l()){
+case',':this.c(787);continue
+case')':this.s=789;continue
 default:this.e();continue
 }
-case 782:this.m(0,')');continue
+case 789:this.m(0,')');continue
 default:return this.exit_()
 }
 }
 annoAssignBase($,$next){
 let value={}
 let name;let _
-this.rule_(784,$next)
+this.rule_(791,$next)
 for(;;)switch(this.s){
-case 784:if(this.annoNamePath(_={category:'anno'},785))name=_.name;continue
-case 785:switch(this.l()){
-case':':this.gc(0,'annoInSameLine')&&this.c(786);continue
+case 791:if(this.annoNamePath(_={category:'anno'},792))name=_.name;continue
+case 792:switch(this.l()){
+case':':this.gc(0,'annoInSameLine')&&this.c(793);continue
 default:this.gr([]);continue
 }
-case 786:if(this.annoValue(_={},0))value=_.value;continue
+case 793:if(this.annoValue(_={},0))value=_.value;continue
 default:
 this.assignAnnotation( $.art, value, name || {} )
 return this.exit_()
@@ -4307,20 +4344,20 @@ return this.exit_()
 annoNamePath($,$next){
 $.name??=new XsnName()
 let at
-this.rule_(788,$next)
+this.rule_(795,$next)
 for(;;)switch(this.s){
-case 788:if(this.miA(789,$.category)){ $.name.path = [ this.identAst() ]; }continue
-case 789:switch(this.l()){
-case'.':this.c(790);continue
-default:this.s=792;continue
-}
-case 790:switch(this.l()){
-case'Id':if(this.ciA(789,$.category)){ $.name.path.push( this.identAst() ); }continue
-case'@':if(this.c(791))at=this.lb();continue
+case 795:if(this.miA(796,$.category)){ $.name.path = [ this.identAst() ]; }continue
+case 796:switch(this.l()){
+case'.':this.c(797);continue
+default:this.s=799;continue
+}
+case 797:switch(this.l()){
+case'Id':if(this.ciA(796,$.category)){ $.name.path.push( this.identAst() ); }continue
+case'@':if(this.c(798))at=this.lb();continue
 default:this.e();continue
 }
-case 791:if(this.miA(789,$.category)){ $.name.path.push( this.identAstWithPrefix( at ) ); }continue
-case 792:switch(this.l()){
+case 798:if(this.miA(796,$.category)){ $.name.path.push( this.identAstWithPrefix( at ) ); }continue
+case 799:switch(this.l()){
 case'#':this.gc(0,'annoInSameLine')&&this.annoPathVariant({nameOrRef:$.name},0);continue
 default:this.gr([]);continue
 }
@@ -4331,25 +4368,25 @@ return this.exit_()
 }
 annoPath($,$next){
 let at
-this.rule_(794,$next)
+this.rule_(801,$next)
 for(;;)switch(this.s){
-case 794:switch(this.l()){
-case'Id':if(this.ciA(796,$.category)){ $.nameOrRef.path = [ this.identAst() ]; }continue
-case'@':if(this.c(795))at=this.lb();continue
+case 801:switch(this.l()){
+case'Id':if(this.ciA(803,$.category)){ $.nameOrRef.path = [ this.identAst() ]; }continue
+case'@':if(this.c(802))at=this.lb();continue
 default:this.e();continue
 }
-case 795:if(this.miA(796,$.category)){ $.nameOrRef.path = [ this.identAstWithPrefix( at ) ]; }continue
-case 796:switch(this.l()){
-case'.':this.c(797);continue
-default:this.s=799;continue
+case 802:if(this.miA(803,$.category)){ $.nameOrRef.path = [ this.identAstWithPrefix( at ) ]; }continue
+case 803:switch(this.l()){
+case'.':this.c(804);continue
+default:this.s=806;continue
 }
-case 797:switch(this.l()){
-case'Id':if(this.ciA(796,$.category)){ $.nameOrRef.path.push( this.identAst() ); }continue
-case'@':if(this.c(798))at=this.lb();continue
+case 804:switch(this.l()){
+case'Id':if(this.ciA(803,$.category)){ $.nameOrRef.path.push( this.identAst() ); }continue
+case'@':if(this.c(805))at=this.lb();continue
 default:this.e();continue
 }
-case 798:if(this.miA(796,$.category)){ $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); }continue
-case 799:switch(this.l()){
+case 805:if(this.miA(803,$.category)){ $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); }continue
+case 806:switch(this.l()){
 case'#':this.annoPathVariant({nameOrRef:$.nameOrRef},0);continue
 default:this.gr([]);continue
 }
@@ -4359,15 +4396,15 @@ return this.exit_()
 }
 }
 annoPathVariant($,$next){
-this.rule_(801,$next)
+this.rule_(808,$next)
 for(;;)switch(this.s){
-case 801:if(this.m(802,'#')){ this.reportUnexpectedSpace(); }continue
-case 802:if(this.miA(803,'variant')){ $.nameOrRef.variant = { path: [ this.identAst() ] }; }continue
-case 803:switch(this.l()){
-case'.':this.c(804);continue
+case 808:if(this.m(809,'#')){ this.reportUnexpectedSpace(); }continue
+case 809:if(this.miA(810,'variant')){ $.nameOrRef.variant = { path: [ this.identAst() ] }; }continue
+case 810:switch(this.l()){
+case'.':this.c(811);continue
 default:this.gr([]);continue
 }
-case 804:if(this.miA(803,'variant')){ $.nameOrRef.variant.path.push( this.identAst() ); }continue
+case 811:if(this.miA(810,'variant')){ $.nameOrRef.variant.path.push( this.identAst() ); }continue
 default:
 this.attachLocation( $.nameOrRef.variant )
 return this.exit_()
@@ -4377,14 +4414,14 @@ annoStructValue($,$next){
 $.value??={}
 let name=new XsnName()
 let _
-this.rule_(806,$next)
+this.rule_(813,$next)
 for(;;)switch(this.s){
-case 806:if(this.annoPath({nameOrRef:name,category:'name'},807)){ this.attachLocation( name ); }continue
-case 807:switch(this.l()){
-case':':this.c(808);continue
-default:if(this.gr([',','}'])){ this.attachLocation( $.value ); }continue
+case 813:if(this.annoPath({nameOrRef:name,category:'name'},814)){ this.attachLocation( name ); }continue
+case 814:switch(this.l()){
+case':':this.c(815);continue
+default:if(this.gr(['Id',',','@','}'])){ this.attachLocation( $.value ); }continue
 }
-case 808:if(this.annoValue(_={},0))$.value=_.value;continue
+case 815:if(this.annoValue(_={},0))$.value=_.value;continue
 default:
 $.value.name = name
 return this.exit_()
@@ -4393,51 +4430,52 @@ return this.exit_()
 annoValue($,$next){
 $.value??={}
 let sign;let sub;let ellipsis;let upTo;let _
-this.rule_(810,$next)
+this.rule_(817,$next)
 for(;;)switch(this.s){
-case 810:switch(this.lk()){
+case 817: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(811))sign=this.lb();continue
+case'+':case'-':if(this.c(818))sign=this.lb();continue
 case'Id':case'@':this.annoPath({nameOrRef:$.value,category:'annoref'},0);continue
-case'{':if(this.c(812)){ if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
+case'{':if(this.c(819)){ if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
 else { $.value.struct = Object.create(null); $.value.literal = 'struct'; } }continue
-case'[':if(this.c(816)){this.arrayAnno(); $.value.val = []; $.value.literal = 'array' }continue
-case'(':this.c(823);continue
+case'[':if(this.c(823)){this.arrayAnno(); $.value.val = []; $.value.literal = 'array' }continue
+case'(':this.c(830);continue
 default:this.ei();continue
 }
-case 811:if(this.m(0,'Number')){ this.adjustAnnoNumber( $.value = this.numberLiteral( sign ) ); }continue
-case 812:switch(this.l()){
-case'Id':case'@':if(this.annoStructValue(_={},813)){sub=_.value; if ($.value.$flatten) $.value.$flatten.push( sub );
+case 818:if(this.m(0,'Number')){ this.adjustAnnoNumber( $.value = this.numberLiteral( sign ) ); }continue
+case 819:switch(this.l()){
+case'Id':case'@':if(this.annoStructValue(_={},820)){sub=_.value; if ($.value.$flatten) $.value.$flatten.push( sub );
 else this.addDef( sub, $.value, 'struct', null, sub.name ); }continue
-default:this.s=814;continue
-}
-case 813:switch(this.l()){
-case',':this.c(812);continue
-case'}':this.s=814;continue
-default:this.e();continue
-}
-case 814:this.s=815;{ this.ec( 'arrayAnno', 'orNotEmpty' ); }continue
-case 815:this.m(0,'}');continue
-case 816:switch(this.l()){
-case'Id':case'#':case'(':case'+':case'-':case'@':case'[':case'{':case'Number':case'String':case'QuotedLiteral':if(this.annoValue(_={},820)){sub=_.value; $.value.val.push( sub ) }continue
-case'...':if(this.gc(821,'arrayAnno','ellipsis')&&this.c(817))ellipsis=this.lb();continue
 default:this.s=821;continue
 }
-case 817:switch(this.lk()){
-case'up':this.ck(818);continue
-default:this.s=820;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location } ); }continue
-}
-case 818:this.mk(819,'to');continue
-case 819:if(this.annoValue(_={},820)){upTo=_.value; $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location, upTo: upTo } ); }continue
 case 820:switch(this.l()){
-case',':this.c(816);continue
-case']':this.s=821;continue
+case',':this.c(819);continue
+case'}':this.s=821;continue
+case'Id':case'@':this.ec('fail')&&this.g(819);continue
+default:this.e();continue
+}
+case 821:this.s=822;{ this.ec( 'arrayAnno', 'orNotEmpty' ); }continue
+case 822:this.m(0,'}');continue
+case 823:switch(this.l()){
+case'Id':case'#':case'(':case'+':case'-':case'@':case'[':case'{':case'Number':case'String':case'QuotedLiteral':if(this.annoValue(_={},827)){sub=_.value; $.value.val.push( sub ) }continue
+case'...':if(this.gc(828,'arrayAnno','ellipsis')&&this.c(824))ellipsis=this.lb();continue
+default:this.s=828;continue
+}
+case 824:switch(this.lk()){
+case'up':this.ck(825);continue
+default:this.s=827;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location } ); }continue
+}
+case 825:this.mk(826,'to');continue
+case 826:if(this.annoValue(_={},827)){upTo=_.value; $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location, upTo: upTo } ); }continue
+case 827:switch(this.l()){
+case',':this.c(823);continue
+case']':this.s=828;continue
 default:this.e();continue
 }
-case 821:this.s=822;{ this.ec( 'arrayAnno', 'bracket' ); }continue
-case 822: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 828:this.s=829;{ this.ec( 'arrayAnno', 'bracket' ); }continue
+case 829:this.m(0,']');continue
+case 830:if(this.condition(_={},831))$.value=_.expr;continue
+case 831:if(this.m(0,')')){ $.value.$tokenTexts = this.ruleTokensText(); }continue
 default:
 this.attachLocation( $.value )
 return this.exit_()