@sap/cds-compiler 2.12.0 → 2.13.6

package/lib/language/language.g4

@@ -393,7 +393,7 @@ artifactDef[ outer, defOnly = false ] locals[ annos = [] ] // cannot use `parent
       | extendProjection[ $outer, this.startLocation(), $annos ]
       | extendType[ $outer, this.startLocation(), $annos ]
       | extendAspect[ $outer, this.startLocation(), $annos ]
-        // TODO: what about extendAction
+      // Streamlined Syntax
       | extendArtifact[ $outer, this.startLocation(), $annos ]
       )
     |
@@ -418,7 +418,9 @@ contextDef[ outer, loc, annos, defOnly = false ] locals[ art, name = {} ]
       this.docComment( $annos ); }
     annotationAssignment_fix[ $annos ]*
     (
-      '{' artifactDef[ $art, defOnly, true ]* '}'
+      '{' { $art.artifacts = this.createDict(); }
+      artifactDef[ $art, defOnly ]*
+      '}' { this.setDictEndLocation( $art.artifacts ); }
       optionalSemi
     |
       requiredSemi
@@ -436,9 +438,9 @@ extendContext[ outer, loc, annos ] locals[ art, name = {} ]
     { this.docComment( $annos ); }
     annotationAssignment_ll1[ $annos ]*
     (
-      '{'
-      artifactDef[ $art, $service ? 'SERVICE' : 'CONTEXT', true ]*
-      '}'
+      '{' { $art.artifacts = this.createDict(); }
+      artifactDef[ $art, $service ? 'SERVICE' : 'CONTEXT' ]*
+      '}' { this.setDictEndLocation( $art.artifacts ); }
       optionalSemi
     |
       requiredSemi
@@ -461,23 +463,35 @@ entityDef[ outer, loc, annos ] locals[ art, name = {} ]
         )*
       )?
       '{'
-      { $art.elements = Object.create(null); } // better for include and annotate
+      { $art.elements = this.createDict(); } // better for include and annotate
       elementDef[ $art ]*
-      '}'
+      '}' { this.setDictEndLocation( $art.elements ); }
       // TODO: action definitions in a specific section?
-      ( ACTIONS '{' actionFunctionDef[ $art ]* '}' )?
+      (
+        ACTIONS '{' { $art.actions = this.createDict(); }
+        actionFunctionDef[ $art ]*
+        '}' { this.setDictEndLocation( $art.actions ); }
+      )?
       optionalSemi
     |
       AS
       ( qe=queryExpression
         { $art.query = $qe.query; $art['$'+'syntax'] = 'entity' }
-        ( ACTIONS '{' actionFunctionDef[ $art ]* '}' optionalSemi
+        (
+          ACTIONS '{' { $art.actions = this.createDict(); }
+          actionFunctionDef[ $art ]*
+          '}' { this.setDictEndLocation( $art.actions ); }
+          optionalSemi
         | requiredSemi
         )
       | qp=projectionSpec
         { $art.query = $qp.query; $art['$'+'syntax'] = 'projection'; }
         projectionClauses[ $qp.query ]
-        ( ACTIONS '{' actionFunctionDef[ $art ]* '}' )?
+        (
+          ACTIONS '{' { $art.actions = this.createDict(); }
+          actionFunctionDef[ $art ]*
+          '}' { this.setDictEndLocation( $art.actions ); }
+        )?
         optionalSemi            // TODO: not fully correct without columns or excluding
       )
     )
@@ -522,12 +536,12 @@ excludingClause[ query ]
   :
     // syntax is less than ideal - EXCLUDING is only useful for `*` - with
     // this syntax, people wonder what happens with explicit select items
-    EXCLUDING '{'
+    EXCLUDING '{' { $query.excludingDict = this.createDict(); }
     projectionExclusion[ $query ]
     ( ',' { if (this.isStraightBefore("}")) break; } // allow ',' before '}'
       projectionExclusion[ $query ]
     )*
-    '}'
+    '}' { this.setDictEndLocation( $query.excludingDict ); }
   ;
 
 projectionExclusion[ outer ] locals[ art ]
@@ -562,13 +576,19 @@ extendEntity[ outer, loc, annos ] locals[ art, name = {} ]
 
 extendForEntity[ art ]
   :
-    '{'
+    '{' { $art.elements = this.createDict(); }
     elementDefOrExtend[ $art ]*
-    '}'
-    ( ACTIONS '{' actionFunctionDef[ $art ]* '}' )?
+    '}' { this.setDictEndLocation( $art.elements ); }
+    (
+      ACTIONS '{' { $art.actions = this.createDict(); }
+      actionFunctionDef[ $art ]*
+      '}' { this.setDictEndLocation( $art.actions ); }
+    )?
     optionalSemi
   |
