@sap/cds-compiler 5.9.2 → 6.0.10

package/lib/edm/edmPreprocessor.js

@@ -1,11 +1,12 @@
 'use strict';
 
 /* eslint max-statements-per-line:off */
-const { setProp, isDeprecatedEnabled, isBetaEnabled } = require('../base/model');
+const { setProp, isBetaEnabled } = require('../base/model');
 const {
   forEachDefinition, forEachGeneric, forEachMemberRecursively,
   isEdmPropertyRendered, getUtils,
-  applyTransformations, transformAnnotationExpression, findAnnotationExpression,
+  applyTransformations, applyTransformationsOnNonDictionary,
+  transformAnnotationExpression, findAnnotationExpression,
   cardinality2str,
 } = require('../model/csnUtils');
 const { isBuiltinType, isMagicVariable } = require('../base/builtins');
@@ -322,6 +323,15 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
         if (node.$path && dotEntityNameMap[node.$path[1]])
           node.$path[1] = dotEntityNameMap[node.$path[1]];
 
+        if (node.projection || node.query) {
+          applyTransformationsOnNonDictionary(node.projection || node.query, undefined, {
+            ref: (parent, prop, ref) => {
+              if (dotEntityNameMap[ref[0]])
+                parent.ref[0] = dotEntityNameMap[ref[0]];
+            },
+          }, { directDict: true });
+        }
+
         rewriteReferencesInActions(node);
       };
 
@@ -518,7 +528,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
     // create the Type Definition
     // modify the original parameter entity with backlink and new name
     if (csn.definitions[typeEntityName])
-      error('odata-definition-exists', [ 'definitions', entityName ], { '#': 'std', name: typeEntityName });
+      error('odata-duplicate-definition', [ 'definitions', entityName ], { '#': 'std', name: typeEntityName });
     else
       entityCsn.name = typeEntityName;
     setProp(entityCsn, '$entitySetName', typeEntitySetName);
@@ -649,7 +659,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
     // proxies are registered in model separately
     if (!isProxy) {
       if (csn.definitions[parameterCsn.name]) {
-        error('odata-definition-exists', [ 'definitions', entityName ], { '#': 'std', name: parameterCsn.name });
+        error('odata-duplicate-definition', [ 'definitions', entityName ], { '#': 'std', name: parameterCsn.name });
       }
       else {
         csn.definitions[parameterCsn.name] = parameterCsn;
@@ -694,7 +704,8 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
     if (!edmUtils.isStructuredArtifact(def))
       return;
 
-    let keys = Object.create(null);
+    const keys = Object.create(null);
+    // eslint-disable-next-line
     const validFrom = [];
     const validKey = [];
 
@@ -741,38 +752,11 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
       edmAnnoPreproc.applyAppSpecificLateCsnTransformationOnElement(options, element, def, error);
     }, [], true, { elementsOnly: true });
 
-    if (!isDeprecatedEnabled(options, '_v1KeysForTemporal')) {
-      // if artifact has a cds.valid.key mention it as @Core.AlternateKey
-      if (validKey.length) {
-        const altKeys = [ { Key: [] } ];
-        validKey.forEach(vk => altKeys[0].Key.push( { Name: vk.name, Alias: vk.name } ) );
-        edmUtils.assignAnnotation(def, '@Core.AlternateKeys', altKeys);
-      }
-    }
-    else if (validKey.length) {
-      // if artifact has a cds.valid.key make this the only primary key and
-      // add all @cds.valid.from + original primary keys as alternate keys
-      // @Core.AlternateKeys: [{ Key: [ { Name: 'slID', Alias: 'slID' }, { Name: 'validFrom', Alias: 'validFrom'} ] }]
+    // if artifact has a cds.valid.key mention it as @Core.AlternateKey
+    if (validKey.length) {
       const altKeys = [ { Key: [] } ];
-      Object.entries(([ kn, k ]) => {
-        altKeys[0].Key.push( { Name: kn, Alias: kn } );
-        delete k.key;
-      });
-      validFrom.forEach((e) => {
-        altKeys[0].Key.push( { Name: e.name, Alias: e.name } );
-      });
+      validKey.forEach(vk => altKeys[0].Key.push( { Name: vk.name, Alias: vk.name } ) );
       edmUtils.assignAnnotation(def, '@Core.AlternateKeys', altKeys);
-      keys = Object.create(null);
-      validKey.forEach((e) => {
-        e.key = true;
-        keys[e.name] = e;
-      });
-    }
-    else {
-      validFrom.forEach((e) => {
-        e.key = true;
-        keys[e.name] = e;
-      });
     }
 
     // prepare the structure itself
@@ -1040,7 +1024,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
             else if (!assocOK) {
               // if there is already a proxy (generated by a 'good' association)
               // and this association is not a good one, don't expose this association.
-              muteNavProp(element, 'oncond');
+              muteNavProp(element);
               return;
             }
             if (proxy) {
@@ -1060,7 +1044,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
               }
             }
             else {
-              muteNavProp(element, assocOK ? 'std' : 'oncond');
+              muteNavProp(element);
               return;
             }
           }
