@sap/cds-compiler 6.0.14 → 6.2.2

package/lib/gen/CdlParser.js

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