@sap/cds-dk 10.0.7 → 10.1.1

package/node_modules/@sap/cds-compiler/lib/gen/CdlParser.js

@@ -133,7 +133,7 @@ EOF:3,
 },
 ['m',0,'}',,,'afterBrace'],
 'artifactDefOrExtend',
-{'@':[10,782],'':11},
+{'@':[10,784],'':11},
 {
 type:12,view:'type',event:'type',action:'type',aspect:'type',entity:'type',context:'type',service:'type',abstract:'type',function:'type',annotation:'type',
 define:['ck',12],
@@ -198,22 +198,22 @@ Id:[22,31],
 'serviceDef',
 ['mk',44,'service',,,'vocabularyRestriction'],
 [45,35],
-{'@':[45,788],'':46},
+{'@':[45,790],'':46},
 {'{':[0,5],'':0},
 'contextDef',
 ['mk',49,'context',,,'vocabularyRestriction'],
 [50,35],
-{'@':[50,788],'':51},
+{'@':[50,790],'':51},
 {'{':[0,5],'':0},
 'annotationDef',
 ['mk',54,'annotation'],
 [55,35],
-{'@':[55,788],'':56},
+{'@':[55,790],'':56},
 [0,357],
 'typeDef',
 ['mk',59,'type'],
 [60,35],
-{'@':[60,788],'':61},
+{'@':[60,790],'':61},
 [0,357],
 'aspectDef',
 {
@@ -222,7 +222,7 @@ abstract:['ck',64,,'hide_'],
 },
 ['mk',65,'entity'],
 [66,35],
-{'@':[66,788],'':67},
+{'@':[66,790],'':67},
 {
 '{':[71,157],
 ':':['c',68],
@@ -239,7 +239,7 @@ abstract:['ck',64,,'hide_'],
 'entityDef',
 ['mk',74,'entity'],
 [75,35],
-{'@':[75,788],'':76},
+{'@':[75,790],'':76},
 {'(':[77,141],'':77},
 {
 '{':81,
@@ -258,13 +258,13 @@ as:['ck',82],
 projection:['g',83,,,'sloppyOn','afterBrace'],
 },
 [84,455,,,'sloppyOn','afterBrace'],
-{group:[85,619],where:'group',having:'group','':85},
-{limit:[86,631],order:'limit','':86},
+{group:[85,621],where:'group',having:'group','':85},
+{limit:[86,633],order:'limit','':86},
 {actions:[0,124],'':0},
 'viewDef',
 ['mk',89,'view'],
 [90,35],
-{'@':[90,788],'':91},
+{'@':[90,790],'':91},
 {
 '(':[97,141],
 with:['ck',92,,'hide_'],
@@ -280,7 +280,7 @@ with:['ck',92,,'hide_'],
 'eventDef',
 ['mk',101,'event'],
 [102,35],
-{'@':[102,788],'':103},
+{'@':[102,790],'':103},
 {
 '{':[0,157],
 ':':['c',104],
@@ -298,17 +298,17 @@ projection:[0,455,[]],
 '{':109,
 },
 [0,157],
-{'@':[110,782],'':0},
+{'@':[110,784],'':0},
 'actionMainDef',
 ['mk',113,'action'],
 [114,35],
-{'@':[114,788],'':115},
+{'@':[114,790],'':115},
 [116,141],
 {returns:[0,153],'':0},
 'functionMainDef',
 ['mk',119,'function'],
 [120,35],
-{'@':[120,788],'':121},
+{'@':[120,790],'':121},
 [122,141],
 [0,153],
 'actionsBlock',
@@ -322,17 +322,17 @@ projection:[0,455,[]],
 },
 ['m',0,'}',,,'afterBrace'],
 'boundActionFunctionDef',
-{'@':[130,782],'':131},
+{'@':[130,784],'':131},
 {
 action:['ck',132],
 function:['ck',136],
 },
 ['mi',133],
-{'@':[133,788],'':134},
+{'@':[133,790],'':134},
 [135,141],
 {returns:[0,153],'':0},
 ['mi',137],
-{'@':[137,788],'':138},
+{'@':[137,790],'':138},
 [139,141],
 [0,153],
 'paramsList',
@@ -344,9 +344,9 @@ function:['ck',136],
 },
 ['m',0,')'],
 'paramDef',
-{'@':[146,782],'':147},
+{'@':[146,784],'':147},
 ['my',148],
-{'@':[148,788],'':149},
+{'@':[148,790],'':149},
 {
 '{':[150,157],
 ':':['c',151],
@@ -355,7 +355,7 @@ function:['ck',136],
 [0,367],
 'returnsSpec',
 ['mk',154,'returns',,'default','elementRestriction'],
-{'@':[154,782],'':155},
+{'@':[154,784],'':155},
 [0,367],
 'elementsBlock',
 ['m',158,'{'],
@@ -367,12 +367,12 @@ Id:['g',158,,'afterBrace'],'@':'Id',key:'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'elementDef',
-{'@':[162,782],'':163},
+{'@':[162,784],'':163},
 {virtual:['ck',164,['Id','key']],'':164},
 {key:['ck',165],'':165},
 {element:['ck',166,['Id'],'hide_'],'':166},
 ['mi',167,,,'elem','elementRestriction'],
-{'@':[167,788],'':168},
+{'@':[167,790],'':168},
 {
 '{':[169,157],
 ':':['c',170],
@@ -381,10 +381,10 @@ Id:['g',158,,'afterBrace'],'@':'Id',key:'Id',
 {not:[171,448],null:'not','':171},
 [171,367],
 {'=':['c',172,,'elementRestriction','calc'],'':0},
-[173,653],
+[173,655],
 {stored:['ck',174],'':174},
 ['g',175],
-{'@':[175,782,,'elementRestriction','anno'],'':0},
+{'@':[175,784,,'elementRestriction','anno'],'':0},
 'enumSymbolsBlock',
 ['mk',178,'enum'],
 ['m',179,'{'],
@@ -396,19 +396,19 @@ Id:['g',179,,'fail'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'enumSymbolDef',
-{'@':[183,782],'':184},
+{'@':[183,784],'':184},
 ['mi',185],
-{'@':[185,782],'':186},
+{'@':[185,784],'':186},
 {'=':['c',187],'':0},
 {
 String:['c',189],
 Number:['c',189],
 '+':['c',188],'-':'+',
-Id:[189,779,,'hide_'],'#':'Id',QuotedLiteral:'Id',
+Id:[189,781,,'hide_'],'#':'Id',QuotedLiteral:'Id',
 },
 ['m',189,'Number'],
 ['g',190],
-{'@':[190,782],'':0},
+{'@':[190,784],'':0},
 'foreignKeysBlock',
 ['m',193,'{'],
 {Id:[194,197],'@':'Id','':195},
@@ -418,7 +418,7 @@ Id:[189,779,,'hide_'],'#':'Id',QuotedLiteral:'Id',
 },
 ['m',0,'}'],
 'foreignKeyDef',
-{'@':[197,782],'':198},
+{'@':[197,784],'':198},
 [199,39],
 {as:['ck',200],'':0},
 ['mi',0],
@@ -436,7 +436,7 @@ composition:['ck',207],
 {one:['ck',210,['Id'],'noRepeatedCardinality'],many:'one','':210},
 [211,39],
 ['mk',212,'on'],
-[0,651],
+[0,653],
 'annotateArtifact',
 [215,35],
 {
@@ -447,10 +447,10 @@ with:['ck',221],
 [217,35],
 {with:['ck',218],'':218},
 ['g',219],
-{'@':[219,782],'':220},
+{'@':[219,784],'':220},
 {'{':[0,318],'':0},
 ['g',222],
-{'@':[222,782],'':223},
+{'@':[222,784],'':223},
 {'(':[224,305],'':224},
 {
 returns:[0,314],
@@ -468,7 +468,7 @@ with:['ck',238],
 [230,35],
 {with:['ck',231],'':231},
 ['g',232],
-{'@':[232,782],'':233},
+{'@':[232,784],'':233},
 {
 '{':234,
 elements:['ck',234],
@@ -477,10 +477,10 @@ enum:[0,344],
 '':0
 },
 [0,328],
-{'@':[235,782],'':236},
+{'@':[235,784],'':236},
 {'{':[237,328],'':0},
 {actions:[0,124],'':0},
-{'@':[238,782],'':239},
+{'@':[238,784],'':239},
 {
 Id:[240,39],
 '{':244,
@@ -488,7 +488,7 @@ elements:['ck',244,['{']],
 actions:[0,124,[]],
 enum:[0,344,[]],
 '(':[0,427],
-group:[0,614,[]],limit:'group',order:'group',where:'group',having:'group',columns:'group',
+group:[0,616,[]],limit:'group',order:'group',where:'group',having:'group',columns:'group',
 definitions:['ck',246,['{']],
 '':0
 },
@@ -504,22 +504,22 @@ definitions:['ck',246,['{']],
 [250,35],
 {with:['ck',251],'':251},
 ['g',252],
-{'@':[252,782],'':253},
+{'@':[252,784],'':253},
 {'{':[0,5],'':0},
 'extendContext',
 ['mk',256,'context'],
 [257,35],
 {with:['ck',258],'':258},
 ['g',259],
-{'@':[259,782],'':260},
+{'@':[259,784],'':260},
 {'{':[0,5],'':0},
 'extendType',
 ['mk',263,'type'],
 [264,35],
 {with:['ck',267],'':265},
-{'@':[265,782],'':266},
+{'@':[265,784],'':266},
 {'{':[0,328],'':0},
-{'@':[267,782],'':268},
+{'@':[267,784],'':268},
 {
 Id:[269,39],
 '{':272,
@@ -536,8 +536,8 @@ enum:[0,177,[]],
 {aspect:['ck',275],entity:'aspect'},
 [276,35],
 {with:['ck',278],'':277},
-{'@':[277,782],'':282},
-{'@':[278,782],'':279},
+{'@':[277,784],'':282},
+{'@':[278,784],'':279},
 {Id:[280,39],'':['g',282,[]],actions:''},
 {',':['c',281],'':282},
 [280,39],
@@ -548,8 +548,8 @@ enum:[0,177,[]],
 [287,35],
 {with:['ck',288],'':288},
 ['g',289],
-{'@':[289,782],'':290},
-{'{':[291,564],'':291},
+{'@':[289,784],'':290},
+{'{':[291,566],'':291},
 {actions:[0,124],'':0},
 'annotateActionsBlock',
 ['mk',294,'actions'],
@@ -562,9 +562,9 @@ Id:['g',295,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'annotateBoundAction',
-{'@':[299,782],'':300},
+{'@':[299,784],'':300},
 ['mi',301],
-{'@':[301,782],'':302},
+{'@':[301,784],'':302},
 {'(':[303,305],'':303},
 {returns:[0,314],'':0},
 'annotateParamsBlock',
@@ -576,12 +576,12 @@ Id:['g',295,,'afterBrace'],'@':'Id',
 },
 ['m',0,')'],
 'annotateParam',
-{'@':[310,782],'':311},
+{'@':[310,784],'':311},
 ['mi',312],
-{'@':[312,782],'':0},
+{'@':[312,784],'':0},
 'annotateReturns',
 ['mk',315,'returns'],
-{'@':[315,782],'':316},
+{'@':[315,784],'':316},
 {'{':[0,318],'':0},
 'annotateElementsBlock',
 ['m',319,'{'],
@@ -593,9 +593,9 @@ Id:['g',319,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'annotateElement',
-{'@':[323,782],'':324},
+{'@':[323,784],'':324},
 ['mi',325],
-{'@':[325,782],'':326},
+{'@':[325,784],'':326},
 {'{':[0,318],'':0},
 'extendElementsBlock',
 ['m',329,'{'],
@@ -607,7 +607,7 @@ Id:['g',329,,'afterBrace'],'@':'Id',key:'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'elementDefOrExtend',
-{'@':[333,782],'':334},
+{'@':[333,784],'':334},
 {
 Id:[0,162],'@':'Id',key:'Id',
 extend:['ck',335,['Id']],
@@ -615,9 +615,9 @@ extend:['ck',335,['Id']],
 {element:['ck',336,['Id']],'':336},
 ['mi',337],
 {with:['ck',340],'':338},
-{'@':[338,782],'':339},
+{'@':[338,784],'':339},
 {'{':[0,328],'':0},
-{'@':[340,782],'':341},
+{'@':[340,784],'':341},
 {
 '{':342,
 elements:['ck',342],
@@ -637,7 +637,7 @@ Id:['g',346,,'fail'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'enumSymbolDefOrExtend',
-{'@':[350,782],'':351},
+{'@':[350,784],'':351},
 {
 Id:[0,183],'@':'Id',
 extend:['ck',352,['Id']],
@@ -645,7 +645,7 @@ extend:['ck',352,['Id']],
 ['mi',353],
 {with:['ck',354],'':354},
 ['g',355],
-{'@':[355,782],'':0},
+{'@':[355,784],'':0},
 'typeOrIncludesSpec',
 {
 '{':[358,157],
@@ -683,9 +683,9 @@ many:['ck',388,['Id','{'],,'calc','elementRestriction'],
 '{':[393,157,,,'calc','elementRestriction'],
 },
 ['g',369],
-{'@':[369,782],'':370},
+{'@':[369,784],'':370},
 {not:[371,448,,'elementRestriction','notNull'],null:'not','':372},
-{'@':[371,782],'':372},
+{'@':[371,784],'':372},
 {
 enum:[373,177,,,'anno','elementRestriction'],
 '@':[0,402],not:'@',null:'@',default:'@',
@@ -693,7 +693,7 @@ enum:[373,177,,,'anno','elementRestriction'],
 },
 {not:[374,448,,'elementRestriction','notNull'],null:'not','':374},
 {default:['ck',375,,'elementRestriction','default'],'':376},
-[376,653],
+[376,655],
 {not:[0,448,,'elementRestriction','notNull'],null:'not','':0},
 [378,413],
 {'@':[0,402],not:'@',null:'@',default:'@','':0},
@@ -716,29 +716,29 @@ type:[389,405,[]],
 },
 {not:[390,448,,'elementRestriction','notNull'],null:'not','':390},
 {enum:[392,177],'':391},
-{'@':[391,782],'':0},
+{'@':[391,784],'':0},
 {not:[0,448,,'elementRestriction','notNull'],null:'not','':0},
 {not:[0,448],null:'not','':0},
 'typeAssocProperties',
 [396,39],
-{'@':[396,782],'':397},
+{'@':[396,784],'':397},
 {
 on:['ck',398],
 '{':[400,192],
 '@':[0,402],not:'@',null:'@',default:'@',
 '':0
 },
-[399,651],
-{'@':[399,782],'':0},
+[399,653],
+{'@':[399,784],'':0},
 {'@':[0,402],not:'@',null:'@',default:'@','':0},
 'typeProperties',
 {
-'@':[402,782],
+'@':[402,784],
 not:[402,448,,'elementRestriction','notNull'],null:'not',
 default:['ck',403,,'elementRestriction','default'],
 '':0
 },
-[402,653],
+[402,655],
 'typeTypeOf',
 ['mk',406,'type'],
 ['mk',407,'of'],
@@ -829,9 +829,9 @@ not:['ck',449],
 'projectionSpec',
 ['mk',456,'projection'],
 ['mk',457,'on'],
-[458,520],
-{'{':[459,564],'':459},
-{excluding:[0,557],'':0},
+[458,522],
+{'{':[459,566],'':459},
+{excluding:[0,559],'':0},
 'queryExpression',
 {
 '(':['c',462],
@@ -848,15 +848,15 @@ union:['ck',466,,'precLeft_',2],
 {distinct:['ck',467],'':467},
 {all:['ck',467],distinct:'all','':467},
 [464,461,,,,'orderByLimitRestriction'],
-{limit:[0,631,,'orderByLimitRestriction'],order:'limit','':0},
+{limit:[0,633,,'orderByLimitRestriction'],order:'limit','':0},
 'selectQuery',
 ['mk',471,'select'],
 {
 from:['ck',472],
-Id:482,'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',key:'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id',
-all:['ck',482],distinct:'all',
+Id:483,'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',all:'Id',key:'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Number:'Id',String:'Id',exists:'Id',distinct:'Id',QuotedLiteral:'Id',
+one:['ck',483,['Id','#','(','*','+','-',':','?','@','{','all','key','not','case','cast','null','true','false','Number','String','exists','distinct','QuotedLiteral'],'hide_'],
 },
-[473,490],
+[473,492],
 {mixin:['ck',474],'':479},
 ['m',475,'{'],
 {Id:[476,202],'':477},
@@ -868,494 +868,496 @@ Id:['g',475,,'fail'],
 ['m',478,'}'],
 ['mk',479,'into'],
 {all:['ck',480],distinct:'all','':480},
-{'{':[481,564],'':481},
-{excluding:[488,557],'':488},
-['g',483,,,'sqlStyle','inSelectItem'],
+{one:['ck',481,,'hide_'],'':481},
+{'{':[482,566],'':482},
+{excluding:[490,559],'':490},
+{all:['ck',484],distinct:'all','':484},
+['g',485,,,'sqlStyle','inSelectItem'],
 {
-'*':['c',484],
-Id:[484,574],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'*':['c',486],
+Id:[486,576],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
 },
-{',':['c',485],'':486},
+{',':['c',487],'':488},
 {
-'*':['c',484],
-Id:[484,574],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'*':['c',486],
+Id:[486,576],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
 },
-['mk',487,'from'],
-[488,490],
-{group:[0,619],where:'group',having:'group','':0},
+['mk',489,'from'],
+[490,492],
+{group:[0,621],where:'group',having:'group','':0},
 'querySource',
-[491,495],
-{',':492,'':0},
-{',':['c',493],'':0},
-[492,495],
+[493,497],
+{',':494,'':0},
+{',':['c',495],'':0},
+[494,497],
 'tableExpression',
 {
-'(':[496,507],
-Id:[496,520],
+'(':[498,509],
+Id:[498,522],
 },
 {
-cross:['ck',497],
-inner:['ck',500],
-full:['ck',499],left:'full',right:'full',
-join:['ck',502],
+cross:['ck',499],
+inner:['ck',502],
+full:['ck',501],left:'full',right:'full',
+join:['ck',504],
 '':0
 },
-['mk',498,'join'],
+['mk',500,'join'],
 {
-'(':[496,507],
-Id:[496,520],
+'(':[498,509],
+Id:[498,522],
 },
-{outer:['ck',500],'':500},
-{one:[501,514],many:'one',exact:'one','':501},
-['mk',502,'join'],
-['g',503],
-[504,495],
-['mk',505,'on'],
-[496,651],
+{outer:['ck',502],'':502},
+{one:[503,516],many:'one',exact:'one','':503},
+['mk',504,'join'],
+['g',505],
+[506,497],
+['mk',507,'on'],
+[498,653],
 'tableOrQueryParens',
-['m',508,'(',,,'queryOnLeft'],
+['m',510,'(',,,'queryOnLeft'],
 {
-'(':[509,507],
-Id:[510,495,,,'table','queryOnLeft'],
-select:[510,461],
+'(':[511,509],
+Id:[512,497,,,'table','queryOnLeft'],
+select:[512,461],
 },
 {
-full:[510,496,,,'table','queryOnLeft'],join:'full',left:'full',cross:'full',inner:'full',right:'full',
-limit:[510,464,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
-'':510
+full:[512,498,,,'table','queryOnLeft'],join:'full',left:'full',cross:'full',inner:'full',right:'full',
+limit:[512,464,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
+'':512
 },
-['m',511,')'],
+['m',513,')'],
 {
-as:['ck',512,,'queryOnLeft','table'],
+as:['ck',514,,'queryOnLeft','table'],
 Id:['ci',0,,'queryOnLeftSloppyAlias'],
 '':0,on:'',all:'',where:'',distinct:''
 },
 ['mi',0],
 'joinCardinality',
 {
-one:515,
-exact:['ck',515],
-many:['ck',516],
+one:517,
+exact:['ck',517],
+many:['ck',518],
 },
-['mk',516,'one'],
-['mk',517,'to'],
+['mk',518,'one'],
+['mk',519,'to'],
 {
-one:518,
-exact:['ck',518],
+one:520,
+exact:['ck',520],
 many:['ck',0],
 },
 ['mk',0,'one'],
 'fromRefWithOptAlias',
-[521,527],
-{':':['c',522],'':523},
-[523,527],
+[523,529],
+{':':['c',524],'':525},
+[525,529],
 {
-as:['ck',524],
+as:['ck',526],
 Id:['ci',0,,'isNoKeywordInRuleFollow'],
-'':525,on:'',all:'',where:'',distinct:''
+'':527,on:'',all:'',where:'',distinct:''
 },
 ['mi',0],
 ['g',0],
 'fromPath',
-['mi',528],
-{'(':[529,533],'[':'(','':529},
-{'.':['c',530,,'notAfterEntityArgOrFilter'],'':0},
-['my',531],
-{'(':[529,533],'[':'(','':529},
+['mi',530],
+{'(':[531,535],'[':'(','':531},
+{'.':['c',532,,'notAfterEntityArgOrFilter'],'':0},
+['my',533],
+{'(':[531,535],'[':'(','':531},
 'fromArgumentsAndFilter',
-{'(':['c',534],'':538},
-{Id:535},
-{Id:[536,540],'':537},
+{'(':['c',536],'':540},
+{Id:537},
+{Id:[538,542],'':539},
 {
-',':['c',535],
-')':537,
+',':['c',537],
+')':539,
 },
-['m',538,')'],
-{'[':[0,544],'':0},
+['m',540,')'],
+{'[':[0,546],'':0},
 'fromNamedArgument',
-['mi',541],
-['m',542,':'],
-[0,653],
+['mi',543],
+['m',544,':'],
+[0,655],
 'cardinalityAndFilter',
-['m',545,'['],
-{Number:['c',546,,'beforeColon'],'':547},
-['m',547,':'],
+['m',547,'['],
+{Number:['c',548,,'beforeColon'],'':549},
+['m',549,':'],
 {
-group:['g',549,[]],limit:'group',order:'group',having:'group',
-where:['ck',548],
+group:['g',551,[]],limit:'group',order:'group',having:'group',
+where:['ck',550],
 ']':['c',0],
-'':548
+'':550
 },
-[549,651],
-{group:['g',550,,'hide_'],'':551},
-[551,625],
-{having:['ck',552,,'hide_'],'':553},
-[553,651],
-{Id:['g',554,,'hide_'],'':555},
-[555,631],
+[551,653],
+{group:['g',552,,'hide_'],'':553},
+[553,627],
+{having:['ck',554,,'hide_'],'':555},
+[555,653],
+{Id:['g',556,,'hide_'],'':557},
+[557,633],
 ['m',0,']'],
 'excludingClause',
-['mk',558,'excluding'],
-['m',559,'{'],
-{Id:560},
-{Id:['cy',561],'':562},
+['mk',560,'excluding'],
+['m',561,'{'],
+{Id:562},
+{Id:['cy',563],'':564},
 {
-',':['c',560],
-'}':562,
+',':['c',562],
+'}':564,
 },
 ['m',0,'}',,,'afterBrace'],
 'selectItemsList',
-['m',565,'{',,'top','inSelectItem'],
+['m',567,'{',,'top','inSelectItem'],
 {
-'*':['c',566],
-Id:[566,574],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'':567
+'*':['c',568],
+Id:[568,576],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'':569
 },
 {
-',':['c',565],
-'}':567,
+',':['c',567],
+'}':569,
 },
 ['m',0,'}',,,'afterBrace'],
 'nestedSelectItemsList',
-['m',570,'{',,,'inSelectItem'],
+['m',572,'{',,,'inSelectItem'],
 {
-'*':['c',571],
-Id:[571,574],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'':572
+'*':['c',573],
+Id:[573,576],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'':574
 },
 {
-',':['c',570],
-'}':572,
+',':['c',572],
+'}':574,
 },
 ['m',0,'}',,,'afterBrace'],
 'selectItemDef',
-{'@':[574,785],'':575},
-{virtual:['ck',576,['Id','#','(','+','-',':','?','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'],'modifierRestriction'],'':576},
-['g',577,,,'key','columnExpr'],
-{key:['ck',578,,'modifierRestriction'],'':578},
+{'@':[576,787],'':577},
+{virtual:['ck',578,['Id','#','(','+','-',':','?','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'],'modifierRestriction'],'':578},
+['g',579,,,'key','columnExpr'],
+{key:['ck',580,,'modifierRestriction'],'':580},
 {
-'#':[579,653,[]],'(':'#','+':'#','-':'#',':':'#','?':'#',new:'#',not:'#',case:'#',cast:'#',null:'#',true:'#',false:'#',Number:'#',String:'#',exists:'#',QuotedLiteral:'#',
-Id:[581,681],
-'{':[592,569],
+'#':[581,655,[]],'(':'#','+':'#','-':'#',':':'#','?':'#',new:'#',not:'#',case:'#',cast:'#',null:'#',true:'#',false:'#',Number:'#',String:'#',exists:'#',QuotedLiteral:'#',
+Id:[583,683],
+'{':[594,571],
 },
 {
-as:['ck',580],
-Id:['ci',589,,'hide_'],
-'':589,from:''
+as:['ck',582],
+Id:['ci',591,,'hide_'],
+'':591,from:''
 },
-['mi',589],
+['mi',591],
 {
-over:['ck',582],
-'*':[584,664],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
-as:['ck',586],
-Id:['ci',589,,'hide_',,'nestedExpand'],
-'.':['c',587],
-'':['g',589,,,,'nestedExpand'],from:''
+over:['ck',584],
+'*':[586,666],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
+as:['ck',588],
+Id:['ci',591,,'hide_',,'nestedExpand'],
+'.':['c',589],
+'':['g',591,,,,'nestedExpand'],from:''
 },
-[583,743],
-{'*':[584,664],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*','':584},
+[585,745],
+{'*':[586,666],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*','':586},
 {
-as:['ck',585],
-Id:['ci',589,,'hide_'],
-'':589,from:''
+as:['ck',587],
+Id:['ci',591,,'hide_'],
+'':591,from:''
 },
-['mi',589],
-['mi',589,,,,'nestedExpand'],
+['mi',591],
+['mi',591,,,,'nestedExpand'],
 {
-'{':[588,569],
+'{':[590,571],
 '*':['c',0],
 },
-{excluding:[0,557],'':0},
-{'{':['g',590,,'nestedExpand'],'':595},
-[591,569],
-{excluding:[595,557],'':595},
-{excluding:[593,557],'':593},
-['mk',594,'as'],
-['mi',595],
-['g',596,,,,'columnExpr'],
-{'@':[596,788],'':597},
-{':':['c',598],'':0},
+{excluding:[0,559],'':0},
+{'{':['g',592,,'nestedExpand'],'':597},
+[593,571],
+{excluding:[597,559],'':597},
+{excluding:[595,559],'':595},
+['mk',596,'as'],
+['mi',597],
+['g',598,,,,'columnExpr'],
+{'@':[598,790],'':599},
+{':':['c',600],'':0},
 {
-Id:[611,367],'{':'Id',
-redirected:['ck',599,['to']],
-association:['ck',603,['[','to'],'columnExpr'],
-composition:['ck',605,['[','of'],'columnExpr'],
+Id:[613,367],'{':'Id',
+redirected:['ck',601,['to']],
+association:['ck',605,['[','to'],'columnExpr'],
+composition:['ck',607,['[','of'],'columnExpr'],
 },
-['mk',600,'to'],
-[601,39],
+['mk',602,'to'],
+[603,39],
 {
-on:['ck',602],
-'{':[611,192],
-'':611
+on:['ck',604],
+'{':[613,192],
+'':613
 },
-[611,651],
-{'[':[604,436],'':604},
-['mk',607,'to'],
+[613,653],
 {'[':[606,436],'':606},
-['mk',607,'of'],
-{one:['ck',608,['Id'],'noRepeatedCardinality'],many:'one','':608},
-[609,39],
-['mk',610,'on'],
-[611,651],
-['g',612],
-{'@':[612,782],'':0},
+['mk',609,'to'],
+{'[':[608,436],'':608},
+['mk',609,'of'],
+{one:['ck',610,['Id'],'noRepeatedCardinality'],many:'one','':610},
+[611,39],
+['mk',612,'on'],
+[613,653],
+['g',614],
+{'@':[614,784],'':0},
 'queryClauses',
-{columns:['ck',615],'':616},
-[616,564],
-{group:[617,619],where:'group',having:'group','':617},
-{limit:[0,631],order:'limit','':0},
+{columns:['ck',617],'':618},
+[618,566],
+{group:[619,621],where:'group',having:'group','':619},
+{limit:[0,633],order:'limit','':0},
 'whereGroupByHaving',
-{where:['ck',620],'':621},
-[621,651],
-{group:[622,625],'':622},
-{having:['ck',623],'':0},
-[0,651],
+{where:['ck',622],'':623},
+[623,653],
+{group:[624,627],'':624},
+{having:['ck',625],'':0},
+[0,653],
 'groupByClause',
-['mk',626,'group'],
-['mk',627,'by'],
-[628,653],
-{',':['c',629],'':0},
-[628,653],
+['mk',628,'group'],
+['mk',629,'by'],
+[630,655],
+{',':['c',631],'':0},
+[630,655],
 'orderByLimitOffset',
-{order:[632,637],'':632},
-{limit:['ck',633],'':0},
-[634,653],
-{offset:['ck',635],'':0},
-[0,653],
+{order:[634,639],'':634},
+{limit:['ck',635],'':0},
+[636,655],
+{offset:['ck',637],'':0},
+[0,655],
 'orderByClause',
-['mk',638,'order'],
-['mk',639,'by'],
-[640,643],
-{',':['c',641],'':0},
-[640,643],
+['mk',640,'order'],
+['mk',641,'by'],
+[642,645],
+{',':['c',643],'':0},
+[642,645],
 'orderByExpression',
-[644,653],
-{asc:['ck',645],desc:'asc','':645},
-{nulls:['ck',646],'':0},
+[646,655],
+{asc:['ck',647],desc:'asc','':647},
+{nulls:['ck',648],'':0},
 {last:['ck',0],first:'last'},
 'conditionEOF',
-[649,653],
+[651,655],
 ['m',0,'EOF'],
 'condition',
-[0,653],
+[0,655],
 'expression',
 {
-'(':[664,687],
-'#':[664,779],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
-':':['c',654],
-'?':['c',664,,'hide_'],
-Id:[656,681],
-new:['ck',659,['Id']],
-exists:['ck',660],
-case:[664,699],
-cast:[664,710],
-'+':['c',663,,'precRight_',30],'-':'+',
-not:['ck',663,,'precRight_',8],
+'(':[666,689],
+'#':[666,781],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
+':':['c',656],
+'?':['c',666,,'hide_'],
+Id:[658,683],
+new:['ck',661,['Id']],
+exists:['ck',662],
+case:[666,701],
+cast:[666,712],
+'+':['c',665,,'precRight_',30],'-':'+',
+not:['ck',665,,'precRight_',8],
 },
 {
-Id:['cy',655],
-Number:['c',664,,'hide_'],
+Id:['cy',657],
+Number:['c',666,,'hide_'],
 },
-{'.':[664,683],'':664},
-{over:['ck',657],'':658},
-[658,743],
-['g',664],
-[664,681],
+{'.':[666,685],'':666},
+{over:['ck',659],'':660},
+[660,745],
+['g',666],
+[666,683],
 {
-'(':['c',661],
-Id:[664,681],
-'?':['c',664,,'hide_'],
+'(':['c',663],
+Id:[666,683],
+'?':['c',666,,'hide_'],
 },
-[662,461],
-['m',664,')'],
-[664,653],
+[664,461],
+['m',666,')'],
+[666,655],
 {
-'*':['c',668,,'precLeft_',24],'/':'*',
-'+':['c',668,,'precLeft_',22],'-':'+',
-'||':['c',668,,'precLeft_',20],
-and:['ck',668,,'precLeft_',4],
-or:['ck',668,,'precLeft_',2],
-'?':['c',665,,'precRight_',0],
-'<':['c',667,,'precNone_',10],'=':'<','>':'<','!=':'<','<=':'<','<>':'<','>=':'<',
-'==':['c',668,,'precNone_',10],
-is:['ck',669,,'precNone_',10],
-not:['ck',671,,'isNegatedRelation',10],
-in:['g',671,,'precNone_',10],like:'in',between:'in',
+'*':['c',670,,'precLeft_',24],'/':'*',
+'+':['c',670,,'precLeft_',22],'-':'+',
+'||':['c',670,,'precLeft_',20],
+and:['ck',670,,'precLeft_',4],
+or:['ck',670,,'precLeft_',2],
+'?':['c',667,,'precRight_',0],
+'<':['c',669,,'precNone_',10],'=':'<','>':'<','!=':'<','<=':'<','<>':'<','>=':'<',
+'==':['c',670,,'precNone_',10],
+is:['ck',671,,'precNone_',10],
+not:['ck',673,,'isNegatedRelation',10],
+in:['g',673,,'precNone_',10],like:'in',between:'in',
 '':0
 },
-[666,653],
-['m',668,':'],
-{all:['ck',668],any:'all',some:'all','':668},
-[679,653],
-{not:['ck',670],'':670},
-['mk',679,'null'],
+[668,655],
+['m',670,':'],
+{all:['ck',670],any:'all',some:'all','':670},
+[681,655],
+{not:['ck',672],'':672},
+['mk',681,'null'],
 {
-between:['ck',672],
-in:['ck',675],
-like:['ck',676],
+between:['ck',674],
+in:['ck',677],
+like:['ck',678],
 },
-[673,653],
-['mk',674,'and'],
-[679,653],
-[679,653],
-[677,653],
-{escape:['ck',678],'':679},
-[679,653],
-['g',664],
+[675,655],
+['mk',676,'and'],
+[681,655],
+[681,655],
+[679,655],
+{escape:['ck',680],'':681},
+[681,655],
+['g',666],
 'valuePath',
-['mi',682],
-{'(':[683,717],'[':'(','':683},
-{'.':['c',684,,'isDotForPath'],'':0},
-['my',685],
-{'(':[683,717],'[':'(','':683},
+['mi',684],
+{'(':[685,719],'[':'(','':685},
+{'.':['c',686,,'isDotForPath'],'':0},
+['my',687],
+{'(':[685,719],'[':'(','':685},
 'expressionOrQueryParens',
-['m',688,'(',,,'queryOnLeft'],
+['m',690,'(',,,'queryOnLeft'],
 {
-'(':[689,687],
-Id:[691,653,,,'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:[692,461],
+'(':[691,689],
+Id:[693,655,,,'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:[694,461],
 },
 {
-'*':[690,664,,,'expr','queryOnLeft'],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
-',':[692,694,,,'expr','queryOnLeft'],
-limit:[692,464,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
-'':692
+'*':[692,666,,,'expr','queryOnLeft'],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*',
+',':[694,696,,,'expr','queryOnLeft'],
+limit:[694,464,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:'limit',intersect:'limit',
+'':694
 },
-{',':[692,694],'':692},
-{',':[692,694],'':692},
+{',':[694,696],'':694},
+{',':[694,696],'':694},
 ['m',0,')'],
 'continueExpressionslist',
-['m',695,','],
-{Id:696,'#':'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'},
-{Id:[697,653],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id','':0},
-{',':['c',696],'':0},
+['m',697,','],
+{Id:698,'#':'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'},
+{Id:[699,655],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id','':0},
+{',':['c',698],'':0},
 'caseExpression',
-['mk',700,'case'],
-{Id:[701,653],'#':'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','':701,when:''},
-{when:702},
-{when:['ck',703],'':706},
-[704,653],
-['mk',705,'then'],
-[702,653],
-{else:['ck',707],'':708},
-[708,653],
+['mk',702,'case'],
+{Id:[703,655],'#':'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','':703,when:''},
+{when:704},
+{when:['ck',705],'':708},
+[706,655],
+['mk',707,'then'],
+[704,655],
+{else:['ck',709],'':710},
+[710,655],
 ['mk',0,'end'],
 'castFunction',
-['mk',711,'cast'],
-['m',712,'('],
-[713,653],
-['mk',714,'as'],
-[715,413],
+['mk',713,'cast'],
+['m',714,'('],
+[715,655],
+['mk',716,'as'],
+[717,413],
 ['m',0,')'],
 'argumentsAndFilter',
-{'(':['c',718,,,,'prepareSpecialFunction'],'':736},
+{'(':['c',720,,,,'prepareSpecialFunction'],'':738},
 {
-')':735,
-Id:['cy',719,,'isNamedArg'],
-'':728
+')':737,
+Id:['cy',721,,'isNamedArg'],
+'':730
 },
 {
-':':['c',720],
-'=>':['c',724],
+':':['c',722],
+'=>':['c',726],
 },
-[721,653],
+[723,655],
 {
-',':['c',722],
-')':735,
+',':['c',724],
+')':737,
 },
 {
-Id:['cy',723],
-')':735,
+Id:['cy',725],
+')':737,
 },
-['m',720,':'],
-[725,653],
+['m',722,':'],
+[727,655],
 {
-',':['c',726],
-')':735,
+',':['c',728],
+')':737,
 },
 {
-Id:['cy',727],
-')':735,
+Id:['cy',729],
+')':737,
 },
-['m',724,'=>'],
-[729,738],
-{',':['c',730,,,,'nextFunctionArgument'],'':732},
-{')':['c',731],'':728},
-{'[':[0,544],'':0},
-{order:['ck',733],'':735},
-['mk',734,'by'],
-[735,758],
-['m',736,')'],
-{'[':[0,544],'':0},
+['m',726,'=>'],
+[731,740],
+{',':['c',732,,,,'nextFunctionArgument'],'':734},
+{')':['c',733],'':730},
+{'[':[0,546],'':0},
+{order:['ck',735],'':737},
+['mk',736,'by'],
+[737,760],
+['m',738,')'],
+{'[':[0,546],'':0},
 'funcExpression',
 {
 ' lookahead':'lGenericIntroOrExpr',
-Id:[740,653],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-GenericExpr:['cx',740],
-GenericIntro:['cx',739],
+Id:[742,655],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+GenericExpr:['cx',742],
+GenericIntro:['cx',741],
 },
-[740,653],
+[742,655],
 {
 ' lookahead':'lGenericSeparator',
-GenericSeparator:['cx',741],
+GenericSeparator:['cx',743],
 '':0
 },
 {
 ' lookahead':'lGenericExpr',
-Id:[740,653],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-GenericExpr:['cx',740],
+Id:[742,655],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+GenericExpr:['cx',742],
 },
 'overClause',
-['m',744,'('],
-{partition:['ck',745],'':747},
-['mk',746,'by'],
-[747,754],
-{order:['ck',748],'':750},
-['mk',749,'by'],
-[750,758],
-{rows:['ck',751],'':752},
-[752,767],
+['m',746,'('],
+{partition:['ck',747],'':749},
+['mk',748,'by'],
+[749,756],
+{order:['ck',750],'':752},
+['mk',751,'by'],
+[752,760],
+{rows:['ck',753],'':754},
+[754,769],
 ['m',0,')'],
 'expressionsAsXpr',
-[755,653],
-{',':['c',756],'':0},
-[755,653],
+[757,655],
+{',':['c',758],'':0},
+[757,655],
 'orderByClauseAsXpr',
-[759,762],
-{',':['c',760],'':0},
-[759,762],
+[761,764],
+{',':['c',762],'':0},
+[761,764],
 'orderBySpecAsXpr',
-[763,653],
-{asc:['ck',764],desc:'asc','':764},
-{nulls:['ck',765],'':0},
+[765,655],
+{asc:['ck',766],desc:'asc','':766},
+{nulls:['ck',767],'':0},
 {last:['ck',0],first:'last'},
 'windowFrameClause',
 {
-unbounded:['ck',768],
-Number:['c',768],
-current:['ck',769],
-between:['ck',770],
+unbounded:['ck',770],
+Number:['c',770],
+current:['ck',771],
+between:['ck',772],
 },
 ['mk',0,'preceding'],
 ['mk',0,'row'],
-[771,774],
-['mk',772,'and'],
-[0,774],
+[773,776],
+['mk',774,'and'],
+[0,776],
 'windowFrameBoundSpec',
 {
-unbounded:['ck',775],
-Number:['c',775],
-current:['ck',777],
+unbounded:['ck',777],
+Number:['c',777],
+current:['ck',779],
 },
 {
-following:['ck',776],
-preceding:['ck',776],
+following:['ck',778],
+preceding:['ck',778],
 },
 ['g',0],
 ['mk',0,'row'],
 'literalValue',
 {
-'#':['c',780],
+'#':['c',782],
 null:['ck',0],
 true:['ck',0],false:'true',
 Number:['c',0],
@@ -1364,101 +1366,101 @@ QuotedLiteral:['c',0],
 },
 ['my',0],
 'annoAssignStd',
-['m',783,'@',,,'annoInSameLine'],
+['m',785,'@',,,'annoInSameLine'],
 {
-'(':[0,791],
-Id:[0,796],
+'(':[0,793],
+Id:[0,798],
 },
 'annoAssignCol',
-['m',786,'@'],
+['m',788,'@'],
 {
-'(':[0,791],
-Id:[0,796],
+'(':[0,793],
+Id:[0,798],
 },
 'annoAssignMid',
-['m',789,'@',,,'annoInSameLine'],
+['m',791,'@',,,'annoInSameLine'],
 {
-'(':[0,791],
-Id:[0,800],
+'(':[0,793],
+Id:[0,802],
 },
 'annoAssignParen',
-['m',792,'(',,,'annoInSameLine'],
-{Id:[793,796],'':794},
+['m',794,'(',,,'annoInSameLine'],
+{Id:[795,798],'':796},
 {
-',':['c',792],
-')':794,
+',':['c',794],
+')':796,
 },
 ['m',0,')'],
 'annoAssignBase',
-[797,800],
-{':':['c',798,,'annoInSameLine'],'':0},
-[0,822],
+[799,802],
+{':':['c',800,,'annoInSameLine'],'':0},
+[0,824],
 'annoNamePath',
-['my',801],
-{'.':['c',802],'':804},
+['my',803],
+{'.':['c',804],'':806},
 {
-Id:['cy',801],
-'@':['c',803],
+Id:['cy',803],
+'@':['c',805],
 },
-['my',801],
-{'#':[0,813,,'annoInSameLine'],'':0},
+['my',803],
+{'#':[0,815,,'annoInSameLine'],'':0},
 'annoPath',
 {
-Id:['cy',808],
-'@':['c',807],
+Id:['cy',810],
+'@':['c',809],
 },
-['my',808],
-{'.':['c',809],'':811},
+['my',810],
+{'.':['c',811],'':813},
 {
-Id:['cy',808],
-'@':['c',810],
+Id:['cy',810],
+'@':['c',812],
 },
-['my',808],
-{'#':[0,813],'':0},
+['my',810],
+{'#':[0,815],'':0},
 'annoPathVariant',
-['m',814,'#'],
-['my',815],
-{'.':['c',816],'':0},
-['my',815],
+['m',816,'#'],
+['my',817],
+{'.':['c',818],'':0},
+['my',817],
 'annoStructValue',
-[819,806],
-{':':['c',820],'':0},
-[0,822],
+[821,808],
+{':':['c',822],'':0},
+[0,824],
 'annoValue',
 {
-'#':[0,779],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
-'+':['c',823],'-':'+',
-Id:[0,806],'@':'Id',
-'{':['c',824],
-'[':['c',827,,,,'arrayAnno'],
-'(':['c',833],
+'#':[0,781],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
+'+':['c',825],'-':'+',
+Id:[0,808],'@':'Id',
+'{':['c',826],
+'[':['c',829,,,,'arrayAnno'],
+'(':['c',835],
 },
 ['m',0,'Number'],
-{Id:[825,818],'@':'Id','':826},
+{Id:[827,820],'@':'Id','':828},
 {
-',':['c',824],
-'}':826,
-Id:['g',824,,'fail'],'@':'Id',
+',':['c',826],
+'}':828,
+Id:['g',826,,'fail'],'@':'Id',
 },
 {'}':['c',0,,'arrayAnno','orNotEmpty']},
 {
-Id:[831,822],'#':'Id','(':'Id','+':'Id','-':'Id','@':'Id','[':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'...':['c',828,,'arrayAnno','ellipsis'],
-'':832
+Id:[833,824],'#':'Id','(':'Id','+':'Id','-':'Id','@':'Id','[':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'...':['c',830,,'arrayAnno','ellipsis'],
+'':834
 },
 {
-up:['ck',829],
-',':831,']':',',
+up:['ck',831],
+',':833,']':',',
 },
-['mk',830,'to'],
-[831,822],
+['mk',832,'to'],
+[833,824],
 {
-',':['c',827],
-']':832,
+',':['c',829],
+']':834,
 },
 {']':['c',0,,'arrayAnno','bracket']},
-{')':['c',0,,'fail'],'':834},
-[835,651],
+{')':['c',0,,'fail'],'':836},
+[837,653],
 ['m',0,')'],
 ]
 class CdlParser extends AstBuildingParser{
@@ -3254,8 +3256,8 @@ for(;;)switch(this.s){
 case 470:if(this.mk(471,'select')){ $.query = { op: this.valueWithLocation( 'SELECT' ) }; }continue
 case 471:switch(this.l()){
 case'from':this.ck(472);continue
-case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'@':case'{':case'key':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':this.s=482;continue
-case'all':case'distinct':if(this.ck(482)){ $.query.quantifier = this.valueWithLocation(); }continue
+case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'@':case'{':case'all':case'key':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'distinct':case'QuotedLiteral':this.s=483;continue
+case'one':if(this.ck(483)){ this.csnParseOnly( 'syntax-unexpected-sql-clause', -1, { '#': 'one', code: 'select one' } ); $.query.one = this.valueWithLocation( true ); }continue
 default:this.e();continue
 }
 case 472:this.querySource({query:$.query},473);continue
@@ -3280,32 +3282,40 @@ case 479:switch(this.lk()){
 case'all':case'distinct':if(this.ck(480)){ $.query.quantifier = this.valueWithLocation(); }continue
 default:this.s=480;continue
 }
-case 480:switch(this.lt()){
-case'{':this.selectItemsList({query:$.query,start:undefined},481);continue
+case 480:switch(this.lk()){
+case'one':if(this.ck(481)){ this.csnParseOnly( 'syntax-unexpected-sql-clause', -1, { '#': 'one', code: 'select one' } ); $.query.one = this.valueWithLocation( true ); }continue
 default:this.s=481;continue
 }
-case 481:switch(this.lk()){
-case'excluding':this.excludingClause({query:$.query},488);continue
-default:this.s=488;continue
+case 481:switch(this.lt()){
+case'{':this.selectItemsList({query:$.query,start:undefined},482);continue
+default:this.s=482;continue
 }
-case 482:this.s=483;{this.inSelectItem('sqlStyle')}continue;
-case 483:switch(this.lt()){
-case'*':if(this.c(484)){ $.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 = []),sqlStyle:true},484);continue
-default:this.e();continue
+case 482:switch(this.lk()){
+case'excluding':this.excludingClause({query:$.query},490);continue
+default:this.s=490;continue
 }
-case 484:switch(this.lt()){
-case',':this.c(485);continue
-default:this.s=486;continue
+case 483:switch(this.l()){
+case'all':case'distinct':if(this.ck(484)){ $.query.quantifier = this.valueWithLocation(); }continue
+default:this.s=484;continue
 }
+case 484:this.s=485;{this.inSelectItem('sqlStyle')}continue;
 case 485:switch(this.lt()){
-case'*':if(this.c(484)){ $.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,sqlStyle:true},484);continue
+case'*':if(this.c(486)){ $.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 = []),sqlStyle:true},486);continue
 default:this.e();continue
 }
-case 486:this.mk(487,'from');continue
-case 487:this.querySource({query:$.query},488);continue
-case 488:switch(this.lk()){
+case 486:switch(this.lt()){
+case',':this.c(487);continue
+default:this.s=488;continue
+}
+case 487:switch(this.lt()){
+case'*':if(this.c(486)){ $.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,sqlStyle:true},486);continue
+default:this.e();continue
+}
+case 488:this.mk(489,'from');continue
+case 489:this.querySource({query:$.query},490);continue
+case 490: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
 }
@@ -3316,19 +3326,19 @@ return this.exit_()
 }
 querySource($,$next){
 let tab;let _
-this.rule_(490,$next)
+this.rule_(492,$next)
 for(;;)switch(this.s){
-case 490:if(this.tableExpression(_={},491)){tab=_.expr; $.query.from = tab; }continue
-case 491:switch(this.lt()){
-case',':this.s=492;{ const { location } = this.la();
+case 492:if(this.tableExpression(_={},493)){tab=_.expr; $.query.from = tab; }continue
+case 493:switch(this.lt()){
+case',':this.s=494;{ 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 492:switch(this.lt()){
-case',':this.c(493);continue
+case 494:switch(this.lt()){
+case',':this.c(495);continue
 default:this.gr(['group','limit','minus','order','union','where','except','having','intersect']);continue
 }
-case 493:if(this.tableExpression(_={},492)){tab=_.expr; $.query.from.args.push( tab ); }continue
+case 495:if(this.tableExpression(_={},494)){tab=_.expr; $.query.from.args.push( tab ); }continue
 default:
 this.attachLocation($.query.from)
 return this.exit_()
@@ -3337,90 +3347,90 @@ return this.exit_()
 tableExpression($,$next,$startState){
 $.expr??={}
 let join;let tab;let card;let cond;let _
-this.rule_($startState??495,$next)
+this.rule_($startState??497,$next)
 for(;;)switch(this.s){
-case 495:switch(this.lt()){
-case'(':if(this.tableOrQueryParens($,496)){ $.expr = this.taggedIfQuery( $.expr ); }continue
-case'Id':this.fromRefWithOptAlias($,496);continue
+case 497:switch(this.lt()){
+case'(':if(this.tableOrQueryParens($,498)){ $.expr = this.taggedIfQuery( $.expr ); }continue
+case'Id':this.fromRefWithOptAlias($,498);continue
 default:this.e();continue
 }
-case 496:switch(this.lk()){
-case'cross':if(this.ck(497))join=this.lb();continue
-case'inner':if(this.ck(500))join=this.lb();continue
-case'full':case'left':case'right':if(this.ck(499))join=this.lb();continue
-case'join':if(this.ck(502)){ join = undefined; }continue
+case 498:switch(this.lk()){
+case'cross':if(this.ck(499))join=this.lb();continue
+case'inner':if(this.ck(502))join=this.lb();continue
+case'full':case'left':case'right':if(this.ck(501))join=this.lb();continue
+case'join':if(this.ck(504)){ join = undefined; }continue
 default:this.gr();continue
 }
-case 497:if(this.mk(498,'join')){ if ($.expr?.join?.val !== 'cross' || $.expr.$parens) $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( undefined, join ), args: [ $.expr ] }; }continue
-case 498:switch(this.lt()){
-case'(':if(this.tableOrQueryParens(_={},496)){tab=_.expr; const r = this.taggedIfQuery( tab ); if (r) $.expr.args.push( r );
+case 499:if(this.mk(500,'join')){ if ($.expr?.join?.val !== 'cross' || $.expr.$parens) $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( undefined, join ), args: [ $.expr ] }; }continue
+case 500:switch(this.lt()){
+case'(':if(this.tableOrQueryParens(_={},498)){tab=_.expr; const r = this.taggedIfQuery( tab ); if (r) $.expr.args.push( r );
 this.attachLocation( $.expr ); }continue
-case'Id':if(this.fromRefWithOptAlias(_={},496)){tab=_.expr; if (tab) $.expr.args.push( tab );
+case'Id':if(this.fromRefWithOptAlias(_={},498)){tab=_.expr; if (tab) $.expr.args.push( tab );
 this.attachLocation( $.expr ); }continue
 default:this.e();continue
 }
-case 499:switch(this.lk()){
-case'outer':this.ck(500);continue
-default:this.s=500;continue
+case 501:switch(this.lk()){
+case'outer':this.ck(502);continue
+default:this.s=502;continue
 }
-case 500:switch(this.lk()){
-case'one':case'many':case'exact':this.joinCardinality(card={},501);continue
-default:this.s=501;continue
+case 502:switch(this.lk()){
+case'one':case'many':case'exact':this.joinCardinality(card={},503);continue
+default:this.s=503;continue
 }
-case 501:this.mk(502,'join');continue
-case 502:this.s=503;{ $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( join?.keyword || 'inner', join ), args: [ $.expr ] }; if (card) $.expr.cardinality = card; card = undefined; }continue
-case 503:if(this.tableExpression(_={},504)){tab=_.expr; $.expr.args.push( tab ); this.attachLocation( $.expr ); }continue
-case 504:this.mk(505,'on');continue
-case 505:if(this.condition(_={},496)){cond=_.expr; $.expr.on = cond;
+case 503:this.mk(504,'join');continue
+case 504:this.s=505;{ $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( join?.keyword || 'inner', join ), args: [ $.expr ] }; if (card) $.expr.cardinality = card; card = undefined; }continue
+case 505:if(this.tableExpression(_={},506)){tab=_.expr; $.expr.args.push( tab ); this.attachLocation( $.expr ); }continue
+case 506:this.mk(507,'on');continue
+case 507:if(this.condition(_={},498)){cond=_.expr; $.expr.on = cond;
 this.attachLocation( $.expr ); }continue
 default:return this.exit_()
 }
 }
 tableOrQueryParens($,$next){
 $.expr??=undefined
-this.rule_(507,$next)
+this.rule_(509,$next)
 for(;;)switch(this.s){
-case 507:if(this.m(508,'(')){this.queryOnLeft()}continue;
-case 508:switch(this.l()){
-case'(':this.tableOrQueryParens($,509);continue
-case'Id':if(this.tableExpression($,510)){this.queryOnLeft('table')}continue;
-case'select':this.queryExpression($,510);continue
+case 509:if(this.m(510,'(')){this.queryOnLeft()}continue;
+case 510:switch(this.l()){
+case'(':this.tableOrQueryParens($,511);continue
+case'Id':if(this.tableExpression($,512)){this.queryOnLeft('table')}continue;
+case'select':this.queryExpression($,512);continue
 default:this.e();continue
 }
-case 509:switch(this.l()){
-case'full':case'join':case'left':case'cross':case'inner':case'right':if(this.tableExpression(( $.expr = this.taggedIfQuery( $.expr ), $ ),510,496)){this.queryOnLeft('table')}continue;
-case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.queryExpression($,510,464);continue
-default:this.s=510;continue
-}
-case 510:if(this.m(511,')')){ this.surroundByParens( $.expr ); }continue
 case 511:switch(this.l()){
-case'as':this.ck(512);continue
+case'full':case'join':case'left':case'cross':case'inner':case'right':if(this.tableExpression(( $.expr = this.taggedIfQuery( $.expr ), $ ),512,498)){this.queryOnLeft('table')}continue;
+case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.queryExpression($,512,464);continue
+default:this.s=512;continue
+}
+case 512:if(this.m(513,')')){ this.surroundByParens( $.expr ); }continue
+case 513:switch(this.l()){
+case'as':this.ck(514);continue
 case'Id':if(this.ci(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.fragileAlias(); }continue
 default:this.gr(['full','join','left','cross','inner','right']);continue
 }
-case 512:if(this.mi(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.identAst(); }continue
+case 514: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_(514,$next)
+this.rule_(516,$next)
 for(;;)switch(this.s){
-case 514:switch(this.lk()){
-case'one':this.s=515;continue
-case'exact':if(this.ck(515)){ $.sourceMin = this.valueWithLocation( 1 ); }continue
-case'many':if(this.ck(516)){ $.sourceMax = this.valueWithLocation( '*' ); }continue
+case 516:switch(this.lk()){
+case'one':this.s=517;continue
+case'exact':if(this.ck(517)){ $.sourceMin = this.valueWithLocation( 1 ); }continue
+case'many':if(this.ck(518)){ $.sourceMax = this.valueWithLocation( '*' ); }continue
 default:this.e();continue
 }
-case 515:if(this.mk(516,'one')){ $.sourceMax = this.valueWithLocation( 1 ); }continue
-case 516:this.mk(517,'to');continue
-case 517:switch(this.lk()){
-case'one':this.s=518;continue
-case'exact':if(this.ck(518)){ $.targetMin = this.valueWithLocation( 1 ); }continue
+case 517:if(this.mk(518,'one')){ $.sourceMax = this.valueWithLocation( 1 ); }continue
+case 518:this.mk(519,'to');continue
+case 519:switch(this.lk()){
+case'one':this.s=520;continue
+case'exact':if(this.ck(520)){ $.targetMin = this.valueWithLocation( 1 ); }continue
 case'many':if(this.ck(0)){ $.targetMax = this.valueWithLocation( '*' ); }continue
 default:this.e();continue
 }
-case 518:if(this.mk(0,'one')){ $.targetMax = this.valueWithLocation( 1 ); }continue
+case 520:if(this.mk(0,'one')){ $.targetMax = this.valueWithLocation( 1 ); }continue
 default:
 this.attachLocation( $ )
 return this.exit_()
@@ -3428,25 +3438,25 @@ return this.exit_()
 }
 fromRefWithOptAlias($,$next){
 $.expr??={}
-this.rule_(520,$next)
+this.rule_(522,$next)
 { $.expr.path = []; }
 for(;;)switch(this.s){
-case 520:this.fromPath({table:$.expr,category:'artref'},521);continue
-case 521:switch(this.lt()){
-case':':if(this.c(522)){ if (!$.expr.scope) $.expr.scope = $.expr.path.length; else {
+case 522:this.fromPath({table:$.expr,category:'artref'},523);continue
+case 523:switch(this.lt()){
+case':':if(this.c(524)){ if (!$.expr.scope) $.expr.scope = $.expr.path.length; else {
 this.warning( 'syntax-invalid-path-separator', this.lb(),
 { '#': 'colon', code: ':', newcode: '.' } );
 } }continue
-default:this.s=523;continue
+default:this.s=525;continue
 }
-case 522:this.fromPath({table:$.expr,category:'ref'},523);continue
-case 523:switch(this.l()){
-case'as':this.ck(524);continue
+case 524:this.fromPath({table:$.expr,category:'ref'},525);continue
+case 525:switch(this.l()){
+case'as':this.ck(526);continue
 case'Id':if(this.ci(0,'FromAlias')){ $.expr.name = this.fragileAlias(); }continue
-default:this.s=525;continue
+default:this.s=527;continue
 }
-case 524:if(this.mi(0,'FromAlias')){ $.expr.name = this.identAst(); }continue
-case 525:if(this.gr()){ this.classifyImplicitName( $.expr.scope ? 'FromElemImplicit' : 'FromImplicit', $.expr ); }continue
+case 526:if(this.mi(0,'FromAlias')){ $.expr.name = this.identAst(); }continue
+case 527:if(this.gr()){ this.classifyImplicitName( $.expr.scope ? 'FromElemImplicit' : 'FromImplicit', $.expr ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -3454,25 +3464,25 @@ return this.exit_()
 }
 fromPath($,$next){
 let pathItem
-this.rule_(527,$next)
+this.rule_(529,$next)
 for(;;)switch(this.s){
-case 527:if(this.mi(528,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
-case 528:switch(this.lt()){
-case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},529)){ pathItem = null; }continue
-default:this.s=529;continue
+case 529:if(this.mi(530,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
+case 530:switch(this.lt()){
+case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},531)){ pathItem = null; }continue
+default:this.s=531;continue
 }
-case 529:switch(this.l()){
-case'.':if(this.c(530)){ if (!pathItem && !$.table.scope) {
+case 531:switch(this.l()){
+case'.':if(this.c(532)){ 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 530:if(this.my(531,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
-case 531:switch(this.lt()){
-case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},529)){ pathItem = null; }continue
-default:this.s=529;continue
+case 532:if(this.my(533,$.category)){ $.table.path.push( pathItem = this.identAst() ); }continue
+case 533:switch(this.lt()){
+case'(':case'[':if(this.fromArgumentsAndFilter({pathStep:pathItem},531)){ pathItem = null; }continue
+default:this.s=531;continue
 }
 default:
 this.attachLocation( $.table.path )
@@ -3480,27 +3490,27 @@ return this.exit_()
 }
 }
 fromArgumentsAndFilter($,$next){
-this.rule_(533,$next)
+this.rule_(535,$next)
 for(;;)switch(this.s){
-case 533:switch(this.lt()){
-case'(':if(this.c(534)){ $.pathStep.args = this.createDict(); $.pathStep.$syntax = ':'; }continue
-default:this.s=538;continue
+case 535:switch(this.lt()){
+case'(':if(this.c(536)){ $.pathStep.args = this.createDict(); $.pathStep.$syntax = ':'; }continue
+default:this.s=540;continue
 }
-case 534:switch(this.l()){
-case'Id':this.s=535;continue
+case 536:switch(this.l()){
+case'Id':this.s=537;continue
 default:this.e();continue
 }
-case 535:switch(this.lt()){
-case'Id':this.fromNamedArgument($,536);continue
-default:this.s=537;continue
+case 537:switch(this.lt()){
+case'Id':this.fromNamedArgument($,538);continue
+default:this.s=539;continue
 }
-case 536:switch(this.lt()){
-case',':this.c(535);continue
-case')':this.s=537;continue
+case 538:switch(this.lt()){
+case',':this.c(537);continue
+case')':this.s=539;continue
 default:this.e();continue
 }
-case 537:this.m(538,')');continue
-case 538:switch(this.lt()){
+case 539:this.m(540,')');continue
+case 540:switch(this.lt()){
 case'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['Id','.','as']);continue
 }
@@ -3509,229 +3519,229 @@ default:return this.exit_()
 }
 fromNamedArgument($,$next){
 let name;let expr;let _
-this.rule_(540,$next)
+this.rule_(542,$next)
 for(;;)switch(this.s){
-case 540:if(this.mi(541,'paramname'))name=this.lb();continue
-case 541:this.m(542,':');continue
-case 542:if(this.expression(_={},0)){expr=_.expr; this.addDef( expr, $.pathStep, 'args', 0, this.identAst( name ) ); }continue
+case 542:if(this.mi(543,'paramname'))name=this.lb();continue
+case 543:this.m(544,':');continue
+case 544:if(this.expression(_={},0)){expr=_.expr; this.addDef( expr, $.pathStep, 'args', 0, this.identAst( name ) ); }continue
 default:return this.exit_()
 }
 }
 cardinalityAndFilter($,$next){
 let cond;let _
-this.rule_(544,$next)
+this.rule_(546,$next)
 for(;;)switch(this.s){
-case 544:this.m(545,'[');continue
-case 545:switch(this.l()){
-case'Number':if(this.c(546)){ $.pathStep.cardinality = { targetMax: this.unsignedIntegerLiteral(), location: this.lb().location }; }continue
-default:this.s=547;continue
-}
-case 546:this.m(547,':');continue
+case 546:this.m(547,'[');continue
 case 547:switch(this.l()){
-case'group':case'limit':case'order':case'having':this.s=549;continue
-case'where':this.ck(548);continue
-case']':if(this.c(0)){ $.pathStep.where ??= { args: [] }; }continue
-default:this.s=548;continue
+case'Number':if(this.c(548)){ $.pathStep.cardinality = { targetMax: this.unsignedIntegerLiteral(), location: this.lb().location }; }continue
+default:this.s=549;continue
 }
-case 548:if(this.condition(_={},549)){cond=_.expr; $.pathStep.where = cond; }continue
-case 549:switch(this.lk()){
-case'group':this.s=550;{ this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'group by' }); }continue
-default:this.s=551;continue
+case 548:this.m(549,':');continue
+case 549:switch(this.l()){
+case'group':case'limit':case'order':case'having':this.s=551;continue
+case'where':this.ck(550);continue
+case']':if(this.c(0)){ $.pathStep.where ??= { args: [] }; }continue
+default:this.s=550;continue
 }
-case 550:this.groupByClause({query:$.pathStep},551);continue
+case 550:if(this.condition(_={},551)){cond=_.expr; $.pathStep.where = cond; }continue
 case 551:switch(this.lk()){
-case'having':if(this.ck(552)){ this.csnParseOnly('syntax-unexpected-sql-clause', -1, { keyword: 'having' }); }continue
+case'group':this.s=552;{ this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'group by' }); }continue
 default:this.s=553;continue
 }
-case 552:if(this.condition(_={},553)){cond=_.expr; $.pathStep.having = cond; }continue
-case 553:switch(this.lt()){
-case'Id':this.s=554;{ if (this.la().keyword === 'limit') this.csnParseOnly('syntax-unexpected-sql-clause', 0, { keyword: 'limit' } ); else this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'order by' } ); }continue
+case 552:this.groupByClause({query:$.pathStep},553);continue
+case 553:switch(this.lk()){
+case'having':if(this.ck(554)){ this.csnParseOnly('syntax-unexpected-sql-clause', -1, { keyword: 'having' }); }continue
 default:this.s=555;continue
 }
-case 554:this.orderByLimitOffset({query:$.pathStep},555);continue
-case 555:this.m(0,']');continue
+case 554:if(this.condition(_={},555)){cond=_.expr; $.pathStep.having = cond; }continue
+case 555:switch(this.lt()){
+case'Id':this.s=556;{ if (this.la().keyword === 'limit') this.csnParseOnly('syntax-unexpected-sql-clause', 0, { keyword: 'limit' } ); else this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'order by' } ); }continue
+default:this.s=557;continue
+}
+case 556:this.orderByLimitOffset({query:$.pathStep},557);continue
+case 557:this.m(0,']');continue
 default:return this.exit_()
 }
 }
 excludingClause($,$next){
-this.rule_(557,$next)
+this.rule_(559,$next)
 for(;;)switch(this.s){
-case 557:if(this.mk(558,'excluding')){ $.query.excludingDict = this.createDict(); }continue
-case 558:this.m(559,'{');continue
-case 559:switch(this.lt()){
-case'Id':this.s=560;continue
+case 559:if(this.mk(560,'excluding')){ $.query.excludingDict = this.createDict(); }continue
+case 560:this.m(561,'{');continue
+case 561:switch(this.lt()){
+case'Id':this.s=562;continue
 default:this.e();continue
 }
-case 560:switch(this.lt()){
-case'Id':if(this.cy(561,'ref')){ this.addDef( { location: this.lb().location }, $.query, 'excludingDict', '', this.identAst() ); }continue
-default:this.s=562;continue
+case 562:switch(this.lt()){
+case'Id':if(this.cy(563,'ref')){ this.addDef( { location: this.lb().location }, $.query, 'excludingDict', '', this.identAst() ); }continue
+default:this.s=564;continue
 }
-case 561:switch(this.lt()){
-case',':this.c(560);continue
-case'}':this.s=562;continue
+case 563:switch(this.lt()){
+case',':this.c(562);continue
+case'}':this.s=564;continue
 default:this.e();continue
 }
-case 562:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.excludingDict ); }continue
+case 564:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.excludingDict ); }continue
 default:return this.exit_()
 }
 }
 selectItemsList($,$next){
-this.rule_(564,$next)
+this.rule_(566,$next)
 for(;;)switch(this.s){
-case 564:if(this.m(565,'{')){this.inSelectItem('top'); $.query.columns = this.createArray( $.start ); }continue
-case 565:switch(this.lt()){
-case'*':if(this.c(566)){ $.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,sqlStyle:false},566);continue
-default:this.s=567;continue
-}
-case 566:switch(this.lt()){
-case',':this.c(565);continue
-case'}':this.s=567;continue
+case 566:if(this.m(567,'{')){this.inSelectItem('top'); $.query.columns = this.createArray( $.start ); }continue
+case 567:switch(this.lt()){
+case'*':if(this.c(568)){ $.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,sqlStyle:false},568);continue
+default:this.s=569;continue
+}
+case 568:switch(this.lt()){
+case',':this.c(567);continue
+case'}':this.s=569;continue
 default:this.e();continue
 }
-case 567:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.columns ); }continue
+case 569:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query.columns ); }continue
 default:return this.exit_()
 }
 }
 nestedSelectItemsList($,$next){
-this.rule_(569,$next)
+this.rule_(571,$next)
 for(;;)switch(this.s){
-case 569:if(this.m(570,'{')){this.inSelectItem(); $.query[$.clause] = this.createArray(); }continue
-case 570:switch(this.lt()){
-case'*':if(this.c(571)){ $.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],sqlStyle:false},571);continue
-default:this.s=572;continue
-}
-case 571:switch(this.lt()){
-case',':this.c(570);continue
-case'}':this.s=572;continue
+case 571:if(this.m(572,'{')){this.inSelectItem(); $.query[$.clause] = this.createArray(); }continue
+case 572:switch(this.lt()){
+case'*':if(this.c(573)){ $.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],sqlStyle:false},573);continue
+default:this.s=574;continue
+}
+case 573:switch(this.lt()){
+case',':this.c(572);continue
+case'}':this.s=574;continue
 default:this.e();continue
 }
-case 572:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query[$.clause] ); }continue
+case 574:if(this.m(0,'}')){this.afterBrace(); this.finalizeDictOrArray( $.query[$.clause] ); }continue
 default:return this.exit_()
 }
 }
 selectItemDef($,$next){
 let art=new XsnArtifact()
 let expr;let e;let target;let cond;let assoc;let card;let _
-this.rule_(574,$next)
+this.rule_(576,$next)
 { $.columns.push( art );
 this.docComment( art ); }
 for(;;)switch(this.s){
-case 574:switch(this.lt()){
-case'@':this.annoAssignCol({art},574);continue
-default:this.s=575;continue
-}
-case 575:switch(this.l()){
-case'virtual':if(this.ck(576)){ art.virtual = this.valueWithLocation( true ); }continue
-default:this.s=576;continue
+case 576:switch(this.lt()){
+case'@':this.annoAssignCol({art},576);continue
+default:this.s=577;continue
 }
-case 576:this.s=577;{this.columnExpr('key')}continue;
 case 577:switch(this.l()){
-case'key':if(this.ck(578)){ art.key = this.valueWithLocation( true ); }continue
+case'virtual':if(this.ck(578)){ art.virtual = this.valueWithLocation( true ); }continue
 default:this.s=578;continue
 }
-case 578:switch(this.l()){
-case'#':case'(':case'+':case'-':case':':case'?':case'new':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression(_={},579)){expr=_.expr; art.value = expr; }continue
-case'Id':if(this.valuePath(_={},581)){expr=_.expr; expr = this.valuePathAst( expr ); art.value = expr; }continue
-case'{':this.nestedSelectItemsList({query:art,clause:'expand'},592);continue
-default:this.e();continue
-}
+case 578:this.s=579;{this.columnExpr('key')}continue;
 case 579:switch(this.l()){
-case'as':this.ck(580);continue
-case'Id':if(this.ci(589,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
-default:this.s=589;continue
+case'key':if(this.ck(580)){ art.key = this.valueWithLocation( true ); }continue
+default:this.s=580;continue
+}
+case 580:switch(this.l()){
+case'#':case'(':case'+':case'-':case':':case'?':case'new':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression(_={},581)){expr=_.expr; art.value = expr; }continue
+case'Id':if(this.valuePath(_={},583)){expr=_.expr; expr = this.valuePathAst( expr ); art.value = expr; }continue
+case'{':this.nestedSelectItemsList({query:art,clause:'expand'},594);continue
+default:this.e();continue
 }
-case 580:if(this.mi(589,'ItemAlias')){ art.name = this.identAst(); }continue
 case 581:switch(this.l()){
-case'over':if(this.ck(582)){ this.pushXprToken( expr.suffix = [] ); }continue
-case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },584,664)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
-case'as':this.ck(586);continue
-case'Id':if(this.ci(589,'ItemAlias')){this.nestedExpand(); art.name = this.fragileAlias( true ); }continue
-case'.':if(this.c(587)){ this.reportUnexpectedSpace( this.lb(), this.la().location, true );
+case'as':this.ck(582);continue
+case'Id':if(this.ci(591,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
+default:this.s=591;continue
+}
+case 582:if(this.mi(591,'ItemAlias')){ art.name = this.identAst(); }continue
+case 583:switch(this.l()){
+case'over':if(this.ck(584)){ this.pushXprToken( expr.suffix = [] ); }continue
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },586,666)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
+case'as':this.ck(588);continue
+case'Id':if(this.ci(591,'ItemAlias')){this.nestedExpand(); art.name = this.fragileAlias( true ); }continue
+case'.':if(this.c(589)){ this.reportUnexpectedSpace( this.lb(), this.la().location, true );
 this.reportExpandInline( art, $.sqlStyle, true ); }continue
-default:this.s=589;{this.nestedExpand(); this.virtualOrImplicit( art ); }continue
-}
-case 582:this.overClause({outer:expr.suffix},583);continue
-case 583:switch(this.lk()){
-case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },584,664)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
-default:this.s=584;continue
-}
-case 584:switch(this.l()){
-case'as':this.ck(585);continue
-case'Id':if(this.ci(589,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
-default:this.s=589;continue
-}
-case 585:if(this.mi(589,'ItemAlias')){ art.name = this.identAst(); }continue
-case 586:if(this.mi(589,'ItemAlias')){this.nestedExpand(); art.name = this.identAst(); }continue
-case 587:switch(this.lt()){
-case'{':this.nestedSelectItemsList({query:art,clause:'inline'},588);continue
+default:this.s=591;{this.nestedExpand(); this.virtualOrImplicit( art ); }continue
+}
+case 584:this.overClause({outer:expr.suffix},585);continue
+case 585:switch(this.lk()){
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },586,666)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
+default:this.s=586;continue
+}
+case 586:switch(this.l()){
+case'as':this.ck(587);continue
+case'Id':if(this.ci(591,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
+default:this.s=591;continue
+}
+case 587:if(this.mi(591,'ItemAlias')){ art.name = this.identAst(); }continue
+case 588:if(this.mi(591,'ItemAlias')){this.nestedExpand(); art.name = this.identAst(); }continue
+case 589:switch(this.lt()){
+case'{':this.nestedSelectItemsList({query:art,clause:'inline'},590);continue
 case'*':if(this.c(0)){ art.inline = [ this.valueWithLocation() ]; }continue
 default:this.e();continue
 }
-case 588:switch(this.lk()){
+case 590:switch(this.lk()){
 case'excluding':this.excludingClause({query:art},0);continue
 default:this.gr([',']);continue
 }
-case 589:switch(this.l()){
-case'{':this.s=590;{ if (!this.nestedExpand(0,true)) this.reportExpandInline( art, $.sqlStyle, false ); }continue
-default:this.s=595;continue
+case 591:switch(this.l()){
+case'{':this.s=592;{ if (!this.nestedExpand(0,true)) this.reportExpandInline( art, $.sqlStyle, false ); }continue
+default:this.s=597;continue
+}
+case 592:this.nestedSelectItemsList({query:art,clause:'expand'},593);continue
+case 593:switch(this.lk()){
+case'excluding':this.excludingClause({query:art},597);continue
+default:this.s=597;continue
 }
-case 590:this.nestedSelectItemsList({query:art,clause:'expand'},591);continue
-case 591:switch(this.lk()){
+case 594:switch(this.lk()){
 case'excluding':this.excludingClause({query:art},595);continue
 default:this.s=595;continue
 }
-case 592:switch(this.lk()){
-case'excluding':this.excludingClause({query:art},593);continue
-default:this.s=593;continue
+case 595:this.mk(596,'as');continue
+case 596:if(this.mi(597,'ItemAlias')){ art.name = this.identAst(); }continue
+case 597:this.s=598;{this.columnExpr(); this.docComment( art ); }continue
+case 598:switch(this.lt()){
+case'@':this.annoAssignMid({art},598);continue
+default:this.s=599;continue
 }
-case 593:this.mk(594,'as');continue
-case 594:if(this.mi(595,'ItemAlias')){ art.name = this.identAst(); }continue
-case 595:this.s=596;{this.columnExpr(); this.docComment( art ); }continue
-case 596:switch(this.lt()){
-case'@':this.annoAssignMid({art},596);continue
-default:this.s=597;continue
-}
-case 597:switch(this.lt()){
-case':':this.c(598);continue
+case 599:switch(this.lt()){
+case':':this.c(600);continue
 default:this.gr([',']);continue
 }
-case 598:switch(this.l()){
-case'Id':case'{':this.typeExpression({art},611);continue
-case'redirected':this.ck(599);continue
-case'association':if(this.ck(603)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
-case'composition':if(this.ck(605)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
+case 600:switch(this.l()){
+case'Id':case'{':this.typeExpression({art},613);continue
+case'redirected':this.ck(601);continue
+case'association':if(this.ck(605)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
+case'composition':if(this.ck(607)){assoc=this.lb(); this.associationInSelectItem( art ); }continue
 default:this.e();continue
 }
-case 599:this.mk(600,'to');continue
-case 600:if(this.simplePath(_={category:'artref'},601)){target=_.ref; art.target = target; }continue
-case 601:switch(this.lk()){
-case'on':this.ck(602);continue
-case'{':this.foreignKeysBlock({art},611);continue
-default:this.s=611;continue
-}
-case 602:if(this.condition(_={},611)){cond=_.expr; art.on = cond; }continue
-case 603:switch(this.lt()){
-case'[':this.cardinality({art},604);continue
-default:this.s=604;continue
+case 601:this.mk(602,'to');continue
+case 602:if(this.simplePath(_={category:'artref'},603)){target=_.ref; art.target = target; }continue
+case 603:switch(this.lk()){
+case'on':this.ck(604);continue
+case'{':this.foreignKeysBlock({art},613);continue
+default:this.s=613;continue
 }
-case 604:this.mk(607,'to');continue
+case 604:if(this.condition(_={},613)){cond=_.expr; art.on = cond; }continue
 case 605:switch(this.lt()){
 case'[':this.cardinality({art},606);continue
 default:this.s=606;continue
 }
-case 606:this.mk(607,'of');continue
-case 607:switch(this.l()){
-case'one':case'many':if(this.ck(608))card=this.lb();continue
+case 606:this.mk(609,'to');continue
+case 607:switch(this.lt()){
+case'[':this.cardinality({art},608);continue
 default:this.s=608;continue
 }
-case 608:if(this.simplePath(_={category:'artref'},609)){target=_.ref; this.setAssocAndComposition( art, assoc, card, target ); }continue
-case 609:this.mk(610,'on');continue
-case 610:if(this.condition(_={},611)){expr=_.expr; art.on = expr; }continue
-case 611:this.s=612;{ this.docComment( art ); }continue
-case 612:switch(this.lt()){
-case'@':this.annoAssignStd({art},612);continue
+case 608:this.mk(609,'of');continue
+case 609:switch(this.l()){
+case'one':case'many':if(this.ck(610))card=this.lb();continue
+default:this.s=610;continue
+}
+case 610:if(this.simplePath(_={category:'artref'},611)){target=_.ref; this.setAssocAndComposition( art, assoc, card, target ); }continue
+case 611:this.mk(612,'on');continue
+case 612:if(this.condition(_={},613)){expr=_.expr; art.on = expr; }continue
+case 613:this.s=614;{ this.docComment( art ); }continue
+case 614:switch(this.lt()){
+case'@':this.annoAssignStd({art},614);continue
 default:this.gr([',']);continue
 }
 default:
@@ -3740,18 +3750,18 @@ return this.exit_()
 }
 }
 queryClauses($,$next){
-this.rule_(614,$next)
+this.rule_(616,$next)
 for(;;)switch(this.s){
-case 614:switch(this.lk()){
-case'columns':this.ck(615);continue
-default:this.s=616;continue
-}
-case 615:this.selectItemsList({query:$.query,start:this.lb()},616);continue
 case 616:switch(this.lk()){
-case'group':case'where':case'having':this.whereGroupByHaving($,617);continue
-default:this.s=617;continue
+case'columns':this.ck(617);continue
+default:this.s=618;continue
 }
-case 617:switch(this.lk()){
+case 617:this.selectItemsList({query:$.query,start:this.lb()},618);continue
+case 618:switch(this.lk()){
+case'group':case'where':case'having':this.whereGroupByHaving($,619);continue
+default:this.s=619;continue
+}
+case 619:switch(this.lk()){
 case'limit':case'order':this.orderByLimitOffset($,0);continue
 default:this.gr([';']);continue
 }
@@ -3760,90 +3770,90 @@ default:return this.exit_()
 }
 whereGroupByHaving($,$next){
 let cond;let _
-this.rule_(619,$next)
+this.rule_(621,$next)
 for(;;)switch(this.s){
-case 619:switch(this.lk()){
-case'where':this.ck(620);continue
-default:this.s=621;continue
-}
-case 620:if(this.condition(_={},621)){cond=_.expr; $.query.where = cond; }continue
 case 621:switch(this.lk()){
-case'group':this.groupByClause($,622);continue
-default:this.s=622;continue
+case'where':this.ck(622);continue
+default:this.s=623;continue
 }
-case 622:switch(this.lk()){
-case'having':this.ck(623);continue
+case 622:if(this.condition(_={},623)){cond=_.expr; $.query.where = cond; }continue
+case 623:switch(this.lk()){
+case'group':this.groupByClause($,624);continue
+default:this.s=624;continue
+}
+case 624:switch(this.lk()){
+case'having':this.ck(625);continue
 default:this.gr(['limit','order']);continue
 }
-case 623:if(this.condition(_={},0)){cond=_.expr; $.query.having = cond; }continue
+case 625:if(this.condition(_={},0)){cond=_.expr; $.query.having = cond; }continue
 default:return this.exit_()
 }
 }
 groupByClause($,$next){
 let expr;let _
-this.rule_(625,$next)
+this.rule_(627,$next)
 for(;;)switch(this.s){
-case 625:this.mk(626,'group');continue
-case 626:this.mk(627,'by');continue
-case 627:if(this.expression(_={},628)){expr=_.expr; $.query.groupBy = [ expr ]; }continue
-case 628:switch(this.lt()){
-case',':this.c(629);continue
+case 627:this.mk(628,'group');continue
+case 628:this.mk(629,'by');continue
+case 629:if(this.expression(_={},630)){expr=_.expr; $.query.groupBy = [ expr ]; }continue
+case 630:switch(this.lt()){
+case',':this.c(631);continue
 default:this.gr(['limit','order','having']);continue
 }
-case 629:if(this.expression(_={},628)){expr=_.expr; $.query.groupBy.push( expr ); }continue
+case 631:if(this.expression(_={},630)){expr=_.expr; $.query.groupBy.push( expr ); }continue
 default:return this.exit_()
 }
 }
 orderByLimitOffset($,$next){
 let expr;let _
-this.rule_(631,$next)
+this.rule_(633,$next)
 for(;;)switch(this.s){
-case 631:switch(this.lk()){
-case'order':this.orderByClause($,632);continue
-default:this.s=632;continue
+case 633:switch(this.lk()){
+case'order':this.orderByClause($,634);continue
+default:this.s=634;continue
 }
-case 632:switch(this.lk()){
-case'limit':this.ck(633);continue
+case 634:switch(this.lk()){
+case'limit':this.ck(635);continue
 default:this.gr();continue
 }
-case 633:if(this.expression(_={},634)){expr=_.expr; $.query.limit = { rows: expr }; }continue
-case 634:switch(this.lk()){
-case'offset':this.ck(635);continue
+case 635:if(this.expression(_={},636)){expr=_.expr; $.query.limit = { rows: expr }; }continue
+case 636:switch(this.lk()){
+case'offset':this.ck(637);continue
 default:this.gr();continue
 }
-case 635:if(this.expression(_={},0)){expr=_.expr; $.query.limit.offset = expr; }continue
+case 637:if(this.expression(_={},0)){expr=_.expr; $.query.limit.offset = expr; }continue
 default:return this.exit_()
 }
 }
 orderByClause($,$next){
 let expr;let _
-this.rule_(637,$next)
+this.rule_(639,$next)
 for(;;)switch(this.s){
-case 637:this.mk(638,'order');continue
-case 638:this.mk(639,'by');continue
-case 639:if(this.orderByExpression(_={},640)){expr=_.expr; $.query.orderBy = [ expr ]; }continue
-case 640:switch(this.lt()){
-case',':this.c(641);continue
+case 639:this.mk(640,'order');continue
+case 640:this.mk(641,'by');continue
+case 641:if(this.orderByExpression(_={},642)){expr=_.expr; $.query.orderBy = [ expr ]; }continue
+case 642:switch(this.lt()){
+case',':this.c(643);continue
 default:this.gr(['limit']);continue
 }
-case 641:if(this.orderByExpression(_={},640)){expr=_.expr; $.query.orderBy.push( expr ); }continue
+case 643:if(this.orderByExpression(_={},642)){expr=_.expr; $.query.orderBy.push( expr ); }continue
 default:return this.exit_()
 }
 }
 orderByExpression($,$next){
 $.expr??=undefined
-this.rule_(643,$next)
+this.rule_(645,$next)
 for(;;)switch(this.s){
-case 643:this.expression($,644);continue
-case 644:switch(this.lk()){
-case'asc':case'desc':if(this.ck(645)){ $.expr.sort = this.valueWithLocation(); }continue
-default:this.s=645;continue
+case 645:this.expression($,646);continue
+case 646:switch(this.lk()){
+case'asc':case'desc':if(this.ck(647)){ $.expr.sort = this.valueWithLocation(); }continue
+default:this.s=647;continue
 }
-case 645:switch(this.lk()){
-case'nulls':this.ck(646);continue
+case 647:switch(this.lk()){
+case'nulls':this.ck(648);continue
 default:this.gr([',','limit']);continue
 }
-case 646:switch(this.lk()){
+case 648:switch(this.lk()){
 case'last':case'first':if(this.ck(0)){ $.expr.nulls = this.valueWithLocation(); }continue
 default:this.e();continue
 }
@@ -3853,113 +3863,113 @@ default:return this.exit_()
 conditionEOF($,$next){
 $.cond??=undefined
 let _
-this.rule_(648,$next)
+this.rule_(650,$next)
 for(;;)switch(this.s){
-case 648:if(this.expression(_={},649))$.cond=_.expr;continue
-case 649:this.m(0,'EOF');continue
+case 650:if(this.expression(_={},651))$.cond=_.expr;continue
+case 651:this.m(0,'EOF');continue
 default:return this.exit_()
 }
 }
 condition($,$next){
 $.expr??=undefined
-this.rule_(651,$next)
+this.rule_(653,$next)
 for(;;)switch(this.s){
-case 651:this.expression($,0);continue
+case 653:this.expression($,0);continue
 default:return this.exit_()
 }
 }
 expression($,$next,$startState){
 $.expr??={}
 let e;let open;let _
-this.rule_($startState??653,$next)
+this.rule_($startState??655,$next)
 for(;;)switch(this.s){
-case 653:switch(this.l()){
-case'(':if(this.expressionOrQueryParens($,664)){ $.expr = this.taggedIfQuery( $.expr ); }continue
-case'#':case'null':case'true':case'false':case'Number':case'String':case'QuotedLiteral':this.literalValue($,664);continue
-case':':if(this.c(654)){ this.reportUnexpectedSpace(); }continue
-case'?':if(this.c(664)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
+case 655:switch(this.l()){
+case'(':if(this.expressionOrQueryParens($,666)){ $.expr = this.taggedIfQuery( $.expr ); }continue
+case'#':case'null':case'true':case'false':case'Number':case'String':case'QuotedLiteral':this.literalValue($,666);continue
+case':':if(this.c(656)){ this.reportUnexpectedSpace(); }continue
+case'?':if(this.c(666)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
 $.expr = this.attachLocation({ param: this.valueWithLocation(), scope: 'param' }); }continue
-case'Id':if(this.valuePath(_={},656)){e=_.expr; $.expr = this.valuePathAst( e ); }continue
-case'new':if(this.ck(659)){ $.expr = this.applyOpToken(); }continue
-case'exists':if(this.ck(660)){ $.expr = this.applyOpToken(); }continue
-case'case':this.caseExpression($,664);continue
-case'cast':this.castFunction($,664);continue
-case'+':case'-':if(this.c(663)){ $.expr = this.applyOpToken(); }continue
-case'not':if(this.ck(663)){ $.expr = this.applyOpToken(); }continue
+case'Id':if(this.valuePath(_={},658)){e=_.expr; $.expr = this.valuePathAst( e ); }continue
+case'new':if(this.ck(661)){ $.expr = this.applyOpToken(); }continue
+case'exists':if(this.ck(662)){ $.expr = this.applyOpToken(); }continue
+case'case':this.caseExpression($,666);continue
+case'cast':this.castFunction($,666);continue
+case'+':case'-':if(this.c(665)){ $.expr = this.applyOpToken(); }continue
+case'not':if(this.ck(665)){ $.expr = this.applyOpToken(); }continue
 default:this.e();continue
 }
-case 654:switch(this.lt()){
-case'Id':if(this.cy(655,'paramref')){ $.expr = { path: [ this.identAst() ], location: this.startLocation(), scope: 'param' }; }continue
-case'Number':if(this.c(664)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'positional', code: ':' + this.lb().text } );
+case 656:switch(this.lt()){
+case'Id':if(this.cy(657,'paramref')){ $.expr = { path: [ this.identAst() ], location: this.startLocation(), scope: 'param' }; }continue
+case'Number':if(this.c(666)){ 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 655:switch(this.lt()){
-case'.':if(this.valuePath($,664,683)){ $.expr = this.valuePathAst( $.expr ); }continue
-default:this.s=664;{ this.attachLocation( $.expr ); }continue
+case 657:switch(this.lt()){
+case'.':if(this.valuePath($,666,685)){ $.expr = this.valuePathAst( $.expr ); }continue
+default:this.s=666;{ this.attachLocation( $.expr ); }continue
 }
-case 656:switch(this.lk()){
-case'over':if(this.ck(657)){ this.pushXprToken( $.expr.suffix = [] ); }continue
-default:this.s=658;continue
+case 658:switch(this.lk()){
+case'over':if(this.ck(659)){ this.pushXprToken( $.expr.suffix = [] ); }continue
+default:this.s=660;continue
 }
-case 657:this.overClause(e={outer:$.expr.suffix},658);continue
-case 658:this.s=664;{ this.attachLocation( $.expr ); }continue
-case 659:if(this.valuePath(_={},664)){e=_.expr; this.valuePathAstWithNew( $.expr, e ); }continue
-case 660:switch(this.lt()){
-case'(':if(this.c(661))open=this.lb();continue
-case'Id':if(this.valuePath(_={},664)){e=_.expr; e = this.valuePathAst( e ); e.$syntax = 'after-exists';
+case 659:this.overClause(e={outer:$.expr.suffix},660);continue
+case 660:this.s=666;{ this.attachLocation( $.expr ); }continue
+case 661:if(this.valuePath(_={},666)){e=_.expr; this.valuePathAstWithNew( $.expr, e ); }continue
+case 662:switch(this.lt()){
+case'(':if(this.c(663))open=this.lb();continue
+case'Id':if(this.valuePath(_={},666)){e=_.expr; e = this.valuePathAst( e ); e.$syntax = 'after-exists';
 $.expr.args.push( e ); this.attachLocation( $.expr ); }continue
-case'?':if(this.c(664)){ this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
+case'?':if(this.c(666)){ 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 661:if(this.queryExpression(_={},662))e=_.expr;continue
-case 662:if(this.m(664,')')){ $.expr.args.push( this.taggedIfQuery( this.surroundByParens( e, open ) ) );
+case 663:if(this.queryExpression(_={},664))e=_.expr;continue
+case 664:if(this.m(666,')')){ $.expr.args.push( this.taggedIfQuery( this.surroundByParens( e, open ) ) );
 this.attachLocation( $.expr ); }continue
-case 663:if(this.expression(_={},664)){e=_.expr; $.expr = this.signedExpression( $.expr, e ); }continue
-case 664:switch(this.l()){
-case'*':case'/':if(this.c(668)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'+':case'-':if(this.c(668)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'||':if(this.c(668)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'and':if(this.ck(668)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'or':if(this.ck(668)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'?':if(this.c(665)){ $.expr = this.applyOpToken( $.expr, '?:' ); }continue
-case'<':case'=':case'>':case'!=':case'<=':case'<>':case'>=':if(this.c(667)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'==':if(this.c(668)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'is':if(this.ck(669)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'not':if(this.ck(671)){ $.expr = this.applyOpToken( $.expr ); }continue
-case'in':case'like':case'between':this.s=671;{ $.expr = { op: { val: 'ixpr', location: this.la().location }, args: [ $.expr ] }; }continue
+case 665:if(this.expression(_={},666)){e=_.expr; $.expr = this.signedExpression( $.expr, e ); }continue
+case 666:switch(this.l()){
+case'*':case'/':if(this.c(670)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'+':case'-':if(this.c(670)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'||':if(this.c(670)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'and':if(this.ck(670)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'or':if(this.ck(670)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
+case'?':if(this.c(667)){ $.expr = this.applyOpToken( $.expr, '?:' ); }continue
+case'<':case'=':case'>':case'!=':case'<=':case'<>':case'>=':if(this.c(669)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'==':if(this.c(670)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'is':if(this.ck(671)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'not':if(this.ck(673)){ $.expr = this.applyOpToken( $.expr ); }continue
+case'in':case'like':case'between':this.s=673;{ $.expr = { op: { val: 'ixpr', location: this.la().location }, args: [ $.expr ] }; }continue
 default:this.gr();continue
 }
-case 665:if(this.expression(_={},666)){e=_.expr; $.expr.args.push( e ); }continue
-case 666:if(this.m(668,':')){ this.pushXprToken( $.expr ); }continue
-case 667:switch(this.l()){
-case'all':case'any':case'some':if(this.ck(668)){ this.pushXprToken( $.expr ); }continue
-default:this.s=668;continue
-}
-case 668:if(this.expression(_={},679)){e=_.expr; $.expr.args.push( e ); }continue
-case 669:switch(this.lk()){
-case'not':if(this.ck(670)){ this.pushXprToken( $.expr ); }continue
+case 667:if(this.expression(_={},668)){e=_.expr; $.expr.args.push( e ); }continue
+case 668:if(this.m(670,':')){ this.pushXprToken( $.expr ); }continue
+case 669:switch(this.l()){
+case'all':case'any':case'some':if(this.ck(670)){ this.pushXprToken( $.expr ); }continue
 default:this.s=670;continue
 }
-case 670:if(this.mk(679,'null')){ this.pushXprToken( $.expr ); }continue
+case 670:if(this.expression(_={},681)){e=_.expr; $.expr.args.push( e ); }continue
 case 671:switch(this.lk()){
-case'between':if(this.ck(672)){ this.pushXprToken( $.expr ); }continue
-case'in':if(this.ck(675)){ this.pushXprToken( $.expr ); }continue
-case'like':if(this.ck(676)){ this.pushXprToken( $.expr ); }continue
+case'not':if(this.ck(672)){ this.pushXprToken( $.expr ); }continue
+default:this.s=672;continue
+}
+case 672:if(this.mk(681,'null')){ this.pushXprToken( $.expr ); }continue
+case 673:switch(this.lk()){
+case'between':if(this.ck(674)){ this.pushXprToken( $.expr ); }continue
+case'in':if(this.ck(677)){ this.pushXprToken( $.expr ); }continue
+case'like':if(this.ck(678)){ this.pushXprToken( $.expr ); }continue
 default:this.e();continue
 }
-case 672:if(this.expression(_={},673)){e=_.expr; $.expr.args?.push( e ); }continue
-case 673:if(this.mk(674,'and')){ this.pushXprToken( $.expr ); }continue
-case 674:if(this.expression(_={},679)){e=_.expr; $.expr.args?.push( e ); }continue
-case 675:if(this.expression(_={},679)){e=_.expr; $.expr.args?.push( this.secureParens( e ) ); }continue
-case 676:if(this.expression(_={},677)){e=_.expr; $.expr.args?.push( e ); }continue
-case 677:switch(this.lk()){
-case'escape':if(this.ck(678)){ this.pushXprToken( $.expr ); }continue
-default:this.s=679;continue
-}
+case 674:if(this.expression(_={},675)){e=_.expr; $.expr.args?.push( e ); }continue
+case 675:if(this.mk(676,'and')){ this.pushXprToken( $.expr ); }continue
+case 676:if(this.expression(_={},681)){e=_.expr; $.expr.args?.push( e ); }continue
+case 677:if(this.expression(_={},681)){e=_.expr; $.expr.args?.push( this.secureParens( e ) ); }continue
 case 678:if(this.expression(_={},679)){e=_.expr; $.expr.args?.push( e ); }continue
-case 679:this.s=664;{ this.attachLocation( $.expr ); }continue
+case 679:switch(this.lk()){
+case'escape':if(this.ck(680)){ this.pushXprToken( $.expr ); }continue
+default:this.s=681;continue
+}
+case 680:if(this.expression(_={},681)){e=_.expr; $.expr.args?.push( e ); }continue
+case 681:this.s=666;{ this.attachLocation( $.expr ); }continue
 default:
 if (this.s == null) this.attachLocation( $.expr )
 return this.exit_()
@@ -3968,21 +3978,21 @@ return this.exit_()
 valuePath($,$next,$startState){
 $.expr??={ path: [] }
 let pathItem
-this.rule_($startState??681,$next)
+this.rule_($startState??683,$next)
 for(;;)switch(this.s){
-case 681:if(this.mi(682,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
-case 682:switch(this.lt()){
-case'(':case'[':this.argumentsAndFilter({pathStep:pathItem},683);continue
-default:this.s=683;continue
+case 683:if(this.mi(684,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
+case 684:switch(this.lt()){
+case'(':case'[':this.argumentsAndFilter({pathStep:pathItem},685);continue
+default:this.s=685;continue
 }
-case 683:switch(this.l()){
-case'.':this.c(684);continue
+case 685:switch(this.l()){
+case'.':this.c(686);continue
 default:this.gr(['*','+','-','/','<','=','>','?','!=','<=','<>','==','>=','in','is','or','||','and','not','like','between']);continue
 }
-case 684:if(this.my(685,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
-case 685:switch(this.lt()){
-case'(':case'[':if(this.argumentsAndFilter({pathStep:pathItem},683)){ pathItem = null; }continue
-default:this.s=683;continue
+case 686:if(this.my(687,'ref')){ $.expr.path.push( pathItem = this.identAst() ); }continue
+case 687:switch(this.lt()){
+case'(':case'[':if(this.argumentsAndFilter({pathStep:pathItem},685)){ pathItem = null; }continue
+default:this.s=685;continue
 }
 default:
 this.attachLocation( $.expr )
@@ -3991,48 +4001,48 @@ return this.exit_()
 }
 expressionOrQueryParens($,$next){
 $.expr??=undefined
-this.rule_(687,$next)
+this.rule_(689,$next)
 for(;;)switch(this.s){
-case 687:if(this.m(688,'(')){this.queryOnLeft()}continue;
-case 688:switch(this.l()){
-case'(':this.expressionOrQueryParens($,689);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($,691)){this.queryOnLeft('expr')}continue;
-case'select':this.queryExpression($,692);continue
+case 689:if(this.m(690,'(')){this.queryOnLeft()}continue;
+case 690:switch(this.l()){
+case'(':this.expressionOrQueryParens($,691);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($,693)){this.queryOnLeft('expr')}continue;
+case'select':this.queryExpression($,694);continue
 default:this.e();continue
 }
-case 689:switch(this.l()){
-case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(( $.expr = this.taggedIfQuery( $.expr ), $ ),690,664)){this.queryOnLeft('expr')}continue;
-case',':if(this.continueExpressionslist($,692)){this.queryOnLeft('expr')}continue;
-case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.queryExpression($,692,464);continue
-default:this.s=692;continue
+case 691:switch(this.l()){
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(( $.expr = this.taggedIfQuery( $.expr ), $ ),692,666)){this.queryOnLeft('expr')}continue;
+case',':if(this.continueExpressionslist($,694)){this.queryOnLeft('expr')}continue;
+case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.queryExpression($,694,464);continue
+default:this.s=694;continue
 }
-case 690:switch(this.lt()){
-case',':this.continueExpressionslist($,692);continue
-default:this.s=692;continue
+case 692:switch(this.lt()){
+case',':this.continueExpressionslist($,694);continue
+default:this.s=694;continue
 }
-case 691:switch(this.lt()){
-case',':this.continueExpressionslist($,692);continue
-default:this.s=692;continue
+case 693:switch(this.lt()){
+case',':this.continueExpressionslist($,694);continue
+default:this.s=694;continue
 }
-case 692:if(this.m(0,')')){ if ($.expr.op?.val !== 'list' || $.expr.location) this.surroundByParens( $.expr ); else this.attachLocation( $.expr ); }continue
+case 694:if(this.m(0,')')){ if ($.expr.op?.val !== 'list' || $.expr.location) this.surroundByParens( $.expr ); else this.attachLocation( $.expr ); }continue
 default:return this.exit_()
 }
 }
 continueExpressionslist($,$next){
 let e;let _
-this.rule_(694,$next)
+this.rule_(696,$next)
 for(;;)switch(this.s){
-case 694:if(this.m(695,',')){ $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: null }; }continue
-case 695:switch(this.l()){
-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=696;continue
+case 696:if(this.m(697,',')){ $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: null }; }continue
+case 697:switch(this.l()){
+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=698;continue
 default:this.e();continue
 }
-case 696:switch(this.lt()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},697)){e=_.expr; $.expr.args.push( e ); }continue
+case 698:switch(this.lt()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},699)){e=_.expr; $.expr.args.push( e ); }continue
 default:this.gr([')']);continue
 }
-case 697:switch(this.lt()){
-case',':this.c(696);continue
+case 699:switch(this.lt()){
+case',':this.c(698);continue
 default:this.gr([')']);continue
 }
 default:return this.exit_()
@@ -4041,30 +4051,30 @@ default:return this.exit_()
 caseExpression($,$next){
 $.expr??=undefined
 let e;let _
-this.rule_(699,$next)
+this.rule_(701,$next)
 for(;;)switch(this.s){
-case 699:if(this.mk(700,'case')){ $.expr.op = { val: 'ixpr', location: this.lb().location }; $.expr.args = []; this.pushXprToken( $.expr ); }continue
-case 700:switch(this.l()){
-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(_={},701)){e=_.expr; $.expr.args.push( e ); }continue
-default:this.s=701;continue
+case 701:if(this.mk(702,'case')){ $.expr.op = { val: 'ixpr', location: this.lb().location }; $.expr.args = []; this.pushXprToken( $.expr ); }continue
+case 702:switch(this.l()){
+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(_={},703)){e=_.expr; $.expr.args.push( e ); }continue
+default:this.s=703;continue
 }
-case 701:switch(this.lk()){
-case'when':this.s=702;continue
+case 703:switch(this.lk()){
+case'when':this.s=704;continue
 default:this.e();continue
 }
-case 702:switch(this.lk()){
-case'when':if(this.ck(703)){ this.pushXprToken( $.expr ); }continue
-default:this.s=706;continue
-}
-case 703:if(this.expression(_={},704)){e=_.expr; $.expr.args.push( e ); }continue
-case 704:if(this.mk(705,'then')){ this.pushXprToken( $.expr ); }continue
-case 705:if(this.expression(_={},702)){e=_.expr; $.expr.args.push( e ); }continue
-case 706:switch(this.lk()){
-case'else':if(this.ck(707)){ this.pushXprToken( $.expr ); }continue
+case 704:switch(this.lk()){
+case'when':if(this.ck(705)){ this.pushXprToken( $.expr ); }continue
 default:this.s=708;continue
 }
-case 707:if(this.expression(_={},708)){e=_.expr; $.expr.args.push( e ); }continue
-case 708:if(this.mk(0,'end')){ this.pushXprToken( $.expr ); }continue
+case 705:if(this.expression(_={},706)){e=_.expr; $.expr.args.push( e ); }continue
+case 706:if(this.mk(707,'then')){ this.pushXprToken( $.expr ); }continue
+case 707:if(this.expression(_={},704)){e=_.expr; $.expr.args.push( e ); }continue
+case 708:switch(this.lk()){
+case'else':if(this.ck(709)){ this.pushXprToken( $.expr ); }continue
+default:this.s=710;continue
+}
+case 709:if(this.expression(_={},710)){e=_.expr; $.expr.args.push( e ); }continue
+case 710:if(this.mk(0,'end')){ this.pushXprToken( $.expr ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -4073,14 +4083,14 @@ return this.exit_()
 castFunction($,$next){
 $.expr??=undefined
 let arg;let _
-this.rule_(710,$next)
+this.rule_(712,$next)
 for(;;)switch(this.s){
-case 710:if(this.mk(711,'cast')){ $.expr.op = this.valueWithLocation(); }continue
-case 711:if(this.m(712,'(')){ $.expr.args = this.createArray(); }continue
-case 712:if(this.expression(_={},713)){arg=_.expr; $.expr.args?.push( arg ); }continue
-case 713:this.mk(714,'as');continue
-case 714:this.typeRefOptArgs({art:$.expr},715);continue
-case 715:if(this.m(0,')')){ this.finalizeDictOrArray( $.expr.args ); }continue
+case 712:if(this.mk(713,'cast')){ $.expr.op = this.valueWithLocation(); }continue
+case 713:if(this.m(714,'(')){ $.expr.args = this.createArray(); }continue
+case 714:if(this.expression(_={},715)){arg=_.expr; $.expr.args?.push( arg ); }continue
+case 715:this.mk(716,'as');continue
+case 716:this.typeRefOptArgs({art:$.expr},717);continue
+case 717:if(this.m(0,')')){ this.finalizeDictOrArray( $.expr.args ); }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
@@ -4088,67 +4098,67 @@ return this.exit_()
 }
 argumentsAndFilter($,$next){
 let open;let id;let expr;let _
-this.rule_(717,$next)
+this.rule_(719,$next)
 for(;;)switch(this.s){
-case 717:switch(this.lt()){
-case'(':if(this.c(718)){open=this.lb();this.prepareSpecialFunction(); $.pathStep.args = this.createArray(); }continue
-default:this.s=736;continue
+case 719:switch(this.lt()){
+case'(':if(this.c(720)){open=this.lb();this.prepareSpecialFunction(); $.pathStep.args = this.createArray(); }continue
+default:this.s=738;continue
 }
-case 718:switch(this.l()){
-case')':this.s=735;continue
-case'Id':if(this.cy(719,'paramname'))id=this.lb();continue
-default:this.s=728;continue
+case 720:switch(this.l()){
+case')':this.s=737;continue
+case'Id':if(this.cy(721,'paramname'))id=this.lb();continue
+default:this.s=730;continue
 }
-case 719:switch(this.lt()){
-case':':if(this.c(720)){ $.pathStep.args = this.createDict( open ); $.pathStep.$syntax = ':'; }continue
-case'=>':if(this.c(724)){ $.pathStep.args = this.createDict(); }continue
+case 721:switch(this.lt()){
+case':':if(this.c(722)){ $.pathStep.args = this.createDict( open ); $.pathStep.$syntax = ':'; }continue
+case'=>':if(this.c(726)){ $.pathStep.args = this.createDict(); }continue
 default:this.e();continue
 }
-case 720:if(this.expression(_={},721)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 721:switch(this.lt()){
-case',':this.c(722);continue
-case')':this.s=735;continue
+case 722:if(this.expression(_={},723)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
+case 723:switch(this.lt()){
+case',':this.c(724);continue
+case')':this.s=737;continue
 default:this.e();continue
 }
-case 722:switch(this.lt()){
-case'Id':if(this.cy(723,'paramname'))id=this.lb();continue
-case')':this.s=735;continue
+case 724:switch(this.lt()){
+case'Id':if(this.cy(725,'paramname'))id=this.lb();continue
+case')':this.s=737;continue
 default:this.e();continue
 }
-case 723:this.m(720,':');continue
-case 724:if(this.expression(_={},725)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
-case 725:switch(this.lt()){
-case',':this.c(726);continue
-case')':this.s=735;continue
+case 725:this.m(722,':');continue
+case 726:if(this.expression(_={},727)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
+case 727:switch(this.lt()){
+case',':this.c(728);continue
+case')':this.s=737;continue
 default:this.e();continue
 }
-case 726:switch(this.lt()){
-case'Id':if(this.cy(727,'paramname'))id=this.lb();continue
-case')':this.s=735;continue
+case 728:switch(this.lt()){
+case'Id':if(this.cy(729,'paramname'))id=this.lb();continue
+case')':this.s=737;continue
 default:this.e();continue
 }
-case 727:this.m(724,'=>');continue
-case 728:if(this.funcExpression(_={},729)){expr=_.expr; $.pathStep.args.push( expr ); }continue
-case 729:switch(this.lt()){
-case',':if(this.c(730)){this.nextFunctionArgument()}continue;
-default:this.s=732;continue
+case 729:this.m(726,'=>');continue
+case 730:if(this.funcExpression(_={},731)){expr=_.expr; $.pathStep.args.push( expr ); }continue
+case 731:switch(this.lt()){
+case',':if(this.c(732)){this.nextFunctionArgument()}continue;
+default:this.s=734;continue
 }
-case 730:switch(this.lt()){
-case')':this.c(731);continue
-default:this.s=728;continue
+case 732:switch(this.lt()){
+case')':this.c(733);continue
+default:this.s=730;continue
 }
-case 731:switch(this.lt()){
+case 733:switch(this.lt()){
 case'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['*','+','-','.','/','<','=','>','?','!=','<=','<>','==','>=','in','is','or','||','and','not','like','between']);continue
 }
-case 732:switch(this.lk()){
-case'order':if(this.ck(733)){ expr = $.pathStep.args[$.pathStep.args.length - 1] = this.applyOpToken( expr ); }continue
-default:this.s=735;continue
+case 734:switch(this.lk()){
+case'order':if(this.ck(735)){ expr = $.pathStep.args[$.pathStep.args.length - 1] = this.applyOpToken( expr ); }continue
+default:this.s=737;continue
 }
-case 733:if(this.mk(734,'by')){ this.pushXprToken( expr ); }continue
-case 734:if(this.orderByClauseAsXpr({outer:expr.args},735)){ this.attachLocation( expr ); }continue
-case 735:if(this.m(736,')')){ this.finalizeDictOrArray( $.pathStep.args ); }continue
-case 736:switch(this.lt()){
+case 735:if(this.mk(736,'by')){ this.pushXprToken( expr ); }continue
+case 736:if(this.orderByClauseAsXpr({outer:expr.args},737)){ this.attachLocation( expr ); }continue
+case 737:if(this.m(738,')')){ this.finalizeDictOrArray( $.pathStep.args ); }continue
+case 738:switch(this.lt()){
 case'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['*','+','-','.','/','<','=','>','?','!=','<=','<>','==','>=','in','is','or','||','and','not','like','between']);continue
 }
@@ -4159,22 +4169,22 @@ funcExpression($,$next){
 $.expr??=undefined
 let args
 let tok;let e;let _
-this.rule_(738,$next)
+this.rule_(740,$next)
 for(;;)switch(this.s){
-case 738:switch(this.lGenericIntroOrExpr()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},740))$.expr=_.expr;continue
-case'GenericExpr':if(this.cx(740)){tok=this.lb(); $.expr = { val: tok.keyword ?? tok.type, location: tok.location, literal: 'token' }; }continue
-case'GenericIntro':if(this.cx(739)){ $.expr = this.applyOpToken(); args = $.expr.args; }continue
+case 740:switch(this.lGenericIntroOrExpr()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},742))$.expr=_.expr;continue
+case'GenericExpr':if(this.cx(742)){tok=this.lb(); $.expr = { val: tok.keyword ?? tok.type, location: tok.location, literal: 'token' }; }continue
+case'GenericIntro':if(this.cx(741)){ $.expr = this.applyOpToken(); args = $.expr.args; }continue
 default:this.e();continue
 }
-case 739:if(this.expression(_={},740)){e=_.expr; $.expr.args.push( e ); }continue
-case 740:switch(this.lGenericSeparator()){
-case'GenericSeparator':if(this.cx(741)){ if (args) this.pushXprToken( args ); else { $.expr= this.applyOpToken( $.expr ); args = $.expr.args; } }continue
+case 741:if(this.expression(_={},742)){e=_.expr; $.expr.args.push( e ); }continue
+case 742:switch(this.lGenericSeparator()){
+case'GenericSeparator':if(this.cx(743)){ if (args) this.pushXprToken( args ); else { $.expr= this.applyOpToken( $.expr ); args = $.expr.args; } }continue
 default:this.gr([')',',','order']);continue
 }
-case 741:switch(this.lGenericExpr()){
-case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},740)){e=_.expr; args.push( e ); }continue
-case'GenericExpr':if(this.cx(740)){ this.pushXprToken( args ); }continue
+case 743:switch(this.lGenericExpr()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},742)){e=_.expr; args.push( e ); }continue
+case'GenericExpr':if(this.cx(742)){ this.pushXprToken( args ); }continue
 default:this.e();continue
 }
 default:
@@ -4184,27 +4194,27 @@ return this.exit_()
 }
 overClause($,$next){
 let over=[]
-this.rule_(743,$next)
+this.rule_(745,$next)
 for(;;)switch(this.s){
-case 743:this.m(744,'(');continue
-case 744:switch(this.lk()){
-case'partition':if(this.ck(745)){ this.pushXprToken( over ); }continue
-default:this.s=747;continue
-}
-case 745:if(this.mk(746,'by')){ this.pushXprToken( over ); }continue
-case 746:this.expressionsAsXpr({outer:over},747);continue
-case 747:switch(this.lk()){
-case'order':if(this.ck(748)){ this.pushXprToken( over ); }continue
-default:this.s=750;continue
-}
-case 748:if(this.mk(749,'by')){ this.pushXprToken( over ); }continue
-case 749:this.orderByClauseAsXpr({outer:over},750);continue
-case 750:switch(this.lk()){
-case'rows':if(this.ck(751)){ this.pushXprToken( over ); }continue
+case 745:this.m(746,'(');continue
+case 746:switch(this.lk()){
+case'partition':if(this.ck(747)){ this.pushXprToken( over ); }continue
+default:this.s=749;continue
+}
+case 747:if(this.mk(748,'by')){ this.pushXprToken( over ); }continue
+case 748:this.expressionsAsXpr({outer:over},749);continue
+case 749:switch(this.lk()){
+case'order':if(this.ck(750)){ this.pushXprToken( over ); }continue
 default:this.s=752;continue
 }
-case 751:this.windowFrameClause({outer:over},752);continue
-case 752:this.m(0,')');continue
+case 750:if(this.mk(751,'by')){ this.pushXprToken( over ); }continue
+case 751:this.orderByClauseAsXpr({outer:over},752);continue
+case 752:switch(this.lk()){
+case'rows':if(this.ck(753)){ this.pushXprToken( over ); }continue
+default:this.s=754;continue
+}
+case 753:this.windowFrameClause({outer:over},754);continue
+case 754:this.m(0,')');continue
 default:
 $.outer.push( this.surroundByParens( this.ixprAst( over ) ) )
 return this.exit_()
@@ -4213,14 +4223,14 @@ return this.exit_()
 expressionsAsXpr($,$next){
 let args=[]
 let expr;let _
-this.rule_(754,$next)
+this.rule_(756,$next)
 for(;;)switch(this.s){
-case 754:if(this.expression(_={},755)){expr=_.expr; args.push( expr ); }continue
-case 755:switch(this.lt()){
-case',':if(this.c(756)){ this.pushXprToken( args ); }continue
+case 756:if(this.expression(_={},757)){expr=_.expr; args.push( expr ); }continue
+case 757:switch(this.lt()){
+case',':if(this.c(758)){ this.pushXprToken( args ); }continue
 default:this.gr([')','rows','order']);continue
 }
-case 756:if(this.expression(_={},755)){expr=_.expr; args.push( expr ); }continue
+case 758:if(this.expression(_={},757)){expr=_.expr; args.push( expr ); }continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
@@ -4228,14 +4238,14 @@ return this.exit_()
 }
 orderByClauseAsXpr($,$next){
 let args=[]
-this.rule_(758,$next)
+this.rule_(760,$next)
 for(;;)switch(this.s){
-case 758:this.orderBySpecAsXpr({args},759);continue
-case 759:switch(this.lt()){
-case',':if(this.c(760)){ this.pushXprToken( args ); }continue
+case 760:this.orderBySpecAsXpr({args},761);continue
+case 761:switch(this.lt()){
+case',':if(this.c(762)){ this.pushXprToken( args ); }continue
 default:this.gr([')']);continue
 }
-case 760:this.orderBySpecAsXpr({args},759);continue
+case 762:this.orderBySpecAsXpr({args},761);continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
@@ -4243,18 +4253,18 @@ return this.exit_()
 }
 orderBySpecAsXpr($,$next){
 let expr;let _
-this.rule_(762,$next)
+this.rule_(764,$next)
 for(;;)switch(this.s){
-case 762:if(this.expression(_={},763)){expr=_.expr; $.args.push( expr ); }continue
-case 763:switch(this.lk()){
-case'asc':case'desc':if(this.ck(764)){ this.pushXprToken( $.args ); }continue
-default:this.s=764;continue
+case 764:if(this.expression(_={},765)){expr=_.expr; $.args.push( expr ); }continue
+case 765:switch(this.lk()){
+case'asc':case'desc':if(this.ck(766)){ this.pushXprToken( $.args ); }continue
+default:this.s=766;continue
 }
-case 764:switch(this.lk()){
-case'nulls':if(this.ck(765)){ this.pushXprToken( $.args ); }continue
+case 766:switch(this.lk()){
+case'nulls':if(this.ck(767)){ this.pushXprToken( $.args ); }continue
 default:this.gr([')',',']);continue
 }
-case 765:switch(this.lk()){
+case 767:switch(this.lk()){
 case'last':case'first':if(this.ck(0)){ this.pushXprToken( $.args ); }continue
 default:this.e();continue
 }
@@ -4263,50 +4273,50 @@ default:return this.exit_()
 }
 windowFrameClause($,$next){
 let args=[]
-this.rule_(767,$next)
+this.rule_(769,$next)
 for(;;)switch(this.s){
-case 767:switch(this.lk()){
-case'unbounded':if(this.ck(768)){ this.pushXprToken( args ); }continue
-case'Number':if(this.c(768)){ args.push( this.unsignedIntegerLiteral() ); }continue
-case'current':if(this.ck(769)){ this.pushXprToken( args ); }continue
-case'between':if(this.ck(770)){ this.pushXprToken( args ); }continue
+case 769:switch(this.lk()){
+case'unbounded':if(this.ck(770)){ this.pushXprToken( args ); }continue
+case'Number':if(this.c(770)){ args.push( this.unsignedIntegerLiteral() ); }continue
+case'current':if(this.ck(771)){ this.pushXprToken( args ); }continue
+case'between':if(this.ck(772)){ this.pushXprToken( args ); }continue
 default:this.e();continue
 }
-case 768:if(this.mk(0,'preceding')){ this.pushXprToken( args ); }continue
-case 769:if(this.mk(0,'row')){ this.pushXprToken( args ); }continue
-case 770:this.windowFrameBoundSpec({args},771);continue
-case 771:if(this.mk(772,'and')){ this.pushXprToken( args ); }continue
-case 772:this.windowFrameBoundSpec({args},0);continue
+case 770:if(this.mk(0,'preceding')){ this.pushXprToken( args ); }continue
+case 771:if(this.mk(0,'row')){ this.pushXprToken( args ); }continue
+case 772:this.windowFrameBoundSpec({args},773);continue
+case 773:if(this.mk(774,'and')){ this.pushXprToken( args ); }continue
+case 774:this.windowFrameBoundSpec({args},0);continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
 }
 }
 windowFrameBoundSpec($,$next){
-this.rule_(774,$next)
+this.rule_(776,$next)
 for(;;)switch(this.s){
-case 774:switch(this.lk()){
-case'unbounded':if(this.ck(775)){ this.pushXprToken( $.args ); }continue
-case'Number':if(this.c(775)){ $.args.push( this.unsignedIntegerLiteral() ); }continue
-case'current':if(this.ck(777)){ this.pushXprToken( $.args ); }continue
+case 776:switch(this.lk()){
+case'unbounded':if(this.ck(777)){ this.pushXprToken( $.args ); }continue
+case'Number':if(this.c(777)){ $.args.push( this.unsignedIntegerLiteral() ); }continue
+case'current':if(this.ck(779)){ this.pushXprToken( $.args ); }continue
 default:this.e();continue
 }
-case 775:switch(this.lk()){
-case'following':this.ck(776);continue
-case'preceding':this.ck(776);continue
+case 777:switch(this.lk()){
+case'following':this.ck(778);continue
+case'preceding':this.ck(778);continue
 default:this.e();continue
 }
-case 776:if(this.gr()){ this.pushXprToken( $.args ); }continue
-case 777:if(this.mk(0,'row')){ this.pushXprToken( $.args ); }continue
+case 778:if(this.gr()){ this.pushXprToken( $.args ); }continue
+case 779:if(this.mk(0,'row')){ this.pushXprToken( $.args ); }continue
 default:return this.exit_()
 }
 }
 literalValue($,$next){
 $.expr??={}
-this.rule_(779,$next)
+this.rule_(781,$next)
 for(;;)switch(this.s){
-case 779:switch(this.lk()){
-case'#':if(this.c(780)){ this.reportUnexpectedSpace(); }continue
+case 781:switch(this.lk()){
+case'#':if(this.c(782)){ 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
@@ -4314,17 +4324,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 780:if(this.my(0,'enumref')){ $.expr = { literal: 'enum', sym: this.identAst() } }continue
+case 782:if(this.my(0,'enumref')){ $.expr = { literal: 'enum', sym: this.identAst() } }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
 }
 }
 annoAssignStd($,$next){
-this.rule_(782,$next)
+this.rule_(784,$next)
 for(;;)switch(this.s){
-case 782:if(this.m(783,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
-case 783:switch(this.lt()){
+case 784:if(this.m(785,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
+case 785:switch(this.lt()){
 case'(':this.annoAssignParen($,0);continue
 case'Id':this.annoAssignBase($,0);continue
 default:this.e();continue
@@ -4335,10 +4345,10 @@ return this.exit_()
 }
 }
 annoAssignCol($,$next){
-this.rule_(785,$next)
+this.rule_(787,$next)
 for(;;)switch(this.s){
-case 785:if(this.m(786,'@')){ this.reportDubiousAnnoSpacing(); }continue
-case 786:switch(this.lt()){
+case 787:if(this.m(788,'@')){ this.reportDubiousAnnoSpacing(); }continue
+case 788:switch(this.lt()){
 case'(':this.annoAssignParen($,0);continue
 case'Id':this.annoAssignBase($,0);continue
 default:this.e();continue
@@ -4350,10 +4360,10 @@ return this.exit_()
 }
 annoAssignMid($,$next){
 let name;let _
-this.rule_(788,$next)
+this.rule_(790,$next)
 for(;;)switch(this.s){
-case 788:if(this.m(789,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
-case 789:switch(this.lt()){
+case 790:if(this.m(791,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
+case 791:switch(this.lt()){
 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
@@ -4364,33 +4374,33 @@ return this.exit_()
 }
 }
 annoAssignParen($,$next){
-this.rule_(791,$next)
+this.rule_(793,$next)
 for(;;)switch(this.s){
-case 791:if(this.m(792,'(')){this.annoInSameLine()}continue;
-case 792:switch(this.lt()){
-case'Id':this.annoAssignBase({art:$.art},793);continue
-default:this.s=794;continue
-}
-case 793:switch(this.lt()){
-case',':this.c(792);continue
-case')':this.s=794;continue
+case 793:if(this.m(794,'(')){this.annoInSameLine()}continue;
+case 794:switch(this.lt()){
+case'Id':this.annoAssignBase({art:$.art},795);continue
+default:this.s=796;continue
+}
+case 795:switch(this.lt()){
+case',':this.c(794);continue
+case')':this.s=796;continue
 default:this.e();continue
 }
-case 794:this.m(0,')');continue
+case 796:this.m(0,')');continue
 default:return this.exit_()
 }
 }
 annoAssignBase($,$next){
 let value={}
 let name;let _
-this.rule_(796,$next)
+this.rule_(798,$next)
 for(;;)switch(this.s){
-case 796:if(this.annoNamePath(_={category:'anno'},797))name=_.name;continue
-case 797:switch(this.l()){
-case':':this.c(798);continue
+case 798:if(this.annoNamePath(_={category:'anno'},799))name=_.name;continue
+case 799:switch(this.l()){
+case':':this.c(800);continue
 default:this.gr();continue
 }
-case 798:if(this.annoValue(_={},0))value=_.value;continue
+case 800:if(this.annoValue(_={},0))value=_.value;continue
 default:
 this.assignAnnotation( $.art, value, name || {} )
 return this.exit_()
@@ -4399,20 +4409,20 @@ return this.exit_()
 annoNamePath($,$next){
 $.name??=new XsnName()
 let at
-this.rule_(800,$next)
+this.rule_(802,$next)
 for(;;)switch(this.s){
-case 800:if(this.my(801,$.category)){ $.name.path = [ this.identAst() ]; }continue
-case 801:switch(this.lt()){
-case'.':this.c(802);continue
-default:this.s=804;continue
-}
-case 802:switch(this.lt()){
-case'Id':if(this.cy(801,$.category)){ $.name.path.push( this.identAst() ); }continue
-case'@':if(this.c(803))at=this.lb();continue
+case 802:if(this.my(803,$.category)){ $.name.path = [ this.identAst() ]; }continue
+case 803:switch(this.lt()){
+case'.':this.c(804);continue
+default:this.s=806;continue
+}
+case 804:switch(this.lt()){
+case'Id':if(this.cy(803,$.category)){ $.name.path.push( this.identAst() ); }continue
+case'@':if(this.c(805))at=this.lb();continue
 default:this.e();continue
 }
-case 803:if(this.my(801,$.category)){ $.name.path.push( this.identAstWithPrefix( at ) ); }continue
-case 804:switch(this.l()){
+case 805:if(this.my(803,$.category)){ $.name.path.push( this.identAstWithPrefix( at ) ); }continue
+case 806:switch(this.l()){
 case'#':this.annoPathVariant({nameOrRef:$.name},0);continue
 default:this.gr();continue
 }
@@ -4423,25 +4433,25 @@ return this.exit_()
 }
 annoPath($,$next){
 let at
-this.rule_(806,$next)
+this.rule_(808,$next)
 for(;;)switch(this.s){
-case 806:switch(this.lt()){
-case'Id':if(this.cy(808,$.category)){ $.nameOrRef.path = [ this.identAst() ]; }continue
-case'@':if(this.c(807))at=this.lb();continue
+case 808:switch(this.lt()){
+case'Id':if(this.cy(810,$.category)){ $.nameOrRef.path = [ this.identAst() ]; }continue
+case'@':if(this.c(809))at=this.lb();continue
 default:this.e();continue
 }
-case 807:if(this.my(808,$.category)){ $.nameOrRef.path = [ this.identAstWithPrefix( at ) ]; }continue
-case 808:switch(this.lt()){
-case'.':this.c(809);continue
-default:this.s=811;continue
+case 809:if(this.my(810,$.category)){ $.nameOrRef.path = [ this.identAstWithPrefix( at ) ]; }continue
+case 810:switch(this.lt()){
+case'.':this.c(811);continue
+default:this.s=813;continue
 }
-case 809:switch(this.lt()){
-case'Id':if(this.cy(808,$.category)){ $.nameOrRef.path.push( this.identAst() ); }continue
-case'@':if(this.c(810))at=this.lb();continue
+case 811:switch(this.lt()){
+case'Id':if(this.cy(810,$.category)){ $.nameOrRef.path.push( this.identAst() ); }continue
+case'@':if(this.c(812))at=this.lb();continue
 default:this.e();continue
 }
-case 810:if(this.my(808,$.category)){ $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); }continue
-case 811:switch(this.lt()){
+case 812:if(this.my(810,$.category)){ $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); }continue
+case 813:switch(this.lt()){
 case'#':this.annoPathVariant({nameOrRef:$.nameOrRef},0);continue
 default:this.gr();continue
 }
@@ -4451,15 +4461,15 @@ return this.exit_()
 }
 }
 annoPathVariant($,$next){
-this.rule_(813,$next)
+this.rule_(815,$next)
 for(;;)switch(this.s){
-case 813:if(this.m(814,'#')){ this.reportUnexpectedSpace(); }continue
-case 814:if(this.my(815,'variant')){ $.nameOrRef.variant = { path: [ this.identAst() ] }; }continue
-case 815:switch(this.lt()){
-case'.':this.c(816);continue
+case 815:if(this.m(816,'#')){ this.reportUnexpectedSpace(); }continue
+case 816:if(this.my(817,'variant')){ $.nameOrRef.variant = { path: [ this.identAst() ] }; }continue
+case 817:switch(this.lt()){
+case'.':this.c(818);continue
 default:this.gr();continue
 }
-case 816:if(this.my(815,'variant')){ $.nameOrRef.variant.path.push( this.identAst() ); }continue
+case 818:if(this.my(817,'variant')){ $.nameOrRef.variant.path.push( this.identAst() ); }continue
 default:
 this.attachLocation( $.nameOrRef.variant )
 return this.exit_()
@@ -4469,14 +4479,14 @@ annoStructValue($,$next){
 $.value??={}
 let name=new XsnName()
 let _
-this.rule_(818,$next)
+this.rule_(820,$next)
 for(;;)switch(this.s){
-case 818:if(this.annoPath({nameOrRef:name,category:'name'},819)){ this.attachLocation( name ); }continue
-case 819:switch(this.lt()){
-case':':this.c(820);continue
+case 820:if(this.annoPath({nameOrRef:name,category:'name'},821)){ this.attachLocation( name ); }continue
+case 821:switch(this.lt()){
+case':':this.c(822);continue
 default:if(this.gr(['Id',',','@','}'])){ this.attachLocation( $.value ); }continue
 }
-case 820:if(this.annoValue(_={},0))$.value=_.value;continue
+case 822:if(this.annoValue(_={},0))$.value=_.value;continue
 default:
 $.value.name = name
 return this.exit_()
@@ -4485,61 +4495,61 @@ return this.exit_()
 annoValue($,$next){
 $.value??={}
 let sign;let sub;let ellipsis;let upTo;let _
-this.rule_(822,$next)
+this.rule_(824,$next)
 for(;;)switch(this.s){
-case 822:switch(this.l()){
+case 824:switch(this.l()){
 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(823))sign=this.lb();continue
+case'+':case'-':if(this.c(825))sign=this.lb();continue
 case'Id':case'@':this.annoPath({nameOrRef:$.value,category:'annoref'},0);continue
-case'{':if(this.c(824)){ if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
+case'{':if(this.c(826)){ if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
 else { $.value.struct = Object.create(null); $.value.literal = 'struct'; } }continue
-case'[':if(this.c(827)){this.arrayAnno(); $.value.val = []; $.value.literal = 'array' }continue
-case'(':this.c(833);continue
+case'[':if(this.c(829)){this.arrayAnno(); $.value.val = []; $.value.literal = 'array' }continue
+case'(':this.c(835);continue
 default:this.e();continue
 }
-case 823:if(this.m(0,'Number')){ this.adjustAnnoNumber( $.value = this.numberLiteral( sign ) ); }continue
-case 824:switch(this.lt()){
-case'Id':case'@':if(this.annoStructValue(_={},825)){sub=_.value; if ($.value.$flatten) $.value.$flatten.push( sub );
+case 825:if(this.m(0,'Number')){ this.adjustAnnoNumber( $.value = this.numberLiteral( sign ) ); }continue
+case 826:switch(this.lt()){
+case'Id':case'@':if(this.annoStructValue(_={},827)){sub=_.value; if ($.value.$flatten) $.value.$flatten.push( sub );
 else this.addDef( sub, $.value, 'struct', null, sub.name ); }continue
-default:this.s=826;continue
+default:this.s=828;continue
 }
-case 825:switch(this.l()){
-case',':this.c(824);continue
-case'}':this.s=826;continue
-case'Id':case'@':this.s=824;continue
+case 827:switch(this.l()){
+case',':this.c(826);continue
+case'}':this.s=828;continue
+case'Id':case'@':this.s=826;continue
 default:this.e();continue
 }
-case 826:switch(this.l()){
+case 828:switch(this.l()){
 case'}':if(this.c(0)){ if ($.value.struct) this.checkStructProps( $.value.struct ); }continue
 default:this.e();continue
 }
-case 827:switch(this.l()){
-case'Id':case'#':case'(':case'+':case'-':case'@':case'[':case'{':case'Number':case'String':case'QuotedLiteral':if(this.annoValue(_={},831)){sub=_.value; $.value.val.push( sub ) }continue
-case'...':if(this.c(828))ellipsis=this.lb();continue
-default:this.s=832;continue
+case 829:switch(this.l()){
+case'Id':case'#':case'(':case'+':case'-':case'@':case'[':case'{':case'Number':case'String':case'QuotedLiteral':if(this.annoValue(_={},833)){sub=_.value; $.value.val.push( sub ) }continue
+case'...':if(this.c(830))ellipsis=this.lb();continue
+default:this.s=834;continue
 }
-case 828:switch(this.lk()){
-case'up':this.ck(829);continue
-case',':case']':this.s=831;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location } ); }continue
+case 830:switch(this.lk()){
+case'up':this.ck(831);continue
+case',':case']':this.s=833;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location } ); }continue
 default:this.e();continue
 }
-case 829:this.mk(830,'to');continue
-case 830:if(this.annoValue(_={},831)){upTo=_.value; $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location, upTo: upTo } ); }continue
-case 831:switch(this.lt()){
-case',':this.c(827);continue
-case']':this.s=832;continue
+case 831:this.mk(832,'to');continue
+case 832:if(this.annoValue(_={},833)){upTo=_.value; $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location, upTo: upTo } ); }continue
+case 833:switch(this.lt()){
+case',':this.c(829);continue
+case']':this.s=834;continue
 default:this.e();continue
 }
-case 832:switch(this.l()){
+case 834:switch(this.l()){
 case']':this.c(0);continue
 default:this.e();continue
 }
-case 833:switch(this.l()){
+case 835:switch(this.l()){
 case')':this.c(0);continue
-default:this.s=834;continue
+default:this.s=836;continue
 }
-case 834:if(this.condition(_={},835)){$.value=_.expr; $.value.$tokenTexts = true; }continue
-case 835:this.m(0,')');continue
+case 836:if(this.condition(_={},837)){$.value=_.expr; $.value.$tokenTexts = true; }continue
+case 837:this.m(0,')');continue
 default:
 this.attachLocation( $.value )
 return this.exit_()