@sap/cds-compiler 6.0.14 → 6.2.2

package/lib/compiler/generate.js

@@ -104,7 +104,7 @@ function generate( model ) {
       const lang = textsAspect.elements.language;
       error( 'def-unexpected-element', [ lang.name.location, lang ],
              { option: 'addTextsLanguageAssoc', art: textsAspect, name: 'language' },
-        // eslint-disable-next-line @stylistic/js/max-len
+        // eslint-disable-next-line @stylistic/max-len
              '$(ART) is not used because option $(OPTION) conflicts with existing element $(NAME); remove either option or element' );
       hasError = true;
     }
@@ -209,7 +209,7 @@ function generate( model ) {
         conflictingElements.push( elem );
 
       const isKey = elem.key && elem.key.val;
-      const isLocalized = hasTruthyProp( elem, 'localized' );
+      const isLocalized = elem.$syntax !== 'calc' && hasTruthyProp( elem, 'localized' );
 
       if (isKey) {
         keys += 1;
@@ -245,7 +245,7 @@ function generate( model ) {
           (fioriEnabled && art.elements.ID_texts)) {
         // TODO if we have too much time: check all elements of texts entity for safety
         warning( null, [ art.name.location, art ], { art: textsEntity },
-                 // eslint-disable-next-line @stylistic/js/max-len
+                 // eslint-disable-next-line @stylistic/max-len
                  'Texts entity $(ART) can\'t be created as there is another definition with that name' );
         info( null, [ textsEntity.name.location, textsEntity ], { art },
               'Texts entity for $(ART) can\'t be created with this definition' );
@@ -640,7 +640,7 @@ function generate( model ) {
     }
     if (model.definitions[entityName]) {
       error( null, [ location, elem ], { art: entityName },
-             // eslint-disable-next-line @stylistic/js/max-len
+             // eslint-disable-next-line @stylistic/max-len
              'Target entity $(ART) can\'t be created as there is another definition with this name' );
       return false;
     }

package/lib/compiler/index.js

@@ -148,6 +148,8 @@ function parserForFile( source, ext, options ) {
 //  - { realname: fs.realpath(filename) }: if filename is not canonicalized
 //
 function compileX( filenames, dir = '', options = {}, fileCache = Object.create( null ) ) {
+  options.abortSignal?.throwIfAborted();
+
   // A non-proper dictionary (i.e. with prototype) is safe if the keys are
   // absolute file names - they start with `/` or `\` or similar
   // if (Object.getPrototypeOf( fileCache ))
@@ -163,7 +165,10 @@ function compileX( filenames, dir = '', options = {}, fileCache = Object.create(
       input = processedInput;
       model.sources = input.sources;
     } )
-    .then( () => promiseAllDoNotRejectImmediately( input.files.map( readAndParse ) ) )
+    .then( () => promiseAllDoNotRejectImmediately(
+      input.files.map( readAndParse ),
+      e => e?.name === 'AbortError' // reject immediately if user wants to abort
+    ))
     .then( testInvocation, (reason) => {
       // do not reject with PromiseAllError, use InvocationError:
       const errs = reason.valuesOrErrors?.filter( e => e instanceof Error ) || [ reason ];
@@ -176,6 +181,7 @@ function compileX( filenames, dir = '', options = {}, fileCache = Object.create(
     all = all.then( readDependencies );
 
   return all.then( () => {
+    options.abortSignal?.throwIfAborted();
     moduleLayers.setLayers( input.sources );
     return compileDoX( model );
   } );
@@ -193,6 +199,9 @@ function compileX( filenames, dir = '', options = {}, fileCache = Object.create(
     sources[filename] = { location: new Location( rel ) };
 
     const source = await cdsFs( fileCache, options.traceFs ).readFileAsync( filename, 'utf8' );
+    // before running our compute-heavy parsing, check if user aborted
+    options.abortSignal?.throwIfAborted();
+
     const ast = parseX( source, rel, options, model.$messageFunctions );
     sources[filename] = ast;
     ast.location = new Location( rel );

package/lib/compiler/lsp-api.js

@@ -397,6 +397,8 @@ function* nameAsReference( ref, hint = null ) {
 function* definitionNameTokens( name, art ) {
   if (!art.kind)
     return null; // e.g. parameter references
+  if (!name)
+    return null; // e.g. column that couldn't be populated
   if (art.kind === '$annotation')
     return null; // annotation name, e.g. in `@anno: (elem)`
 

package/lib/compiler/populate.js

@@ -813,7 +813,7 @@ function populate( model ) {
     // invent a name for code completion in expression, see also #10596
     col.name = {
       id: '',
-      location: col.value && col.value.location || col.location,
+      location: col.value?.location || col.location,
       $inferred: 'none',
     };
     return '';
@@ -979,14 +979,14 @@ function populate( model ) {
         // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
         info( 'wildcard-excluding-many', [ sibling.name.location, query ],
               { id, keyword: 'excluding' },
-              // eslint-disable-next-line @stylistic/js/max-len
+              // eslint-disable-next-line @stylistic/max-len
               'This select item replaces $(ID) from two or more sources. Add $(ID) to $(KEYWORD) to silence this message' );
       }
       else {
         // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
         info( 'wildcard-excluding-one', [ sibling.name.location, query ],
               { id, alias: navElem._parent.name.id, keyword: 'excluding' },
-              // eslint-disable-next-line @stylistic/js/max-len
+              // eslint-disable-next-line @stylistic/max-len
               'This select item replaces $(ID) from table alias $(ALIAS). Add $(ID) to $(KEYWORD) to silence this message' );
       }
     }
@@ -1112,9 +1112,9 @@ function populate( model ) {
                  // art: definitionScope( target ), - TODO extra debug info in message
                  sorted_arts: exposed,
                }, {
-                 // eslint-disable-next-line @stylistic/js/max-len
+                 // eslint-disable-next-line @stylistic/max-len
                  std: 'Replace target $(TARGET) by one of $(SORTED_ARTS); can\'t auto-redirect this association if multiple projections exist in this service',
-                 // eslint-disable-next-line @stylistic/js/max-len
+                 // eslint-disable-next-line @stylistic/max-len
                  two: 'Replace target $(TARGET) by $(SORTED_ARTS) or $(SECOND); can\'t auto-redirect this association if multiple projections exist in this service',
                } );
       // continuation semantics: no auto-redirection
@@ -1136,11 +1136,11 @@ function populate( model ) {
                    anno: 'cds.redirection.target',
                    sorted_arts: exposed,
                  }, {
-                   // eslint-disable-next-line @stylistic/js/max-len
+                   // eslint-disable-next-line @stylistic/max-len
                    std: 'Add $(ANNO) to one of $(SORTED_ARTS) to select the entity as redirection target for $(TARGET) in this service; can\'t auto-redirect $(ART) otherwise',
-                   // eslint-disable-next-line @stylistic/js/max-len
+                   // eslint-disable-next-line @stylistic/max-len
                    two: 'Add $(ANNO) to either $(SORTED_ARTS) or $(SECOND) to select the entity as redirection target for $(TARGET) in this service; can\'t auto-redirect $(ART) otherwise',
-                   // eslint-disable-next-line @stylistic/js/max-len
+                   // eslint-disable-next-line @stylistic/max-len
                    justOne: 'Remove $(ANNO) from all but one of $(SORTED_ARTS) to have a unique redirection target for $(TARGET) in this service; can\'t auto-redirect $(ART) otherwise',
                  } );
       }

package/lib/compiler/propagator.js

@@ -354,7 +354,7 @@ function propagate( model ) {
       const art = item && item._artifact;
       if (art?.virtual?.val) {
         message( 'def-missing-virtual', [ item.location, elem ], { art, keyword: 'virtual' },
-                 // eslint-disable-next-line @stylistic/js/max-len
+                 // eslint-disable-next-line @stylistic/max-len
                  'Prepend $(KEYWORD) to current select item - containing element $(ART) is virtual' );
         return;
       }

package/lib/compiler/resolve.js

@@ -326,7 +326,7 @@ function resolve( model ) {
       propagateKeys = false;
       info( 'query-from-many', [ toMany.location, query ], { art: toMany }, {
         std: 'Key properties are not propagated because a to-many association $(ART) is selected',
-        // eslint-disable-next-line @stylistic/js/max-len
+        // eslint-disable-next-line @stylistic/max-len
         element: 'Key properties are not propagated because a to-many association $(MEMBER) of $(ART) is selected',
       } );
     }
@@ -367,9 +367,9 @@ function resolve( model ) {
         // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
         info( 'query-navigate-many', [ art.location, user || query ], { art }, {
           std: 'Navigating along to-many association $(ART) - key properties are not propagated',
-          // eslint-disable-next-line @stylistic/js/max-len
+          // eslint-disable-next-line @stylistic/max-len
           element: 'Navigating along to-many association $(MEMBER) of $(ART) - key properties are not propagated',
-          // eslint-disable-next-line @stylistic/js/max-len
+          // eslint-disable-next-line @stylistic/max-len
           alias: 'Navigating along to-many mixin association $(MEMBER) - key properties are not propagated',
         } );
       }
@@ -490,9 +490,9 @@ function resolve( model ) {
         resolveTypeExpr( obj, art );
       // typeOf unmanaged assoc?  TODO: is this the right place to check this?
       // (probably better in rewriteAssociations)
-      const elemtype = obj.type._artifact;
-      if (elemtype && effectiveType( elemtype )) {
-        const assocType = getAssocSpec( elemtype ) || {};
+      const elemType = obj.type._artifact;
+      if (elemType && effectiveType( elemType )) {
+        const assocType = getAssocSpec( elemType ) || {};
         if ((assocType.on || assocType.$assocFilter) && !obj.on)
           obj.on = { $inferred: 'rewrite' }; // TODO: no extra rewrite here
         if (assocType.targetAspect) {
@@ -506,11 +506,10 @@ function resolve( model ) {
         }
 
         // Check if relational type is missing its target or if it's used directly.
-        if (elemtype.category === 'relation' &&
-            !obj.target && !obj.targetAspect) {
+        if (elemType.category === 'relation' && !obj.target && !obj.targetAspect) {
           const isCsn = (obj._block && obj._block.$frontend === 'json');
           error( 'type-missing-target', [ obj.type.location, obj ],
-                 { '#': isCsn ? 'csn' : 'std', type: elemtype }, {
+                 { '#': isCsn ? 'csn' : 'std', type: elemType }, {
                    // We don't say "use 'association to <target>" because the type could be used
                    // in action parameters, etc. as well.
                    std: 'The type $(TYPE) can\'t be used directly because it\'s compiler internal',
@@ -920,7 +919,7 @@ function resolve( model ) {
       } );
     }
     else {
-      const noTruthyAllowed = [ 'localized', 'key', 'virtual' ];
+      const noTruthyAllowed = [ 'key', 'virtual' ];
       for (const prop of noTruthyAllowed) {
         if (art[prop]?.val) {
           // probably better than a parse error (which is good for DEFAULT vs calc),
@@ -1274,7 +1273,7 @@ function resolve( model ) {
           const text = (item !== last) ? 'sub' : 'std';
           error( 'duplicate-key-ref', [ item.location, key ], { '#': text, name }, {
             std: 'Foreign key $(NAME) already refers to the same target element',
-            // eslint-disable-next-line @stylistic/js/max-len
+            // eslint-disable-next-line @stylistic/max-len
             sub: 'Foreign key $(NAME) already refers to the target element whose sub element is again referred to here',
             // TODO: please add ideas for a better text, e.g. to (closed) PR #11325
           } );
@@ -1594,10 +1593,12 @@ function resolve( model ) {
     const art = type && (type.kind === 'entity' ? type : type.target?._artifact);
     if (!art)
       return ref;               // error already reported via resolvePathItem()
-    const unexpectedFilter = expected !== 'column' && expected !== 'calc' && 'std' ||
-          isQuasiVirtualAssociation( type ) && 'model-only';
-    if (last.args || last.where || last.cardinality)
+    if (last.args || last.where || last.cardinality) {
+      const unexpectedFilter = (expected !== 'annotation' && expected !== 'column' &&
+          expected !== 'calc' && 'std') ||
+        isQuasiVirtualAssociation( type ) && 'model-only';
       reportUnexpectedArgsAndFilter( last, expected, user, art, unexpectedFilter );
+    }
     // TODO: we should have different message-ids for the "last" stuff: adding
     // `.item` likely corrects the ref, probably with location at end of ref
     return ref;

package/lib/compiler/shared.js

@@ -527,7 +527,6 @@ function fns( model ) {
     if (traverseTypedExpr( args[0], exprCtx, user, null, callback ) === traverseExpr.STOP)
       return null;
     return args.slice( 1 );
-    // TODO: adopt if we extend this to ?:?:…
   }
 
   function traverseCaseWhen( args, exprCtx, user, type, callback ) {
@@ -992,7 +991,7 @@ function fns( model ) {
         }
         else if ($extended && art.elements) {
           warning( 'ref-deprecated-in-extend', [ head.location, user ], { id: head.id },
-                   // eslint-disable-next-line @stylistic/js/max-len
+                   // eslint-disable-next-line @stylistic/max-len
                    'In an added column, do not use the table alias $(ID) to refer to source elements' );
         }
       }
@@ -1490,7 +1489,7 @@ function fns( model ) {
         // of invisible table aliases; at least one stakeholder uses this,
         // so it can't be an error (yet).
         message( 'ref-deprecated-self-element', [ ref.path[0].location, user._user ], {},
-                 // eslint-disable-next-line @stylistic/js/max-len
+                 // eslint-disable-next-line @stylistic/max-len
                  'Referring to the query\'s own elements here might lead to invalid SQL references; use source elements only' );
         return false;
       default:
@@ -1899,7 +1898,7 @@ function fns( model ) {
     else if (target._artifact && target._artifact !== user._main && user._main.kind === 'entity') {
       const last = path[path.length - 1];
       warning( 'ref-invalid-backlink', [ last.location, user ], { art: target, id: '$self' },
-               // eslint-disable-next-line @stylistic/js/max-len
+               // eslint-disable-next-line @stylistic/max-len
                'The target $(ART) of the association is not the current entity represented by $(ID)' );
     }
   }
@@ -1989,11 +1988,11 @@ function fns( model ) {
       std: 'Can follow association $(ART) only to its foreign key references, not to $(NAME)',
       keys: 'Can follow managed association $(ART) only to the keys of its target, not to $(NAME)',
       complete: 'The reference must cover a full foreign key reference of association $(ART)',
-      // eslint-disable-next-line @stylistic/js/max-len
+      // eslint-disable-next-line @stylistic/max-len
       'self-std': 'In column ref starting with $(ALIAS), we can follow association $(ART) only to its foreign key references, not to $(NAME)',
-      // eslint-disable-next-line @stylistic/js/max-len
+      // eslint-disable-next-line @stylistic/max-len
       'self-keys': 'In column ref starting with $(ALIAS), we can follow managed association $(ART) only to the keys of its target, not to $(NAME)',
-      // eslint-disable-next-line @stylistic/js/max-len
+      // eslint-disable-next-line @stylistic/max-len
       'self-complete': 'The column reference starting with $(ALIAS) must cover a full foreign key reference of association $(ART)',
     } );
     // TODO later: mention allowed ones

package/lib/compiler/tweak-assocs.js

@@ -129,7 +129,7 @@ function tweakAssocs( model ) {
       // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
       info( 'assoc-outside-service', loc, { '#': text, target, service: main._service }, {
         std: 'Association target $(TARGET) is outside any service',
-        // eslint-disable-next-line @stylistic/js/max-len
+        // eslint-disable-next-line @stylistic/max-len
         exposed: 'If association is published in service $(SERVICE), its target $(TARGET) is outside any service',
       } );
     }
@@ -146,7 +146,7 @@ function tweakAssocs( model ) {
       if (assoc && assoc.foreignKeys) {
         error( 'rewrite-key-for-unmanaged', [ elem.on.location, elem ],
                { keyword: 'on', art: assocWithExplicitSpec( assoc ) },
-               // eslint-disable-next-line @stylistic/js/max-len
+               // eslint-disable-next-line @stylistic/max-len
                'Do not specify an $(KEYWORD) condition when redirecting the managed association $(ART)' );
       }
       checkIgnoredFilter( elem );
@@ -714,7 +714,7 @@ function tweakAssocs( model ) {
         if (assoc.$errorReported !== 'assoc-unexpected-scope') {
           error( 'assoc-unexpected-scope', [ assoc.value.location, assoc ],
                  { id: assoc.value._artifact.name.id },
-                 // eslint-disable-next-line @stylistic/js/max-len
+                 // eslint-disable-next-line @stylistic/max-len
                  'Association $(ID) can\'t be projected because its ON-condition refers to a parameter' );
           assoc.$errorReported = 'assoc-unexpected-scope';
         }
@@ -747,11 +747,11 @@ function tweakAssocs( model ) {
       if (!(elem === item._artifact ||          // redirection for explicit def
             elem._origin === item._artifact)) {
         const art = assoc._origin;
-        // eslint-disable-next-line @stylistic/js/max-len
+        // eslint-disable-next-line @stylistic/max-len
         warning( 'rewrite-shadowed', [ elem.name.location, elem ], { art: art && effectiveType( art ) }, {
-          // eslint-disable-next-line @stylistic/js/max-len
+          // eslint-disable-next-line @stylistic/max-len
           std: 'This element is not originally referred to in the ON-condition of association $(ART)',
-          // eslint-disable-next-line @stylistic/js/max-len
+          // eslint-disable-next-line @stylistic/max-len
           element: 'This element is not originally referred to in the ON-condition of association $(MEMBER) of $(ART)',
         } );
       }

package/lib/compiler/utils.js

@@ -150,7 +150,7 @@ function setMemberParent( elem, name, parent, prop ) {
       p[prop] = Object.create( null );
     dictAdd( p[prop], name, elem );
   }
-  if (parent._outer && parent._outer.items) // TODO: remove for items, too
+  if (parent._outer?.items) // TODO: remove for items, too
     parent = parent._outer;
   setLink( elem, '_parent', parent );
   setLink( elem, '_main', parent._main || parent );
@@ -484,11 +484,13 @@ function traverseQueryPost( query, simpleOnly, callback ) {
   // else: with parse error (`select from <EOF>`, `select distinct from;`)
 }
 
-// Call callback on all queries in dependency order, i.e. starting with query Q
-// 1. sub queries in FROM sources of Q
-// 2. Q itself, except if non-referred query, but with right UNION parts
-// 3. sub queries in ON in FROM of Q
-// 4. sub queries in columns, WHERE, HAVING
+/**
+ * Call callback on all queries in dependency order, i.e. starting with query Q
+ * 1. sub queries in FROM sources of Q
+ * 2. Q itself, ALSO if non-referred query
+ * 3. sub queries in ON in FROM of Q
+ * 4. sub queries in columns, WHERE, HAVING
+ */
 function traverseQueryExtra( main, callback ) {
   if (!main.$queries)
     return;
@@ -501,16 +503,7 @@ function traverseQueryExtra( main, callback ) {
     if (query._status === 'extra' || query._parent.kind === '$tableAlias')
       continue; // if parent is alias, query is FROM source -> run by traverseQueryPost
     // we are now in the top-level (parent is entity) or a non-referred query (parent is query)
-    setLink( query, '_status', 'extra' ); // do not call callback() in non-referred query
-    // console.log( 'A:', query.name,query._status)
-    traverseQueryPost( query, null, (q) => {
-      if (q._status !== 'extra') {
-        // console.log( 'T:', q.name)
-        setLink( q, '_status', 'extra' );
-        callback( q );
-      }
-      // else console.log( 'E:', q.name)
-    } );
+    traverseQueryPost( query, null, callback );
   }
 }
 

package/lib/compiler/xpr-rewrite.js

@@ -266,7 +266,7 @@ function xprRewriteFns( model ) {
       config.tokenExpr = expr;
       return traverseExpr.STOP === traverseExpr(
         expr, 'annoRewrite', config.target,
-        // eslint-disable-next-line @stylistic/js/max-len, @stylistic/js/function-paren-newline
+        // eslint-disable-next-line @stylistic/max-len, @stylistic/function-paren-newline
         (e, refCtx) => (rewriteAnnoExpr( e, config, refCtx ) ? traverseExpr.STOP : traverseExpr.SKIP) );
     }
     return false;
@@ -323,7 +323,7 @@ function xprRewriteFns( model ) {
           const filterConfig = { ...config, target: assocTarget, isInFilter: true };
           if (traverseExpr.STOP === traverseExpr(
             step.where, 'filter', step,
-            // eslint-disable-next-line @stylistic/js/max-len
+            // eslint-disable-next-line @stylistic/max-len
             (e, ctx) => expr.path && (rewriteGenericAnnoPath( e, filterConfig, ctx ) ? traverseExpr.STOP : traverseExpr.SKIP)
           ))
             return true;

package/lib/gen/BaseParser.js

@@ -1,4 +1,4 @@
-// Base class for generated parser, for redepage v0.2.4
+// Base class for generated parser, for redepage v0.2.7
 
 'use strict';
 
@@ -17,7 +17,6 @@ class BaseParser {
   lexer;
 
   tokens = undefined;
-  eofIndex = undefined;
   tokenIdx = 0;
   recoverTokenIdx = -1;
   conditionTokenIdx = -1; // TODO: can we use recoverTokenIdx ?
@@ -44,7 +43,6 @@ class BaseParser {
 
   init() {
     this.lexer.tokenize( this );
-    this.eofIndex = this.tokens.length - 1;
     return this;
   }
 
@@ -53,7 +51,7 @@ class BaseParser {
       s: this.s,
       stack: this.stack,
       dynamic_: this.dynamic_,
-      prec_: this.prec_
+      prec_: this.prec_,        // TODO: necessary?
     };
   }
 
@@ -85,8 +83,8 @@ class BaseParser {
   la() {                        // lookahead: complete token
     return this.tokens[this.tokenIdx];
   }
-  lb() {                        // look back: complete token
-    return this.tokens[this.tokenIdx - 1];
+  lb( k = 1 ) {                 // look back: complete token
+    return this.tokens[this.tokenIdx - k];
   }
   lr() {                        // return the first token matched by current rule
     return this.tokens[this.stack[this.stack.length - 1].tokenIdx];
@@ -95,12 +93,12 @@ class BaseParser {
   // lookahead, error: ----------------------------------------------------------
 
   l() {                         // lookahead: token type
-    return this.tokens[this.tokenIdx].type;
+    return this.la().type;
   }
 
   // instead of l() if keyword (reserved and/or unreserved) is in one of the cases
   lk() {                        // keyword lookahead
-    const la = this.tokens[this.tokenIdx];
+    const la = this.la();
     if (!this.nextTokenAsId)
       return la.keyword || la.type;
     // return la.keyword && this.table[this.s][la.keyword] && la.keyword || la.type;
@@ -109,7 +107,7 @@ class BaseParser {
   }
 
   e() {                         // error: report and recover
-    const la = this.tokens[this.tokenIdx];
+    const la = this.la();
     this._trace( 'detect parsing error' );
     if (this.errorTokenIdx === this.tokenIdx)
       throw Error( `Already reported error for ${ tokenFullName( la ) } at ${ la.location }`);
@@ -141,7 +139,7 @@ class BaseParser {
 
   // instead of e() in default if lk() had been used and 'Id' is in a non-default case
   ei() {                // error (after trying to test again as identifier)
-    if (!this.tokens[this.tokenIdx].keyword) // lk() had directly returned the type
+    if (!this.la().keyword)     // lk() had directly returned the type
       return this.e();
     this.nextTokenAsId = true;
     return false;               // do not execute action after it
@@ -200,18 +198,6 @@ class BaseParser {
     return false;               // do not execute action after it
   }
 
-  // instead of gi() at rule end (RuleEnd_ in follow-set) for `Id<weak>`, TODO: delete
-  giR( state, follow ) { // go to state (after trying to test again as identifier)
-    const { keyword } = this.tokens[this.tokenIdx];
-    if (!keyword || this.keywords[keyword])
-      return this.g( state, follow );
-    this._tracePush( [ 'R', 0 ] );
-    if (this._matchesInFollow( 'Id', keyword, 'R' ))
-      return this.g( state, follow );
-    this.nextTokenAsId = true;
-    return false;               // do not execute action after it
-  }
-
   // instead of g() in a non-default case if there is a LL1 conflict
   gP( state, follow ) {                // goto state with standard weak-conflict prediction
     return this.lP( follow ) && this.g( state );
@@ -303,7 +289,8 @@ class BaseParser {
   // “go if user condition fails”
   gc( state, cond, arg ) {
     if (this.conditionTokenIdx === this.tokenIdx &&        // tested on same
-        this.conditionStackLength == null) {               // after error recovery
+        this.conditionStackLength == null &&               // after error recovery
+        !this[cond].afterError) {
       this._tracePush( [ 'C' ] );
       return true;
     }
@@ -314,12 +301,11 @@ class BaseParser {
     }
     // calling the condition might have side effects (precendence conditions have)
     // → call tracing “name” before
-    const fail = this[cond]( arg, true ); // TODO: use single-letter for run?
+    const fail = this[cond]( arg, true ); // TODO: use single-letter for run! → 'X'
     if (this.constructor.tracingParser)
       this._traceSubPush( !fail );
     // The default case must not have actions. If written in grammar with action,
-    // the default must have <default=fallback>
-
+    // the default must currently have <default=true>
 
     if (fail) {                 // TODO: extra gcK() method instead of check below
       // TODO: probably remove the following (and `conditionStackLength` tests)
@@ -346,6 +332,23 @@ class BaseParser {
     return this.gc( null, cond, arg );
   }
 
+  // predefined guard:
+  isNoKeywordInRuleFollow( _arg, mode ) {
+    const { keyword } = this.la();
+    if (this.constructor.tracingParser && (mode === true || mode === 'M')) {
+      // TODO: mode === 'X' || mode === 'M'
+      --this.trace.at(-1).length; // do not show guard name in trace
+      if (!keyword || this.keywords[keyword] == null)
+        return false;             // ok
+      const r = this._matchesInFollow( 'Id', keyword, 'R' );
+      --this.trace.at(-1).length; // this.gc() also traces result
+      return r;
+    }
+    if (!keyword || this.keywords[keyword] == null)
+      return false;             // ok
+    return this._matchesInFollow( 'Id', keyword, 'R' );
+  }
+
   // rule start, end and call: --------------------------------------------------
 
   rule_( state, followState = -1 ) { // start rule
@@ -433,13 +436,13 @@ class BaseParser {
       this.s = cmd[1];
     if (cmd[0] !== (lk1 ? 'ck' : 'ci')) { // make the std case fast
       // TODO: also not with lean condition
-      let match1 = this._pred_next( 'Id', lk1, 'P' ); // TODO: really P for I?
+      let match1 = this._pred_next( 'Id', lk1, 'P' ); // first step of `K`/`I` prediction
       if (!match1) {
         if (lk1 || match1 === false) // assert for correct code generation
           throw Error( `Cannot match first prediction token in rule at state ${ saved.s }` );
-        if (match1 == null) {
+        if (match1 == null) {      // TODO: just return true, rule exit prediction will do it
           this._traceSubPush( 0 );  // TODO: make _pred_next push this
-          match1 = this._matchesInFollow( 'Id', lk1, 'I' ); // TODO: 'I'?
+          match1 = this._matchesInFollow( 'Id', lk1, 'I' );
         }
         else {
           this._traceSubPush( false );
@@ -452,10 +455,12 @@ class BaseParser {
 
     this._traceSubPush( '' );   // between the two tokens
     ++this.tokenIdx;            // for user lookahead fns and conditions
-    let match2 = this._pred_next( lt2, lk2, (lk1 ? 'K' : 'I') );
+    const mode = lk1 ? 'K' : 'I';
+    let match2 = this._pred_next( lt2, lk2, mode );
     if (match2 == null) {
       this._traceSubPush( 0 );  // TODO: make _pred_next push this
-      match2 = !!this._matchesInFollow( lt2, lk2, (lk1 ? 'K' : 'I') );
+      match2 = !!this._matchesInFollow( lt2, lk2, mode );
+      // TODO: we might use mode 'E' in _matchesInFollow (depends on caching)
     }
     else {
       this._traceSubPush( match2 );
@@ -485,8 +490,6 @@ class BaseParser {
    * condition is listed in `this.leanConditions`.
    */
   _pred_next( type, keyword, mode ) { // mode = P | K | I | E | R | M
-    // TODO mode: really distinguish between K | I | E | R ?
-    // Probably not: would not work with caching?  → P, P -> F
     const properCall = (mode === 'P');
     const lean = (mode !== 'M'); // TODO: extra method with conditions ?
     // TODO: if false, use condition in this.leanConditions
@@ -609,6 +612,7 @@ class BaseParser {
       this._traceSubPush( match == null ? 0 : match === (mode !== 'R') );
       // successfully matching a keyword in giR() means unsuccessful match as
       // reserved identifer
+      // TODO: this.stack ?
     }
     this.dynamic_ = dynamic_;
     this.s = savedState;
@@ -761,26 +765,26 @@ class BaseParser {
     const { keyword, type } = token;
     if (keyword && set[keyword] === true)
       delete set[keyword];
-    else if (set[type] === true && !(keyword && this.keywords[keyword]))
-      delete set[type];         // delete Id if Id token or non-reserved keyword
+    else if (set[type] === true && !(keyword && this.keywords[keyword] != null))
+      delete set[type];         // delete if not keyword
 
     this._trace( 'collect tokens for message' );
     const { trace } = this;
     const saved = this._saveForWalk();
+    saved.fixKeywordTokenIdx = this.fixKeywordTokenIdx; // changed by confirmExpected
     const expecting = Object.keys( set )
       .filter( tok => this._confirmExpected( tok, saved ) );
     token.type = type;          // overwritten by _confirmExpected
     token.keyword = keyword;
     Object.assign( this, saved );
     this.trace = trace;
-    // TODO: also trace M(…) collection, extra line for each token, with condition
     return expecting;
   }
 
   _findSyncToken( syncSet ) {
     const rewindDepth = this.stack.length
     this.recoverTokenIdx = this.tokenIdx;
-    while (this.recoverTokenIdx <= this.eofIndex) {
+    while (this.recoverTokenIdx < this.tokens.length) {
       const { keyword, type } = this.tokens[this.recoverTokenIdx];
       let recoverDepth = keyword ? syncSet[keyword] : null;
       if (recoverDepth != null)
@@ -971,6 +975,8 @@ class BaseParser {
 const members = BaseParser.prototype;
 // functions below are to be called with `call` to set `this`
 
+members.isNoKeywordInRuleFollow.afterError = true;
+
 members.precLeft_.traceName = function( prec ) {
   const parentPrec = this.stack.at( -1 ).prec;
   return `${ parentPrec ?? '-∞' }<${ prec }`;

package/lib/gen/CdlGrammar.checksum

@@ -1 +1 @@
-eb778bab22f4006cfcf64e418dcae71c
+7489417512fa82b33fb6799686ce2917