-    ACTIONS '{' actionFunctionDef[ $art ]* '}'
+    ACTIONS '{' { $art.actions = this.createDict(); }
+    actionFunctionDef[ $art ]*
+    '}' { this.setDictEndLocation( $art.actions ); }
     optionalSemi
   |
     requiredSemi
@@ -594,10 +614,16 @@ extendProjection[ outer, loc, annos ] locals[ art, name = {} ]
         )*
       )?
       '}'
-      ( ACTIONS '{' actionFunctionDef[ $art ]* '}' )?
+      (
+        ACTIONS '{' { $art.actions = this.createDict(); }
+        actionFunctionDef[ $art ]*
+        '}' { this.setDictEndLocation( $art.actions ); }
+      )?
       optionalSemi
     |
-      ACTIONS '{' actionFunctionDef[ $art ]* '}'
+      ACTIONS '{' { $art.actions = this.createDict(); }
+      actionFunctionDef[ $art ]*
+      '}' { this.setDictEndLocation( $art.actions ); }
       optionalSemi
     |
       requiredSemi
@@ -702,12 +728,15 @@ aspectDef[ outer, loc, annos ] locals[ art, name = {} ]
         )*
       )?
     )?
-    '{'
-    { $art.elements = Object.create(null); } // better for include and annotate
+    '{' { $art.elements = this.createDict(); }
     ( elementDef[ $art ]* )
-    '}'
+    '}' { this.setDictEndLocation( $art.elements ); }
     // TODO: action definitions in a specific section?
-    ( ACTIONS '{' actionFunctionDef[ $art ]* '}' )?
+    (
+      ACTIONS '{' { $art.actions = this.createDict(); }
+      actionFunctionDef[ $art ]*
+      '}' { this.setDictEndLocation( $art.actions ); }
+    )?
     optionalSemi
   ;
 
@@ -758,13 +787,82 @@ annotationDef[ outer, loc, annos ] locals[ art, name = {} ]
     typeSpecSemi[ $art, $annos ] // also 'includes'...
   ;
 
-extendArtifact[ outer, loc, annos ] locals[ art, name = {} ]
-@after { this.attachLocation($art); }
+extendArtifact[ outer, loc, annos ] locals[ art, name = {}, elemName = {} ]
+@after{ /* #ATN 1 */ this.attachLocation($art); }
   :
     simplePath[ $name, 'Extend' ]
-    { $art = this.addItem( $outer, 'extensions', 'extend', $annos,
-                           { name: $name }, $loc );  }
-    extendWithOptElements[ $art, $annos ]
+    (
+      { $art = this.addItem( $outer, 'extensions', 'extend', $annos, { name: $name }, $loc );  }
+    |
+      ':'
+      simplePath[ $elemName, 'ref']
+      {{
+        const def = this.addItem( $outer, 'extensions', 'extend', null, { name: $name }, $loc );
+        $art = this.artifactForElementAnnotateOrExtend( 'extend', def, $elemName.path, $annos, $loc );
+      }}
+    )
+    (
+      { this.docComment( $annos ); }
+      annotationAssignment_ll1[ $annos ]*
+      (
+        '{' { $art.elements = this.createDict(); }
+        elementDefOrExtend[ $art ]*
+        '}' { this.setDictEndLocation( $art.elements ); }
+        optionalSemi
+      |
+        requiredSemi
+      )
+    |
+      WITH { this.noSemicolonHere(); this.docComment( $annos ); }
+      annotationAssignment_ll1[ $annos ]*
+      // #ATN: DEFINITIONS, COLUMNS, ACTIONS etc are not reserved and could be identifiers (ref).
+      (
+        includeRef[ $art ]
+        requiredSemi
+      |
+        '{' { $art.elements = this.createDict(); }
+        elementDefOrExtend[ $art ]*
+        '}' { this.setDictEndLocation( $art.elements ); }
+        optionalSemi
+      |
+        requiredSemi
+      |
+        { this.disallowElementExtension( $elemName, $outer, 'definitions' ); }
+        DEFINITIONS
+        '{' { $art.artifacts = this.createDict(); }
+        artifactDef[ $art, true ]*
+        '}' { this.setDictEndLocation( $art.artifacts ); }
+        optionalSemi
+      |
+        { this.disallowElementExtension( $elemName, $outer, 'columns' ); }
+        COLUMNS
+        '{' { $art.columns = []; }
+        (
+          selectItemDef[ $art.columns ]
+          ( ',' { if (this.isStraightBefore("}")) break; } // allow ',' before '}'
+            selectItemDef[ $art.columns ]
+          )*
+        )?
+        '}'
+        optionalSemi
+      |
+        { this.disallowElementExtension( $elemName, $outer, 'actions' ); }
+        ACTIONS '{' { $art.actions = this.createDict(); }
+        actionFunctionDef[ $art ]*
+        '}' { this.setDictEndLocation( $art.actions ); }
+        optionalSemi
+      |
+        ELEMENTS '{' { $art.elements = this.createDict(); }
+        elementDefOrExtend[ $art ]*
+        '}' { this.setDictEndLocation( $art.elements ); }
+        optionalSemi
+      |
+        ENUM '{' { $art.enum = this.createDict(); }
+        enumSymbolDef[ $art ]*
+        '}' { this.setDictEndLocation( $art.enum ); }
+        optionalSemi
+      )
+    )
   ;
 
 extendWithOptElements[ art, annos ]
