@sap/cds-compiler 5.6.0 → 5.7.2

package/lib/parsers/CdlGrammar.g4

@@ -29,6 +29,7 @@ tokens{                         // reserved words
   ALL, ANY, AS,
   BY,
   CASE, CAST,
+  DISTINCT,                     // not entirely necessary
   EXISTS,
   FALSE, FROM,
   IN,
@@ -37,7 +38,7 @@ tokens{                         // reserved words
   OF, ON,
   SELECT, SOME,
   TRUE,
-  WHERE, WITH,
+  WHEN, WHERE, WITH,
 }
 
 // Top-level: USING, NAMESPACE, artifactDefOrExtend (start rule: start) ---------
@@ -45,22 +46,22 @@ tokens{                         // reserved words
 start returns[ source = new XsnSource( 'cdl' ) ]
   :
     (
-      ( <cond=namespaceRestriction> namespaceDeclaration[ $source ]
+      ( <guard=namespaceRestriction> namespaceDeclaration[ $source ]
       | usingDeclaration[ $source ]
       | artifactDefOrExtend[ $source ] <prepare=namespaceRestriction>
       )
-      ( ';' | <exitLoop> | <repeatLoop, cond=afterBrace> { this.noAssignmentInSameLine(); } )
+      ( ';' | <exitLoop> | <repeatLoop, guard=afterBrace> { this.noAssignmentInSameLine(); } )
     )*
     EOF { this.docComment( null ); }
   ;
 
 artifactsBlock[ art, start = undefined ]
   :
-    '{'<prepare=vocabularyRestriction>
+    '{'
     { $art.artifacts = this.createDict( $start ); $art.extensions = []; }
     (
       artifactDefOrExtend[ $art ]
-      ( ';' | <exitLoop> | <repeatLoop, cond=afterBrace> { this.noAssignmentInSameLine(); } )
+      ( ';' | <exitLoop> | <repeatLoop, guard=afterBrace> { this.noAssignmentInSameLine(); } )
     )*
     '}'<prepare=afterBrace>
     { this.finalizeDictOrArray( $art.artifacts ); }
@@ -74,7 +75,7 @@ artifactDefOrExtend[ outer ] locals[ art = new XsnArtifact() ]
       DEFINE?
       ( serviceDef[ $art, $outer ]
       | contextDef[ $art, $outer ]
-      | <cond=vocabularyRestriction>annotationDef[ $art, $outer ]
+      | <guard=vocabularyRestriction> annotationDef[ $art, $outer ]
       | typeDef[ $art, $outer ]
       | aspectDef[ $art, $outer ]
       | entityDef[ $art, $outer ]
@@ -84,7 +85,7 @@ artifactDefOrExtend[ outer ] locals[ art = new XsnArtifact() ]
       | functionMainDef[ $art, $outer ]
       )
     |
-      <cond=extensionRestriction> EXTEND { $art.kind = 'extend'; }
+      <guard=extensionRestriction> EXTEND { $art.kind = 'extend'; }
       ( extendArtifact[ $art, $outer ]
       | extendService[ $art, $outer ]
         // Non-streamlined Syntax; we would neither add new clauses to them, nor
@@ -95,7 +96,7 @@ artifactDefOrExtend[ outer ] locals[ art = new XsnArtifact() ]
       | <hide> extendProjection[ $art, $outer ]
       )
     |
-      <cond=extensionRestriction> ANNOTATE annotateArtifact[ $art, $outer ]
+      <guard=extensionRestriction> ANNOTATE annotateArtifact[ $art, $outer ]
     )
   ;
 
@@ -127,7 +128,7 @@ usingDeclaration[ source ] locals[ decl = { kind: 'using' } ] // TODO: XsnArtifa
       '{' { $decl.usings = this.createArray(); }
       ( usingProxy[ $decl, { kind: 'using' } ]
         ( ',' | <exitLoop> )
-      )+
+      )*
       '}'<prepare=afterBrace>
       { this.finalizeDictOrArray( $decl.usings ); }
       ( FROM String
@@ -170,7 +171,8 @@ simplePath[ category = 'artref' ] returns[ default ref = {} ]
 serviceDef[ art, outer ]
 @finally{ this.attachLocation( $art ); }
   :
-    SERVICE name=namePath[ 'Service' ]
+    SERVICE <prepare=vocabularyRestriction>
+    name=namePath[ 'Service' ]
     { this.addDef( $art, $outer, 'artifacts', 'service', $name ); }
     { this.docComment( $art ); } annoAssignMid[ $art ]*
     artifactsBlock[ $art ]?
@@ -179,7 +181,8 @@ serviceDef[ art, outer ]
 contextDef[ art, outer ]
 @finally{ this.attachLocation( $art ); }
   :
-    CONTEXT name=namePath[ 'Context' ]
+    CONTEXT <prepare=vocabularyRestriction>
+    name=namePath[ 'Context' ]
     { this.addDef( $art, $outer, 'artifacts', 'context', $name ); }
     { this.docComment( $art ); } annoAssignMid[ $art ]*
     artifactsBlock[ $art ]?
@@ -189,7 +192,7 @@ annotationDef[ art, outer ]
 @finally{ this.attachLocation( $art ); }
   :
     ANNOTATION name=namePath[ 'AnnoDef' ]
-    // make it also work with ignored <cond=vocabularyRestriction>:
+    // make it also work with ignored <guard=vocabularyRestriction>:
     { this.addDef( $art, $outer, ($outer.kind === 'source' ? 'vocabularies' : 'artifacts'), 'annotation', $name ); }
     { this.docComment( $art ); } annoAssignMid[ $art ]*
     typeOrIncludesSpec[ $art ]
@@ -232,7 +235,8 @@ aspectDef[ art, outer ]
 entityDef[ art, outer ]
 @finally{ this.attachLocation( $art ); }
   :
-    ENTITY name=namePath[ 'Entity' ]
+    ENTITY<prepare=afterBrace>  // enable special
+    name=namePath[ 'Entity' ]
     { this.addDef( $art, $outer, 'artifacts', 'entity', $name ); }
     { this.docComment( $art ); } annoAssignMid[ $art ]*
     paramsList[ $art ]?
@@ -254,6 +258,14 @@ entityDef[ art, outer ]
         { $art.query = $query; $art.$syntax = 'projection'; }
         whereGroupByHaving[ $query ]?
         orderByLimitOffset[ $query ]?
+        { if (this.lb().type !== '}' && ![ ';', '}', 'EOF' ].includes( this.l() ) && this.la().keyword !== 'actions') {
+          // not worth to nicer location here - is standard error in v6
+          this.warning( 'syntax-missing-proj-semicolon', this.la(),
+                        { expecting: [ "';'" ], offending: this.antlrName( this.la() ) },
+                        'Missing $(EXPECTING) before $(OFFENDING)');
+        } }
+        <prepare=afterBrace> // disable special loop-exit, allow no `;`
+        // TODO v6: these <prepare=afterBrace>s are extremely strange
       )
     )
     actionsBlock[ $art ]?
