@sap/cds-compiler 6.7.3 → 6.9.0

package/lib/gen/BaseParser.js

@@ -1,4 +1,4 @@
-//Base class for generated parser, for redepage v0.3.2
+// Base class for generated parser, for redepage v0.4.0
 
 'use strict';
 
@@ -24,7 +24,6 @@ recoverTokenIdx = -1;
 reuseErrorTokenIdx = null;
 fixKeywordTokenIdx = -1;
 conditionStackLength = -1;
-nextTokenAsId = false;
 
 s = null;
 errorState = null;
@@ -32,7 +31,7 @@ stack = [];
 dynamic_ = {};
 prec_ = null;
 $hasErrors = null;
-leanConditions = {};
+hardGuards = {};
 _trace = [];
 
 constructor( lexer, keywords, table ) {
@@ -103,22 +102,30 @@ return this.tokens[this.stack[this.stack.length - 1].tokenIdx];
 
 
 
-l() {
+lt() {
 return this.la().type;
 }
 
 
 lk() {
 const la = this.la();
-if (!this.nextTokenAsId)
 return la.keyword || la.type;
+}
 
-this.nextTokenAsId = false;
-return la.type;
+l() {
+let cmd = this.table[this.s];
+let { keyword, type } = this.la();
+const kb = keyword && cmd[keyword];
+if (Array.isArray( kb ) &&
+(!kb[2] || this.fixKeywordTokenIdx === this.tokenIdx || this._predictKeyword( kb[2] )))
+return (kb[3] && this._rejectCond( kb[3], kb[4] )) ? '' : keyword;
+const tb = cmd[type];
+return (!tb || tb[3] && this._rejectCond( tb[3], tb[4] )) ? '' : type;
 }
 
 e() {
 const la = this.la();
+this.s = null;
 
 if (this.errorTokenIdx === this.tokenIdx &&
 (this.reuseErrorTokenIdx == null && this.reuseErrorTokenIdx < this.tokenIdx))
@@ -140,21 +147,11 @@ return false;
 }
 
 
-ei() {
-if (!this.la().keyword)
-return this.e();
-this.nextTokenAsId = true;
-return false;
-}
-
-
 
 
 gr( follow ) {
-if (this.stack[this.stack.length - 1].tokenIdx === this.tokenIdx)
-
-return this.e();
-this.s = 0;
+if (!this.g( 0 ))
+return false;
 
 
 const { type, keyword } = this.tokens[this.tokenIdx];
@@ -172,35 +169,11 @@ return (match ?? true) || this.e();
 }
 
 
-g( state, follow ) {
-if (!(state == null ? this.e() : state || this.gr( follow )))
-return false;
+g( state ) {
 this.s = state;
-return true
-}
-
-
-giA( state, follow ) {
-if (!this.tokens[this.tokenIdx].keyword)
-return this.g( state, follow );
-this.nextTokenAsId = true;
-return false;
-}
-
-
-gi( state, follow ) {
-const lk = this.tokens[this.tokenIdx].keyword;
-
-
-if (!lk || this.keywords[lk])
-return this.g( state, follow );
-this.nextTokenAsId = true;
-return false;
-}
-
-
-gP( state, follow ) {
-return this.lP( follow ) && this.g( state );
+return (state || this.stack[this.stack.length - 1].tokenIdx < this.tokenIdx)
+? true
+: this.e();
 }
 
 
@@ -219,9 +192,9 @@ return (this.tokens[this.tokenIdx].type === 'Id')
 }
 
 
-miA( state, ident = true ) {
+my( state, ident = true ) {
 return (this.tokens[this.tokenIdx].type === 'Id')
-? this.ciA( state, ident )
+? this.cy( state, ident )
 : this.e();
 }
 
@@ -247,7 +220,7 @@ return this.e();
 const la = this.tokens[this.tokenIdx];
 
 
-if (this.keywords[la.keyword]) {
+if (this.keywords[la.keyword] && this.errorTokenIdx !== this.tokenIdx) {
 
 if (this._runTransparently( () => {
 ++this.tokenIdx;
@@ -264,7 +237,7 @@ return this.c( state, ident )
 }
 
 
-ciA( state, ident = 'ident' ) {
+cy( state, ident = 'ident' ) {
 return this.c( state, ident )
 }
 
@@ -274,12 +247,7 @@ return this.c( state, 'keyword' )
 }
 
 
-ckP( state, first2 ) {
-return this.lP( first2 ) && this.ck( state );
-}
-
-
-ckA( state ) {
+cx( state ) {
 
 return this.c( state, (this.l() === 'Id' ? 'keyword' : 'token') );
 }
@@ -295,15 +263,11 @@ reuseToken_() {
 
 
 
-
-
-
-
-gc( state, cond, arg ) {
+_rejectCond( cond, arg ) {
 if (this.conditionTokenIdx === this.tokenIdx &&
 this.conditionStackLength == null &&
 !this[cond].afterError)
-return true
+return false
 
 
 
@@ -314,7 +278,8 @@ const fail = this[cond]( arg, true );
 
 
 
-if (fail) {
+if (!fail)
+return false;
 
 
 
@@ -326,17 +291,13 @@ const { keyword } = this.la();
 if (keyword && this.table[this.s][keyword])
 this.fixKeywordTokenIdx = this.tokenIdx;
 this.conditionTokenIdx = this.tokenIdx;
+
 this.conditionStackLength = this.stack.length;
 this.conditionName = cond;
 
 
 this.conditionFailure = fail;
-}
-return !fail || this.g( state ) && false;
-}
-
-ec( cond, arg ) {
-return this.gc( null, cond, arg );
+return true;
 }
 
 
@@ -370,18 +331,7 @@ throw Error( `this.s === ${ this.s }; illegally set by action, or runtime/genera
 this.dynamic_ = Object.getPrototypeOf( this.dynamic_ );
 const caller = this.stack.pop();
 const immediately = this.tokenIdx === caller.tokenIdx && this.tokenIdx >= this.errorTokenIdx;
-if (this.constructor.tracingParser) {
-const post = this.s == null &&
-(immediately
-? ' immediately'
-: caller.followState == null
-? ' unsuccessfully'
-: ' prematurely');
-const text = immediately ? '⚠ exit rule' : '⏎ exit rule';
-this.s = caller.followState;
-
 
-}
 this.prec_ = caller.prec;
 this.s = caller.followState;
 if (immediately)
@@ -393,13 +343,10 @@ return true;
 }
 
 
+_predictKeyword( first2 ) {
 
-
-
-lP( first2 ) {
-
-const { keyword: lk1 } = this.tokens[this.tokenIdx];
-if (!lk1 || this.keywords[lk1] !== 0 || this.fixKeywordTokenIdx === this.tokenIdx)
+const { keyword: lk1 } = this.la();
+if (this.keywords[lk1] !== 0)
 return true;
 
 
@@ -415,10 +362,7 @@ if (this._walkPred( this.table[this.s][lk1], lk1, lt2, lk2 ))
 return true;
 
 const choice = this.table[this.s];
-if (!this._walkPred( choice.Id || choice[''], null, lt2, lk2 ))
-return true;
-this.nextTokenAsId = true;
-return false;
+return !this._walkPred( choice.Id || choice[''], null, lt2, lk2 );
 }
 
 _walkPred( cmd, lk1, lt2, lk2 ) {
@@ -494,9 +438,9 @@ cmd = !(c && this._rejectCondition( c, mode, lean )) && c || cmd[''];
 const state = this.s;
 this.s = cmd[1];
 switch (cmd[0]) {
-case 'c': case 'ck': case 'ckA':
+case 'c': case 'ck': case 'cx':
 return true;
-case 'ciA':
+case 'cy':
 return mode !== 'F';
 
 
@@ -505,6 +449,8 @@ case 'ci':
 if (!keyword ||
 !this.keywords[keyword] && this.fixKeywordTokenIdx !== this.tokenIdx)
 return mode !== 'F';
+
+
 cmd = this.table[state][''];
 this.s = cmd[1];
 break;
@@ -514,7 +460,7 @@ case 'mi':
 return type === 'Id' && mode !== 'F' &&
 (!keyword ||
 !this.keywords[keyword] && this.fixKeywordTokenIdx !== this.tokenIdx);
-case 'miA':
+case 'my':
 return type === 'Id' && mode !== 'F';
 case 'mk':
 return keyword === cmd[2];
@@ -564,7 +510,7 @@ return (hasMatchedToken ?? this.tokenIdx > this.stack.at( -1 ).tokenIdx)
 
 _rejectCondition( cmd, mode, lean ) {
 const cond = cmd[3];
-if (!cond || lean && !this.leanConditions[cond])
+if (!cond || lean && !this.hardGuards[cond])
 return false;
 if (!this.constructor.tracingParser)
 return !!this[cond]( cmd[4], mode );
@@ -591,9 +537,6 @@ this.s = this.stack[depth].followState;
 
 match = this._pred_next( type, keyword, mode );
 
-
-
-
 }
 this.dynamic_ = dynamic_;
 this.s = savedState;
@@ -671,12 +614,16 @@ cmd ??= this.table[this.s];
 if (!Array.isArray( cmd )) {
 const lookahead = cmd[' lookahead'];
 const dict = cmd;
+cmd = dict[''];
 for (const prop in dict) {
 if (prop && Object.hasOwn( dict, prop ) && prop !== 'Id' &&
-!Object.hasOwn( expecting, prop ) && prop.charAt(0) !== ' ')
+!Object.hasOwn( expecting, prop ) && prop.charAt(0) !== ' ') {
+
+const ad = dict[prop];
+if (ad[1] !== cmd[1] || ad[0] !== 'g')
 this.addTokenToSet_( expecting, prop, val, collectKeywordsAndIdOnly, lookahead );
 }
-cmd = dict[''];
+}
 if (dict.Id) {
 
 if (cmd[0] === 'e') {
@@ -695,13 +642,13 @@ switch (cmd[0]) {
 case 'm': case 'mk':
 this.addTokenToSet_( expecting, cmd[2], val, collectKeywordsAndIdOnly );
 break loop;
-case 'ci': case 'ciA': case 'mi': case 'miA':
+case 'ci': case 'cy': case 'mi': case 'my':
 this.addTokenToSet_( expecting, 'Id', val, false );
 
 
 
 break loop;
-case 'g': case 'gi': case 'e':
+case 'g': case 'e':
 break;
 default:
 if (typeof cmd[0] !== 'number')
@@ -925,17 +872,21 @@ return table;
 for (const line of table) {
 if (typeof line !== 'object' || Array.isArray( line ))
 continue;
-const cache = Object.create( null );
-for (const prop of Object.keys( line )) {
-const alt = line[prop];
-if (!Array.isArray( alt ) && prop.charAt(0) !== ' ')
-line[prop] = (typeof alt === 'string') ? line[alt] : (cache[alt] ??= [ 'g', alt ]);
-}
+for (const prop of Object.keys( line ))
+compileTableItem( line, prop );
 if (!line[''])
 line[''] = [ 'e' ];
 }
 table.$compiled = true;
 return table;
 }
+function compileTableItem( line, prop ) {
+const alt = line[prop];
+if (typeof alt === 'number')
+return line[prop] = [ 'g', alt ];
+else if (typeof alt === 'string' && prop.charAt(0) !== ' ')
+return line[prop] = compileTableItem( line, alt );
+return alt;
+}
 BaseParser.prototype.isNoKeywordInRuleFollow.afterError = true;
 module.exports = BaseParser;

package/lib/gen/CdlGrammar.checksum

@@ -1 +1 @@
-f0320d5264a6107c245a82427b4f6338
+43e8ba55fd2a4f645dcbc0928d83528b