@@ -775,9 +873,9 @@ extendWithOptElements[ art, annos ]
       includeRef[ $art ]
       requiredSemi
     |
-      '{'
+      '{' { $art.elements = this.createDict(); }
       elementDefOrExtend[ $art ]*
-      '}'
+      '}' { this.setDictEndLocation( $art.elements ); }
       optionalSemi
     |
       requiredSemi
@@ -786,59 +884,71 @@ extendWithOptElements[ art, annos ]
     { this.docComment( $annos ); }
     annotationAssignment_ll1[ $annos ]*
     (
-      '{'
+      '{' { $art.elements = this.createDict(); }
       elementDefOrExtend[ $art ]*
-      '}'
+      '}' { this.setDictEndLocation( $art.elements ); }
       optionalSemi
     |
       requiredSemi
     )
   ;
 
-annotateArtifact[ outer, loc, annos ] locals[ art, name = {} ]
+annotateArtifact[ outer, loc, annos ] locals[ art, name = {}, elemName = {} ]
 @after { this.attachLocation($art); }
   :
     simplePath[ $name, 'Annotate' ]
-    { $art = this.addItem( $outer, 'extensions', 'annotate', $annos, { name: $name }, $loc ); }
+    (
+      { $art = this.addItem( $outer, 'extensions', 'annotate', $annos, { name: $name }, $loc ); }
+    |
+      ':'
+      simplePath[ $elemName, 'ref']
+      {{
+        const def = this.addItem( $outer, 'extensions', 'annotate', null, { name: $name }, $loc );
+        $art = this.artifactForElementAnnotateOrExtend( 'annotate', def, $elemName.path, $annos, $loc );
+      }}
+    )
+
     ( WITH { this.noSemicolonHere(); } )?
     { this.docComment( $annos ); }
     annotationAssignment_ll1[ $annos ]*
     (
-      '{'
+      '{' { $art.elements = this.createDict(); }
       annotateElement[ $art ]*
-      '}'
+      '}' { this.setDictEndLocation( $art.elements ); }
       (
         ACTIONS
-        '{'
+        '{' { $art.actions = this.createDict(); }
         annotateAction[ $art ]*
-        '}'
+        '}' { this.setDictEndLocation( $art.actions ); }
       )?
       optionalSemi
     |
       ACTIONS
-      '{'
+      '{' { $art.actions = this.createDict(); }
       annotateAction[ $art ]*
-      '}'
+      '}' { this.setDictEndLocation( $art.actions ); }
       optionalSemi
     |
-      '('
+      '(' { $art.params = this.createDict(); }
       annotateParam[ $art ]
       ( ',' { if (this.isStraightBefore(')')) break; } // allow ',' before ')'
         annotateParam[ $art ]
       )*
-      ')'
+      ')' { this.setDictEndLocation( $art.params ); }
       (
-        RETURNS '{' { $art['$'+'syntax'] = 'returns'; }
+        RETURNS { $art['$'+'syntax'] = 'returns'; }
+        '{' { $art.elements = this.createDict(); }
         annotateElement[ $art ]*
-        '}'
+        '}' { this.setDictEndLocation( $art.elements ); }
         optionalSemi
       |
         requiredSemi
       )
     |
-      RETURNS '{' { $art['$'+'syntax'] = 'returns'; }
+      RETURNS { $art['$'+'syntax'] = 'returns'; }
+      '{' { $art.elements = this.createDict(); }
       annotateElement[ $art ]*
-      '}'
+      '}' { this.setDictEndLocation( $art.elements ); }
       optionalSemi
 
     |
@@ -856,9 +966,9 @@ annotateElement[ outer ] locals[ art, annos = [] ]
       this.docComment( $annos ); }
     annotationAssignment_ll1[ $annos ]*
     (
-      '{'
+      '{' { $art.elements = this.createDict(); }
       annotateElement[ $art ]*
-      '}'
+      '}' { this.setDictEndLocation( $art.elements ); }
       optionalSemi
     |
       requiredSemi
@@ -875,17 +985,17 @@ annotateAction [ outer ] locals [ art, annos = [] ]
       this.docComment( $annos ); }
     annotationAssignment_ll1[ $annos ]*
     (
-      '('
+      '(' { $art.params = this.createDict(); }
       annotateParam[ $art ]
       ( ',' { if (this.isStraightBefore(')')) break; } // allow ',' before ')'
         annotateParam[ $art ]
       )*
-      ')'
+      ')' { this.setDictEndLocation( $art.params ); }
     )?
     (
-      RETURNS '{'
+      RETURNS '{' { $art.elements = this.createDict(); }
       annotateElement[ $art ]*
-      '}'
+      '}' { this.setDictEndLocation( $art.elements ); }
       optionalSemi
     |
       requiredSemi
@@ -929,6 +1039,12 @@ enumSymbolDef[ outer ] locals[ art, annos = [] ]
     requiredSemi
   ;
 
+defaultValue[ art ] locals[ elem, elements = {} ]
+  :
+  // TODO: We may support structured default values here.
+  DEFAULT expr=expression { $art.default = $expr.expr; }
+  ;
+
 elementDefOrExtend[ outer ] locals[ annos = [] ]
 @after { /* #ATN 1 */ if ($ctx.art) this.attachLocation($art.art); }
 // tool complains if I test for ($art)
@@ -995,7 +1111,7 @@ elementDefInner[ outer, loc, annos, allowEq ] returns[ art ]
   :
     // TODO: it would be excellent to remove ELEMENT...
     // or have a special ident rule without the ELEMENT
-    // Reason: it would be good for error recover to start a major block without LL1 ambiguity
+    // Reason: it would be good for error recovery to start a major block without LL1 ambiguity
     // VIRTUAL is keyword, except if before the following tokens texts:
     { this.setLocalToken( 'VIRTUAL', 'VIRTUAL', /^[:{@=}]$/ ); }
     virtual=VIRTUAL? key=KEY?
@@ -1047,7 +1163,7 @@ elementDefInner[ outer, loc, annos, allowEq ] returns[ art ]
         )
       |
         (
-          array=ARRAY of=OF 
+          array=ARRAY of=OF
           { $art.items = { location: this.tokenLocation( $array, $of ) }; }
         | many=MANY
           { $art.items = { location: this.tokenLocation( $many ) };}
@@ -1065,10 +1181,9 @@ elementDefInner[ outer, loc, annos, allowEq ] returns[ art ]
           { this.docComment( $annos ); }
           annotationAssignment_ll1[ $annos ]*
           (
-              ENUM '{'
-              { $art.items.enum = Object.create(null); }
-              enumSymbolDef[ $art.items ]*
-            '}'
+            ENUM '{' { $art.items.enum = this.createDict(); }
+            enumSymbolDef[ $art.items ]*
+            '}' { this.setDictEndLocation( $art.items.enum ); }
             misplacedAnnotations[ $annos, 'syntax-anno-after-enum' ]?
           )?
         )
