@abaplint/cli 2.119.57 → 2.119.59

package/build/cli.js

@@ -11174,6 +11174,7 @@ const expand_macros_1 = __webpack_require__(/*! ./expand_macros */ "../core/buil
 const tokens_1 = __webpack_require__(/*! ../1_lexer/tokens */ "../core/build/src/abap/1_lexer/tokens/index.js");
 const _select_reclassify_1 = __webpack_require__(/*! ./_select_reclassify */ "../core/build/src/abap/2_statements/_select_reclassify.js");
 exports.STATEMENT_MAX_TOKENS = 20000;
+const EMPTY_PRAGMAS = Object.freeze([]);
 class StatementMap {
     constructor() {
         this.map = {};
@@ -11372,9 +11373,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) {
@@ -24748,16 +24759,20 @@ class BuiltIn {
         return def.predicate;
     }
     getTypes() {
-        const ret = this.buildSY();
-        {
-            const id = new tokens_1.Identifier(new position_1.Position(1, 1), "abap_bool");
-            ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, new basic_1.CharacterType(1, { qualifiedName: "ABAP_BOOL", ddicName: "ABAP_BOOL" })));
-        }
-        {
-            const id = new tokens_1.Identifier(new position_1.Position(1, 1), "cursor");
-            ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, basic_1.IntegerType.get({ qualifiedName: "CURSOR", ddicName: "CURSOR" })));
+        // the identifiers are identical for every object, share them to reduce memory usage
+        if (BuiltIn.typesCache === undefined) {
+            const ret = this.buildSY();
+            {
+                const id = new tokens_1.Identifier(new position_1.Position(1, 1), "abap_bool");
+                ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, new basic_1.CharacterType(1, { qualifiedName: "ABAP_BOOL", ddicName: "ABAP_BOOL" })));
+            }
+            {
+                const id = new tokens_1.Identifier(new position_1.Position(1, 1), "cursor");
+                ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, basic_1.IntegerType.get({ qualifiedName: "CURSOR", ddicName: "CURSOR" })));
+            }
+            BuiltIn.typesCache = ret;
         }
-        return ret;
+        return BuiltIn.typesCache;
     }
     get(extras) {
         const ret = [];
@@ -24790,10 +24805,17 @@ class BuiltIn {
             BuiltIn.getCache.push(this.buildConstant("space", new basic_1.CharacterType(1, { derivedFromConstant: true }), "' '"));
         }
         ret.push(...BuiltIn.getCache);
-        for (const e of extras) {
-            const id = new tokens_1.Identifier(new position_1.Position(this.row++, 1), e);
-            ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, basic_1.VoidType.get(e), ["read_only" /* IdentifierMeta.ReadOnly */, "built-in" /* IdentifierMeta.BuiltIn */], "'?'"));
+        // the extras are identical for every object, share them to reduce memory usage
+        const key = extras.join("|");
+        if (key !== BuiltIn.extrasCacheKey) {
+            BuiltIn.extrasCacheKey = key;
+            BuiltIn.extrasCache = [];
+            for (const e of extras) {
+                const id = new tokens_1.Identifier(new position_1.Position(this.row++, 1), e);
+                BuiltIn.extrasCache.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, basic_1.VoidType.get(e), ["read_only" /* IdentifierMeta.ReadOnly */, "built-in" /* IdentifierMeta.BuiltIn */], "'?'"));
+            }
         }
+        ret.push(...BuiltIn.extrasCache);
         return ret;
     }
     /////////////////////////////
@@ -25002,6 +25024,9 @@ exports.BuiltIn = BuiltIn;
 BuiltIn.filename = "_builtin.prog.abap";
 BuiltIn.counter = 1;
 BuiltIn.getCache = [];