@@ -336,7 +348,7 @@ actionsBlock[ art ]
     ACTIONS { $art.actions = this.createDict(); } '{'
     (
       boundActionFunctionDef[ $art ]
-      ( ';' | <exitLoop> | <repeatLoop, cond=afterBrace> { this.noAssignmentInSameLine(); } )
+      ( ';' | <exitLoop> | <repeatLoop, guard=afterBrace> { this.noAssignmentInSameLine(); } )
     )*
     '}'<prepare=afterBrace>
     { this.finalizeDictOrArray( $art.actions ); }
@@ -402,7 +414,7 @@ elementsBlock[ art ]
     ( elementDef[ $art ]
       ( ';'
       | <exitLoop>
-      | <repeatLoop, cond=afterBrace, restrict=Id> { this.noAssignmentInSameLine(); }
+      | <repeatLoop, guard=afterBrace, restrict=Id> { this.noAssignmentInSameLine(); }
       )
     )*
     '}'<prepare=afterBrace>
@@ -429,14 +441,14 @@ elementDef[ outer, art = undefined ]
       ':' typeExpression[ $art ] // includes DEFAULT
     )?
     (
-      <cond=elementRestriction, arg=calc> '='
+      <guard=elementRestriction, arg=calc> '='
       // TODO TOOL: add to "expected set" if failing here?  Or have some "do not
       // consider for rule exit if condition failure on `=`"?
       expr=expression { $art.value = $expr; }
       ( STORED { $art.value.stored = this.valueWithLocation( true ); } )?
       // TODO: why have `stored` as property of the value?
-      { if (this.elementRestriction( true, 'anno' )) this.docComment( $art ); }
-      ( <cond=elementRestriction, arg=anno> annoAssignStd[ $art ] )*
+      { if (!this.elementRestriction( true, 'anno' )) this.docComment( $art ); }
+      ( <guard=elementRestriction, arg=anno> annoAssignStd[ $art ] )*
     )?
   ;
 
@@ -507,7 +519,7 @@ mixinElementDef[ outer ] locals[ art = new XsnArtifact() ]
     ( assoc=ASSOCIATION cardinality[ $art ]? TO
     | assoc=COMPOSITION cardinality[ $art ]? OF
     )