@@ -1092,13 +1207,14 @@ elementDefInner[ outer, loc, annos, allowEq ] returns[ art ]
         typeRefOptArgs[ $art ]
         { this.docComment( $annos ); }
         annotationAssignment_ll1[ $annos ]*
-        ( ENUM '{'
-            { $art.enum = Object.create(null); }
-            enumSymbolDef[ $art ]*
-          '}'
+        (
+          ENUM '{' { $art.enum = this.createDict(); }
+          enumSymbolDef[ $art ]*
+          '}' { this.setDictEndLocation( $art.enum ); }
           elementProperties[ $art ]?
           misplacedAnnotations[ $annos, 'syntax-anno-after-enum' ]?
-        | elementProperties[ $art ]
+        |
+          elementProperties[ $art ]
           { this.docComment( $annos ); }
           annotationAssignment_ll1[ $annos ]*
         )?
@@ -1249,7 +1365,7 @@ selectItemInlineDef[ outer ] locals[ annos = [] ]
 
 parameterListDef[ art ]
   :
-    '('
+    '(' { $art.params = this.createDict(); }
     // also empty param list (we might do some hacking later to allow reserved words)
     // see annotationAssignment_paren
     (
@@ -1258,7 +1374,7 @@ parameterListDef[ art ]
         parameterDef[ $art ]
       )*
     )?
