@sap/cds-compiler 5.3.2 → 5.4.0

package/lib/gen/CdlParser.js

@@ -1,4 +1,4 @@
-// Parser generated by redepage v0.1.12
+// Parser generated by redepage v0.1.16
 'use strict;'
 const { XsnSource, XsnArtifact, XsnName } = require( '../compiler/xsn-model' );
 const AstBuildingParser = require('../parsers/AstBuildingParser');
@@ -133,7 +133,7 @@ const table = [
   },
   /* 8 */ ['m',0,'}'],
   'artifactDefOrExtend',
-  /* 10 */ { '@': [10,777], '': 11 },
+  /* 10 */ { '@': [10,780], '': 11 },
   /* 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,
@@ -199,22 +199,22 @@ const table = [
   'serviceDef',
   /* 44 */ ['mk',45,'service'],
   /* 45 */ [46,36],
-  /* 46 */ { '@': [46,783], '': 47 },
+  /* 46 */ { '@': [46,786], '': 47 },
   /* 47 */ { '{': [0,5], '': 0 },
   'contextDef',
   /* 49 */ ['mk',50,'context'],
   /* 50 */ [51,36],
-  /* 51 */ { '@': [51,783], '': 52 },
+  /* 51 */ { '@': [51,786], '': 52 },
   /* 52 */ { '{': [0,5], '': 0 },
   'annotationDef',
   /* 54 */ ['mk',55,'annotation'],
   /* 55 */ [56,36],
-  /* 56 */ { '@': [56,783], '': 57 },
+  /* 56 */ { '@': [56,786], '': 57 },
   /* 57 */ [0,349],
   'typeDef',
   /* 59 */ ['mk',60,'type'],
   /* 60 */ [61,36],
