@sap/cds-compiler 5.5.2 → 5.6.0

package/lib/gen/CdlParser.js

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