-    ')'
+    ')' { this.setDictEndLocation( $art.params ); }
   ;
 
 parameterDef[ outer ] locals[ art, annos = [] ]
@@ -1271,14 +1387,14 @@ parameterDef[ outer ] locals[ art, annos = [] ]
       this.docComment( $annos ); }
     annotationAssignment_fix[ $annos ]*
     typeSpec[ $art ]
-    ( DEFAULT expr=expression { $art.default = $expr.expr; } )?
+    defaultValue[ $art ]?
     { this.docComment( $annos ); }
     annotationAssignment_ll1[ $annos ]*
   ;
 
 entityParameters[ art ]
   :
-    '('
+    '(' { $art.params = this.createDict(); }
     // also empty param list (we might do some hacking later to allow reserved words)
     // see annotationAssignment_paren
     (
@@ -1287,7 +1403,7 @@ entityParameters[ art ]
         entityParameterDef[ $art ]
       )*
     )?
-    ')'
+    ')' { this.setDictEndLocation( $art.params ); }
   ;
 
 entityParameterDef[ outer ] locals[ art, annos = [] ]
@@ -1300,7 +1416,7 @@ entityParameterDef[ outer ] locals[ art, annos = [] ]
       this.docComment( $annos ); }
     annotationAssignment_fix[ $annos ]*
     typeSpec[ $art ]
-    ( DEFAULT expr=expression { $art.default = $expr.expr; } )?
+    defaultValue[ $art ]?
     { this.docComment( $annos ); }
     annotationAssignment_ll1[ $annos ]*
   ;
@@ -1316,17 +1432,11 @@ nullability[ art ]
 
 elementProperties[ elem ]
   :
-    nullability[$elem]
-    (
-      DEFAULT expr=expression
-      { $elem.default = $expr.expr; }
-    )?
+    nullability[ $elem ]
+    defaultValue[ $elem ]?
   |
-    (
-      DEFAULT expr=expression
-      { $elem.default = $expr.expr; }
-    )
-    nullability[$elem]?
+    defaultValue[ $elem ]
+    nullability[ $elem ]?
   |
     eq='='
     { this.notSupportedYet( 'Calculated fields are not supported yet', $eq ); }
@@ -1377,10 +1487,10 @@ typeSpec[ art ]                 // for params
       // TODO: no LOCALIZED ?
     | typeRefOptArgs[ $art ]
       nullability[ $art ]?
-      ( ENUM '{'
-          { $art.enum = Object.create(null); }
-          enumSymbolDef[ $art ]*
-        '}'
+      (
+        ENUM '{' { $art.enum = this.createDict(); }
+        enumSymbolDef[ $art ]*
+        '}' { this.setDictEndLocation( $art.enum ); }
       )?
     )
   ;
@@ -1390,7 +1500,7 @@ returnTypeSpec[ art, annos ]
   :
     ret=RETURNS { $art.returns = { location: this.tokenLocation( $ret ), kind: 'param' }; }
     // #ATN: typeSimple can start with ARRAY or TYPE