@@ -1072,12 +1056,10 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
       });
     }
 
-    function muteNavProp( elt, msg = 'std' ) {
+    function muteNavProp( elt ) {
       edmUtils.assignAnnotation(elt, '@odata.navigable', false);
-      if (elt._target['@cds.autoexpose'] !== false) {
-        warning('odata-navigation', elt.$path,
-                { target: elt._target.name, service: globalSchemaPrefix, '#': msg });
-      }
+      if (elt._target['@cds.autoexpose'] !== false)
+        info('odata-navigation', elt.$path, { target: elt._target.name, service: globalSchemaPrefix });
     }
 
     function createSchemaRefFor( targetSchemaName ) {
@@ -1152,10 +1134,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
           if (!newElt) {
             if (csnUtils.isAssocOrComposition(e)) {
               if (!e.on && e.keys) {
-                if (options.odataNoTransitiveProxies)
-                  newElt = convertManagedAssocIntoStruct(e);
-                else
-                  newElt = createProxyOrSchemaRefForManagedAssoc(e);
+                newElt = createProxyOrSchemaRefForManagedAssoc(e);
               }
               else {
                 info(null, [ 'definitions', struct.name, 'elements', assoc.name ],
@@ -1306,7 +1285,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
                 });
               }
               else if (elem.keys && !elem.on) {
-              // a primary key can never be an unmanaged association
+                // a primary key can never be an unmanaged association
                 type.elements[elemName] = createProxyOrSchemaRefForManagedAssoc(elem);
               }
               if (forceToNotNull) {
@@ -1316,7 +1295,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
                     newElt.cardinality = {};
                   newElt.cardinality.min = 1;
                 }
-                // if odata-spec-violation-key-null is checking on min>1, this can be an else
+                // if odata-unexpected-nullable-key is checking on min>1, this can be an else
                 newElt.notNull = true;
               }
               setProp(type.elements[elemName], 'name', elem.name);
@@ -1326,35 +1305,6 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
         }
       }
 
-      // Convert a managed association into a structured type and
-      // eliminate nested foreign key associations
-      function convertManagedAssocIntoStruct( e ) {
-        const newElt = cloneCsnNonDict(e, options);
-        newElt.elements = Object.create(null);
-        // remove all unwanted garbage
-        delete newElt.keys;
-        delete newElt.target;
-        delete newElt.type;
-        // if this association has no keys or if it is a redirected parameterized entity,
-        // use the primary keys of the target
-        const keys = (!e._target.$isParamEntity && e.keys) ||
-          Object.keys(e._target.$keys).map(k => ({ ref: [ k ] }));
-        keys.forEach((k) => {
-          let art = e._target || csnUtils.getCsnDef(e.target);
-          for (const ps of k.ref)
-            art = art.elements[ps];
-
-          // art is in the target side, clone it and remove key property
-          const cloneArt = cloneCsnNonDict(art, options);
-          setProp(cloneArt, 'name', art.name);
-          if (e.key)
-            cloneArt.notNull = true;
-          delete cloneArt.key;
-          newElt.elements[art.name] = cloneArt;
-        });
-        return newElt;
-      }
-
       // create a new element and wire the proxy as new target.
       // Create a new proxy if:
       // 1) source and target schema names are different (otherwise)
