@sap/cds-compiler 2.4.4 → 2.10.2

package/lib/language/antlrParser.js

@@ -10,7 +10,7 @@
 
 const antlr4 = require('antlr4');
 
-const { makeMessageFunction, CompileMessage } = require('../base/messages');
+const { CompileMessage } = require('../base/messages');
 const errorStrategy = require('./errorStrategy');
 
 const Parser = require('../gen/languageParser').languageParser;
@@ -112,7 +112,7 @@ const rules = {
   expr: { func: 'conditionEOF', returns: 'cond' }, // yes, condition
 };
 
-function parse( source, filename = '<undefined>.cds', options = {}, rule = 'cdl' ) {
+function parse( source, filename = '<undefined>.cds', options = {}, messageFunctions, rule = 'cdl' ) {
   const lexer = new Lexer( new antlr4.InputStream(source) );
   const tokenStream = new RewriteTypeTokenStream(lexer);
   /** @type {object} */
@@ -121,7 +121,7 @@ function parse( source, filename = '<undefined>.cds', options = {}, rule = 'cdl'
 
   parser.filename = filename;
   parser.options = options;
-  parser.$message = makeMessageFunction( parser, options, 'parse' ); // sets parser.messages
+  parser.$messageFunctions = messageFunctions;
 
   initTokenRewrite( parser, tokenStream );
   // comment the following 2 lines if you want to output the parser errors directly:
@@ -162,6 +162,7 @@ function parse( source, filename = '<undefined>.cds', options = {}, rule = 'cdl'
   if (rulespec.$frontend)
     ast.$frontend = rulespec.$frontend;
 
+  // TODO: clarify with LSP colleagues: still necessary?
   if (parser.messages) {
     Object.defineProperty( ast, 'messages',
                            { value: parser.messages, configurable: true, writable: true } );

package/lib/language/errorStrategy.js

@@ -245,6 +245,7 @@ function reportIgnoredWith( recognizer, t ) {
 }
 
 function consumeUntil( recognizer, set ) {
+  // TODO: add trace
   if (SEMI == null)
     SEMI = recognizer.literalNames.indexOf( "';'" );
   if (RBRACE == null)

package/lib/language/genericAntlrParser.js

@@ -13,6 +13,14 @@ const locUtils = require('../base/location');
 const { parseDocComment } = require('./docCommentParser');
 const { functionsWithoutParens, specialFunctions } = require('../compiler/builtins');
 
+
+// Push message `msg` with location `loc` to array of errors:
+function _message( parser, severity, id, loc, ...args ) {
+  const msg = parser.$messageFunctions[severity]; // set in antlrParser.js
+  return msg( id,
+              (loc instanceof antlr4.CommonToken) ? parser.tokenLocation(loc) : loc, ...args );
+}
+
 // Class which is to be used as grammar option with
 //   grammar <name> options { superclass = genericAntlrParser; }
 //
@@ -34,10 +42,10 @@ function GenericAntlrParser( ...args ) {
 
 GenericAntlrParser.prototype = Object.assign(
   Object.create( antlr4.Parser.prototype ), {
-    message: function(...args) { return message.call(this, 'message', ...args); },
-    error: function(...args) { return message.call(this, 'error', ...args); },
-    warning: function(...args) { return message.call(this, 'warning', ...args); },
-    info: function(...args) { return message.call(this, 'info', ...args); },
+    message: function(...args) { return _message( this, 'message', ...args ); },
+    error: function(...args) { return _message( this, 'error', ...args ); },
+    warning: function(...args) { return _message( this, 'warning', ...args ); },
+    info: function(...args) { return _message( this, 'info', ...args ); },
     attachLocation,
     startLocation,
     tokenLocation,
@@ -69,6 +77,7 @@ GenericAntlrParser.prototype = Object.assign(
     noAssignmentInSameLine,
     noSemicolonHere,
     setLocalToken,
+    setLocalTokenIfBefore,
     excludeExpected,
     isStraightBefore,
     meltKeywordToIdentifier,
@@ -110,14 +119,6 @@ const quotedLiteralPatterns = {
   },
 };
 
-
-// Push message `msg` with location `loc` to array of errors:
-function message( severity, id, loc, ...args ) {
-  const msg = this.$message[severity];
-  return msg( id,   // function $message is set in antlrParser.js
-              (loc instanceof antlr4.CommonToken) ? this.tokenLocation(loc) : loc, ...args );
-}
-
 // Use the following function for language constructs which we (currently)
 // just being able to parse, in able to run tests from HANA CDS.  As soon as we
 // create ASTs for the language construct and put it into a CSN, a
@@ -183,6 +184,14 @@ function setLocalToken( string, tokenName, notBefore, inSameLine ) {
     ll1.type = this.constructor[tokenName];
 }
 
+function setLocalTokenIfBefore( string, tokenName, before, inSameLine ) {
+  const ll1 = this.getCurrentToken();
+  if (ll1.text.toUpperCase() === string &&
+      (!inSameLine || this._input.LT(-1).line === ll1.line) &&
+      (!before || before && before.test( this._input.LT(2).text )))
+    ll1.type = this.constructor[tokenName];
+}
+
 // // Special function for rule `requiredSemi` before return $ctx
 // function braceForSemi() {
 //   if (RBRACE == null)
@@ -305,7 +314,7 @@ function combinedLocation( start, end ) {
   return locUtils.combinedLocation( start, end );
 }
 
-function surroundByParens( expr, open, close ) {
+function surroundByParens( expr, open, close, asQuery = false ) {
   if (!expr)
     return expr;
   const location = this.tokenLocation( open, close );
@@ -313,7 +322,7 @@ function surroundByParens( expr, open, close ) {
     expr.$parens.push( location );
   else
     expr.$parens = [ location ];
-  return expr;
+  return (asQuery) ? { query: expr, location } : expr;
 }
 
 function unaryOpForParens( query, val ) {
@@ -362,6 +371,7 @@ function fragileAlias( ast, safe = false ) {
   else                          // configurable error
     this.message( 'syntax-fragile-alias', ast.location, { keyword: 'as' },
                   'Please add the keyword $(KEYWORD) in front of the alias name' );
+  return ast;
 }
 
 // Return AST for identifier token `token`.  Also check that identifer is not empty.