-    ( typeStruct[ $art.returns ] 
+    ( typeStruct[ $art.returns ]
       nullability[ $art.returns ]?
     | typeArray[ $art.returns ] // nullability is set in typeArray
     | typeTypeOf[ $art.returns ]
@@ -1398,11 +1508,12 @@ returnTypeSpec[ art, annos ]
       // TODO: no LOCALIZED ?
     | typeRefOptArgs[ $art.returns ]
       nullability[ $art.returns ]?
-      ( ENUM '{'
-          { $art.returns.enum = Object.create(null); }
-          enumSymbolDef[ $art.returns ]*
-        '}'
-      | misplacedAnnotations[ $annos, 'syntax-anno-after-params' ]
+      (
+        ENUM '{' { $art.returns.enum = this.createDict(); }
+        enumSymbolDef[ $art.returns ]*
+        '}' { this.setDictEndLocation( $art.returns.enum ); }
+      |
+        misplacedAnnotations[ $annos, 'syntax-anno-after-params' ]
       )?
     )
 
@@ -1443,7 +1554,7 @@ typeSpecSemi[ art, annos ]      // with 'includes', for type and annotation defs
         { $art.items = { location: this.tokenLocation( $many ) };}
       )
       // #ATN: typeRefOptArgs can start with TYPE
-      ( typeStruct[ $art.items ] 
+      ( typeStruct[ $art.items ]
         nullability[ $art.items ]?
         optionalSemi
       | typeTypeOf[ $art.items ]
@@ -1455,21 +1566,24 @@ typeSpecSemi[ art, annos ]      // with 'includes', for type and annotation defs
         nullability[ $art.items ]?
         { this.docComment( $annos ); }
         annotationAssignment_ll1[ $annos ]*
-        ( ENUM '{'
-            { $art.items.enum = Object.create(null); }
-            enumSymbolDef[ $art.items ]*
-          '}'
-          optionalSemi 
-        | requiredSemi
+        (
+          ENUM '{' { $art.items.enum = this.createDict(); }
+          enumSymbolDef[ $art.items ]*
+          '}' { this.setDictEndLocation( $art.items.enum ); }
+          optionalSemi
+        |
+          requiredSemi
         )
       )
     |
       typeTypeOf[ $art ]
+      defaultValue[ $art ]?
       { this.docComment( $annos ); }
       annotationAssignment_ll1[ $annos ]* requiredSemi
     |
       l=LOCALIZED { $art.localized = this.valueWithTokenLocation( true, $l ); }
       typeRefOptArgs[ $art ]
+      defaultValue[ $art ]?
       { this.docComment( $annos ); }
       annotationAssignment_ll1[ $annos ]*
       requiredSemi
@@ -1500,12 +1614,19 @@ typeSpecSemi[ art, annos ]      // with 'includes', for type and annotation defs
         ')'
         { this.docComment( $annos ); }
         annotationAssignment_ll1[ $annos ]*
-        ( ENUM '{'
-            { $art.enum = Object.create(null); }
-            enumSymbolDef[ $art ]*
-          '}'
-          optionalSemi
-        | requiredSemi
+        (
+          ENUM '{' { $art.enum = this.createDict(); }
+          enumSymbolDef[ $art ]*
+          '}' { this.setDictEndLocation( $art.enum ); }
+          (
+            optionalSemi
+          |
+            defaultValue[ $art ]
+            requiredSemi
+          )
+        |
+          defaultValue[ $art ]?
+          requiredSemi
         )
       |
         ':' // with element, e.g. `type T : E:elem enum { ... }`
@@ -1513,22 +1634,36 @@ typeSpecSemi[ art, annos ]      // with 'includes', for type and annotation defs
         simplePath[ $art.type, 'ref']
         { this.docComment( $annos ); }
         annotationAssignment_ll1[ $annos ]*
-        ( ENUM '{'
-            { $art.enum = Object.create(null); }
-            enumSymbolDef[ $art ]*
-          '}'
-          optionalSemi
-        | requiredSemi
+        (
+          ENUM '{' { $art.enum = this.createDict(); }
+          enumSymbolDef[ $art ]*
+          '}' { this.setDictEndLocation( $art.enum ); }
+          (
+            optionalSemi
+          |
+            defaultValue[ $art ]
+            requiredSemi
+          )
+        |
+          defaultValue[ $art ]?
+          requiredSemi
         )
       |
         { this.docComment( $annos ); }
         annotationAssignment_ll1[ $annos ]*
-        ( ENUM '{'
-            { $art.enum = Object.create(null); }
-            enumSymbolDef[ $art ]*
-          '}'
-          optionalSemi
-        | requiredSemi
+        (
+          ENUM '{' { $art.enum = this.createDict(); }
+          enumSymbolDef[ $art ]*
+          '}' { this.setDictEndLocation( $art.enum ); }
+          (
+            optionalSemi
+          |
+            defaultValue[ $art ]
+            requiredSemi
+          )
+        |
+          defaultValue[ $art ]?
+          requiredSemi
         )
       |
         // TODO: complain if used in anno def?
@@ -1545,15 +1680,17 @@ typeSpecSemi[ art, annos ]      // with 'includes', for type and annotation defs
 typeStruct[ art, attachLoc = false ]
 @after { if ($attachLoc) this.attachLocation($art); }
   :
-    { $art.elements = Object.create(null); } // we allow empty structures
-    '{' elementDef[ $art ]* '}'
+    '{' { $art.elements = this.createDict(); }
+    elementDef[ $art ]*
+    '}' { this.setDictEndLocation( $art.elements ); }
   ;
 
 typeCompoStruct[ art ]
 @after { this.attachLocation($art); }
   :
-    { $art.elements = Object.create(null); } // we allow empty structures
-    COMPOSITIONofBRACE elementDef[ $art ]* '}'
+    COMPOSITIONofBRACE { $art.elements = this.createDict(); }
+    elementDef[ $art ]*
+    '}' { this.setDictEndLocation( $art.elements ); }
   ;
 
 typeArray[ art ]
@@ -1572,10 +1709,10 @@ typeArray[ art ]
       nullability[ $art.items ]?
     | typeRefOptArgs[ $art.items ]
       nullability[ $art.items ]?
-      ( ENUM '{'
-          { $art.items.enum = Object.create(null); }
-          enumSymbolDef[ $art.items ]*
-        '}'
+      (
+        ENUM '{' { $art.items.enum = this.createDict(); }
+        enumSymbolDef[ $art.items ]*
+        '}' { this.setDictEndLocation( $art.items.enum ); }
       )?
     )
   ;
@@ -1603,7 +1740,7 @@ typeAssociationBase[ art, handleTypeCompo ] // including Composition
 typeAssociationCont[ art ]
   :
     (
-      '{'
+      '{' { $art.foreignKeys = this.createDict(); }
       { this.addDef( $art, 'foreignKeys' ); }
       (
         foreignKey[ $art ]
@@ -1611,7 +1748,7 @@ typeAssociationCont[ art ]
           foreignKey[ $art ]
         )*
       )?
-      '}'
+      '}' { this.setDictEndLocation( $art.foreignKeys ); }
     |
       ON cond=condition
       { $art.on=$cond.cond; }
@@ -1622,7 +1759,7 @@ typeAssociationElementCont[ art, annos ] // including Composition
 // optional NULL / NOT NULL for managed association only
   :
     (
-      '{'
+      '{' { $art.foreignKeys = this.createDict(); }
       { this.addDef( $art, 'foreignKeys' ); }
       (
         foreignKey[ $art ]
@@ -1630,7 +1767,7 @@ typeAssociationElementCont[ art, annos ] // including Composition
           foreignKey[ $art ]
         )*
       )?
-      '}'
+      '}' { this.setDictEndLocation( $art.foreignKeys ); }
       nullability[ $art ]?
     |
       ON cond=condition
@@ -1770,14 +1907,26 @@ orderByClause[ inQuery ] returns [ query ]
     ( ',' obn=orderBySpec  { $query.orderBy.push( $obn.ob ); } )*
   ;
 
+// Generic function ORDER BY clause, e.g. `first_value(id order by name)`
+// lhsExpr is the left expression of the ORDER BY clause.
+functionOrderByClause[ lhsExpr ] returns [ expr ]
+@after { this.attachLocation( $expr ); }
+  :
+    o=ORDER b=BY { $expr = { op: this.valueWithTokenLocation( 'orderBy', $o, $b ) , args: [ $lhsExpr ] }}
+    ob1=orderBySpec { $expr.args.push( $ob1.ob ); }
+    ( ',' obn=orderBySpec { $expr.args.push( $obn.ob ); } )*
+  ;
+
 overOrderByClause returns [ expr ]
+@after { this.attachLocation( $expr ); }
   :
-    o=ORDER b=BY { $expr = { op: this.valueWithTokenLocation( 'orderBy', $o, $b ) , args: [] }}
+    o=ORDER b=BY { $expr = { op: this.valueWithTokenLocation( 'overOrderBy', $o, $b ) , args: [] }}
     ob1=orderBySpec { $expr.args.push( $ob1.ob ); }
     ( ',' obn=orderBySpec { $expr.args.push( $obn.ob ); } )*
   ;
 
 partitionByClause returns [ expr ]
+@after { this.attachLocation( $expr ); }
   :
     p=PARTITION b=BY { $expr = { op: this.valueWithTokenLocation( 'partitionBy', $p, $b ) , args: [] }}
     e1=expression { $expr.args.push( $e1.expr ); }
@@ -1785,12 +1934,14 @@ partitionByClause returns [ expr ]
   ;
 
 windowFrameClause returns [ wf ]
+@after { this.attachLocation( $wf ); }
   :
     r=ROWS { $wf = { op: this.valueWithTokenLocation( 'rows', $r ) , args: [] }}
     wfe=windowFrameExtentSpec { $wf.args.push( $wfe.wfe ); }
   ;
 
 windowFrameExtentSpec returns[ wfe ]
+@after { this.attachLocation( $wfe ); }
   :
     { $wfe = {} }
     windowFrameStartSpec [ $wfe ]
@@ -1820,6 +1971,7 @@ windowFrameBoundSpec returns [ wfb ]
   ;
 
 windowFrameStartSpec [ wf ]
+@after { this.attachLocation( $wf ); }
   :
     u=UNBOUNDED p=PRECEDING
     {
@@ -1832,7 +1984,7 @@ windowFrameStartSpec [ wf ]
       $wf.op = this.valueWithTokenLocation( 'preceding', $p );
       $wf.args = [ this.numberLiteral( $n ) ];
     }
-  | 
+  |
     c=CURRENT r=ROW
     {
       $wf.op = this.valueWithTokenLocation( 'currentRow', $c, $r );
@@ -1841,7 +1993,7 @@ windowFrameStartSpec [ wf ]
   ;
 
 overClause returns [ over ]
-@after { this.attachLocation($over); }
+@after { this.attachLocation( $over ); }
   :
     o=OVER { $over = { op: this.valueWithTokenLocation( 'over', $o ) , args: []  } }
     '('
@@ -1895,9 +2047,10 @@ queryPrimary returns[ query = {} ]
     (
       FROM querySource[ $query ]
       (
-        mixin=MIXIN '{'
+        mixin=MIXIN '{' { $query.mixin = this.createDict(); }
         mixinElementDef[ $query ]*
-        '}' INTO
+        '}' { this.setDictEndLocation( $query.mixin ); }
+        INTO
       )?
       ( ad=( ALL | DISTINCT )     // TODO: or directly after SELECT ?
       { $query.quantifier = this.valueWithTokenLocation( $ad.text.toLowerCase(), $ad ); }
@@ -2351,6 +2504,7 @@ fromArguments[ pathStep ]
 pathArguments[ pathStep, considerSpecial ]
 @after{ /* #ATN 1 */ }
   :
+    { this.excludeExpected([ 'ORDER' ]); }
     paren='('
     { this.prepareGenericKeywords( $considerSpecial ); }
     // ATN, LL2: Identifier can start both named arguments and the positional.
@@ -2372,6 +2526,13 @@ pathArguments[ pathStep, considerSpecial ]
       ( ',' { if (this.isStraightBefore(')')) break; } // allow ',' before ')'
         funcExpression[ $pathStep, $considerSpecial ]
       )*
+      // Note: We can't move this into funcExpression, or we would increase the ATN count because of `,` amiguity.
+      ( ob=functionOrderByClause[ $pathStep.args[$pathStep.args.length - 1] ]
+        {
+          // Remove the last entry which was copied to $ob.expr and push $ob.expr.
+          $pathStep.args[$pathStep.args.length - 1] = $ob.expr;
+        }
+      )?
     |
       a=ALL { $pathStep.quantifier = this.valueWithTokenLocation( 'all', $a ); }
       e1=expression { $pathStep.args = [ $e1.expr ]; }
@@ -2679,6 +2840,7 @@ ident[ category ] returns[ id ]
   | ASSOCIATION
   | BETWEEN
   | BOTH
+  | COLUMNS
   | COMPOSITION
   | CONTEXT
   | CROSS
@@ -2686,8 +2848,10 @@ ident[ category ] returns[ id ]
   | DAY
   | DEFAULT
   | DEFINE
+  | DEFINITIONS
   | DESC
   | ELEMENT
+  | ELEMENTS
   | ELSE
   | END
   | ENTITY
@@ -2883,6 +3047,7 @@ ASPECT : [aA][sS][pP][eE][cC][tT] ;
 ASSOCIATION : [aA][sS][sS][oO][cC][iI][aA][tT][iI][oO][nN] ;
 BETWEEN : [bB][eE][tT][wW][eE][eE][nN] ;
 BOTH : [bB][oO][tT][hH] ;
+COLUMNS : [cC][oO][lL][uU][mM][nN][sS];
 COMPOSITION : [cC][oO][mM][pP][oO][sS][iI][tT][iI][oO][nN] ;
 CONTEXT : [cC][oO][nN][tT][eE][xX][tT] ;
 CROSS : [cC][rR][oO][sS][sS] ;
@@ -2890,8 +3055,10 @@ CURRENT : [cC][uU][rR][rR][eE][nN][tT] ;
 DAY : [dD][aA][yY] ;
 DEFAULT : [dD][eE][fF][aA][uU][lL][tT] ;
 DEFINE : [dD][eE][fF][iI][nN][eE] ;
+DEFINITIONS : [dD][eE][fF][iI][nN][iI][tT][iI][oO][nN][sS] ;
 DESC : [dD][eE][sS][cC] ;
 ELEMENT : [eE][lL][eE][mM][eE][nN][tT] ;
+ELEMENTS : [eE][lL][eE][mM][eE][nN][tT][sS] ;
 ELSE : [eE][lL][sS][eE] ;
 END : [eE][nN][dD] ;
 ENTITY : [eE][nN][tT][iI][tT][yY] ;