@@ -1509,8 +1459,8 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
         }
         else if (alreadyRegistered && !alreadyRegistered.$proxy &&
           alreadyRegistered.kind !== 'entity') {
-          warning('odata-definition-exists', [ 'definitions', proxy.$origin._parent.name, 'elements', proxy.$origin.name ],
-                  { '#': 'proxy', name: fqProxyName, kind: alreadyRegistered.kind });
+          warning('odata-duplicate-proxy', [ 'definitions', proxy.$origin._parent.name, 'elements', proxy.$origin.name ],
+                  { name: fqProxyName, kind: alreadyRegistered.kind });
         }
       }
       else if (!schemas[fqSchemaName]) {
@@ -1639,7 +1589,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
       else if (eltCsn.target && !eltCsn.on) {
         // if this association has no keys or if it is a redirected parameterized entity,
         // use the primary keys of the target
-        const keys = (!eltCsn._target.$isParamEntity && eltCsn.keys) ||
+        const keys = (!eltCsn._target.$isParamEntity && !eltCsn.on && (eltCsn.keys ?? [])) ||
           Object.keys(eltCsn._target.$keys).map(k => ({ ref: [ k ] }));
         let pathSegment = prefix;
         keys.forEach((k) => {
@@ -1668,7 +1618,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
       const eltDef = elt.items || elt;
       if ((!elt.key && (eltDef.notNull === undefined || eltDef.notNull === false)) ||
            elt.key && (eltDef.notNull !== undefined && eltDef.notNull === false)) {
-        message('odata-spec-violation-key-null', location,
+        message('odata-unexpected-nullable-key', location,
                 { name: pathSegment || elt.name, '#': !pathSegment ? 'std' : 'scalar' });
       }
       // many is either directly on elements or on the type
@@ -1682,7 +1632,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
         (options.odataFormat !== 'flat' && !options.odataForeignKeys) &&
          elt.cardinality?.max && elt.cardinality.max !== 1) {
         // many primary key can be induced by a many parameter of a view
-        message('odata-spec-violation-key-array', location,
+        message('odata-unexpected-arrayed-key', location,
                 {
                   name: pathSegment || elt.name,
                   value: cardinality2str(elt),
@@ -1714,7 +1664,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
             'Edm.TimeOfDay': 1,
           };
           if (!(edmType in legalEdmTypes)) {
-            message('odata-spec-violation-key-type', location,
+            message('odata-invalid-key-type', location,
                     {
                       name: pathSegment, type: type.type, id: edmType, '#': pathSegment ? 'std' : 'scalar',
                     });
@@ -2152,9 +2102,11 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
                 edmUtils.assignAnnotation(p, '@Core.OptionalParameter.DefaultValue', p.default.val);
               optPns.push(p);
             }
-            // nullable action params are optional (implicit default null)
-            else if (!p.notNull && action.kind === 'action') {
+            // nullable action/function params are optional (implicit default null)
+            else if (!p.notNull) {
               optPns.push(p);
+              if (action.kind === 'function')
+                p['@Core.OptionalParameter'] = { $Type: '' };
             }
             else if (action.kind === 'function') {
               // this is a mandatory parameter, warn about all previously collected optional parameters

package/lib/edm/edmUtils.js

@@ -344,7 +344,7 @@ function finalizeReferentialConstraints( csn, assocCsn, options, info ) {
         const renderedKeys = Object.values(principalEntity.$keys).filter(isConstraintCandidate).map(v => v.name);
         if (options.isV2() && intersect(renderedKeys, remainingPrincipalRefs).length !== renderedKeys.length) {
           if (options.odataV2PartialConstr) {
-            info('odata-spec-violation-constraints',
+            info('odata-incomplete-constraints',
                  [ 'definitions', assocCsn._parent.name, 'elements', assocCsn.name ], { version: '2.0' });
           }
           else {
@@ -379,7 +379,7 @@ function finalizeReferentialConstraints( csn, assocCsn, options, info ) {
     const renderedKeys = Object.values(assocCsn._target.$keys).filter(isConstraintCandidate).map(v => v.name);
     if (options.isV2() && intersect(renderedKeys, remainingPrincipalRefs).length !== renderedKeys.length) {
       if (options.odataV2PartialConstr) {
-        info('odata-spec-violation-constraints',
+        info('odata-incomplete-constraints',
              [ 'definitions', assocCsn._parent.name, 'elements', assocCsn.name ], { version: '2.0' } );
       }
       else {

package/lib/gen/BaseParser.js

@@ -1,4 +1,4 @@
-// Base class for generated parser, for redepage v0.2.1
+// Base class for generated parser, for redepage v0.2.3
 
 'use strict';
 
@@ -110,7 +110,7 @@ class BaseParser {
 
   e() {                         // error: report and recover
     const la = this.tokens[this.tokenIdx];
-    this._trace( 'detect parsing error,' );
+    this._trace( 'detect parsing error' );
     if (this.errorTokenIdx === this.tokenIdx)
       throw Error( `Already reported error for ${ tokenFullName( la ) } at ${ la.location }`);
 
@@ -134,7 +134,7 @@ class BaseParser {
     this.reportUnexpectedToken_();
     const syncSet = this._calculateTokenSet( 'Y' );
     const recoverDepth = this._findSyncToken( syncSet );
-    this._trace( 'recover from error,' );
+    this._trace( 'recover from error' );
     this._recoverFromError( recoverDepth );
     return false;
   }
@@ -181,7 +181,7 @@ class BaseParser {
     return true;
   }
 
-  // instead of gi() for `Id_all`
+  // instead of gi() for `Id<greedy>`
   giA( state, follow ) { // go to state (after trying to test again as identifier)
     if (!this.tokens[this.tokenIdx].keyword) // lk() had directly returned the type
       return this.g( state, follow );
@@ -200,9 +200,7 @@ class BaseParser {
     return false;               // do not execute action after it
   }
 
-  // instead of gi() at rule end (RuleEnd_ in follow-set) for `Id_restricted`
-  // TODO: investigate why this is just used once - should be for all no-`as`
-  // cases
+  // 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])
@@ -227,14 +225,14 @@ class BaseParser {
       : this.e();
   }
 
-  // instead of m() for identifiers via `Id` or `Id_restricted`
+  // instead of m() for identifiers via `Id` or `Id<weak>`
   mi( state, ident = true ) {   // match identifier token
     return (this.tokens[this.tokenIdx].type === 'Id')
       ? this.ci( state, ident )
       : this.e();
   }
 
-  // instead of mi() for `Id_all`
+  // instead of mi() for `Id<greedy>`
   miA( state, ident = true ) {  // match identifier token
     return (this.tokens[this.tokenIdx].type === 'Id')
       ? this.ciA( state, ident )
@@ -254,7 +252,7 @@ class BaseParser {
     this.s = state;
     this.errorState = state;
     if (this.constructor.tracingParser)
-      this._trace( `consume ${ tokenFullName( la, ' as ' ) },`, la );
+      this._trace( `consume ${ tokenFullName( la, ' as ' ) }`, la );
     return true;
   }
 
@@ -271,7 +269,7 @@ class BaseParser {
     return this.c( state, ident )
   }
 
-  // instead of ci() for `Id_all`, used both with l() and lk()
+  // instead of ci() for `Id<greedy>`, used both with l() and lk()
   ciA( state, ident = 'ident' ) {  // consume identifier token, the "All" variant
     return this.c( state, ident )
   }
@@ -286,7 +284,7 @@ class BaseParser {
     return this.lP( first2 ) && this.ck( state );
   }
 
-  // for parser token or token set via `/`
+  // for parser token or token set via `/` -> cx() ?
   ckA( state ) {
     // if it really should be considered an Id, `set this.la().parsedAs` yourself
     return this.c( state, (this.l() === 'Id' ? 'keyword' : 'token') );
@@ -316,7 +314,7 @@ class BaseParser {
     }
     // calling the condition might have side effects (precendence conditions have)
     // → call tracing “name” before
-    const fail = this[cond]( true, arg );
+    const fail = this[cond]( true, arg ); // TODO: use single-letter for run?
     if (this.constructor.tracingParser)
       this._traceSubPush( !fail );
     // The default case must not have actions. If written in grammar with action,
@@ -379,7 +377,7 @@ class BaseParser {
              : ' prematurely');
       const text = immediately ? '⚠ exit rule' : '⏎ exit rule';
       this.s = caller.followState; // for trace
-      this._trace( [ text, caller.ruleState, post, this.stack.length + 1 ] )
+      this._trace( [ text, caller.ruleState, post, 'back to' ] )
       if (immediately && this.stack.at(-1)?.followState != null)
         this.trace = [ this.errorState ]; // show last good state in trace
     }
@@ -434,13 +432,14 @@ class BaseParser {
     if (typeof cmd[0] !== 'number') // don't skip push to state with rule call
       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?
       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) {
           this._traceSubPush( 0 );  // TODO: make _pred_next push this
-          match1 = this._matchesInFollow( 'Id', lk1, 'I' );
+          match1 = this._matchesInFollow( 'Id', lk1, 'I' ); // TODO: 'I'?
         }
         else {
           this._traceSubPush( false );
@@ -471,7 +470,23 @@ class BaseParser {
 
   // Standard weak-conflict predicate -------------------------------------------
 
+  /**
+   * Return whether current token (its type and keyword are args - TODO delete?)
+   * would be matched when starting at the current state:
+   *  - true/false are definite answers,
+   *  - null: reached end-of-rule (let caller decide what to do).
+   *
+   * Changes by side-effect:
+   *  - this.s
+   *  - with mode='P' (first step in keyword prediction) if a rule is called:
+   *    this.stack, this.dynamic_, this.prec_
+   *
+   * Conditions are only evaluated with mode='M' (expected set in msgs) or if
+   * 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
@@ -496,8 +511,9 @@ class BaseParser {
           return true;
         case 'ciA':             // TODO: fixKeywordTokenIdx ?
           return mode !== 'R';
-          // in the R prediction for optional `Id<reserved>` at rule end, only
+          // in the R prediction for optional `Id<weak>` at rule end, only
           // alternative keyword matches are preferred, not identifier matches
+          // TODO: delete this prediction
         case 'ci':
           if (!keyword ||
               !this.keywords[keyword] && this.fixKeywordTokenIdx !== this.tokenIdx)
@@ -577,7 +593,7 @@ class BaseParser {
     return !succeed;
   }
 
-  _matchesInFollow( type, keyword, mode ) { // mode = E | R
+  _matchesInFollow( type, keyword, mode ) { // mode = E | R and K | I
     // TODO: now also set stack!
     const savedState = this.s;
     // TODO: caching
@@ -588,6 +604,7 @@ class BaseParser {
     while (match == null && --depth) {
       this.dynamic_ = Object.getPrototypeOf( this.dynamic_ );
       this.s = this.stack[depth].followState;
+      // TODO: this.prec_ ?
       match = this._pred_next( type, keyword, mode );
       this._traceSubPush( match == null ? 0 : match === (mode !== 'R') );
       // successfully matching a keyword in giR() means unsuccessful match as
@@ -700,7 +717,7 @@ class BaseParser {
         case 'ci': case 'ciA': case 'mi': case 'miA':
           this.addTokenToSet_( expecting, 'Id', val, false );
           // TODO: should we do s/th special, such that a reserved word is a sync
-          // token for Id<all>?  Probably not, see also comment in
+          // token for Id<greedy>?  Probably not, see also comment in
            // _findSyncToken()
           break loop;
         case 'g': case 'gi': case 'e':
@@ -747,7 +764,7 @@ class BaseParser {
     else if (set[type] === true && !(keyword && this.keywords[keyword]))
       delete set[type];         // delete Id if Id token or non-reserved keyword
 
-    this._trace( 'collect tokens for message,' );
+    this._trace( 'collect tokens for message' );
     const { trace } = this;
     const saved = this._saveForWalk();
     const expecting = Object.keys( set )
@@ -765,16 +782,18 @@ class BaseParser {
     this.recoverTokenIdx = this.tokenIdx;
     while (this.recoverTokenIdx <= this.eofIndex) {
       const { keyword, type } = this.tokens[this.recoverTokenIdx];
-      const tryKeyw = keyword ? syncSet[keyword] : null;
-      if (tryKeyw != null)
-        return tryKeyw;
-      const tryType = syncSet[type];
+      let recoverDepth = keyword ? syncSet[keyword] : null;
+      if (recoverDepth != null)
+        return recoverDepth;
+      recoverDepth = syncSet[type];
       // sync to Id only if in expected set of last good state or if after ';'
-      if (tryType != null &&
+      if (recoverDepth != null &&
           (type !== 'Id' || (!keyword || !this.keywords[keyword]) &&
            // reserved words do not match Id in expected-set
-           (tryType > rewindDepth || this.tokens[this.recoverTokenIdx - 1].type === ';')))
-        return tryType;
+           (recoverDepth > rewindDepth || this.tokens[this.recoverTokenIdx - 1].type === ';')))
+        // if (recoverDepth != null &&
+        //     (this.recoverTokenIdx > this.tokenIdx || 
+        return recoverDepth;
       ++this.recoverTokenIdx;
     }
     throw Error( 'EOF must be last in `tokens`' );
@@ -809,7 +828,7 @@ class BaseParser {
 
   _skipErrorTokens() {
     if (this.constructor.tracingParser && this.tokenIdx <= this.recoverTokenIdx) {
-      this._trace( `skipped ${ this.recoverTokenIdx - this.tokenIdx } tokens to recover from error,`,
+      this._trace( `skip ${ this.recoverTokenIdx - this.tokenIdx } tokens to recover from error`,
                    this.tokens[this.recoverTokenIdx] );
       }
     while (this.tokenIdx < this.recoverTokenIdx)
@@ -832,7 +851,7 @@ class BaseParser {
     msg ??= `Unexpected token ${ tokenFullName( token, ': ' ) }`;
     this.reportError_(
       token.location, msg + ' - expecting: ' +
-        this.expectingArray_().map( tokenName ).sort().join( ',' ) );
+        this.expectingArray_().map( tokenName ).sort().join( ', ' ) );
   }
 
   reportReservedWord_() {
@@ -875,7 +894,7 @@ class BaseParser {
       this.log( indent, line, `(${ la })` );
       return;
     }
-    else if (la === 2) {
+    else if (la === 2) {        // confirming tokens in expected set
       this.log( indent, '          ', msg + ':',
                 this.trace.map( traceStep ).join( ' → ' ) );
       this.trace = [ this.s ?? '⚠' ];
@@ -887,31 +906,23 @@ class BaseParser {
       this.trace = [ -1 ];
     }
     this.trace.push( this.s ?? '⚠' );
-    if (Array.isArray( msg )) {
-      const [ intro, state, finale, exitLength ] = msg;
-      let depth = (exitLength) ? exitLength - 1 : this.stack.length + 1;
-      let length = this.trace.length - 1;
-      this.trace[length] = `${ this.trace[length] }(${ depth })`;
-      depth = exitLength || this.stack.length;
-      while (length && typeof this.trace[--length] !== 'number')
-        ;
-      this.trace[length] = `${ this.trace[length] }(${ depth })`;
-
+    if (Array.isArray( msg )) { // rule call and exit
+      const [ intro, state, finale, exit ] = msg;
       let start = state;
       while (typeof this.table[--start] !== 'string')
         ;
-      const post = (exitLength || start + 1 < state) && finale;
-      msg = `${ intro } “${ this.table[start] }”${ post || '' },`;
+      const post = (exit || start + 1 < state) && finale;
+      msg = `${ intro } “${ this.table[start] }”${ post || '' } ${ exit || 'from' } stack level ${ this.stack.length }`;
     }
     // Yes, I know util.format, but do not want to have a `require` in this file
     const line = location.line < 1e5 ? `    ${ location.line }`.slice(-5) : `${ location.line }`;
     const col = location.col < 1e4 ? `:${ location.col }   `.slice(0,5) : `:${location.col }`;
-    this.log( line + col + indent + msg,
-              'states:', this.trace.map( traceStep ).join( ' → ' ) );
+    this.log( line + col + indent + msg + ', states:',
+              this.trace.map( traceStep ).join( ' → ' ) );
     this.trace = [ this.s ?? '⚠' ];
   }
 
-  inSameRule_( lowState, highState ) {
+  inSameRule_( lowState = this.s, highState = this.stack.at(-1).followState ) {
     if (lowState > highState)
       [ lowState, highState ] = [ highState, lowState ];
     while (lowState < highState) {

package/lib/gen/CdlGrammar.checksum

@@ -1 +1 @@
-226c8854e08665b3eaae3ae1a1276db7
+539f33c85849442e96168a85adec09fb