@sap/cds-compiler 6.1.0 → 6.3.0

package/lib/gen/BaseParser.js

@@ -1,4 +1,4 @@
-// Base class for generated parser, for redepage v0.2.5
+// Base class for generated parser, for redepage v0.3.0
 
 '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_         // TODO: necessary?
+      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
@@ -762,12 +765,13 @@ 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
@@ -780,7 +784,7 @@ class BaseParser {
   _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 @@
-7cfe4871a952fbc999cd1e8b06300f7f
+1f3bba2acb882f5120a55a01eb9a7bdc