-  /* 61 */ { '@': [61,783], '': 62 },
+  /* 61 */ { '@': [61,786], '': 62 },
   /* 62 */ [0,349],
   'aspectDef',
   /* 64 */ {
@@ -223,7 +223,7 @@ const table = [
   },
   /* 65 */ ['mk',66,'entity'],
   /* 66 */ [67,36],
-  /* 67 */ { '@': [67,783], '': 68 },
+  /* 67 */ { '@': [67,786], '': 68 },
   /* 68 */ {
     '{': [69,160],
     ':': ['c',70],
@@ -239,7 +239,7 @@ const table = [
   'entityDef',
   /* 77 */ ['mk',78,'entity'],
   /* 78 */ [79,36],
-  /* 79 */ { '@': [79,783], '': 80 },
+  /* 79 */ { '@': [79,786], '': 80 },
   /* 80 */ { '(': [81,144], '': 81 },
   /* 81 */ {
     ':': ['c',82],
@@ -254,16 +254,16 @@ const table = [
   },
   /* 85 */ [89,160],
   /* 86 */ {
-    '(': [89,461], select: '(',
-    projection: [87,455],
+    '(': [89,463], select: '(',
+    projection: [87,457],
   },
-  /* 87 */ { group: [88,610], where: 'group', having: 'group', '': 88 },
-  /* 88 */ { limit: [89,622], order: 'limit', '': 89 },
+  /* 87 */ { group: [88,613], where: 'group', having: 'group', '': 88 },
+  /* 88 */ { limit: [89,625], order: 'limit', '': 89 },
   /* 89 */ { actions: [0,127], '': 0 },
   'viewDef',
   /* 91 */ ['mk',92,'view'],
   /* 92 */ [93,36],
-  /* 93 */ { '@': [93,783], '': 94 },
+  /* 93 */ { '@': [93,786], '': 94 },
   /* 94 */ {
     '(': [100,144],
     with: ['ck',95],
@@ -275,11 +275,11 @@ const table = [
   /* 98 */ [97,149],
   /* 99 */ ['g',100],
   /* 100 */ ['mk',101,'as'],
-  /* 101 */ [0,461],
+  /* 101 */ [0,463],
   'eventDef',
   /* 103 */ ['mk',104,'event'],
   /* 104 */ [105,36],
-  /* 105 */ { '@': [105,783], '': 106 },
+  /* 105 */ { '@': [105,786], '': 106 },
   /* 106 */ {
     '{': [0,160],
     ':': ['c',107],
@@ -287,7 +287,7 @@ const table = [
   /* 107 */ {
     '{': [0,160],
     Id: [108,40],
-    projection: [0,455,1],
+    projection: [0,457,1],
   },
   /* 108 */ { ',': 109, '{': 109, '': 113 },
   /* 109 */ { ',': ['c',110], '': 112 },
@@ -297,17 +297,17 @@ const table = [
     '{': 112,
   },
   /* 112 */ [0,160],
-  /* 113 */ { '@': [113,777], '': 0 },
+  /* 113 */ { '@': [113,780], '': 0 },
   'actionMainDef',
   /* 115 */ ['mk',116,'action'],
   /* 116 */ [117,36],
-  /* 117 */ { '@': [117,783], '': 118 },
+  /* 117 */ { '@': [117,786], '': 118 },
   /* 118 */ [119,144],
   /* 119 */ { returns: [0,156], '': 0 },
   'functionMainDef',
   /* 121 */ ['mk',122,'function'],
   /* 122 */ [123,36],
-  /* 123 */ { '@': [123,783], '': 124 },
+  /* 123 */ { '@': [123,786], '': 124 },
   /* 124 */ [125,144],
   /* 125 */ [0,156],
   'actionsBlock',
@@ -321,17 +321,17 @@ const table = [
   },
   /* 131 */ ['m',0,'}'],
   'boundActionFunctionDef',
-  /* 133 */ { '@': [133,777], '': 134 },
+  /* 133 */ { '@': [133,780], '': 134 },
   /* 134 */ {
     action: ['ck',135],
     function: ['ck',139],
   },
   /* 135 */ ['mi',136],
-  /* 136 */ { '@': [136,783], '': 137 },
+  /* 136 */ { '@': [136,786], '': 137 },
   /* 137 */ [138,144],
   /* 138 */ { returns: [0,156], '': 0 },
   /* 139 */ ['mi',140],
-  /* 140 */ { '@': [140,783], '': 141 },
+  /* 140 */ { '@': [140,786], '': 141 },
   /* 141 */ [142,144],
   /* 142 */ [0,156],
   'paramsList',
@@ -343,18 +343,18 @@ const table = [
   },
   /* 147 */ ['m',0,')'],
   'paramDef',
-  /* 149 */ { '@': [149,777], '': 150 },
+  /* 149 */ { '@': [149,780], '': 150 },
   /* 150 */ ['miA',151],
-  /* 151 */ { '@': [151,783], '': 152 },
+  /* 151 */ { '@': [151,786], '': 152 },
   /* 152 */ {
     '{': [153,160],
     ':': ['c',154],
   },
-  /* 153 */ { not: [0,448], null: 'not', '': 0 },
+  /* 153 */ { not: [0,450], null: 'not', '': 0 },
   /* 154 */ [0,360],
   'returnsSpec',
   /* 156 */ ['mk',157,'returns'],
-  /* 157 */ { '@': [157,777], '': 158 },
+  /* 157 */ { '@': [157,780], '': 158 },
   /* 158 */ [0,360],
   'elementsBlock',
   /* 160 */ ['m',161,'{'],
@@ -366,25 +366,25 @@ const table = [
   },
   /* 163 */ ['m',0,'}'],
   'elementDef',
-  /* 165 */ { '@': [165,777], '': 166 },
+  /* 165 */ { '@': [165,780], '': 166 },
   /* 166 */ { virtual: ['ck',167,1], '': 167 },
   /* 167 */ { key: ['ck',168], '': 168 },
   /* 168 */ { masked: ['ck',169,1], '': 169 },
   /* 169 */ { element: ['ck',170,1], '': 170 },
   /* 170 */ ['mi',171],
-  /* 171 */ { '@': [171,783], '': 172 },
+  /* 171 */ { '@': [171,786], '': 172 },
   /* 172 */ {
     '{': [173,160],
     ':': ['c',174],
     '': 175
   },
-  /* 173 */ { not: [175,448], null: 'not', '': 175 },
+  /* 173 */ { not: [175,450], null: 'not', '': 175 },
   /* 174 */ [175,360],
   /* 175 */ { '=': ['c',176], '': 0 },
-  /* 176 */ [177,650],
+  /* 176 */ [177,653],
   /* 177 */ { stored: ['ck',178], '': 178 },
   /* 178 */ ['g',179],
-  /* 179 */ { '@': [179,777], '': 0 },
+  /* 179 */ { '@': [179,780], '': 0 },
   'enumSymbolsBlock',
   /* 181 */ ['mk',182,'enum'],
   /* 182 */ ['m',183,'{'],
@@ -395,19 +395,19 @@ const table = [
   },
   /* 185 */ ['m',0,'}'],
   'enumSymbolDef',
-  /* 187 */ { '@': [187,777], '': 188 },
+  /* 187 */ { '@': [187,780], '': 188 },
   /* 188 */ ['mi',189],
-  /* 189 */ { '@': [189,777], '': 190 },
+  /* 189 */ { '@': [189,780], '': 190 },
   /* 190 */ { '=': ['c',191], '': 0 },
   /* 191 */ {
     String: ['c',193],
     Number: ['c',193],
     '+': ['c',192], '-': '+',
-    Id: [193,774], '#': 'Id', QuotedLiteral: 'Id',
+    Id: [193,777], '#': 'Id', QuotedLiteral: 'Id',
   },
   /* 192 */ ['m',193,'Number'],
   /* 193 */ ['g',194],
-  /* 194 */ { '@': [194,777], '': 0 },
+  /* 194 */ { '@': [194,780], '': 0 },
   'foreignKeysBlock',
   /* 196 */ ['m',197,'{'],
   /* 197 */ { Id: [198,201], '@': 'Id', '': 199 },
@@ -417,7 +417,7 @@ const table = [
   },
   /* 199 */ ['m',0,'}'],
   'foreignKeyDef',
-  /* 201 */ { '@': [201,777], '': 202 },
+  /* 201 */ { '@': [201,780], '': 202 },
   /* 202 */ [203,40],
   /* 203 */ { as: ['ck',204], '': 0 },
   /* 204 */ ['mi',0],
@@ -428,14 +428,14 @@ const table = [
     association: ['ck',209],
     composition: ['ck',211],
   },
-  /* 209 */ { '[': [210,430], '': 210 },
+  /* 209 */ { '[': [210,432], '': 210 },
   /* 210 */ ['mk',213,'to'],
-  /* 211 */ { '[': [212,430], '': 212 },
+  /* 211 */ { '[': [212,432], '': 212 },
   /* 212 */ ['mk',213,'of'],
   /* 213 */ { one: ['ck',214,1], many: 'one', '': 214 },
   /* 214 */ [215,40],
   /* 215 */ ['mk',216,'on'],
-  /* 216 */ [0,642],
+  /* 216 */ [0,645],
   'annotateArtifact',
   /* 218 */ [219,36],
   /* 219 */ {
@@ -446,10 +446,10 @@ const table = [
   /* 220 */ [221,36],
   /* 221 */ { with: ['ck',222], '': 222 },
   /* 222 */ ['g',223],
-  /* 223 */ { '@': [223,777], '': 224 },
+  /* 223 */ { '@': [223,780], '': 224 },
   /* 224 */ { '{': [0,323], '': 0 },
   /* 225 */ ['g',226],
-  /* 226 */ { '@': [226,777], '': 227 },
+  /* 226 */ { '@': [226,780], '': 227 },
   /* 227 */ { '(': [228,310], '': 228 },
   /* 228 */ {
     returns: [0,319],
@@ -467,26 +467,26 @@ const table = [
   /* 233 */ [234,36],
   /* 234 */ { with: ['ck',235], '': 235 },
   /* 235 */ ['g',236],
-  /* 236 */ { '@': [236,777], '': 237 },
+  /* 236 */ { '@': [236,780], '': 237 },
   /* 237 */ {
     elements: ['ck',238],
     '{': 238,
     enum: [0,181],
-    '(': [0,421],
+    '(': [0,423],
     '': 0
   },
   /* 238 */ [0,333],
-  /* 239 */ { '@': [239,777], '': 240 },
+  /* 239 */ { '@': [239,780], '': 240 },
   /* 240 */ { '{': [241,333], '': 0 },
   /* 241 */ { actions: [0,127], '': 0 },
-  /* 242 */ { '@': [242,777], '': 243 },
+  /* 242 */ { '@': [242,780], '': 243 },
   /* 243 */ {
     Id: [244,40],
     elements: ['ck',248,1],
     '{': 248,
     actions: [0,127,1],
     enum: [0,181,1],
-    '(': [0,421],
+    '(': [0,423],
     columns: ['ck',250,1],
     definitions: ['ck',251,1],
     '': 0
@@ -497,35 +497,35 @@ const table = [
   /* 247 */ { actions: [0,127], '': 0 },
   /* 248 */ [249,333],
   /* 249 */ { actions: [0,127], '': 0 },
-  /* 250 */ [0,566],
+  /* 250 */ [0,569],
   /* 251 */ [0,5],
   'extendService',
   /* 253 */ ['mk',254,'service'],
   /* 254 */ [255,36],
   /* 255 */ { with: ['ck',256], '': 256 },
   /* 256 */ ['g',257],
-  /* 257 */ { '@': [257,777], '': 258 },
+  /* 257 */ { '@': [257,780], '': 258 },
   /* 258 */ { '{': [0,5], '': 0 },
   'extendContext',
   /* 260 */ ['mk',261,'context'],
   /* 261 */ [262,36],
   /* 262 */ { with: ['ck',263], '': 263 },
   /* 263 */ ['g',264],
-  /* 264 */ { '@': [264,777], '': 265 },
+  /* 264 */ { '@': [264,780], '': 265 },
   /* 265 */ { '{': [0,5], '': 0 },
   'extendType',
   /* 267 */ ['mk',268,'type'],
   /* 268 */ [269,36],
   /* 269 */ { with: ['ck',272], '': 270 },
-  /* 270 */ { '@': [270,777], '': 271 },
+  /* 270 */ { '@': [270,780], '': 271 },
   /* 271 */ { '{': [0,333], '': 0 },
-  /* 272 */ { '@': [272,777], '': 273 },
+  /* 272 */ { '@': [272,780], '': 273 },
   /* 273 */ {
     Id: [274,40],
     elements: ['ck',277,1],
     '{': 277,
     enum: [0,181,1],
-    '(': [0,421],
+    '(': [0,423],
     '': 0
   },
   /* 274 */ { ',': ['c',275], '': 276 },
@@ -536,8 +536,8 @@ const table = [
   /* 279 */ { aspect: ['ck',280], entity: 'aspect' },
   /* 280 */ [281,36],
   /* 281 */ { with: ['ck',283], '': 282 },
-  /* 282 */ { '@': [282,777], '': 287 },
-  /* 283 */ { '@': [283,777], '': 284 },
+  /* 282 */ { '@': [282,780], '': 287 },
+  /* 283 */ { '@': [283,780], '': 284 },
   /* 284 */ {
     Id: [285,40],
     actions: ['g',287,1],
@@ -552,8 +552,8 @@ const table = [
   /* 291 */ [292,36],
   /* 292 */ { with: ['ck',293], '': 293 },
   /* 293 */ ['g',294],
-  /* 294 */ { '@': [294,777], '': 295 },
-  /* 295 */ { '{': [296,566], '': 296 },
+  /* 294 */ { '@': [294,780], '': 295 },
+  /* 295 */ { '{': [296,569], '': 296 },
   /* 296 */ { actions: [0,127], '': 0 },
   'annotateActionsBlock',
   /* 298 */ ['mk',299,'actions'],
@@ -566,9 +566,9 @@ const table = [
   },
   /* 302 */ ['m',0,'}'],
   'annotateBoundAction',
-  /* 304 */ { '@': [304,777], '': 305 },
+  /* 304 */ { '@': [304,780], '': 305 },
   /* 305 */ ['mi',306],
-  /* 306 */ { '@': [306,777], '': 307 },
+  /* 306 */ { '@': [306,780], '': 307 },
   /* 307 */ { '(': [308,310], '': 308 },
   /* 308 */ { returns: [0,319,1], '': 0 },
   'annotateParamsBlock',
@@ -580,12 +580,12 @@ const table = [
   },
   /* 313 */ ['m',0,')'],
   'annotateParam',
-  /* 315 */ { '@': [315,777], '': 316 },
+  /* 315 */ { '@': [315,780], '': 316 },
   /* 316 */ ['mi',317],
-  /* 317 */ { '@': [317,777], '': 0 },
+  /* 317 */ { '@': [317,780], '': 0 },
   'annotateReturns',
   /* 319 */ ['mk',320,'returns'],
-  /* 320 */ { '@': [320,777], '': 321 },
+  /* 320 */ { '@': [320,780], '': 321 },
   /* 321 */ { '{': [0,323], '': 0 },
   'annotateElementsBlock',
   /* 323 */ ['m',324,'{'],
@@ -597,9 +597,9 @@ const table = [
   },
   /* 326 */ ['m',0,'}'],
   'annotateElement',
-  /* 328 */ { '@': [328,777], '': 329 },
+  /* 328 */ { '@': [328,780], '': 329 },
   /* 329 */ ['mi',330],
-  /* 330 */ { '@': [330,777], '': 331 },
+  /* 330 */ { '@': [330,780], '': 331 },
   /* 331 */ { '{': [0,323], '': 0 },
   'extendElementsBlock',
   /* 333 */ ['m',334,'{'],
@@ -611,7 +611,7 @@ const table = [
   },
   /* 336 */ ['m',0,'}'],
   'elementDefOrExtend',
-  /* 338 */ { '@': [338,777], '': 339 },
+  /* 338 */ { '@': [338,780], '': 339 },
   /* 339 */ {
     Id: [0,165], '@': 'Id', key: 'Id',
     extend: ['ck',340,1],
@@ -619,14 +619,14 @@ const table = [
   /* 340 */ { element: ['ck',341,1], '': 341 },
   /* 341 */ ['mi',342],
   /* 342 */ { with: ['ck',345], '': 343 },
-  /* 343 */ { '@': [343,777], '': 344 },
+  /* 343 */ { '@': [343,780], '': 344 },
   /* 344 */ { '{': [0,333], '': 0 },
-  /* 345 */ { '@': [345,777], '': 346 },
+  /* 345 */ { '@': [345,780], '': 346 },
   /* 346 */ {
     elements: ['ck',347],
     '{': 347,
     enum: [0,181],
-    '(': [0,421],
+    '(': [0,423],
     '': 0
   },
   /* 347 */ [0,333],
@@ -635,13 +635,13 @@ const table = [
     '{': [350,160],
     ':': ['c',351],
   },
-  /* 350 */ { not: [0,448], null: 'not', '': 0 },
+  /* 350 */ { not: [0,450], null: 'not', '': 0 },
   /* 351 */ {
     '{': [0,360,1], many: '{', type: '{', array: '{', localized: '{', association: '{', composition: '{',
     Id: [352,40],
   },
   /* 352 */ {
-    '(': [353,410], ':': '(',
+    '(': [353,411], ':': '(',
     '@': [0,362], not: '@', enum: '@', null: '@', default: '@',
     ',': 354, '{': 354,
     '': 0
@@ -654,785 +654,793 @@ const table = [
     '{': 357,
   },
   /* 357 */ [358,160],
-  /* 358 */ { not: [0,448], null: 'not', '': 0 },
+  /* 358 */ { not: [0,450], null: 'not', '': 0 },
   'typeExpression',
   /* 360 */ {
     '{': [361,160],
-    Id: [362,409],
-    type: [362,401,1],
-    localized: ['ck',370,1],
-    association: ['ck',374,1],
-    composition: ['ck',383,1],
-    array: ['ck',393,1],
-    many: ['ck',394,1],
+    Id: [362,410],
+    type: [362,402,1],
+    localized: ['ck',371,1],
+    association: ['ck',375,1],
+    composition: ['ck',384,1],
+    array: ['ck',394,1],
+    many: ['ck',395,1],
   },
-  /* 361 */ { not: [0,448], null: 'not', '': 0 },
-  /* 362 */ { not: [363,448], null: 'not', '': 363 },
-  /* 363 */ ['g',364],
-  /* 364 */ {
-    not: [365,442], null: 'not', default: 'not',
-    enum: [366,181],
-    '@': 367,
+  /* 361 */ { not: [0,450], null: 'not', '': 0 },
+  /* 362 */ { not: [363,450], null: 'not', '': 363 },
+  /* 363 */ {
+    not: [364,444], null: 'not', default: 'not',
+    '@': 366,
+    enum: 369,
     '': 0
   },
-  /* 365 */ { '@': [365,777], '': 0 },
-  /* 366 */ { not: [0,442], null: 'not', default: 'not', '': 0 },
-  /* 367 */ { '@': [367,777], '': 368 },
-  /* 368 */ { enum: [369,181], '': 0 },
-  /* 369 */ { not: [0,442], null: 'not', default: 'not', '': 0 },
-  /* 370 */ [371,409],
-  /* 371 */ { not: [372,442], null: 'not', default: 'not', '': 372 },
-  /* 372 */ ['g',373],
-  /* 373 */ { '@': [373,777], '': 0 },
-  /* 374 */ { '[': [375,430], '': 375 },
-  /* 375 */ ['mk',376,'to'],
-  /* 376 */ { one: ['ck',377,1], many: 'one', '': 377 },
-  /* 377 */ [378,40],
-  /* 378 */ {
-    on: ['ck',379],
-    '{': [380,196],
-    '': 380
-  },
-  /* 379 */ [381,642],
-  /* 380 */ { not: [381,442], null: 'not', default: 'not', '': 381 },
-  /* 381 */ ['g',382],
-  /* 382 */ { '@': [382,777], '': 0 },
-  /* 383 */ { '[': [384,430], '': 384 },
-  /* 384 */ ['mk',385,'of'],
-  /* 385 */ { one: ['ck',386,1], many: 'one', '': 386 },
-  /* 386 */ {
-    Id: [387,40],
-    '{': 392,
+  /* 364 */ { '@': 365, '': 0 },
+  /* 365 */ { '@': [365,780], '': 0 },
+  /* 366 */ { '@': [366,780], '': 367 },
+  /* 367 */ { enum: [368,181], '': 0 },
+  /* 368 */ { not: [0,444], null: 'not', default: 'not', '': 0 },
+  /* 369 */ [370,181],
+  /* 370 */ { not: [0,444], null: 'not', default: 'not', '': 0 },
+  /* 371 */ [372,410],
+  /* 372 */ { not: [373,444], null: 'not', default: 'not', '': 373 },
+  /* 373 */ { '@': 374, '': 0 },
+  /* 374 */ { '@': [374,780], '': 0 },
+  /* 375 */ { '[': [376,432], '': 376 },
+  /* 376 */ ['mk',377,'to'],
+  /* 377 */ { one: ['ck',378,1], many: 'one', '': 378 },
+  /* 378 */ [379,40],
+  /* 379 */ {
+    on: ['ck',380],
+    '{': [381,196],
+    '': 381
   },
+  /* 380 */ [382,645],
+  /* 381 */ { not: [382,444], null: 'not', default: 'not', '': 382 },
+  /* 382 */ ['g',383],
+  /* 383 */ { '@': [383,780], '': 0 },
+  /* 384 */ { '[': [385,432], '': 385 },
+  /* 385 */ ['mk',386,'of'],
+  /* 386 */ { one: ['ck',387,1], many: 'one', '': 387 },
   /* 387 */ {
-    on: ['ck',388],
-    '{': [389,196],
-    '': 389
+    Id: [388,40],
+    '{': 393,
+  },
+  /* 388 */ {
+    on: ['ck',389],
+    '{': [390,196],
+    '': 390
   },
-  /* 388 */ [390,642],
-  /* 389 */ { not: [390,442], null: 'not', default: 'not', '': 390 },
-  /* 390 */ ['g',391],
-  /* 391 */ { '@': [391,777], '': 0 },
-  /* 392 */ [0,160],
-  /* 393 */ ['mk',394,'of'],
-  /* 394 */ {
-    '{': [395,160],
-    Id: [396,409],
-    type: [396,401,1],
+  /* 389 */ [391,645],
+  /* 390 */ { not: [391,444], null: 'not', default: 'not', '': 391 },
+  /* 391 */ ['g',392],
+  /* 392 */ { '@': [392,780], '': 0 },
+  /* 393 */ [0,160],
+  /* 394 */ ['mk',395,'of'],
+  /* 395 */ {
+    '{': [396,160],
+    Id: [397,410],
+    type: [397,402,1],
+  },
+  /* 396 */ { not: [0,450], null: 'not', '': 0 },
+  /* 397 */ { not: [398,450], null: 'not', '': 398 },
+  /* 398 */ {
+    enum: [399,181],
+    '@': 400,
+    '': 0
   },
-  /* 395 */ { not: [0,448], null: 'not', '': 0 },
-  /* 396 */ { not: [397,448], null: 'not', '': 397 },
-  /* 397 */ { enum: [398,181], '': 399 },
-  /* 398 */ { not: [0,448], null: 'not', '': 0 },
-  /* 399 */ { '@': [399,777], '': 0 },
+  /* 399 */ { not: [0,450], null: 'not', '': 0 },
+  /* 400 */ { '@': [400,780], '': 0 },
   'typeTypeOf',
-  /* 401 */ ['mk',402,'type'],
-  /* 402 */ ['mk',403,'of'],
-  /* 403 */ [404,40],
-  /* 404 */ { ':': ['c',405], '': 0 },
-  /* 405 */ ['miA',406],
-  /* 406 */ { '.': ['c',407], '': 0 },
-  /* 407 */ ['miA',406],
+  /* 402 */ ['mk',403,'type'],
+  /* 403 */ ['mk',404,'of'],
+  /* 404 */ [405,40],
+  /* 405 */ { ':': ['c',406], '': 0 },
+  /* 406 */ ['miA',407],
+  /* 407 */ { '.': ['c',408], '': 0 },
+  /* 408 */ ['miA',407],
   'typeRefOptArgs',
-  /* 409 */ [410,40],
-  /* 410 */ {
-    ':': ['c',411],
-    '(': ['c',414],
+  /* 410 */ [411,40],
+  /* 411 */ {
+    ':': ['c',412],
+    '(': ['c',415],
     '': 0
   },
-  /* 411 */ ['miA',412],
-  /* 412 */ { '.': ['c',413], '': 0 },
-  /* 413 */ ['miA',412],
-  /* 414 */ {
-    Number: ['c',415],
-    Id: 417,
+  /* 412 */ ['miA',413],
+  /* 413 */ { '.': ['c',414], '': 0 },
+  /* 414 */ ['miA',413],
+  /* 415 */ {
+    Number: ['c',416],
+    Id: 419,
   },
-  /* 415 */ { ',': ['c',416], '': 419 },
-  /* 416 */ {
-    Number: ['c',415],
-    floating: ['ck',415], variable: 'floating',
-    ')': 419,
+  /* 416 */ { ',': ['c',417], '': 418 },
+  /* 417 */ {
+    Number: ['c',416],
+    floating: ['ck',416], variable: 'floating',
+    ')': 418,
   },
-  /* 417 */ { Id: [418,426], '': 419 },
-  /* 418 */ {
-    ',': ['c',417],
-    ')': 419,
+  /* 418 */ ['g',421],
+  /* 419 */ { Id: [420,428], '': 421 },
+  /* 420 */ {
+    ',': ['c',419],
+    ')': 421,
   },
-  /* 419 */ ['m',0,')'],
+  /* 421 */ ['m',0,')'],
   'typeNamedArgsList',
-  /* 421 */ ['m',422,'('],
-  /* 422 */ { Id: [423,426], '': 424 },
-  /* 423 */ {
-    ',': ['c',422],
-    ')': 424,
+  /* 423 */ ['m',424,'('],
+  /* 424 */ { Id: [425,428], '': 426 },
+  /* 425 */ {
+    ',': ['c',424],
+    ')': 426,
   },
-  /* 424 */ ['m',0,')'],
+  /* 426 */ ['m',0,')'],
   'typeNamedArg',
-  /* 426 */ ['mi',427],
-  /* 427 */ ['m',428,':'],
-  /* 428 */ {
+  /* 428 */ ['mi',429],
+  /* 429 */ ['m',430,':'],
+  /* 430 */ {
     Number: ['c',0],
     floating: ['ck',0], variable: 'floating',
   },
   'cardinality',
-  /* 430 */ ['m',431,'['],
-  /* 431 */ {
-    '*': ['c',432],
-    Number: ['c',434],
-    '': 436
+  /* 432 */ ['m',433,'['],
+  /* 433 */ {
+    '*': ['c',434],
+    Number: ['c',436],
+    '': 438
   },
-  /* 432 */ { ',': ['c',433], '': 436 },
-  /* 433 */ [436,438],
-  /* 434 */ {
-    ',': ['c',435],
-    '..': [436,439],
-    '': 436
+  /* 434 */ { ',': ['c',435], '': 438 },
+  /* 435 */ [438,440],
+  /* 436 */ {
+    ',': ['c',437],
+    '..': [438,441],
+    '': 438
   },
-  /* 435 */ [436,438],
-  /* 436 */ ['m',0,']'],
+  /* 437 */ [438,440],
+  /* 438 */ ['m',0,']'],
   'targetCardinality',
-  /* 438 */ {
+  /* 440 */ {
     '*': ['c',0],
-    Number: ['c',439],
+    Number: ['c',441],
   },
-  /* 439 */ { '..': ['c',440], '': 0 },
-  /* 440 */ {
+  /* 441 */ { '..': ['c',442], '': 0 },
+  /* 442 */ {
     '*': ['c',0],
     Number: ['c',0],
   },
   'nullabilityAndDefault',
-  /* 442 */ {
-    not: [443,448], null: 'not',
-    default: ['ck',445],
+  /* 444 */ {
+    not: [445,450], null: 'not',
+    default: ['ck',447],
   },
-  /* 443 */ { default: ['ck',444], '': 0 },
-  /* 444 */ [0,650],
-  /* 445 */ [446,650],
-  /* 446 */ { not: [0,448], null: 'not', '': 0 },
+  /* 445 */ { default: ['ck',446], '': 0 },
+  /* 446 */ [0,653],
+  /* 447 */ [448,653],
+  /* 448 */ { not: [0,450], null: 'not', '': 0 },
   'nullability',
-  /* 448 */ {
+  /* 450 */ {
     null: ['ck',0],
-    not: ['ck',449],
+    not: ['ck',451],
   },
-  /* 449 */ ['mk',0,'null'],
+  /* 451 */ ['mk',0,'null'],
   'queryEOF',
-  /* 451 */ [452,461],
-  /* 452 */ { ';': ['c',453], '': 453 },
-  /* 453 */ ['m',0,'EOF'],
+  /* 453 */ [454,463],
+  /* 454 */ { ';': ['c',455], '': 455 },
+  /* 455 */ ['m',0,'EOF'],
   'projectionSpec',
-  /* 455 */ ['mk',456,'projection'],
-  /* 456 */ ['mk',457,'on'],
-  /* 457 */ [458,520],
-  /* 458 */ { '{': [459,566], '': 459 },
-  /* 459 */ { excluding: [0,559], '': 0 },
+  /* 457 */ ['mk',458,'projection'],
+  /* 458 */ ['mk',459,'on'],
+  /* 459 */ [460,523],
+  /* 460 */ { '{': [461,569], '': 461 },
+  /* 461 */ { excluding: [0,562], '': 0 },
   'queryExpression',
-  /* 461 */ {
-    '(': ['c',462],
-    Id: [464,471],
+  /* 463 */ {
+    '(': ['c',464],
+    Id: [466,473],
   },
-  /* 462 */ [463,461],
-  /* 463 */ ['m',464,')'],
-  /* 464 */ {
-    intersect: ['ck',465],
-    minus: ['ck',465], except: 'minus',
-    union: ['ck',466],
-    '': 468
+  /* 464 */ [465,463],
+  /* 465 */ ['m',466,')'],
+  /* 466 */ {
+    intersect: ['ck',467],
+    minus: ['ck',467], except: 'minus',
+    union: ['ck',468],
+    '': 470
   },
-  /* 465 */ { distinct: ['ck',467], '': 467 },
-  /* 466 */ { all: ['ck',467], distinct: 'all', '': 467 },
-  /* 467 */ [464,461],
-  /* 468 */ { limit: ['g',469], order: 'limit', '': 0 },
-  /* 469 */ [0,622],
+  /* 467 */ { distinct: ['ck',469], '': 469 },
+  /* 468 */ { all: ['ck',469], distinct: 'all', '': 469 },
+  /* 469 */ [466,463],
+  /* 470 */ { limit: ['g',471], order: 'limit', '': 0 },
+  /* 471 */ [0,625],
   'selectQuery',
-  /* 471 */ ['mk',472,'select'],
-  /* 472 */ {
-    from: ['ck',473],
-    all: ['ck',483,1], distinct: 'all',
-    Id: 483, '#': 483, '(': 483, '*': 483, '+': 483, '-': 483, ':': 483, '?': 483, '@': 483, '{': 483, key: 483, not: 483, case: 483, cast: 483, null: 483, true: 483, false: 483, Number: 483, String: 483, exists: 483, QuotedLiteral: 483,
-  },
-  /* 473 */ [474,490],
-  /* 474 */ { mixin: ['ck',475], '': 480 },
-  /* 475 */ ['m',476,'{'],
-  /* 476 */ { Id: [477,206], '': 478 },
-  /* 477 */ {
-    ';': ['c',476],
-    '}': 478,
+  /* 473 */ ['mk',474,'select'],
+  /* 474 */ {
+    from: ['ck',475],
+    all: ['ck',485,1], distinct: 'all',
+    Id: 485, '#': 485, '(': 485, '*': 485, '+': 485, '-': 485, ':': 485, '?': 485, '@': 485, '{': 485, key: 485, not: 485, case: 485, cast: 485, null: 485, true: 485, false: 485, Number: 485, String: 485, exists: 485, QuotedLiteral: 485,
   },
-  /* 478 */ ['m',479,'}'],
-  /* 479 */ ['mk',480,'into'],
-  /* 480 */ { all: ['ck',481], distinct: 'all', '': 481 },
-  /* 481 */ { '{': [482,566], '': 482 },
-  /* 482 */ { excluding: [488,559], '': 488 },
-  /* 483 */ {
-    '*': ['c',484],
-    Id: [484,576], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', '@': 'Id', '{': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
+  /* 475 */ [476,492],
+  /* 476 */ { mixin: ['ck',477], '': 482 },
+  /* 477 */ ['m',478,'{'],
+  /* 478 */ { Id: [479,206], '': 480 },
+  /* 479 */ {
+    ';': ['c',478],
+    '}': 480,
   },
-  /* 484 */ { ',': ['c',485], '': 486 },
+  /* 480 */ ['m',481,'}'],
+  /* 481 */ ['mk',482,'into'],
+  /* 482 */ { all: ['ck',483], distinct: 'all', '': 483 },
+  /* 483 */ { '{': [484,569], '': 484 },
+  /* 484 */ { excluding: [490,562], '': 490 },
   /* 485 */ {
-    '*': ['c',484],
-    Id: [484,576], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', '@': 'Id', '{': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
+    '*': ['c',486],
+    Id: [486,579], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', '@': 'Id', '{': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
+  },
+  /* 486 */ { ',': ['c',487], '': 488 },
+  /* 487 */ {
+    '*': ['c',486],
+    Id: [486,579], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', '@': 'Id', '{': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
   },
-  /* 486 */ ['mk',487,'from'],
-  /* 487 */ [488,490],
-  /* 488 */ { group: [0,610], where: 'group', having: 'group', '': 0 },
+  /* 488 */ ['mk',489,'from'],
+  /* 489 */ [490,492],
+  /* 490 */ { group: [0,613], where: 'group', having: 'group', '': 0 },
   'querySource',
-  /* 490 */ [491,495],
-  /* 491 */ { ',': 492, '': 0 },
-  /* 492 */ { ',': ['c',493], '': 0 },
-  /* 493 */ [492,495],
+  /* 492 */ [493,497],
+  /* 493 */ { ',': 494, '': 0 },
+  /* 494 */ { ',': ['c',495], '': 0 },
+  /* 495 */ [494,497],
   'tableExpression',
-  /* 495 */ {
-    '(': [496,507],
-    Id: [497,520],
-  },
-  /* 496 */ ['g',497],
   /* 497 */ {
-    cross: ['ck',498],
-    inner: ['ck',501],
-    full: ['ck',500], left: 'full', right: 'full',
-    join: 502,
-    '': 0
+    '(': [498,510],
+    Id: [499,523],
   },
-  /* 498 */ ['mk',499,'join'],
+  /* 498 */ ['g',499],
   /* 499 */ {
-    '(': [497,507],
-    Id: [497,520],
+    cross: ['ck',500],
+    inner: ['ck',503],
+    full: ['ck',502], left: 'full', right: 'full',
+    join: ['ck',505],
+    '': 0
   },
-  /* 500 */ { outer: ['ck',501], '': 501 },
-  /* 501 */ { one: [502,514], many: 'one', exact: 'one', '': 502 },
-  /* 502 */ ['mk',503,'join'],
-  /* 503 */ [504,495],
-  /* 504 */ ['mk',505,'on'],
-  /* 505 */ [497,642],
+  /* 500 */ ['mk',501,'join'],
+  /* 501 */ {
+    '(': [499,510],
+    Id: [499,523],
+  },
+  /* 502 */ { outer: ['ck',503], '': 503 },
+  /* 503 */ { one: [504,517], many: 'one', exact: 'one', '': 504 },
+  /* 504 */ ['mk',505,'join'],
+  /* 505 */ ['g',506],
+  /* 506 */ [507,497],
+  /* 507 */ ['mk',508,'on'],
+  /* 508 */ [499,645],
   'tableOrQueryParens',
-  /* 507 */ ['m',508,'('],
-  /* 508 */ {
-    '(': [509,507],
-    Id: [510,495],
-    select: [510,461],
+  /* 510 */ ['m',511,'('],
+  /* 511 */ {
+    '(': [512,510],
+    Id: [513,497],
+    select: [513,463],
   },
-  /* 509 */ {
-    full: [510,496], join: 'full', left: 'full', cross: 'full', inner: 'full', right: 'full',
-    limit: [510,464], minus: 'limit', order: 'limit', union: 'limit', except: 'limit', intersect: 'limit',
-    '': 510
+  /* 512 */ {
+    full: [513,498], join: 'full', left: 'full', cross: 'full', inner: 'full', right: 'full',
+    limit: [513,466], minus: 'limit', order: 'limit', union: 'limit', except: 'limit', intersect: 'limit',
+    '': 513
   },
-  /* 510 */ ['m',511,')'],
-  /* 511 */ {
-    as: ['ck',512],
+  /* 513 */ ['m',514,')'],
+  /* 514 */ {
+    as: ['ck',515],
     Id: ['ci',0],
     '': 0
   },
-  /* 512 */ ['mi',0],
+  /* 515 */ ['mi',0],
   'joinCardinality',
-  /* 514 */ {
-    exact: ['ck',515],
-    one: 515,
-    many: ['ck',516],
-  },
-  /* 515 */ ['mk',516,'one'],
-  /* 516 */ ['mk',517,'to'],
   /* 517 */ {
     exact: ['ck',518],
     one: 518,
+    many: ['ck',519],
+  },
+  /* 518 */ ['mk',519,'one'],
+  /* 519 */ ['mk',520,'to'],
+  /* 520 */ {
+    exact: ['ck',521],
+    one: 521,
     many: ['ck',0],
   },
-  /* 518 */ ['mk',0,'one'],
+  /* 521 */ ['mk',0,'one'],
   'fromRefWithOptAlias',
-  /* 520 */ [521,527],
-  /* 521 */ { ':': ['c',522], '': 523 },
-  /* 522 */ [523,527],
-  /* 523 */ {
-    as: ['ck',524],
+  /* 523 */ [524,530],
+  /* 524 */ { ':': ['c',525], '': 526 },
+  /* 525 */ [526,530],
+  /* 526 */ {
+    as: ['ck',527],
     Id: ['ci',0],
-    '': 525
+    '': 528
   },
-  /* 524 */ ['mi',0],
-  /* 525 */ ['g',0,[]],
+  /* 527 */ ['mi',0],
+  /* 528 */ ['g',0,[]],
   'fromPath',
-  /* 527 */ ['mi',528],
-  /* 528 */ { '(': [529,533], '[': '(', '': 529 },
-  /* 529 */ { '.': ['c',530], '': 0 },
-  /* 530 */ ['miA',531],
-  /* 531 */ { '(': [529,533], '[': '(', '': 529 },
+  /* 530 */ ['mi',531],
+  /* 531 */ { '(': [532,536], '[': '(', '': 532 },
+  /* 532 */ { '.': ['c',533], '': 0 },
+  /* 533 */ ['miA',534],
+  /* 534 */ { '(': [532,536], '[': '(', '': 532 },
   'fromArgumentsAndFilter',
-  /* 533 */ { '(': ['c',534], '': 538 },
-  /* 534 */ { Id: 535 },
-  /* 535 */ { Id: [536,540], '': 537 },
-  /* 536 */ {
-    ',': ['c',535],
-    ')': 537,
+  /* 536 */ { '(': ['c',537], '': 541 },
+  /* 537 */ { Id: 538 },
+  /* 538 */ { Id: [539,543], '': 540 },
+  /* 539 */ {
+    ',': ['c',538],
+    ')': 540,
   },
-  /* 537 */ ['m',538,')'],
-  /* 538 */ { '[': [0,544], '': 0 },
+  /* 540 */ ['m',541,')'],
+  /* 541 */ { '[': [0,547], '': 0 },
   'fromNamedArgument',
-  /* 540 */ ['mi',541],
-  /* 541 */ ['m',542,':'],
-  /* 542 */ [0,650],
+  /* 543 */ ['mi',544],
+  /* 544 */ ['m',545,':'],
+  /* 545 */ [0,653],
   'cardinalityAndFilter',
-  /* 544 */ ['m',545,'['],
-  /* 545 */ { Number: ['c',546], '': 547 },
-  /* 546 */ ['m',547,':'],
-  /* 547 */ [548,550],
-  /* 548 */ ['m',0,']'],
+  /* 547 */ ['m',548,'['],
+  /* 548 */ { Number: ['c',549], '': 550 },
+  /* 549 */ ['m',550,':'],
+  /* 550 */ [551,553],
+  /* 551 */ ['m',0,']'],
   'filterClauses',
-  /* 550 */ {
-    where: ['ck',551],
-    Id: 551, '#': 551, '(': 551, '+': 551, '-': 551, ':': 551, '?': 551, not: 551, case: 551, cast: 551, null: 551, true: 551, false: 551, Number: 551, String: 551, exists: 551, QuotedLiteral: 551,
-    group: ['g',552,1], limit: 'group', order: 'group', having: 'group',
-    '': 552
+  /* 553 */ {
+    where: ['ck',554],
+    Id: 554, '#': 554, '(': 554, '+': 554, '-': 554, ':': 554, '?': 554, not: 554, case: 554, cast: 554, null: 554, true: 554, false: 554, Number: 554, String: 554, exists: 554, QuotedLiteral: 554,
+    group: ['g',555,1], limit: 'group', order: 'group', having: 'group',
+    '': 555
   },
-  /* 551 */ [552,642],
-  /* 552 */ { group: 553, '': 554 },
-  /* 553 */ [554,616],
-  /* 554 */ { having: ['ck',555], '': 556 },
-  /* 555 */ [556,642],
-  /* 556 */ { limit: 557, order: 557, '': 0 },
-  /* 557 */ [0,622],
+  /* 554 */ [555,645],
+  /* 555 */ { group: 556, '': 557 },
+  /* 556 */ [557,619],
+  /* 557 */ { having: ['ck',558], '': 559 },
+  /* 558 */ [559,645],
+  /* 559 */ { limit: 560, order: 560, '': 0 },
+  /* 560 */ [0,625],
   'excludingClause',
-  /* 559 */ ['mk',560,'excluding'],
-  /* 560 */ ['m',561,'{'],
-  /* 561 */ { Id: 562 },
-  /* 562 */ { Id: ['ciA',563], '': 564 },
-  /* 563 */ {
-    ',': ['c',562],
-    '}': 564,
+  /* 562 */ ['mk',563,'excluding'],
+  /* 563 */ ['m',564,'{'],
+  /* 564 */ { Id: 565 },
+  /* 565 */ { Id: ['ciA',566], '': 567 },
+  /* 566 */ {
+    ',': ['c',565],
+    '}': 567,
   },
-  /* 564 */ ['m',0,'}'],
+  /* 567 */ ['m',0,'}'],
   'selectItemsList',
-  /* 566 */ ['m',567,'{'],
-  /* 567 */ {
-    '*': ['c',568],
-    Id: [568,576], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', '@': 'Id', '{': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
-    '': 569
+  /* 569 */ ['m',570,'{'],
+  /* 570 */ {
+    '*': ['c',571],
+    Id: [571,579], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', '@': 'Id', '{': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
+    '': 572
   },
-  /* 568 */ {
-    ',': ['c',567],
-    '}': 569,
+  /* 571 */ {
+    ',': ['c',570],
+    '}': 572,
   },
-  /* 569 */ ['m',0,'}'],
+  /* 572 */ ['m',0,'}'],
   'nestedSelectItemsList',
-  /* 571 */ ['m',572,'{'],
-  /* 572 */ {
-    '*': ['c',573],
-    Id: [573,576], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', '@': 'Id', '{': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
-    '': 574
+  /* 574 */ ['m',575,'{'],
+  /* 575 */ {
+    '*': ['c',576],
+    Id: [576,579], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', '@': 'Id', '{': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
+    '': 577
   },
-  /* 573 */ {
-    ',': ['c',572],
-    '}': 574,
+  /* 576 */ {
+    ',': ['c',575],
+    '}': 577,
   },
-  /* 574 */ ['m',0,'}'],
+  /* 577 */ ['m',0,'}'],
   'selectItemDef',
-  /* 576 */ { '@': [576,780], '': 577 },
-  /* 577 */ { virtual: ['ck',578,1], '': 578 },
-  /* 578 */ { key: ['ck',579], '': 579 },
-  /* 579 */ {
-    Id: [580,650], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
-    '{': [587,571],
-  },
-  /* 580 */ {
-    as: ['ck',581],
-    Id: ['ci',582],
-    '': 582
-  },
-  /* 581 */ ['mi',582],
+  /* 579 */ { '@': [579,783], '': 580 },
+  /* 580 */ { virtual: ['ck',581,1], '': 581 },
+  /* 581 */ { key: ['ck',582], '': 582 },
   /* 582 */ {
-    '{': 583,
-    '.': ['c',585],
-    '': 590
+    Id: [583,653], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
+    '{': [590,574],
+  },
+  /* 583 */ {
+    as: ['ck',584],
+    Id: ['ci',585],
+    '': 585
   },
-  /* 583 */ [584,571],
-  /* 584 */ { excluding: [590,559], '': 590 },
+  /* 584 */ ['mi',585],
   /* 585 */ {
-    '{': [586,571],
-    '*': ['c',590],
+    '{': 586,
+    '.': ['c',588],
+    '': 593
   },
-  /* 586 */ { excluding: [590,559], '': 590 },
-  /* 587 */ { excluding: [588,559], '': 588 },
-  /* 588 */ ['mk',589,'as'],
-  /* 589 */ ['mi',590],
-  /* 590 */ ['g',591],
-  /* 591 */ { '@': [591,783], '': 592 },
-  /* 592 */ { ':': ['c',593], '': 0 },
-  /* 593 */ {
-    type: [607,401,1],
-    localized: ['ck',594,1],
-    Id: 594,
-    redirected: ['ck',595,1],
-    association: ['ck',599,1],
-    composition: ['ck',601,1],
+  /* 586 */ [587,574],
+  /* 587 */ { excluding: [593,562], '': 593 },
+  /* 588 */ {
+    '{': [589,574],
+    '*': ['c',593],
   },
-  /* 594 */ [607,409],
-  /* 595 */ ['mk',596,'to'],
-  /* 596 */ [597,40],
-  /* 597 */ {
-    on: ['ck',598],
-    '{': [607,196],
-    '': 607
+  /* 589 */ { excluding: [593,562], '': 593 },
+  /* 590 */ { excluding: [591,562], '': 591 },
+  /* 591 */ ['mk',592,'as'],
+  /* 592 */ ['mi',593],
+  /* 593 */ ['g',594],
+  /* 594 */ { '@': [594,786], '': 595 },
+  /* 595 */ { ':': ['c',596], '': 0 },
+  /* 596 */ {
+    type: [610,402,1],
+    localized: ['ck',597,1],
+    Id: 597,
+    redirected: ['ck',598,1],
+    association: ['ck',602,1],
+    composition: ['ck',604,1],
   },
-  /* 598 */ [607,642],
-  /* 599 */ { '[': [600,430], '': 600 },
-  /* 600 */ ['mk',603,'to'],
-  /* 601 */ { '[': [602,430], '': 602 },
-  /* 602 */ ['mk',603,'of'],
-  /* 603 */ { one: ['ck',604,1], many: 'one', '': 604 },
-  /* 604 */ [605,40],
-  /* 605 */ ['mk',606,'on'],
-  /* 606 */ [607,642],
-  /* 607 */ ['g',608],
-  /* 608 */ { '@': [608,777], '': 0 },
+  /* 597 */ [610,410],
+  /* 598 */ ['mk',599,'to'],
+  /* 599 */ [600,40],
+  /* 600 */ {
+    on: ['ck',601],
+    '{': [610,196],
+    '': 610
+  },
+  /* 601 */ [610,645],
+  /* 602 */ { '[': [603,432], '': 603 },
+  /* 603 */ ['mk',606,'to'],
+  /* 604 */ { '[': [605,432], '': 605 },
+  /* 605 */ ['mk',606,'of'],
+  /* 606 */ { one: ['ck',607,1], many: 'one', '': 607 },
+  /* 607 */ [608,40],
+  /* 608 */ ['mk',609,'on'],
+  /* 609 */ [610,645],
+  /* 610 */ ['g',611],
+  /* 611 */ { '@': [611,780], '': 0 },
   'whereGroupByHaving',
-  /* 610 */ { where: ['ck',611], '': 612 },
-  /* 611 */ [612,642],
-  /* 612 */ { group: [613,616], '': 613 },
-  /* 613 */ { having: ['ck',614], '': 0 },
-  /* 614 */ [0,642],
+  /* 613 */ { where: ['ck',614], '': 615 },
+  /* 614 */ [615,645],
+  /* 615 */ { group: [616,619], '': 616 },
+  /* 616 */ { having: ['ck',617], '': 0 },
+  /* 617 */ [0,645],
   'groupByClause',
-  /* 616 */ ['mk',617,'group'],
-  /* 617 */ ['mk',618,'by'],
-  /* 618 */ [619,650],
-  /* 619 */ { ',': ['c',620], '': 0 },
-  /* 620 */ [619,650],
+  /* 619 */ ['mk',620,'group'],
+  /* 620 */ ['mk',621,'by'],
+  /* 621 */ [622,653],
+  /* 622 */ { ',': ['c',623], '': 0 },
+  /* 623 */ [622,653],
   'orderByLimitOffset',
-  /* 622 */ { order: [623,628], '': 623 },
-  /* 623 */ { limit: ['ck',624], '': 0 },
-  /* 624 */ [625,650],
-  /* 625 */ { offset: ['ck',626], '': 0 },
-  /* 626 */ [0,650],
+  /* 625 */ { order: [626,631], '': 626 },
+  /* 626 */ { limit: ['ck',627], '': 0 },
+  /* 627 */ [628,653],
+  /* 628 */ { offset: ['ck',629], '': 0 },
+  /* 629 */ [0,653],
   'orderByClause',
-  /* 628 */ ['mk',629,'order'],
-  /* 629 */ ['mk',630,'by'],
-  /* 630 */ [631,634],
-  /* 631 */ { ',': ['c',632], '': 0 },
-  /* 632 */ [631,634],
+  /* 631 */ ['mk',632,'order'],
+  /* 632 */ ['mk',633,'by'],
+  /* 633 */ [634,637],
+  /* 634 */ { ',': ['c',635], '': 0 },
+  /* 635 */ [634,637],
   'orderByExpression',
-  /* 634 */ [635,650],
-  /* 635 */ { asc: ['ck',636], desc: 'asc', '': 636 },
-  /* 636 */ { nulls: ['ck',637], '': 0 },
-  /* 637 */ { last: ['ck',0], first: 'last' },
+  /* 637 */ [638,653],
+  /* 638 */ { asc: ['ck',639], desc: 'asc', '': 639 },
+  /* 639 */ { nulls: ['ck',640], '': 0 },
+  /* 640 */ { last: ['ck',0], first: 'last' },
   'conditionEOF',
-  /* 639 */ [640,650],
-  /* 640 */ ['m',0,'EOF'],
+  /* 642 */ [643,653],
+  /* 643 */ ['m',0,'EOF'],
   'condition',
-  /* 642 */ [0,650],
+  /* 645 */ [0,653],
   'valuePath',
-  /* 644 */ ['mi',645],
-  /* 645 */ { '(': [646,711], '[': '(', '': 646 },
-  /* 646 */ { '.': ['c',647], '': 0 },
-  /* 647 */ ['miA',648],
-  /* 648 */ { '(': [646,711], '[': '(', '': 646 },
+  /* 647 */ ['mi',648],
+  /* 648 */ { '(': [649,714], '[': '(', '': 649 },
+  /* 649 */ { '.': ['c',650], '': 0 },
+  /* 650 */ ['miA',651],
+  /* 651 */ { '(': [649,714], '[': '(', '': 649 },
   'expression',
-  /* 650 */ {
-    '(': [651,678],
-    '#': [661,774], null: '#', true: '#', false: '#', Number: '#', String: '#', QuotedLiteral: '#',
-    ':': ['c',652],
-    '?': ['c',661],
-    Id: [654,644],
-    new: [661,690,1],
-    exists: ['ck',657],
-    case: [661,693],
-    cast: [661,704],
-    '+': ['c',660], '-': '+',
-    not: ['ck',660],
+  /* 653 */ {
+    '(': [654,681],
+    '#': [664,777], null: '#', true: '#', false: '#', Number: '#', String: '#', QuotedLiteral: '#',
+    ':': ['c',655],
+    '?': ['c',664],
+    Id: [657,647],
+    new: [664,693,1],
+    exists: ['ck',660],
+    case: [664,696],
+    cast: [664,707],
+    '+': ['c',663], '-': '+',
+    not: ['ck',663],
   },
-  /* 651 */ ['g',661],
-  /* 652 */ {
-    Id: ['ciA',653],
-    Number: ['c',661],
+  /* 654 */ ['g',664],
+  /* 655 */ {
+    Id: ['ciA',656],
+    Number: ['c',664],
   },
-  /* 653 */ { '.': [661,646], '': 661 },
-  /* 654 */ { over: ['ck',655,1], '': 656 },
-  /* 655 */ [656,738],
-  /* 656 */ ['g',661],
-  /* 657 */ {
-    '(': ['c',658],
-    Id: [661,644],
-    '?': ['c',661],
+  /* 656 */ { '.': [664,649], '': 664 },
+  /* 657 */ { over: ['ck',658], '': 659 },
+  /* 658 */ [659,741],
+  /* 659 */ ['g',664],
+  /* 660 */ {
+    '(': ['c',661],
+    Id: [664,647],
+    '?': ['c',664],
   },
-  /* 658 */ [659,461],
-  /* 659 */ ['m',661,')'],
-  /* 660 */ [661,650],
-  /* 661 */ {
-    '*': ['c',665], '/': '*',
-    '+': ['c',665], '-': '+',
-    '||': ['c',665],
-    and: ['ck',665,1],
-    or: ['ck',665,1],
-    '?': ['c',662],
-    '<': ['c',664], '=': '<', '>': '<', '!=': '<', '<=': '<', '<>': '<', '>=': '<',
-    is: ['ck',666,1],
-    not: ['ck',668],
-    in: ['g',668,1], like: 'in', between: 'in',
+  /* 661 */ [662,463],
+  /* 662 */ ['m',664,')'],
+  /* 663 */ [664,653],
+  /* 664 */ {
+    '*': ['c',668], '/': '*',
+    '+': ['c',668], '-': '+',
+    '||': ['c',668],
+    and: ['ck',668],
+    or: ['ck',668],
+    '?': ['c',665],
+    '<': ['c',667], '=': '<', '>': '<', '!=': '<', '<=': '<', '<>': '<', '>=': '<',
+    is: ['ck',669],
+    not: ['ck',671],
+    in: ['g',671], like: 'in', between: 'in',
     '': 0
   },
-  /* 662 */ [663,650],
-  /* 663 */ ['m',665,':'],
-  /* 664 */ { all: ['ck',665], any: 'all', some: 'all', '': 665 },
-  /* 665 */ [676,650],
-  /* 666 */ { not: ['ck',667], '': 667 },
-  /* 667 */ ['mk',676,'null'],
-  /* 668 */ {
-    between: ['ck',669],
-    in: ['ck',672],
-    like: ['ck',673],
+  /* 665 */ [666,653],
+  /* 666 */ ['m',668,':'],
+  /* 667 */ { all: ['ck',668], any: 'all', some: 'all', '': 668 },
+  /* 668 */ [679,653],
+  /* 669 */ { not: ['ck',670], '': 670 },
+  /* 670 */ ['mk',679,'null'],
+  /* 671 */ {
+    between: ['ck',672],
+    in: ['ck',675],
+    like: ['ck',676],
   },
-  /* 669 */ [670,650],
-  /* 670 */ ['mk',671,'and'],
-  /* 671 */ [676,650],
-  /* 672 */ [676,650],
-  /* 673 */ [674,650],
-  /* 674 */ { escape: ['ck',675,1], '': 676 },
-  /* 675 */ [676,650],
-  /* 676 */ ['g',661],
+  /* 672 */ [673,653],
+  /* 673 */ ['mk',674,'and'],
+  /* 674 */ [679,653],
+  /* 675 */ [679,653],
+  /* 676 */ [677,653],
+  /* 677 */ { escape: ['ck',678], '': 679 },
+  /* 678 */ [679,653],
+  /* 679 */ ['g',664],
   'expressionOrQueryParens',
-  /* 678 */ ['m',679,'('],
-  /* 679 */ {
-    '(': [680,678],
-    Id: [682,650], '#': '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: [683,461],
+  /* 681 */ ['m',682,'('],
+  /* 682 */ {
+    '(': [683,681],
+    Id: [685,653], '#': '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: [686,463],
   },
-  /* 680 */ {
-    '*': [681,651], '+': '*', '-': '*', '/': '*', '<': '*', '=': '*', '>': '*', '?': '*', '!=': '*', '<=': '*', '<>': '*', '>=': '*', in: '*', is: '*', or: '*', '||': '*', and: '*', not: '*', like: '*', between: '*',
-    ',': [683,685],
-    limit: [683,464], minus: 'limit', order: 'limit', union: 'limit', except: 'limit', intersect: 'limit',
-    '': 683
+  /* 683 */ {
+    '*': [684,654], '+': '*', '-': '*', '/': '*', '<': '*', '=': '*', '>': '*', '?': '*', '!=': '*', '<=': '*', '<>': '*', '>=': '*', in: '*', is: '*', or: '*', '||': '*', and: '*', not: '*', like: '*', between: '*',
+    ',': [686,688],
+    limit: [686,466], minus: 'limit', order: 'limit', union: 'limit', except: 'limit', intersect: 'limit',
+    '': 686
   },
-  /* 681 */ { ',': [683,685], '': 683 },
-  /* 682 */ { ',': [683,685], '': 683 },
-  /* 683 */ ['m',0,')'],
+  /* 684 */ { ',': [686,688], '': 686 },
+  /* 685 */ { ',': [686,688], '': 686 },
+  /* 686 */ ['m',0,')'],
   'continueExpressionslist',
-  /* 685 */ ['m',686,','],
-  /* 686 */ { Id: 687, '#': 687, '(': 687, '+': 687, '-': 687, ':': 687, '?': 687, not: 687, case: 687, cast: 687, null: 687, true: 687, false: 687, Number: 687, String: 687, exists: 687, QuotedLiteral: 687 },
-  /* 687 */ { Id: [688,650], '#': '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 },
-  /* 688 */ { ',': ['c',687], '': 0 },
+  /* 688 */ ['m',689,','],
+  /* 689 */ { Id: 690, '#': 690, '(': 690, '+': 690, '-': 690, ':': 690, '?': 690, not: 690, case: 690, cast: 690, null: 690, true: 690, false: 690, Number: 690, String: 690, exists: 690, QuotedLiteral: 690 },
+  /* 690 */ { Id: [691,653], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', not: 'Id', case: 'Id', cast: 'Id', null: 'Id', true: 'Id', false: 'Id', Number: 'Id', String: 'Id', exists: 'Id', QuotedLiteral: 'Id', '': 0 },
+  /* 691 */ { ',': ['c',690], '': 0 },
   'newAndValuePath',
-  /* 690 */ ['mk',691,'new'],
-  /* 691 */ [0,644],
+  /* 693 */ ['mk',694,'new'],
+  /* 694 */ [0,647],
   'caseExpression',
-  /* 693 */ ['mk',694,'case'],
-  /* 694 */ {
-    Id: [695,650], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', not: 'Id', case: 'Id', cast: 'Id', null: 'Id', true: 'Id', false: 'Id', Number: 'Id', String: 'Id', exists: 'Id', QuotedLiteral: 'Id',
-    when: ['g',695,1],
-    '': 695
+  /* 696 */ ['mk',697,'case'],
+  /* 697 */ {
+    Id: [698,653], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', not: 'Id', case: 'Id', cast: 'Id', null: 'Id', true: 'Id', false: 'Id', Number: 'Id', String: 'Id', exists: 'Id', QuotedLiteral: 'Id',
+    when: ['g',698,1],
+    '': 698
   },
-  /* 695 */ { when: 696 },
-  /* 696 */ { when: ['ck',697], '': 700 },
-  /* 697 */ [698,650],
-  /* 698 */ ['mk',699,'then'],
-  /* 699 */ [696,650],
-  /* 700 */ { else: ['ck',701], '': 702 },
-  /* 701 */ [702,650],
-  /* 702 */ ['mk',0,'end'],
+  /* 698 */ { when: 699 },
+  /* 699 */ { when: ['ck',700], '': 703 },
+  /* 700 */ [701,653],
+  /* 701 */ ['mk',702,'then'],
+  /* 702 */ [699,653],
+  /* 703 */ { else: ['ck',704], '': 705 },
+  /* 704 */ [705,653],
+  /* 705 */ ['mk',0,'end'],
   'castFunction',
-  /* 704 */ ['mk',705,'cast'],
-  /* 705 */ ['m',706,'('],
-  /* 706 */ [707,650],
-  /* 707 */ ['mk',708,'as'],
-  /* 708 */ [709,409],
-  /* 709 */ ['m',0,')'],
+  /* 707 */ ['mk',708,'cast'],
+  /* 708 */ ['m',709,'('],
+  /* 709 */ [710,653],
+  /* 710 */ ['mk',711,'as'],
+  /* 711 */ [712,410],
+  /* 712 */ ['m',0,')'],
   'argumentsAndFilter',
-  /* 711 */ { '(': ['c',712], '': 731 },
-  /* 712 */ { Id: ['ciA',719], '': 713 },
-  /* 713 */ { Id: [714,733], '#': 'Id', '(': 'Id', '*': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', Id_all: 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id', '': 730 },
-  /* 714 */ { ',': ['c',715], '': 716 },
-  /* 715 */ {
-    Id: [714,733], '#': 'Id', '(': 'Id', '*': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', not: 'Id', case: 'Id', cast: 'Id', null: 'Id', true: 'Id', false: 'Id', Id_all: 'Id', Number: 'Id', String: 'Id', exists: 'Id', QuotedLiteral: 'Id',
-    ')': ['g',716,1], order: ')',
-  },
-  /* 716 */ { order: ['ck',717], '': 730 },
-  /* 717 */ ['mk',718,'by'],
-  /* 718 */ [730,753],
-  /* 719 */ {
-    ':': ['c',720],
-    '=>': ['c',725],
+  /* 714 */ { '(': ['c',715], '': 734 },
+  /* 715 */ { Id: ['ciA',722], '': 716 },
+  /* 716 */ { Id: [717,736], '#': 'Id', '(': 'Id', '*': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', Id_all: 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id', '': 733 },
+  /* 717 */ { ',': ['c',718], '': 719 },
+  /* 718 */ {
+    Id: [717,736], '#': 'Id', '(': 'Id', '*': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', not: 'Id', case: 'Id', cast: 'Id', null: 'Id', true: 'Id', false: 'Id', Id_all: 'Id', Number: 'Id', String: 'Id', exists: 'Id', QuotedLiteral: 'Id',
+    ')': ['g',719,1], order: ')',
   },
-  /* 720 */ [721,650],
-  /* 721 */ { ',': ['c',722], '': 730 },
+  /* 719 */ { order: ['ck',720], '': 733 },
+  /* 720 */ ['mk',721,'by'],
+  /* 721 */ [733,756],
   /* 722 */ {
-    Id: ['ciA',723],
-    ')': 730,
+    ':': ['c',723],
+    '=>': ['c',728],
+  },
+  /* 723 */ [724,653],
+  /* 724 */ { ',': ['c',725], '': 733 },
+  /* 725 */ {
+    Id: ['ciA',726],
+    ')': 733,
   },
-  /* 723 */ ['m',724,':'],
-  /* 724 */ [721,650],
-  /* 725 */ [726,650],
-  /* 726 */ { ',': ['c',727], '': 730 },
-  /* 727 */ {
-    Id: ['ciA',728],
-    ')': 730,
+  /* 726 */ ['m',727,':'],
+  /* 727 */ [724,653],
+  /* 728 */ [729,653],
+  /* 729 */ { ',': ['c',730], '': 733 },
+  /* 730 */ {
+    Id: ['ciA',731],
+    ')': 733,
   },
-  /* 728 */ ['m',729,'=>'],
-  /* 729 */ [726,650],
-  /* 730 */ ['m',731,')'],
-  /* 731 */ { '[': [0,544], '': 0 },
+  /* 731 */ ['m',732,'=>'],
+  /* 732 */ [729,653],
+  /* 733 */ ['m',734,')'],
+  /* 734 */ { '[': [0,547], '': 0 },
   'funcExpression',
-  /* 733 */ {
+  /* 736 */ {
     ' lookahead': 'lGenericIntroOrExpr',
-    Id: [735,650], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
-    GenericExpr: ['ckA',735],
-    GenericIntro: ['ckA',734],
+    Id: [738,653], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
+    GenericExpr: ['ckA',738],
+    GenericIntro: ['ckA',737],
   },
-  /* 734 */ [735,650],
-  /* 735 */ {
+  /* 737 */ [738,653],
+  /* 738 */ {
     ' lookahead': 'lGenericSeparator',
-    GenericSeparator: ['ckA',736],
+    GenericSeparator: ['ckA',739],
     '': 0
   },
-  /* 736 */ {
+  /* 739 */ {
     ' lookahead': 'lGenericExpr',
-    Id: [735,650], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
-    GenericExpr: ['ckA',735],
+    Id: [738,653], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', ':': 'Id', '?': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
+    GenericExpr: ['ckA',738],
   },
   'overClause',
-  /* 738 */ ['m',739,'('],
-  /* 739 */ { partition: ['ck',740], '': 742 },
-  /* 740 */ ['mk',741,'by'],
-  /* 741 */ [742,749],
-  /* 742 */ { order: ['ck',743], '': 745 },
+  /* 741 */ ['m',742,'('],
+  /* 742 */ { partition: ['ck',743], '': 745 },
   /* 743 */ ['mk',744,'by'],
-  /* 744 */ [745,753],
-  /* 745 */ { rows: ['ck',746], '': 747 },
-  /* 746 */ [747,762],
-  /* 747 */ ['m',0,')'],
+  /* 744 */ [745,752],
+  /* 745 */ { order: ['ck',746], '': 748 },
+  /* 746 */ ['mk',747,'by'],
+  /* 747 */ [748,756],
+  /* 748 */ { rows: ['ck',749], '': 750 },
+  /* 749 */ [750,765],
+  /* 750 */ ['m',0,')'],
   'expressionsAsXpr',
-  /* 749 */ [750,650],
-  /* 750 */ { ',': ['c',751], '': 0 },
-  /* 751 */ [750,650],
+  /* 752 */ [753,653],
+  /* 753 */ { ',': ['c',754], '': 0 },
+  /* 754 */ [753,653],
   'orderByClauseAsXpr',
-  /* 753 */ [754,757],
-  /* 754 */ { ',': ['c',755], '': 0 },
-  /* 755 */ [754,757],
+  /* 756 */ [757,760],
+  /* 757 */ { ',': ['c',758], '': 0 },
+  /* 758 */ [757,760],
   'orderBySpecAsXpr',
-  /* 757 */ [758,650],
-  /* 758 */ { asc: ['ck',759], desc: 'asc', '': 759 },
-  /* 759 */ { nulls: ['ck',760], '': 0 },
-  /* 760 */ { last: ['ck',0], first: 'last' },
+  /* 760 */ [761,653],
+  /* 761 */ { asc: ['ck',762], desc: 'asc', '': 762 },
+  /* 762 */ { nulls: ['ck',763], '': 0 },
+  /* 763 */ { last: ['ck',0], first: 'last' },
   'windowFrameClause',
-  /* 762 */ {
-    unbounded: ['ck',763],
-    Number: ['c',763],
-    current: ['ck',764],
-    between: ['ck',765],
+  /* 765 */ {
+    unbounded: ['ck',766],
+    Number: ['c',766],
+    current: ['ck',767],
+    between: ['ck',768],
   },
-  /* 763 */ ['mk',0,'preceding'],
-  /* 764 */ ['mk',0,'row'],
-  /* 765 */ [766,769],
-  /* 766 */ ['mk',767,'and'],
-  /* 767 */ [0,769],
+  /* 766 */ ['mk',0,'preceding'],
+  /* 767 */ ['mk',0,'row'],
+  /* 768 */ [769,772],
+  /* 769 */ ['mk',770,'and'],
+  /* 770 */ [0,772],
   'windowFrameBoundSpec',
-  /* 769 */ {
-    unbounded: ['ck',770],
-    Number: ['c',770],
-    current: ['ck',772],
+  /* 772 */ {
+    unbounded: ['ck',773],
+    Number: ['c',773],
+    current: ['ck',775],
   },
-  /* 770 */ {
-    following: ['ck',771],
-    preceding: ['ck',771],
+  /* 773 */ {
+    following: ['ck',774],
+    preceding: ['ck',774],
   },
-  /* 771 */ ['g',0,[]],
-  /* 772 */ ['mk',0,'row'],
+  /* 774 */ ['g',0,[]],
+  /* 775 */ ['mk',0,'row'],
   'literalValue',
-  /* 774 */ {
-    '#': ['c',775],
+  /* 777 */ {
+    '#': ['c',778],
     null: ['ck',0],
     true: ['ck',0], false: 'true',
     Number: ['c',0],
     String: ['c',0],
     QuotedLiteral: ['c',0],
   },
-  /* 775 */ ['mi',0],
+  /* 778 */ ['mi',0],
   'annoAssignStd',
-  /* 777 */ ['m',778,'@'],
-  /* 778 */ {
-    '(': [0,786],
-    Id: [0,791],
-  },
-  'annoAssignCol',
   /* 780 */ ['m',781,'@'],
   /* 781 */ {
-    '(': [0,786],
-    Id: [0,791],
+    '(': [0,789],
+    Id: [0,794],
   },
-  'annoAssignMid',
+  'annoAssignCol',
   /* 783 */ ['m',784,'@'],
   /* 784 */ {
-    '(': [0,786],
-    Id: [0,795],
+    '(': [0,789],
+    Id: [0,794],
+  },
+  'annoAssignMid',
+  /* 786 */ ['m',787,'@'],
+  /* 787 */ {
+    '(': [0,789],
+    Id: [0,798],
   },
   'annoAssignParen',
-  /* 786 */ ['m',787,'('],
-  /* 787 */ { Id: [788,791], '': 789 },
-  /* 788 */ {
-    ',': ['c',787],
-    ')': 789,
+  /* 789 */ ['m',790,'('],
+  /* 790 */ { Id: [791,794], '': 792 },
+  /* 791 */ {
+    ',': ['c',790],
+    ')': 792,
   },
-  /* 789 */ ['m',0,')'],
+  /* 792 */ ['m',0,')'],
   'annoAssignBase',
-  /* 791 */ [792,795],
-  /* 792 */ { ':': ['c',793], '': 0 },
-  /* 793 */ [0,817],
+  /* 794 */ [795,798],
+  /* 795 */ { ':': ['c',796], '': 0 },
+  /* 796 */ [0,820],
   'annoNamePath',
-  /* 795 */ ['miA',796],
-  /* 796 */ { '.': ['c',797], '': 799 },
-  /* 797 */ {
-    Id: ['ciA',796],
-    '@': ['c',798],
+  /* 798 */ ['miA',799],
+  /* 799 */ { '.': ['c',800], '': 802 },
+  /* 800 */ {
+    Id: ['ciA',799],
+    '@': ['c',801],
   },
-  /* 798 */ ['miA',796],
-  /* 799 */ { '#': [0,808], '': 0 },
+  /* 801 */ ['miA',799],
+  /* 802 */ { '#': [0,811], '': 0 },
   'annoPath',
-  /* 801 */ {
-    Id: ['ciA',803],
-    '@': ['c',802],
-  },
-  /* 802 */ ['miA',803],
-  /* 803 */ { '.': ['c',804], '': 806 },
   /* 804 */ {
-    Id: ['ciA',803],
+    Id: ['ciA',806],
     '@': ['c',805],
   },
-  /* 805 */ ['miA',803],
-  /* 806 */ { '#': [0,808], '': 0 },
+  /* 805 */ ['miA',806],
+  /* 806 */ { '.': ['c',807], '': 809 },
+  /* 807 */ {
+    Id: ['ciA',806],
+    '@': ['c',808],
+  },
+  /* 808 */ ['miA',806],
+  /* 809 */ { '#': [0,811], '': 0 },
   'annoPathVariant',
-  /* 808 */ ['m',809,'#'],
-  /* 809 */ ['miA',810],
-  /* 810 */ { '.': ['c',811], '': 0 },
-  /* 811 */ ['miA',810],
+  /* 811 */ ['m',812,'#'],
+  /* 812 */ ['miA',813],
+  /* 813 */ { '.': ['c',814], '': 0 },
+  /* 814 */ ['miA',813],
   'annoStructValue',
-  /* 813 */ [814,801],
-  /* 814 */ { ':': ['c',815], '': 0 },
-  /* 815 */ [0,817],
+  /* 816 */ [817,804],
+  /* 817 */ { ':': ['c',818], '': 0 },
+  /* 818 */ [0,820],
   'annoValue',
-  /* 817 */ {
-    '#': [0,774], null: '#', true: '#', false: '#', Number: '#', String: '#', QuotedLiteral: '#',
-    '+': ['c',818], '-': '+',
-    Id: [0,801], '@': 'Id',
-    '{': ['c',819],
-    '[': ['c',822],
-    '(': ['c',829],
-  },
-  /* 818 */ ['m',0,'Number'],
-  /* 819 */ { Id: [820,813], '@': 'Id', '': 821 },
   /* 820 */ {
-    ',': ['c',819],
-    '}': 821,
-  },
-  /* 821 */ ['m',0,'}'],
-  /* 822 */ {
-    Id: [827,817], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', '@': 'Id', '[': 'Id', '{': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
-    '...': ['c',823],
-    '': 828
+    '#': [0,777], null: '#', true: '#', false: '#', Number: '#', String: '#', QuotedLiteral: '#',
+    '+': ['c',821], '-': '+',
+    Id: [0,804], '@': 'Id',
+    '{': ['c',822],
+    '[': ['c',826],
+    '(': ['c',833],
   },
-  /* 823 */ { up: ['ck',824], '': 826 },
-  /* 824 */ ['mk',825,'to'],
-  /* 825 */ [826,817],
-  /* 826 */ ['g',827],
-  /* 827 */ {
+  /* 821 */ ['m',0,'Number'],
+  /* 822 */ { Id: [823,816], '@': 'Id', '': 824 },
+  /* 823 */ {
     ',': ['c',822],
-    ']': 828,
+    '}': 824,
+  },
+  /* 824 */ ['g',825],
+  /* 825 */ ['m',0,'}'],
+  /* 826 */ {
+    Id: [831,820], '#': 'Id', '(': 'Id', '+': 'Id', '-': 'Id', '@': 'Id', '[': 'Id', '{': 'Id', Number: 'Id', String: 'Id', QuotedLiteral: 'Id',
+    '...': ['c',827],
+    '': 832
   },
-  /* 828 */ ['m',0,']'],
-  /* 829 */ [830,642],
-  /* 830 */ ['m',0,')'],
+  /* 827 */ { up: ['ck',828], '': 830 },
+  /* 828 */ ['mk',829,'to'],
+  /* 829 */ [830,820],
+  /* 830 */ ['g',831],
+  /* 831 */ {
+    ',': ['c',826],
+    ']': 832,
+  },
+  /* 832 */ ['m',0,']'],
+  /* 833 */ [834,645],
+  /* 834 */ ['m',0,')'],
 ];
 class CdlParser extends AstBuildingParser {
   constructor(lexer,...args) { super(lexer,keywords,table,...args) }
@@ -1660,7 +1668,7 @@ this.docComment( $.art ); } continue;
     let name; let _;
     for(;;) switch(this.s) {
       case 54: this.mk(55,'annotation'); continue;
-      case 55: if(this.namePath(_={category:'AnnoDef'},56)) {name=_.name; this.addDef( $.art, $.outer, 'vocabularies', 'annotation', name );
+      case 55: if(this.namePath(_={category:'AnnoDef'},56)) {name=_.name; this.addDef( $.art, $.outer, ($.outer.kind === 'source' ? 'vocabularies' : 'artifacts'), 'annotation', name );
 this.docComment( $.art ); } continue;
       case 56: switch(this.l()) {
         case '@': this.annoAssignMid({art:$.art},56); continue;
@@ -2026,8 +2034,9 @@ this.docComment( art ); } continue;
   returnsSpec($,$next) {
     this.rule_(156,$next);
     let art=new XsnArtifact();
+    let ret;
     for(;;) switch(this.s) {
-      case 156: if(this.mk(157,'returns')) {this.elementRestriction(); art.kind = 'param'; $.outer.returns = art;
+      case 156: if(this.mk(157,'returns')) {ret=this.lb();this.elementRestriction(0,'default'); art.kind = 'param'; $.outer.returns = art;
 this.docComment( art ); } continue;
       case 157: switch(this.l()) {
         case '@': this.annoAssignStd({art},157); continue;
@@ -2035,7 +2044,7 @@ this.docComment( art ); } continue;
       }
       case 158: this.typeExpression({art},0); continue;
       default:
-      this.attachLocation( art );
+      this.attachLocation( art ); if (ret) art.location.tokenIndex = ret.location.tokenIndex;
       return this.exit_();
     }
   }
@@ -2084,7 +2093,7 @@ this.message( 'syntax-unsupported-masked', this.lb(), { keyword: 'masked' } ); }
         case 'element': if(this.ckP(170,['Id'])) { $.art.$syntax = 'element'; } continue;
         default: this.s=170; continue;
       }
-      case 170: if(this.mi(171,'Element')) { this.addDef( $.art, $.outer, 'elements', 'element', this.identAst() );
+      case 170: if(this.mi(171,'Element')) {this.elementRestriction(0,'elem'); this.addDef( $.art, $.outer, 'elements', 'element', this.identAst() );
 this.docComment( $.art ); } continue;
       case 171: switch(this.l()) {
         case '@': this.annoAssignMid({art:$.art},171); continue;
@@ -2092,8 +2101,8 @@ this.docComment( $.art ); } continue;
       }
       case 172: switch(this.l()) {
         case '{': this.elementsBlock({art:$.art},173); continue;
-        case ':': if(this.c(174)) {this.elementRestriction();} continue;
-        default: this.s=175;{ this.elementRestriction(); } continue;
+        case ':': this.c(174); continue;
+        default: this.s=175; continue;
       }
       case 173: switch(this.lk()) {
         case 'not': case 'null': this.nullability({art:$.art},175); continue;
@@ -2101,17 +2110,17 @@ this.docComment( $.art ); } continue;
       }
       case 174: this.typeExpression({art:$.art},175); continue;
       case 175: switch(this.l()) {
-        case '=': this.gc(0,'calcOrDefaultRestriction') && this.c(176); continue;
-        default: this.gr(['Id',';','@','}','key']); continue;
+        case '=': this.gc(0,'elementRestriction','calc') && this.c(176); continue;
+        default: if(this.gr(['Id',';','@','}','key'])) { this.docComment( $.art, 'type' ); } continue;
       }
       case 176: if(this.expression(_={},177)) {expr=_.expr; $.art.value = expr; } continue;
       case 177: switch(this.lk()) {
         case 'stored': if(this.ck(178)) { $.art.value.stored = this.valueWithLocation( true ); } continue;
         default: this.s=178; continue;
       }
-      case 178: this.s=179;{ this.docComment( $.art ); } continue;
+      case 178: this.s=179;{ if (this.elementRestriction( true, 'anno' )) this.docComment( $.art ); } continue;
       case 179: switch(this.l()) {
-        case '@': this.gc(0,'elementRestriction') && this.annoAssignStd({art:$.art},179); continue;
+        case '@': this.gc(0,'elementRestriction','anno') && this.annoAssignStd({art:$.art},179); continue;
         default: this.gr(['Id',';','@','}','key']); continue;
       }
       default:
@@ -2250,17 +2259,17 @@ this.docComment( art ); } continue;
   }
   annotateArtifact($,$next) {
     this.rule_(218,$next);
-    let name; let elemName; let _;
+    let name; let elemName; let keyword; let _;
     for(;;) switch(this.s) {
       case 218: if(this.namePath(_={category:'Ext'},219)) name=_.name; continue;
       case 219: switch(this.lk()) {
         case ':': this.c(220); continue;
-        case 'with': this.ck(225); continue;
+        case 'with': if(this.ck(225)) keyword=this.lb(); continue;
         default: this.s=225; continue;
       }
       case 220: if(this.namePath(_={category:'ExtElement'},221)) {elemName=_.name; this.addExtension( $.art, $.outer, 'annotate', name, elemName.path ); } continue;
       case 221: switch(this.lk()) {
-        case 'with': this.ck(222); continue;
+        case 'with': if(this.ck(222)) keyword=this.lb(); continue;
         default: this.s=222; continue;
       }
       case 222: this.s=223;{ this.docComment( $.art ); } continue;
@@ -2292,25 +2301,25 @@ this.docComment( $.art ); } continue;
         default: this.gr([';']); continue;
       }
       default:
-      this.attachLocation( $.art );
+      this.checkWith( keyword ); this.attachLocation( $.art );
       return this.exit_();
     }
   }
   extendArtifact($,$next) {
     this.rule_(231,$next);
-    let name; let elemName; let elements; let incl; let _;
+    let name; let elemName; let keyword; let elements; let incl; let _;
     for(;;) switch(this.s) {
       case 231: if(this.namePath(_={category:'Ext'},232)) name=_.name; continue;
       case 232: switch(this.lk()) {
         case ':': this.c(233); continue;
-        case 'with': if(this.ck(242)) { this.addExtension( $.art, $.outer, 'extend', name );
+        case 'with': if(this.ck(242)) {keyword=this.lb(); this.addExtension( $.art, $.outer, 'extend', name );
 this.docComment( $.art ); } continue;
         default: this.s=239;{ this.addExtension( $.art, $.outer, 'extend', name );
 this.docComment( $.art ); } continue;
       }
       case 233: if(this.namePath(_={category:'ExtElement'},234)) {elemName=_.name; this.addExtension( $.art, $.outer, 'extend', name, elemName.path ); } continue;
       case 234: switch(this.lk()) {
-        case 'with': this.ck(235); continue;
+        case 'with': if(this.ck(235)) keyword=this.lb(); continue;
         default: this.s=235; continue;
       }
       case 235: this.s=236;{ this.docComment( $.art ); } continue;
@@ -2374,18 +2383,18 @@ this.docComment( $.art ); } continue;
       case 250: this.selectItemsList({query:$.art,start:this.lb()},0); continue;
       case 251: this.artifactsBlock({art:$.art,start:this.lb()},0); continue;
       default:
-      this.attachLocation( $.art );
+      this.checkWith( keyword ); this.attachLocation( $.art );
       return this.exit_();
     }
   }
   extendService($,$next) {
     this.rule_(253,$next);
-    let name; let _;
+    let name; let keyword; let _;
     for(;;) switch(this.s) {
       case 253: if(this.mk(254,'service')) { $.art.expectedKind = this.valueWithLocation(); } continue;
       case 254: if(this.namePath(_={category:'ExtService'},255)) {name=_.name; $.art.name = name; $.outer.extensions.push( $.art ); } continue;
       case 255: switch(this.lk()) {
-        case 'with': this.ck(256); continue;
+        case 'with': if(this.ck(256)) keyword=this.lb(); continue;
         default: this.s=256; continue;
       }
       case 256: this.s=257;{ this.docComment( $.art ); } continue;
@@ -2398,18 +2407,18 @@ this.docComment( $.art ); } continue;
         default: this.gr([';']); continue;
       }
       default:
-      this.attachLocation( $.art );
+      this.checkWith( keyword ); this.attachLocation( $.art );
       return this.exit_();
     }
   }
   extendContext($,$next) {
     this.rule_(260,$next);
-    let name; let _;
+    let name; let keyword; let _;
     for(;;) switch(this.s) {
       case 260: if(this.mk(261,'context')) { $.art.expectedKind = this.valueWithLocation(); } continue;
       case 261: if(this.namePath(_={category:'ExtContext'},262)) {name=_.name; $.art.name = name; $.outer.extensions.push( $.art ); } continue;
       case 262: switch(this.lk()) {
-        case 'with': this.ck(263); continue;
+        case 'with': if(this.ck(263)) keyword=this.lb(); continue;
         default: this.s=263; continue;
       }
       case 263: this.s=264;{ this.docComment( $.art ); } continue;
@@ -2422,18 +2431,18 @@ this.docComment( $.art ); } continue;
         default: this.gr([';']); continue;
       }
       default:
-      this.attachLocation( $.art );
+      this.checkWith( keyword ); this.attachLocation( $.art );
       return this.exit_();
     }
   }
   extendType($,$next) {
     this.rule_(267,$next);
-    let name; let incl; let elements; let _;
+    let name; let keyword; let incl; let elements; let _;
     for(;;) switch(this.s) {
       case 267: if(this.mk(268,'type')) { $.art.expectedKind = this.valueWithLocation(); } continue;
       case 268: if(this.namePath(_={category:'Ext'},269)) {name=_.name; $.art.name = name; $.outer.extensions.push( $.art ); } continue;
       case 269: switch(this.lk()) {
-        case 'with': if(this.ck(272)) { this.docComment( $.art ); } continue;
+        case 'with': if(this.ck(272)) {keyword=this.lb(); this.docComment( $.art ); } continue;
         default: this.s=270;{ this.docComment( $.art ); } continue;
       }
       case 270: switch(this.l()) {
@@ -2467,13 +2476,13 @@ this.docComment( $.art ); } continue;
       }
       case 277: this.extendElementsBlock({art:$.art,start:elements},0); continue;
       default:
-      this.attachLocation( $.art );
+      this.checkWith( keyword ); this.attachLocation( $.art );
       return this.exit_();
     }
   }
   extendEntityOrAspect($,$next) {
     this.rule_(279,$next);
-    let name; let incl; let _;
+    let name; let keyword; let incl; let _;
     for(;;) switch(this.s) {
       case 279: switch(this.lk()) {
         case 'aspect': case 'entity': if(this.ck(280)) { $.art.expectedKind = this.valueWithLocation(); } continue;
@@ -2481,7 +2490,7 @@ this.docComment( $.art ); } continue;
       }
       case 280: if(this.namePath(_={category:'Ext'},281)) {name=_.name; $.art.name = name; $.outer.extensions.push( $.art ); } continue;
       case 281: switch(this.lk()) {
-        case 'with': if(this.ck(283)) { this.docComment( $.art ); } continue;
+        case 'with': if(this.ck(283)) {keyword=this.lb(); this.docComment( $.art ); } continue;
         default: this.s=282;{ this.docComment( $.art ); } continue;
       }
       case 282: switch(this.l()) {
@@ -2511,18 +2520,18 @@ this.docComment( $.art ); } continue;
         default: this.gr([';']); continue;
       }
       default:
-      this.attachLocation( $.art );
+      this.checkWith( keyword ); this.attachLocation( $.art );
       return this.exit_();
     }
   }
   extendProjection($,$next) {
     this.rule_(290,$next);
-    let name; let _;
+    let name; let keyword; let _;
     for(;;) switch(this.s) {
       case 290: if(this.mk(291,'projection')) { $.art.expectedKind = this.valueWithLocation(); } continue;
       case 291: if(this.namePath(_={category:'Ext'},292)) {name=_.name; $.art.name = name; $.outer.extensions.push( $.art ); } continue;
       case 292: switch(this.lk()) {
-        case 'with': this.ck(293); continue;
+        case 'with': if(this.ck(293)) keyword=this.lb(); continue;
         default: this.s=293; continue;
       }
       case 293: this.s=294;{ this.docComment( $.art ); } continue;
@@ -2539,7 +2548,7 @@ this.docComment( $.art ); } continue;
         default: this.gr([';']); continue;
       }
       default:
-      this.attachLocation( $.art );
+      this.checkWith( keyword ); this.attachLocation( $.art );
       return this.exit_();
     }
   }
@@ -2630,8 +2639,9 @@ this.docComment( art ); } continue;
   annotateReturns($,$next) {
     this.rule_(319,$next);
     let art=new XsnArtifact();
+    let ret;
     for(;;) switch(this.s) {
-      case 319: if(this.mk(320,'returns')) { $.outer.returns = art; art.kind = 'annotate';
+      case 319: if(this.mk(320,'returns')) {ret=this.lb(); $.outer.returns = art; art.kind = 'annotate';
 this.docComment( art ); } continue;
       case 320: switch(this.l()) {
         case '@': this.annoAssignStd({art},320); continue;
@@ -2642,7 +2652,7 @@ this.docComment( art ); } continue;
         default: this.gr([';']); continue;
       }
       default:
-      this.attachLocation( art );
+      this.attachLocation( art ); if (ret) art.location.tokenIndex = ret.location.tokenIndex;
       return this.exit_();
     }
   }
@@ -2709,7 +2719,7 @@ this.docComment( art ); } continue;
   elementDefOrExtend($,$next) {
     this.rule_(338,$next);
     let art=new XsnArtifact();
-    let elements;
+    let keyword; let elements;
     { this.docComment( art ); }
     for(;;) switch(this.s) {
       case 338: switch(this.l()) {
@@ -2727,7 +2737,7 @@ this.docComment( art ); } continue;
       }
       case 341: if(this.mi(342,'ExtElement')) { this.addDef( art, $.outer, 'elements', 'extend', this.identAst() ); } continue;
       case 342: switch(this.lk()) {
-        case 'with': if(this.ck(345)) { this.docComment( art ); } continue;
+        case 'with': if(this.ck(345)) {keyword=this.lb(); this.docComment( art ); } continue;
         default: this.s=343;{ this.docComment( art ); } continue;
       }
       case 343: switch(this.l()) {
@@ -2750,7 +2760,9 @@ this.docComment( art ); } continue;
         default: this.gr(['Id',';','@','}','key']); continue;
       }
       case 347: this.extendElementsBlock({art,start:elements},0); continue;
-      default: return this.exit_();
+      default:
+      this.checkWith( keyword ); this.attachLocation( art );
+      return this.exit_();
     }
   }
   typeOrIncludesSpec($,$next) {
@@ -2772,7 +2784,7 @@ this.docComment( art ); } continue;
         default: this.ei(); continue;
       }
       case 352: switch(this.lk()) {
-        case '(': case ':': this.typeRefOptArgs({art:$.art},353,410); continue;
+        case '(': case ':': this.typeRefOptArgs({art:$.art},353,411); continue;
         case '@': case 'not': case 'enum': case 'null': case 'default': this.typeExpression({art:$.art},0,362); continue;
         case ',': case '{': this.s=354;{ $.art.includes = [ $.art.type ]; delete $.art.type; } continue;
         default: if(this.gr([';'])) { this.docComment( $.art ); } continue;
@@ -2807,14 +2819,14 @@ this.docComment( art ); } continue;
     let assoc; let card; let target; let cond; let _;
     for(;;) switch(this.s) {
       case 360: switch(this.lk()) {
-        case '{': this.elementsBlock({art:$.art},361); continue;
+        case '{': if(this.elementsBlock({art:$.art},361)) {this.elementRestriction(0,'calc');} continue;
         case 'Id': this.typeRefOptArgs({art:$.art},362); continue;
         case 'type': this.lP() && this.typeTypeOf({art:$.art},362); continue;
-        case 'localized': if(this.ckP(370,['Id'])) { $.art.localized = this.valueWithLocation( true ); } continue;
-        case 'association': if(this.ckP(374,['[','to'])) assoc=this.lb(); continue;
-        case 'composition': if(this.ckP(383,['[','of'])) assoc=this.lb(); continue;
-        case 'array': this.ckP(393,['of']); continue;
-        case 'many': if(this.ckP(394,['Id','{'])) { $.art.items = { location: this.lb().location }; } continue;
+        case 'localized': if(this.ckP(371,['Id'])) { $.art.localized = this.valueWithLocation( true ); } continue;
+        case 'association': if(this.ckP(375,['[','to'])) {assoc=this.lb();this.elementRestriction(0,'calc');} continue;
+        case 'composition': if(this.ckP(384,['[','of'])) {assoc=this.lb();this.elementRestriction(0,'calc');} continue;
+        case 'array': if(this.ckP(394,['of'])) {this.elementRestriction(0,'calc');} continue;
+        case 'many': if(this.ckP(395,['Id','{'])) {this.elementRestriction(0,'calc'); $.art.items = { location: this.lb().location }; } continue;
         default: this.ei(); continue;
       }
       case 361: switch(this.lk()) {
@@ -2825,221 +2837,232 @@ this.docComment( art ); } continue;
         case 'not': case 'null': this.nullability({art:$.art},363); continue;
         default: this.s=363; continue;
       }
-      case 363: this.s=364;{ this.calcOrDefaultRestriction(); } continue;
-      case 364: switch(this.lk()) {
-        case 'not': case 'null': case 'default': if(this.nullabilityAndDefault({art:$.art},365)) { this.docComment( $.art ); } continue;
-        case 'enum': this.enumSymbolsBlock({art:$.art},366); continue;
-        case '@': this.s=367;{ this.docComment( $.art ); } continue;
-        default: if(this.gr([])) { this.docComment( $.art ); } continue;
+      case 363: switch(this.lk()) {
+        case 'not': case 'null': case 'default': this.nullabilityAndDefault({art:$.art},364); continue;
+        case '@': this.s=366;{ this.docComment( $.art ); } continue;
+        case 'enum': this.s=369;{ this.docComment( $.art ); } continue;
+        default: if(this.gr([])) { this.docComment( $.art, 'elem' ); } continue;
+      }
+      case 364: switch(this.l()) {
+        case '@': this.s=365;{ this.elementRestriction( false, 'calc' );
+this.docComment( $.art ); } continue;
+        default: if(this.gr([])) { this.docComment( $.art, 'elem' ); } continue;
       }
       case 365: switch(this.l()) {
         case '@': this.annoAssignStd({art:$.art},365); continue;
         default: this.gr([]); continue;
       }
-      case 366: switch(this.lk()) {
-        case 'not': case 'null': case 'default': this.nullabilityAndDefault({art:$.art},0); continue;
-        default: this.gr([]); continue;
+      case 366: switch(this.l()) {
+        case '@': this.annoAssignStd({art:$.art},366); continue;
+        default: this.s=367; continue;
       }
-      case 367: switch(this.l()) {
-        case '@': this.annoAssignStd({art:$.art},367); continue;
-        default: this.s=368; continue;
+      case 367: switch(this.lk()) {
+        case 'enum': if(this.enumSymbolsBlock({art:$.art},368)) {this.elementRestriction(0,'anno');} continue;
+        default: this.gr([]); continue;
       }
       case 368: switch(this.lk()) {
-        case 'enum': if(this.enumSymbolsBlock({art:$.art},369)) { this.calcOrDefaultRestriction(); } continue;
+        case 'not': case 'null': case 'default': this.nullabilityAndDefault({art:$.art},0); continue;
         default: this.gr([]); continue;
       }
-      case 369: switch(this.lk()) {
+      case 369: if(this.enumSymbolsBlock({art:$.art},370)) {this.elementRestriction(0,'anno');} continue;
+      case 370: switch(this.lk()) {
         case 'not': case 'null': case 'default': this.nullabilityAndDefault({art:$.art},0); continue;
         default: this.gr([]); continue;
       }
-      case 370: if(this.typeRefOptArgs({art:$.art},371)) { this.calcOrDefaultRestriction(); } continue;
-      case 371: switch(this.lk()) {
-        case 'not': case 'null': case 'default': this.nullabilityAndDefault({art:$.art},372); continue;
-        default: this.s=372; continue;
+      case 371: this.typeRefOptArgs({art:$.art},372); continue;
+      case 372: switch(this.lk()) {
+        case 'not': case 'null': case 'default': this.nullabilityAndDefault({art:$.art},373); continue;
+        default: this.s=373; continue;
       }
-      case 372: this.s=373;{ this.docComment( $.art ); } continue;
       case 373: switch(this.l()) {
-        case '@': this.annoAssignStd({art:$.art},373); continue;
-        default: this.gr([]); continue;
+        case '@': this.s=374;{ this.elementRestriction( false, 'calc' );
+this.docComment( $.art ); } continue;
+        default: if(this.gr([])) { this.docComment( $.art, 'elem' ); } continue;
       }
       case 374: switch(this.l()) {
-        case '[': this.cardinality({art:$.art},375); continue;
-        default: this.s=375; continue;
-      }
-      case 375: this.mk(376,'to'); continue;
-      case 376: switch(this.lk()) {
-        case 'one': case 'many': if(this.ckP(377,['Id'])) card=this.lb(); continue;
-        default: this.s=377; continue;
-      }
-      case 377: if(this.simplePath(_={category:'artref'},378)) {target=_.ref; this.setAssocAndComposition( $.art, assoc, card, target );
-this.calcOrDefaultRestriction(false,true); } continue;
-      case 378: switch(this.lk()) {
-        case 'on': this.ck(379); continue;
-        case '{': this.foreignKeysBlock({art:$.art},380); continue;
-        default: this.s=380; continue;
-      }
-      case 379: if(this.condition(_={},381)) {cond=_.expr; $.art.on = cond; } continue;
-      case 380: switch(this.lk()) {
-        case 'not': case 'null': case 'default': this.nullabilityAndDefault({art:$.art},381); continue;
+        case '@': this.annoAssignStd({art:$.art},374); continue;
+        default: this.gr([]); continue;
+      }
+      case 375: switch(this.l()) {
+        case '[': this.cardinality({art:$.art},376); continue;
+        default: this.s=376; continue;
+      }
+      case 376: this.mk(377,'to'); continue;
+      case 377: switch(this.lk()) {
+        case 'one': case 'many': if(this.ckP(378,['Id'])) card=this.lb(); continue;
+        default: this.s=378; continue;
+      }
+      case 378: if(this.simplePath(_={category:'artref'},379)) {target=_.ref; this.setAssocAndComposition( $.art, assoc, card, target ); } continue;
+      case 379: switch(this.lk()) {
+        case 'on': this.ck(380); continue;
+        case '{': this.foreignKeysBlock({art:$.art},381); continue;
         default: this.s=381; continue;
       }
-      case 381: this.s=382;{ this.docComment( $.art ); } continue;
-      case 382: switch(this.l()) {
-        case '@': this.annoAssignStd({art:$.art},382); continue;
-        default: this.gr([]); continue;
+      case 380: if(this.condition(_={},382)) {cond=_.expr; $.art.on = cond; } continue;
+      case 381: switch(this.lk()) {
+        case 'not': case 'null': case 'default': this.nullabilityAndDefault({art:$.art},382); continue;
+        default: this.s=382; continue;
       }
+      case 382: this.s=383;{ this.docComment( $.art ); } continue;
       case 383: switch(this.l()) {
-        case '[': this.cardinality({art:$.art},384); continue;
-        default: this.s=384; continue;
-      }
-      case 384: this.mk(385,'of'); continue;
-      case 385: switch(this.lk()) {
-        case 'one': case 'many': if(this.ckP(386,['Id','{'])) card=this.lb(); continue;
-        default: this.s=386; continue;
-      }
-      case 386: switch(this.l()) {
-        case 'Id': if(this.simplePath(_={category:'artref'},387)) {target=_.ref; this.setAssocAndComposition( $.art, assoc, card, target );
-this.calcOrDefaultRestriction(false,true); } continue;
-        case '{': this.s=392;{ target = {}; this.setAssocAndComposition( $.art, assoc, card, target ); } continue;
-        default: this.e(); continue;
+        case '@': this.annoAssignStd({art:$.art},383); continue;
+        default: this.gr([]); continue;
+      }
+      case 384: switch(this.l()) {
+        case '[': this.cardinality({art:$.art},385); continue;
+        default: this.s=385; continue;
       }
-      case 387: switch(this.lk()) {
-        case 'on': this.ck(388); continue;
-        case '{': this.foreignKeysBlock({art:$.art},389); continue;
-        default: this.s=389; continue;
+      case 385: this.mk(386,'of'); continue;
+      case 386: switch(this.lk()) {
+        case 'one': case 'many': if(this.ckP(387,['Id','{'])) card=this.lb(); continue;
+        default: this.s=387; continue;
       }
-      case 388: if(this.condition(_={},390)) {cond=_.expr; $.art.on = cond; } continue;
-      case 389: switch(this.lk()) {
-        case 'not': case 'null': case 'default': this.nullabilityAndDefault({art:$.art},390); continue;
+      case 387: switch(this.l()) {
+        case 'Id': if(this.simplePath(_={category:'artref'},388)) {target=_.ref; this.setAssocAndComposition( $.art, assoc, card, target ); } continue;
+        case '{': this.s=393;{ target = { location: this.startLocation( this.la() ) };
+this.setAssocAndComposition( $.art, assoc, card, target ); } continue;
+        default: this.e(); continue;
+      }
+      case 388: switch(this.lk()) {
+        case 'on': this.ck(389); continue;
+        case '{': this.foreignKeysBlock({art:$.art},390); continue;
         default: this.s=390; continue;
       }
-      case 390: this.s=391;{ this.docComment( $.art ); } continue;
-      case 391: switch(this.l()) {
-        case '@': this.annoAssignStd({art:$.art},391); continue;
+      case 389: if(this.condition(_={},391)) {cond=_.expr; $.art.on = cond; } continue;
+      case 390: switch(this.lk()) {
+        case 'not': case 'null': case 'default': this.nullabilityAndDefault({art:$.art},391); continue;
+        default: this.s=391; continue;
+      }
+      case 391: this.s=392;{ this.docComment( $.art ); } continue;
+      case 392: switch(this.l()) {
+        case '@': this.annoAssignStd({art:$.art},392); continue;
         default: this.gr([]); continue;
       }
-      case 392: if(this.elementsBlock({art:target},0)) { target.location = target.elements[Symbol.for('cds.$location')]; } continue;
-      case 393: if(this.mk(394,'of')) { $.art.items = { location: this.locationOfPrevTokens( 2 ) }; } continue;
-      case 394: switch(this.lk()) {
-        case '{': this.elementsBlock({art:$.art.items},395); continue;
-        case 'Id': this.typeRefOptArgs({art:$.art.items},396); continue;
-        case 'type': this.lP() && this.typeTypeOf({art:$.art.items},396); continue;
+      case 393: if(this.elementsBlock({art:target},0)) { target.location = target.elements[Symbol.for('cds.$location')]; } continue;
+      case 394: if(this.mk(395,'of')) { $.art.items = { location: this.locationOfPrevTokens( 2 ) }; } continue;
+      case 395: switch(this.lk()) {
+        case '{': this.elementsBlock({art:$.art.items},396); continue;
+        case 'Id': this.typeRefOptArgs({art:$.art.items},397); continue;
+        case 'type': this.lP() && this.typeTypeOf({art:$.art.items},397); continue;
         default: this.ei(); continue;
       }
-      case 395: switch(this.lk()) {
+      case 396: switch(this.lk()) {
         case 'not': case 'null': this.nullability({art:$.art.items},0); continue;
         default: this.gr([]); continue;
       }
-      case 396: switch(this.lk()) {
-        case 'not': case 'null': this.nullability({art:$.art.items},397); continue;
-        default: this.s=397; continue;
-      }
       case 397: switch(this.lk()) {
-        case 'enum': this.enumSymbolsBlock({art:$.art.items},398); continue;
-        default: this.s=399;{ this.docComment( $.art ); } continue;
+        case 'not': case 'null': this.nullability({art:$.art.items},398); continue;
+        default: this.s=398; continue;
       }
       case 398: switch(this.lk()) {
+        case 'enum': this.enumSymbolsBlock({art:$.art.items},399); continue;
+        case '@': this.s=400;{ this.elementRestriction( false, 'calc' );
+this.docComment( $.art ); } continue;
+        default: if(this.gr([])) { this.docComment( $.art, 'elem' ); } continue;
+      }
+      case 399: switch(this.lk()) {
         case 'not': case 'null': this.nullability({art:$.art.items},0); continue;
         default: this.gr([]); continue;
       }
-      case 399: switch(this.l()) {
-        case '@': this.annoAssignStd({art:$.art},399); continue;
+      case 400: switch(this.l()) {
+        case '@': this.annoAssignStd({art:$.art},400); continue;
         default: this.gr([]); continue;
       }
       default: return this.exit_();
     }
   }
   typeTypeOf($,$next) {
-    this.rule_(401,$next);
+    this.rule_(402,$next);
     let location;
     let type; let _;
     for(;;) switch(this.s) {
-      case 401: this.mk(402,'type'); continue;
-      case 402: if(this.mk(403,'of')) { location = this.locationOfPrevTokens( 2 ); } continue;
-      case 403: if(this.simplePath(_={category:'ref'},404)) {type=_.ref; $.art.type = type; } continue;
-      case 404: switch(this.l()) {
-        case ':': if(this.c(405)) { type.scope = type.path.length; } continue;
+      case 402: this.mk(403,'type'); continue;
+      case 403: if(this.mk(404,'of')) { location = this.locationOfPrevTokens( 2 ); } continue;
+      case 404: if(this.simplePath(_={category:'ref'},405)) {type=_.ref; $.art.type = type; } continue;
+      case 405: switch(this.l()) {
+        case ':': if(this.c(406)) { type.scope = type.path.length; } continue;
         default: if(this.gr(['@'])) { type.scope = 'typeOf'; type.path.unshift( { id: 'type of', location } ); } continue;
       }
-      case 405: if(this.miA(406,'ref')) { type.path.push( this.identAst() ); } continue;
-      case 406: switch(this.l()) {
-        case '.': this.c(407); 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.gr(['@']); continue;
       }
-      case 407: if(this.miA(406,'ref')) { type.path.push( this.identAst() ); } continue;
+      case 408: if(this.miA(407,'ref')) { type.path.push( this.identAst() ); } continue;
       default: return this.exit_();
     }
   }
   typeRefOptArgs($,$next,$startState) {
-    this.rule_($startState??409,$next);
+    this.rule_($startState??410,$next);
     let type=$.art.type;
     let open; let tok; let _;
     for(;;) switch(this.s) {
-      case 409: if(this.simplePath(_={category:'artref'},410)) {type=_.ref; $.art.type = type; } continue;
-      case 410: switch(this.l()) {
-        case ':': if(this.c(411)) { type.scope = type.path.length; } continue;
-        case '(': if(this.c(414)) open=this.lb(); continue;
+      case 410: if(this.simplePath(_={category:'artref'},411)) {type=_.ref; $.art.type = type; } continue;
+      case 411: switch(this.l()) {
+        case ':': if(this.c(412)) { type.scope = type.path.length; } continue;
+        case '(': if(this.c(415)) open=this.lb(); continue;
         default: this.gr([]); continue;
       }
-      case 411: if(this.miA(412,'ref')) { type.path.push( this.identAst() ); } continue;
-      case 412: switch(this.l()) {
-        case '.': this.c(413); continue;
+      case 412: if(this.miA(413,'ref')) { type.path.push( this.identAst() ); } continue;
+      case 413: switch(this.l()) {
+        case '.': this.c(414); continue;
         default: this.gr([]); continue;
       }
-      case 413: if(this.miA(412,'ref')) { type.path.push( this.identAst() ); } continue;
-      case 414: switch(this.lk()) {
-        case 'Number': if(this.c(415)) { $.art.$typeArgs = this.createArray( open );
+      case 414: if(this.miA(413,'ref')) { type.path.push( this.identAst() ); } continue;
+      case 415: switch(this.lk()) {
+        case 'Number': if(this.c(416)) { $.art.$typeArgs = this.createArray( open );
 $.art.$typeArgs.push( this.unsignedIntegerLiteral() ); } continue;
-        case 'Id': this.s=417;{ $.art.$typeArgs = this.createDict( open ); } continue;
+        case 'Id': this.s=419;{ $.art.$typeArgs = this.createDict( open ); } continue;
         default: this.ei(); continue;
       }
-      case 415: switch(this.l()) {
-        case ',': this.c(416); continue;
-        default: this.s=419; continue;
+      case 416: switch(this.l()) {
+        case ',': this.c(417); continue;
+        default: this.s=418; continue;
       }
-      case 416: switch(this.lk()) {
-        case 'Number': if(this.c(415)) { $.art.$typeArgs.push( this.unsignedIntegerLiteral() ); } continue;
-        case 'floating': case 'variable': if(this.ck(415)) {tok=this.lb(); $.art.$typeArgs.push( { literal: 'string', val: tok.keyword, location: tok.location } ); } continue;
-        case ')': this.s=419; continue;
+      case 417: switch(this.lk()) {
+        case 'Number': if(this.c(416)) { $.art.$typeArgs.push( this.unsignedIntegerLiteral() ); } continue;
+        case 'floating': case 'variable': if(this.ck(416)) {tok=this.lb(); $.art.$typeArgs.push( { literal: 'string', val: tok.keyword, location: tok.location } ); } continue;
+        case ')': this.s=418; continue;
         default: this.e(); continue;
       }
-      case 417: switch(this.l()) {
-        case 'Id': this.typeNamedArg({art:$.art},418); continue;
-        default: this.s=419; continue;
+      case 418: this.s=421;{ this.checkTypeArgs( $.art ); } continue;
+      case 419: switch(this.l()) {
+        case 'Id': this.typeNamedArg({art:$.art},420); continue;
+        default: this.s=421; continue;
       }
-      case 418: switch(this.l()) {
-        case ',': this.c(417); continue;
-        case ')': this.s=419; continue;
+      case 420: switch(this.l()) {
+        case ',': this.c(419); continue;
+        case ')': this.s=421; continue;
         default: this.e(); continue;
       }
-      case 419: if(this.m(0,')')) { this.finalizeDictOrArray( $.art.$typeArgs ); } continue;
+      case 421: if(this.m(0,')')) { if ($.art.$typeArgs) this.finalizeDictOrArray( $.art.$typeArgs ); } continue;
       default: return this.exit_();
     }
   }
   typeNamedArgsList($,$next) {
-    this.rule_(421,$next);
+    this.rule_(423,$next);
     for(;;) switch(this.s) {
-      case 421: if(this.m(422,'(')) { $.art.$typeArgs = this.createDict(); } continue;
-      case 422: switch(this.l()) {
-        case 'Id': this.typeNamedArg({art:$.art},423); continue;
-        default: this.s=424; continue;
-      }
-      case 423: switch(this.l()) {
-        case ',': this.c(422); continue;
-        case ')': this.s=424; continue;
+      case 423: if(this.m(424,'(')) { $.art.$typeArgs = this.createDict(); } continue;
+      case 424: switch(this.l()) {
+        case 'Id': this.typeNamedArg({art:$.art},425); continue;
+        default: this.s=426; continue;
+      }
+      case 425: switch(this.l()) {
+        case ',': this.c(424); continue;
+        case ')': this.s=426; continue;
         default: this.e(); continue;
       }
-      case 424: if(this.m(0,')')) { this.finalizeDictOrArray( $.art.$typeArgs ); } continue;
+      case 426: if(this.m(0,')')) { this.finalizeDictOrArray( $.art.$typeArgs ); } continue;
       default: return this.exit_();
     }
   }
   typeNamedArg($,$next) {
-    this.rule_(426,$next);
+    this.rule_(428,$next);
     let name; let tok;
     for(;;) switch(this.s) {
-      case 426: if(this.mi(427,'typeparamname')) name=this.lb(); continue;
-      case 427: this.m(428,':'); continue;
-      case 428: switch(this.lk()) {
+      case 428: if(this.mi(429,'typeparamname')) name=this.lb(); continue;
+      case 429: this.m(430,':'); continue;
+      case 430: 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;
@@ -3048,46 +3071,46 @@ $.art.$typeArgs.push( this.unsignedIntegerLiteral() ); } continue;
     }
   }
   cardinality($,$next) {
-    this.rule_(430,$next);
+    this.rule_(432,$next);
     let card={};
     for(;;) switch(this.s) {
-      case 430: this.m(431,'['); continue;
-      case 431: switch(this.l()) {
-        case '*': if(this.c(432)) { card.targetMax = this.valueWithLocation(); } continue;
-        case 'Number': if(this.c(434)) { card.targetMax = this.unsignedIntegerLiteral(); } continue;
-        default: this.s=436;{ card.targetMax = this.valueWithLocation( '*' ); } continue;
-      }
-      case 432: switch(this.l()) {
-        case ',': this.c(433); continue;
-        default: this.s=436; continue;
+      case 432: this.m(433,'['); continue;
+      case 433: switch(this.l()) {
+        case '*': if(this.c(434)) { card.targetMax = this.valueWithLocation(); } continue;
+        case 'Number': if(this.c(436)) { card.targetMax = this.unsignedIntegerLiteral(); } continue;
+        default: this.s=438;{ card.targetMax = this.valueWithLocation( '*' ); } continue;
       }
-      case 433: this.targetCardinality({card,atAlt:false},436); continue;
       case 434: switch(this.l()) {
         case ',': this.c(435); continue;
-        case '..': this.targetCardinality({card,atAlt:true},436,439); continue;
-        default: this.s=436; continue;
+        default: this.s=438; continue;
       }
-      case 435: this.targetCardinality({card,atAlt:false},436); continue;
-      case 436: this.m(0,']'); continue;
+      case 435: this.targetCardinality({card,atAlt:false},438); continue;
+      case 436: switch(this.l()) {
+        case ',': this.c(437); continue;
+        case '..': this.targetCardinality({card,atAlt:true},438,441); continue;
+        default: this.s=438; continue;
+      }
+      case 437: this.targetCardinality({card,atAlt:false},438); continue;
+      case 438: this.m(0,']'); continue;
       default:
       $.art.cardinality = this.attachLocation(card);
       return this.exit_();
     }
   }
   targetCardinality($,$next,$startState) {
-    this.rule_($startState??438,$next);
+    this.rule_($startState??440,$next);
     { if (!$.atAlt) $.card.sourceMax = $.card.targetMax; }
     for(;;) switch(this.s) {
-      case 438: switch(this.l()) {
+      case 440: switch(this.l()) {
         case '*': if(this.c(0)) { $.card.targetMax = this.valueWithLocation(); } continue;
-        case 'Number': if(this.c(439)) { $.card.targetMax = this.unsignedIntegerLiteral(); } continue;
+        case 'Number': if(this.c(441)) { $.card.targetMax = this.unsignedIntegerLiteral(); } continue;
         default: this.e(); continue;
       }
-      case 439: switch(this.l()) {
-        case '..': if(this.c(440)) { $.card.targetMin = $.card.targetMax; } continue;
+      case 441: switch(this.l()) {
+        case '..': if(this.c(442)) { $.card.targetMin = $.card.targetMax; } continue;
         default: this.gr([']']); continue;
       }
-      case 440: switch(this.l()) {
+      case 442: 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;
@@ -3096,21 +3119,21 @@ $.art.$typeArgs.push( this.unsignedIntegerLiteral() ); } continue;
     }
   }
   nullabilityAndDefault($,$next) {
-    this.rule_(442,$next);
+    this.rule_(444,$next);
     let expr; let _;
     for(;;) switch(this.s) {
-      case 442: switch(this.lk()) {
-        case 'not': case 'null': this.nullability({art:$.art},443); continue;
-        case 'default': this.ec('calcOrDefaultRestriction') && this.ck(445); continue;
+      case 444: switch(this.lk()) {
+        case 'not': case 'null': this.nullability({art:$.art},445); continue;
+        case 'default': this.ec('elementRestriction','default') && this.ck(447); continue;
         default: this.e(); continue;
       }
-      case 443: switch(this.lk()) {
-        case 'default': this.gc(0,'calcOrDefaultRestriction') && this.ck(444); continue;
+      case 445: switch(this.lk()) {
+        case 'default': this.gc(0,'elementRestriction','default') && this.ck(446); continue;
         default: this.gr([]); continue;
       }
-      case 444: if(this.expression(_={},0)) {expr=_.expr; $.art.default = expr; } continue;
-      case 445: if(this.expression(_={},446)) {expr=_.expr; $.art.default = expr; } continue;
-      case 446: switch(this.lk()) {
+      case 446: if(this.expression(_={},0)) {expr=_.expr; $.art.default = expr; } continue;
+      case 447: if(this.expression(_={},448)) {expr=_.expr; $.art.default = expr; } continue;
+      case 448: switch(this.lk()) {
         case 'not': case 'null': this.nullability({art:$.art},0); continue;
         default: this.gr([]); continue;
       }
@@ -3118,45 +3141,45 @@ $.art.$typeArgs.push( this.unsignedIntegerLiteral() ); } continue;
     }
   }
   nullability($,$next) {
-    this.rule_(448,$next);
+    this.rule_(450,$next);
     for(;;) switch(this.s) {
-      case 448: switch(this.lk()) {
+      case 450: switch(this.lk()) {
         case 'null': if(this.ck(0)) { this.setNullability( $.art, false ); } continue;
-        case 'not': this.ck(449); continue;
+        case 'not': this.ck(451); continue;
         default: this.e(); continue;
       }
-      case 449: if(this.mk(0,'null')) { this.setNullability( $.art, true, this.locationOfPrevTokens( 2 ) ); } continue;
+      case 451: if(this.mk(0,'null')) { this.setNullability( $.art, true, this.locationOfPrevTokens( 2 ) ); } continue;
       default: return this.exit_();
     }
   }
   queryEOF($,$next) {
     $.query??=undefined;
-    this.rule_(451,$next);
+    this.rule_(453,$next);
     let _;
     for(;;) switch(this.s) {
-      case 451: if(this.queryExpression(_={},452)) $.query=_.expr; continue;
-      case 452: switch(this.l()) {
-        case ';': this.c(453); continue;
-        default: this.s=453; continue;
+      case 453: if(this.queryExpression(_={},454)) $.query=_.expr; continue;
+      case 454: switch(this.l()) {
+        case ';': this.c(455); continue;
+        default: this.s=455; continue;
       }
-      case 453: this.m(0,'EOF'); continue;
+      case 455: this.m(0,'EOF'); continue;
       default: return this.exit_();
     }
   }
   projectionSpec($,$next) {
     $.query??={};
-    this.rule_(455,$next);
+    this.rule_(457,$next);
     let tab; let _;
     for(;;) switch(this.s) {
-      case 455: if(this.mk(456,'projection')) { $.query = { op: this.valueWithLocation( 'SELECT' ) }; } continue;
-      case 456: this.mk(457,'on'); continue;
-      case 457: if(this.fromRefWithOptAlias(_={},458)) {tab=_.expr; this.afterBrace();
+      case 457: if(this.mk(458,'projection')) { $.query = { op: this.valueWithLocation( 'SELECT' ) }; } continue;
+      case 458: this.mk(459,'on'); continue;
+      case 459: if(this.fromRefWithOptAlias(_={},460)) {tab=_.expr; this.afterBrace();
 $.query.from = tab; } continue;
-      case 458: switch(this.l()) {
-        case '{': this.selectItemsList({query:$.query,start:undefined},459); continue;
-        default: this.s=459; continue;
+      case 460: switch(this.l()) {
+        case '{': this.selectItemsList({query:$.query,start:undefined},461); continue;
+        default: this.s=461; continue;
       }
-      case 459: switch(this.lk()) {
+      case 461: switch(this.lk()) {
         case 'excluding': this.excludingClause({query:$.query},0); continue;
         default: this.gr([';']); continue;
       }
@@ -3167,39 +3190,39 @@ $.query.from = tab; } continue;
   }
   queryExpression($,$next,$startState) {
     $.expr??={};
-    this.rule_($startState??461,$next);
+    this.rule_($startState??463,$next);
     let op; let quantifier;
     let query; let _;
     for(;;) switch(this.s) {
-      case 461: switch(this.l()) {
-        case '(': this.c(462); continue;
-        case 'Id': if(this.selectQuery(_={},464)) $.expr=_.query; continue;
+      case 463: switch(this.l()) {
+        case '(': this.c(464); continue;
+        case 'Id': if(this.selectQuery(_={},466)) $.expr=_.query; continue;
         default: this.e(); continue;
       }
-      case 462: this.queryExpression($,463); continue;
-      case 463: if(this.m(464,')')) { this.surroundByParens( $.expr ); } continue;
-      case 464: switch(this.lk()) {
-        case 'intersect': if(this.gp(468,4) && this.ck(465)) { op = this.valueWithLocation(); } continue;
-        case 'minus': case 'except': if(this.gp(468,2) && this.ck(465)) { op = this.valueWithLocation(); } continue;
-        case 'union': if(this.gp(468,2) && this.ck(466)) { op = this.valueWithLocation(); } continue;
-        default: this.s=468; continue;
+      case 464: this.queryExpression($,465); continue;
+      case 465: if(this.m(466,')')) { this.surroundByParens( $.expr ); } continue;
+      case 466: switch(this.lk()) {
+        case 'intersect': if(this.gc(470,'precLeft_',4) && this.ck(467)) { op = this.valueWithLocation(); } continue;
+        case 'minus': case 'except': if(this.gc(470,'precLeft_',2) && this.ck(467)) { op = this.valueWithLocation(); } continue;
+        case 'union': if(this.gc(470,'precLeft_',2) && this.ck(468)) { op = this.valueWithLocation(); } continue;
+        default: this.s=470; continue;
       }
-      case 465: switch(this.lk()) {
-        case 'distinct': if(this.ck(467)) { quantifier = this.valueWithLocation(); } continue;
-        default: this.s=467; continue;
+      case 467: switch(this.lk()) {
+        case 'distinct': if(this.ck(469)) { quantifier = this.valueWithLocation(); } continue;
+        default: this.s=469; continue;
       }
-      case 466: switch(this.lk()) {
-        case 'all': case 'distinct': if(this.ck(467)) { quantifier = this.valueWithLocation(); } continue;
-        default: this.s=467; continue;
+      case 468: switch(this.lk()) {
+        case 'all': case 'distinct': if(this.ck(469)) { quantifier = this.valueWithLocation(); } continue;
+        default: this.s=469; continue;
       }
-      case 467: if(this.queryExpression(_={},464)) {query=_.expr; if ($.expr.$parens || op.val !== $.expr.op.val || quantifier?.val !== $.expr.quantifier?.val) $.expr = { op, args: [$.expr], quantifier };
+      case 469: if(this.queryExpression(_={},466)) {query=_.expr; if ($.expr.$parens || op.val !== $.expr.op.val || quantifier?.val !== $.expr.quantifier?.val) $.expr = { op, args: [$.expr], quantifier };
 quantifier = undefined;
 $.expr.args.push( query ); this.attachLocation( $.expr ); } continue;
-      case 468: switch(this.lk()) {
-        case 'limit': case 'order': if(this.gp(0,0,'post') && this.g(469)) { if ($.expr.$parens) { this.attachLocation( $.expr ); $.expr = { op: this.valueWithLocation( '$query', this.la() ), args: [ $.expr ] }; } } continue;
+      case 470: switch(this.lk()) {
+        case 'limit': case 'order': if(this.gc(0,'precPost_',0) && this.g(471)) { if ($.expr.$parens) { this.attachLocation( $.expr ); $.expr = { op: this.valueWithLocation( '$query', this.la() ), args: [ $.expr ] }; } } continue;
         default: this.gr([]); continue;
       }
-      case 469: this.orderByLimitOffset({query:$.expr},0); continue;
+      case 471: this.orderByLimitOffset({query:$.expr},0); continue;
       default:
       this.attachLocation( $.expr );
       return this.exit_();
@@ -3207,61 +3230,61 @@ $.expr.args.push( query ); this.attachLocation( $.expr ); } continue;
   }
   selectQuery($,$next) {
     $.query??={};
-    this.rule_(471,$next);
+    this.rule_(473,$next);
     for(;;) switch(this.s) {
-      case 471: if(this.mk(472,'select')) { $.query = { op: this.valueWithLocation( 'SELECT' ) }; } continue;
-      case 472: switch(this.lk()) {
-        case 'from': this.ck(473); continue;
-        case 'all': case 'distinct': if(this.ckP(483,['Id','#','(','*','+','-',':','?','@','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'])) { $.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=483; continue;
+      case 473: if(this.mk(474,'select')) { $.query = { op: this.valueWithLocation( 'SELECT' ) }; } continue;
+      case 474: switch(this.lk()) {
+        case 'from': this.ck(475); continue;
+        case 'all': case 'distinct': if(this.ckP(485,['Id','#','(','*','+','-',':','?','@','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'])) { $.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=485; continue;
         default: this.ei(); continue;
       }
-      case 473: this.querySource({query:$.query},474); continue;
-      case 474: switch(this.lk()) {
-        case 'mixin': this.ck(475); continue;
-        default: this.s=480; continue;
+      case 475: this.querySource({query:$.query},476); continue;
+      case 476: switch(this.lk()) {
+        case 'mixin': this.ck(477); continue;
+        default: this.s=482; continue;
       }
-      case 475: if(this.m(476,'{')) { $.query.mixin = this.createDict(); } continue;
-      case 476: switch(this.l()) {
-        case 'Id': this.mixinElementDef({outer:$.query},477); continue;
-        default: this.s=478; continue;
+      case 477: if(this.m(478,'{')) { $.query.mixin = this.createDict(); } continue;
+      case 478: switch(this.l()) {
+        case 'Id': this.mixinElementDef({outer:$.query},479); continue;
+        default: this.s=480; continue;
       }
-      case 477: switch(this.l()) {
-        case ';': this.c(476); continue;
-        case '}': this.s=478; continue;
+      case 479: switch(this.l()) {
+        case ';': this.c(478); continue;
+        case '}': this.s=480; continue;
         default: this.e(); continue;
       }
-      case 478: if(this.m(479,'}')) { this.finalizeDictOrArray( $.query.mixin ); } continue;
-      case 479: this.mk(480,'into'); continue;
-      case 480: switch(this.lk()) {
-        case 'all': case 'distinct': if(this.ck(481)) { $.query.quantifier = this.valueWithLocation(); } continue;
-        default: this.s=481; continue;
-      }
-      case 481: switch(this.l()) {
-        case '{': this.selectItemsList({query:$.query,start:undefined},482); continue;
-        default: this.s=482; continue;
-      }
+      case 480: if(this.m(481,'}')) { this.finalizeDictOrArray( $.query.mixin ); } continue;
+      case 481: this.mk(482,'into'); continue;
       case 482: switch(this.lk()) {
-        case 'excluding': this.excludingClause({query:$.query},488); continue;
-        default: this.s=488; continue;
+        case 'all': case 'distinct': if(this.ck(483)) { $.query.quantifier = this.valueWithLocation(); } continue;
+        default: this.s=483; continue;
       }
       case 483: switch(this.l()) {
-        case '*': if(this.c(484)) { $.query.columns = [ this.valueWithLocation() ]; } continue;
-        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case '@': case '{': case 'Number': case 'String': case 'QuotedLiteral': this.selectItemDef({columns:($.query.columns = [])},484); continue;
-        default: this.e(); continue;
+        case '{': this.selectItemsList({query:$.query,start:undefined},484); continue;
+        default: this.s=484; continue;
       }
-      case 484: switch(this.l()) {
-        case ',': this.c(485); continue;
-        default: this.s=486; continue;
+      case 484: switch(this.lk()) {
+        case 'excluding': this.excludingClause({query:$.query},490); continue;
+        default: this.s=490; continue;
       }
       case 485: switch(this.l()) {
-        case '*': if(this.c(484)) { $.query.columns.push( this.valueWithLocation() ); } continue;
-        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case '@': case '{': case 'Number': case 'String': case 'QuotedLiteral': this.selectItemDef({columns:$.query.columns},484); continue;
+        case '*': if(this.c(486)) { $.query.columns = [ this.valueWithLocation() ]; } continue;
+        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case '@': case '{': case 'Number': case 'String': case 'QuotedLiteral': this.selectItemDef({columns:($.query.columns = [])},486); continue;
         default: this.e(); continue;
       }
-      case 486: this.mk(487,'from'); continue;
-      case 487: this.querySource({query:$.query},488); continue;
-      case 488: switch(this.lk()) {
+      case 486: switch(this.l()) {
+        case ',': this.c(487); continue;
+        default: this.s=488; continue;
+      }
+      case 487: switch(this.l()) {
+        case '*': if(this.c(486)) { $.query.columns.push( this.valueWithLocation() ); } continue;
+        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case '@': case '{': case 'Number': case 'String': case 'QuotedLiteral': this.selectItemDef({columns:$.query.columns},486); continue;
+        default: this.e(); continue;
+      }
+      case 488: this.mk(489,'from'); continue;
+      case 489: this.querySource({query:$.query},490); continue;
+      case 490: switch(this.lk()) {
         case 'group': case 'where': case 'having': this.whereGroupByHaving({query:$.query},0); continue;
         default: this.gr(['limit','minus','order','union','except','intersect']); continue;
       }
@@ -3271,164 +3294,165 @@ $.expr.args.push( query ); this.attachLocation( $.expr ); } continue;
     }
   }
   querySource($,$next) {
-    this.rule_(490,$next);
+    this.rule_(492,$next);
     let tab; let _;
     for(;;) switch(this.s) {
-      case 490: if(this.tableExpression(_={},491)) {tab=_.expr; $.query.from = tab; } continue;
-      case 491: switch(this.l()) {
-        case ',': this.s=492;{ const { location } = this.la();
+      case 492: if(this.tableExpression(_={},493)) {tab=_.expr; $.query.from = tab; } continue;
+      case 493: switch(this.l()) {
+        case ',': this.s=494;{ const { location } = this.la();
 $.query.from = { op: { val: 'join', location }, join: { val: 'cross', location }, args: [tab] }; } continue;
         default: this.gr(['group','limit','minus','order','union','where','except','having','intersect']); continue;
       }
-      case 492: switch(this.l()) {
-        case ',': this.c(493); continue;
+      case 494: switch(this.l()) {
+        case ',': this.c(495); continue;
         default: this.gr(['group','limit','minus','order','union','where','except','having','intersect']); continue;
       }
-      case 493: if(this.tableExpression(_={},492)) {tab=_.expr; $.query.from.args.push( tab ); } continue;
+      case 495: if(this.tableExpression(_={},494)) {tab=_.expr; $.query.from.args.push( tab ); } continue;
       case 0:
       this.attachLocation($.query.from);
       default: return this.exit_();
     }
   }
   tableExpression($,$next,$startState) {
-    $.expr??=undefined;
-    this.rule_($startState??495,$next);
+    $.expr??={};
+    this.rule_($startState??497,$next);
     let join; let tab; let card; let cond; let _;
     for(;;) switch(this.s) {
-      case 495: switch(this.l()) {
-        case '(': this.tableOrQueryParens($,496); continue;
-        case 'Id': this.fromRefWithOptAlias($,497); continue;
+      case 497: switch(this.l()) {
+        case '(': this.tableOrQueryParens($,498); continue;
+        case 'Id': this.fromRefWithOptAlias($,499); continue;
         default: this.e(); continue;
       }
-      case 496: this.s=497;{ $.expr = this.taggedIfQuery( $.expr ); } continue;
-      case 497: switch(this.lk()) {
-        case 'cross': if(this.ck(498)) join=this.lb(); continue;
-        case 'inner': if(this.ck(501)) join=this.lb(); continue;
-        case 'full': case 'left': case 'right': if(this.ck(500)) join=this.lb(); continue;
-        case 'join': this.s=502; continue;
-        default: if(this.gr([])) { join = undefined; } continue;
-      }
-      case 498: if(this.mk(499,'join')) { if ($.expr?.join?.val !== 'cross' || $.expr.$parens) $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( undefined, join ), args: [ $.expr ] }; } continue;
-      case 499: switch(this.l()) {
-        case '(': if(this.tableOrQueryParens(_={},497)) {tab=_.expr; $.expr.args.push( this.taggedIfQuery( tab ) );
+      case 498: this.s=499;{ $.expr = this.taggedIfQuery( $.expr ); } continue;
+      case 499: switch(this.lk()) {
+        case 'cross': if(this.ck(500)) join=this.lb(); continue;
+        case 'inner': if(this.ck(503)) join=this.lb(); continue;
+        case 'full': case 'left': case 'right': if(this.ck(502)) join=this.lb(); continue;
+        case 'join': if(this.ck(505)) { join = undefined; } continue;
+        default: this.gr([]); continue;
+      }
+      case 500: if(this.mk(501,'join')) { if ($.expr?.join?.val !== 'cross' || $.expr.$parens) $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( undefined, join ), args: [ $.expr ] }; } continue;
+      case 501: switch(this.l()) {
+        case '(': if(this.tableOrQueryParens(_={},499)) {tab=_.expr; $.expr.args.push( this.taggedIfQuery( tab ) );
 this.attachLocation( $.expr ); } continue;
-        case 'Id': if(this.fromRefWithOptAlias(_={},497)) {tab=_.expr; $.expr.args.push( tab );
+        case 'Id': if(this.fromRefWithOptAlias(_={},499)) {tab=_.expr; $.expr.args.push( tab );
 this.attachLocation( $.expr ); } continue;
         default: this.e(); continue;
       }
-      case 500: switch(this.lk()) {
-        case 'outer': this.ck(501); continue;
-        default: this.s=501; continue;
+      case 502: switch(this.lk()) {
+        case 'outer': this.ck(503); continue;
+        default: this.s=503; continue;
       }
-      case 501: switch(this.lk()) {
-        case 'one': case 'many': case 'exact': this.joinCardinality(card={},502); continue;
-        default: this.s=502; continue;
+      case 503: switch(this.lk()) {
+        case 'one': case 'many': case 'exact': this.joinCardinality(card={},504); continue;
+        default: this.s=504; continue;
       }
-      case 502: if(this.mk(503,'join')) { $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( join?.keyword || 'inner', join ), args: [ $.expr ] }; if (card) $.expr.cardinality = card; card = undefined;
-join = undefined; } continue;
-      case 503: if(this.tableExpression(_={},504)) {tab=_.expr; $.expr.args.push( tab ); this.attachLocation( $.expr ); } continue;
-      case 504: this.mk(505,'on'); continue;
-      case 505: if(this.condition(_={},497)) {cond=_.expr; $.expr.on = cond;
+      case 504: this.mk(505,'join'); continue;
+      case 505: this.s=506;{ $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( join?.keyword || 'inner', join ), args: [ $.expr ] }; if (card) $.expr.cardinality = card; card = undefined; } continue;
+      case 506: if(this.tableExpression(_={},507)) {tab=_.expr; $.expr.args.push( tab ); this.attachLocation( $.expr ); } continue;
+      case 507: this.mk(508,'on'); continue;
+      case 508: if(this.condition(_={},499)) {cond=_.expr; $.expr.on = cond;
 this.attachLocation( $.expr ); } continue;
       default: return this.exit_();
     }
   }
   tableOrQueryParens($,$next) {
     $.expr??=undefined;
-    this.rule_(507,$next);
+    this.rule_(510,$next);
     for(;;) switch(this.s) {
-      case 507: this.m(508,'('); continue;
-      case 508: switch(this.lk()) {
-        case '(': this.tableOrQueryParens($,509); continue;
-        case 'Id': this.ep(-2) && this.tableExpression($,510); continue;
-        case 'select': this.ep(-1) && this.queryExpression($,510); continue;
+      case 510: if(this.m(511,'(')) {this.queryOnLeft();} continue;
+      case 511: switch(this.lk()) {
+        case '(': this.tableOrQueryParens($,512); continue;
+        case 'Id': if(this.tableExpression($,513)) {this.queryOnLeft(0,'table');} continue;
+        case 'select': this.queryExpression($,513); continue;
         default: this.ei(); continue;
       }
-      case 509: switch(this.lk()) {
-        case 'full': case 'join': case 'left': case 'cross': case 'inner': case 'right': this.gp(510,-2,'post') && this.tableExpression($,510,496); continue;
-        case 'limit': case 'minus': case 'order': case 'union': case 'except': case 'intersect': this.gp(510,-1,'post') && this.queryExpression($,510,464); continue;
-        default: this.s=510; continue;
+      case 512: switch(this.lk()) {
+        case 'full': case 'join': case 'left': case 'cross': case 'inner': case 'right': if(this.tableExpression($,513,498)) {this.queryOnLeft(0,'table');} continue;
+        case 'limit': case 'minus': case 'order': case 'union': case 'except': case 'intersect': this.gc(513,'queryOnLeft') && this.queryExpression($,513,466); continue;
+        default: this.s=513; continue;
       }
-      case 510: if(this.m(511,')')) { this.surroundByParens( $.expr ); } continue;
-      case 511: switch(this.lk()) {
-        case 'as': this.gp(0,-2,'none') && this.ck(512); continue;
-        case 'Id': if(this.gc(0,'tableAlias') && this.ci(0,'FromAlias')) {this.setPrecInCallingRule(); $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.fragileAlias(); } continue;
-        default: if(this.gi(0,['full','join','left','cross','inner','right'])) { this.setPrecInCallingRule(); } continue;
+      case 513: if(this.m(514,')')) { this.surroundByParens( $.expr ); } continue;
+      case 514: switch(this.lk()) {
+        case 'as': this.gc(0,'queryOnLeft','table') && this.ck(515); continue;
+        case 'Id': if(this.gc(0,'queryOnLeft','tableWithoutAs') && this.ci(0,'FromAlias')) { $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.fragileAlias(); } continue;
+        default: this.gi(0,['full','join','left','cross','inner','right']); continue;
       }
-      case 512: if(this.mi(0,'FromAlias')) {this.setPrecInCallingRule(); $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.identAst(); } continue;
+      case 515: if(this.mi(0,'FromAlias')) { $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.identAst(); } continue;
       default: return this.exit_();
     }
   }
   joinCardinality($,$next) {
     $.sourceMax??=undefined; $.targetMax??=undefined;
-    this.rule_(514,$next);
+    this.rule_(517,$next);
     for(;;) switch(this.s) {
-      case 514: switch(this.lk()) {
-        case 'exact': if(this.ck(515)) { $.sourceMin = this.valueWithLocation( 1 ); } continue;
-        case 'one': this.s=515; continue;
-        case 'many': if(this.ck(516)) { $.sourceMax = this.valueWithLocation( '*' ); } continue;
-        default: this.e(); continue;
-      }
-      case 515: if(this.mk(516,'one')) { $.sourceMax = this.valueWithLocation( 1 ); } continue;
-      case 516: this.mk(517,'to'); continue;
       case 517: switch(this.lk()) {
-        case 'exact': if(this.ck(518)) { $.targetMin = this.valueWithLocation( 1 ); } continue;
+        case 'exact': if(this.ck(518)) { $.sourceMin = this.valueWithLocation( 1 ); } continue;
         case 'one': this.s=518; continue;
+        case 'many': if(this.ck(519)) { $.sourceMax = this.valueWithLocation( '*' ); } continue;
+        default: this.e(); continue;
+      }
+      case 518: if(this.mk(519,'one')) { $.sourceMax = this.valueWithLocation( 1 ); } continue;
+      case 519: this.mk(520,'to'); continue;
+      case 520: switch(this.lk()) {
+        case 'exact': if(this.ck(521)) { $.targetMin = this.valueWithLocation( 1 ); } continue;
+        case 'one': this.s=521; continue;
         case 'many': if(this.ck(0)) { $.targetMax = this.valueWithLocation( '*' ); } continue;
         default: this.e(); continue;
       }
-      case 518: if(this.mk(0,'one')) { $.targetMax = this.valueWithLocation( 1 ); } continue;
+      case 521: if(this.mk(0,'one')) { $.targetMax = this.valueWithLocation( 1 ); } continue;
       default:
       this.attachLocation( $ );
       return this.exit_();
     }
   }
   fromRefWithOptAlias($,$next) {
-    $.expr??={ path: [] };
-    this.rule_(520,$next);
+    $.expr??={};
+    this.rule_(523,$next);
+    { $.expr.path = []; }
     for(;;) switch(this.s) {
-      case 520: this.fromPath({table:$.expr,category:'artref'},521); continue;
-      case 521: switch(this.l()) {
-        case ':': if(this.c(522)) { if (!$.expr.scope) $.expr.scope = $.expr.path.length; else {
+      case 523: this.fromPath({table:$.expr,category:'artref'},524); continue;
+      case 524: switch(this.l()) {
+        case ':': if(this.c(525)) { if (!$.expr.scope) $.expr.scope = $.expr.path.length; else {
 this.warning( 'syntax-invalid-path-separator', this.lb(),
 { '#': 'colon', code: ':', newcode: '.' } );
 } } continue;
-        default: this.s=523; continue;
+        default: this.s=526; continue;
       }
-      case 522: this.fromPath({table:$.expr,category:'ref'},523); continue;
-      case 523: switch(this.lk()) {
-        case 'as': this.ck(524); continue;
-        case 'Id': if(this.gc(525,'tableAlias') && this.ci(0,'FromAlias')) { $.expr.name = this.fragileAlias(); } continue;
-        default: this.giR(525); continue;
+      case 525: this.fromPath({table:$.expr,category:'ref'},526); continue;
+      case 526: switch(this.lk()) {
+        case 'as': this.ck(527); continue;
+        case 'Id': if(this.gc(528,'tableWithoutAs') && this.ci(0,'FromAlias')) { $.expr.name = this.fragileAlias(); } continue;
+        default: this.giR(528); continue;
       }
-      case 524: if(this.mi(0,'FromAlias')) { $.expr.name = this.identAst(); } continue;
-      case 525: if(this.gr([])) { this.classifyImplicitName( $.expr.scope ? 'FromElemImplicit' : 'FromImplicit', $.expr ); } continue;
+      case 527: if(this.mi(0,'FromAlias')) { $.expr.name = this.identAst(); } continue;
+      case 528: if(this.gr([])) { this.classifyImplicitName( $.expr.scope ? 'FromElemImplicit' : 'FromImplicit', $.expr ); } continue;
       default:
       this.attachLocation( $.expr );
       return this.exit_();
     }
   }
   fromPath($,$next) {
-    this.rule_(527,$next);
+    this.rule_(530,$next);
     let pathItem;
     for(;;) switch(this.s) {
-      case 527: if(this.mi(528,$.category)) { $.table.path.push( pathItem = this.identAst() ); } continue;
-      case 528: switch(this.l()) {
-        case '(': case '[': if(this.fromArgumentsAndFilter({pathStep:pathItem},529)) { pathItem = null; } continue;
-        default: this.s=529; continue;
+      case 530: if(this.mi(531,$.category)) { $.table.path.push( pathItem = this.identAst() ); } continue;
+      case 531: switch(this.l()) {
+        case '(': case '[': if(this.fromArgumentsAndFilter({pathStep:pathItem},532)) { pathItem = null; } continue;
+        default: this.s=532; continue;
       }
-      case 529: switch(this.l()) {
-        case '.': if(this.c(530)) { if (!pathItem && !$.table.scope) {
+      case 532: switch(this.l()) {
+        case '.': if(this.c(533)) { if (!pathItem && !$.table.scope) {
 $.table.scope = $.table.path.length; $.category = 'ref';
 this.warning( 'syntax-invalid-path-separator', this.lb(),
 { '#': 'dot', code: '.', newcode: ':' } );
 } } continue;
         default: this.gr(['Id','as']); continue;
       }
-      case 530: if(this.miA(531,$.category)) { $.table.path.push( pathItem = this.identAst() ); } continue;
-      case 531: switch(this.l()) {
-        case '(': case '[': if(this.fromArgumentsAndFilter({pathStep:pathItem},529)) { pathItem = null; } continue;
-        default: this.s=529; continue;
+      case 533: if(this.miA(534,$.category)) { $.table.path.push( pathItem = this.identAst() ); } continue;
+      case 534: switch(this.l()) {
+        case '(': case '[': if(this.fromArgumentsAndFilter({pathStep:pathItem},532)) { pathItem = null; } continue;
+        default: this.s=532; continue;
       }
       default:
       this.attachLocation( $.table.path );
@@ -3436,27 +3460,27 @@ this.warning( 'syntax-invalid-path-separator', this.lb(),
     }
   }
   fromArgumentsAndFilter($,$next) {
-    this.rule_(533,$next);
+    this.rule_(536,$next);
     for(;;) switch(this.s) {
-      case 533: switch(this.l()) {
-        case '(': if(this.c(534)) { $.pathStep.args = this.createDict(); $.pathStep.$syntax = ':'; } continue;
-        default: this.s=538; continue;
+      case 536: switch(this.l()) {
+        case '(': if(this.c(537)) { $.pathStep.args = this.createDict(); $.pathStep.$syntax = ':'; } continue;
+        default: this.s=541; continue;
       }
-      case 534: switch(this.lk()) {
-        case 'Id': this.s=535; continue;
+      case 537: switch(this.lk()) {
+        case 'Id': this.s=538; continue;
         default: this.ei(); continue;
       }
-      case 535: switch(this.l()) {
-        case 'Id': this.fromNamedArgument($,536); continue;
-        default: this.s=537; continue;
+      case 538: switch(this.l()) {
+        case 'Id': this.fromNamedArgument($,539); continue;
+        default: this.s=540; continue;
       }
-      case 536: switch(this.l()) {
-        case ',': this.c(535); continue;
-        case ')': this.s=537; continue;
+      case 539: switch(this.l()) {
+        case ',': this.c(538); continue;
+        case ')': this.s=540; continue;
         default: this.e(); continue;
       }
-      case 537: this.m(538,')'); continue;
-      case 538: switch(this.l()) {
+      case 540: this.m(541,')'); continue;
+      case 541: switch(this.l()) {
         case '[': this.cardinalityAndFilter($,0); continue;
         default: this.gr(['Id','.','as']); continue;
       }
@@ -3464,219 +3488,220 @@ this.warning( 'syntax-invalid-path-separator', this.lb(),
     }
   }
   fromNamedArgument($,$next) {
-    this.rule_(540,$next);
+    this.rule_(543,$next);
     let name; let expr; let _;
     for(;;) switch(this.s) {
-      case 540: if(this.mi(541,'paramname')) name=this.lb(); continue;
-      case 541: this.m(542,':'); continue;
-      case 542: if(this.expression(_={},0)) {expr=_.expr; this.addDef( expr, $.pathStep, 'args', 0, this.identAst( name ) ); } continue;
+      case 543: if(this.mi(544,'paramname')) name=this.lb(); continue;
+      case 544: this.m(545,':'); continue;
+      case 545: if(this.expression(_={},0)) {expr=_.expr; this.addDef( expr, $.pathStep, 'args', 0, this.identAst( name ) ); } continue;
       default: return this.exit_();
     }
   }
   cardinalityAndFilter($,$next) {
-    this.rule_(544,$next);
+    this.rule_(547,$next);
     for(;;) switch(this.s) {
-      case 544: this.m(545,'['); continue;
-      case 545: switch(this.l()) {
-        case 'Number': if(this.gc(547,'beforeColon') && this.c(546)) { $.pathStep.cardinality = { targetMax: this.unsignedIntegerLiteral(), location: this.lb().location }; } continue;
-        default: this.s=547; continue;
-      }
-      case 546: this.m(547,':'); continue;
-      case 547: this.filterClauses({pathStep:$.pathStep},548); continue;
-      case 548: this.m(0,']'); continue;
+      case 547: this.m(548,'['); continue;
+      case 548: switch(this.l()) {
+        case 'Number': if(this.gc(550,'beforeColon') && this.c(549)) { $.pathStep.cardinality = { targetMax: this.unsignedIntegerLiteral(), location: this.lb().location }; } continue;
+        default: this.s=550; continue;
+      }
+      case 549: this.m(550,':'); continue;
+      case 550: this.filterClauses({pathStep:$.pathStep},551); continue;
+      case 551: this.m(0,']'); continue;
       default: return this.exit_();
     }
   }
   filterClauses($,$next) {
-    this.rule_(550,$next);
+    this.rule_(553,$next);
     let cond; let _;
     for(;;) switch(this.s) {
-      case 550: switch(this.lk()) {
-        case 'where': this.ck(551); 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=551; continue;
-        case 'group': case 'limit': case 'order': case 'having': this.gP(552); continue;
-        default: this.gi(552); continue;
-      }
-      case 551: if(this.condition(_={},552)) {cond=_.expr; $.pathStep.where = cond; } continue;
-      case 552: switch(this.lk()) {
-        case 'group': this.s=553;{ this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'group by' }); } continue;
-        default: this.s=554; continue;
-      }
-      case 553: this.groupByClause({query:$.pathStep},554); continue;
-      case 554: switch(this.lk()) {
-        case 'having': if(this.ck(555)) { this.csnParseOnly('syntax-unexpected-sql-clause', -1, { keyword: 'having' }); } continue;
-        default: this.s=556; continue;
-      }
-      case 555: if(this.condition(_={},556)) {cond=_.expr; $.pathStep.having = cond; } continue;
-      case 556: switch(this.lk()) {
-        case 'limit': case 'order': this.s=557;{ 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 553: switch(this.lk()) {
+        case 'where': this.ck(554); 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=554; continue;
+        case 'group': case 'limit': case 'order': case 'having': this.gP(555); continue;
+        default: this.gi(555); continue;
+      }
+      case 554: if(this.condition(_={},555)) {cond=_.expr; $.pathStep.where = cond; } continue;
+      case 555: switch(this.lk()) {
+        case 'group': this.s=556;{ this.csnParseOnly('syntax-unexpected-sql-clause', 1, { keyword: 'group by' }); } continue;
+        default: this.s=557; continue;
+      }
+      case 556: this.groupByClause({query:$.pathStep},557); continue;
+      case 557: switch(this.lk()) {
+        case 'having': if(this.ck(558)) { this.csnParseOnly('syntax-unexpected-sql-clause', -1, { keyword: 'having' }); } continue;
+        default: this.s=559; continue;
+      }
+      case 558: if(this.condition(_={},559)) {cond=_.expr; $.pathStep.having = cond; } continue;
+      case 559: switch(this.lk()) {
+        case 'limit': case 'order': this.s=560;{ 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 557: this.orderByLimitOffset({query:$.pathStep},0); continue;
+      case 560: this.orderByLimitOffset({query:$.pathStep},0); continue;
       default: return this.exit_();
     }
   }
   excludingClause($,$next) {
-    this.rule_(559,$next);
+    this.rule_(562,$next);
     for(;;) switch(this.s) {
-      case 559: this.mk(560,'excluding'); continue;
-      case 560: if(this.m(561,'{')) { $.query.excludingDict = this.createDict(); } continue;
-      case 561: switch(this.l()) {
-        case 'Id': this.s=562; continue;
+      case 562: this.mk(563,'excluding'); continue;
+      case 563: if(this.m(564,'{')) { $.query.excludingDict = this.createDict(); } continue;
+      case 564: switch(this.l()) {
+        case 'Id': this.s=565; continue;
         default: this.e(); continue;
       }
-      case 562: switch(this.l()) {
-        case 'Id': if(this.ciA(563,'ref')) { this.addDef( { location: this.lb().location }, $.query, 'excludingDict', '', this.identAst() ); } continue;
-        default: this.s=564; continue;
+      case 565: switch(this.l()) {
+        case 'Id': if(this.ciA(566,'ref')) { this.addDef( { location: this.lb().location }, $.query, 'excludingDict', '', this.identAst() ); } continue;
+        default: this.s=567; continue;
       }
-      case 563: switch(this.l()) {
-        case ',': this.c(562); continue;
-        case '}': this.s=564; continue;
+      case 566: switch(this.l()) {
+        case ',': this.c(565); continue;
+        case '}': this.s=567; continue;
         default: this.e(); continue;
       }
-      case 564: if(this.m(0,'}')) {this.afterBrace(); this.finalizeDictOrArray( $.query.excludingDict ); } continue;
+      case 567: if(this.m(0,'}')) {this.afterBrace(); this.finalizeDictOrArray( $.query.excludingDict ); } continue;
       default: return this.exit_();
     }
   }
   selectItemsList($,$next) {
-    this.rule_(566,$next);
+    this.rule_(569,$next);
     for(;;) switch(this.s) {
-      case 566: if(this.m(567,'{')) {this.notInExpandInline(); $.query.columns = this.createArray( $.start ); } continue;
-      case 567: switch(this.l()) {
-        case '*': if(this.c(568)) { $.query.columns.push( this.valueWithLocation() ); } continue;
-        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case '@': case '{': case 'Number': case 'String': case 'QuotedLiteral': this.selectItemDef({columns:$.query.columns},568); continue;
-        default: this.s=569; continue;
-      }
-      case 568: switch(this.l()) {
-        case ',': this.c(567); continue;
-        case '}': this.s=569; continue;
+      case 569: if(this.m(570,'{')) {this.inSelectItem(0,'top'); $.query.columns = this.createArray( $.start ); } continue;
+      case 570: switch(this.l()) {
+        case '*': if(this.c(571)) { $.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},571); continue;
+        default: this.s=572; continue;
+      }
+      case 571: switch(this.l()) {
+        case ',': this.c(570); continue;
+        case '}': this.s=572; continue;
         default: this.e(); continue;
       }
-      case 569: if(this.m(0,'}')) {this.afterBrace(); this.finalizeDictOrArray( $.query.columns ); } continue;
+      case 572: if(this.m(0,'}')) {this.afterBrace(); this.finalizeDictOrArray( $.query.columns ); } continue;
       default: return this.exit_();
     }
   }
   nestedSelectItemsList($,$next) {
-    this.rule_(571,$next);
+    this.rule_(574,$next);
     for(;;) switch(this.s) {
-      case 571: if(this.m(572,'{')) {this.inExpandInline(); $.query[$.clause] = this.createArray(); } continue;
-      case 572: switch(this.l()) {
-        case '*': if(this.c(573)) { $.query[$.clause].push( this.valueWithLocation() ); } continue;
-        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case '@': case '{': case 'Number': case 'String': case 'QuotedLiteral': this.selectItemDef({columns:$.query[$.clause]},573); continue;
-        default: this.s=574; continue;
-      }
-      case 573: switch(this.l()) {
-        case ',': this.c(572); continue;
-        case '}': this.s=574; continue;
+      case 574: if(this.m(575,'{')) {this.inSelectItem(0,'nested'); $.query[$.clause] = this.createArray(); } continue;
+      case 575: switch(this.l()) {
+        case '*': if(this.c(576)) { $.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]},576); continue;
+        default: this.s=577; continue;
+      }
+      case 576: switch(this.l()) {
+        case ',': this.c(575); continue;
+        case '}': this.s=577; continue;
         default: this.e(); continue;
       }
-      case 574: if(this.m(0,'}')) {this.afterBrace(); this.finalizeDictOrArray( $.query[$.clause] ); } continue;
+      case 577: if(this.m(0,'}')) {this.afterBrace(); this.finalizeDictOrArray( $.query[$.clause] ); } continue;
       default: return this.exit_();
     }
   }
   selectItemDef($,$next) {
-    this.rule_(576,$next);
+    this.rule_(579,$next);
     let art=new XsnArtifact(); let alias;
     let expr; let as; let target; let cond; let assoc; let card; let _;
     { $.columns.push( art );
 this.docComment( art ); }
     for(;;) switch(this.s) {
-      case 576: switch(this.l()) {
-        case '@': this.annoAssignCol({art},576); continue;
-        default: this.s=577; continue;
+      case 579: switch(this.l()) {
+        case '@': this.annoAssignCol({art},579); continue;
+        default: this.s=580; continue;
       }
-      case 577: switch(this.lk()) {
-        case 'virtual': if(this.lP(['Id','#','(','+','-',':','?','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral']) && this.gc(578,'notInExpandInline') && this.ck(578)) { art.virtual = this.valueWithLocation( true ); } continue;
-        default: this.s=578; continue;
+      case 580: switch(this.lk()) {
+        case 'virtual': if(this.lP(['Id','#','(','+','-',':','?','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral']) && this.gc(581,'modifierRestriction') && this.ck(581)) { art.virtual = this.valueWithLocation( true ); } continue;
+        default: this.s=581; continue;
       }
-      case 578: switch(this.lk()) {
-        case 'key': if(this.gc(579,'notInExpandInline') && this.ck(579)) { art.key = this.valueWithLocation( true ); } continue;
-        default: this.s=579; continue;
+      case 581: switch(this.lk()) {
+        case 'key': if(this.gc(582,'modifierRestriction') && this.ck(582)) { art.key = this.valueWithLocation( true ); } continue;
+        default: this.s=582; continue;
       }
-      case 579: switch(this.l()) {
-        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case 'Number': case 'String': case 'QuotedLiteral': if(this.expression(_={},580)) {expr=_.expr; art.value = expr; } continue;
-        case '{': this.nestedSelectItemsList({query:art,clause:'expand'},587); continue;
+      case 582: switch(this.l()) {
+        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case 'Number': case 'String': case 'QuotedLiteral': if(this.expression(_={},583)) {expr=_.expr; art.value = expr; } continue;
+        case '{': this.nestedSelectItemsList({query:art,clause:'expand'},590); continue;
         default: this.e(); continue;
       }
-      case 580: switch(this.lk()) {
-        case 'as': if(this.ck(581)) as=this.lb(); continue;
-        case 'Id': if(this.ci(582,'ItemAlias')) { art.name = this.fragileAlias( true ); } continue;
-        default: if(this.gi(582)) { alias = this.classifyImplicitName( 'ItemImplicit', expr ); } continue;
+      case 583: switch(this.lk()) {
+        case 'as': if(this.ck(584)) as=this.lb(); continue;
+        case 'Id': if(this.ci(585,'ItemAlias')) { art.name = this.fragileAlias( true ); } continue;
+        default: if(this.gi(585)) { alias = this.classifyImplicitName( 'ItemImplicit', expr ); } continue;
       }
-      case 581: if(this.mi(582,'ItemAlias')) { art.name = this.identAst(); } continue;
-      case 582: switch(this.l()) {
-        case '{': this.s=583;{ this.reportExpandInline( art, false ); } continue;
-        case '.': if(this.c(585)) { this.reportExpandInline( art, as || true );
+      case 584: if(this.mi(585,'ItemAlias')) { art.name = this.identAst(); } continue;
+      case 585: switch(this.l()) {
+        case '{': this.s=586;{ this.reportExpandInline( art, false ); } continue;
+        case '.': if(this.c(588)) { this.reportUnexpectedSpace( this.lb(), this.la().location, true );
+this.reportExpandInline( art, as || true );
 if (alias) alias.token.parsedAs = alias.parsedAs; } continue;
-        default: this.s=590; continue;
+        default: this.s=593; continue;
       }
-      case 583: this.nestedSelectItemsList({query:art,clause:'expand'},584); continue;
-      case 584: switch(this.lk()) {
-        case 'excluding': this.excludingClause({query:art},590); continue;
-        default: this.s=590; continue;
+      case 586: this.nestedSelectItemsList({query:art,clause:'expand'},587); continue;
+      case 587: switch(this.lk()) {
+        case 'excluding': this.excludingClause({query:art},593); continue;
+        default: this.s=593; continue;
       }
-      case 585: switch(this.l()) {
-        case '{': this.nestedSelectItemsList({query:art,clause:'inline'},586); continue;
-        case '*': if(this.c(590)) { art.inline = [ this.valueWithLocation() ]; } continue;
+      case 588: switch(this.l()) {
+        case '{': this.nestedSelectItemsList({query:art,clause:'inline'},589); continue;
+        case '*': if(this.c(593)) { art.inline = [ this.valueWithLocation() ]; } continue;
         default: this.e(); continue;
       }
-      case 586: switch(this.lk()) {
-        case 'excluding': this.excludingClause({query:art},590); continue;
-        default: this.s=590; continue;
+      case 589: switch(this.lk()) {
+        case 'excluding': this.excludingClause({query:art},593); continue;
+        default: this.s=593; continue;
       }
-      case 587: switch(this.lk()) {
-        case 'excluding': this.excludingClause({query:art},588); continue;
-        default: this.s=588; 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.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 590: switch(this.lk()) {
+        case 'excluding': this.excludingClause({query:art},591); continue;
+        default: this.s=591; continue;
+      }
+      case 591: this.mk(592,'as'); continue;
+      case 592: if(this.mi(593,'ItemAlias')) { art.name = this.identAst(); } continue;
+      case 593: this.s=594;{ this.docComment( art ); } continue;
+      case 594: switch(this.l()) {
+        case '@': this.annoAssignMid({art},594); continue;
+        default: this.s=595; continue;
+      }
+      case 595: switch(this.l()) {
+        case ':': this.c(596); 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.ckP(599,['[','to'])) {assoc=this.lb(); this.associationInSelectItem( art ); } continue;
-        case 'composition': if(this.ckP(601,['[','of'])) {assoc=this.lb(); this.associationInSelectItem( art ); } continue;
+      case 596: switch(this.lk()) {
+        case 'type': this.lP() && this.typeTypeOf({art},610); continue;
+        case 'localized': if(this.ckP(597,['Id'])) { art.localized = this.valueWithLocation( true ); } continue;
+        case 'Id': this.s=597; continue;
+        case 'redirected': this.ckP(598,['to']); continue;
+        case 'association': if(this.ckP(602,['[','to'])) {assoc=this.lb(); this.associationInSelectItem( art ); } continue;
+        case 'composition': if(this.ckP(604,['[','of'])) {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;
+      case 597: this.typeRefOptArgs({art},610); continue;
+      case 598: this.mk(599,'to'); continue;
+      case 599: if(this.simplePath(_={category:'artref'},600)) {target=_.ref; art.target = target; } continue;
+      case 600: switch(this.lk()) {
+        case 'on': this.ck(601); continue;
+        case '{': this.foreignKeysBlock({art},610); continue;
+        default: this.s=610; continue;
+      }
+      case 601: if(this.condition(_={},610)) {cond=_.expr; art.on = cond; } continue;
+      case 602: switch(this.l()) {
+        case '[': this.cardinality({art},603); continue;
+        default: this.s=603; continue;
+      }
+      case 603: this.mk(606,'to'); continue;
+      case 604: switch(this.l()) {
+        case '[': this.cardinality({art},605); continue;
+        default: this.s=605; continue;
+      }
+      case 605: this.mk(606,'of'); continue;
+      case 606: switch(this.lk()) {
+        case 'one': case 'many': if(this.ckP(607,['Id'])) card=this.lb(); continue;
         default: this.s=607; continue;
       }
-      case 598: if(this.condition(_={},607)) {cond=_.expr; art.on = cond; } 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;
-        default: this.s=602; continue;
-      }
-      case 602: this.mk(603,'of'); continue;
-      case 603: switch(this.lk()) {
-        case 'one': case 'many': if(this.ckP(604,['Id'])) 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 607: if(this.simplePath(_={category:'artref'},608)) {target=_.ref; this.setAssocAndComposition( art, assoc, card, target ); } continue;
+      case 608: this.mk(609,'on'); continue;
+      case 609: if(this.condition(_={},610)) {expr=_.expr; art.on = expr; } continue;
+      case 610: this.s=611;{ this.docComment( art ); } continue;
+      case 611: switch(this.l()) {
+        case '@': this.annoAssignStd({art},611); continue;
         default: this.gr([',']); continue;
       }
       default:
@@ -3685,91 +3710,91 @@ if (alias) alias.token.parsedAs = alias.parsedAs; } continue;
     }
   }
   whereGroupByHaving($,$next) {
-    this.rule_(610,$next);
+    this.rule_(613,$next);
     let cond; let _;
     for(;;) switch(this.s) {
-      case 610: switch(this.lk()) {
-        case 'where': this.ck(611); continue;
-        default: this.s=612; continue;
+      case 613: switch(this.lk()) {
+        case 'where': this.ck(614); continue;
+        default: this.s=615; 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 614: if(this.condition(_={},615)) {cond=_.expr; $.query.where = cond; } continue;
+      case 615: switch(this.lk()) {
+        case 'group': this.groupByClause($,616); continue;
+        default: this.s=616; continue;
       }
-      case 613: switch(this.lk()) {
-        case 'having': this.ck(614); continue;
+      case 616: switch(this.lk()) {
+        case 'having': this.ck(617); continue;
         default: this.gr(['limit','order']); continue;
       }
-      case 614: if(this.condition(_={},0)) {cond=_.expr; $.query.having = cond; } continue;
+      case 617: if(this.condition(_={},0)) {cond=_.expr; $.query.having = cond; } continue;
       default: return this.exit_();
     }
   }
   groupByClause($,$next) {
-    this.rule_(616,$next);
+    this.rule_(619,$next);
     let expr; let _;
     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 619: this.mk(620,'group'); continue;
+      case 620: this.mk(621,'by'); continue;
+      case 621: if(this.expression(_={},622)) {expr=_.expr; $.query.groupBy = [ expr ]; } continue;
+      case 622: switch(this.l()) {
+        case ',': this.c(623); continue;
         default: this.gr(['limit','order','having']); continue;
       }
-      case 620: if(this.expression(_={},619)) {expr=_.expr; $.query.groupBy.push( expr ); } continue;
+      case 623: if(this.expression(_={},622)) {expr=_.expr; $.query.groupBy.push( expr ); } continue;
       default: return this.exit_();
     }
   }
   orderByLimitOffset($,$next) {
-    this.rule_(622,$next);
+    this.rule_(625,$next);
     let expr; let _;
     for(;;) switch(this.s) {
-      case 622: switch(this.lk()) {
-        case 'order': this.orderByClause($,623); continue;
-        default: this.s=623; continue;
+      case 625: switch(this.lk()) {
+        case 'order': this.orderByClause($,626); continue;
+        default: this.s=626; continue;
       }
-      case 623: switch(this.lk()) {
-        case 'limit': this.ck(624); continue;
+      case 626: switch(this.lk()) {
+        case 'limit': this.ck(627); 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;
+      case 627: if(this.expression(_={},628)) {expr=_.expr; $.query.limit = { rows: expr }; } continue;
+      case 628: switch(this.lk()) {
+        case 'offset': this.ck(629); continue;
         default: this.gr([]); continue;
       }
-      case 626: if(this.expression(_={},0)) {expr=_.expr; $.query.limit.offset = expr; } continue;
+      case 629: if(this.expression(_={},0)) {expr=_.expr; $.query.limit.offset = expr; } continue;
       default: return this.exit_();
     }
   }
   orderByClause($,$next) {
-    this.rule_(628,$next);
+    this.rule_(631,$next);
     let expr; let _;
     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 631: this.mk(632,'order'); continue;
+      case 632: this.mk(633,'by'); continue;
+      case 633: if(this.orderByExpression(_={},634)) {expr=_.expr; $.query.orderBy = [ expr ]; } continue;
+      case 634: switch(this.l()) {
+        case ',': this.c(635); continue;
         default: this.gr(['limit']); continue;
       }
-      case 632: if(this.orderByExpression(_={},631)) {expr=_.expr; $.query.orderBy.push( expr ); } continue;
+      case 635: if(this.orderByExpression(_={},634)) {expr=_.expr; $.query.orderBy.push( expr ); } continue;
       default: return this.exit_();
     }
   }
   orderByExpression($,$next) {
     $.expr??=undefined;
-    this.rule_(634,$next);
+    this.rule_(637,$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 637: this.expression($,638); continue;
+      case 638: switch(this.lk()) {
+        case 'asc': case 'desc': if(this.ck(639)) { $.expr.sort = this.valueWithLocation(); } continue;
+        default: this.s=639; continue;
       }
-      case 636: switch(this.lk()) {
-        case 'nulls': this.ck(637); continue;
+      case 639: switch(this.lk()) {
+        case 'nulls': this.ck(640); continue;
         default: this.gr([',','limit']); continue;
       }
-      case 637: switch(this.lk()) {
+      case 640: switch(this.lk()) {
         case 'last': case 'first': if(this.ck(0)) { $.expr.nulls = this.valueWithLocation(); } continue;
         default: this.e(); continue;
       }
@@ -3778,40 +3803,40 @@ if (alias) alias.token.parsedAs = alias.parsedAs; } continue;
   }
   conditionEOF($,$next) {
     $.cond??=undefined;
-    this.rule_(639,$next);
+    this.rule_(642,$next);
     let _;
     for(;;) switch(this.s) {
-      case 639: if(this.expression(_={},640)) $.cond=_.expr; continue;
-      case 640: this.m(0,'EOF'); continue;
+      case 642: if(this.expression(_={},643)) $.cond=_.expr; continue;
+      case 643: this.m(0,'EOF'); continue;
       default: return this.exit_();
     }
   }
   condition($,$next) {
     $.expr??=undefined;
-    this.rule_(642,$next);
+    this.rule_(645,$next);
     for(;;) switch(this.s) {
-      case 642: this.expression($,0); continue;
+      case 645: this.expression($,0); continue;
       default: return this.exit_();
     }
   }
   valuePath($,$next,$startState) {
     $.expr??={ path: [] };
-    this.rule_($startState??644,$next);
+    this.rule_($startState??647,$next);
     let pathItem;
     for(;;) switch(this.s) {
-      case 644: if(this.mi(645,'ref')) { $.expr.path.push( pathItem = this.identAst() ); } continue;
-      case 645: switch(this.l()) {
-        case '(': case '[': this.argumentsAndFilter({pathStep:pathItem},646); continue;
-        default: this.s=646; continue;
+      case 647: if(this.mi(648,'ref')) { $.expr.path.push( pathItem = this.identAst() ); } continue;
+      case 648: switch(this.l()) {
+        case '(': case '[': this.argumentsAndFilter({pathStep:pathItem},649); continue;
+        default: this.s=649; continue;
       }
-      case 646: switch(this.l()) {
-        case '.': this.gc(0,'isDotForPath') && this.c(647); continue;
+      case 649: switch(this.l()) {
+        case '.': this.gc(0,'isDotForPath') && this.c(650); continue;
         default: this.gr(['*','+','-','/','<','=','>','?','!=','<=','<>','>=','in','is','or','||','and','not','like','between']); continue;
       }
-      case 647: if(this.miA(648,'ref')) { $.expr.path.push( pathItem = this.identAst() ); } continue;
-      case 648: switch(this.l()) {
-        case '(': case '[': if(this.argumentsAndFilter({pathStep:pathItem},646)) { pathItem = null; } continue;
-        default: this.s=646; continue;
+      case 650: if(this.miA(651,'ref')) { $.expr.path.push( pathItem = this.identAst() ); } continue;
+      case 651: switch(this.l()) {
+        case '(': case '[': if(this.argumentsAndFilter({pathStep:pathItem},649)) { pathItem = null; } continue;
+        default: this.s=649; continue;
       }
       default:
       this.attachLocation( $.expr );
@@ -3819,143 +3844,143 @@ if (alias) alias.token.parsedAs = alias.parsedAs; } continue;
     }
   }
   expression($,$next,$startState) {
-    $.expr??=undefined;
-    this.rule_($startState??650,$next);
+    $.expr??={};
+    this.rule_($startState??653,$next);
     let e; let open; let _;
     for(;;) switch(this.s) {
-      case 650: switch(this.lk()) {
-        case '(': this.expressionOrQueryParens($,651); continue;
-        case '#': case 'null': case 'true': case 'false': case 'Number': case 'String': case 'QuotedLiteral': this.literalValue($,661); continue;
-        case ':': if(this.c(652)) { this.reportUnexpectedSpace(); } continue;
-        case '?': if(this.c(661)) { this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
+      case 653: switch(this.lk()) {
+        case '(': this.expressionOrQueryParens($,654); continue;
+        case '#': case 'null': case 'true': case 'false': case 'Number': case 'String': case 'QuotedLiteral': this.literalValue($,664); continue;
+        case ':': if(this.c(655)) { this.reportUnexpectedSpace(); } continue;
+        case '?': if(this.c(664)) { this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
 $.expr = this.attachLocation({ param: this.valueWithLocation(), scope: 'param' }); } continue;
-        case 'Id': if(this.valuePath(_={},654)) {e=_.expr; $.expr = this.valuePathAst( e ); } continue;
-        case 'new': this.lP() && this.newAndValuePath($,661); continue;
-        case 'exists': if(this.ck(657)) { $.expr = this.applyOpToken(); } continue;
-        case 'case': this.caseExpression($,661); continue;
-        case 'cast': this.castFunction($,661); continue;
-        case '+': case '-': if(this.ep(30,'right') && this.c(660)) { $.expr = this.applyOpToken(); } continue;
-        case 'not': if(this.ep(8,'right') && this.ck(660)) { $.expr = this.applyOpToken(); } continue;
+        case 'Id': if(this.valuePath(_={},657)) {e=_.expr; $.expr = this.valuePathAst( e ); } continue;
+        case 'new': this.lP() && this.newAndValuePath($,664); continue;
+        case 'exists': if(this.ck(660)) { $.expr = this.applyOpToken(); } continue;
+        case 'case': this.caseExpression($,664); continue;
+        case 'cast': this.castFunction($,664); continue;
+        case '+': case '-': if(this.ec('precRight_',30) && this.c(663)) { $.expr = this.applyOpToken(); } continue;
+        case 'not': if(this.ec('precRight_',8) && this.ck(663)) { $.expr = this.applyOpToken(); } continue;
         default: this.ei(); continue;
       }
-      case 651: this.s=661;{ $.expr = this.taggedIfQuery( $.expr ); } continue;
-      case 652: switch(this.l()) {
-        case 'Id': if(this.ciA(653,'paramref')) { $.expr = { path: [ this.identAst() ], location: this.startLocation(), scope: 'param' }; } continue;
-        case 'Number': if(this.c(661)) { this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'positional', code: ':' + this.lb().text } );
+      case 654: this.s=664;{ $.expr = this.taggedIfQuery( $.expr ); } continue;
+      case 655: switch(this.l()) {
+        case 'Id': if(this.ciA(656,'paramref')) { $.expr = { path: [ this.identAst() ], location: this.startLocation(), scope: 'param' }; } continue;
+        case 'Number': if(this.c(664)) { this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'positional', code: ':' + this.lb().text } );
 $.expr = this.attachLocation({ param: this.unsignedIntegerLiteral(), scope: 'param' }); } continue;
         default: this.e(); continue;
       }
-      case 653: switch(this.l()) {
-        case '.': if(this.valuePath($,661,646)) { $.expr = this.valuePathAst( $.expr ); } continue;
-        default: this.s=661;{ this.attachLocation( $.expr ); } continue;
+      case 656: switch(this.l()) {
+        case '.': if(this.valuePath($,664,649)) { $.expr = this.valuePathAst( $.expr ); } continue;
+        default: this.s=664;{ this.attachLocation( $.expr ); } continue;
       }
-      case 654: switch(this.lk()) {
-        case 'over': if(this.ckP(655,['('])) { this.pushXprToken( $.expr.suffix = [] ); } continue;
-        default: this.s=656; continue;
+      case 657: switch(this.lk()) {
+        case 'over': if(this.ck(658)) { this.pushXprToken( $.expr.suffix = [] ); } continue;
+        default: this.s=659; continue;
       }
-      case 655: this.overClause(e={outer:$.expr.suffix},656); continue;
-      case 656: this.s=661;{ this.attachLocation( $.expr ); } continue;
-      case 657: switch(this.l()) {
-        case '(': if(this.c(658)) open=this.lb(); continue;
-        case 'Id': if(this.valuePath(_={},661)) {e=_.expr; e = this.valuePathAst( e ); e.$expected = 'exists';
+      case 658: this.overClause(e={outer:$.expr.suffix},659); continue;
+      case 659: this.s=664;{ this.attachLocation( $.expr ); } continue;
+      case 660: switch(this.l()) {
+        case '(': if(this.c(661)) open=this.lb(); continue;
+        case 'Id': if(this.valuePath(_={},664)) {e=_.expr; e = this.valuePathAst( e ); e.$expected = 'exists';
 $.expr.args.push( e ); this.attachLocation( $.expr ); } continue;
-        case '?': if(this.c(661)) { this.csnParseOnly( 'syntax-unsupported-param', -1, { '#': 'dynamic', code: '?' } );
+        case '?': if(this.c(664)) { 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 658: if(this.queryExpression(_={},659)) e=_.expr; continue;
-      case 659: if(this.m(661,')')) { $.expr.args.push( this.taggedIfQuery( this.surroundByParens( e, open ) ) );
+      case 661: if(this.queryExpression(_={},662)) e=_.expr; continue;
+      case 662: if(this.m(664,')')) { $.expr.args.push( this.taggedIfQuery( this.surroundByParens( e, open ) ) );
 this.attachLocation( $.expr ); } continue;
-      case 660: if(this.expression(_={},661)) {e=_.expr; $.expr = this.signedExpression( $.expr, e ); } continue;
-      case 661: switch(this.lk()) {
-        case '*': case '/': if(this.gp(0,24) && this.c(665)) { $.expr = this.applyOpToken( $.expr, 'nary' ); } continue;
-        case '+': case '-': if(this.gp(0,22) && this.c(665)) { $.expr = this.applyOpToken( $.expr, 'nary' ); } continue;
-        case '||': if(this.gp(0,20) && this.c(665)) { $.expr = this.applyOpToken( $.expr, 'nary' ); } continue;
-        case 'and': if(this.lP(['Id','#','(','+','-',':','?','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral']) && this.gp(0,4) && this.ck(665)) { $.expr = this.applyOpToken( $.expr, 'nary' ); } continue;
-        case 'or': if(this.lP(['Id','#','(','+','-',':','?','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral']) && this.gp(0,2) && this.ck(665)) { $.expr = this.applyOpToken( $.expr, 'nary' ); } continue;
-        case '?': if(this.gp(0,0) && this.c(662)) { $.expr = this.applyOpToken( $.expr, '?:' ); } continue;
-        case '<': case '=': case '>': case '!=': case '<=': case '<>': case '>=': if(this.gp(0,10,'none') && this.c(664)) { $.expr = this.applyOpToken( $.expr ); } continue;
-        case 'is': if(this.lP(['not','null']) && this.gp(0,10,'none') && this.ck(666)) { $.expr = this.applyOpToken( $.expr ); } continue;
-        case 'not': if(this.gc(0,'isNegatedRelation') && this.ck(668)) { $.expr = this.applyOpToken( $.expr ); } continue;
-        case 'in': case 'like': case 'between': if(this.lP() && this.gp(0,10,'none') && this.g(668)) { $.expr = { op: { val: 'ixpr', location: this.la().location }, args: [ $.expr ] }; } continue;
+      case 663: if(this.expression(_={},664)) {e=_.expr; $.expr = this.signedExpression( $.expr, e ); } continue;
+      case 664: switch(this.lk()) {
+        case '*': case '/': if(this.gc(0,'precLeft_',24) && this.c(668)) { $.expr = this.applyOpToken( $.expr, 'nary' ); } continue;
+        case '+': case '-': if(this.gc(0,'precLeft_',22) && this.c(668)) { $.expr = this.applyOpToken( $.expr, 'nary' ); } continue;
+        case '||': if(this.gc(0,'precLeft_',20) && this.c(668)) { $.expr = this.applyOpToken( $.expr, 'nary' ); } continue;
+        case 'and': if(this.gc(0,'precLeft_',4) && this.ck(668)) { $.expr = this.applyOpToken( $.expr, 'nary' ); } continue;
+        case 'or': if(this.gc(0,'precLeft_',2) && this.ck(668)) { $.expr = this.applyOpToken( $.expr, 'nary' ); } continue;
+        case '?': if(this.gc(0,'precLeft_',0) && this.c(665)) { $.expr = this.applyOpToken( $.expr, '?:' ); } continue;
+        case '<': case '=': case '>': case '!=': case '<=': case '<>': case '>=': if(this.gc(0,'precNone_',10) && this.c(667)) { $.expr = this.applyOpToken( $.expr ); } continue;
+        case 'is': if(this.gc(0,'precNone_',10) && this.ck(669)) { $.expr = this.applyOpToken( $.expr ); } continue;
+        case 'not': if(this.gc(0,'isNegatedRelation','10') && this.ck(671)) { $.expr = this.applyOpToken( $.expr ); } continue;
+        case 'in': case 'like': case 'between': if(this.gc(0,'precNone_',10) && this.g(671)) { $.expr = { op: { val: 'ixpr', location: this.la().location }, args: [ $.expr ] }; } continue;
         default: this.gr([]); continue;
       }
-      case 662: if(this.expression(_={},663)) {e=_.expr; $.expr.args.push( e ); } continue;
-      case 663: if(this.m(665,':')) { this.pushXprToken( $.expr ); } continue;
-      case 664: switch(this.lk()) {
-        case 'all': case 'any': case 'some': if(this.ck(665)) { this.pushXprToken( $.expr ); } continue;
-        default: this.s=665; continue;
-      }
-      case 665: if(this.expression(_={},676)) {e=_.expr; $.expr.args.push( e ); } continue;
-      case 666: switch(this.lk()) {
-        case 'not': if(this.ck(667)) { this.pushXprToken( $.expr ); } continue;
-        default: this.s=667; continue;
-      }
-      case 667: if(this.mk(676,'null')) { this.pushXprToken( $.expr ); } continue;
-      case 668: switch(this.lk()) {
-        case 'between': if(this.ck(669)) { this.pushXprToken( $.expr ); } continue;
-        case 'in': if(this.ck(672)) { this.pushXprToken( $.expr ); } continue;
-        case 'like': if(this.ck(673)) { this.pushXprToken( $.expr ); } continue;
+      case 665: if(this.expression(_={},666)) {e=_.expr; $.expr.args.push( e ); } continue;
+      case 666: if(this.m(668,':')) { this.pushXprToken( $.expr ); } continue;
+      case 667: switch(this.lk()) {
+        case 'all': case 'any': case 'some': if(this.ck(668)) { this.pushXprToken( $.expr ); } continue;
+        default: this.s=668; continue;
+      }
+      case 668: if(this.expression(_={},679)) {e=_.expr; $.expr.args.push( e ); } continue;
+      case 669: switch(this.lk()) {
+        case 'not': if(this.ck(670)) { this.pushXprToken( $.expr ); } continue;
+        default: this.s=670; continue;
+      }
+      case 670: if(this.mk(679,'null')) { this.pushXprToken( $.expr ); } continue;
+      case 671: switch(this.lk()) {
+        case 'between': if(this.ck(672)) { this.pushXprToken( $.expr ); } continue;
+        case 'in': if(this.ck(675)) { this.pushXprToken( $.expr ); } continue;
+        case 'like': if(this.ck(676)) { this.pushXprToken( $.expr ); } continue;
         default: this.e(); continue;
       }
-      case 669: if(this.expression(_={},670)) {e=_.expr; $.expr.args?.push( e ); } continue;
-      case 670: if(this.mk(671,'and')) { this.pushXprToken( $.expr ); } continue;
-      case 671: if(this.expression(_={},676)) {e=_.expr; $.expr.args?.push( e ); } continue;
-      case 672: if(this.expression(_={},676)) {e=_.expr; $.expr.args?.push( this.secureParens( e ) ); } continue;
-      case 673: if(this.expression(_={},674)) {e=_.expr; $.expr.args?.push( e ); } continue;
-      case 674: switch(this.lk()) {
-        case 'escape': if(this.ckP(675,['Id','#','(','+','-',':','?','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'])) { this.pushXprToken( $.expr ); } continue;
-        default: this.s=676; continue;
-      }
-      case 675: if(this.expression(_={},676)) {e=_.expr; $.expr.args?.push( e ); } continue;
-      case 676: this.s=661;{ this.attachLocation( $.expr ); } continue;
+      case 672: if(this.expression(_={},673)) {e=_.expr; $.expr.args?.push( e ); } continue;
+      case 673: if(this.mk(674,'and')) { this.pushXprToken( $.expr ); } continue;
+      case 674: if(this.expression(_={},679)) {e=_.expr; $.expr.args?.push( e ); } continue;
+      case 675: if(this.expression(_={},679)) {e=_.expr; $.expr.args?.push( this.secureParens( e ) ); } continue;
+      case 676: if(this.expression(_={},677)) {e=_.expr; $.expr.args?.push( e ); } continue;
+      case 677: switch(this.lk()) {
+        case 'escape': if(this.ck(678)) { this.pushXprToken( $.expr ); } continue;
+        default: this.s=679; continue;
+      }
+      case 678: if(this.expression(_={},679)) {e=_.expr; $.expr.args?.push( e ); } continue;
+      case 679: this.s=664;{ this.attachLocation( $.expr ); } continue;
       default: return this.exit_();
     }
   }
   expressionOrQueryParens($,$next) {
     $.expr??=undefined;
-    this.rule_(678,$next);
+    this.rule_(681,$next);
     for(;;) switch(this.s) {
-      case 678: this.m(679,'('); continue;
-      case 679: switch(this.lk()) {
-        case '(': this.expressionOrQueryParens($,680); 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': this.ep(-2) && this.expression($,682); continue;
-        case 'select': this.ep(-1) && this.queryExpression($,683); continue;
+      case 681: if(this.m(682,'(')) {this.queryOnLeft();} continue;
+      case 682: switch(this.lk()) {
+        case '(': this.expressionOrQueryParens($,683); 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($,685)) {this.queryOnLeft(0,'expr');} continue;
+        case 'select': this.queryExpression($,686); continue;
         default: this.ei(); continue;
       }
-      case 680: switch(this.lk()) {
-        case '*': case '+': case '-': case '/': case '<': case '=': case '>': case '?': case '!=': case '<=': case '<>': case '>=': case 'in': case 'is': case 'or': case '||': case 'and': case 'not': case 'like': case 'between': this.gp(683,-2,'post') && this.expression($,681,651); continue;
-        case ',': this.gp(683,-2,'post') && this.continueExpressionslist($,683); continue;
-        case 'limit': case 'minus': case 'order': case 'union': case 'except': case 'intersect': this.gp(683,-1,'post') && this.queryExpression($,683,464); continue;
-        default: this.s=683; continue;
+      case 683: switch(this.lk()) {
+        case '*': case '+': case '-': case '/': case '<': case '=': case '>': case '?': case '!=': case '<=': case '<>': case '>=': case 'in': case 'is': case 'or': case '||': case 'and': case 'not': case 'like': case 'between': if(this.expression($,684,654)) {this.queryOnLeft(0,'expr');} continue;
+        case ',': if(this.continueExpressionslist($,686)) {this.queryOnLeft(0,'expr');} continue;
+        case 'limit': case 'minus': case 'order': case 'union': case 'except': case 'intersect': this.gc(686,'queryOnLeft') && this.queryExpression($,686,466); continue;
+        default: this.s=686; continue;
       }
-      case 681: switch(this.l()) {
-        case ',': this.continueExpressionslist($,683); continue;
-        default: this.s=683; continue;
+      case 684: switch(this.l()) {
+        case ',': this.continueExpressionslist($,686); continue;
+        default: this.s=686; continue;
       }
-      case 682: switch(this.l()) {
-        case ',': this.continueExpressionslist($,683); continue;
-        default: this.s=683; continue;
+      case 685: switch(this.l()) {
+        case ',': this.continueExpressionslist($,686); continue;
+        default: this.s=686; continue;
       }
-      case 683: if(this.m(0,')')) {this.setPrecInCallingRule(); this.surroundByParens( $.expr ); } continue;
+      case 686: if(this.m(0,')')) { this.surroundByParens( $.expr ); } continue;
       default: return this.exit_();
     }
   }
   continueExpressionslist($,$next) {
-    this.rule_(685,$next);
+    this.rule_(688,$next);
     let e; let _;
     for(;;) switch(this.s) {
-      case 685: if(this.m(686,',')) { $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: { ... $.expr.$parens?.at( -1 ) ?? $.expr.location } }; } continue;
-      case 686: switch(this.lk()) {
-        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case 'not': case 'case': case 'cast': case 'null': case 'true': case 'false': case 'Number': case 'String': case 'exists': case 'QuotedLiteral': this.s=687; continue;
+      case 688: if(this.m(689,',')) { $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: { ... $.expr.$parens?.at( -1 ) ?? $.expr.location } }; } continue;
+      case 689: 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=690; continue;
         default: this.ei(); continue;
       }
-      case 687: switch(this.lk()) {
-        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case 'not': case 'case': case 'cast': case 'null': case 'true': case 'false': case 'Number': case 'String': case 'exists': case 'QuotedLiteral': if(this.expression(_={},688)) {e=_.expr; $.expr.args.push( e ); } continue;
+      case 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(0,[')']); continue;
       }
-      case 688: switch(this.l()) {
-        case ',': this.c(687); continue;
+      case 691: switch(this.l()) {
+        case ',': this.c(690); continue;
         default: this.gr([')']); continue;
       }
       case 0: { this.attachLocation( $.expr ); }
@@ -3966,11 +3991,11 @@ this.attachLocation( $.expr ); } continue;
   }
   newAndValuePath($,$next) {
     $.expr??=undefined;
-    this.rule_(690,$next);
+    this.rule_(693,$next);
     let e; let _;
     for(;;) switch(this.s) {
-      case 690: if(this.mk(691,'new')) { $.expr = this.applyOpToken(); } continue;
-      case 691: if(this.valuePath(_={},0)) {e=_.expr; e = this.valuePathAst( e );
+      case 693: if(this.mk(694,'new')) { $.expr = this.applyOpToken(); } continue;
+      case 694: if(this.valuePath(_={},0)) {e=_.expr; e = this.valuePathAst( e );
 if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.args ); } continue;
       default:
       this.attachLocation( $.expr );
@@ -3978,116 +4003,116 @@ if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.arg
     }
   }
   caseExpression($,$next) {
-    $.expr??={ op: { val: 'ixpr' }, args: [] };
-    this.rule_(693,$next);
+    $.expr??=undefined;
+    this.rule_(696,$next);
     let e; let _;
     for(;;) switch(this.s) {
-      case 693: if(this.mk(694,'case')) { this.pushXprToken( $.expr ); $.expr.op.location = $.expr.args[0].location; } continue;
-      case 694: 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(_={},695)) {e=_.expr; $.expr.args.push( e ); } continue;
-        case 'when': this.gP(695); continue;
-        default: this.gi(695); continue;
-      }
-      case 695: switch(this.lk()) {
-        case 'when': this.s=696; continue;
+      case 696: if(this.mk(697,'case')) { $.expr.op = { val: 'ixpr', location: this.lb().location }; $.expr.args = []; this.pushXprToken( $.expr ); } continue;
+      case 697: 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(_={},698)) {e=_.expr; $.expr.args.push( e ); } continue;
+        case 'when': this.gP(698); continue;
+        default: this.gi(698); continue;
+      }
+      case 698: switch(this.lk()) {
+        case 'when': this.s=699; continue;
         default: this.e(); continue;
       }
-      case 696: switch(this.lk()) {
-        case 'when': if(this.ck(697)) { this.pushXprToken( $.expr ); } continue;
-        default: this.s=700; continue;
+      case 699: switch(this.lk()) {
+        case 'when': if(this.ck(700)) { this.pushXprToken( $.expr ); } continue;
+        default: this.s=703; continue;
       }
-      case 697: if(this.expression(_={},698)) {e=_.expr; $.expr.args.push( e ); } continue;
-      case 698: if(this.mk(699,'then')) { this.pushXprToken( $.expr ); } continue;
-      case 699: if(this.expression(_={},696)) {e=_.expr; $.expr.args.push( e ); } continue;
-      case 700: switch(this.lk()) {
-        case 'else': if(this.ck(701)) { this.pushXprToken( $.expr ); } continue;
-        default: this.s=702; continue;
+      case 700: if(this.expression(_={},701)) {e=_.expr; $.expr.args.push( e ); } continue;
+      case 701: if(this.mk(702,'then')) { this.pushXprToken( $.expr ); } continue;
+      case 702: if(this.expression(_={},699)) {e=_.expr; $.expr.args.push( e ); } continue;
+      case 703: switch(this.lk()) {
+        case 'else': if(this.ck(704)) { this.pushXprToken( $.expr ); } continue;
+        default: this.s=705; continue;
       }
-      case 701: if(this.expression(_={},702)) {e=_.expr; $.expr.args.push( e ); } continue;
-      case 702: if(this.mk(0,'end')) { this.pushXprToken( $.expr ); } continue;
+      case 704: if(this.expression(_={},705)) {e=_.expr; $.expr.args.push( e ); } continue;
+      case 705: if(this.mk(0,'end')) { this.pushXprToken( $.expr ); } continue;
       default:
       this.attachLocation( $.expr );
       return this.exit_();
     }
   }
   castFunction($,$next) {
-    $.expr??={};
-    this.rule_(704,$next);
+    $.expr??=undefined;
+    this.rule_(707,$next);
     let arg; let _;
     for(;;) switch(this.s) {
-      case 704: if(this.mk(705,'cast')) { $.expr.op = this.valueWithLocation(); } continue;
-      case 705: if(this.m(706,'(')) { $.expr.args = this.createArray(); } continue;
-      case 706: if(this.expression(_={},707)) {arg=_.expr; $.expr.args?.push( arg ); } continue;
-      case 707: this.mk(708,'as'); continue;
-      case 708: this.typeRefOptArgs({art:$.expr},709); continue;
-      case 709: if(this.m(0,')')) { this.finalizeDictOrArray( $.expr.args ); } continue;
+      case 707: if(this.mk(708,'cast')) { $.expr.op = this.valueWithLocation(); } continue;
+      case 708: if(this.m(709,'(')) { $.expr.args = this.createArray(); } continue;
+      case 709: if(this.expression(_={},710)) {arg=_.expr; $.expr.args?.push( arg ); } continue;
+      case 710: this.mk(711,'as'); continue;
+      case 711: this.typeRefOptArgs({art:$.expr},712); continue;
+      case 712: if(this.m(0,')')) { this.finalizeDictOrArray( $.expr.args ); } continue;
       default:
       this.attachLocation( $.expr );
       return this.exit_();
     }
   }
   argumentsAndFilter($,$next) {
-    this.rule_(711,$next);
+    this.rule_(714,$next);
     let open; let expr; let id; let _;
     for(;;) switch(this.s) {
-      case 711: switch(this.l()) {
-        case '(': if(this.c(712)) {open=this.lb();this.prepareSpecialFunction(); $.pathStep.args = this.createArray(); } continue;
-        default: this.s=731; continue;
+      case 714: switch(this.l()) {
+        case '(': if(this.c(715)) {open=this.lb();this.prepareSpecialFunction(); $.pathStep.args = this.createArray(); } continue;
+        default: this.s=734; continue;
       }
-      case 712: switch(this.l()) {
-        case 'Id': if(this.gc(713,'isNamedArg') && this.ciA(719,'paramname')) id=this.lb(); continue;
-        default: this.s=713; continue;
+      case 715: switch(this.l()) {
+        case 'Id': if(this.gc(716,'isNamedArg') && this.ciA(722,'paramname')) id=this.lb(); continue;
+        default: this.s=716; continue;
       }
-      case 713: switch(this.l()) {
-        case 'Id': case '#': case '(': case '*': case '+': case '-': case ':': case '?': case 'Id_all': case 'Number': case 'String': case 'QuotedLiteral': if(this.funcExpression(_={},714)) {expr=_.expr; $.pathStep.args.push( expr ); } continue;
-        default: this.s=730; continue;
+      case 716: switch(this.l()) {
+        case 'Id': case '#': case '(': case '*': case '+': case '-': case ':': case '?': case 'Id_all': case 'Number': case 'String': case 'QuotedLiteral': if(this.funcExpression(_={},717)) {expr=_.expr; $.pathStep.args.push( expr ); } continue;
+        default: this.s=733; continue;
       }
-      case 714: switch(this.l()) {
-        case ',': if(this.c(715)) {this.nextFunctionArgument();} continue;
-        default: this.s=716; continue;
+      case 717: switch(this.l()) {
+        case ',': if(this.c(718)) {this.nextFunctionArgument();} continue;
+        default: this.s=719; continue;
       }
-      case 715: switch(this.lk()) {
-        case 'Id': case '#': case '(': case '*': case '+': case '-': case ':': case '?': case 'not': case 'case': case 'cast': case 'null': case 'true': case 'false': case 'Id_all': case 'Number': case 'String': case 'exists': case 'QuotedLiteral': if(this.funcExpression(_={},714)) {expr=_.expr; $.pathStep.args.push( expr ); } continue;
-        case ')': case 'order': this.gP(716); continue;
+      case 718: switch(this.lk()) {
+        case 'Id': case '#': case '(': case '*': case '+': case '-': case ':': case '?': case 'not': case 'case': case 'cast': case 'null': case 'true': case 'false': case 'Id_all': case 'Number': case 'String': case 'exists': case 'QuotedLiteral': if(this.funcExpression(_={},717)) {expr=_.expr; $.pathStep.args.push( expr ); } continue;
+        case ')': case 'order': this.gP(719); continue;
         default: this.ei(); continue;
       }
-      case 716: switch(this.lk()) {
-        case 'order': if(this.ck(717)) { expr = $.pathStep.args[$.pathStep.args.length - 1] = this.applyOpToken( expr ); } continue;
-        default: this.s=730; continue;
+      case 719: switch(this.lk()) {
+        case 'order': if(this.ck(720)) { expr = $.pathStep.args[$.pathStep.args.length - 1] = this.applyOpToken( expr ); } continue;
+        default: this.s=733; continue;
       }
-      case 717: if(this.mk(718,'by')) { this.pushXprToken( expr ); } continue;
-      case 718: if(this.orderByClauseAsXpr({outer:expr.args},730)) { this.attachLocation( expr ); } continue;
-      case 719: switch(this.l()) {
-        case ':': if(this.c(720)) { $.pathStep.args = this.createDict( open ); $.pathStep.$syntax = ':'; } continue;
-        case '=>': if(this.c(725)) { $.pathStep.args = this.createDict(); } continue;
+      case 720: if(this.mk(721,'by')) { this.pushXprToken( expr ); } continue;
+      case 721: if(this.orderByClauseAsXpr({outer:expr.args},733)) { this.attachLocation( expr ); } continue;
+      case 722: switch(this.l()) {
+        case ':': if(this.c(723)) { $.pathStep.args = this.createDict( open ); $.pathStep.$syntax = ':'; } continue;
+        case '=>': if(this.c(728)) { $.pathStep.args = this.createDict(); } continue;
         default: this.e(); continue;
       }
-      case 720: if(this.expression(_={},721)) {expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); } continue;
-      case 721: switch(this.l()) {
-        case ',': this.c(722); continue;
-        default: this.s=730; continue;
+      case 723: if(this.expression(_={},724)) {expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); } continue;
+      case 724: switch(this.l()) {
+        case ',': this.c(725); continue;
+        default: this.s=733; continue;
       }
-      case 722: switch(this.l()) {
-        case 'Id': if(this.ciA(723,'paramname')) id=this.lb(); continue;
-        case ')': this.s=730; continue;
+      case 725: switch(this.l()) {
+        case 'Id': if(this.ciA(726,'paramname')) id=this.lb(); continue;
+        case ')': this.s=733; continue;
         default: this.e(); continue;
       }
-      case 723: this.m(724,':'); continue;
-      case 724: if(this.expression(_={},721)) {expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); } continue;
-      case 725: if(this.expression(_={},726)) {expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); } continue;
-      case 726: switch(this.l()) {
-        case ',': this.c(727); continue;
-        default: this.s=730; continue;
+      case 726: this.m(727,':'); continue;
+      case 727: if(this.expression(_={},724)) {expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); } continue;
+      case 728: if(this.expression(_={},729)) {expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); } continue;
+      case 729: switch(this.l()) {
+        case ',': this.c(730); continue;
+        default: this.s=733; continue;
       }
-      case 727: switch(this.l()) {
-        case 'Id': if(this.ciA(728,'paramname')) id=this.lb(); continue;
-        case ')': this.s=730; continue;
+      case 730: switch(this.l()) {
+        case 'Id': if(this.ciA(731,'paramname')) id=this.lb(); continue;
+        case ')': this.s=733; continue;
         default: this.e(); continue;
       }
-      case 728: this.m(729,'=>'); continue;
-      case 729: if(this.expression(_={},726)) {expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); } continue;
-      case 730: this.m(731,')'); continue;
-      case 731: switch(this.l()) {
+      case 731: this.m(732,'=>'); continue;
+      case 732: if(this.expression(_={},729)) {expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); } continue;
+      case 733: this.m(734,')'); continue;
+      case 734: switch(this.l()) {
         case '[': this.cardinalityAndFilter($,0); continue;
         default: this.gr(['*','+','-','.','/','<','=','>','?','!=','<=','<>','>=','in','is','or','||','and','not','like','between']); continue;
       }
@@ -4096,24 +4121,24 @@ if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.arg
   }
   funcExpression($,$next) {
     $.expr??=undefined;
-    this.rule_(733,$next);
+    this.rule_(736,$next);
     let args;
     let tok; let e; let _;
     for(;;) switch(this.s) {
-      case 733: switch(this.lGenericIntroOrExpr()) {
-        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case 'Number': case 'String': case 'QuotedLiteral': if(this.expression(_={},735)) $.expr=_.expr; continue;
-        case 'GenericExpr': if(this.ckA(735)) {tok=this.lb(); $.expr = { val: tok.keyword ?? tok.type, location: tok.location, literal: 'token' }; } continue;
-        case 'GenericIntro': if(this.ckA(734)) { $.expr = this.applyOpToken(); args = $.expr.args; } continue;
+      case 736: switch(this.lGenericIntroOrExpr()) {
+        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case 'Number': case 'String': case 'QuotedLiteral': if(this.expression(_={},738)) $.expr=_.expr; continue;
+        case 'GenericExpr': if(this.ckA(738)) {tok=this.lb(); $.expr = { val: tok.keyword ?? tok.type, location: tok.location, literal: 'token' }; } continue;
+        case 'GenericIntro': if(this.ckA(737)) { $.expr = this.applyOpToken(); args = $.expr.args; } continue;
         default: this.e(); continue;
       }
-      case 734: if(this.expression(_={},735)) {e=_.expr; $.expr.args.push( e ); } continue;
-      case 735: switch(this.lGenericSeparator()) {
-        case 'GenericSeparator': if(this.ckA(736)) { if (args) this.pushXprToken( args ); else { $.expr= this.applyOpToken( $.expr ); args = $.expr.args; } } continue;
+      case 737: if(this.expression(_={},738)) {e=_.expr; $.expr.args.push( e ); } continue;
+      case 738: switch(this.lGenericSeparator()) {
+        case 'GenericSeparator': if(this.ckA(739)) { if (args) this.pushXprToken( args ); else { $.expr= this.applyOpToken( $.expr ); args = $.expr.args; } } continue;
         default: this.gr([')',',','order']); continue;
       }
-      case 736: switch(this.lGenericExpr()) {
-        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case 'Number': case 'String': case 'QuotedLiteral': if(this.expression(_={},735)) {e=_.expr; args.push( e ); } continue;
-        case 'GenericExpr': if(this.ckA(735)) { this.pushXprToken( args ); } continue;
+      case 739: switch(this.lGenericExpr()) {
+        case 'Id': case '#': case '(': case '+': case '-': case ':': case '?': case 'Number': case 'String': case 'QuotedLiteral': if(this.expression(_={},738)) {e=_.expr; args.push( e ); } continue;
+        case 'GenericExpr': if(this.ckA(738)) { this.pushXprToken( args ); } continue;
         default: this.e(); continue;
       }
       default:
@@ -4122,78 +4147,78 @@ if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.arg
     }
   }
   overClause($,$next) {
-    this.rule_(738,$next);
+    this.rule_(741,$next);
     let over=[];
     for(;;) switch(this.s) {
-      case 738: this.m(739,'('); continue;
-      case 739: switch(this.lk()) {
-        case 'partition': if(this.ck(740)) { this.pushXprToken( over ); } continue;
-        default: this.s=742; continue;
-      }
-      case 740: if(this.mk(741,'by')) { this.pushXprToken( over ); } continue;
-      case 741: this.expressionsAsXpr({outer:over},742); continue;
+      case 741: this.m(742,'('); continue;
       case 742: switch(this.lk()) {
-        case 'order': if(this.ck(743)) { this.pushXprToken( over ); } continue;
+        case 'partition': if(this.ck(743)) { this.pushXprToken( over ); } continue;
         default: this.s=745; continue;
       }
       case 743: if(this.mk(744,'by')) { this.pushXprToken( over ); } continue;
-      case 744: this.orderByClauseAsXpr({outer:over},745); continue;
+      case 744: this.expressionsAsXpr({outer:over},745); continue;
       case 745: switch(this.lk()) {
-        case 'rows': if(this.ck(746)) { this.pushXprToken( over ); } continue;
-        default: this.s=747; continue;
+        case 'order': if(this.ck(746)) { this.pushXprToken( over ); } continue;
+        default: this.s=748; continue;
       }
-      case 746: this.windowFrameClause({outer:over},747); continue;
-      case 747: this.m(0,')'); continue;
+      case 746: if(this.mk(747,'by')) { this.pushXprToken( over ); } continue;
+      case 747: this.orderByClauseAsXpr({outer:over},748); continue;
+      case 748: switch(this.lk()) {
+        case 'rows': if(this.ck(749)) { this.pushXprToken( over ); } continue;
+        default: this.s=750; continue;
+      }
+      case 749: this.windowFrameClause({outer:over},750); continue;
+      case 750: this.m(0,')'); continue;
       default:
       $.outer.push( this.surroundByParens( this.ixprAst( over ) ) );
       return this.exit_();
     }
   }
   expressionsAsXpr($,$next) {
-    this.rule_(749,$next);
+    this.rule_(752,$next);
     let args=[];
     let expr; let _;
     for(;;) switch(this.s) {
-      case 749: if(this.expression(_={},750)) {expr=_.expr; args.push( expr ); } continue;
-      case 750: switch(this.l()) {
-        case ',': if(this.c(751)) { this.pushXprToken( args ); } continue;
+      case 752: if(this.expression(_={},753)) {expr=_.expr; args.push( expr ); } continue;
+      case 753: switch(this.l()) {
+        case ',': if(this.c(754)) { this.pushXprToken( args ); } continue;
         default: this.gr([')','rows','order']); continue;
       }
-      case 751: if(this.expression(_={},750)) {expr=_.expr; args.push( expr ); } continue;
+      case 754: if(this.expression(_={},753)) {expr=_.expr; args.push( expr ); } continue;
       default:
       $.outer.push( this.ixprAst( args ) );
       return this.exit_();
     }
   }
   orderByClauseAsXpr($,$next) {
-    this.rule_(753,$next);
+    this.rule_(756,$next);
     let args=[];
     for(;;) switch(this.s) {
-      case 753: this.orderBySpecAsXpr({args},754); continue;
-      case 754: switch(this.l()) {
-        case ',': if(this.c(755)) { this.pushXprToken( args ); } continue;
+      case 756: this.orderBySpecAsXpr({args},757); continue;
+      case 757: switch(this.l()) {
+        case ',': if(this.c(758)) { this.pushXprToken( args ); } continue;
         default: this.gr([')']); continue;
       }
-      case 755: this.orderBySpecAsXpr({args},754); continue;
+      case 758: this.orderBySpecAsXpr({args},757); continue;
       default:
       $.outer.push( this.ixprAst( args ) );
       return this.exit_();
     }
   }
   orderBySpecAsXpr($,$next) {
-    this.rule_(757,$next);
+    this.rule_(760,$next);
     let expr; let _;
     for(;;) switch(this.s) {
-      case 757: if(this.expression(_={},758)) {expr=_.expr; $.args.push( expr ); } continue;
-      case 758: switch(this.lk()) {
-        case 'asc': case 'desc': if(this.ck(759)) { this.pushXprToken( $.args ); } continue;
-        default: this.s=759; continue;
+      case 760: if(this.expression(_={},761)) {expr=_.expr; $.args.push( expr ); } continue;
+      case 761: switch(this.lk()) {
+        case 'asc': case 'desc': if(this.ck(762)) { this.pushXprToken( $.args ); } continue;
+        default: this.s=762; continue;
       }
-      case 759: switch(this.lk()) {
-        case 'nulls': if(this.ck(760)) { this.pushXprToken( $.args ); } continue;
+      case 762: switch(this.lk()) {
+        case 'nulls': if(this.ck(763)) { this.pushXprToken( $.args ); } continue;
         default: this.gr([')',',']); continue;
       }
-      case 760: switch(this.lk()) {
+      case 763: switch(this.lk()) {
         case 'last': case 'first': if(this.ck(0)) { this.pushXprToken( $.args ); } continue;
         default: this.e(); continue;
       }
@@ -4201,51 +4226,51 @@ if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.arg
     }
   }
   windowFrameClause($,$next) {
-    this.rule_(762,$next);
+    this.rule_(765,$next);
     let args=[];
     for(;;) switch(this.s) {
-      case 762: switch(this.lk()) {
-        case 'unbounded': if(this.ck(763)) { this.pushXprToken( args ); } continue;
-        case 'Number': if(this.c(763)) { args.push( this.unsignedIntegerLiteral() ); } continue;
-        case 'current': if(this.ck(764)) { this.pushXprToken( args ); } continue;
-        case 'between': if(this.ck(765)) { 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(767)) { this.pushXprToken( args ); } continue;
+        case 'between': if(this.ck(768)) { this.pushXprToken( args ); } continue;
         default: this.e(); continue;
       }
-      case 763: if(this.mk(0,'preceding')) { this.pushXprToken( args ); } continue;
-      case 764: if(this.mk(0,'row')) { this.pushXprToken( args ); } continue;
-      case 765: this.windowFrameBoundSpec({args},766); continue;
-      case 766: if(this.mk(767,'and')) { this.pushXprToken( args ); } continue;
-      case 767: this.windowFrameBoundSpec({args},0); continue;
+      case 766: if(this.mk(0,'preceding')) { this.pushXprToken( args ); } continue;
+      case 767: if(this.mk(0,'row')) { this.pushXprToken( args ); } continue;
+      case 768: this.windowFrameBoundSpec({args},769); continue;
+      case 769: if(this.mk(770,'and')) { this.pushXprToken( args ); } continue;
+      case 770: this.windowFrameBoundSpec({args},0); continue;
       default:
       $.outer.push( this.ixprAst( args ) );
       return this.exit_();
     }
   }
   windowFrameBoundSpec($,$next) {
-    this.rule_(769,$next);
+    this.rule_(772,$next);
     for(;;) switch(this.s) {
-      case 769: switch(this.lk()) {
-        case 'unbounded': if(this.ck(770)) { this.pushXprToken( $.args ); } continue;
-        case 'Number': if(this.c(770)) { $.args.push( this.unsignedIntegerLiteral() ); } continue;
-        case 'current': if(this.ck(772)) { this.pushXprToken( $.args ); } continue;
+      case 772: switch(this.lk()) {
+        case 'unbounded': if(this.ck(773)) { this.pushXprToken( $.args ); } continue;
+        case 'Number': if(this.c(773)) { $.args.push( this.unsignedIntegerLiteral() ); } continue;
+        case 'current': if(this.ck(775)) { this.pushXprToken( $.args ); } continue;
         default: this.e(); continue;
       }
-      case 770: switch(this.lk()) {
-        case 'following': this.ck(771); continue;
-        case 'preceding': this.ck(771); continue;
+      case 773: switch(this.lk()) {
+        case 'following': this.ck(774); continue;
+        case 'preceding': this.ck(774); continue;
         default: this.e(); continue;
       }
-      case 771: if(this.gr([])) { this.pushXprToken( $.args ); } continue;
-      case 772: if(this.mk(0,'row')) { this.pushXprToken( $.args ); } continue;
+      case 774: if(this.gr([])) { this.pushXprToken( $.args ); } continue;
+      case 775: if(this.mk(0,'row')) { this.pushXprToken( $.args ); } continue;
       default: return this.exit_();
     }
   }
   literalValue($,$next) {
     $.expr??={};
-    this.rule_(774,$next);
+    this.rule_(777,$next);
     for(;;) switch(this.s) {
-      case 774: switch(this.lk()) {
-        case '#': if(this.c(775)) { this.reportUnexpectedSpace(); } continue;
+      case 777: switch(this.lk()) {
+        case '#': if(this.c(778)) { 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;
@@ -4253,17 +4278,17 @@ if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.arg
         case 'QuotedLiteral': if(this.c(0)) { $.expr = this.quotedLiteral(); } continue;
         default: this.e(); continue;
       }
-      case 775: if(this.mi(0,'enumref')) { $.expr = { literal: 'enum', sym: this.identAst() } } continue;
+      case 778: if(this.mi(0,'enumref')) { $.expr = { literal: 'enum', sym: this.identAst() } } continue;
       default:
       this.attachLocation( $.expr );
       return this.exit_();
     }
   }
   annoAssignStd($,$next) {
-    this.rule_(777,$next);
+    this.rule_(780,$next);
     for(;;) switch(this.s) {
-      case 777: if(this.m(778,'@')) {this.annoInSameLine(); this.reportUnexpectedSpace(); } continue;
-      case 778: switch(this.l()) {
+      case 780: if(this.m(781,'@')) {this.annoInSameLine(); this.reportUnexpectedSpace(); } continue;
+      case 781: switch(this.l()) {
         case '(': this.annoAssignParen($,0); continue;
         case 'Id': this.annoAssignBase($,0); continue;
         default: this.e(); continue;
@@ -4274,10 +4299,10 @@ if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.arg
     }
   }
   annoAssignCol($,$next) {
-    this.rule_(780,$next);
+    this.rule_(783,$next);
     for(;;) switch(this.s) {
-      case 780: if(this.m(781,'@')) { this.reportUnexpectedSpace(); } continue;
-      case 781: switch(this.l()) {
+      case 783: if(this.m(784,'@')) { this.reportUnexpectedSpace(); } continue;
+      case 784: switch(this.l()) {
         case '(': this.annoAssignParen($,0); continue;
         case 'Id': this.annoAssignBase($,0); continue;
         default: this.e(); continue;
@@ -4288,11 +4313,11 @@ if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.arg
     }
   }
   annoAssignMid($,$next) {
-    this.rule_(783,$next);
+    this.rule_(786,$next);
     let name; let _;
     for(;;) switch(this.s) {
-      case 783: if(this.m(784,'@')) {this.annoInSameLine(); this.reportUnexpectedSpace(); } continue;
-      case 784: switch(this.l()) {
+      case 786: if(this.m(787,'@')) {this.annoInSameLine(); this.reportUnexpectedSpace(); } continue;
+      case 787: 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;
@@ -4303,33 +4328,33 @@ if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.arg
     }
   }
   annoAssignParen($,$next) {
-    this.rule_(786,$next);
+    this.rule_(789,$next);
     for(;;) switch(this.s) {
-      case 786: if(this.m(787,'(')) {this.annoInSameLine();} continue;
-      case 787: switch(this.l()) {
-        case 'Id': this.annoAssignBase({art:$.art},788); continue;
-        default: this.s=789; continue;
-      }
-      case 788: switch(this.l()) {
-        case ',': this.c(787); continue;
-        case ')': this.s=789; continue;
+      case 789: if(this.m(790,'(')) {this.annoInSameLine();} continue;
+      case 790: switch(this.l()) {
+        case 'Id': this.annoAssignBase({art:$.art},791); continue;
+        default: this.s=792; continue;
+      }
+      case 791: switch(this.l()) {
+        case ',': this.c(790); continue;
+        case ')': this.s=792; continue;
         default: this.e(); continue;
       }
-      case 789: this.m(0,')'); continue;
+      case 792: this.m(0,')'); continue;
       default: return this.exit_();
     }
   }
   annoAssignBase($,$next) {
-    this.rule_(791,$next);
+    this.rule_(794,$next);
     let value={};
     let name; let _;
     for(;;) switch(this.s) {
-      case 791: if(this.annoNamePath(_={category:'anno'},792)) name=_.name; continue;
-      case 792: switch(this.l()) {
-        case ':': this.gc(0,'annoInSameLine') && this.c(793); continue;
+      case 794: if(this.annoNamePath(_={category:'anno'},795)) name=_.name; continue;
+      case 795: switch(this.l()) {
+        case ':': this.gc(0,'annoInSameLine') && this.c(796); continue;
         default: this.gr([]); continue;
       }
-      case 793: if(this.annoValue(_={},0)) value=_.value; continue;
+      case 796: if(this.annoValue(_={},0)) value=_.value; continue;
       default:
       this.assignAnnotation( $.art, value, name || {} );
       return this.exit_();
@@ -4337,21 +4362,21 @@ if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.arg
   }
   annoNamePath($,$next) {
     $.name??=new XsnName();
-    this.rule_(795,$next);
+    this.rule_(798,$next);
     let at;
     for(;;) switch(this.s) {
-      case 795: if(this.miA(796,$.category)) { $.name.path = [ this.identAst() ]; } continue;
-      case 796: switch(this.l()) {
-        case '.': this.c(797); continue;
-        default: this.s=799; continue;
-      }
-      case 797: switch(this.l()) {
-        case 'Id': if(this.ciA(796,$.category)) { $.name.path.push( this.identAst() ); } continue;
-        case '@': if(this.c(798)) at=this.lb(); continue;
+      case 798: if(this.miA(799,$.category)) { $.name.path = [ this.identAst() ]; } continue;
+      case 799: switch(this.l()) {
+        case '.': this.c(800); continue;
+        default: this.s=802; continue;
+      }
+      case 800: switch(this.l()) {
+        case 'Id': if(this.ciA(799,$.category)) { $.name.path.push( this.identAst() ); } continue;
+        case '@': if(this.c(801)) at=this.lb(); continue;
         default: this.e(); continue;
       }
-      case 798: if(this.miA(796,$.category)) { $.name.path.push( this.identAstWithPrefix( at ) ); } continue;
-      case 799: switch(this.l()) {
+      case 801: if(this.miA(799,$.category)) { $.name.path.push( this.identAstWithPrefix( at ) ); } continue;
+      case 802: switch(this.l()) {
         case '#': this.gc(0,'annoInSameLine') && this.annoPathVariant({nameOrRef:$.name},0); continue;
         default: this.gr([]); continue;
       }
@@ -4361,26 +4386,26 @@ if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.arg
     }
   }
   annoPath($,$next) {
-    this.rule_(801,$next);
+    this.rule_(804,$next);
     let at;
     for(;;) switch(this.s) {
-      case 801: switch(this.l()) {
-        case 'Id': if(this.ciA(803,$.category)) { $.nameOrRef.path = [ this.identAst() ]; } continue;
-        case '@': if(this.c(802)) at=this.lb(); continue;
-        default: this.e(); continue;
-      }
-      case 802: if(this.miA(803,$.category)) { $.nameOrRef.path = [ this.identAstWithPrefix( at ) ]; } continue;
-      case 803: switch(this.l()) {
-        case '.': this.c(804); continue;
-        default: this.s=806; continue;
-      }
       case 804: switch(this.l()) {
-        case 'Id': if(this.ciA(803,$.category)) { $.nameOrRef.path.push( this.identAst() ); } continue;
+        case 'Id': if(this.ciA(806,$.category)) { $.nameOrRef.path = [ this.identAst() ]; } continue;
         case '@': if(this.c(805)) at=this.lb(); continue;
         default: this.e(); continue;
       }
-      case 805: if(this.miA(803,$.category)) { $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); } continue;
+      case 805: if(this.miA(806,$.category)) { $.nameOrRef.path = [ this.identAstWithPrefix( at ) ]; } continue;
       case 806: switch(this.l()) {
+        case '.': this.c(807); continue;
+        default: this.s=809; continue;
+      }
+      case 807: switch(this.l()) {
+        case 'Id': if(this.ciA(806,$.category)) { $.nameOrRef.path.push( this.identAst() ); } continue;
+        case '@': if(this.c(808)) at=this.lb(); continue;
+        default: this.e(); continue;
+      }
+      case 808: if(this.miA(806,$.category)) { $.nameOrRef.path.push( this.identAstWithPrefix( at ) ); } continue;
+      case 809: switch(this.l()) {
         case '#': this.annoPathVariant({nameOrRef:$.nameOrRef},0); continue;
         default: this.gr([]); continue;
       }
@@ -4390,15 +4415,15 @@ if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.arg
     }
   }
   annoPathVariant($,$next) {
-    this.rule_(808,$next);
+    this.rule_(811,$next);
     for(;;) switch(this.s) {
-      case 808: if(this.m(809,'#')) { this.reportUnexpectedSpace(); } continue;
-      case 809: if(this.miA(810,'variant')) { $.nameOrRef.variant = { path: [ this.identAst() ] }; } continue;
-      case 810: switch(this.l()) {
-        case '.': this.c(811); continue;
+      case 811: if(this.m(812,'#')) { this.reportUnexpectedSpace(); } continue;
+      case 812: if(this.miA(813,'variant')) { $.nameOrRef.variant = { path: [ this.identAst() ] }; } continue;
+      case 813: switch(this.l()) {
+        case '.': this.c(814); continue;
         default: this.gr([]); continue;
       }
-      case 811: if(this.miA(810,'variant')) { $.nameOrRef.variant.path.push( this.identAst() ); } continue;
+      case 814: if(this.miA(813,'variant')) { $.nameOrRef.variant.path.push( this.identAst() ); } continue;
       default:
       this.attachLocation( $.nameOrRef.variant );
       return this.exit_();
@@ -4406,16 +4431,16 @@ if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.arg
   }
   annoStructValue($,$next) {
     $.value??={};
-    this.rule_(813,$next);
+    this.rule_(816,$next);
     let name=new XsnName();
     let _;
     for(;;) switch(this.s) {
-      case 813: if(this.annoPath({nameOrRef:name,category:'name'},814)) { this.attachLocation( name ); } continue;
-      case 814: switch(this.l()) {
-        case ':': this.c(815); continue;
+      case 816: if(this.annoPath({nameOrRef:name,category:'name'},817)) { this.attachLocation( name ); } continue;
+      case 817: switch(this.l()) {
+        case ':': this.c(818); continue;
         default: if(this.gr([',','}'])) { this.attachLocation( $.value ); } continue;
       }
-      case 815: if(this.annoValue(_={},0)) $.value=_.value; continue;
+      case 818: if(this.annoValue(_={},0)) $.value=_.value; continue;
       default:
       $.value.name = name;
       return this.exit_();
@@ -4423,51 +4448,52 @@ if (e.op?.val !== 'ixpr') $.expr.args.push( e ); else $.expr.args.push( ...e.arg
   }
   annoValue($,$next) {
     $.value??={};
-    this.rule_(817,$next);
+    this.rule_(820,$next);
     let sign; let sub; let ellipsis; let upTo; let _;
     for(;;) switch(this.s) {
-      case 817: switch(this.lk()) {
+      case 820: 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(818)) sign=this.lb(); continue;
+        case '+': case '-': if(this.c(821)) sign=this.lb(); continue;
         case 'Id': case '@': this.annoPath({nameOrRef:$.value,category:'annoref'},0); continue;
-        case '{': if(this.c(819)) { if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
+        case '{': if(this.c(822)) { if (!this.dynamic_.arrayAnno) $.value.$flatten = [];
 else { $.value.struct = Object.create(null); $.value.literal = 'struct'; } } continue;
-        case '[': if(this.c(822)) {this.ellipsisRestriction(); $.value.val = []; $.value.literal = 'array' } continue;
-        case '(': this.c(829); continue;
+        case '[': if(this.c(826)) {this.arrayAnno(); $.value.val = []; $.value.literal = 'array' } continue;
+        case '(': this.c(833); continue;
         default: this.ei(); continue;
       }
-      case 818: if(this.m(0,'Number')) { this.adjustAnnoNumber( $.value = this.numberLiteral( sign ) ); } continue;
-      case 819: switch(this.l()) {
-        case 'Id': case '@': if(this.annoStructValue(_={},820)) {sub=_.value; if ($.value.$flatten) $.value.$flatten.push( sub );
+      case 821: if(this.m(0,'Number')) { this.adjustAnnoNumber( $.value = this.numberLiteral( sign ) ); } continue;
+      case 822: switch(this.l()) {
+        case 'Id': case '@': if(this.annoStructValue(_={},823)) {sub=_.value; if ($.value.$flatten) $.value.$flatten.push( sub );
 else this.addDef( sub, $.value, 'struct', null, sub.name ); } continue;
-        default: this.s=821; continue;
+        default: this.s=824; continue;
       }
-      case 820: switch(this.l()) {
-        case ',': this.c(819); continue;
-        case '}': this.s=821; continue;
+      case 823: switch(this.l()) {
+        case ',': this.c(822); continue;
+        case '}': this.s=824; continue;
         default: this.e(); continue;
       }
-      case 821: this.m(0,'}'); continue;
-      case 822: switch(this.l()) {
-        case 'Id': case '#': case '(': case '+': case '-': case '@': case '[': case '{': case 'Number': case 'String': case 'QuotedLiteral': if(this.annoValue(_={},827)) {sub=_.value; $.value.val.push( sub ) } continue;
-        case '...': if(this.gc(828,'ellipsisRestriction') && this.c(823)) ellipsis=this.lb(); continue;
-        default: this.s=828; continue;
-      }
-      case 823: switch(this.lk()) {
-        case 'up': this.ck(824); continue;
-        default: this.s=826;{ upTo = undefined; } continue;
-      }
-      case 824: this.mk(825,'to'); continue;
-      case 825: if(this.annoValue(_={},826)) upTo=_.value; continue;
-      case 826: this.s=827;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location, upTo: upTo } ); } continue;
-      case 827: switch(this.l()) {
-        case ',': this.c(822); continue;
-        case ']': this.s=828; continue;
+      case 824: this.s=825;{ this.ec( 'arrayAnno', 'orNotEmpty' ); } continue;
+      case 825: this.m(0,'}'); continue;
+      case 826: switch(this.l()) {
+        case 'Id': case '#': case '(': case '+': case '-': case '@': case '[': case '{': case 'Number': case 'String': case 'QuotedLiteral': if(this.annoValue(_={},831)) {sub=_.value; $.value.val.push( sub ) } continue;
+        case '...': if(this.gc(832,'arrayAnno','ellipsis') && this.c(827)) ellipsis=this.lb(); continue;
+        default: this.s=832; continue;
+      }
+      case 827: switch(this.lk()) {
+        case 'up': this.ck(828); continue;
+        default: this.s=830;{ upTo = undefined; } continue;
+      }
+      case 828: this.mk(829,'to'); continue;
+      case 829: if(this.annoValue(_={},830)) upTo=_.value; continue;
+      case 830: this.s=831;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location, upTo: upTo } ); } continue;
+      case 831: switch(this.l()) {
+        case ',': this.c(826); continue;
+        case ']': this.s=832; continue;
         default: this.e(); continue;
       }
-      case 828: this.m(0,']'); continue;
-      case 829: if(this.condition(_={},830)) $.value=_.expr; continue;
-      case 830: if(this.m(0,')')) { $.value.$tokenTexts = this.ruleTokensText(); } continue;
+      case 832: this.m(0,']'); continue;
+      case 833: if(this.condition(_={},834)) $.value=_.expr; continue;
+      case 834: if(this.m(0,')')) { $.value.$tokenTexts = this.ruleTokensText(); } continue;
       default:
       this.attachLocation( $.value );
       return this.exit_();