-    ( <cond=noRepeatedCardinality> card=ONE/MANY )?
+    ( <guard=noRepeatedCardinality> card=ONE/MANY )?
     target=simplePath
     { this.setAssocAndComposition( $art, $assoc, $card, $target ); }
     ON expr=condition { $art.on = $expr; }
@@ -527,7 +539,7 @@ annotateArtifact[ art, outer ]
       annotateElementsBlock[ $art ]?
     | // definition annotation
       keyword=WITH?
-      // <cond=noRuleExitAfterWith>), or as rule option,
+      // <guard=noRuleExitAfterWith>), or as rule option,
       // this.noSemicolonHere() had the issues: DocComment, before `}`/EOF
       { this.addExtension( $art, $outer, 'annotate', $name ); }
       { this.docComment( $art ); } annoAssignStd[ $art ]*
@@ -598,7 +610,7 @@ extendService[ art, outer ]
     name=namePath[ 'ExtService' ]
     { $art.name = $name; $outer.extensions.push( $art ); }
     keyword=WITH?
-    // <cond=noRuleExitAfterWith>), or as rule option,
+    // <guard=noRuleExitAfterWith>), or as rule option,
     // this.noSemicolonHere() had the issues: DocComment, before `}`/EOF
     { this.docComment( $art ); } annoAssignStd[ $art ]*
     artifactsBlock[ $art ]?
@@ -611,7 +623,7 @@ extendContext[ art, outer ]
     name=namePath[ 'ExtContext' ]
     { $art.name = $name; $outer.extensions.push( $art ); }
     keyword=WITH?
-    // <cond=noRuleExitAfterWith>), or as rule option,
+    // <guard=noRuleExitAfterWith>), or as rule option,
     // this.noSemicolonHere() had the issues: DocComment, before `}`/EOF
     { this.docComment( $art ); } annoAssignStd[ $art ]*
     artifactsBlock[ $art ]?
@@ -681,7 +693,7 @@ annotateActionsBlock[ art ]
   :
     ACTIONS { $art.actions = this.createDict(); } '{'
     ( annotateBoundAction[ $art ]
-      ( ';' | <exitLoop> | <repeatLoop, cond=afterBrace> { this.noAssignmentInSameLine(); } )
+      ( ';' | <exitLoop> | <repeatLoop, guard=afterBrace> { this.noAssignmentInSameLine(); } )
     )*
     '}'<prepare=afterBrace>
     { this.finalizeExtensionsDict( $art.actions ); }
@@ -732,7 +744,7 @@ annotateElementsBlock[ art ]
     ( annotateElement[ $art ]
       ( ';'
       | <exitLoop>
-      | <repeatLoop, cond=afterBrace, restrict=Id> { this.noAssignmentInSameLine(); }
+      | <repeatLoop, guard=afterBrace, restrict=Id> { this.noAssignmentInSameLine(); }
       )
     )*
     '}'<prepare=afterBrace>
@@ -755,7 +767,7 @@ extendElementsBlock[ art, start = undefined ]
     ( elementDefOrExtend[ $art ]
       ( ';'
       | <exitLoop>
-      | <repeatLoop, cond=afterBrace, restrict=Id> { this.noAssignmentInSameLine(); } )
+      | <repeatLoop, guard=afterBrace, restrict=Id> { this.noAssignmentInSameLine(); } )
     )*
     '}'<prepare=afterBrace>
     { this.finalizeExtensionsDict( $art.elements ); }
@@ -838,7 +850,7 @@ typeOrIncludesSpec[ art ]
 //    annotations are attached to the element, the type properties to the line type
 //
 // If used in a definition with additional clauses (currently just `= expr` for
-// elements), these clauses must be guarded with <cond=…>.
+// elements), these clauses must be guarded with <guard=…>.
 //
 // This rule is for element, type, (input and `returns`) parameter and annotation
 // definitions.  It is not used when the type expression is restricted: CDL-style
@@ -849,15 +861,15 @@ typeExpression[ art ]
     ( typeRefOptArgs[ $art ] | typeTypeOf[ $art ] )
     (<altRuleStart>)
     { this.docComment( $art ); } annoAssignStd[ $art ]*
