@sap/cds-compiler 6.2.2 → 6.3.0

package/lib/gen/CdlParser.js

@@ -1,4 +1,4 @@
-// Parser generated by redepage v0.2.7
+// Parser generated by redepage v0.3.0
 'use strict;'
 const { XsnSource, XsnArtifact, XsnName } = require( '../compiler/xsn-model' )
 const AstBuildingParser = require('../parsers/AstBuildingParser')
@@ -133,7 +133,7 @@ Id:['g',6,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'artifactDefOrExtend',
-{'@':[10,773],'':11},
+{'@':[10,772],'':11},
 {
 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],
@@ -198,22 +198,22 @@ Id:[22,31],
 'serviceDef',
 ['mk',44,'service',,,'vocabularyRestriction'],
 [45,35],
-{'@':[45,779],'':46},
+{'@':[45,778],'':46},
 {'{':[0,5],'':0},
 'contextDef',
 ['mk',49,'context',,,'vocabularyRestriction'],
 [50,35],
-{'@':[50,779],'':51},
+{'@':[50,778],'':51},
 {'{':[0,5],'':0},
 'annotationDef',
 ['mk',54,'annotation'],
 [55,35],
-{'@':[55,779],'':56},
+{'@':[55,778],'':56},
 [0,347],
 'typeDef',
 ['mk',59,'type'],
 [60,35],
-{'@':[60,779],'':61},
+{'@':[60,778],'':61},
 [0,347],
 'aspectDef',
 {
@@ -222,7 +222,7 @@ abstract:['ck',64,,'hide_'],
 },
 ['mk',65,'entity'],
 [66,35],
-{'@':[66,779],'':67},
+{'@':[66,778],'':67},
 {
 '{':[71,158],
 ':':['c',68],
@@ -239,7 +239,7 @@ abstract:['ck',64,,'hide_'],
 'entityDef',
 ['mk',74,'entity'],
 [75,35],
-{'@':[75,779],'':76},
+{'@':[75,778],'':76},
 {'(':[77,142],'':77},
 {
 '{':81,
@@ -265,7 +265,7 @@ projection:['g',83,,,'sloppy','afterBrace'],
 'viewDef',
 ['mk',90,'view'],
 [91,35],
-{'@':[91,779],'':92},
+{'@':[91,778],'':92},
 {
 '(':[98,142],
 with:['ck',93,,'hide_'],
@@ -281,7 +281,7 @@ with:['ck',93,,'hide_'],
 'eventDef',
 ['mk',102,'event'],
 [103,35],
-{'@':[103,779],'':104},
+{'@':[103,778],'':104},
 {
 '{':[0,158],
 ':':['c',105],
@@ -299,17 +299,17 @@ projection:[0,446,1],
 '{':110,
 },
 [0,158],
-{'@':[111,773],'':0},
+{'@':[111,772],'':0},
 'actionMainDef',
 ['mk',114,'action'],
 [115,35],
-{'@':[115,779],'':116},
+{'@':[115,778],'':116},
 [117,142],
 {returns:[0,154],'':0},
 'functionMainDef',
 ['mk',120,'function'],
 [121,35],
-{'@':[121,779],'':122},
+{'@':[121,778],'':122},
 [123,142],
 [0,154],
 'actionsBlock',
@@ -323,17 +323,17 @@ Id:['g',127,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'boundActionFunctionDef',
-{'@':[131,773],'':132},
+{'@':[131,772],'':132},
 {
 action:['ck',133],
 function:['ck',137],
 },
 ['mi',134],
-{'@':[134,779],'':135},
+{'@':[134,778],'':135},
 [136,142],
 {returns:[0,154],'':0},
 ['mi',138],
-{'@':[138,779],'':139},
+{'@':[138,778],'':139},
 [140,142],
 [0,154],
 'paramsList',
@@ -345,9 +345,9 @@ function:['ck',137],
 },
 ['m',0,')'],
 'paramDef',
-{'@':[147,773],'':148},
+{'@':[147,772],'':148},
 ['miA',149],
-{'@':[149,779],'':150},
+{'@':[149,778],'':150},
 {
 '{':[151,158],
 ':':['c',152],
@@ -356,7 +356,7 @@ function:['ck',137],
 [0,358],
 'returnsSpec',
 ['mk',155,'returns',,'default','elementRestriction'],
-{'@':[155,773],'':156},
+{'@':[155,772],'':156},
 [0,358],
 'elementsBlock',
 ['m',159,'{'],
@@ -368,13 +368,13 @@ Id:['g',159,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'elementDef',
-{'@':[163,773],'':164},
+{'@':[163,772],'':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,779],'':170},
+{'@':[169,778],'':170},
 {
 '{':[171,158],
 ':':['c',172],
@@ -386,7 +386,7 @@ Id:['g',159,,'afterBrace'],'@':'Id',
 [175,642],
 {stored:['ck',176],'':176},
 ['g',177],
-{'@':[177,773,,'elementRestriction','anno'],'':0},
+{'@':[177,772,,'elementRestriction','anno'],'':0},
 'enumSymbolsBlock',
 ['mk',180,'enum'],
 ['m',181,'{'],
@@ -397,19 +397,19 @@ Id:['g',159,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'enumSymbolDef',
-{'@':[185,773],'':186},
+{'@':[185,772],'':186},
 ['mi',187],
-{'@':[187,773],'':188},
+{'@':[187,772],'':188},
 {'=':['c',189],'':0},
 {
 String:['c',191],
 Number:['c',191],
 '+':['c',190],'-':'+',
-Id:[191,770,,'hide_'],'#':'Id',QuotedLiteral:'Id',
+Id:[191,769,,'hide_'],'#':'Id',QuotedLiteral:'Id',
 },
 ['m',191,'Number'],
 ['g',192],
-{'@':[192,773],'':0},
+{'@':[192,772],'':0},
 'foreignKeysBlock',
 ['m',195,'{'],
 {Id:[196,199],'@':'Id','':197},
@@ -419,7 +419,7 @@ Id:[191,770,,'hide_'],'#':'Id',QuotedLiteral:'Id',
 },
 ['m',0,'}'],
 'foreignKeyDef',
-{'@':[199,773],'':200},
+{'@':[199,772],'':200},
 [201,39],
 {as:['ck',202],'':0},
 ['mi',0],
@@ -448,10 +448,10 @@ with:['ck',223],
 [219,35],
 {with:['ck',220],'':220},
 ['g',221],
-{'@':[221,773],'':222},
+{'@':[221,772],'':222},
 {'{':[0,321],'':0},
 ['g',224],
-{'@':[224,773],'':225},
+{'@':[224,772],'':225},
 {'(':[226,308],'':226},
 {
 returns:[0,317],
@@ -469,7 +469,7 @@ with:['ck',240],
 [232,35],
 {with:['ck',233],'':233},
 ['g',234],
-{'@':[234,773],'':235},
+{'@':[234,772],'':235},
 {
 '{':236,
 elements:['ck',236],
@@ -478,10 +478,10 @@ enum:[0,179],
 '':0
 },
 [0,331],
-{'@':[237,773],'':238},
+{'@':[237,772],'':238},
 {'{':[239,331],'':0},
 {actions:[0,125],'':0},
-{'@':[240,773],'':241},
+{'@':[240,772],'':241},
 {
 Id:[242,39],
 '{':246,
@@ -506,22 +506,22 @@ definitions:['ck',249,1],
 [253,35],
 {with:['ck',254],'':254},
 ['g',255],
-{'@':[255,773],'':256},
+{'@':[255,772],'':256},
 {'{':[0,5],'':0},
 'extendContext',
 ['mk',259,'context'],
 [260,35],
 {with:['ck',261],'':261},
 ['g',262],
-{'@':[262,773],'':263},
+{'@':[262,772],'':263},
 {'{':[0,5],'':0},
 'extendType',
 ['mk',266,'type'],
 [267,35],
 {with:['ck',270],'':268},
-{'@':[268,773],'':269},
+{'@':[268,772],'':269},
 {'{':[0,331],'':0},
-{'@':[270,773],'':271},
+{'@':[270,772],'':271},
 {
 Id:[272,39],
 '{':275,
@@ -538,8 +538,8 @@ enum:[0,179,1],
 {aspect:['ck',278],entity:'aspect'},
 [279,35],
 {with:['ck',281],'':280},
-{'@':[280,773],'':285},
-{'@':[281,773],'':282},
+{'@':[280,772],'':285},
+{'@':[281,772],'':282},
 {
 Id:[283,39],
 actions:['g',285,1],
@@ -554,7 +554,7 @@ actions:['g',285,1],
 [290,35],
 {with:['ck',291],'':291},
 ['g',292],
-{'@':[292,773],'':293},
+{'@':[292,772],'':293},
 {'{':[294,558],'':294},
 {actions:[0,125],'':0},
 'annotateActionsBlock',
@@ -568,9 +568,9 @@ Id:['g',298,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'annotateBoundAction',
-{'@':[302,773],'':303},
+{'@':[302,772],'':303},
 ['mi',304],
-{'@':[304,773],'':305},
+{'@':[304,772],'':305},
 {'(':[306,308],'':306},
 {returns:[0,317,1],'':0},
 'annotateParamsBlock',
@@ -582,12 +582,12 @@ Id:['g',298,,'afterBrace'],'@':'Id',
 },
 ['m',0,')'],
 'annotateParam',
-{'@':[313,773],'':314},
+{'@':[313,772],'':314},
 ['mi',315],
-{'@':[315,773],'':0},
+{'@':[315,772],'':0},
 'annotateReturns',
 ['mk',318,'returns'],
-{'@':[318,773],'':319},
+{'@':[318,772],'':319},
 {'{':[0,321],'':0},
 'annotateElementsBlock',
 ['m',322,'{'],
@@ -599,9 +599,9 @@ Id:['g',322,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'annotateElement',
-{'@':[326,773],'':327},
+{'@':[326,772],'':327},
 ['mi',328],
-{'@':[328,773],'':329},
+{'@':[328,772],'':329},
 {'{':[0,321],'':0},
 'extendElementsBlock',
 ['m',332,'{'],
@@ -613,7 +613,7 @@ Id:['g',332,,'afterBrace'],'@':'Id',
 },
 ['m',0,'}',,,'afterBrace'],
 'elementDefOrExtend',
-{'@':[336,773],'':337},
+{'@':[336,772],'':337},
 {
 Id:[0,163],'@':'Id',key:'Id',
 extend:['ck',338,1],
@@ -621,9 +621,9 @@ extend:['ck',338,1],
 {element:['ck',339,1],'':339},
 ['mi',340],
 {with:['ck',343],'':341},
-{'@':[341,773],'':342},
+{'@':[341,772],'':342},
 {'{':[0,331],'':0},
-{'@':[343,773],'':344},
+{'@':[343,772],'':344},
 {
 '{':345,
 elements:['ck',345],
@@ -670,9 +670,9 @@ many:['ck',379,1,,'calc','elementRestriction'],
 '{':[384,158,,,'calc','elementRestriction'],
 },
 ['g',360],
-{'@':[360,773],'':361},
+{'@':[360,772],'':361},
 {not:[362,439,,'elementRestriction','notNull'],null:'not','':363},
-{'@':[362,773],'':363},
+{'@':[362,772],'':363},
 {
 enum:[364,179,,,'anno','elementRestriction'],
 '@':[0,393],not:'@',null:'@',default:'@',
@@ -703,12 +703,12 @@ type:[380,396,1],
 },
 {not:[381,439,,'elementRestriction','notNull'],null:'not','':381},
 {enum:[383,179],'':382},
-{'@':[382,773],'':0},
+{'@':[382,772],'':0},
 {not:[0,439,,'elementRestriction','notNull'],null:'not','':0},
 {not:[0,439],null:'not','':0},
 'typeAssocProperties',
 [387,39],
-{'@':[387,773],'':388},
+{'@':[387,772],'':388},
 {
 on:['ck',389],
 '{':[391,194],
@@ -716,11 +716,11 @@ on:['ck',389],
 '':0
 },
 [390,640],
-{'@':[390,773],'':0},
+{'@':[390,772],'':0},
 {'@':[0,393],not:'@',null:'@',default:'@','':0},
 'typeProperties',
 {
-'@':[393,773],
+'@':[393,772],
 not:[393,439,,'elementRestriction','notNull'],null:'not',
 default:['ck',394,,'elementRestriction','default'],
 '':0
@@ -1018,7 +1018,7 @@ Id:[565,568],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id','@':'Id','{':
 },
 ['m',0,'}',,,'afterBrace'],
 'selectItemDef',
-{'@':[568,776],'':569},
+{'@':[568,775],'':569},
 {virtual:['ck',570,1,'modifierRestriction'],'':570},
 ['g',571,,,'key','columnExpr'],
 {key:['ck',572,,'modifierRestriction'],'':572},
@@ -1041,7 +1041,7 @@ Id:['ci',583,,,,'nestedExpand'],
 '.':['c',581],
 '':583
 },
-[577,734],
+[577,733],
 {'*':[578,643],'+':'*','-':'*','/':'*','<':'*','=':'*','>':'*','?':'*','!=':'*','<=':'*','<>':'*','==':'*','>=':'*',in:'*',is:'*',or:'*','||':'*',and:'*',not:'*',like:'*',between:'*','':578},
 {
 as:['ck',579],
@@ -1062,7 +1062,7 @@ Id:['ci',583],
 ['mk',588,'as'],
 ['mi',589],
 ['g',590,,,,'columnExpr'],
-{'@':[590,779],'':591},
+{'@':[590,778],'':591},
 {':':['c',592],'':0},
 {
 Id:[605,358],'{':'Id',
@@ -1087,7 +1087,7 @@ on:['ck',596],
 ['mk',604,'on'],
 [605,640],
 ['g',606],
-{'@':[606,773],'':0},
+{'@':[606,772],'':0},
 'whereGroupByHaving',
 {where:['ck',609],'':610},
 [610,640],
@@ -1125,7 +1125,7 @@ on:['ck',596],
 'expression',
 {
 '(':[643,677],
-'#':[654,770],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
+'#':[654,769],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
 ':':['c',644],
 '?':['c',654,,'hide_'],
 Id:[646,671],
@@ -1143,7 +1143,7 @@ Number:['c',654,,'hide_'],
 },
 {'.':[654,673],'':654},
 {over:['ck',647],'':648},
-[648,734],
+[648,733],
 ['g',654],
 [654,671],
 {
@@ -1233,108 +1233,114 @@ limit:[682,455,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:
 [705,404],
 ['m',0,')'],
 'argumentsAndFilter',
-{'(':['c',708,,,,'prepareSpecialFunction'],'':727},
-{Id:['ciA',709,,'isNamedArg'],'':720},
+{'(':['c',708,,,,'prepareSpecialFunction'],'':726},
+{
+')':725,
+Id:['ciA',709,,'isNamedArg'],
+'':718
+},
 {
 ':':['c',710],
-'=>':['c',715],
+'=>':['c',714],
 },
 [711,642],
-{',':['c',712],'':726},
+{
+',':['c',712],
+')':725,
+},
 {
 Id:['ciA',713],
-')':726,
+')':725,
 },
-['m',714,':'],
-[711,642],
-[716,642],
-{',':['c',717],'':726},
+['m',710,':'],
+[715,642],
 {
-Id:['ciA',718],
-')':726,
+',':['c',716],
+')':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:[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:')',
+Id:['ciA',717],
+')':725,
 },
-{order:['ck',724],'':726},
-['mk',725,'by'],
-[726,749],
-['m',727,')'],
+['m',714,'=>'],
+[719,728],
+{',':['c',720,,,,'nextFunctionArgument'],'':722},
+{')':['c',721],'':718},
+{'[':[0,536],'':0},
+{order:['ck',723],'':725},
+['mk',724,'by'],
+[725,748],
+['m',726,')'],
 {'[':[0,536],'':0},
 'funcExpression',
 {
 ' lookahead':'lGenericIntroOrExpr',
-Id:[731,642],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-GenericExpr:['ckA',731],
-GenericIntro:['ckA',730],
+Id:[730,642],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+GenericExpr:['ckA',730],
+GenericIntro:['ckA',729],
 },
-[731,642],
+[730,642],
 {
 ' lookahead':'lGenericSeparator',
-GenericSeparator:['ckA',732],
+GenericSeparator:['ckA',731],
 '':0
 },
 {
 ' lookahead':'lGenericExpr',
-Id:[731,642],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-GenericExpr:['ckA',731],
+Id:[730,642],'#':'Id','(':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+GenericExpr:['ckA',730],
 },
 'overClause',
-['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',734,'('],
+{partition:['ck',735],'':737},
+['mk',736,'by'],
+[737,744],
+{order:['ck',738],'':740},
+['mk',739,'by'],
+[740,748],
+{rows:['ck',741],'':742},
+[742,757],
 ['m',0,')'],
 'expressionsAsXpr',
-[746,642],
-{',':['c',747],'':0},
-[746,642],
+[745,642],
+{',':['c',746],'':0},
+[745,642],
 'orderByClauseAsXpr',
-[750,753],
-{',':['c',751],'':0},
-[750,753],
+[749,752],
+{',':['c',750],'':0},
+[749,752],
 'orderBySpecAsXpr',
-[754,642],
-{asc:['ck',755],desc:'asc','':755},
-{nulls:['ck',756],'':0},
+[753,642],
+{asc:['ck',754],desc:'asc','':754},
+{nulls:['ck',755],'':0},
 {last:['ck',0],first:'last'},
 'windowFrameClause',
 {
-unbounded:['ck',759],
-Number:['c',759],
-current:['ck',760],
-between:['ck',761],
+unbounded:['ck',758],
+Number:['c',758],
+current:['ck',759],
+between:['ck',760],
 },
 ['mk',0,'preceding'],
 ['mk',0,'row'],
-[762,765],
-['mk',763,'and'],
-[0,765],
+[761,764],
+['mk',762,'and'],
+[0,764],
 'windowFrameBoundSpec',
 {
-unbounded:['ck',766],
-Number:['c',766],
-current:['ck',768],
+unbounded:['ck',765],
+Number:['c',765],
+current:['ck',767],
 },
 {
-following:['ck',767],
-preceding:['ck',767],
+following:['ck',766],
+preceding:['ck',766],
 },
 ['g',0],
 ['mk',0,'row'],
 'literalValue',
 {
-'#':['c',771],
+'#':['c',770],
 null:['ck',0],
 true:['ck',0],false:'true',
 Number:['c',0],
@@ -1343,102 +1349,100 @@ QuotedLiteral:['c',0],
 },
 ['miA',0],
 'annoAssignStd',
-['m',774,'@',,,'annoInSameLine'],
+['m',773,'@',,,'annoInSameLine'],
 {
-'(':[0,782],
-Id:[0,787],
+'(':[0,781],
+Id:[0,786],
 },
 'annoAssignCol',
-['m',777,'@'],
+['m',776,'@'],
 {
-'(':[0,782],
-Id:[0,787],
+'(':[0,781],
+Id:[0,786],
 },
 'annoAssignMid',
-['m',780,'@',,,'annoInSameLine'],
+['m',779,'@',,,'annoInSameLine'],
 {
-'(':[0,782],
-Id:[0,791],
+'(':[0,781],
+Id:[0,790],
 },
 'annoAssignParen',
-['m',783,'(',,,'annoInSameLine'],
-{Id:[784,787],'':785},
+['m',782,'(',,,'annoInSameLine'],
+{Id:[783,786],'':784},
 {
-',':['c',783],
-')':785,
+',':['c',782],
+')':784,
 },
 ['m',0,')'],
 'annoAssignBase',
-[788,791],
-{':':['c',789,,'annoInSameLine'],'':0},
-[0,813],
+[787,790],
+{':':['c',788,,'annoInSameLine'],'':0},
+[0,812],
 'annoNamePath',
-['miA',792],
-{'.':['c',793],'':795},
+['miA',791],
+{'.':['c',792],'':794},
 {
-Id:['ciA',792],
-'@':['c',794],
+Id:['ciA',791],
+'@':['c',793],
 },
-['miA',792],
-{'#':[0,804,,'annoInSameLine'],'':0},
+['miA',791],
+{'#':[0,803,,'annoInSameLine'],'':0},
 'annoPath',
 {
-Id:['ciA',799],
-'@':['c',798],
+Id:['ciA',798],
+'@':['c',797],
 },
-['miA',799],
-{'.':['c',800],'':802},
+['miA',798],
+{'.':['c',799],'':801},
 {
-Id:['ciA',799],
-'@':['c',801],
+Id:['ciA',798],
+'@':['c',800],
 },
-['miA',799],
-{'#':[0,804],'':0},
+['miA',798],
+{'#':[0,803],'':0},
 'annoPathVariant',
-['m',805,'#'],
-['miA',806],
-{'.':['c',807],'':0},
-['miA',806],
+['m',804,'#'],
+['miA',805],
+{'.':['c',806],'':0},
+['miA',805],
 'annoStructValue',
-[810,797],
-{':':['c',811],'':0},
-[0,813],
+[809,796],
+{':':['c',810],'':0},
+[0,812],
 'annoValue',
 {
-'#':[0,770],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
-'+':['c',814],'-':'+',
-Id:[0,797],'@':'Id',
-'{':['c',815],
-'[':['c',819,,,,'arrayAnno'],
-'(':['c',826],
+'#':[0,769],null:'#',true:'#',false:'#',Number:'#',String:'#',QuotedLiteral:'#',
+'+':['c',813],'-':'+',
+Id:[0,796],'@':'Id',
+'{':['c',814],
+'[':['c',817,,,,'arrayAnno'],
+'(':['c',823],
 },
 ['m',0,'Number'],
-{Id:[816,809],'@':'Id','':817},
+{Id:[815,808],'@':'Id','':816},
 {
-',':['c',815],
-'}':817,
-Id:['g',815,,'fail'],'@':'Id',
+',':['c',814],
+'}':816,
+Id:['g',814,,'fail'],'@':'Id',
 },
-['g',818],
-['m',0,'}'],
+['m',0,'}','arrayAnno','orNotEmpty'],
 {
-Id:[823,813],'#':'Id','(':'Id','+':'Id','-':'Id','@':'Id','[':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
-'...':['c',820,,'arrayAnno','ellipsis'],
-'':824
+Id:[821,812],'#':'Id','(':'Id','+':'Id','-':'Id','@':'Id','[':'Id','{':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+'...':['c',818,,'arrayAnno','ellipsis'],
+'':822
 },
 {
-up:['ck',821],
-',':823,']':823,
+up:['ck',819],
+',':821,']':821,
 },
-['mk',822,'to'],
-[823,813],
+['mk',820,'to'],
+[821,812],
 {
-',':['c',819],
-']':824,
+',':['c',817],
+']':822,
 },
-['g',825],
-['m',0,']'],
-[827,640],
+['m',0,']','arrayAnno','bracket'],
+[824,640],
 ['m',0,')'],
 ]
 class CdlParser extends AstBuildingParser{
@@ -3502,8 +3506,8 @@ default:return this.exit_()
 excludingClause($,$next){
 this.rule_(551,$next)
 for(;;)switch(this.s){
-case 551:this.mk(552,'excluding');continue
-case 552:if(this.m(553,'{')){ $.query.excludingDict = this.createDict(); }continue
+case 551:if(this.mk(552,'excluding')){ $.query.excludingDict = this.createDict(); }continue
+case 552:this.m(553,'{');continue
 case 553:switch(this.l()){
 case'Id':this.s=554;continue
 default:this.e();continue
@@ -4022,62 +4026,63 @@ this.rule_(707,$next)
 for(;;)switch(this.s){
 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
+default:this.s=726;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')':this.s=725;continue
+case'Id':if(this.gc(718,'isNamedArg')&&this.ciA(709,'paramname'))id=this.lb();continue
+default:this.s=718;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
+case'=>':if(this.c(714)){ $.pathStep.args = this.createDict(); }continue
 default:this.e();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')':this.s=725;continue
+default:this.e();continue
 }
 case 712:switch(this.l()){
 case'Id':if(this.ciA(713,'paramname'))id=this.lb();continue
-case')':this.s=726;continue
+case')':this.s=725;continue
 default:this.e();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 713:this.m(710,':');continue
+case 714:if(this.expression(_={},715)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
+case 715:switch(this.l()){
+case',':this.c(716);continue
+case')':this.s=725;continue
+default:this.e();continue
 }
-case 717:switch(this.l()){
-case'Id':if(this.ciA(718,'paramname'))id=this.lb();continue
-case')':this.s=726;continue
+case 716:switch(this.l()){
+case'Id':if(this.ciA(717,'paramname'))id=this.lb();continue
+case')':this.s=725;continue
 default:this.e();continue
 }
-case 718:this.m(719,'=>');continue
-case 719:if(this.expression(_={},716)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
+case 717:this.m(714,'=>');continue
+case 718:if(this.funcExpression(_={},719)){expr=_.expr; $.pathStep.args.push( expr ); }continue
+case 719:switch(this.l()){
+case',':if(this.c(720)){this.nextFunctionArgument()}continue;
+default:this.s=722;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')':this.c(721);continue
+default:this.s=718;continue
 }
 case 721:switch(this.l()){
-case',':if(this.c(722)){this.nextFunctionArgument()}continue;
-default:this.s=723;continue
+case'[':this.cardinalityAndFilter($,0);continue
+default:this.gr(['*','+','-','.','/','<','=','>','?','!=','<=','<>','==','>=','in','is','or','||','and','not','like','between']);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'order':if(this.ck(723)){ expr = $.pathStep.args[$.pathStep.args.length - 1] = this.applyOpToken( expr ); }continue
+default:this.s=725;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 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 723:if(this.mk(724,'by')){ this.pushXprToken( expr ); }continue
+case 724:if(this.orderByClauseAsXpr({outer:expr.args},725)){ this.attachLocation( expr ); }continue
+case 725:if(this.m(726,')')){ this.finalizeDictOrArray( $.pathStep.args ); }continue
+case 726:switch(this.l()){
 case'[':this.cardinalityAndFilter($,0);continue
 default:this.gr(['*','+','-','.','/','<','=','>','?','!=','<=','<>','==','>=','in','is','or','||','and','not','like','between']);continue
 }
@@ -4088,22 +4093,22 @@ funcExpression($,$next){
 $.expr??=undefined
 let args
 let tok;let e;let _
-this.rule_(729,$next)
+this.rule_(728,$next)
 for(;;)switch(this.s){
-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
+case 728:switch(this.lGenericIntroOrExpr()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},730))$.expr=_.expr;continue
+case'GenericExpr':if(this.ckA(730)){tok=this.lb(); $.expr = { val: tok.keyword ?? tok.type, location: tok.location, literal: 'token' }; }continue
+case'GenericIntro':if(this.ckA(729)){ $.expr = this.applyOpToken(); args = $.expr.args; }continue
 default:this.e();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
+case 729:if(this.expression(_={},730)){e=_.expr; $.expr.args.push( e ); }continue
+case 730:switch(this.lGenericSeparator()){
+case'GenericSeparator':if(this.ckA(731)){ if (args) this.pushXprToken( args ); else { $.expr= this.applyOpToken( $.expr ); args = $.expr.args; } }continue
 default:this.gr([')',',','order']);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
+case 731:switch(this.lGenericExpr()){
+case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':if(this.expression(_={},730)){e=_.expr; args.push( e ); }continue
+case'GenericExpr':if(this.ckA(730)){ this.pushXprToken( args ); }continue
 default:this.e();continue
 }
 default:
@@ -4113,27 +4118,27 @@ return this.exit_()
 }
 overClause($,$next){
 let over=[]
-this.rule_(734,$next)
+this.rule_(733,$next)
 for(;;)switch(this.s){
-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 742:this.windowFrameClause({outer:over},743);continue
-case 743:this.m(0,')');continue
+case 733:this.m(734,'(');continue
+case 734:switch(this.lk()){
+case'partition':if(this.ck(735)){ this.pushXprToken( over ); }continue
+default:this.s=737;continue
+}
+case 735:if(this.mk(736,'by')){ this.pushXprToken( over ); }continue
+case 736:this.expressionsAsXpr({outer:over},737);continue
+case 737:switch(this.lk()){
+case'order':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.orderByClauseAsXpr({outer:over},740);continue
+case 740:switch(this.lk()){
+case'rows':if(this.ck(741)){ this.pushXprToken( over ); }continue
+default:this.s=742;continue
+}
+case 741:this.windowFrameClause({outer:over},742);continue
+case 742:this.m(0,')');continue
 default:
 $.outer.push( this.surroundByParens( this.ixprAst( over ) ) )
 return this.exit_()
@@ -4142,14 +4147,14 @@ return this.exit_()
 expressionsAsXpr($,$next){
 let args=[]
 let expr;let _
-this.rule_(745,$next)
+this.rule_(744,$next)
 for(;;)switch(this.s){
-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
+case 744:if(this.expression(_={},745)){expr=_.expr; args.push( expr ); }continue
+case 745:switch(this.l()){
+case',':if(this.c(746)){ this.pushXprToken( args ); }continue
 default:this.gr([')','rows','order']);continue
 }
-case 747:if(this.expression(_={},746)){expr=_.expr; args.push( expr ); }continue
+case 746:if(this.expression(_={},745)){expr=_.expr; args.push( expr ); }continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
@@ -4157,14 +4162,14 @@ return this.exit_()
 }
 orderByClauseAsXpr($,$next){
 let args=[]
-this.rule_(749,$next)
+this.rule_(748,$next)
 for(;;)switch(this.s){
-case 749:this.orderBySpecAsXpr({args},750);continue
-case 750:switch(this.l()){
-case',':if(this.c(751)){ this.pushXprToken( args ); }continue
+case 748:this.orderBySpecAsXpr({args},749);continue
+case 749:switch(this.l()){
+case',':if(this.c(750)){ this.pushXprToken( args ); }continue
 default:this.gr([')']);continue
 }
-case 751:this.orderBySpecAsXpr({args},750);continue
+case 750:this.orderBySpecAsXpr({args},749);continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
@@ -4172,18 +4177,18 @@ return this.exit_()
 }
 orderBySpecAsXpr($,$next){
 let expr;let _
-this.rule_(753,$next)
+this.rule_(752,$next)
 for(;;)switch(this.s){
-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 752:if(this.expression(_={},753)){expr=_.expr; $.args.push( expr ); }continue
+case 753:switch(this.lk()){
+case'asc':case'desc':if(this.ck(754)){ this.pushXprToken( $.args ); }continue
+default:this.s=754;continue
 }
-case 755:switch(this.lk()){
-case'nulls':if(this.ck(756)){ this.pushXprToken( $.args ); }continue
+case 754:switch(this.lk()){
+case'nulls':if(this.ck(755)){ this.pushXprToken( $.args ); }continue
 default:this.gr([')',',']);continue
 }
-case 756:switch(this.lk()){
+case 755:switch(this.lk()){
 case'last':case'first':if(this.ck(0)){ this.pushXprToken( $.args ); }continue
 default:this.e();continue
 }
@@ -4192,50 +4197,50 @@ default:return this.exit_()
 }
 windowFrameClause($,$next){
 let args=[]
-this.rule_(758,$next)
+this.rule_(757,$next)
 for(;;)switch(this.s){
-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
+case 757:switch(this.lk()){
+case'unbounded':if(this.ck(758)){ this.pushXprToken( args ); }continue
+case'Number':if(this.c(758)){ args.push( this.unsignedIntegerLiteral() ); }continue
+case'current':if(this.ck(759)){ this.pushXprToken( args ); }continue
+case'between':if(this.ck(760)){ this.pushXprToken( args ); }continue
 default:this.e();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
+case 758:if(this.mk(0,'preceding')){ this.pushXprToken( args ); }continue
+case 759:if(this.mk(0,'row')){ this.pushXprToken( args ); }continue
+case 760:this.windowFrameBoundSpec({args},761);continue
+case 761:if(this.mk(762,'and')){ this.pushXprToken( args ); }continue
+case 762:this.windowFrameBoundSpec({args},0);continue
 default:
 $.outer.push( this.ixprAst( args ) )
 return this.exit_()
 }
 }
 windowFrameBoundSpec($,$next){
-this.rule_(765,$next)
+this.rule_(764,$next)
 for(;;)switch(this.s){
-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
+case 764:switch(this.lk()){
+case'unbounded':if(this.ck(765)){ this.pushXprToken( $.args ); }continue
+case'Number':if(this.c(765)){ $.args.push( this.unsignedIntegerLiteral() ); }continue
+case'current':if(this.ck(767)){ this.pushXprToken( $.args ); }continue
 default:this.e();continue
 }
-case 766:switch(this.lk()){
-case'following':this.ck(767);continue
-case'preceding':this.ck(767);continue
+case 765:switch(this.lk()){
+case'following':this.ck(766);continue
+case'preceding':this.ck(766);continue
 default:this.e();continue
 }
-case 767:if(this.gr()){ this.pushXprToken( $.args ); }continue
-case 768:if(this.mk(0,'row')){ this.pushXprToken( $.args ); }continue
+case 766:if(this.gr()){ this.pushXprToken( $.args ); }continue
+case 767:if(this.mk(0,'row')){ this.pushXprToken( $.args ); }continue
 default:return this.exit_()
 }
 }
 literalValue($,$next){
 $.expr??={}
-this.rule_(770,$next)
+this.rule_(769,$next)
 for(;;)switch(this.s){
-case 770:switch(this.lk()){
-case'#':if(this.c(771)){ this.reportUnexpectedSpace(); }continue
+case 769:switch(this.lk()){
+case'#':if(this.c(770)){ 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
@@ -4243,17 +4248,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 771:if(this.miA(0,'enumref')){ $.expr = { literal: 'enum', sym: this.identAst() } }continue
+case 770:if(this.miA(0,'enumref')){ $.expr = { literal: 'enum', sym: this.identAst() } }continue
 default:
 this.attachLocation( $.expr )
 return this.exit_()
 }
 }
 annoAssignStd($,$next){
-this.rule_(773,$next)
+this.rule_(772,$next)
 for(;;)switch(this.s){
-case 773:if(this.m(774,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
-case 774:switch(this.l()){
+case 772:if(this.m(773,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
+case 773:switch(this.l()){
 case'(':this.annoAssignParen($,0);continue
 case'Id':this.annoAssignBase($,0);continue
 default:this.e();continue
@@ -4264,10 +4269,10 @@ return this.exit_()
 }
 }
 annoAssignCol($,$next){
-this.rule_(776,$next)
+this.rule_(775,$next)
 for(;;)switch(this.s){
-case 776:if(this.m(777,'@')){ this.reportDubiousAnnoSpacing(); }continue
-case 777:switch(this.l()){
+case 775:if(this.m(776,'@')){ this.reportDubiousAnnoSpacing(); }continue
+case 776:switch(this.l()){
 case'(':this.annoAssignParen($,0);continue
 case'Id':this.annoAssignBase($,0);continue
 default:this.e();continue
@@ -4279,10 +4284,10 @@ return this.exit_()
 }
 annoAssignMid($,$next){
 let name;let _
-this.rule_(779,$next)
+this.rule_(778,$next)
 for(;;)switch(this.s){
-case 779:if(this.m(780,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
-case 780:switch(this.l()){
+case 778:if(this.m(779,'@')){this.annoInSameLine(); this.reportDubiousAnnoSpacing(); }continue
+case 779: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
@@ -4293,33 +4298,33 @@ return this.exit_()
 }
 }
 annoAssignParen($,$next){
-this.rule_(782,$next)
+this.rule_(781,$next)
 for(;;)switch(this.s){
-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 781:if(this.m(782,'(')){this.annoInSameLine()}continue;
+case 782:switch(this.l()){
+case'Id':this.annoAssignBase({art:$.art},783);continue
+default:this.s=784;continue
 }
-case 784:switch(this.l()){
-case',':this.c(783);continue
-case')':this.s=785;continue
+case 783:switch(this.l()){
+case',':this.c(782);continue
+case')':this.s=784;continue
 default:this.e();continue
 }
-case 785:this.m(0,')');continue
+case 784:this.m(0,')');continue
 default:return this.exit_()
 }
 }
 annoAssignBase($,$next){
 let value={}
 let name;let _
-this.rule_(787,$next)
+this.rule_(786,$next)
 for(;;)switch(this.s){
-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
+case 786:if(this.annoNamePath(_={category:'anno'},787))name=_.name;continue
+case 787:switch(this.l()){
+case':':this.gc(0,'annoInSameLine')&&this.c(788);continue
 default:this.gr();continue
 }
-case 789:if(this.annoValue(_={},0))value=_.value;continue
+case 788:if(this.annoValue(_={},0))value=_.value;continue
 default:
 this.assignAnnotation( $.art, value, name || {} )
 return this.exit_()
@@ -4328,20 +4333,20 @@ return this.exit_()
 annoNamePath($,$next){
 $.name??=new XsnName()
 let at
-this.rule_(791,$next)
+this.rule_(790,$next)
 for(;;)switch(this.s){
-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 790:if(this.miA(791,$.category)){ $.name.path = [ this.identAst() ]; }continue
+case 791:switch(this.l()){
+case'.':this.c(792);continue
+default:this.s=794;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
+case 792:switch(this.l()){
+case'Id':if(this.ciA(791,$.category)){ $.name.path.push( this.identAst() ); }continue
+case'@':if(this.c(793))at=this.lb();continue
 default:this.e();continue
 }
-case 794:if(this.miA(792,$.category)){ $.name.path.push( this.identAstWithPrefix( at ) ); }continue
-case 795:switch(this.l()){
+case 793:if(this.miA(791,$.category)){ $.name.path.push( this.identAstWithPrefix( at ) ); }continue
+case 794:switch(this.l()){
 case'#':this.gc(0,'annoInSameLine')&&this.annoPathVariant({nameOrRef:$.name},0);continue
 default:this.gr();continue
 }
@@ -4352,25 +4357,25 @@ return this.exit_()
 }
 annoPath($,$next){
 let at
-this.rule_(797,$next)
+this.rule_(796,$next)
 for(;;)switch(this.s){
-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
+case 796:switch(this.l()){
+case'Id':if(this.ciA(798,$.category)){ $.nameOrRef.path = [ this.identAst() ]; }continue
+case'@':if(this.c(797))at=this.lb();continue
 default:this.e();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 797:if(this.miA(798,$.category)){ $.nameOrRef.path = [ this.identAstWithPrefix( at ) ]; }continue
+case 798:switch(this.l()){
+case'.':this.c(799);continue
+default:this.s=801;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
+case 799:switch(this.l()){
+case'Id':if(this.ciA(798,$.category)){ $.nameOrRef.path.push( this.identAst() ); }continue
+case'@':if(this.c(800))at=this.lb();continue
 default:this.e();continue
 }
-case 801:if(this.miA(799,$.category)){ $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); }continue
-case 802:switch(this.l()){
+case 800:if(this.miA(798,$.category)){ $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); }continue
+case 801:switch(this.l()){
 case'#':this.annoPathVariant({nameOrRef:$.nameOrRef},0);continue
 default:this.gr();continue
 }
@@ -4380,15 +4385,15 @@ return this.exit_()
 }
 }
 annoPathVariant($,$next){
-this.rule_(804,$next)
+this.rule_(803,$next)
 for(;;)switch(this.s){
-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
+case 803:if(this.m(804,'#')){ this.reportUnexpectedSpace(); }continue
+case 804:if(this.miA(805,'variant')){ $.nameOrRef.variant = { path: [ this.identAst() ] }; }continue
+case 805:switch(this.l()){
+case'.':this.c(806);continue
 default:this.gr();continue
 }
-case 807:if(this.miA(806,'variant')){ $.nameOrRef.variant.path.push( this.identAst() ); }continue
+case 806:if(this.miA(805,'variant')){ $.nameOrRef.variant.path.push( this.identAst() ); }continue
 default:
 this.attachLocation( $.nameOrRef.variant )
 return this.exit_()
@@ -4398,14 +4403,14 @@ annoStructValue($,$next){
 $.value??={}
 let name=new XsnName()
 let _
-this.rule_(809,$next)
+this.rule_(808,$next)
 for(;;)switch(this.s){
-case 809:if(this.annoPath({nameOrRef:name,category:'name'},810)){ this.attachLocation( name ); }continue
-case 810:switch(this.l()){
-case':':this.c(811);continue
+case 808:if(this.annoPath({nameOrRef:name,category:'name'},809)){ this.attachLocation( name ); }continue
+case 809:switch(this.l()){
+case':':this.c(810);continue
 default:if(this.gr(['Id',',','@','}'])){ this.attachLocation( $.value ); }continue
 }
-case 811:if(this.annoValue(_={},0))$.value=_.value;continue
+case 810:if(this.annoValue(_={},0))$.value=_.value;continue
 default:
 $.value.name = name
 return this.exit_()
@@ -4414,53 +4419,51 @@ return this.exit_()
 annoValue($,$next){
 $.value??={}
 let sign;let sub;let ellipsis;let upTo;let _
-this.rule_(813,$next)
+this.rule_(812,$next)
 for(;;)switch(this.s){
-case 813:switch(this.lk()){
+case 812: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(814))sign=this.lb();continue
+case'+':case'-':if(this.c(813))sign=this.lb();continue
 case'Id':case'@':this.annoPath({nameOrRef:$.value,category:'annoref'},0);continue
-case'{':if(this.c(815)){ if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
+case'{':if(this.c(814)){ if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
 else { $.value.struct = Object.create(null); $.value.literal = 'struct'; } }continue
-case'[':if(this.c(819)){this.arrayAnno(); $.value.val = []; $.value.literal = 'array' }continue
-case'(':this.c(826);continue
+case'[':if(this.c(817)){this.arrayAnno(); $.value.val = []; $.value.literal = 'array' }continue
+case'(':this.c(823);continue
 default:this.ei();continue
 }
-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 );
+case 813:if(this.m(0,'Number')){ this.adjustAnnoNumber( $.value = this.numberLiteral( sign ) ); }continue
+case 814:switch(this.l()){
+case'Id':case'@':if(this.annoStructValue(_={},815)){sub=_.value; if ($.value.$flatten) $.value.$flatten.push( sub );
 else this.addDef( sub, $.value, 'struct', null, sub.name ); }continue
-default:this.s=817;continue
+default:this.s=816;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
+case 815:switch(this.l()){
+case',':this.c(814);continue
+case'}':this.s=816;continue
+case'Id':case'@':this.ec('fail')&&this.g(814);continue
 default:this.e();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 816:this.ec('arrayAnno','orNotEmpty')&&this.m(0,'}');continue
+case 817:switch(this.l()){
+case'Id':case'#':case'(':case'+':case'-':case'@':case'[':case'{':case'Number':case'String':case'QuotedLiteral':if(this.annoValue(_={},821)){sub=_.value; $.value.val.push( sub ) }continue
+case'...':if(this.gc(822,'arrayAnno','ellipsis')&&this.c(818))ellipsis=this.lb();continue
+default:this.s=822;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
+case 818:switch(this.lk()){
+case'up':this.ck(819);continue
+case',':case']':this.s=821;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location } ); }continue
 default:this.e();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
+case 819:this.mk(820,'to');continue
+case 820:if(this.annoValue(_={},821)){upTo=_.value; $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location, upTo: upTo } ); }continue
+case 821:switch(this.l()){
+case',':this.c(817);continue
+case']':this.s=822;continue
 default:this.e();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
+case 822:this.ec('arrayAnno','bracket')&&this.m(0,']');continue
+case 823:if(this.condition(_={},824))$.value=_.expr;continue
+case 824:if(this.m(0,')')){ $.value.$tokenTexts = this.ruleTokensText(); }continue
 default:
 this.attachLocation( $.value )
 return this.exit_()