@abaplint/core 2.119.58 → 2.119.59

package/build/abaplint.d.ts

@@ -1251,6 +1251,7 @@ declare class ClassDefinition_3 extends Identifier implements IClassDefinition {
     getCreateVisibility(): Visibility;
     private findSuper;
     private checkMethodNameLength;
+    private checkClassConstructorStatic;
     private checkMethodsFromSuperClasses;
     private findFriends;
     private addReference;
@@ -2430,9 +2431,11 @@ declare abstract class Expression implements IStatementRunnable {
 
 declare class ExpressionNode extends AbstractNode<ExpressionNode | TokenNode> {
     private readonly expression;
+    private tokenCount;
     constructor(expression: IStatementRunnable);
     addChild(_n: ExpressionNode | TokenNode): void;
     get(): IStatementRunnable;
+    setChildren(children: (ExpressionNode | TokenNode)[]): ExpressionNode;
     countTokens(): number;
     getFirstToken(): Token;
     concatTokensWithLinebreaks(): string;

package/build/src/abap/2_statements/statement_parser.js

@@ -46,6 +46,7 @@ const expand_macros_1 = require("./expand_macros");
 const tokens_1 = require("../1_lexer/tokens");
 const _select_reclassify_1 = require("./_select_reclassify");
 exports.STATEMENT_MAX_TOKENS = 20000;
+const EMPTY_PRAGMAS = Object.freeze([]);
 class StatementMap {
     constructor() {
         this.map = {};
@@ -244,9 +245,19 @@ class StatementParser {
         return statement;
     }
     removePragma(tokens) {
+        let hasPragma = false;
+        // skip the last token as it is the punctuation
+        for (let i = 0; i < tokens.length - 1; i++) {
+            if (tokens[i] instanceof Tokens.Pragma) {
+                hasPragma = true;
+                break;
+            }
+        }
+        if (hasPragma === false) {
+            return { tokens: tokens.slice(0, tokens.length - 1), pragmas: EMPTY_PRAGMAS };
+        }
         const result = [];
         const pragmas = [];
-        // skip the last token as it is the punctuation
         for (let i = 0; i < tokens.length - 1; i++) {
             const t = tokens[i];
             if (t instanceof Tokens.Pragma) {

package/build/src/abap/nodes/expression_node.js

@@ -7,6 +7,7 @@ const _abstract_node_1 = require("./_abstract_node");
 class ExpressionNode extends _abstract_node_1.AbstractNode {
     constructor(expression) {
         super();
+        this.tokenCount = 0;
         this.expression = expression;
     }
     addChild(_n) {
@@ -15,12 +16,15 @@ class ExpressionNode extends _abstract_node_1.AbstractNode {
     get() {
         return this.expression;
     }
-    countTokens() {
-        let ret = 0;
-        for (const c of this.getChildren()) {
-            ret = ret + c.countTokens();
+    setChildren(children) {
+        super.setChildren(children);
+        for (const child of this.getChildren()) {
+            this.tokenCount = this.tokenCount + child.countTokens();
         }
-        return ret;
+        return this;
+    }
+    countTokens() {
+        return this.tokenCount;
     }
     getFirstToken() {
         for (const child of this.getChildren()) {

package/build/src/abap/types/class_definition.js

@@ -97,6 +97,7 @@ class ClassDefinition extends _identifier_1.Identifier {
         // perform checks after everything has been initialized
         this.checkMethodsFromSuperClasses(input);
         this.checkMethodNameLength(input);
+        this.checkClassConstructorStatic(input);
     }
     getFriends() {
         return this.friends;
@@ -160,6 +161,13 @@ class ClassDefinition extends _identifier_1.Identifier {
             }
         }
     }
+    checkClassConstructorStatic(input) {
+        for (const m of this.methodDefs.getAll()) {
+            if (m.getName().toUpperCase() === "CLASS_CONSTRUCTOR" && m.isStatic() === false) {
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, m.getToken(), "CLASS_CONSTRUCTOR must be static"));
+            }
+        }
+    }
     checkMethodsFromSuperClasses(input) {
         var _a;
         const scope = input.scope;

package/build/src/cds/expressions/cds_define_table_function.js

@@ -7,7 +7,7 @@ const cds_name_1 = require("./cds_name");
 class CDSDefineTableFunction extends combi_1.Expression {
     getRunnable() {
         const methodName = (0, combi_1.seq)(cds_name_1.CDSName, "=", ">", cds_name_1.CDSName);
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE TABLE FUNCTION"), cds_name_1.CDSName, (0, combi_1.optPrio)(_1.CDSWithParameters), (0, combi_1.str)("RETURNS {"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), cds_name_1.CDSName, ":", _1.CDSType, ";")), (0, combi_1.str)("} IMPLEMENTED BY METHOD"), methodName, (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("DEFINE TABLE FUNCTION"), cds_name_1.CDSName, (0, combi_1.optPrio)(_1.CDSWithParameters), (0, combi_1.str)("RETURNS {"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), cds_name_1.CDSName, ":", _1.CDSType, (0, combi_1.star)(_1.CDSAnnotation), ";")), (0, combi_1.str)("} IMPLEMENTED BY METHOD"), methodName, (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineTableFunction = CDSDefineTableFunction;

package/build/src/cds/expressions/cds_element.js

@@ -18,7 +18,7 @@ class CDSElement extends combi_1.Expression {
         const funcWithPath = (0, combi_1.seq)(_1.CDSFunction, (0, combi_1.plusPrio)(pathSegment));
         const body = (0, combi_1.altPrio)(extensionWildcard, includeElement, _1.CDSArithmetics, _1.CDSAggregate, _1.CDSString, _1.CDSArithParen, funcWithPath, _1.CDSFunction, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)("(", _1.CDSCase, ")"), (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.optPrio)(cds_as_1.CDSAs), (0, combi_1.optPrio)((0, combi_1.altPrio)(redirected, colonThing))), _1.CDSInteger);
         const elementBody = (0, combi_1.altPrio)(typedVirtual, (0, combi_1.seq)((0, combi_1.altPrio)("KEY", "VIRTUAL"), body), body);
-        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), elementBody, (0, combi_1.optPrio)(cds_as_1.CDSAs));
+        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), elementBody, (0, combi_1.optPrio)(cds_as_1.CDSAs), (0, combi_1.starPrio)(_1.CDSAnnotation));
     }
 }
 exports.CDSElement = CDSElement;

package/build/src/cds/expressions/cds_name.js

@@ -5,7 +5,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSName extends combi_1.Expression {
     getRunnable() {
         const pre = (0, combi_1.seq)("/", (0, combi_1.regex)(/^[\w_]+$/), "/");
-        return (0, combi_1.seq)((0, combi_1.optPrio)(":"), (0, combi_1.optPrio)(pre), (0, combi_1.regex)(/^\$?#?[\w_]+$/));
+        return (0, combi_1.altPrio)((0, combi_1.regex)(/^"(?:[^"]|"")*"$/), (0, combi_1.seq)((0, combi_1.optPrio)(":"), (0, combi_1.optPrio)(pre), (0, combi_1.regex)(/^\$?#?[\w_]+$/)));
     }
 }
 exports.CDSName = CDSName;

package/build/src/cds/expressions/cds_string.js

@@ -4,7 +4,7 @@ exports.CDSString = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSString extends combi_1.Expression {
     getRunnable() {
-        const reg = (0, combi_1.regex)(/^(?:'(?:[^'\\]|''|\\'|\\\\|\\(?!'))*'|"(?:[^"\\]|""|\\"|\\\\|\\(?!"))*")$/);
+        const reg = (0, combi_1.regex)(/^'(?:[^'\\]|''|\\'|\\\\|\\(?!'))*'$/);
         const abapTypeName = (0, combi_1.regex)(/^(?:int[1-9]|int8|sstring|sstr|char|numc|dats|datn|tims|timn|utcl|utclong|fltp|decfloat\d+|dec|string|rawstring|rstr|raw|xstring|clnt|lang|unit|cuky|curr|quan|geom_ewkb|d34n|d16n|d34d|d16d|d34s|d16s|d34r|d16r|d|t|p|n|c|x|f)$/i);
         const abap = (0, combi_1.seq)("abap", ".", abapTypeName, (0, combi_1.optPrio)((0, combi_1.seq)("(", (0, combi_1.regex)(/^\d+$/), ")")), reg);
         return (0, combi_1.altPrio)(abap, reg);

package/build/src/registry.js

@@ -75,7 +75,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.58";
+        return "2.119.59";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.119.58",
+    "version": "2.119.59",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",