-    ( <cond=elementRestriction, arg=notNull> nullability[ $art ]
+    ( <guard=elementRestriction, arg=notNull> nullability[ $art ]
       { this.docComment( $art ); } annoAssignStd[ $art ]*
     )?
     ( enumSymbolsBlock[ $art ] <prepare=elementRestriction, arg=anno>
-      ( <cond=elementRestriction, arg=notNull> nullability[ $art ] )?
-      ( <cond=elementRestriction, arg=default>
+      ( <guard=elementRestriction, arg=notNull> nullability[ $art ] )?
+      ( <guard=elementRestriction, arg=default>
         DEFAULT expr=expression { $art.default = $expr; }
       )?
-      ( <cond=elementRestriction, arg=notNull> nullability[ $art ] )?
+      ( <guard=elementRestriction, arg=notNull> nullability[ $art ] )?
     | typeProperties[ $art ]
     )?
   |
@@ -868,12 +880,12 @@ typeExpression[ art ]
   |
     assoc=ASSOCIATION <prepare=elementRestriction, arg=calc>
     cardinality[ $art ]? TO
-    ( <cond=noRepeatedCardinality> card=ONE/MANY )?
+    ( <guard=noRepeatedCardinality> card=ONE/MANY )?
     typeAssocProperties[ $art, $assoc, $card ]
   |
     assoc=COMPOSITION <prepare=elementRestriction, arg=calc>
     cardinality[ $art ]? OF
-    ( <cond=noRepeatedCardinality> card=ONE/MANY )?
+    ( <guard=noRepeatedCardinality> card=ONE/MANY )?
     ( typeAssocProperties[ $art, $assoc, $card ]
     | elementsBlock[ this.setAssocAndComposition( $art, $assoc, $card ) ]
       { $art.target.location = $art.target.elements[Symbol.for('cds.$location')]; }
@@ -886,7 +898,7 @@ typeExpression[ art ]
     )                      // no anno assignments, except to end type expression
     (
       ( typeRefOptArgs[ $art.items ] | typeTypeOf[ $art.items ] )
-      ( <cond=elementRestriction, arg=notNull> nullability[ $art.items ] )?
+      ( <guard=elementRestriction, arg=notNull> nullability[ $art.items ] )?
       ( { this.docComment( $art ); } annoAssignStd[ $art ]*
         { ; } <exitRule>         // TODO TOOL: make it work without workaround { ; }
         // TODO TOOL: investigate why simply `{} <exitRule>` is ignored
@@ -895,7 +907,7 @@ typeExpression[ art ]
     |
       elementsBlock[ $art.items ]
     )
-    ( <cond=elementRestriction, arg=notNull> nullability[ $art.items ] )?
+    ( <guard=elementRestriction, arg=notNull> nullability[ $art.items ] )?
   |
     elementsBlock[ $art ] <prepare=elementRestriction, arg=calc>
     nullability[ $art ]?
@@ -918,16 +930,17 @@ typeProperties[ art ]
     (
       annoAssignStd[ $art ]
     |
-      <cond=elementRestriction, arg=notNull>
+      <guard=elementRestriction, arg=notNull>
       nullability[ $art ] { this.docComment( $art ); }
     |
-      <cond=elementRestriction, arg=default>
+      <guard=elementRestriction, arg=default>
       DEFAULT expr=expression { $art.default = $expr; this.docComment( $art ); }
     )+
   ;
 
 
 typeTypeOf[ art ] locals[ location ]
+@after{ this.attachLocation( $art.type ); }
   :
     TYPE OF { location = this.locationOfPrevTokens( 2 ); }
     type=simplePath[ 'ref' ] { $art.type = $type; }
@@ -954,6 +967,7 @@ typeRefOptArgs[ art ] locals[ type = $art.type ]
       (
         '.' Id_all['ref'] { $type.path.push( this.identAst() ); }
       )*
+      { this.attachLocation( $art.type ); }
     |
       open='('
       (
@@ -1058,12 +1072,11 @@ queryEOF returns[ query ]
 projectionSpec returns[ default query = {} ]
 @finally{ this.attachLocation($query); }
   :
-    // TODO, currently just with simple ref
-    PROJECTION <prepare=afterBrace> // v6: remove <prepare>
+    PROJECTION
+    <prepare=afterBrace, arg=entity> // enable special loop-exit, TODO v6 delete
     { $query = { op: this.valueWithLocation( 'SELECT' ) }; }
     ON
-    tab=fromRefWithOptAlias <prepare=afterBrace>
-    // TODO: this <prepare=afterBrace> is extremely strange... v6 forbid.
+    tab=fromRefWithOptAlias
     { $query.from = tab; }
     selectItemsList[ $query ]?
     excludingClause[ $query ]?
@@ -1087,7 +1100,7 @@ queryExpression returns[ default expr = {} ] locals[ op, quantifier ]
       )
       query=queryExpression
       // with same op/quantifier: make left-assoc binary to nary:
-      { if ($expr.$parens || $op.val !== $expr.op.val || $quantifier?.val !== $expr.quantifier?.val) $expr = { op, args: [$expr], quantifier }; }
+      { if ($expr.$parens || $op.val !== $expr.op.val || $quantifier?.val !== $expr.quantifier?.val) $expr = { op, args: [$expr], quantifier, location: { ...$.expr.location } }; } // TODO: ...$
       { $quantifier = undefined; }
       { $expr.args.push( $query ); this.attachLocation( $expr ); }
     )*
@@ -1180,16 +1193,16 @@ tableOrQueryParens returns[ default expr ]
     '(' <prepare=queryOnLeft>
     ( <prefer> tableOrQueryParens[ ...$ ]
       ( tableExpression[ ...$ ]<atAltStart, prepare=queryOnLeft, arg=table>
-      | <cond=queryOnLeft> queryExpression[ ...$ ]<atAltStart>
+      | <guard=queryOnLeft> queryExpression[ ...$ ]<atAltStart>
       )?
     | tableExpression[ ...$ ] <prepare=queryOnLeft, arg=table>
     | queryExpression[ ...$ ]
     )
     ')'
     { this.surroundByParens( $expr ); }
-    ( <cond=queryOnLeft, arg=table> AS Id['FromAlias']
+    ( <guard=queryOnLeft, arg=table> AS Id['FromAlias']
       { $expr = this.taggedIfQuery( $expr ); $expr.name = this.identAst(); }
-    | <cond=queryOnLeft, arg=tableWithoutAs> Id_restricted['FromAlias']
+    | <guard=queryOnLeft, arg=tableWithoutAs> Id_restricted['FromAlias']
       // TODO TOOL: shouldn't we have generated `default: this.giR()`?
       { $expr = this.taggedIfQuery( $expr ); $expr.name = this.fragileAlias(); }
     )?
@@ -1228,7 +1241,7 @@ fromRefWithOptAlias returns[ default expr = {} ]
     (
       AS Id['FromAlias'] { $expr.name = this.identAst(); }
     |
-      // <cond=tableWithoutAs> not necessary, tool uses `default: this.giR()`
+      // <guard=tableWithoutAs> not necessary, tool uses `default: this.giR()`
       Id_restricted['FromAlias']
       { $expr.name = this.fragileAlias(); }
     |
@@ -1243,7 +1256,7 @@ fromPath[ table, category ] locals[ pathItem ]
     Id[ $category ] { $table.path.push( $pathItem = this.identAst() ); }
     ( fromArgumentsAndFilter[ $pathItem ] { $pathItem = null; } )?
     (
-      <cond=notAfterEntityArgOrFilter> // TODO TOOL: allow <hide=method>
+      <guard=notAfterEntityArgOrFilter> // TODO TOOL: allow <hide=method>
       '.' { if (!$pathItem && !$table.scope) {
         $table.scope = $table.path.length; $category = 'ref';
         this.warning( 'syntax-invalid-path-separator', this.lb(),
@@ -1277,7 +1290,7 @@ fromNamedArgument[ pathStep ]
 cardinalityAndFilter[ pathStep ]
   :
     '['
-    ( <cond=beforeColon> Number // TODO: only allow `1`?
+    ( <guard=beforeColon> Number // TODO: only allow `1`?
       { $pathStep.cardinality = { targetMax: this.unsignedIntegerLiteral(), location: this.lb().location }; }
       ':'
     )?
@@ -1341,7 +1354,7 @@ selectItemsList[ query, start = undefined ]
 
 nestedSelectItemsList[ query, clause ]
   :
-    '{'<prepare=inSelectItem, arg=nested>
+    '{'<prepare=inSelectItem>
     { $query[$clause] = this.createArray(); }
     (
       ( '*' { $query[$clause].push( this.valueWithLocation() ); }
@@ -1353,43 +1366,72 @@ nestedSelectItemsList[ query, clause ]
     { this.finalizeDictOrArray( $query[$clause] ); }
   ;
 
-selectItemDef[ columns ] locals[ art = new XsnArtifact(), alias ]
+selectItemDef[ columns ] locals[ art = new XsnArtifact() ]
 @finally{ this.attachLocation( $art ); }
   :
     { $columns.push( $art ); }  // TODO: probably too early
     { this.docComment( $art ); } annoAssignCol[ $art ]*
-    ( <cond=modifierRestriction> VIRTUAL
+    ( <guard=modifierRestriction> VIRTUAL
       { $art.virtual = this.valueWithLocation( true ); }
     )?
     {;} <prepare=columnExpr, arg=key>    // TOOL TODO: disappears without {;}
-    ( <cond=modifierRestriction> KEY
+    ( <guard=modifierRestriction> KEY
       { $art.key = this.valueWithLocation( true ); }
     )?
+    // TODO: we might have an extra rule for column expression...
     (
-      expr=expression { $art.value = $expr; }
-      ( as=AS Id['ItemAlias'] { $art.name = this.identAst(); }
-      | Id_restricted['ItemAlias'] { $art.name = this.fragileAlias( true ); }
-      | { $alias = this.classifyImplicitName( 'ItemImplicit', $expr ); }
+      (
+        expr=expression { $art.value = $expr; }
+        ( AS Id['ItemAlias'] { $art.name = this.identAst(); }
+        | Id_restricted['ItemAlias'] { $art.name = this.fragileAlias( true ); }
+        )?
       |
-        // TODO: guard for ref-only expression can probably replace reportExpandInline
-        '.'
-        { this.reportUnexpectedSpace( this.lb(), this.la().location, true ); } // TODO: no ERR
-        { this.reportExpandInline( $art, $as || true ); }
-        // no extra 'syntax-unexpected-alias' anymore,
-        // 'syntax-unexpected-anno' reported in define.js
-        { if ($alias) $alias.token.parsedAs = $alias.parsedAs; }
+        <prefer>
+        expr=valuePath { $expr = this.valuePathAst( $expr ); $art.value = $expr; }
         (
-          nestedSelectItemsList[ $art, 'inline' ]
-          excludingClause[ $art ]?
+          (
+            OVER { this.pushXprToken( $expr.suffix = [] ); }
+            overClause[ $expr.suffix ]
+            ( e=expression[ ...{ expr: $expr } ]<atAltStart>
+              { Object.assign( $e.location, $expr.location ); $art.value = this.attachLocation( $e )}
+            )?
+          |
+            e=expression[ ...{ expr: $expr } ]<atAltStart>
+            { Object.assign( $e.location, $expr.location ); $art.value = this.attachLocation( $e )}
+          )
+          ( AS Id['ItemAlias'] { $art.name = this.identAst(); }
+          | Id_restricted['ItemAlias'] { $art.name = this.fragileAlias( true ); }
+          )?
+        |                         // includes empty
+          AS Id['ItemAlias'] <prepare=nestedExpand> { $art.name = this.identAst(); }
+        |
+          Id_restricted['ItemAlias'] <prepare=nestedExpand>
+          { $art.name = this.fragileAlias( true ); }
         |
-          '*' { $art.inline = [ this.valueWithLocation() ]; }
+          { this.classifyImplicitName( 'ItemImplicit', $expr ); } <prepare=nestedExpand>
+          // TODO TOOL: action in default does not work in embedded action
+        |
+          // TODO: guard instead reportExpandInline if valuePath is function?
+          '.'
+          { this.reportUnexpectedSpace( this.lb(), this.la().location, true ); } // TODO: no ERR
+          { this.reportExpandInline( $art, true ); }
+          // no extra 'syntax-unexpected-alias' anymore,
+          // 'syntax-unexpected-anno' reported in define.js
+          (
+            nestedSelectItemsList[ $art, 'inline' ]
+            excludingClause[ $art ]?
+          |
+            '*' { $art.inline = [ this.valueWithLocation() ]; }
+          )
+          <exitRule>
         )
-        <exitRule>
       )
-      // TODO: <cond> instead `reportExpandInline` for "expand/inline only w/ ref"
+      // expand is only allowed only after valuePath, but error recovery is poor
+      // if the following is moved up to <prepare=nestedExpand>
       (
-        // TODO: guard for ref-only expression can probably replace:
-        { this.reportExpandInline( $art, false ); }
+        // TODO: make guard handle that if valuePath might be function?
+        <guard=nestedExpand>
+        { if (!this.nestedExpand(true)) this.reportExpandInline( $art, false ); }
         nestedSelectItemsList[ $art, 'expand' ]
         excludingClause[ $art ]?
       )?
@@ -1400,7 +1442,7 @@ selectItemDef[ columns ] locals[ art = new XsnArtifact(), alias ]
     )
     { this.docComment( $art ); } <prepare=columnExpr> annoAssignMid[ $art ]*
     (
-      ':'
+      ':'                       // TODO: guard? currently not with expand ?
       (
         ( typeTypeOf[ $art ]
         | ( LOCALIZED { $art.localized = this.valueWithLocation( true ); } )?
@@ -1413,14 +1455,14 @@ selectItemDef[ columns ] locals[ art = new XsnArtifact(), alias ]
         | foreignKeysBlock[ $art ]
         )?
       |
-        ( <cond=columnExpr>     // arg=singleId
+        ( <guard=columnExpr>     // arg=singleId
           assoc=ASSOCIATION { this.associationInSelectItem( $art ); }
           cardinality[ $art ]? TO
-        | <cond=columnExpr>     // arg=singleId
+        | <guard=columnExpr>     // arg=singleId
           assoc=COMPOSITION { this.associationInSelectItem( $art ); }
           cardinality[ $art ]? OF
         )
-        ( <cond=noRepeatedCardinality> card=ONE/MANY )?
+        ( <guard=noRepeatedCardinality> card=ONE/MANY )?
         target=simplePath
         { this.setAssocAndComposition( $art, $assoc, $card, $target ); }
         ON expr=condition { $art.on = $expr; }
@@ -1485,7 +1527,7 @@ valuePath returns[ default expr = { path: [] } ] locals[ pathItem ]
     ( argumentsAndFilter[ $pathItem ] )?
     (<altRuleStart>)
     (
-      <cond=isDotForPath> '.'
+      <guard=isDotForPath> '.'
       Id_all['ref'] { $expr.path.push( $pathItem = this.identAst() ); }
       ( argumentsAndFilter[ $pathItem ] { $pathItem = null; } )?
     )*
@@ -1571,7 +1613,7 @@ expression returns[ default expr = {} ]
       | <prec=10, postfix=once> IS { $expr = this.applyOpToken( $expr ); }
         ( NOT { this.pushXprToken( $expr ); } )?
         NULL { this.pushXprToken( $expr ); }
-      | ( <arg=10, cond=isNegatedRelation> NOT { $expr = this.applyOpToken( $expr ); }
+      | ( <arg=10, guard=isNegatedRelation> NOT { $expr = this.applyOpToken( $expr ); }
           // TODO: condition, because there might be NOT NULL after DEFAULT expression
         | <prec=10, postfix=once>
           { $expr = { op: { val: 'ixpr', location: this.la().location }, args: [ $expr ] }; }
@@ -1601,7 +1643,7 @@ expressionOrQueryParens returns[ default expr ]
       ( expression[ ...$ ]<atAltStart, prepare=queryOnLeft, arg=expr>
         continueExpressionslist[ ...$ ]?
       | continueExpressionslist[ ...$ ] <prepare=queryOnLeft, arg=expr>
-      | <cond=queryOnLeft> queryExpression[ ...$ ]<atAltStart>
+      | <guard=queryOnLeft> queryExpression[ ...$ ]<atAltStart>
       )?
     | expression[ ...$ ] <prepare=queryOnLeft, arg=expr>
       continueExpressionslist[ ...$ ]?
@@ -1688,7 +1730,7 @@ options{ minTokensMatched = 1 }
         // TODO: if we want perfect CC and error recovery, `isNamedArg` would work
         // like keyword prediction and also do something similar to the (future)
         // "identifier confirmation prediction" (consider argument `(par ‡ : 42)`
-        <cond=isNamedArg> id=Id_all['paramname']
+        <guard=isNamedArg> id=Id_all['paramname']
         (
           ':' { $pathStep.args = this.createDict( $open ); $pathStep.$syntax = ':'; }
           expr=expression { this.addNamedArg( $pathStep, $id, $expr ); }
@@ -1829,7 +1871,7 @@ literalValue returns[ default expr = {} ]
   :
    // TODO: remove from this rule (not in enum! `String enum { foo = #bar }`) ?
     '#' { this.reportUnexpectedSpace(); }
-    Id['enumref']
+    Id_all['enumref']
     { $expr = { literal: 'enum', sym: this.identAst() } }
   |
     NULL
@@ -1887,6 +1929,7 @@ annoAssignParen[ art ]
   :
     '('<prepare=annoInSameLine>
     ( annoAssignBase[ $art ]
+      //( annoAssignErrorRecoveryHelper )?
       ( ',' | <exitLoop> )
     )*
     ')'
@@ -1896,7 +1939,7 @@ annoAssignBase[ art ] locals[ value = {} ]
 @finally{ this.assignAnnotation( $art, $value, $name || {} ); }
   :
     name=annoNamePath
-    ( <cond=annoInSameLine> ':' value=annoValue )?
+    ( <guard=annoInSameLine> ':' value=annoValue )?
   ;
 
 annoNamePath[ category = 'anno' ] returns[ default name = new XsnName() ]
@@ -1911,7 +1954,7 @@ annoNamePath[ category = 'anno' ] returns[ default name = new XsnName() ]
         Id_all[ $category ] { $name.path.push( this.identAstWithPrefix( $at ) ); }
       )
     )*
-    ( <cond=annoInSameLine> annoPathVariant[ $name ] )?
+    ( <guard=annoInSameLine> annoPathVariant[ $name ] )?
   ;
 
 annoPath[ nameOrRef, category = 'annoref' ]
@@ -1969,17 +2012,18 @@ annoValue returns[ default value = {} ]
     }
     (
       // TODO: complain about empty loop if top-level as before
-      // TOOL TODO → allow `<cond=…> '}'` below where the condition rejects `}`
+      // TOOL TODO → allow `<guard=…> '}'` below where the condition rejects `}`
       // after `{` if top-level
       sub=annoStructValue
       {
         if ($value.$flatten) $value.$flatten.push( $sub );
         else this.addDef( $sub, $value, 'struct', null, $sub.name );
       }
-      ( ',' | <exitLoop> )
+      ( ',' | <exitLoop> | <guard=fail, repeatLoop, restrict=Id> )
+      // <guard=fail, repeatLoop>` for better error recovery for input `foo@bar`
     )*
     // TODO TOOL: allow:
-    // ( <cond=arrayAnno, …> '}' | <error> )         // TODO TOOL - workaround:
+    // ( <guard=arrayAnno, …> '}' | <error> )         // TODO TOOL - workaround:
     { this.ec( 'arrayAnno', 'orNotEmpty' ); } '}'
     // Do NOT use <prepare=afterBrace> here!
   |
@@ -1989,7 +2033,7 @@ annoValue returns[ default value = {} ]
     (
       ( sub=annoValue { $value.val.push( $sub ) }
       |
-        <cond=arrayAnno, arg=ellipsis> ellipsis='...'
+        <guard=arrayAnno, arg=ellipsis> ellipsis='...'
         ( UP TO upTo=annoValue
           { $value.val.push( { literal: 'token', val: '...', location: $ellipsis.location, upTo: $upTo } ); }
         | { $value.val.push( { literal: 'token', val: '...', location: $ellipsis.location } ); }
@@ -2001,7 +2045,7 @@ annoValue returns[ default value = {} ]
       )
       ( ',' | <exitLoop> )
     )*
-    // TODO TOOL: allow ( <cond=arrayAnno, arg=bracket> ']' )
+    // TODO TOOL: allow ( <guard=arrayAnno, arg=bracket> ']' )
     { this.ec( 'arrayAnno', 'bracket' ); }<always>
     ']'
   |

package/lib/parsers/Lexer.js

@@ -95,7 +95,7 @@ class Lexer {
         tokenIndex: parser.tokens.length + parser.docComments.length + parser.comments.length,
       };
       let keyword;
-      if (typeof type !== 'function' ||
+      if (typeof type !== 'function' || // eslint-disable-next-line sonarjs/no-nested-assignment
           ([ type, text, keyword ] = type( text, this, parser, pos )) && type) {
         parser.tokens.push( {
           __proto__: Token.prototype,
@@ -200,7 +200,8 @@ function string( text, lexer, parser, beg ) {
     // TODO: set parsedAs to 0 → no further error if string is not expected?
     prefix = null;           // no combination with date/time/…
   }
-  adaptEndLocation( lexer, (rulesRegexp.lastIndex = lastIndex || lexer.input.length) );
+  rulesRegexp.lastIndex = lastIndex || lexer.input.length;
+  adaptEndLocation( lexer, rulesRegexp.lastIndex );
 
   if (!prefix)
     return [ 'String', lexer.input.substring( beg, rulesRegexp.lastIndex ), keyword ];
@@ -233,7 +234,8 @@ function ident( text, lexer, parser, beg ) {
     keyword = 0;
     // TODO: set parsedAs to 0 → no further error if string is not expected?
   }
-  adaptEndLocation( lexer, (rulesRegexp.lastIndex = lastIndex || lexer.input.length) );
+  rulesRegexp.lastIndex = lastIndex || lexer.input.length;
+  adaptEndLocation( lexer, rulesRegexp.lastIndex );
   return [ 'Id', lexer.input.substring( beg, rulesRegexp.lastIndex ), keyword ];
 }
 

package/lib/parsers/index.js

@@ -21,7 +21,7 @@ function parseCdl( source, filename = '<undefined>.cds',
                    options = {}, messageFunctions = null,
                    rule = 'cdl' ) {
   const rulespec = rules[rule];
-  if (!options.newParser)
+  if (!options.newParser)       // TODO: (options.newParser === false)
     return parseWithAntlr( source, filename, options, messageFunctions, rulespec );
   const { CdlParser } = gen;
   if (CdlParser.tracingParser)  // tracing → direct console output of message