@sap/cds-compiler 5.5.0 → 5.6.0

package/lib/gen/CdlParser.js

@@ -1,4 +1,4 @@
-// Parser generated by redepage v0.1.18
+// Parser generated by redepage v0.1.19
 'use strict;'
 const { XsnSource, XsnArtifact, XsnName } = require( '../compiler/xsn-model' )
 const AstBuildingParser = require('../parsers/AstBuildingParser')
@@ -133,7 +133,7 @@ Id:['g',6,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'artifactDefOrExtend',
-{'@':[10,768],'':11},
+{'@':[10,770],'':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,
@@ -147,7 +147,7 @@ annotation:[0,54,,'vocabularyRestriction'],
 type:[0,59],
 aspect:[0,64],abstract:'aspect',
 entity:[0,74],
-view:[0,88],
+view:[0,88,,'hide_'],
 event:[0,100],
 action:[0,112],
 function:[0,118],
@@ -155,10 +155,10 @@ function:[0,118],
 {
 Id:[0,228],
 service:[0,250,1],
-context:[0,257,1],
-type:[0,264,1],
-aspect:[0,276,1],entity:'aspect',
-projection:[0,287,1],
+context:[0,257,1,'hide_'],
+type:[0,264,1,'hide_'],
+aspect:[0,276,1,'hide_'],entity:'aspect',
+projection:[0,287,1,'hide_'],
 },
 [0,215],
 'namespaceDeclaration',
@@ -199,31 +199,31 @@ Id:[22,32],
 'serviceDef',
 ['mk',45,'service'],
 [46,36],
-{'@':[46,774],'':47},
+{'@':[46,776],'':47},
 {'{':[0,5],'':0},
 'contextDef',
 ['mk',50,'context'],
 [51,36],
-{'@':[51,774],'':52},
+{'@':[51,776],'':52},
 {'{':[0,5],'':0},
 'annotationDef',
 ['mk',55,'annotation'],
 [56,36],
-{'@':[56,774],'':57},
+{'@':[56,776],'':57},
 [0,346],
 'typeDef',
 ['mk',60,'type'],
 [61,36],
-{'@':[61,774],'':62},
+{'@':[61,776],'':62},
 [0,346],
 'aspectDef',
 {
 aspect:['ck',66],
-abstract:['ck',65],
+abstract:['ck',65,,'hide_'],
 },
 ['mk',66,'entity'],
 [67,36],
-{'@':[67,774],'':68},
+{'@':[67,776],'':68},
 {
 '{':[72,157],
 ':':['c',69],
@@ -240,7 +240,7 @@ abstract:['ck',65],
 'entityDef',
 ['mk',75,'entity'],
 [76,36],
-{'@':[76,774],'':77},
+{'@':[76,776],'':77},
 {'(':[78,141],'':78},
 {
 ':':['c',79],
@@ -258,16 +258,16 @@ as:['ck',83],
 '(':[86,451],select:'(',
 projection:[84,445],
 },
-{group:[85,601],where:'group',having:'group','':85},
-{limit:[86,613],order:'limit','':86},
+{group:[85,603],where:'group',having:'group','':85},
+{limit:[86,615],order:'limit','':86},
 {actions:[0,124],'':0},
 'viewDef',
 ['mk',89,'view'],
 [90,36],
-{'@':[90,774],'':91},
+{'@':[90,776],'':91},
 {
 '(':[97,141],
-with:['ck',92],
+with:['ck',92,,'hide_'],
 '':97
 },
 ['mk',93,'parameters'],
@@ -280,7 +280,7 @@ with:['ck',92],
 'eventDef',
 ['mk',101,'event'],
 [102,36],
-{'@':[102,774],'':103},
+{'@':[102,776],'':103},
 {
 '{':[0,157],
 ':':['c',104],
@@ -298,17 +298,17 @@ projection:[0,445,1],
 '{':109,
 },
 [0,157],
-{'@':[110,768],'':0},
+{'@':[110,770],'':0},
 'actionMainDef',
 ['mk',113,'action'],
 [114,36],
-{'@':[114,774],'':115},
+{'@':[114,776],'':115},
 [116,141],
 {returns:[0,153],'':0},
 'functionMainDef',
 ['mk',119,'function'],
 [120,36],
-{'@':[120,774],'':121},
+{'@':[120,776],'':121},
 [122,141],
 [0,153],
 'actionsBlock',
@@ -322,17 +322,17 @@ Id:['g',126,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'boundActionFunctionDef',
-{'@':[130,768],'':131},
+{'@':[130,770],'':131},
 {
 action:['ck',132],
 function:['ck',136],
 },
 ['mi',133],
-{'@':[133,774],'':134},
+{'@':[133,776],'':134},
 [135,141],
 {returns:[0,153],'':0},
 ['mi',137],
-{'@':[137,774],'':138},
+{'@':[137,776],'':138},
 [139,141],
 [0,153],
 'paramsList',
@@ -344,9 +344,9 @@ function:['ck',136],
 },
 ['m',0,')'],
 'paramDef',
-{'@':[146,768],'':147},
+{'@':[146,770],'':147},
 ['miA',148],
-{'@':[148,774],'':149},
+{'@':[148,776],'':149},
 {
 '{':[150,157],
 ':':['c',151],
@@ -355,7 +355,7 @@ function:['ck',136],
 [0,357],
 'returnsSpec',
 ['mk',154,'returns',,'default','elementRestriction'],
-{'@':[154,768],'':155},
+{'@':[154,770],'':155},
 [0,357],
 'elementsBlock',
 ['m',158,'{'],
@@ -367,13 +367,13 @@ Id:['g',158,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'elementDef',
-{'@':[162,768],'':163},
+{'@':[162,770],'':163},
 {virtual:['ck',164,1],'':164},
 {key:['ck',165],'':165},
-{masked:['ck',166,1],'':166},
-{element:['ck',167,1],'':167},
+{masked:['ck',166,1,'hide_'],'':166},
+{element:['ck',167,1,'hide_'],'':167},
 ['mi',168,,,'elem','elementRestriction'],
-{'@':[168,774],'':169},
+{'@':[168,776],'':169},
 {
 '{':[170,157],
 ':':['c',171],
@@ -382,10 +382,10 @@ Id:['g',158,,'afterBrace'],'@':'Id',
 {not:[172,438],null:'not','':172},
 [172,357],
 {'=':['c',173,,'elementRestriction','calc'],'':0},
-[174,641],
+[174,643],
 {stored:['ck',175],'':175},
 ['g',176],
-{'@':[176,768,,'elementRestriction','anno'],'':0},
+{'@':[176,770,,'elementRestriction','anno'],'':0},
 'enumSymbolsBlock',
 ['mk',179,'enum'],
 ['m',180,'{'],
@@ -396,19 +396,19 @@ Id:['g',158,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'enumSymbolDef',
-{'@':[184,768],'':185},
+{'@':[184,770],'':185},
 ['mi',186],
-{'@':[186,768],'':187},
+{'@':[186,770],'':187},
 {'=':['c',188],'':0},
 {
 String:['c',190],
 Number:['c',190],
 '+':['c',189],'-':'+',
-Id:[190,765],'#':'Id',QuotedLiteral:'Id',
+Id:[190,767,,'hide_'],'#':'Id',QuotedLiteral:'Id',
 },
 ['m',190,'Number'],
 ['g',191],
-{'@':[191,768],'':0},
+{'@':[191,770],'':0},
 'foreignKeysBlock',
 ['m',194,'{'],
 {Id:[195,198],'@':'Id','':196},
@@ -418,7 +418,7 @@ Id:[190,765],'#':'Id',QuotedLiteral:'Id',
 },
 ['m',0,'}'],
 'foreignKeyDef',
-{'@':[198,768],'':199},
+{'@':[198,770],'':199},
 [200,40],
 {as:['ck',201],'':0},
 ['mi',0],
@@ -433,10 +433,10 @@ composition:['ck',208],
 ['mk',210,'to'],
 {'[':[209,426],'':209},
 ['mk',210,'of'],
-{one:['ck',211,1],many:'one','':211},
+{one:['ck',211,1,'noRepeatedCardinality'],many:'one','':211},
 [212,40],
 ['mk',213,'on'],
-[0,633],
+[0,635],
 'annotateArtifact',
 [216,36],
 {
@@ -447,10 +447,10 @@ with:['ck',222],
 [218,36],
 {with:['ck',219],'':219},
 ['g',220],
-{'@':[220,768],'':221},
+{'@':[220,770],'':221},
 {'{':[0,320],'':0},
 ['g',223],
-{'@':[223,768],'':224},
+{'@':[223,770],'':224},
 {'(':[225,307],'':225},
 {
 returns:[0,316],
@@ -468,7 +468,7 @@ with:['ck',239],
 [231,36],
 {with:['ck',232],'':232},
 ['g',233],
-{'@':[233,768],'':234},
+{'@':[233,770],'':234},
 {
 elements:['ck',235],
 '{':235,
@@ -477,10 +477,10 @@ enum:[0,178],
 '':0
 },
 [0,330],
-{'@':[236,768],'':237},
+{'@':[236,770],'':237},
 {'{':[238,330],'':0},
 {actions:[0,124],'':0},
-{'@':[239,768],'':240},
+{'@':[239,770],'':240},
 {
 Id:[241,40],
 elements:['ck',245,1],
@@ -498,29 +498,29 @@ definitions:['ck',248,1],
 {actions:[0,124],'':0},
 [246,330],
 {actions:[0,124],'':0},
-[0,557],
+[0,558],
 [0,5],
 'extendService',
 ['mk',251,'service'],
 [252,36],
 {with:['ck',253],'':253},
 ['g',254],
-{'@':[254,768],'':255},
+{'@':[254,770],'':255},
 {'{':[0,5],'':0},
 'extendContext',
 ['mk',258,'context'],
 [259,36],
 {with:['ck',260],'':260},
 ['g',261],
-{'@':[261,768],'':262},
+{'@':[261,770],'':262},
 {'{':[0,5],'':0},
 'extendType',
 ['mk',265,'type'],
 [266,36],
 {with:['ck',269],'':267},
-{'@':[267,768],'':268},
+{'@':[267,770],'':268},
 {'{':[0,330],'':0},
-{'@':[269,768],'':270},
+{'@':[269,770],'':270},
 {
 Id:[271,40],
 elements:['ck',274,1],
@@ -537,8 +537,8 @@ enum:[0,178,1],
 {aspect:['ck',277],entity:'aspect'},
 [278,36],
 {with:['ck',280],'':279},
-{'@':[279,768],'':284},
-{'@':[280,768],'':281},
+{'@':[279,770],'':284},
+{'@':[280,770],'':281},
 {
 Id:[282,40],
 actions:['g',284,1],
@@ -553,8 +553,8 @@ actions:['g',284,1],
 [289,36],
 {with:['ck',290],'':290},
 ['g',291],
-{'@':[291,768],'':292},
-{'{':[293,557],'':293},
+{'@':[291,770],'':292},
+{'{':[293,558],'':293},
 {actions:[0,124],'':0},
 'annotateActionsBlock',
 ['mk',296,'actions'],
@@ -567,9 +567,9 @@ Id:['g',297,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'annotateBoundAction',
-{'@':[301,768],'':302},
+{'@':[301,770],'':302},
 ['mi',303],
-{'@':[303,768],'':304},
+{'@':[303,770],'':304},
 {'(':[305,307],'':305},
 {returns:[0,316,1],'':0},
 'annotateParamsBlock',
@@ -581,12 +581,12 @@ Id:['g',297,,'afterBrace'],'@':'Id',
 },
 ['m',0,')'],
 'annotateParam',
-{'@':[312,768],'':313},
+{'@':[312,770],'':313},
 ['mi',314],
-{'@':[314,768],'':0},
+{'@':[314,770],'':0},
 'annotateReturns',
 ['mk',317,'returns'],
-{'@':[317,768],'':318},
+{'@':[317,770],'':318},
 {'{':[0,320],'':0},
 'annotateElementsBlock',
 ['m',321,'{'],
@@ -598,9 +598,9 @@ Id:['g',321,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'annotateElement',
-{'@':[325,768],'':326},
+{'@':[325,770],'':326},
 ['mi',327],
-{'@':[327,768],'':328},
+{'@':[327,770],'':328},
 {'{':[0,320],'':0},
 'extendElementsBlock',
 ['m',331,'{'],
@@ -612,7 +612,7 @@ Id:['g',331,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'elementDefOrExtend',
-{'@':[335,768],'':336},
+{'@':[335,770],'':336},
 {
 Id:[0,162],'@':'Id',key:'Id',
 extend:['ck',337,1],
@@ -620,9 +620,9 @@ extend:['ck',337,1],
 {element:['ck',338,1],'':338},
 ['mi',339],
 {with:['ck',342],'':340},
-{'@':[340,768],'':341},
+{'@':[340,770],'':341},
 {'{':[0,330],'':0},
-{'@':[342,768],'':343},
+{'@':[342,770],'':343},
 {
 elements:['ck',344],
 '{':344,
@@ -668,9 +668,9 @@ many:['ck',378,1,,'calc','elementRestriction'],
 '{':[384,157,,,'calc','elementRestriction'],
 },
 ['g',359],
-{'@':[359,768],'':360},
+{'@':[359,770],'':360},
 {not:[361,438,,'elementRestriction','notNull'],null:'not','':362},
-{'@':[361,768],'':362},
+{'@':[361,770],'':362},
 {
 enum:[363,178,,,'anno','elementRestriction'],
 '@':[0,393],not:'@',null:'@',default:'@',
@@ -678,17 +678,17 @@ enum:[363,178,,,'anno','elementRestriction'],
 },
 {not:[364,438,,'elementRestriction','notNull'],null:'not','':364},
 {default:['ck',365,,'elementRestriction','default'],'':366},
-[366,641],
+[366,643],
 {not:[0,438,,'elementRestriction','notNull'],null:'not','':0},
 [368,404],
 {'@':[0,393],not:'@',null:'@',default:'@','':0},
 {'[':[370,426],'':370},
 ['mk',371,'to'],
-{one:['ck',372,1],many:'one','':372},
+{one:['ck',372,1,'noRepeatedCardinality'],many:'one','':372},
 [0,386],
 {'[':[374,426],'':374},
 ['mk',375,'of'],
-{one:['ck',376,1],many:'one','':376},
+{one:['ck',376,1,'noRepeatedCardinality'],many:'one','':376},
 {
 Id:[0,386],
 '{':[0,157],
@@ -701,30 +701,30 @@ type:[379,396,1],
 },
 {not:[380,438,,'elementRestriction','notNull'],null:'not','':380},
 {enum:[383,178],'':381},
-{'@':[381,768],'':382},
+{'@':[381,770],'':382},
 ['g',0,[]],
 {not:[0,438,,'elementRestriction','notNull'],null:'not','':0},
 {not:[0,438],null:'not','':0},
 'typeAssocProperties',
 [387,40],
-{'@':[387,768],'':388},
+{'@':[387,770],'':388},
 {
 on:['ck',389],
 '{':[391,193],
 '@':[0,393],not:'@',null:'@',default:'@',
 '':0
 },
-[390,633],
-{'@':[390,768],'':0},
+[390,635],
+{'@':[390,770],'':0},
 {'@':[0,393],not:'@',null:'@',default:'@','':0},
 'typeProperties',
 {
-'@':[393,768],
+'@':[393,770],
 not:[393,438,,'elementRestriction','notNull'],null:'not',
 default:['ck',394,,'elementRestriction','default'],
 '':0
 },
-[393,641],
+[393,643],
 'typeTypeOf',
 ['mk',397,'type'],
 ['mk',398,'of'],
@@ -812,11 +812,11 @@ not:['ck',439],
 {';':['c',443],'':443},
 ['m',0,'EOF'],
 'projectionSpec',
-['mk',446,'projection'],
+['mk',446,'projection',,,'afterBrace'],
 ['mk',447,'on'],
-[448,511],
-{'{':[449,557],'':449},
-{excluding:[0,550],'':0},
+[448,512,,,,'afterBrace'],
+{'{':[449,558],'':449},
+{excluding:[0,551],'':0},
 'queryExpression',
 {
 '(':['c',452],
@@ -834,7 +834,7 @@ union:['ck',456,,'precLeft_',2],
 {all:['ck',457],distinct:'all','':457},
 [454,451],
 {limit:['g',459,,'precPost_',0],order:'limit','':0},
-[0,613],
+[0,615],
 'selectQuery',
 ['mk',462,'select'],
 {
@@ -842,7 +842,7 @@ 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,
 },
-[464,480],
+[464,481],
 {mixin:['ck',465],'':470},
 ['m',466,'{'],
 {Id:[467,203],'':468},
@@ -853,479 +853,478 @@ Id:473,'#':473,'(':473,'*':473,'+':473,'-':473,':':473,'?':473,'@':473,'{':473,k
 ['m',469,'}'],
 ['mk',470,'into'],
 {all:['ck',471],distinct:'all','':471},
-{'{':[472,557],'':472},
-{excluding:[478,550],'':478},
+{'{':[472,558],'':472},
+{excluding:[479,551],'':479},
+['g',474,,,'sqlStyle','inSelectItem'],
 {
-'*':['c',474],
-Id:[474,567],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'*':['c',475],
+Id:[475,568],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
 },
-{',':['c',475],'':476},
+{',':['c',476],'':477},
 {
-'*':['c',474],
-Id:[474,567],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'*':['c',475],
+Id:[475,568],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
 },
-['mk',477,'from'],
-[478,480],
-{group:[0,601],where:'group',having:'group','':0},
+['mk',478,'from'],
+[479,481],
+{group:[0,603],where:'group',having:'group','':0},
 'querySource',
-[481,485],
-{',':482,'':0},
-{',':['c',483],'':0},
-[482,485],
+[482,486],
+{',':483,'':0},
+{',':['c',484],'':0},
+[483,486],
 'tableExpression',
 {
-'(':[486,498],
-Id:[487,511],
+'(':[487,499],
+Id:[488,512],
 },
-['g',487],
+['g',488],
 {
-cross:['ck',488],
-inner:['ck',491],
-full:['ck',490],left:'full',right:'full',
-join:['ck',493],
+cross:['ck',489],
+inner:['ck',492],
+full:['ck',491],left:'full',right:'full',
+join:['ck',494],
 '':0
 },
-['mk',489,'join'],
+['mk',490,'join'],
 {
-'(':[487,498],
-Id:[487,511],
+'(':[488,499],
+Id:[488,512],
 },
-{outer:['ck',491],'':491},
-{one:[492,505],many:'one',exact:'one','':492},
-['mk',493,'join'],
-['g',494],
-[495,485],
-['mk',496,'on'],
-[487,633],
+{outer:['ck',492],'':492},
+{one:[493,506],many:'one',exact:'one','':493},
+['mk',494,'join'],
+['g',495],
+[496,486],
+['mk',497,'on'],
+[488,635],
 'tableOrQueryParens',
-['m',499,'(',,,'queryOnLeft'],
+['m',500,'(',,,'queryOnLeft'],
 {
-'(':[500,498],
-Id:[501,485,,,'table','queryOnLeft'],
-select:[501,451],
+'(':[501,499],
+Id:[502,486,,,'table','queryOnLeft'],
+select:[502,451],
 },
 {
-full:[501,486,,,'table','queryOnLeft'],join:'full',left:'full',cross:'full',inner:'full',right:'full',
-limit:[501,454,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
-'':501
+full:[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
 },
-['m',502,')'],
+['m',503,')'],
 {
-as:['ck',503,,'queryOnLeft','table'],
+as:['ck',504,,'queryOnLeft','table'],
 Id:['ci',0,,'queryOnLeft','tableWithoutAs'],
 '':0
 },
 ['mi',0],
 'joinCardinality',
 {
-exact:['ck',506],
-one:506,
-many:['ck',507],
+exact:['ck',507],
+one:507,
+many:['ck',508],
 },
-['mk',507,'one'],
-['mk',508,'to'],
+['mk',508,'one'],
+['mk',509,'to'],
 {
-exact:['ck',509],
-one:509,
+exact:['ck',510],
+one:510,
 many:['ck',0],
 },
 ['mk',0,'one'],
 'fromRefWithOptAlias',
-[512,518],
-{':':['c',513],'':514},
-[514,518],
+[513,519],
+{':':['c',514],'':515},
+[515,519],
 {
-as:['ck',515],
-Id:['ci',0,,'tableWithoutAs'],
-'':516
+as:['ck',516],
+Id:['ci',0],
+'':517
 },
 ['mi',0],
 ['g',0,[]],
 'fromPath',
-['mi',519],
-{'(':[520,524],'[':'(','':520},
-{'.':['c',521],'':0},
-['miA',522],
-{'(':[520,524],'[':'(','':520},
+['mi',520],
+{'(':[521,525],'[':'(','':521},
+{'.':['c',522,,'notAfterEntityArgOrFilter'],'':0},
+['miA',523],
+{'(':[521,525],'[':'(','':521},
 'fromArgumentsAndFilter',
-{'(':['c',525],'':529},
-{Id:526},
-{Id:[527,531],'':528},
+{'(':['c',526],'':530},
+{Id:527},
+{Id:[528,532],'':529},
 {
-',':['c',526],
-')':528,
+',':['c',527],
+')':529,
 },
-['m',529,')'],
-{'[':[0,535],'':0},
+['m',530,')'],
+{'[':[0,536],'':0},
 'fromNamedArgument',
-['mi',532],
-['m',533,':'],
-[0,641],
+['mi',533],
+['m',534,':'],
+[0,643],
 'cardinalityAndFilter',
-['m',536,'['],
-{Number:['c',537,,'beforeColon'],'':538},
-['m',538,':'],
-[539,541],
+['m',537,'['],
+{Number:['c',538,,'beforeColon'],'':539},
+['m',539,':'],
+[540,542],
 ['m',0,']'],
 'filterClauses',
 {
-where:['ck',542],
-Id:542,'#':542,'(':542,'+':542,'-':542,':':542,'?':542,not:542,case:542,cast:542,null:542,true:542,false:542,Number:542,String:542,exists:542,QuotedLiteral:542,
-group:['g',543,1],limit:'group',order:'group',having:'group',
-'':543
+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
 },
-[543,633],
-{group:544,'':545},
-[545,607],
-{having:['ck',546],'':547},
-[547,633],
-{limit:548,order:548,'':0},
-[0,613],
+[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],
 'excludingClause',
-['mk',551,'excluding'],
-['m',552,'{'],
-{Id:553},
-{Id:['ciA',554],'':555},
+['mk',552,'excluding'],
+['m',553,'{'],
+{Id:554},
+{Id:['ciA',555],'':556},
 {
-',':['c',553],
-'}':555,
+',':['c',554],
+'}':556,
 },
 ['m',0,'}',,,'afterBrace'],
 'selectItemsList',
-['m',558,'{',,'top','inSelectItem'],
+['m',559,'{',,'top','inSelectItem'],
 {
-'*':['c',559],
-Id:[559,567],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'':560
+'*':['c',560],
+Id:[560,568],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'':561
 },
 {
-',':['c',558],
-'}':560,
+',':['c',559],
+'}':561,
 },
 ['m',0,'}',,,'afterBrace'],
 'nestedSelectItemsList',
-['m',563,'{',,'nested','inSelectItem'],
+['m',564,'{',,'nested','inSelectItem'],
 {
-'*':['c',564],
-Id:[564,567],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'':565
+'*':['c',565],
+Id:[565,568],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'':566
 },
 {
-',':['c',563],
-'}':565,
+',':['c',564],
+'}':566,
 },
 ['m',0,'}',,,'afterBrace'],
 'selectItemDef',
-{'@':[567,771],'':568},
-{virtual:['ck',569,1,'modifierRestriction'],'':569},
-{key:['ck',570,,'modifierRestriction'],'':570},
-{
-Id:[571,641],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'{':[578,562],
-},
+{'@':[568,773],'':569},
+{virtual:['ck',570,1,'modifierRestriction'],'':570},
+['g',571,,,'key','columnExpr'],
+{key:['ck',572,,'modifierRestriction'],'':572},
 {
-as:['ck',572],
-Id:['ci',573],
-'':573
+Id:[573,643],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'{':[580,563],
 },
-['mi',573],
 {
-'{':574,
-'.':['c',576],
-'':581
+as:['ck',574],
+Id:['ci',577],
+'.':['c',575],
+'':577
 },
-[575,562],
-{excluding:[581,550],'':581},
+['mi',577],
 {
-'{':[577,562],
-'*':['c',581],
+'{':[576,563],
+'*':['c',0],
 },
-{excluding:[581,550],'':581},
-{excluding:[579,550],'':579},
-['mk',580,'as'],
-['mi',581],
-['g',582],
-{'@':[582,774],'':583},
-{':':['c',584],'':0},
+{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},
 {
-type:[598,396,1],
-localized:['ck',585,1],
-Id:585,
-redirected:['ck',586,1],
-association:['ck',590,1],
-composition:['ck',592,1],
+type:[600,396,1],
+localized:['ck',587,1],
+Id:587,
+redirected:['ck',588,1],
+association:['ck',592,1,'columnExpr'],
+composition:['ck',594,1,'columnExpr'],
 },
-[598,404],
-['mk',587,'to'],
-[588,40],
+[600,404],
+['mk',589,'to'],
+[590,40],
 {
-on:['ck',589],
-'{':[598,193],
-'':598
+on:['ck',591],
+'{':[600,193],
+'':600
 },
-[598,633],
-{'[':[591,426],'':591},
-['mk',594,'to'],
+[600,635],
 {'[':[593,426],'':593},
-['mk',594,'of'],
-{one:['ck',595,1],many:'one','':595},
-[596,40],
-['mk',597,'on'],
-[598,633],
-['g',599],
-{'@':[599,768],'':0},
+['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},
 'whereGroupByHaving',
-{where:['ck',602],'':603},
-[603,633],
-{group:[604,607],'':604},
-{having:['ck',605],'':0},
-[0,633],
+{where:['ck',604],'':605},
+[605,635],
+{group:[606,609],'':606},
+{having:['ck',607],'':0},
+[0,635],
 'groupByClause',
-['mk',608,'group'],
-['mk',609,'by'],
-[610,641],
-{',':['c',611],'':0},
-[610,641],
+['mk',610,'group'],
+['mk',611,'by'],
+[612,643],
+{',':['c',613],'':0},
+[612,643],
 'orderByLimitOffset',
-{order:[614,619],'':614},
-{limit:['ck',615],'':0},
-[616,641],
-{offset:['ck',617],'':0},
-[0,641],
+{order:[616,621],'':616},
+{limit:['ck',617],'':0},
+[618,643],
+{offset:['ck',619],'':0},
+[0,643],
 'orderByClause',
-['mk',620,'order'],
-['mk',621,'by'],
-[622,625],
-{',':['c',623],'':0},
-[622,625],
+['mk',622,'order'],
+['mk',623,'by'],
+[624,627],
+{',':['c',625],'':0},
+[624,627],
 'orderByExpression',
-[626,641],
-{asc:['ck',627],desc:'asc','':627},
-{nulls:['ck',628],'':0},
+[628,643],
+{asc:['ck',629],desc:'asc','':629},
+{nulls:['ck',630],'':0},
 {last:['ck',0],first:'last'},
 'conditionEOF',
-[631,641],
+[633,643],
 ['m',0,'EOF'],
 'condition',
-[0,641],
+[0,643],
 'valuePath',
-['mi',636],
-{'(':[637,702],'[':'(','':637},
-{'.':['c',638,,'isDotForPath'],'':0},
-['miA',639],
-{'(':[637,702],'[':'(','':637},
+['mi',638],
+{'(':[639,704],'[':'(','':639},
+{'.':['c',640,,'isDotForPath'],'':0},
+['miA',641],
+{'(':[639,704],'[':'(','':639},
 'expression',
 {
-'(':[642,669],
-'#':[652,765],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
-':':['c',643],
-'?':['c',652],
-Id:[645,635],
-new:[652,681,1],
-exists:['ck',648],
-case:[652,684],
-cast:[652,695],
-'+':['c',651,,'precRight_',30],'-':'+',
-not:['ck',651,,'precRight_',8],
+'(':[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],
 },
-['g',652],
+['g',654],
 {
-Id:['ciA',644],
-Number:['c',652],
+Id:['ciA',646],
+Number:['c',654,,'hide_'],
 },
-{'.':[652,637],'':652},
-{over:['ck',646],'':647},
-[647,729],
-['g',652],
+{'.':[654,639],'':654},
+{over:['ck',648],'':649},
+[649,731],
+['g',654],
 {
-'(':['c',649],
-Id:[652,635],
-'?':['c',652],
+'(':['c',651],
+Id:[654,637],
+'?':['c',654,,'hide_'],
 },
-[650,451],
-['m',652,')'],
-[652,641],
+[652,451],
+['m',654,')'],
+[654,643],
 {
-'*':['c',656,,'precLeft_',24],'/':'*',
-'+':['c',656,,'precLeft_',22],'-':'+',
-'||':['c',656,,'precLeft_',20],
-and:['ck',656,,'precLeft_',4],
-or:['ck',656,,'precLeft_',2],
-'?':['c',653,,'precLeft_',0],
-'<':['c',655,,'precNone_',10],'=':'<','>':'<','!=':'<','<=':'<','<>':'<','>=':'<',
-is:['ck',657,,'precNone_',10],
-not:['ck',659,,'isNegatedRelation','10'],
-in:['g',659,,'precNone_',10],like:'in',between:'in',
+'*':['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',
 '':0
 },
-[654,641],
-['m',656,':'],
-{all:['ck',656],any:'all',some:'all','':656},
-[667,641],
-{not:['ck',658],'':658},
-['mk',667,'null'],
+[656,643],
+['m',658,':'],
+{all:['ck',658],any:'all',some:'all','':658},
+[669,643],
+{not:['ck',660],'':660},
+['mk',669,'null'],
 {
-between:['ck',660],
-in:['ck',663],
-like:['ck',664],
+between:['ck',662],
+in:['ck',665],
+like:['ck',666],
 },
-[661,641],
-['mk',662,'and'],
-[667,641],
-[667,641],
-[665,641],
-{escape:['ck',666],'':667},
-[667,641],
-['g',652],
+[663,643],
+['mk',664,'and'],
+[669,643],
+[669,643],
+[667,643],
+{escape:['ck',668],'':669},
+[669,643],
+['g',654],
 'expressionOrQueryParens',
-['m',670,'(',,,'queryOnLeft'],
+['m',672,'(',,,'queryOnLeft'],
 {
-'(':[671,669],
-Id:[673,641,,,'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:[674,451],
+'(':[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],
 },
 {
-'*':[672,642,,,'expr','queryOnLeft'],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
-',':[674,676,,,'expr','queryOnLeft'],
-limit:[674,454,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
-'':674
+'*':[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
 },
-{',':[674,676],'':674},
-{',':[674,676],'':674},
+{',':[676,678],'':676},
+{',':[676,678],'':676},
 ['m',0,')'],
 'continueExpressionslist',
-['m',677,','],
-{Id:678,'#':678,'(':678,'+':678,'-':678,':':678,'?':678,not:678,case:678,cast:678,null:678,true:678,false:678,Number:678,String:678,exists:678,QuotedLiteral:678},
-{Id:[679,641],'#':'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',678],'':0},
+['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},
 'newAndValuePath',
-['mk',682,'new'],
-[0,635],
+['mk',684,'new'],
+[0,637],
 'caseExpression',
-['mk',685,'case'],
+['mk',687,'case'],
 {
-Id:[686,641],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id',
-when:['g',686,1],
-'':686
+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:687},
-{when:['ck',688],'':691},
-[689,641],
-['mk',690,'then'],
-[687,641],
-{else:['ck',692],'':693},
-[693,641],
+{when:689},
+{when:['ck',690],'':693},
+[691,643],
+['mk',692,'then'],
+[689,643],
+{else:['ck',694],'':695},
+[695,643],
 ['mk',0,'end'],
 'castFunction',
-['mk',696,'cast'],
-['m',697,'('],
-[698,641],
-['mk',699,'as'],
-[700,404],
+['mk',698,'cast'],
+['m',699,'('],
+[700,643],
+['mk',701,'as'],
+[702,404],
 ['m',0,')'],
 'argumentsAndFilter',
-{'(':['c',703,,,,'prepareSpecialFunction'],'':722},
-{Id:['ciA',710,,'isNamedArg'],'':704},
-{Id:[705,724],'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Id_all:'Id',Number:'Id',String:'Id',QuotedLiteral:'Id','':721},
-{',':['c',706,,,,'nextFunctionArgument'],'':707},
+{'(':['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},
 {
-Id:[705,724],'#':'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',707,1],order:')',
+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:')',
 },
-{order:['ck',708],'':721},
-['mk',709,'by'],
-[721,744],
+{order:['ck',710],'':723},
+['mk',711,'by'],
+[723,746],
 {
-':':['c',711],
-'=>':['c',716],
+':':['c',713],
+'=>':['c',718],
 },
-[712,641],
-{',':['c',713],'':721},
+[714,643],
+{',':['c',715],'':723},
 {
-Id:['ciA',714],
-')':721,
+Id:['ciA',716],
+')':723,
 },
-['m',715,':'],
-[712,641],
-[717,641],
-{',':['c',718],'':721},
+['m',717,':'],
+[714,643],
+[719,643],
+{',':['c',720],'':723},
 {
-Id:['ciA',719],
-')':721,
+Id:['ciA',721],
+')':723,
 },
-['m',720,'=>'],
-[717,641],
-['m',722,')'],
-{'[':[0,535],'':0},
+['m',722,'=>'],
+[719,643],
+['m',724,')'],
+{'[':[0,536],'':0},
 'funcExpression',
 {
 ' lookahead':'lGenericIntroOrExpr',
-Id:[726,641],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-GenericExpr:['ckA',726],
-GenericIntro:['ckA',725],
+Id:[728,643],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+GenericExpr:['ckA',728],
+GenericIntro:['ckA',727],
 },
-[726,641],
+[728,643],
 {
 ' lookahead':'lGenericSeparator',
-GenericSeparator:['ckA',727],
+GenericSeparator:['ckA',729],
 '':0
 },
 {
 ' lookahead':'lGenericExpr',
-Id:[726,641],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-GenericExpr:['ckA',726],
+Id:[728,643],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+GenericExpr:['ckA',728],
 },
 'overClause',
-['m',730,'('],
-{partition:['ck',731],'':733},
-['mk',732,'by'],
-[733,740],
-{order:['ck',734],'':736},
-['mk',735,'by'],
-[736,744],
-{rows:['ck',737],'':738},
-[738,753],
+['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',0,')'],
 'expressionsAsXpr',
-[741,641],
-{',':['c',742],'':0},
-[741,641],
+[743,643],
+{',':['c',744],'':0},
+[743,643],
 'orderByClauseAsXpr',
-[745,748],
-{',':['c',746],'':0},
-[745,748],
+[747,750],
+{',':['c',748],'':0},
+[747,750],
 'orderBySpecAsXpr',
-[749,641],
-{asc:['ck',750],desc:'asc','':750},
-{nulls:['ck',751],'':0},
+[751,643],
+{asc:['ck',752],desc:'asc','':752},
+{nulls:['ck',753],'':0},
 {last:['ck',0],first:'last'},
 'windowFrameClause',
 {
-unbounded:['ck',754],
-Number:['c',754],
-current:['ck',755],
-between:['ck',756],
+unbounded:['ck',756],
+Number:['c',756],
+current:['ck',757],
+between:['ck',758],
 },
 ['mk',0,'preceding'],
 ['mk',0,'row'],
-[757,760],
-['mk',758,'and'],
-[0,760],
+[759,762],
+['mk',760,'and'],
+[0,762],
 'windowFrameBoundSpec',
 {
-unbounded:['ck',761],
-Number:['c',761],
-current:['ck',763],
+unbounded:['ck',763],
+Number:['c',763],
+current:['ck',765],
 },
 {
-following:['ck',762],
-preceding:['ck',762],
+following:['ck',764],
+preceding:['ck',764],
 },
 ['g',0,[]],
 ['mk',0,'row'],
 'literalValue',
 {
-'#':['c',766],
+'#':['c',768],
 null:['ck',0],
 true:['ck',0],false:'true',
 Number:['c',0],
@@ -1334,98 +1333,98 @@ QuotedLiteral:['c',0],
 },
 ['mi',0],
 'annoAssignStd',
-['m',769,'@',,,'annoInSameLine'],
+['m',771,'@',,,'annoInSameLine'],
 {
-'(':[0,777],
-Id:[0,782],
+'(':[0,779],
+Id:[0,784],
 },
 'annoAssignCol',
-['m',772,'@'],
+['m',774,'@'],
 {
-'(':[0,777],
-Id:[0,782],
+'(':[0,779],
+Id:[0,784],
 },
 'annoAssignMid',
-['m',775,'@',,,'annoInSameLine'],
+['m',777,'@',,,'annoInSameLine'],
 {
-'(':[0,777],
-Id:[0,786],
+'(':[0,779],
+Id:[0,788],
 },
 'annoAssignParen',
-['m',778,'(',,,'annoInSameLine'],
-{Id:[779,782],'':780},
+['m',780,'(',,,'annoInSameLine'],
+{Id:[781,784],'':782},
 {
-',':['c',778],
-')':780,
+',':['c',780],
+')':782,
 },
 ['m',0,')'],
 'annoAssignBase',
-[783,786],
-{':':['c',784,,'annoInSameLine'],'':0},
-[0,808],
+[785,788],
+{':':['c',786,,'annoInSameLine'],'':0},
+[0,810],
 'annoNamePath',
-['miA',787],
-{'.':['c',788],'':790},
+['miA',789],
+{'.':['c',790],'':792},
 {
-Id:['ciA',787],
-'@':['c',789],
+Id:['ciA',789],
+'@':['c',791],
 },
-['miA',787],
-{'#':[0,799,,'annoInSameLine'],'':0},
+['miA',789],
+{'#':[0,801,,'annoInSameLine'],'':0},
 'annoPath',
 {
-Id:['ciA',794],
-'@':['c',793],
+Id:['ciA',796],
+'@':['c',795],
 },
-['miA',794],
-{'.':['c',795],'':797},
+['miA',796],
+{'.':['c',797],'':799},
 {
-Id:['ciA',794],
-'@':['c',796],
+Id:['ciA',796],
+'@':['c',798],
 },
-['miA',794],
-{'#':[0,799],'':0},
+['miA',796],
+{'#':[0,801],'':0},
 'annoPathVariant',
-['m',800,'#'],
-['miA',801],
-{'.':['c',802],'':0},
-['miA',801],
+['m',802,'#'],
+['miA',803],
+{'.':['c',804],'':0},
+['miA',803],
 'annoStructValue',
-[805,792],
-{':':['c',806],'':0},
-[0,808],
+[807,794],
+{':':['c',808],'':0},
+[0,810],
 'annoValue',
 {
-'#':[0,765],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
-'+':['c',809],'-':'+',
-Id:[0,792],'@':'Id',
-'{':['c',810],
-'[':['c',814,,,,'arrayAnno'],
-'(':['c',821],
+'#':[0,767],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
+'+':['c',811],'-':'+',
+Id:[0,794],'@':'Id',
+'{':['c',812],
+'[':['c',816,,,,'arrayAnno'],
+'(':['c',823],
 },
 ['m',0,'Number'],
-{Id:[811,804],'@':'Id','':812},
+{Id:[813,806],'@':'Id','':814},
 {
-',':['c',810],
-'}':812,
+',':['c',812],
+'}':814,
 },
-['g',813],
+['g',815],
 ['m',0,'}'],
 {
-Id:[819,808],'#':'Id','(':'Id','+':'Id','-':'Id','@':'Id','[':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'...':['c',815,,'arrayAnno','ellipsis'],
-'':820
+Id:[820,810],'#':'Id','(':'Id','+':'Id','-':'Id','@':'Id','[':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'...':['c',817,,'arrayAnno','ellipsis'],
+'':821
 },
-{up:['ck',816],'':818},
-['mk',817,'to'],
-[818,808],
-['g',819],
+{up:['ck',818],'':820},
+['mk',819,'to'],
+[820,810],
 {
-',':['c',814],
-']':820,
+',':['c',816],
+']':821,
 },
+['g',822],
 ['m',0,']'],
-[822,633],
+[824,635],
 ['m',0,')'],
 ]
 class CdlParser extends AstBuildingParser{
@@ -1689,7 +1688,7 @@ this.rule_(64,$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.lb().location ); }continue
+case'abstract':if(this.ck(65)){ this.warning( 'syntax-deprecated-abstract', this.combineLocation( this.lb(), this.la() ) ); }continue
 default:this.e();continue
 }
 case 65:this.mk(66,'entity');continue
@@ -2218,7 +2217,7 @@ default:this.s=209;continue
 }
 case 209:this.mk(210,'of');continue
 case 210:switch(this.lk()){
-case'one':case'many':if(this.ckP(211,['Id']))card=this.lb();continue
+case'one':case'many':if(this.lP(['Id'])&&this.gc(211,'noRepeatedCardinality')&&this.ck(211))card=this.lb();continue
 default:this.s=211;continue
 }
 case 211:if(this.simplePath(_={category:'artref'},212)){target=_.ref; this.setAssocAndComposition( art, assoc, card, target ); }continue
@@ -2272,8 +2271,9 @@ case 226:switch(this.lk()){
 case'actions':this.annotateActionsBlock({art:$.art},0);continue
 default:this.gr([';']);continue
 }
+case 0:{ this.checkWith( keyword ); }
 default:
-this.checkWith( keyword ); this.attachLocation( $.art )
+this.attachLocation( $.art )
 return this.exit_()
 }
 }
@@ -2354,8 +2354,9 @@ default:this.gr([';']);continue
 }
 case 247:this.selectItemsList({query:$.art,start:this.lb()},0);continue
 case 248:this.artifactsBlock({art:$.art,start:this.lb()},0);continue
+case 0:{ this.checkWith( keyword ); }
 default:
-this.checkWith( keyword ); this.attachLocation( $.art )
+this.attachLocation( $.art )
 return this.exit_()
 }
 }
@@ -2843,7 +2844,7 @@ default:this.s=370;continue
 }
 case 370:this.mk(371,'to');continue
 case 371:switch(this.lk()){
-case'one':case'many':if(this.ckP(372,['Id']))card=this.lb();continue
+case'one':case'many':if(this.lP(['Id'])&&this.gc(372,'noRepeatedCardinality')&&this.ck(372))card=this.lb();continue
 default:this.s=372;continue
 }
 case 372:this.typeAssocProperties({art:$.art,assoc,card},0);continue
@@ -2853,7 +2854,7 @@ default:this.s=374;continue
 }
 case 374:this.mk(375,'of');continue
 case 375:switch(this.lk()){
-case'one':case'many':if(this.ckP(376,['Id','{']))card=this.lb();continue
+case'one':case'many':if(this.lP(['Id','{'])&&this.gc(376,'noRepeatedCardinality')&&this.ck(376))card=this.lb();continue
 default:this.s=376;continue
 }
 case 376:switch(this.l()){
@@ -3113,10 +3114,9 @@ $.query??={}
 let tab;let _
 this.rule_(445,$next)
 for(;;)switch(this.s){
-case 445:if(this.mk(446,'projection')){ $.query = { op: this.valueWithLocation( 'SELECT' ) }; }continue
+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 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
@@ -3207,26 +3207,27 @@ case'{':this.selectItemsList({query:$.query,start:undefined},472);continue
 default:this.s=472;continue
 }
 case 472:switch(this.lk()){
-case'excluding':this.excludingClause({query:$.query},478);continue
-default:this.s=478;continue
-}
-case 473:switch(this.l()){
-case'*':if(this.c(474)){ $.query.columns = [ this.valueWithLocation() ]; }continue
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:($.query.columns = [])},474);continue
-default:this.e();continue
+case'excluding':this.excludingClause({query:$.query},479);continue
+default:this.s=479;continue
 }
+case 473:this.s=474;{this.inSelectItem(0,'sqlStyle'); ; }continue
 case 474:switch(this.l()){
-case',':this.c(475);continue
-default:this.s=476;continue
+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 475:switch(this.l()){
-case'*':if(this.c(474)){ $.query.columns.push( this.valueWithLocation() ); }continue
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query.columns},474);continue
+case',':this.c(476);continue
+default:this.s=477;continue
+}
+case 476:switch(this.l()){
+case'*':if(this.c(475)){ $.query.columns.push( this.valueWithLocation() ); }continue
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query.columns},475);continue
 default:this.e();continue
 }
-case 476:this.mk(477,'from');continue
-case 477:this.querySource({query:$.query},478);continue
-case 478:switch(this.lk()){
+case 477:this.mk(478,'from');continue
+case 478:this.querySource({query:$.query},479);continue
+case 479: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
 }
@@ -3237,19 +3238,19 @@ return this.exit_()
 }
 querySource($,$next){
 let tab;let _
-this.rule_(480,$next)
+this.rule_(481,$next)
 for(;;)switch(this.s){
-case 480:if(this.tableExpression(_={},481)){tab=_.expr; $.query.from = tab; }continue
-case 481:switch(this.l()){
-case',':this.s=482;{ const { location } = this.la();
+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();
 $.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 482:switch(this.l()){
-case',':this.c(483);continue
+case 483:switch(this.l()){
+case',':this.c(484);continue
 default:this.gr(['group','limit','minus','order','union','where','except','having','intersect']);continue
 }
-case 483:if(this.tableExpression(_={},482)){tab=_.expr; $.query.from.args.push( tab ); }continue
+case 484:if(this.tableExpression(_={},483)){tab=_.expr; $.query.from.args.push( tab ); }continue
 case 0:
 this.attachLocation($.query.from)
 default:return this.exit_()
@@ -3258,91 +3259,91 @@ default:return this.exit_()
 tableExpression($,$next,$startState){
 $.expr??={}
 let join;let tab;let card;let cond;let _
-this.rule_($startState??485,$next)
+this.rule_($startState??486,$next)
 for(;;)switch(this.s){
-case 485:switch(this.l()){
-case'(':this.tableOrQueryParens($,486);continue
-case'Id':this.fromRefWithOptAlias($,487);continue
+case 486:switch(this.l()){
+case'(':this.tableOrQueryParens($,487);continue
+case'Id':this.fromRefWithOptAlias($,488);continue
 default:this.e();continue
 }
-case 486:this.s=487;{ $.expr = this.taggedIfQuery( $.expr ); }continue
-case 487:switch(this.lk()){
-case'cross':if(this.ck(488))join=this.lb();continue
-case'inner':if(this.ck(491))join=this.lb();continue
-case'full':case'left':case'right':if(this.ck(490))join=this.lb();continue
-case'join':if(this.ck(493)){ join = undefined; }continue
+case 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
 default:this.gr([]);continue
 }
-case 488:if(this.mk(489,'join')){ if ($.expr?.join?.val !== 'cross' || $.expr.$parens) $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( undefined, join ), args: [ $.expr ] }; }continue
-case 489:switch(this.l()){
-case'(':if(this.tableOrQueryParens(_={},487)){tab=_.expr; $.expr.args.push( this.taggedIfQuery( tab ) );
+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 ) );
 this.attachLocation( $.expr ); }continue
-case'Id':if(this.fromRefWithOptAlias(_={},487)){tab=_.expr; $.expr.args.push( tab );
+case'Id':if(this.fromRefWithOptAlias(_={},488)){tab=_.expr; $.expr.args.push( tab );
 this.attachLocation( $.expr ); }continue
 default:this.e();continue
 }
-case 490:switch(this.lk()){
-case'outer':this.ck(491);continue
-default:this.s=491;continue
-}
 case 491:switch(this.lk()){
-case'one':case'many':case'exact':this.joinCardinality(card={},492);continue
+case'outer':this.ck(492);continue
 default:this.s=492;continue
 }
-case 492:this.mk(493,'join');continue
-case 493:this.s=494;{ $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( join?.keyword || 'inner', join ), args: [ $.expr ] }; if (card) $.expr.cardinality = card; card = undefined; }continue
-case 494:if(this.tableExpression(_={},495)){tab=_.expr; $.expr.args.push( tab ); this.attachLocation( $.expr ); }continue
-case 495:this.mk(496,'on');continue
-case 496:if(this.condition(_={},487)){cond=_.expr; $.expr.on = cond;
+case 492:switch(this.lk()){
+case'one':case'many':case'exact':this.joinCardinality(card={},493);continue
+default:this.s=493;continue
+}
+case 493:this.mk(494,'join');continue
+case 494:this.s=495;{ $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( join?.keyword || 'inner', join ), args: [ $.expr ] }; if (card) $.expr.cardinality = card; card = undefined; }continue
+case 495:if(this.tableExpression(_={},496)){tab=_.expr; $.expr.args.push( tab ); this.attachLocation( $.expr ); }continue
+case 496:this.mk(497,'on');continue
+case 497:if(this.condition(_={},488)){cond=_.expr; $.expr.on = cond;
 this.attachLocation( $.expr ); }continue
 default:return this.exit_()
 }
 }
 tableOrQueryParens($,$next){
 $.expr??=undefined
-this.rule_(498,$next)
+this.rule_(499,$next)
 for(;;)switch(this.s){
-case 498:if(this.m(499,'(')){this.queryOnLeft()}continue;
-case 499:switch(this.lk()){
-case'(':this.tableOrQueryParens($,500);continue
-case'Id':if(this.tableExpression($,501)){this.queryOnLeft(0,'table')}continue;
-case'select':this.queryExpression($,501);continue
+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
 default:this.ei();continue
 }
-case 500:switch(this.lk()){
-case'full':case'join':case'left':case'cross':case'inner':case'right':if(this.tableExpression($,501,486)){this.queryOnLeft(0,'table')}continue;
-case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(501,'queryOnLeft')&&this.queryExpression($,501,454);continue
-default:this.s=501;continue
+case 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 501:if(this.m(502,')')){ this.surroundByParens( $.expr ); }continue
-case 502:switch(this.lk()){
-case'as':this.gc(0,'queryOnLeft','table')&&this.ck(503);continue
+case 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'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 503:if(this.mi(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.identAst(); }continue
+case 504:if(this.mi(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.identAst(); }continue
 default:return this.exit_()
 }
 }
 joinCardinality($,$next){
 $.sourceMax??=undefined;$.targetMax??=undefined
-this.rule_(505,$next)
+this.rule_(506,$next)
 for(;;)switch(this.s){
-case 505:switch(this.lk()){
-case'exact':if(this.ck(506)){ $.sourceMin = this.valueWithLocation( 1 ); }continue
-case'one':this.s=506;continue
-case'many':if(this.ck(507)){ $.sourceMax = this.valueWithLocation( '*' ); }continue
+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
 default:this.e();continue
 }
-case 506:if(this.mk(507,'one')){ $.sourceMax = this.valueWithLocation( 1 ); }continue
-case 507:this.mk(508,'to');continue
-case 508:switch(this.lk()){
-case'exact':if(this.ck(509)){ $.targetMin = this.valueWithLocation( 1 ); }continue
-case'one':this.s=509;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'many':if(this.ck(0)){ $.targetMax = this.valueWithLocation( '*' ); }continue
 default:this.e();continue
 }
-case 509:if(this.mk(0,'one')){ $.targetMax = this.valueWithLocation( 1 ); }continue
+case 510:if(this.mk(0,'one')){ $.targetMax = this.valueWithLocation( 1 ); }continue
 default:
 this.attachLocation( $ )
 return this.exit_()
@@ -3350,25 +3351,25 @@ return this.exit_()
 }
 fromRefWithOptAlias($,$next){
 $.expr??={}
-this.rule_(511,$next)
+this.rule_(512,$next)
 { $.expr.path = []; }
 for(;;)switch(this.s){
-case 511:this.fromPath({table:$.expr,category:'artref'},512);continue
-case 512:switch(this.l()){
-case':':if(this.c(513)){ if (!$.expr.scope) $.expr.scope = $.expr.path.length; else {
+case 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 {
 this.warning( 'syntax-invalid-path-separator', this.lb(),
 { '#': 'colon', code: ':', newcode: '.' } );
 } }continue
-default:this.s=514;continue
+default:this.s=515;continue
 }
-case 513:this.fromPath({table:$.expr,category:'ref'},514);continue
-case 514:switch(this.lk()){
-case'as':this.ck(515);continue
-case'Id':if(this.gc(516,'tableWithoutAs')&&this.ci(0,'FromAlias')){ $.expr.name = this.fragileAlias(); }continue
-default:this.giR(516);continue
+case 514:this.fromPath({table:$.expr,category:'ref'},515);continue
+case 515:switch(this.lk()){
+case'as':this.ck(516);continue
+case'Id':if(this.ci(0,'FromAlias')){ $.expr.name = this.fragileAlias(); }continue
+default:this.giR(517);continue
 }
-case 515:if(this.mi(0,'FromAlias')){ $.expr.name = this.identAst(); }continue
-case 516:if(this.gr([])){ this.classifyImplicitName( $.expr.scope ? 'FromElemImplicit' : 'FromImplicit', $.expr ); }continue
+case 516:if(this.mi(0,'FromAlias')){ $.expr.name = this.identAst(); }continue
+case 517:if(this.gr([])){ this.classifyImplicitName( $.expr.scope ? 'FromElemImplicit' : 'FromImplicit', $.expr ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -3376,25 +3377,25 @@ return this.exit_()
 }
 fromPath($,$next){
 let pathItem
-this.rule_(518,$next)
+this.rule_(519,$next)
 for(;;)switch(this.s){
-case 518:if(this.mi(519,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
-case 519:switch(this.l()){
-case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},520)){ pathItem = null; }continue
-default:this.s=520;continue
-}
+case 519:if(this.mi(520,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
 case 520:switch(this.l()){
-case'.':if(this.c(521)){ if (!pathItem && !$.table.scope) {
+case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},521)){ pathItem = null; }continue
+default:this.s=521;continue
+}
+case 521:switch(this.l()){
+case'.':if(this.gc(0,'notAfterEntityArgOrFilter')&&this.c(522)){ if (!pathItem && !$.table.scope) {
 $.table.scope = $.table.path.length; $.category = 'ref';
 this.warning( 'syntax-invalid-path-separator', this.lb(),
 { '#': 'dot', code: '.', newcode: ':' } );
 } }continue
 default:this.gr(['Id','as']);continue
 }
-case 521:if(this.miA(522,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
-case 522:switch(this.l()){
-case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},520)){ pathItem = null; }continue
-default:this.s=520;continue
+case 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
 }
 default:
 this.attachLocation( $.table.path )
@@ -3402,27 +3403,27 @@ return this.exit_()
 }
 }
 fromArgumentsAndFilter($,$next){
-this.rule_(524,$next)
+this.rule_(525,$next)
 for(;;)switch(this.s){
-case 524:switch(this.l()){
-case'(':if(this.c(525)){ $.pathStep.args = this.createDict(); $.pathStep.$syntax = ':'; }continue
-default:this.s=529;continue
+case 525:switch(this.l()){
+case'(':if(this.c(526)){ $.pathStep.args = this.createDict(); $.pathStep.$syntax = ':'; }continue
+default:this.s=530;continue
 }
-case 525:switch(this.lk()){
-case'Id':this.s=526;continue
+case 526:switch(this.lk()){
+case'Id':this.s=527;continue
 default:this.ei();continue
 }
-case 526:switch(this.l()){
-case'Id':this.fromNamedArgument($,527);continue
-default:this.s=528;continue
-}
 case 527:switch(this.l()){
-case',':this.c(526);continue
-case')':this.s=528;continue
+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
 default:this.e();continue
 }
-case 528:this.m(529,')');continue
-case 529:switch(this.l()){
+case 529:this.m(530,')');continue
+case 530:switch(this.l()){
 case'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['Id','.','as']);continue
 }
@@ -3431,219 +3432,220 @@ default:return this.exit_()
 }
 fromNamedArgument($,$next){
 let name;let expr;let _
-this.rule_(531,$next)
+this.rule_(532,$next)
 for(;;)switch(this.s){
-case 531:if(this.mi(532,'paramname'))name=this.lb();continue
-case 532:this.m(533,':');continue
-case 533:if(this.expression(_={},0)){expr=_.expr; this.addDef( expr, $.pathStep, 'args', 0, this.identAst( name ) ); }continue
+case 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
 default:return this.exit_()
 }
 }
 cardinalityAndFilter($,$next){
-this.rule_(535,$next)
+this.rule_(536,$next)
 for(;;)switch(this.s){
-case 535:this.m(536,'[');continue
-case 536:switch(this.l()){
-case'Number':if(this.gc(538,'beforeColon')&&this.c(537)){ $.pathStep.cardinality = { targetMax: this.unsignedIntegerLiteral(), location: this.lb().location }; }continue
-default:this.s=538;continue
-}
-case 537:this.m(538,':');continue
-case 538:this.filterClauses({pathStep:$.pathStep},539);continue
-case 539:this.m(0,']');continue
+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
 default:return this.exit_()
 }
 }
 filterClauses($,$next){
 let cond;let _
-this.rule_(541,$next)
+this.rule_(542,$next)
 for(;;)switch(this.s){
-case 541:switch(this.lk()){
-case'where':this.ck(542);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=542;continue
-case'group':case'limit':case'order':case'having':this.gP(543);continue
-default:this.gi(543);continue
-}
-case 542:if(this.condition(_={},543)){cond=_.expr; $.pathStep.where = cond; }continue
-case 543:switch(this.lk()){
-case'group':this.s=544;{ this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'group by' }); }continue
-default:this.s=545;continue
-}
-case 544:this.groupByClause({query:$.pathStep},545);continue
-case 545:switch(this.lk()){
-case'having':if(this.ck(546)){ this.csnParseOnly('syntax-unexpected-sql-clause', -1, { keyword: 'having' }); }continue
-default:this.s=547;continue
-}
-case 546:if(this.condition(_={},547)){cond=_.expr; $.pathStep.having = cond; }continue
-case 547:switch(this.lk()){
-case'limit':case'order':this.s=548;{ 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 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
 default:this.gr([']']);continue
 }
-case 548:this.orderByLimitOffset({query:$.pathStep},0);continue
+case 549:this.orderByLimitOffset({query:$.pathStep},0);continue
 default:return this.exit_()
 }
 }
 excludingClause($,$next){
-this.rule_(550,$next)
+this.rule_(551,$next)
 for(;;)switch(this.s){
-case 550:this.mk(551,'excluding');continue
-case 551:if(this.m(552,'{')){ $.query.excludingDict = this.createDict(); }continue
-case 552:switch(this.l()){
-case'Id':this.s=553;continue
-default:this.e();continue
-}
+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':if(this.ciA(554,'ref')){ this.addDef( { location: this.lb().location }, $.query, 'excludingDict', '', this.identAst() ); }continue
-default:this.s=555;continue
+case'Id':this.s=554;continue
+default:this.e();continue
 }
 case 554:switch(this.l()){
-case',':this.c(553);continue
-case'}':this.s=555;continue
+case'Id':if(this.ciA(555,'ref')){ this.addDef( { location: this.lb().location }, $.query, 'excludingDict', '', this.identAst() ); }continue
+default:this.s=556;continue
+}
+case 555:switch(this.l()){
+case',':this.c(554);continue
+case'}':this.s=556;continue
 default:this.e();continue
 }
-case 555:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.excludingDict ); }continue
+case 556:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.excludingDict ); }continue
 default:return this.exit_()
 }
 }
 selectItemsList($,$next){
-this.rule_(557,$next)
+this.rule_(558,$next)
 for(;;)switch(this.s){
-case 557:if(this.m(558,'{')){this.inSelectItem(0,'top'); $.query.columns = this.createArray( $.start ); }continue
-case 558:switch(this.l()){
-case'*':if(this.c(559)){ $.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},559);continue
-default:this.s=560;continue
-}
+case 558:if(this.m(559,'{')){this.inSelectItem(0,'top'); $.query.columns = this.createArray( $.start ); }continue
 case 559:switch(this.l()){
-case',':this.c(558);continue
-case'}':this.s=560;continue
+case'*':if(this.c(560)){ $.query.columns.push( this.valueWithLocation() ); }continue
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query.columns},560);continue
+default:this.s=561;continue
+}
+case 560:switch(this.l()){
+case',':this.c(559);continue
+case'}':this.s=561;continue
 default:this.e();continue
 }
-case 560:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.columns ); }continue
+case 561:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.columns ); }continue
 default:return this.exit_()
 }
 }
 nestedSelectItemsList($,$next){
-this.rule_(562,$next)
+this.rule_(563,$next)
 for(;;)switch(this.s){
-case 562:if(this.m(563,'{')){this.inSelectItem(0,'nested'); $.query[$.clause] = this.createArray(); }continue
-case 563:switch(this.l()){
-case'*':if(this.c(564)){ $.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]},564);continue
-default:this.s=565;continue
-}
+case 563:if(this.m(564,'{')){this.inSelectItem(0,'nested'); $.query[$.clause] = this.createArray(); }continue
 case 564:switch(this.l()){
-case',':this.c(563);continue
-case'}':this.s=565;continue
+case'*':if(this.c(565)){ $.query[$.clause].push( this.valueWithLocation() ); }continue
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query[$.clause]},565);continue
+default:this.s=566;continue
+}
+case 565:switch(this.l()){
+case',':this.c(564);continue
+case'}':this.s=566;continue
 default:this.e();continue
 }
-case 565:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query[$.clause] ); }continue
+case 566: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_(567,$next)
+this.rule_(568,$next)
 { $.columns.push( art );
 this.docComment( art ); }
 for(;;)switch(this.s){
-case 567:switch(this.l()){
-case'@':this.annoAssignCol({art},567);continue
-default:this.s=568;continue
-}
-case 568:switch(this.lk()){
-case'virtual':if(this.lP(['Id','#','(','+','-',':','?','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'])&&this.gc(569,'modifierRestriction')&&this.ck(569)){ art.virtual = this.valueWithLocation( true ); }continue
+case 568:switch(this.l()){
+case'@':this.annoAssignCol({art},568);continue
 default:this.s=569;continue
 }
 case 569:switch(this.lk()){
-case'key':if(this.gc(570,'modifierRestriction')&&this.ck(570)){ art.key = this.valueWithLocation( true ); }continue
+case'virtual':if(this.lP(['Id','#','(','+','-',':','?','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'])&&this.gc(570,'modifierRestriction')&&this.ck(570)){ art.virtual = this.valueWithLocation( true ); }continue
 default:this.s=570;continue
 }
-case 570:switch(this.l()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},571)){expr=_.expr; art.value = expr; }continue
-case'{':this.nestedSelectItemsList({query:art,clause:'expand'},578);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 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:switch(this.lk()){
-case'as':if(this.ck(572))as=this.lb();continue
-case'Id':if(this.ci(573,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
-default:if(this.gi(573)){ alias = this.classifyImplicitName( 'ItemImplicit', expr ); }continue
-}
-case 572:if(this.mi(573,'ItemAlias')){ art.name = this.identAst(); }continue
-case 573:switch(this.l()){
-case'{':this.s=574;{ this.reportExpandInline( art, false ); }continue
-case'.':if(this.c(576)){ this.reportUnexpectedSpace( this.lb(), this.la().location, true );
+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:this.s=581;continue
+default:if(this.gi(577)){ alias = this.classifyImplicitName( 'ItemImplicit', expr ); }continue
 }
-case 574:this.nestedSelectItemsList({query:art,clause:'expand'},575);continue
-case 575:switch(this.lk()){
-case'excluding':this.excludingClause({query:art},581);continue
-default:this.s=581;continue
-}
-case 576:switch(this.l()){
-case'{':this.nestedSelectItemsList({query:art,clause:'inline'},577);continue
-case'*':if(this.c(581)){ art.inline = [ this.valueWithLocation() ]; }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'*':if(this.c(0)){ art.inline = [ this.valueWithLocation() ]; }continue
 default:this.e();continue
 }
-case 577:switch(this.lk()){
-case'excluding':this.excludingClause({query:art},581);continue
-default:this.s=581;continue
+case 576:switch(this.lk()){
+case'excluding':this.excludingClause({query:art},0);continue
+default:this.gr([',']);continue
 }
-case 578:switch(this.lk()){
-case'excluding':this.excludingClause({query:art},579);continue
-default:this.s=579;continue
+case 577:switch(this.l()){
+case'{':this.s=578;{ this.reportExpandInline( art, false ); }continue
+default:this.s=583;continue
 }
-case 579:this.mk(580,'as');continue
-case 580:if(this.mi(581,'ItemAlias')){ art.name = this.identAst(); }continue
-case 581:this.s=582;{ this.docComment( art ); }continue
-case 582:switch(this.l()){
-case'@':this.annoAssignMid({art},582);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 583:switch(this.l()){
-case':':this.c(584);continue
+case 580:switch(this.lk()){
+case'excluding':this.excludingClause({query:art},581);continue
+default:this.s=581;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 585:switch(this.l()){
+case':':this.c(586);continue
 default:this.gr([',']);continue
 }
-case 584:switch(this.lk()){
-case'type':this.lP()&&this.typeTypeOf({art},598);continue
-case'localized':if(this.ckP(585,['Id'])){ art.localized = this.valueWithLocation( true ); }continue
-case'Id':this.s=585;continue
-case'redirected':this.ckP(586,['to']);continue
-case'association':if(this.ckP(590,['[','to'])){assoc=this.lb(); this.associationInSelectItem( art ); }continue
-case'composition':if(this.ckP(592,['[','of'])){assoc=this.lb(); this.associationInSelectItem( art ); }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
 default:this.ei();continue
 }
-case 585:this.typeRefOptArgs({art},598);continue
-case 586:this.mk(587,'to');continue
-case 587:if(this.simplePath(_={category:'artref'},588)){target=_.ref; art.target = target; }continue
-case 588:switch(this.lk()){
-case'on':this.ck(589);continue
-case'{':this.foreignKeysBlock({art},598);continue
-default:this.s=598;continue
-}
-case 589:if(this.condition(_={},598)){cond=_.expr; art.on = cond; }continue
-case 590:switch(this.l()){
-case'[':this.cardinality({art},591);continue
-default:this.s=591;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
+default:this.s=600;continue
 }
-case 591:this.mk(594,'to');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(594,'of');continue
-case 594:switch(this.lk()){
-case'one':case'many':if(this.ckP(595,['Id']))card=this.lb();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:if(this.simplePath(_={category:'artref'},596)){target=_.ref; this.setAssocAndComposition( art, assoc, card, target ); }continue
-case 596:this.mk(597,'on');continue
-case 597:if(this.condition(_={},598)){expr=_.expr; art.on = expr; }continue
-case 598:this.s=599;{ this.docComment( art ); }continue
-case 599:switch(this.l()){
-case'@':this.annoAssignStd({art},599);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 601:switch(this.l()){
+case'@':this.annoAssignStd({art},601);continue
 default:this.gr([',']);continue
 }
 default:
@@ -3653,90 +3655,90 @@ return this.exit_()
 }
 whereGroupByHaving($,$next){
 let cond;let _
-this.rule_(601,$next)
+this.rule_(603,$next)
 for(;;)switch(this.s){
-case 601:switch(this.lk()){
-case'where':this.ck(602);continue
-default:this.s=603;continue
-}
-case 602:if(this.condition(_={},603)){cond=_.expr; $.query.where = cond; }continue
 case 603:switch(this.lk()){
-case'group':this.groupByClause($,604);continue
-default:this.s=604;continue
+case'where':this.ck(604);continue
+default:this.s=605;continue
 }
-case 604:switch(this.lk()){
-case'having':this.ck(605);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 606:switch(this.lk()){
+case'having':this.ck(607);continue
 default:this.gr(['limit','order']);continue
 }
-case 605:if(this.condition(_={},0)){cond=_.expr; $.query.having = cond; }continue
+case 607:if(this.condition(_={},0)){cond=_.expr; $.query.having = cond; }continue
 default:return this.exit_()
 }
 }
 groupByClause($,$next){
 let expr;let _
-this.rule_(607,$next)
+this.rule_(609,$next)
 for(;;)switch(this.s){
-case 607:this.mk(608,'group');continue
-case 608:this.mk(609,'by');continue
-case 609:if(this.expression(_={},610)){expr=_.expr; $.query.groupBy = [ expr ]; }continue
-case 610:switch(this.l()){
-case',':this.c(611);continue
+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
 default:this.gr(['limit','order','having']);continue
 }
-case 611:if(this.expression(_={},610)){expr=_.expr; $.query.groupBy.push( expr ); }continue
+case 613:if(this.expression(_={},612)){expr=_.expr; $.query.groupBy.push( expr ); }continue
 default:return this.exit_()
 }
 }
 orderByLimitOffset($,$next){
 let expr;let _
-this.rule_(613,$next)
+this.rule_(615,$next)
 for(;;)switch(this.s){
-case 613:switch(this.lk()){
-case'order':this.orderByClause($,614);continue
-default:this.s=614;continue
+case 615:switch(this.lk()){
+case'order':this.orderByClause($,616);continue
+default:this.s=616;continue
 }
-case 614:switch(this.lk()){
-case'limit':this.ck(615);continue
+case 616:switch(this.lk()){
+case'limit':this.ck(617);continue
 default:this.gr([]);continue
 }
-case 615:if(this.expression(_={},616)){expr=_.expr; $.query.limit = { rows: expr }; }continue
-case 616:switch(this.lk()){
-case'offset':this.ck(617);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
 default:this.gr([]);continue
 }
-case 617:if(this.expression(_={},0)){expr=_.expr; $.query.limit.offset = expr; }continue
+case 619:if(this.expression(_={},0)){expr=_.expr; $.query.limit.offset = expr; }continue
 default:return this.exit_()
 }
 }
 orderByClause($,$next){
 let expr;let _
-this.rule_(619,$next)
+this.rule_(621,$next)
 for(;;)switch(this.s){
-case 619:this.mk(620,'order');continue
-case 620:this.mk(621,'by');continue
-case 621:if(this.orderByExpression(_={},622)){expr=_.expr; $.query.orderBy = [ expr ]; }continue
-case 622:switch(this.l()){
-case',':this.c(623);continue
+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
 default:this.gr(['limit']);continue
 }
-case 623:if(this.orderByExpression(_={},622)){expr=_.expr; $.query.orderBy.push( expr ); }continue
+case 625:if(this.orderByExpression(_={},624)){expr=_.expr; $.query.orderBy.push( expr ); }continue
 default:return this.exit_()
 }
 }
 orderByExpression($,$next){
 $.expr??=undefined
-this.rule_(625,$next)
+this.rule_(627,$next)
 for(;;)switch(this.s){
-case 625:this.expression($,626);continue
-case 626:switch(this.lk()){
-case'asc':case'desc':if(this.ck(627)){ $.expr.sort = this.valueWithLocation(); }continue
-default:this.s=627;continue
+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 627:switch(this.lk()){
-case'nulls':this.ck(628);continue
+case 629:switch(this.lk()){
+case'nulls':this.ck(630);continue
 default:this.gr([',','limit']);continue
 }
-case 628:switch(this.lk()){
+case 630:switch(this.lk()){
 case'last':case'first':if(this.ck(0)){ $.expr.nulls = this.valueWithLocation(); }continue
 default:this.e();continue
 }
@@ -3746,39 +3748,39 @@ default:return this.exit_()
 conditionEOF($,$next){
 $.cond??=undefined
 let _
-this.rule_(630,$next)
+this.rule_(632,$next)
 for(;;)switch(this.s){
-case 630:if(this.expression(_={},631))$.cond=_.expr;continue
-case 631:this.m(0,'EOF');continue
+case 632:if(this.expression(_={},633))$.cond=_.expr;continue
+case 633:this.m(0,'EOF');continue
 default:return this.exit_()
 }
 }
 condition($,$next){
 $.expr??=undefined
-this.rule_(633,$next)
+this.rule_(635,$next)
 for(;;)switch(this.s){
-case 633:this.expression($,0);continue
+case 635:this.expression($,0);continue
 default:return this.exit_()
 }
 }
 valuePath($,$next,$startState){
 $.expr??={ path: [] }
 let pathItem
-this.rule_($startState??635,$next)
+this.rule_($startState??637,$next)
 for(;;)switch(this.s){
-case 635:if(this.mi(636,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
-case 636:switch(this.l()){
-case'(':case'[':this.argumentsAndFilter({pathStep:pathItem},637);continue
-default:this.s=637;continue
+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 637:switch(this.l()){
-case'.':this.gc(0,'isDotForPath')&&this.c(638);continue
+case 639:switch(this.l()){
+case'.':this.gc(0,'isDotForPath')&&this.c(640);continue
 default:this.gr(['*','+','-','/','<','=','>','?','!=','<=','<>','>=','in','is','or','||','and','not','like','between']);continue
 }
-case 638:if(this.miA(639,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
-case 639:switch(this.l()){
-case'(':case'[':if(this.argumentsAndFilter({pathStep:pathItem},637)){ pathItem = null; }continue
-default:this.s=637;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
 }
 default:
 this.attachLocation( $.expr )
@@ -3788,141 +3790,141 @@ return this.exit_()
 expression($,$next,$startState){
 $.expr??={}
 let e;let open;let _
-this.rule_($startState??641,$next)
+this.rule_($startState??643,$next)
 for(;;)switch(this.s){
-case 641:switch(this.lk()){
-case'(':this.expressionOrQueryParens($,642);continue
-case'#':case'null':case'true':case'false':case'Number':case'String':case'QuotedLiteral':this.literalValue($,652);continue
-case':':if(this.c(643)){ this.reportUnexpectedSpace(); }continue
-case'?':if(this.c(652)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
+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: '?' } );
 $.expr = this.attachLocation({ param: this.valueWithLocation(), scope: 'param' }); }continue
-case'Id':if(this.valuePath(_={},645)){e=_.expr; $.expr = this.valuePathAst( e ); }continue
-case'new':this.lP()&&this.newAndValuePath($,652);continue
-case'exists':if(this.ck(648)){ $.expr = this.applyOpToken(); }continue
-case'case':this.caseExpression($,652);continue
-case'cast':this.castFunction($,652);continue
-case'+':case'-':if(this.ec('precRight_',30)&&this.c(651)){ $.expr = this.applyOpToken(); }continue
-case'not':if(this.ec('precRight_',8)&&this.ck(651)){ $.expr = this.applyOpToken(); }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
 default:this.ei();continue
 }
-case 642:this.s=652;{ $.expr = this.taggedIfQuery( $.expr ); }continue
-case 643:switch(this.l()){
-case'Id':if(this.ciA(644,'paramref')){ $.expr = { path: [ this.identAst() ], location: this.startLocation(), scope: 'param' }; }continue
-case'Number':if(this.c(652)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'positional', code: ':' + this.lb().text } );
+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 } );
 $.expr = this.attachLocation({ param: this.unsignedIntegerLiteral(), scope: 'param' }); }continue
 default:this.e();continue
 }
-case 644:switch(this.l()){
-case'.':if(this.valuePath($,652,637)){ $.expr = this.valuePathAst( $.expr ); }continue
-default:this.s=652;{ this.attachLocation( $.expr ); }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 645:switch(this.lk()){
-case'over':if(this.ck(646)){ this.pushXprToken( $.expr.suffix = [] ); }continue
-default:this.s=647;continue
+case 647:switch(this.lk()){
+case'over':if(this.ck(648)){ this.pushXprToken( $.expr.suffix = [] ); }continue
+default:this.s=649;continue
 }
-case 646:this.overClause(e={outer:$.expr.suffix},647);continue
-case 647:this.s=652;{ this.attachLocation( $.expr ); }continue
-case 648:switch(this.l()){
-case'(':if(this.c(649))open=this.lb();continue
-case'Id':if(this.valuePath(_={},652)){e=_.expr; e = this.valuePathAst( e ); e.$expected = 'exists';
+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';
 $.expr.args.push( e ); this.attachLocation( $.expr ); }continue
-case'?':if(this.c(652)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
+case'?':if(this.c(654)){ 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 649:if(this.queryExpression(_={},650))e=_.expr;continue
-case 650:if(this.m(652,')')){ $.expr.args.push( this.taggedIfQuery( this.surroundByParens( e, open ) ) );
+case 651:if(this.queryExpression(_={},652))e=_.expr;continue
+case 652:if(this.m(654,')')){ $.expr.args.push( this.taggedIfQuery( this.surroundByParens( e, open ) ) );
 this.attachLocation( $.expr ); }continue
-case 651:if(this.expression(_={},652)){e=_.expr; $.expr = this.signedExpression( $.expr, e ); }continue
-case 652:switch(this.lk()){
-case'*':case'/':if(this.gc(0,'precLeft_',24)&&this.c(656)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'+':case'-':if(this.gc(0,'precLeft_',22)&&this.c(656)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'||':if(this.gc(0,'precLeft_',20)&&this.c(656)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'and':if(this.gc(0,'precLeft_',4)&&this.ck(656)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'or':if(this.gc(0,'precLeft_',2)&&this.ck(656)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'?':if(this.gc(0,'precLeft_',0)&&this.c(653)){ $.expr = this.applyOpToken( $.expr, '?:' ); }continue
-case'<':case'=':case'>':case'!=':case'<=':case'<>':case'>=':if(this.gc(0,'precNone_',10)&&this.c(655)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'is':if(this.gc(0,'precNone_',10)&&this.ck(657)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'not':if(this.gc(0,'isNegatedRelation','10')&&this.ck(659)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'in':case'like':case'between':if(this.gc(0,'precNone_',10)&&this.g(659)){ $.expr = { op: { val: 'ixpr', location: this.la().location }, args: [ $.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
 default:this.gr([]);continue
 }
-case 653:if(this.expression(_={},654)){e=_.expr; $.expr.args.push( e ); }continue
-case 654:if(this.m(656,':')){ this.pushXprToken( $.expr ); }continue
-case 655:switch(this.lk()){
-case'all':case'any':case'some':if(this.ck(656)){ this.pushXprToken( $.expr ); }continue
-default:this.s=656;continue
-}
-case 656:if(this.expression(_={},667)){e=_.expr; $.expr.args.push( e ); }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'not':if(this.ck(658)){ this.pushXprToken( $.expr ); }continue
+case'all':case'any':case'some':if(this.ck(658)){ this.pushXprToken( $.expr ); }continue
 default:this.s=658;continue
 }
-case 658:if(this.mk(667,'null')){ this.pushXprToken( $.expr ); }continue
+case 658:if(this.expression(_={},669)){e=_.expr; $.expr.args.push( e ); }continue
 case 659:switch(this.lk()){
-case'between':if(this.ck(660)){ this.pushXprToken( $.expr ); }continue
-case'in':if(this.ck(663)){ this.pushXprToken( $.expr ); }continue
-case'like':if(this.ck(664)){ this.pushXprToken( $.expr ); }continue
+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
 default:this.e();continue
 }
-case 660:if(this.expression(_={},661)){e=_.expr; $.expr.args?.push( e ); }continue
-case 661:if(this.mk(662,'and')){ this.pushXprToken( $.expr ); }continue
-case 662:if(this.expression(_={},667)){e=_.expr; $.expr.args?.push( e ); }continue
-case 663:if(this.expression(_={},667)){e=_.expr; $.expr.args?.push( this.secureParens( e ) ); }continue
-case 664:if(this.expression(_={},665)){e=_.expr; $.expr.args?.push( e ); }continue
-case 665:switch(this.lk()){
-case'escape':if(this.ck(666)){ this.pushXprToken( $.expr ); }continue
-default:this.s=667;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:this.s=652;{ this.attachLocation( $.expr ); }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
 default:return this.exit_()
 }
 }
 expressionOrQueryParens($,$next){
 $.expr??=undefined
-this.rule_(669,$next)
+this.rule_(671,$next)
 for(;;)switch(this.s){
-case 669:if(this.m(670,'(')){this.queryOnLeft()}continue;
-case 670:switch(this.lk()){
-case'(':this.expressionOrQueryParens($,671);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($,673)){this.queryOnLeft(0,'expr')}continue;
-case'select':this.queryExpression($,674);continue
+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
 default:this.ei();continue
 }
-case 671: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($,672,642)){this.queryOnLeft(0,'expr')}continue;
-case',':if(this.continueExpressionslist($,674)){this.queryOnLeft(0,'expr')}continue;
-case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(674,'queryOnLeft')&&this.queryExpression($,674,454);continue
-default:this.s=674;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 672:switch(this.l()){
-case',':this.continueExpressionslist($,674);continue
-default:this.s=674;continue
+case 674:switch(this.l()){
+case',':this.continueExpressionslist($,676);continue
+default:this.s=676;continue
 }
-case 673:switch(this.l()){
-case',':this.continueExpressionslist($,674);continue
-default:this.s=674;continue
+case 675:switch(this.l()){
+case',':this.continueExpressionslist($,676);continue
+default:this.s=676;continue
 }
-case 674:if(this.m(0,')')){ this.surroundByParens( $.expr ); }continue
+case 676:if(this.m(0,')')){ this.surroundByParens( $.expr ); }continue
 default:return this.exit_()
 }
 }
 continueExpressionslist($,$next){
 let e;let _
-this.rule_(676,$next)
+this.rule_(678,$next)
 for(;;)switch(this.s){
-case 676:if(this.m(677,',')){ $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: { ... $.expr.$parens?.at( -1 ) ?? $.expr.location } }; }continue
-case 677: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=678;continue
+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
 default:this.ei();continue
 }
-case 678: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(_={},679)){e=_.expr; $.expr.args.push( e ); }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
 default:this.gi(0,[')']);continue
 }
-case 679:switch(this.l()){
-case',':this.c(678);continue
+case 681:switch(this.l()){
+case',':this.c(680);continue
 default:this.gr([')']);continue
 }
 case 0:{ this.attachLocation( $.expr ); }
@@ -3934,10 +3936,10 @@ return this.exit_()
 newAndValuePath($,$next){
 $.expr??=undefined
 let e;let _
-this.rule_(681,$next)
+this.rule_(683,$next)
 for(;;)switch(this.s){
-case 681:if(this.mk(682,'new')){ $.expr = this.applyOpToken(); }continue
-case 682:if(this.valuePath(_={},0)){e=_.expr; e = this.valuePathAst( e );
+case 683:if(this.mk(684,'new')){ $.expr = this.applyOpToken(); }continue
+case 684: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 )
@@ -3947,31 +3949,31 @@ return this.exit_()
 caseExpression($,$next){
 $.expr??=undefined
 let e;let _
-this.rule_(684,$next)
+this.rule_(686,$next)
 for(;;)switch(this.s){
-case 684:if(this.mk(685,'case')){ $.expr.op = { val: 'ixpr', location: this.lb().location }; $.expr.args = []; this.pushXprToken( $.expr ); }continue
-case 685:switch(this.lk()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression(_={},686)){e=_.expr; $.expr.args.push( e ); }continue
-case'when':this.gP(686);continue
-default:this.gi(686);continue
-}
-case 686:switch(this.lk()){
-case'when':this.s=687;continue
+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 688:switch(this.lk()){
+case'when':this.s=689;continue
 default:this.e();continue
 }
-case 687:switch(this.lk()){
-case'when':if(this.ck(688)){ this.pushXprToken( $.expr ); }continue
-default:this.s=691;continue
-}
-case 688:if(this.expression(_={},689)){e=_.expr; $.expr.args.push( e ); }continue
-case 689:if(this.mk(690,'then')){ this.pushXprToken( $.expr ); }continue
-case 690:if(this.expression(_={},687)){e=_.expr; $.expr.args.push( e ); }continue
-case 691:switch(this.lk()){
-case'else':if(this.ck(692)){ this.pushXprToken( $.expr ); }continue
+case 689:switch(this.lk()){
+case'when':if(this.ck(690)){ this.pushXprToken( $.expr ); }continue
 default:this.s=693;continue
 }
-case 692:if(this.expression(_={},693)){e=_.expr; $.expr.args.push( e ); }continue
-case 693:if(this.mk(0,'end')){ this.pushXprToken( $.expr ); }continue
+case 690:if(this.expression(_={},691)){e=_.expr; $.expr.args.push( e ); }continue
+case 691:if(this.mk(692,'then')){ this.pushXprToken( $.expr ); }continue
+case 692:if(this.expression(_={},689)){e=_.expr; $.expr.args.push( e ); }continue
+case 693:switch(this.lk()){
+case'else':if(this.ck(694)){ this.pushXprToken( $.expr ); }continue
+default:this.s=695;continue
+}
+case 694:if(this.expression(_={},695)){e=_.expr; $.expr.args.push( e ); }continue
+case 695:if(this.mk(0,'end')){ this.pushXprToken( $.expr ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -3980,14 +3982,14 @@ return this.exit_()
 castFunction($,$next){
 $.expr??=undefined
 let arg;let _
-this.rule_(695,$next)
+this.rule_(697,$next)
 for(;;)switch(this.s){
-case 695:if(this.mk(696,'cast')){ $.expr.op = this.valueWithLocation(); }continue
-case 696:if(this.m(697,'(')){ $.expr.args = this.createArray(); }continue
-case 697:if(this.expression(_={},698)){arg=_.expr; $.expr.args?.push( arg ); }continue
-case 698:this.mk(699,'as');continue
-case 699:this.typeRefOptArgs({art:$.expr},700);continue
-case 700:if(this.m(0,')')){ this.finalizeDictOrArray( $.expr.args ); }continue
+case 697:if(this.mk(698,'cast')){ $.expr.op = this.valueWithLocation(); }continue
+case 698:if(this.m(699,'(')){ $.expr.args = this.createArray(); }continue
+case 699:if(this.expression(_={},700)){arg=_.expr; $.expr.args?.push( arg ); }continue
+case 700:this.mk(701,'as');continue
+case 701:this.typeRefOptArgs({art:$.expr},702);continue
+case 702:if(this.m(0,')')){ this.finalizeDictOrArray( $.expr.args ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -3995,66 +3997,66 @@ return this.exit_()
 }
 argumentsAndFilter($,$next){
 let open;let expr;let id;let _
-this.rule_(702,$next)
+this.rule_(704,$next)
 for(;;)switch(this.s){
-case 702:switch(this.l()){
-case'(':if(this.c(703)){open=this.lb();this.prepareSpecialFunction(); $.pathStep.args = this.createArray(); }continue
-default:this.s=722;continue
-}
-case 703:switch(this.l()){
-case'Id':if(this.gc(704,'isNamedArg')&&this.ciA(710,'paramname'))id=this.lb();continue
-default:this.s=704;continue
-}
 case 704:switch(this.l()){
-case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'Id_all':case'Number':case'String':case'QuotedLiteral':if(this.funcExpression(_={},705)){expr=_.expr; $.pathStep.args.push( expr ); }continue
-default:this.s=721;continue
+case'(':if(this.c(705)){open=this.lb();this.prepareSpecialFunction(); $.pathStep.args = this.createArray(); }continue
+default:this.s=724;continue
 }
 case 705:switch(this.l()){
-case',':if(this.c(706)){this.nextFunctionArgument()}continue;
-default:this.s=707;continue
+case'Id':if(this.gc(706,'isNamedArg')&&this.ciA(712,'paramname'))id=this.lb();continue
+default:this.s=706;continue
 }
-case 706: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(_={},705)){expr=_.expr; $.pathStep.args.push( expr ); }continue
-case')':case'order':this.gP(707);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 707:switch(this.l()){
+case',':if(this.c(708)){this.nextFunctionArgument()}continue;
+default:this.s=709;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
 default:this.ei();continue
 }
-case 707:switch(this.lk()){
-case'order':if(this.ck(708)){ expr = $.pathStep.args[$.pathStep.args.length - 1] = this.applyOpToken( expr ); }continue
-default:this.s=721;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 708:if(this.mk(709,'by')){ this.pushXprToken( expr ); }continue
-case 709:if(this.orderByClauseAsXpr({outer:expr.args},721)){ this.attachLocation( expr ); }continue
-case 710:switch(this.l()){
-case':':if(this.c(711)){ $.pathStep.args = this.createDict( open ); $.pathStep.$syntax = ':'; }continue
-case'=>':if(this.c(716)){ $.pathStep.args = this.createDict(); }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
 default:this.e();continue
 }
-case 711:if(this.expression(_={},712)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 712:switch(this.l()){
-case',':this.c(713);continue
-default:this.s=721;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 713:switch(this.l()){
-case'Id':if(this.ciA(714,'paramname'))id=this.lb();continue
-case')':this.s=721;continue
+case 715:switch(this.l()){
+case'Id':if(this.ciA(716,'paramname'))id=this.lb();continue
+case')':this.s=723;continue
 default:this.e();continue
 }
-case 714:this.m(715,':');continue
-case 715:if(this.expression(_={},712)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 716:if(this.expression(_={},717)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 717:switch(this.l()){
-case',':this.c(718);continue
-default:this.s=721;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 718:switch(this.l()){
-case'Id':if(this.ciA(719,'paramname'))id=this.lb();continue
-case')':this.s=721;continue
+case 720:switch(this.l()){
+case'Id':if(this.ciA(721,'paramname'))id=this.lb();continue
+case')':this.s=723;continue
 default:this.e();continue
 }
-case 719:this.m(720,'=>');continue
-case 720:if(this.expression(_={},717)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 721:this.m(722,')');continue
-case 722:switch(this.l()){
+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'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['*','+','-','.','/','<','=','>','?','!=','<=','<>','>=','in','is','or','||','and','not','like','between']);continue
 }
@@ -4065,22 +4067,22 @@ funcExpression($,$next){
 $.expr??=undefined
 let args
 let tok;let e;let _
-this.rule_(724,$next)
+this.rule_(726,$next)
 for(;;)switch(this.s){
-case 724:switch(this.lGenericIntroOrExpr()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},726))$.expr=_.expr;continue
-case'GenericExpr':if(this.ckA(726)){tok=this.lb(); $.expr = { val: tok.keyword ?? tok.type, location: tok.location, literal: 'token' }; }continue
-case'GenericIntro':if(this.ckA(725)){ $.expr = this.applyOpToken(); args = $.expr.args; }continue
+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
 default:this.e();continue
 }
-case 725:if(this.expression(_={},726)){e=_.expr; $.expr.args.push( e ); }continue
-case 726:switch(this.lGenericSeparator()){
-case'GenericSeparator':if(this.ckA(727)){ if (args) this.pushXprToken( args ); else { $.expr= this.applyOpToken( $.expr ); args = $.expr.args; } }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
 default:this.gr([')',',','order']);continue
 }
-case 727:switch(this.lGenericExpr()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},726)){e=_.expr; args.push( e ); }continue
-case'GenericExpr':if(this.ckA(726)){ this.pushXprToken( args ); }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
 default:this.e();continue
 }
 default:
@@ -4090,27 +4092,27 @@ return this.exit_()
 }
 overClause($,$next){
 let over=[]
-this.rule_(729,$next)
+this.rule_(731,$next)
 for(;;)switch(this.s){
-case 729:this.m(730,'(');continue
-case 730:switch(this.lk()){
-case'partition':if(this.ck(731)){ this.pushXprToken( over ); }continue
-default:this.s=733;continue
-}
-case 731:if(this.mk(732,'by')){ this.pushXprToken( over ); }continue
-case 732:this.expressionsAsXpr({outer:over},733);continue
-case 733:switch(this.lk()){
-case'order':if(this.ck(734)){ this.pushXprToken( over ); }continue
-default:this.s=736;continue
-}
-case 734:if(this.mk(735,'by')){ this.pushXprToken( over ); }continue
-case 735:this.orderByClauseAsXpr({outer:over},736);continue
-case 736:switch(this.lk()){
-case'rows':if(this.ck(737)){ this.pushXprToken( over ); }continue
+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 737:this.windowFrameClause({outer:over},738);continue
-case 738:this.m(0,')');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
 default:
 $.outer.push( this.surroundByParens( this.ixprAst( over ) ) )
 return this.exit_()
@@ -4119,14 +4121,14 @@ return this.exit_()
 expressionsAsXpr($,$next){
 let args=[]
 let expr;let _
-this.rule_(740,$next)
+this.rule_(742,$next)
 for(;;)switch(this.s){
-case 740:if(this.expression(_={},741)){expr=_.expr; args.push( expr ); }continue
-case 741:switch(this.l()){
-case',':if(this.c(742)){ this.pushXprToken( args ); }continue
+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
 default:this.gr([')','rows','order']);continue
 }
-case 742:if(this.expression(_={},741)){expr=_.expr; args.push( expr ); }continue
+case 744:if(this.expression(_={},743)){expr=_.expr; args.push( expr ); }continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
@@ -4134,14 +4136,14 @@ return this.exit_()
 }
 orderByClauseAsXpr($,$next){
 let args=[]
-this.rule_(744,$next)
+this.rule_(746,$next)
 for(;;)switch(this.s){
-case 744:this.orderBySpecAsXpr({args},745);continue
-case 745:switch(this.l()){
-case',':if(this.c(746)){ this.pushXprToken( args ); }continue
+case 746:this.orderBySpecAsXpr({args},747);continue
+case 747:switch(this.l()){
+case',':if(this.c(748)){ this.pushXprToken( args ); }continue
 default:this.gr([')']);continue
 }
-case 746:this.orderBySpecAsXpr({args},745);continue
+case 748:this.orderBySpecAsXpr({args},747);continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
@@ -4149,18 +4151,18 @@ return this.exit_()
 }
 orderBySpecAsXpr($,$next){
 let expr;let _
-this.rule_(748,$next)
+this.rule_(750,$next)
 for(;;)switch(this.s){
-case 748:if(this.expression(_={},749)){expr=_.expr; $.args.push( expr ); }continue
-case 749:switch(this.lk()){
-case'asc':case'desc':if(this.ck(750)){ this.pushXprToken( $.args ); }continue
-default:this.s=750;continue
+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 750:switch(this.lk()){
-case'nulls':if(this.ck(751)){ this.pushXprToken( $.args ); }continue
+case 752:switch(this.lk()){
+case'nulls':if(this.ck(753)){ this.pushXprToken( $.args ); }continue
 default:this.gr([')',',']);continue
 }
-case 751:switch(this.lk()){
+case 753:switch(this.lk()){
 case'last':case'first':if(this.ck(0)){ this.pushXprToken( $.args ); }continue
 default:this.e();continue
 }
@@ -4169,50 +4171,50 @@ default:return this.exit_()
 }
 windowFrameClause($,$next){
 let args=[]
-this.rule_(753,$next)
+this.rule_(755,$next)
 for(;;)switch(this.s){
-case 753:switch(this.lk()){
-case'unbounded':if(this.ck(754)){ this.pushXprToken( args ); }continue
-case'Number':if(this.c(754)){ args.push( this.unsignedIntegerLiteral() ); }continue
-case'current':if(this.ck(755)){ this.pushXprToken( args ); }continue
-case'between':if(this.ck(756)){ this.pushXprToken( args ); }continue
+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
 default:this.e();continue
 }
-case 754:if(this.mk(0,'preceding')){ this.pushXprToken( args ); }continue
-case 755:if(this.mk(0,'row')){ this.pushXprToken( args ); }continue
-case 756:this.windowFrameBoundSpec({args},757);continue
-case 757:if(this.mk(758,'and')){ this.pushXprToken( args ); }continue
-case 758:this.windowFrameBoundSpec({args},0);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
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
 }
 }
 windowFrameBoundSpec($,$next){
-this.rule_(760,$next)
+this.rule_(762,$next)
 for(;;)switch(this.s){
-case 760:switch(this.lk()){
-case'unbounded':if(this.ck(761)){ this.pushXprToken( $.args ); }continue
-case'Number':if(this.c(761)){ $.args.push( this.unsignedIntegerLiteral() ); }continue
-case'current':if(this.ck(763)){ 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(765)){ this.pushXprToken( $.args ); }continue
 default:this.e();continue
 }
-case 761:switch(this.lk()){
-case'following':this.ck(762);continue
-case'preceding':this.ck(762);continue
+case 763:switch(this.lk()){
+case'following':this.ck(764);continue
+case'preceding':this.ck(764);continue
 default:this.e();continue
 }
-case 762:if(this.gr([])){ this.pushXprToken( $.args ); }continue
-case 763:if(this.mk(0,'row')){ this.pushXprToken( $.args ); }continue
+case 764:if(this.gr([])){ this.pushXprToken( $.args ); }continue
+case 765:if(this.mk(0,'row')){ this.pushXprToken( $.args ); }continue
 default:return this.exit_()
 }
 }
 literalValue($,$next){
 $.expr??={}
-this.rule_(765,$next)
+this.rule_(767,$next)
 for(;;)switch(this.s){
-case 765:switch(this.lk()){
-case'#':if(this.c(766)){ this.reportUnexpectedSpace(); }continue
+case 767:switch(this.lk()){
+case'#':if(this.c(768)){ 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
@@ -4220,17 +4222,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 766:if(this.mi(0,'enumref')){ $.expr = { literal: 'enum', sym: this.identAst() } }continue
+case 768:if(this.mi(0,'enumref')){ $.expr = { literal: 'enum', sym: this.identAst() } }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
 }
 }
 annoAssignStd($,$next){
-this.rule_(768,$next)
+this.rule_(770,$next)
 for(;;)switch(this.s){
-case 768:if(this.m(769,'@')){this.annoInSameLine(); this.reportUnexpectedSpace(); }continue
-case 769:switch(this.l()){
+case 770:if(this.m(771,'@')){this.annoInSameLine(); this.reportUnexpectedSpace(); }continue
+case 771:switch(this.l()){
 case'(':this.annoAssignParen($,0);continue
 case'Id':this.annoAssignBase($,0);continue
 default:this.e();continue
@@ -4241,10 +4243,10 @@ return this.exit_()
 }
 }
 annoAssignCol($,$next){
-this.rule_(771,$next)
+this.rule_(773,$next)
 for(;;)switch(this.s){
-case 771:if(this.m(772,'@')){ this.reportUnexpectedSpace(); }continue
-case 772:switch(this.l()){
+case 773:if(this.m(774,'@')){ this.reportUnexpectedSpace(); }continue
+case 774:switch(this.l()){
 case'(':this.annoAssignParen($,0);continue
 case'Id':this.annoAssignBase($,0);continue
 default:this.e();continue
@@ -4256,10 +4258,10 @@ return this.exit_()
 }
 annoAssignMid($,$next){
 let name;let _
-this.rule_(774,$next)
+this.rule_(776,$next)
 for(;;)switch(this.s){
-case 774:if(this.m(775,'@')){this.annoInSameLine(); this.reportUnexpectedSpace(); }continue
-case 775:switch(this.l()){
+case 776:if(this.m(777,'@')){this.annoInSameLine(); this.reportUnexpectedSpace(); }continue
+case 777: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
@@ -4270,33 +4272,33 @@ return this.exit_()
 }
 }
 annoAssignParen($,$next){
-this.rule_(777,$next)
+this.rule_(779,$next)
 for(;;)switch(this.s){
-case 777:if(this.m(778,'(')){this.annoInSameLine()}continue;
-case 778:switch(this.l()){
-case'Id':this.annoAssignBase({art:$.art},779);continue
-default:this.s=780;continue
-}
-case 779:switch(this.l()){
-case',':this.c(778);continue
-case')':this.s=780;continue
+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
 default:this.e();continue
 }
-case 780:this.m(0,')');continue
+case 782:this.m(0,')');continue
 default:return this.exit_()
 }
 }
 annoAssignBase($,$next){
 let value={}
 let name;let _
-this.rule_(782,$next)
+this.rule_(784,$next)
 for(;;)switch(this.s){
-case 782:if(this.annoNamePath(_={category:'anno'},783))name=_.name;continue
-case 783:switch(this.l()){
-case':':this.gc(0,'annoInSameLine')&&this.c(784);continue
+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
 default:this.gr([]);continue
 }
-case 784:if(this.annoValue(_={},0))value=_.value;continue
+case 786:if(this.annoValue(_={},0))value=_.value;continue
 default:
 this.assignAnnotation( $.art, value, name || {} )
 return this.exit_()
@@ -4305,20 +4307,20 @@ return this.exit_()
 annoNamePath($,$next){
 $.name??=new XsnName()
 let at
-this.rule_(786,$next)
+this.rule_(788,$next)
 for(;;)switch(this.s){
-case 786:if(this.miA(787,$.category)){ $.name.path = [ this.identAst() ]; }continue
-case 787:switch(this.l()){
-case'.':this.c(788);continue
-default:this.s=790;continue
-}
-case 788:switch(this.l()){
-case'Id':if(this.ciA(787,$.category)){ $.name.path.push( this.identAst() ); }continue
-case'@':if(this.c(789))at=this.lb();continue
-default:this.e();continue
+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 789:if(this.miA(787,$.category)){ $.name.path.push( this.identAstWithPrefix( at ) ); }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
+default:this.e();continue
+}
+case 791:if(this.miA(789,$.category)){ $.name.path.push( this.identAstWithPrefix( at ) ); }continue
+case 792:switch(this.l()){
 case'#':this.gc(0,'annoInSameLine')&&this.annoPathVariant({nameOrRef:$.name},0);continue
 default:this.gr([]);continue
 }
@@ -4329,25 +4331,25 @@ return this.exit_()
 }
 annoPath($,$next){
 let at
-this.rule_(792,$next)
+this.rule_(794,$next)
 for(;;)switch(this.s){
-case 792:switch(this.l()){
-case'Id':if(this.ciA(794,$.category)){ $.nameOrRef.path = [ this.identAst() ]; }continue
-case'@':if(this.c(793))at=this.lb();continue
+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
 default:this.e();continue
 }
-case 793:if(this.miA(794,$.category)){ $.nameOrRef.path = [ this.identAstWithPrefix( at ) ]; }continue
-case 794:switch(this.l()){
-case'.':this.c(795);continue
-default:this.s=797;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 795:switch(this.l()){
-case'Id':if(this.ciA(794,$.category)){ $.nameOrRef.path.push( this.identAst() ); }continue
-case'@':if(this.c(796))at=this.lb();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
 default:this.e();continue
 }
-case 796:if(this.miA(794,$.category)){ $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); }continue
-case 797:switch(this.l()){
+case 798:if(this.miA(796,$.category)){ $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); }continue
+case 799:switch(this.l()){
 case'#':this.annoPathVariant({nameOrRef:$.nameOrRef},0);continue
 default:this.gr([]);continue
 }
@@ -4357,15 +4359,15 @@ return this.exit_()
 }
 }
 annoPathVariant($,$next){
-this.rule_(799,$next)
+this.rule_(801,$next)
 for(;;)switch(this.s){
-case 799:if(this.m(800,'#')){ this.reportUnexpectedSpace(); }continue
-case 800:if(this.miA(801,'variant')){ $.nameOrRef.variant = { path: [ this.identAst() ] }; }continue
-case 801:switch(this.l()){
-case'.':this.c(802);continue
+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
 default:this.gr([]);continue
 }
-case 802:if(this.miA(801,'variant')){ $.nameOrRef.variant.path.push( this.identAst() ); }continue
+case 804:if(this.miA(803,'variant')){ $.nameOrRef.variant.path.push( this.identAst() ); }continue
 default:
 this.attachLocation( $.nameOrRef.variant )
 return this.exit_()
@@ -4375,14 +4377,14 @@ annoStructValue($,$next){
 $.value??={}
 let name=new XsnName()
 let _
-this.rule_(804,$next)
+this.rule_(806,$next)
 for(;;)switch(this.s){
-case 804:if(this.annoPath({nameOrRef:name,category:'name'},805)){ this.attachLocation( name ); }continue
-case 805:switch(this.l()){
-case':':this.c(806);continue
+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 806:if(this.annoValue(_={},0))$.value=_.value;continue
+case 808:if(this.annoValue(_={},0))$.value=_.value;continue
 default:
 $.value.name = name
 return this.exit_()
@@ -4391,51 +4393,51 @@ return this.exit_()
 annoValue($,$next){
 $.value??={}
 let sign;let sub;let ellipsis;let upTo;let _
-this.rule_(808,$next)
+this.rule_(810,$next)
 for(;;)switch(this.s){
-case 808:switch(this.lk()){
+case 810: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(809))sign=this.lb();continue
+case'+':case'-':if(this.c(811))sign=this.lb();continue
 case'Id':case'@':this.annoPath({nameOrRef:$.value,category:'annoref'},0);continue
-case'{':if(this.c(810)){ if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
+case'{':if(this.c(812)){ if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
 else { $.value.struct = Object.create(null); $.value.literal = 'struct'; } }continue
-case'[':if(this.c(814)){this.arrayAnno(); $.value.val = []; $.value.literal = 'array' }continue
-case'(':this.c(821);continue
+case'[':if(this.c(816)){this.arrayAnno(); $.value.val = []; $.value.literal = 'array' }continue
+case'(':this.c(823);continue
 default:this.ei();continue
 }
-case 809:if(this.m(0,'Number')){ this.adjustAnnoNumber( $.value = this.numberLiteral( sign ) ); }continue
-case 810:switch(this.l()){
-case'Id':case'@':if(this.annoStructValue(_={},811)){sub=_.value; if ($.value.$flatten) $.value.$flatten.push( sub );
+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 );
 else this.addDef( sub, $.value, 'struct', null, sub.name ); }continue
-default:this.s=812;continue
+default:this.s=814;continue
 }
-case 811:switch(this.l()){
-case',':this.c(810);continue
-case'}':this.s=812;continue
+case 813:switch(this.l()){
+case',':this.c(812);continue
+case'}':this.s=814;continue
 default:this.e();continue
 }
-case 812:this.s=813;{ this.ec( 'arrayAnno', 'orNotEmpty' ); }continue
-case 813:this.m(0,'}');continue
-case 814:switch(this.l()){
-case'Id':case'#':case'(':case'+':case'-':case'@':case'[':case'{':case'Number':case'String':case'QuotedLiteral':if(this.annoValue(_={},819)){sub=_.value; $.value.val.push( sub ) }continue
-case'...':if(this.gc(820,'arrayAnno','ellipsis')&&this.c(815))ellipsis=this.lb();continue
-default:this.s=820;continue
-}
-case 815:switch(this.lk()){
-case'up':this.ck(816);continue
-default:this.s=818;{ upTo = undefined; }continue
-}
-case 816:this.mk(817,'to');continue
-case 817:if(this.annoValue(_={},818))upTo=_.value;continue
-case 818:this.s=819;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location, upTo: upTo } ); }continue
-case 819:switch(this.l()){
-case',':this.c(814);continue
-case']':this.s=820;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
 default:this.e();continue
 }
-case 820:this.m(0,']');continue
-case 821:if(this.condition(_={},822))$.value=_.expr;continue
-case 822:if(this.m(0,')')){ $.value.$tokenTexts = this.ruleTokensText(); }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
 default:
 this.attachLocation( $.value )
 return this.exit_()