+BuiltIn.typesCache = undefined;
+BuiltIn.extrasCacheKey = undefined;
+BuiltIn.extrasCache = [];
 // todo: "pcre" vs "regex", only one of these parameters are allowed
 // todo: "pcre", only possible from 755
 BuiltIn.methods = {
@@ -47867,15 +47892,21 @@ exports.CrossIncludeMacros = CrossIncludeMacros;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AbstractNode = void 0;
+// shared constant, so nodes without children don't waste memory on empty arrays
+const EMPTY = Object.freeze([]);
 class AbstractNode {
     constructor() {
-        this.children = [];
+        this.children = EMPTY;
     }
     addChild(n) {
+        if (this.children === EMPTY) {
+            this.children = [];
+        }
         this.children.push(n);
     }
     setChildren(children) {
-        this.children = children;
+        // copy, input arrays are built via push() and carry over-allocated backing stores
+        this.children = children.slice();
     }
     getChildren() {
         return this.children;
@@ -47908,6 +47939,7 @@ const _abstract_node_1 = __webpack_require__(/*! ./_abstract_node */ "../core/bu
 class ExpressionNode extends _abstract_node_1.AbstractNode {
     constructor(expression) {
         super();
+        this.tokenCount = 0;
         this.expression = expression;
     }
     addChild(_n) {
@@ -47916,12 +47948,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()) {
@@ -48231,17 +48266,13 @@ const string_template_middle_1 = __webpack_require__(/*! ../1_lexer/tokens/strin
 const string_template_end_1 = __webpack_require__(/*! ../1_lexer/tokens/string_template_end */ "../core/build/src/abap/1_lexer/tokens/string_template_end.js");
 const string_template_begin_1 = __webpack_require__(/*! ../1_lexer/tokens/string_template_begin */ "../core/build/src/abap/1_lexer/tokens/string_template_begin.js");
 const string_template_1 = __webpack_require__(/*! ../1_lexer/tokens/string_template */ "../core/build/src/abap/1_lexer/tokens/string_template.js");
+const EMPTY_PRAGMAS = Object.freeze([]);
 class StatementNode extends _abstract_node_1.AbstractNode {
     constructor(statement, colon, pragmas) {
         super();
         this.statement = statement;
         this.colon = colon;
-        if (pragmas) {
-            this.pragmas = pragmas;
-        }
-        else {
-            this.pragmas = [];
-        }
+        this.pragmas = pragmas !== null && pragmas !== void 0 ? pragmas : EMPTY_PRAGMAS;
     }
     get() {
         return this.statement;
@@ -48256,7 +48287,7 @@ class StatementNode extends _abstract_node_1.AbstractNode {
         if (children.length === 0) {
             throw new Error("statement: zero children");
         }
-        this.children = children;
+        super.setChildren(children);
         return this;
     }
     getStart() {
@@ -48837,6 +48868,7 @@ exports.StructureNode = StructureNode;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TokenNode = void 0;
+const EMPTY_CHILDREN = Object.freeze([]);
 class TokenNode {
     constructor(token) {
         this.token = token;
@@ -48848,7 +48880,7 @@ class TokenNode {
         throw new Error("TokenNode, Method not implemented.");
     }
     getChildren() {
-        return [];
+        return EMPTY_CHILDREN;
     }
     concatTokens() {
         return this.token.getStr();
@@ -50927,6 +50959,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;
@@ -50990,6 +51023,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;
@@ -53617,7 +53657,7 @@ const cds_name_1 = __webpack_require__(/*! ./cds_name */ "../core/build/src/cds/
 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;
@@ -53682,7 +53722,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;
@@ -53951,7 +53991,7 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../cor
 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;
@@ -54166,7 +54206,7 @@ exports.CDSString = void 0;
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "../core/build/src/abap/2_statements/combi.js");
 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);
@@ -68667,7 +68707,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.57";
+        return "2.119.59";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.119.57",
+    "version": "2.119.59",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -39,7 +39,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.119.57",
+        "@abaplint/core": "^2.119.59",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",