@abaplint/core 2.120.3 → 2.120.5

package/build/abaplint.d.ts

@@ -1024,6 +1024,10 @@ declare class CDSParametersSelect extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class CDSParenSelect extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 export declare class CDSParser {
     parse(file: IFile | undefined): ExpressionNode | undefined;
 }
@@ -2767,6 +2771,7 @@ declare namespace ExpressionsCDS {
         CDSDefineProjection,
         CDSDefineTableEntity,
         CDSDefineTableFunction,
+        CDSParenSelect,
         CDSDefineView,
         CDSElement,
         CDSExtendView,
@@ -7845,8 +7850,8 @@ export declare class SyntaxLogic {
     private issues;
     private readonly object;
     private readonly reg;
-    private readonly scope;
-    private readonly helpers;
+    private scope;
+    private helpers;
     constructor(reg: IRegistry, object: ABAPObject);
     run(): ISyntaxResult;
     private traverseObject;

package/build/src/abap/5_syntax/expressions/cond_body.js

@@ -57,7 +57,7 @@ class CondBody {
                 type = source_1.Source.runSyntax(s, input, targetType);
             }
             else {
-                source_1.Source.runSyntax(s, input, targetType);
+                source_1.Source.runSyntax(s, input, targetType !== null && targetType !== void 0 ? targetType : type);
             }
         }
         if (scoped === true) {

package/build/src/abap/5_syntax/expressions/source.js

@@ -71,7 +71,7 @@ const assert_error_1 = require("../assert_error");
 */
 // TODO: refactor all these method parameters to objects, this is getting messy
 class Source {
-    static runSyntax(node, input, targetType, writeReference = false, allowGenericDeference = false) {
+    static runSyntax(node, input, targetType, writeReference = false, allowGenericDeference = false, readReference = true) {
         var _a;
         if (node === undefined) {
             return undefined;
@@ -117,7 +117,7 @@ class Source {
                 case "SWITCH":
                     {
                         const foundType = this.determineType(node, input, targetType);
-                        const bodyType = switch_body_1.SwitchBody.runSyntax(node.findDirectExpression(Expressions.SwitchBody), input);
+                        const bodyType = switch_body_1.SwitchBody.runSyntax(node.findDirectExpression(Expressions.SwitchBody), input, foundType);
                         if (foundType === undefined || foundType.isGeneric()) {
                             this.addIfInferred(node, input, bodyType);
                         }
@@ -249,7 +249,10 @@ class Source {
             return undefined;
         }
         let context = new unknown_type_1.UnknownType("todo, Source type");
-        const type = [_reference_1.ReferenceType.DataReadReference];
+        const type = [];
+        if (readReference) {
+            type.push(_reference_1.ReferenceType.DataReadReference);
+        }
         if (writeReference) {
             type.push(_reference_1.ReferenceType.DataWriteReference);
         }

package/build/src/abap/5_syntax/expressions/switch_body.js

@@ -39,7 +39,7 @@ const source_1 = require("./source");
 const _syntax_input_1 = require("../_syntax_input");
 const basic_1 = require("../../types/basic");
 class SwitchBody {
-    static runSyntax(node, input) {
+    static runSyntax(node, input, targetType) {
         if (node === undefined) {
             return;
         }
@@ -49,12 +49,12 @@ class SwitchBody {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
         }
-        const type = source_1.Source.runSyntax(thenSource, input);
+        const type = source_1.Source.runSyntax(thenSource, input, targetType);
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             if (s === thenSource) {
                 continue;
             }
-            source_1.Source.runSyntax(s, input);
+            source_1.Source.runSyntax(s, input, targetType !== null && targetType !== void 0 ? targetType : type);
         }
         return type;
     }

package/build/src/abap/5_syntax/statements/call_transformation.js

@@ -45,7 +45,8 @@ class CallTransformation {
         const resultParameters = node.findExpressionAfterToken("RESULT");
         const resultSources = new Set((resultParameters === null || resultParameters === void 0 ? void 0 : resultParameters.findAllExpressions(Expressions.SimpleSource3)) || []);
         for (const s of node.findAllExpressions(Expressions.SimpleSource3)) {
-            source_1.Source.runSyntax(s, input, undefined, resultSources.has(s));
+            const isResult = resultSources.has(s);
+            source_1.Source.runSyntax(s, input, undefined, isResult, false, isResult === false);
         }
         for (const d of node.findAllExpressions(Expressions.Dynamic)) {
             dynamic_1.Dynamic.runSyntax(d, input);

package/build/src/abap/5_syntax/statements/catch.js

@@ -36,7 +36,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Catch = void 0;
 const Expressions = __importStar(require("../../2_statements/expressions"));
 const _typed_identifier_1 = require("../../types/_typed_identifier");
-const unknown_type_1 = require("../../types/basic/unknown_type");
 const basic_1 = require("../../types/basic");
 const target_1 = require("../expressions/target");
 const _reference_1 = require("../_reference");
@@ -44,7 +43,7 @@ const _syntax_input_1 = require("../_syntax_input");
 const _type_utils_1 = require("../_type_utils");
 class Catch {
     runSyntax(node, input) {
-        var _a, _b;
+        var _a;
         const names = new Set();
         for (const c of node.findDirectExpressions(Expressions.ClassName)) {
             const token = c.getFirstToken();
@@ -60,7 +59,6 @@ class Catch {
             else {
                 const message = "CATCH, unknown class " + className;
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, token, message));
-                return;
             }
             if (names.has(className)) {
                 const message = "Duplicate class name in CATCH: " + className;
@@ -70,23 +68,18 @@ class Catch {
             names.add(className);
         }
         const target = node.findDirectExpression(Expressions.Target);
-        const firstClassName = (_a = node.findDirectExpression(Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr();
         if (target === null || target === void 0 ? void 0 : target.findDirectExpression(Expressions.InlineData)) {
-            const token = (_b = target.findFirstExpression(Expressions.TargetField)) === null || _b === void 0 ? void 0 : _b.getFirstToken();
-            const found = input.scope.existsObject(firstClassName);
-            if (token && firstClassName && (found === null || found === void 0 ? void 0 : found.id)) {
-                const identifier = new _typed_identifier_1.TypedIdentifier(token, input.filename, new basic_1.ObjectReferenceType(found.id), ["inline" /* IdentifierMeta.InlineDefinition */]);
-                input.scope.addIdentifier(identifier);
-                input.scope.addReference(token, identifier, _reference_1.ReferenceType.DataWriteReference, input.filename);
-            }
-            else if (token && input.scope.getDDIC().inErrorNamespace(firstClassName) === false) {
-                const identifier = new _typed_identifier_1.TypedIdentifier(token, input.filename, basic_1.VoidType.get(firstClassName), ["inline" /* IdentifierMeta.InlineDefinition */]);
-                input.scope.addIdentifier(identifier);
-                input.scope.addReference(token, identifier, _reference_1.ReferenceType.DataWriteReference, input.filename);
-            }
-            else if (token) {
-                const message = "Catch, could not determine type for \"" + token.getStr() + "\"";
-                const identifier = new _typed_identifier_1.TypedIdentifier(token, input.filename, new unknown_type_1.UnknownType(message), ["inline" /* IdentifierMeta.InlineDefinition */]);
+            const token = (_a = target.findFirstExpression(Expressions.TargetField)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+            if (token) {
+                const classNames = Array.from(names);
+                const unknownClass = classNames.find(name => input.scope.findClassDefinition(name) === undefined);
+                const commonSuperclass = unknownClass === undefined
+                    ? this.findCommonSuperclass(classNames, input)
+                    : undefined;
+                const type = commonSuperclass
+                    ? new basic_1.ObjectReferenceType(commonSuperclass)
+                    : basic_1.VoidType.get(unknownClass || classNames.join(" "));
+                const identifier = new _typed_identifier_1.TypedIdentifier(token, input.filename, type, ["inline" /* IdentifierMeta.InlineDefinition */]);
                 input.scope.addIdentifier(identifier);
                 input.scope.addReference(token, identifier, _reference_1.ReferenceType.DataWriteReference, input.filename);
             }
@@ -110,6 +103,22 @@ class Catch {
             }
         }
     }
+    findCommonSuperclass(classNames, input) {
+        var _a;
+        const lineages = [];
+        for (const className of classNames) {
+            const lineage = [];
+            let current = input.scope.findClassDefinition(className);
+            const visited = new Set();
+            while (current && visited.has(current.getName().toUpperCase()) === false) {
+                lineage.push(current);
+                visited.add(current.getName().toUpperCase());
+                current = input.scope.findClassDefinition(current.getSuperClass());
+            }
+            lineages.push(lineage);
+        }
+        return (_a = lineages[0]) === null || _a === void 0 ? void 0 : _a.find(candidate => lineages.every(lineage => lineage.some(item => item.getName().toUpperCase() === candidate.getName().toUpperCase())));
+    }
 }
 exports.Catch = Catch;
 //# sourceMappingURL=catch.js.map

package/build/src/abap/5_syntax/statements/constant.js

@@ -53,6 +53,10 @@ class Constant {
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, found.getToken(), message));
                 return new _typed_identifier_1.TypedIdentifier(found.getToken(), input.filename, basic_2.VoidType.get(_syntax_input_1.CheckSyntaxKey), meta, val);
             }
+            if (this.isNameTooLong(found.getName())) {
+                const message = "CONSTANTS name too long, " + found.getName();
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, found.getToken(), message));
+            }
             return new _typed_identifier_1.TypedIdentifier(found.getToken(), input.filename, found.getType(), meta, val);
         }
         const fallback = node.findFirstExpression(Expressions.DefinitionName);
@@ -61,10 +65,17 @@ class Constant {
                 const message = "not possible to have a name with only digits";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, fallback.getFirstToken(), message));
             }
+            if (this.isNameTooLong(fallback.concatTokens())) {
+                const message = "CONSTANTS name too long, " + fallback.concatTokens();
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, fallback.getFirstToken(), message));
+            }
             return new _typed_identifier_1.TypedIdentifier(fallback.getFirstToken(), input.filename, new basic_1.UnknownType("constant, fallback"));
         }
         throw new assert_error_1.AssertError("Statement Constant: unexpected structure");
     }
+    isNameTooLong(name) {
+        return name.length > 30;
+    }
     isOnlyDigits(name) {
         return /^[0-9]+$/.test(name);
     }

package/build/src/abap/5_syntax/statements/data.js

@@ -51,6 +51,10 @@ class Data {
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, id.getToken(), message));
                 return new _typed_identifier_1.TypedIdentifier(id.getToken(), input.filename, basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey));
             }
+            if (id && this.isNameTooLong(id.getName())) {
+                const message = "DATA name too long, " + id.getName();
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, id.getToken(), message));
+            }
             if ((id === null || id === void 0 ? void 0 : id.getType().isGeneric()) === true
                 && (id === null || id === void 0 ? void 0 : id.getType().containsVoid()) === false) {
                 const message = "DATA definition cannot be generic, " + (name === null || name === void 0 ? void 0 : name.concatTokens());
@@ -64,10 +68,17 @@ class Data {
                 const message = "not possible to have a name with only digits";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, name.getFirstToken(), message));
             }
+            if (this.isNameTooLong(name.concatTokens())) {
+                const message = "DATA name too long, " + name.concatTokens();
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, name.getFirstToken(), message));
+            }
             return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), input.filename, new unknown_type_1.UnknownType("data, fallback"));
         }
         return undefined;
     }
+    isNameTooLong(name) {
+        return name.length > 30;
+    }
     isOnlyDigits(name) {
         return /^[0-9]+$/.test(name);
     }

package/build/src/abap/5_syntax/syntax.js

@@ -335,16 +335,17 @@ class SyntaxLogic {
         this.reg = reg;
         this.issues = [];
         this.object = object;
-        this.scope = _current_scope_1.CurrentScope.buildDefault(this.reg, object);
-        this.helpers = {
-            oooc: new _object_oriented_1.ObjectOriented(this.scope),
-            proc: new _procedural_1.Procedural(this.reg, this.scope),
-        };
     }
     run() {
         if (this.object.syntaxResult !== undefined) {
             return this.object.syntaxResult;
         }
+        // the scope is built here instead of in the constructor, cached results must stay cheap
+        this.scope = _current_scope_1.CurrentScope.buildDefault(this.reg, this.object);
+        this.helpers = {
+            oooc: new _object_oriented_1.ObjectOriented(this.scope),
+            proc: new _procedural_1.Procedural(this.reg, this.scope),
+        };
         this.issues = [];
         this.reg.getDDICReferences().clear(this.object);
         this.reg.getMSAGReferences().clear(this.object);

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

@@ -7,7 +7,7 @@ class CDSAggregate extends combi_1.Expression {
     getRunnable() {
         const fieldAsType = (0, combi_1.seq)(_1.CDSPrefixedName, "AS", _1.CDSType);
         const funcAsType = (0, combi_1.seq)(_1.CDSFunction, "AS", _1.CDSType);
-        const value = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSCast, _1.CDSCase, funcAsType, _1.CDSFunction, fieldAsType, _1.CDSPrefixedName, _1.CDSString, "*");
+        const value = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSArithParen, _1.CDSCast, _1.CDSCase, funcAsType, _1.CDSFunction, fieldAsType, _1.CDSPrefixedName, _1.CDSString, "*");
         return (0, combi_1.seq)((0, combi_1.altPrio)("MAX", "MIN", "SUM", "AVG", "COUNT"), "(", (0, combi_1.optPrio)((0, combi_1.altPrio)("DISTINCT", "ALL")), value, (0, combi_1.opt)((0, combi_1.seq)("AS", _1.CDSType)), ")");
     }
 }

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

@@ -8,9 +8,10 @@ class CDSAnnotationSimple extends combi_1.Expression {
     getRunnable() {
         const ident = (0, combi_1.regex)(/^[\w_]+$/);
         // #(expr) where expr can be: identifier, dotted path, string, or concatenation with +
-        const hashArg = (0, combi_1.altPrio)(_1.CDSString, cds_prefixed_name_1.CDSPrefixedName, ident);
+        const funcCall = (0, combi_1.seq)(ident, "(", (0, combi_1.altPrio)(_1.CDSString, cds_prefixed_name_1.CDSPrefixedName, ident), ")");
+        const hashArg = (0, combi_1.altPrio)(_1.CDSString, funcCall, cds_prefixed_name_1.CDSPrefixedName, ident);
         const hashExpr = (0, combi_1.seq)(hashArg, (0, combi_1.starPrio)((0, combi_1.seq)("+", hashArg)));
-        const value = (0, combi_1.altPrio)(_1.CDSString, "true", "false", "null", (0, combi_1.seq)("-", (0, combi_1.regex)(/^\d+$/), ".", (0, combi_1.regex)(/^\d+$/)), (0, combi_1.seq)("-", (0, combi_1.regex)(/^\d+$/)), (0, combi_1.seq)((0, combi_1.regex)(/^\d+$/), ".", (0, combi_1.regex)(/^\d+$/)), (0, combi_1.regex)(/^\d+$/), (0, combi_1.seq)("#", "(", hashExpr, ")"), (0, combi_1.regex)(/^#[\w_]+$/));
+        const value = (0, combi_1.altPrio)(_1.CDSString, "true", "false", "null", (0, combi_1.seq)("-", (0, combi_1.regex)(/^\d+$/), ".", (0, combi_1.regex)(/^\d+[eE]$/), (0, combi_1.altPrio)("+", "-"), (0, combi_1.regex)(/^\d+$/)), (0, combi_1.seq)((0, combi_1.regex)(/^\d+$/), ".", (0, combi_1.regex)(/^\d+[eE]$/), (0, combi_1.altPrio)("+", "-"), (0, combi_1.regex)(/^\d+$/)), (0, combi_1.seq)("-", (0, combi_1.regex)(/^\d+$/), ".", (0, combi_1.regex)(/^\d+$/)), (0, combi_1.seq)("-", (0, combi_1.regex)(/^\d+$/)), (0, combi_1.seq)((0, combi_1.regex)(/^\d+$/), ".", (0, combi_1.regex)(/^\d+$/)), (0, combi_1.regex)(/^\d+$/), (0, combi_1.seq)("#", "(", hashExpr, ")"), (0, combi_1.regex)(/^#[\w_]+$/));
         return value;
     }
 }

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

@@ -13,9 +13,9 @@ class CDSAssociation extends combi_1.Expression {
         const numericCardinality = (0, combi_1.seq)("[", cardNum, (0, combi_1.optPrio)((0, combi_1.seq)(".", ".", cardNum)), "]");
         // Text-based OF form: "association of one to many Target on ..." — text cardinality includes "TO"
         const ofTextSide = (0, combi_1.altPrio)((0, combi_1.seq)("EXACT", "ONE"), "ONE", "MANY");
-        const ofTextForm = (0, combi_1.seq)("ASSOCIATION", "OF", ofTextSide, "TO", ofTextSide, _1.CDSRelation, "ON", _1.CDSCondition);
+        const ofTextForm = (0, combi_1.seq)("ASSOCIATION", "OF", ofTextSide, "TO", ofTextSide, _1.CDSRelation, "ON", _1.CDSCondition, (0, combi_1.opt)((0, combi_1.seq)("WITH", "DEFAULT", "FILTER", _1.CDSCondition)));
         // Numeric OF form: "association of [0..1] to Target on ..."
-        const ofNumericForm = (0, combi_1.seq)("ASSOCIATION", "OF", numericCardinality, "TO", _1.CDSRelation, "ON", _1.CDSCondition);
+        const ofNumericForm = (0, combi_1.seq)("ASSOCIATION", "OF", numericCardinality, "TO", _1.CDSRelation, "ON", _1.CDSCondition, (0, combi_1.opt)((0, combi_1.seq)("WITH", "DEFAULT", "FILTER", _1.CDSCondition)));
         // "association [0..1] to Target as _Alias on condition" — standard form
         const parentForm = (0, combi_1.seq)("ASSOCIATION", "TO", "PARENT", _1.CDSRelation);
         const standardForm = (0, combi_1.seq)("ASSOCIATION", (0, combi_1.optPrio)(cds_cardinality_1.CDSCardinality), "TO", (0, combi_1.opt)((0, combi_1.altPrio)(textCardinality, "PARENT")), _1.CDSRelation, "ON", _1.CDSCondition, (0, combi_1.opt)((0, combi_1.seq)("WITH", "DEFAULT", "FILTER", _1.CDSCondition)));

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

@@ -11,7 +11,7 @@ class CDSCase extends combi_1.Expression {
         // CDSArithmetics is still tried after for arithmetic like (-1)*Amount or (2*A)-B.
         const caseParen = (0, combi_1.seq)("(", CDSCase, ")");
         const value = (0, combi_1.altPrio)(_1.CDSString, CDSCase, caseParen, _1.CDSArithmetics, _1.CDSCast, _1.CDSAggregate, _1.CDSArithParen, _1.CDSFunction, _1.CDSInteger, _1.CDSPrefixedName);
-        const simple = (0, combi_1.seq)((0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSArithParen, _1.CDSAggregate, _1.CDSFunction, _1.CDSPrefixedName), (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", value, "THEN", value)));
+        const simple = (0, combi_1.seq)((0, combi_1.altPrio)(_1.CDSString, _1.CDSCast, _1.CDSArithmetics, _1.CDSArithParen, _1.CDSAggregate, _1.CDSFunction, _1.CDSPrefixedName), (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", value, "THEN", value)));
         const complex = (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", _1.CDSCondition, "THEN", value));
         return (0, combi_1.seq)("CASE", (0, combi_1.altPrio)(complex, simple), (0, combi_1.optPrio)((0, combi_1.seq)("ELSE", value)), "END");
     }

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

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSCast extends combi_1.Expression {
     getRunnable() {
         // CDSArithmetics before CDSFunction/CDSAggregate: handles function()*n, cast()*n, sum()*n patterns
-        const first = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSFunction, _1.CDSArithParen, _1.CDSCase, _1.CDSAggregate, CDSCast, _1.CDSString, _1.CDSPrefixedName, _1.CDSInteger);
+        const first = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSFunction, _1.CDSArithParen, _1.CDSCase, _1.CDSAggregate, CDSCast, _1.CDSInteger, _1.CDSString, _1.CDSPrefixedName);
         return (0, combi_1.seq)("CAST", "(", first, "AS", _1.CDSType, (0, combi_1.optPrio)((0, combi_1.seq)("PRESERVING", "TYPE")), ")");
     }
 }

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

@@ -7,8 +7,9 @@ const cds_cardinality_1 = require("./cds_cardinality");
 class CDSComposition extends combi_1.Expression {
     getRunnable() {
         const num = (0, combi_1.altPrio)("ONE", "MANY");
-        // Text cardinality after OF: "of exact one to many", "of one to many", or bare "of many" / "of one"
-        const textCardinality = (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.opt)("EXACT"), num, "TO", num), (0, combi_1.seq)((0, combi_1.opt)("EXACT"), num));
+        const exactNum = (0, combi_1.seq)((0, combi_1.opt)("EXACT"), num);
+        // Text cardinality after OF: "of exact one to exact one", "of exact one to many", "of one to many", or bare "of many" / "of one"
+        const textCardinality = (0, combi_1.altPrio)((0, combi_1.seq)(exactNum, "TO", exactNum), (0, combi_1.seq)((0, combi_1.opt)("EXACT"), num));
         // Numeric cardinality [n..m] before OF: any non-negative integer or *
         const cardNum = (0, combi_1.altPrio)((0, combi_1.regex)(/^\d+$/), "*");
         const numericCardinality = (0, combi_1.seq)("[", cardNum, (0, combi_1.optPrio)((0, combi_1.seq)(".", ".", cardNum)), "]");

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

@@ -8,7 +8,7 @@ class CDSCondition extends combi_1.Expression {
     getRunnable() {
         // CDSArithmetics before CDSCast/CDSFunction so cast(A)-cast(B) is handled as arithmetic, not two separate casts
         // CDSCase allows nested case expressions on either side of a comparison
-        const left = (0, combi_1.altPrio)(_1.CDSString, _1.CDSArithmetics, _1.CDSCast, _1.CDSFunction, _1.CDSAggregate, _1.CDSCase, _1.CDSArithParen, _1.CDSPrefixedName);
+        const left = (0, combi_1.altPrio)(_1.CDSString, _1.CDSArithmetics, _1.CDSCast, _1.CDSFunction, _1.CDSAggregate, _1.CDSCase, _1.CDSArithParen, cds_integer_1.CDSInteger, _1.CDSPrefixedName);
         const nonLikeOperators = (0, combi_1.altPrio)("=", (0, combi_1.seq)("!", "="), (0, combi_1.seq)("<", ">"), (0, combi_1.seq)(">", "="), (0, combi_1.seq)("<", "="), "<", ">");
         const likeOperators = (0, combi_1.altPrio)("LIKE", "NOT LIKE");
         // Right side of comparison: simple values first, then parenthesized, then full arithmetic last.

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

@@ -9,7 +9,7 @@ class CDSDefineCustom extends combi_1.Expression {
     getRunnable() {
         const field = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.str)("KEY")), cds_name_1.CDSName, ":", cds_type_1.CDSType, ";");
         const compsiOrAssoci = (0, combi_1.seq)(cds_name_1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), (0, combi_1.str)("CUSTOM ENTITY"), cds_name_1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.alt)(field, compsiOrAssoci))), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)((0, combi_1.str)("DEFINE")), (0, combi_1.opt)((0, combi_1.str)("ROOT")), (0, combi_1.str)("CUSTOM ENTITY"), cds_name_1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), (0, combi_1.str)("{"), (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.alt)(field, compsiOrAssoci))), (0, combi_1.str)("}"), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineCustom = CDSDefineCustom;

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

@@ -5,7 +5,7 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSDefineExternalEntity extends combi_1.Expression {
     getRunnable() {
-        const extNameValue = (0, combi_1.alt)(_1.CDSName, (0, combi_1.regex)(/^"[^"]*"$/));
+        const extNameValue = (0, combi_1.alt)(_1.CDSName, (0, combi_1.regex)(/^"(?:[^"]|"")*"$/));
         const externalName = (0, combi_1.seq)("EXTERNAL", "NAME", extNameValue);
         const nullability = (0, combi_1.optPrio)((0, combi_1.alt)("NOT NULL", "NULL"));
         const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.str)("KEY")), _1.CDSName, ":", _1.CDSType, nullability, (0, combi_1.optPrio)(externalName), ";");
@@ -13,7 +13,7 @@ class CDSDefineExternalEntity extends combi_1.Expression {
         const body = (0, combi_1.plus)((0, combi_1.alt)(field, assocOrComp));
         const externalEntity = (0, combi_1.seq)((0, combi_1.opt)("WRITABLE"), "EXTERNAL", "ENTITY", _1.CDSName, (0, combi_1.opt)(externalName), (0, combi_1.opt)(_1.CDSWithParameters));
         const staticEntity = (0, combi_1.seq)("STATIC", "ENTITY", _1.CDSName, (0, combi_1.opt)(externalName));
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.alt)(externalEntity, staticEntity), (0, combi_1.str)("{"), body, (0, combi_1.str)("}"), (0, combi_1.opt)((0, combi_1.seq)("WITH", "FEDERATED", "DATA", (0, combi_1.optPrio)((0, combi_1.alt)((0, combi_1.seq)("PROVIDED", "AT", "RUNTIME"), (0, combi_1.seq)("PROVIDED", "BY", _1.CDSName))))), (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), (0, combi_1.alt)(externalEntity, staticEntity), (0, combi_1.str)("{"), body, (0, combi_1.str)("}"), (0, combi_1.opt)((0, combi_1.seq)("WITH", "FEDERATED", "DATA", (0, combi_1.optPrio)((0, combi_1.alt)((0, combi_1.seq)("PROVIDED", "AT", "RUNTIME"), (0, combi_1.seq)("PROVIDED", "BY", _1.CDSName))), (0, combi_1.optPrio)((0, combi_1.seq)("ON", "UNLINKED", (0, combi_1.altPrio)("FAIL", "IGNORE"))))), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineExternalEntity = CDSDefineExternalEntity;

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

@@ -11,10 +11,10 @@ class CDSDefineHierarchy extends combi_1.Expression {
         const siblingsOrder = (0, combi_1.seq)("SIBLINGS", "ORDER", "BY", siblingsOrderField, (0, combi_1.star)((0, combi_1.seq)(",", siblingsOrderField)));
         const directory = (0, combi_1.seq)("DIRECTORY", _1.CDSName, "FILTER", "BY", _1.CDSCondition);
         // DATE PERIOD: period from <field> to <field> [valid from :p to :p]
-        const datePeriod = (0, combi_1.seq)("PERIOD", "FROM", _1.CDSName, "TO", _1.CDSName, (0, combi_1.opt)((0, combi_1.seq)("VALID", "FROM", _1.CDSPrefixedName, "TO", _1.CDSPrefixedName)));
+        const datePeriod = (0, combi_1.seq)("PERIOD", "FROM", _1.CDSName, "TO", _1.CDSName, (0, combi_1.opt)((0, combi_1.seq)("VALID", "FROM", (0, combi_1.altPrio)(_1.CDSString, _1.CDSPrefixedName), "TO", (0, combi_1.altPrio)(_1.CDSString, _1.CDSPrefixedName))));
         const depthValue = (0, combi_1.altPrio)(_1.CDSString, _1.CDSInteger, _1.CDSPrefixedName);
         const loadMode = (0, combi_1.altPrio)("BULK", "INCREMENTAL", _1.CDSPrefixedName);
-        const hierarchyBody = (0, combi_1.seq)("SOURCE", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), "CHILD", "TO", "PARENT", "ASSOCIATION", _1.CDSName, (0, combi_1.opt)(directory), (0, combi_1.opt)(datePeriod), (0, combi_1.opt)((0, combi_1.seq)("START", "WHERE", _1.CDSCondition)), (0, combi_1.opt)(siblingsOrder), (0, combi_1.opt)((0, combi_1.seq)("LOAD", loadMode)), (0, combi_1.opt)((0, combi_1.seq)("DEPTH", depthValue)), (0, combi_1.opt)((0, combi_1.seq)("NODETYPE", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("MULTIPLE", "PARENTS", (0, combi_1.altPrio)("NOT ALLOWED", "ALLOWED", (0, combi_1.seq)("LEAVES", (0, combi_1.optPrio)("ONLY"))))), (0, combi_1.opt)((0, combi_1.seq)("ORPHANS", (0, combi_1.altPrio)("IGNORE", "ROOT", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("CYCLES", (0, combi_1.altPrio)("BREAKUP", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("GENERATE", "SPANTREE")), (0, combi_1.opt)((0, combi_1.seq)("CACHE", (0, combi_1.altPrio)("ON", "OFF", "FORCE"))));
+        const hierarchyBody = (0, combi_1.seq)("SOURCE", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), "CHILD", "TO", "PARENT", "ASSOCIATION", _1.CDSName, (0, combi_1.opt)((0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.opt)(directory), datePeriod, (0, combi_1.opt)(directory)), (0, combi_1.seq)(datePeriod, (0, combi_1.opt)(directory)), directory)), (0, combi_1.opt)((0, combi_1.seq)("START", "WHERE", _1.CDSCondition)), (0, combi_1.opt)(siblingsOrder), (0, combi_1.opt)((0, combi_1.seq)("DEPTH", depthValue)), (0, combi_1.opt)((0, combi_1.seq)("NODETYPE", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("LOAD", loadMode)), (0, combi_1.opt)((0, combi_1.seq)("MULTIPLE", "PARENTS", (0, combi_1.altPrio)("NOT ALLOWED", "ALLOWED", (0, combi_1.seq)("LEAVES", (0, combi_1.optPrio)("ONLY"))))), (0, combi_1.opt)((0, combi_1.seq)("ORPHANS", (0, combi_1.altPrio)("IGNORE", "ROOT", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("CYCLES", (0, combi_1.altPrio)("BREAKUP", "ERROR"))), (0, combi_1.opt)((0, combi_1.seq)("GENERATE", "SPANTREE")), (0, combi_1.opt)((0, combi_1.seq)("CACHE", (0, combi_1.altPrio)("ON", "OFF", "FORCE"))));
         return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), "HIERARCHY", _1.CDSName, (0, combi_1.opt)(_1.CDSWithParameters), "AS", "PARENT", "CHILD", "HIERARCHY", "(", hierarchyBody, ")", "{", (0, combi_1.seq)(field, (0, combi_1.star)((0, combi_1.seq)(",", field))), "}", (0, combi_1.opt)(";"));
     }
 }

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

@@ -6,9 +6,14 @@ const __1 = require("../..");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSDefineProjection extends combi_1.Expression {
     getRunnable() {
-        // redefine association _Assoc redirected to [composition child | parent] Entity
-        const redefineAssoc = (0, combi_1.seq)("REDEFINE", "ASSOCIATION", _1.CDSName, "REDIRECTED", "TO", (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("COMPOSITION", "CHILD"), "PARENT")), _1.CDSName);
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("TRANSIENT"), "VIEW", (0, combi_1.ver)(__1.Release.v755, (0, combi_1.opt)("ENTITY")), _1.CDSName, (0, combi_1.opt)(_1.CDSProviderContract), (0, combi_1.opt)(_1.CDSWithParameters), "AS PROJECTION ON", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSAssociation, redefineAssoc)), (0, combi_1.str)("{"), (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(",")), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)(";"));
+        const redefineCard = (0, combi_1.altPrio)("EXACT ONE TO EXACT ONE", "EXACT ONE TO MANY", "EXACT ONE TO ONE", "MANY TO EXACT ONE", "MANY TO MANY", "MANY TO ONE", "ONE TO EXACT ONE", "ONE TO MANY", "ONE TO ONE", "TO EXACT ONE", "TO ONE", "TO MANY", _1.CDSInteger, "*");
+        const redefineAssocFilter = (0, combi_1.seq)("[", (0, combi_1.optPrio)((0, combi_1.seq)(redefineCard, ":")), _1.CDSCondition, "]");
+        const redefineAssoc = (0, combi_1.seq)("REDEFINE", "ASSOCIATION", _1.CDSPrefixedName, (0, combi_1.optPrio)(redefineAssocFilter), (0, combi_1.opt)(_1.CDSAs), "REDIRECTED", "TO", (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("COMPOSITION", "CHILD"), "PARENT")), _1.CDSName);
+        const typedLiteralVal = (0, combi_1.seq)(_1.CDSType, _1.CDSString);
+        const aspectValue = (0, combi_1.altPrio)(typedLiteralVal, _1.CDSString, _1.CDSPrefixedName);
+        const aspectBinding = (0, combi_1.seq)(_1.CDSPrefixedName, "=", ">", aspectValue);
+        const bindAspect = (0, combi_1.seq)("BIND", "ASPECT", _1.CDSName, "(", aspectBinding, (0, combi_1.starPrio)((0, combi_1.seq)(",", aspectBinding)), ")", (0, combi_1.optPrio)((0, combi_1.seq)("AS", _1.CDSName)));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("TRANSIENT"), (0, combi_1.opt)("ROOT"), "VIEW", (0, combi_1.ver)(__1.Release.v755, (0, combi_1.opt)("ENTITY")), _1.CDSName, (0, combi_1.opt)(_1.CDSProviderContract), (0, combi_1.opt)(_1.CDSWithParameters), "AS PROJECTION ON", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSAssociation, redefineAssoc)), (0, combi_1.starPrio)(bindAspect), (0, combi_1.str)("{"), (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(",")), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineProjection = CDSDefineProjection;

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

@@ -10,9 +10,9 @@ const cds_with_parameters_1 = require("./cds_with_parameters");
 class CDSDefineView extends combi_1.Expression {
     getRunnable() {
         const columnAlias = (0, combi_1.seq)("(", cds_name_1.CDSName, (0, combi_1.star)((0, combi_1.seq)(",", cds_name_1.CDSName)), ")");
-        const parenSelect = (0, combi_1.seq)("(", cds_select_1.CDSSelect, ")");
-        const unionBranch = (0, combi_1.altPrio)(parenSelect, cds_select_1.CDSSelect);
-        const topLevelSelect = (0, combi_1.altPrio)((0, combi_1.seq)(parenSelect, (0, combi_1.star)((0, combi_1.altPrio)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), unionBranch), (0, combi_1.seq)("EXCEPT", unionBranch), (0, combi_1.seq)("INTERSECT", unionBranch)))), cds_select_1.CDSSelect);
+        const unionBranch = (0, combi_1.altPrio)(_1.CDSParenSelect, cds_select_1.CDSSelect);
+        const unionOps = (0, combi_1.star)((0, combi_1.altPrio)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), unionBranch), (0, combi_1.seq)("EXCEPT", unionBranch), (0, combi_1.seq)("INTERSECT", unionBranch)));
+        const topLevelSelect = (0, combi_1.altPrio)((0, combi_1.seq)(_1.CDSParenSelect, unionOps), (0, combi_1.seq)(cds_select_1.CDSSelect, unionOps));
         return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("WRITABLE"), "VIEW", (0, combi_1.ver)(__1.Release.v755, (0, combi_1.opt)("ENTITY")), cds_name_1.CDSName, (0, combi_1.opt)(columnAlias), (0, combi_1.opt)(cds_with_parameters_1.CDSWithParameters), "AS", topLevelSelect, (0, combi_1.opt)((0, combi_1.seq)("WITH", "HIERARCHY", cds_name_1.CDSName)), (0, combi_1.opt)(";"));
     }
 }

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

@@ -7,16 +7,16 @@ const cds_as_1 = require("./cds_as");
 const cds_cast_1 = require("./cds_cast");
 class CDSElement extends combi_1.Expression {
     getRunnable() {
-        const redirected = (0, combi_1.seq)(": REDIRECTED TO", (0, combi_1.optPrio)((0, combi_1.altPrio)("PARENT", "COMPOSITION CHILD")), _1.CDSName);
+        const redirected = (0, combi_1.seq)(": REDIRECTED TO", (0, combi_1.optPrio)((0, combi_1.altPrio)("PARENT", "COMPOSITION CHILD")), _1.CDSName, (0, combi_1.optPrio)(_1.CDSParametersSelect));
         const colonThing = (0, combi_1.seq)(":", (0, combi_1.altPrio)(_1.CDSType, _1.CDSName, "LOCALIZED"));
         const extensionWildcard = (0, combi_1.seq)("$extension", ".", "*");
         const excludingNames = (0, combi_1.seq)(_1.CDSName, (0, combi_1.starPrio)((0, combi_1.seq)(",", _1.CDSName)));
         const excluding = (0, combi_1.seq)("EXCLUDING", "{", excludingNames, "}");
-        const includeElement = (0, combi_1.seq)("INCLUDE", _1.CDSPrefixedName, (0, combi_1.optPrio)(excluding), (0, combi_1.optPrio)("SIGNATURE ONLY"));
+        const includeElement = (0, combi_1.seq)("INCLUDE", (0, combi_1.stopBefore1)("AS", "KEY", "VIRTUAL", "}"), _1.CDSPrefixedName, (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("SIGNATURE ONLY", (0, combi_1.optPrio)(excluding)), (0, combi_1.seq)(excluding, (0, combi_1.optPrio)("SIGNATURE ONLY")))));
         const typedVirtual = (0, combi_1.seq)("VIRTUAL", _1.CDSName, ":", _1.CDSType);
         const pathSegment = (0, combi_1.seq)(".", (0, combi_1.altPrio)(_1.CDSString, _1.CDSName, "*"), (0, combi_1.optPrio)((0, combi_1.altPrio)(_1.CDSParametersSelect, _1.CDSParameters)));
         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 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, ")"), _1.CDSInteger, (0, combi_1.seq)(_1.CDSPrefixedName, (0, combi_1.optPrio)(cds_as_1.CDSAs), (0, combi_1.optPrio)((0, combi_1.altPrio)(redirected, colonThing))));
         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), (0, combi_1.starPrio)(_1.CDSAnnotation));
     }

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

@@ -7,10 +7,20 @@ class CDSExtendView extends combi_1.Expression {
     getRunnable() {
         const namedot = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", _1.CDSName)), (0, combi_1.optPrio)(_1.CDSAs));
         const valueNested = (0, combi_1.seq)("{", namedot, (0, combi_1.star)((0, combi_1.seq)(",", namedot)), "}");
-        const redefineAssoc = (0, combi_1.seq)("REDEFINE", "ASSOCIATION", _1.CDSPrefixedName, (0, combi_1.optPrio)((0, combi_1.seq)("[", _1.CDSCondition, "]")), (0, combi_1.opt)(_1.CDSAs), "REDIRECTED", "TO", (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("COMPOSITION", "CHILD"), "PARENT")), _1.CDSName);
+        const redefineCard = (0, combi_1.altPrio)("EXACT ONE TO EXACT ONE", "EXACT ONE TO MANY", "EXACT ONE TO ONE", "MANY TO EXACT ONE", "MANY TO MANY", "MANY TO ONE", "ONE TO EXACT ONE", "ONE TO MANY", "ONE TO ONE", "TO EXACT ONE", "TO ONE", "TO MANY", _1.CDSInteger, "*");
+        const redefineAssocFilter = (0, combi_1.seq)("[", (0, combi_1.optPrio)((0, combi_1.seq)(redefineCard, ":")), _1.CDSCondition, "]");
+        const redefineAssoc = (0, combi_1.seq)("REDEFINE", "ASSOCIATION", _1.CDSPrefixedName, (0, combi_1.optPrio)(redefineAssocFilter), (0, combi_1.opt)(_1.CDSAs), "REDIRECTED", "TO", (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)("COMPOSITION", "CHILD"), "PARENT")), _1.CDSName);
         const elementList = (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(","));
         const elementNested = (0, combi_1.seq)("{", (0, combi_1.altPrio)("*", elementList), "}");
-        const extendView = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("EXTEND VIEW"), (0, combi_1.opt)((0, combi_1.str)("ENTITY")), _1.CDSName, (0, combi_1.str)("WITH"), (0, combi_1.opt)(_1.CDSName), (0, combi_1.star)(redefineAssoc), (0, combi_1.star)(_1.CDSAssociation), (0, combi_1.altPrio)(elementNested, valueNested), (0, combi_1.opt)(";"));
+        const unionElemList = (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(","));
+        const unionBranchBody = (0, combi_1.seq)((0, combi_1.star)((0, combi_1.altPrio)(_1.CDSAssociation, _1.CDSComposition)), "{", (0, combi_1.altPrio)("*", unionElemList), "}", (0, combi_1.optPrio)(_1.CDSGroupBy));
+        const parenUnionBody = (0, combi_1.seq)("(", (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSAssociation, _1.CDSComposition)), "{", (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(",")), "}", (0, combi_1.star)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSAssociation, _1.CDSComposition)), "{", (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(",")), "}")), ")");
+        const unionSuffix = (0, combi_1.seq)((0, combi_1.optPrio)(_1.CDSGroupBy), (0, combi_1.star)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), (0, combi_1.altPrio)(parenUnionBody, unionBranchBody))));
+        const typedLiteralVal = (0, combi_1.seq)(_1.CDSType, _1.CDSString);
+        const aspectValue = (0, combi_1.altPrio)(typedLiteralVal, _1.CDSString, _1.CDSPrefixedName);
+        const aspectBinding = (0, combi_1.seq)(_1.CDSPrefixedName, "=", ">", aspectValue);
+        const bindAspect = (0, combi_1.seq)("BIND", "ASPECT", _1.CDSName, "(", aspectBinding, (0, combi_1.starPrio)((0, combi_1.seq)(",", aspectBinding)), ")", (0, combi_1.optPrio)((0, combi_1.seq)("AS", _1.CDSName)));
+        const extendView = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.str)("EXTEND VIEW"), (0, combi_1.opt)((0, combi_1.str)("ENTITY")), _1.CDSName, (0, combi_1.str)("WITH"), (0, combi_1.opt)(_1.CDSName), (0, combi_1.star)(redefineAssoc), (0, combi_1.star)((0, combi_1.altPrio)(_1.CDSAssociation, _1.CDSComposition)), (0, combi_1.starPrio)(bindAspect), (0, combi_1.altPrio)(parenUnionBody, elementNested, valueNested), unionSuffix, (0, combi_1.opt)(";"));
         const field = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)((0, combi_1.str)("KEY")), _1.CDSName, ":", _1.CDSType, ";");
         const assocOrComp = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), _1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation), ";");
         const entityBody = (0, combi_1.seq)("{", (0, combi_1.plus)((0, combi_1.alt)(field, assocOrComp)), "}");

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

@@ -58,6 +58,7 @@ class CDSFunction extends combi_1.Expression {
         const occurrencesRegexpr = (0, combi_1.seq)("OCCURRENCES_REGEXPR", "(", conversionInputs, ")");
         const substrRegexpr = (0, combi_1.seq)("SUBSTR_REGEXPR", "(", conversionInputs, ")");
         const locateRegexpr = (0, combi_1.seq)("LOCATE_REGEXPR", "(", conversionInputs, ")");
+        const sqrt = (0, combi_1.seq)("SQRT", "(", _1.CDSFunctionInput, ")");
         const extFuncName = (0, combi_1.regex)(/^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)+$/i);
         const genericArgs = (0, combi_1.seq)(_1.CDSFunctionInput, (0, combi_1.starPrio)((0, combi_1.seq)(",", _1.CDSFunctionInput)));
         const namedArgValue = (0, combi_1.altPrio)((0, combi_1.seq)("INTERVAL", _1.CDSFunctionInput, _1.CDSName), _1.CDSFunctionInput, _1.CDSName);
@@ -65,7 +66,7 @@ class CDSFunction extends combi_1.Expression {
         const namedArgColon = (0, combi_1.seq)(_1.CDSName, ":", namedArgValue);
         const namedArgs = (0, combi_1.seq)((0, combi_1.altPrio)(namedArgArrow, namedArgColon), (0, combi_1.starPrio)((0, combi_1.seq)(",", (0, combi_1.altPrio)(namedArgArrow, namedArgColon))));
         const genericFunc = (0, combi_1.seq)(extFuncName, "(", (0, combi_1.optPrio)((0, combi_1.altPrio)(namedArgs, genericArgs)), ")");
-        return (0, combi_1.altPrio)(substring, coalesce, tstmp_to_dats, concat, tstmp_to_tims, upper, lower, abs, ceil, floor, round, div, division, concat_with_space, dats_is_valid, tims_is_valid, dats_days_between, tstmp_add_seconds, tstmp_seconds_between, tstmp_current_utctimestamp, tstmp_is_valid, utcl_current, abap_system_timezone, abap_user_timezone, bintohex, hextobin, dats_add_days, dats_add_months, tstmp_to_dst, dats_tims_to_tstmp, mod, left, right, lpad, rpad, instr, length, ltrim, rtrim, replace, unitConversion, currencyConversion, decimalShift, fltp_to_dec, ratioOf, replaceRegexpr, matchesRegexpr, occurrencesRegexpr, substrRegexpr, locateRegexpr, curr_to_decfloat_amount, genericFunc);
+        return (0, combi_1.altPrio)(substring, coalesce, tstmp_to_dats, concat, tstmp_to_tims, upper, lower, abs, ceil, floor, round, div, division, concat_with_space, dats_is_valid, tims_is_valid, dats_days_between, tstmp_add_seconds, tstmp_seconds_between, tstmp_current_utctimestamp, tstmp_is_valid, utcl_current, abap_system_timezone, abap_user_timezone, bintohex, hextobin, dats_add_days, dats_add_months, tstmp_to_dst, dats_tims_to_tstmp, mod, left, right, lpad, rpad, instr, length, ltrim, rtrim, replace, unitConversion, currencyConversion, decimalShift, fltp_to_dec, ratioOf, replaceRegexpr, matchesRegexpr, occurrencesRegexpr, substrRegexpr, locateRegexpr, curr_to_decfloat_amount, sqrt, genericFunc);
     }
 }
 exports.CDSFunction = CDSFunction;

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

@@ -5,8 +5,9 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSFunctionInput extends combi_1.Expression {
     getRunnable() {
-        const input = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSArithParen, _1.CDSAggregate, _1.CDSCast, _1.CDSFunction, _1.CDSCase, _1.CDSString, _1.CDSPrefixedName, _1.CDSInteger);
-        return input;
+        const positional = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSArithParen, _1.CDSAggregate, _1.CDSCast, _1.CDSFunction, _1.CDSCase, _1.CDSString, _1.CDSPrefixedName, _1.CDSInteger);
+        const named = (0, combi_1.seq)(_1.CDSName, "=", ">", positional);
+        return (0, combi_1.altPrio)(named, positional);
     }
 }
 exports.CDSFunctionInput = CDSFunctionInput;

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

@@ -2,10 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSName = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
+const KEYWORDS = ["AS", "ON", "WHERE", "WITH", "UNION", "GROUP", "HAVING",
+    "AND", "OR", "BETWEEN", "LIKE", "IN", "EXISTS",
+    "WHEN", "THEN", "ELSE", "END", "CASE", "CAST"];
 class CDSName extends combi_1.Expression {
     getRunnable() {
-        const pre = (0, combi_1.seq)("/", (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_]+$/)));
+        const word = (0, combi_1.regex)(/^\$?#?[\w_]+$/);
+        const slashName = (0, combi_1.seq)("/", (0, combi_1.regex)(/^[\w]+$/), "/", (0, combi_1.stopBefore1)(...KEYWORDS), (0, combi_1.regex)(/^[\w_]+$/));
+        return (0, combi_1.altPrio)((0, combi_1.regex)(/^"(?:[^"]|"")*"$/), (0, combi_1.seq)((0, combi_1.optPrio)(":"), slashName), (0, combi_1.seq)((0, combi_1.optPrio)(":"), word));
     }
 }
 exports.CDSName = CDSName;

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

@@ -6,7 +6,8 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSParametersSelect extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
-        const value = (0, combi_1.alt)(_1.CDSInteger, name, _1.CDSString);
+        const typedLiteral = (0, combi_1.seq)(_1.CDSType, _1.CDSString);
+        const value = (0, combi_1.altPrio)(typedLiteral, _1.CDSInteger, name, _1.CDSString);
         const colonPair = (0, combi_1.seq)(name, ":", value, (0, combi_1.optPrio)("DEFAULT"));
         const arrowPair = (0, combi_1.seq)(name, "=", ">", value);
         const nameValue = (0, combi_1.altPrio)(colonPair, arrowPair);

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSParenSelect = void 0;
+const _1 = require(".");
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSParenSelect extends combi_1.Expression {
+    getRunnable() {
+        const unionBranch = (0, combi_1.altPrio)(CDSParenSelect, _1.CDSSelect);
+        const unionOps = (0, combi_1.star)((0, combi_1.altPrio)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), unionBranch), (0, combi_1.seq)("EXCEPT", unionBranch), (0, combi_1.seq)("INTERSECT", unionBranch)));
+        return (0, combi_1.seq)("(", (0, combi_1.altPrio)((0, combi_1.seq)(CDSParenSelect, unionOps), (0, combi_1.seq)(_1.CDSSelect, unionOps)), ")");
+    }
+}
+exports.CDSParenSelect = CDSParenSelect;
+//# sourceMappingURL=cds_paren_select.js.map

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

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSPrefixedName = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
 const cds_name_1 = require("./cds_name");
+const cds_integer_1 = require("./cds_integer");
 const cds_parameters_1 = require("./cds_parameters");
 const cds_parameters_select_1 = require("./cds_parameters_select");
 const cds_condition_1 = require("./cds_condition");
-const cds_integer_1 = require("./cds_integer");
 const cds_string_1 = require("./cds_string");
 class CDSPrefixedName extends combi_1.Expression {
     getRunnable() {
@@ -16,13 +16,17 @@ class CDSPrefixedName extends combi_1.Expression {
         const cardinalityJoin = (0, combi_1.seq)("[", cardSpec, ":", joinType, "]");
         const cardinalityJoinWhere = (0, combi_1.seq)("[", cardSpec, ":", joinType, "WHERE", cds_condition_1.CDSCondition, "]");
         const joinWhere = (0, combi_1.seq)("[", joinType, "WHERE", cds_condition_1.CDSCondition, "]");
-        const textCard = (0, combi_1.altPrio)("MANY TO EXACT ONE", "MANY TO ONE", "ONE TO MANY", "ONE TO ONE", "TO EXACT ONE", "TO ONE", "TO MANY");
+        const textCard = (0, combi_1.altPrio)("EXACT ONE TO EXACT ONE", "EXACT ONE TO MANY", "EXACT ONE TO ONE", "MANY TO EXACT ONE", "MANY TO MANY", "MANY TO ONE", "ONE TO EXACT ONE", "ONE TO MANY", "ONE TO ONE", "TO EXACT ONE", "TO ONE", "TO MANY");
         const textCardFilter = (0, combi_1.seq)("[", textCard, (0, combi_1.optPrio)((0, combi_1.seq)(":", (0, combi_1.altPrio)((0, combi_1.seq)(joinType, "WHERE", cds_condition_1.CDSCondition), joinType, cds_condition_1.CDSCondition))), "]");
         const cardNum = (0, combi_1.altPrio)(cds_integer_1.CDSInteger, "*");
         const rangeCard = (0, combi_1.seq)(cds_integer_1.CDSInteger, ".", ".", cardNum);
         const rangeCardFilter = (0, combi_1.seq)("[", rangeCard, ":", cds_condition_1.CDSCondition, "]");
-        const pathFilter = (0, combi_1.altPrio)(cardinalityJoinWhere, joinWhere, cardinalityJoin, joinRedirect, textCardFilter, rangeCardFilter, (0, combi_1.seq)("[", cardSpec, ":", cds_condition_1.CDSCondition, "]"), (0, combi_1.seq)("[", cds_condition_1.CDSCondition, "]"));
-        const segment = (0, combi_1.seq)(".", (0, combi_1.altPrio)(cds_string_1.CDSString, cds_name_1.CDSName, "*"), (0, combi_1.optPrio)((0, combi_1.altPrio)(cds_parameters_select_1.CDSParametersSelect, cds_parameters_1.CDSParameters)), (0, combi_1.optPrio)(pathFilter));
+        const rangeOnly = (0, combi_1.seq)("[", rangeCard, "]");
+        const numToText = (0, combi_1.seq)(cds_integer_1.CDSInteger, (0, combi_1.altPrio)("TO EXACT ONE", "TO ONE", "TO MANY"));
+        const numTextCardFilter = (0, combi_1.seq)("[", numToText, (0, combi_1.optPrio)((0, combi_1.seq)(":", cds_condition_1.CDSCondition)), "]");
+        const numToNum = (0, combi_1.seq)("[", cds_integer_1.CDSInteger, "TO", cds_integer_1.CDSInteger, (0, combi_1.optPrio)((0, combi_1.seq)(":", cds_condition_1.CDSCondition)), "]");
+        const pathFilter = (0, combi_1.altPrio)(cardinalityJoinWhere, joinWhere, cardinalityJoin, joinRedirect, numToNum, numTextCardFilter, textCardFilter, rangeCardFilter, rangeOnly, (0, combi_1.seq)("[", cardSpec, ":", cds_condition_1.CDSCondition, "]"), (0, combi_1.seq)("[", cardSpec, "]"), (0, combi_1.seq)("[", cds_condition_1.CDSCondition, "]"));
+        const segment = (0, combi_1.seq)(".", (0, combi_1.altPrio)(cds_string_1.CDSString, cds_integer_1.CDSInteger, cds_name_1.CDSName, "*"), (0, combi_1.optPrio)((0, combi_1.altPrio)(cds_parameters_select_1.CDSParametersSelect, cds_parameters_1.CDSParameters)), (0, combi_1.optPrio)(pathFilter));
         return (0, combi_1.seq)(cds_name_1.CDSName, (0, combi_1.optPrio)((0, combi_1.altPrio)(cds_parameters_1.CDSParameters, cds_parameters_select_1.CDSParametersSelect)), (0, combi_1.optPrio)(pathFilter), (0, combi_1.star)(segment));
     }
 }

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

@@ -3,10 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSRelation = void 0;
 const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
+const KEYWORDS = ["AS", "ON", "WHERE", "WITH", "UNION", "GROUP", "HAVING",
+    "AND", "OR", "BETWEEN", "LIKE", "IN", "EXISTS",
+    "WHEN", "THEN", "ELSE", "END", "CASE", "CAST"];
 class CDSRelation extends combi_1.Expression {
     getRunnable() {
-        const pre = (0, combi_1.seq)("/", (0, combi_1.regex)(/^[\w_]+$/), "/");
-        return (0, combi_1.seq)((0, combi_1.opt)(pre), (0, combi_1.regex)(/^[\w_]+$/), (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs));
+        const word = (0, combi_1.regex)(/^[\w_]+$/);
+        const slashName = (0, combi_1.seq)("/", (0, combi_1.regex)(/^[\w]+$/), "/", (0, combi_1.stopBefore1)(...KEYWORDS), (0, combi_1.regex)(/^[\w_]+$/));
+        const name = (0, combi_1.altPrio)(slashName, word);
+        return (0, combi_1.seq)(name, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs));
     }
 }
 exports.CDSRelation = CDSRelation;

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

@@ -7,11 +7,12 @@ const cds_association_1 = require("./cds_association");
 const cds_join_1 = require("./cds_join");
 class CDSSelect extends combi_1.Expression {
     getRunnable() {
-        const fields = (0, combi_1.seq)((0, combi_1.star)((0, combi_1.seq)(_1.CDSElement, ",")), _1.CDSElement);
+        const fields = (0, combi_1.seq)((0, combi_1.stopBefore1)("FROM"), (0, combi_1.star)((0, combi_1.seq)(_1.CDSElement, ",")), _1.CDSElement);
         const distinct = (0, combi_1.str)("DISTINCT");
         const elementList = (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(","));
         const elements = (0, combi_1.seq)((0, combi_1.str)("{"), (0, combi_1.altPrio)("*", elementList), (0, combi_1.str)("}"));
-        const aspectValue = (0, combi_1.altPrio)(_1.CDSString, _1.CDSPrefixedName);
+        const typedLiteralVal = (0, combi_1.seq)(_1.CDSType, _1.CDSString);
+        const aspectValue = (0, combi_1.altPrio)(typedLiteralVal, _1.CDSString, _1.CDSPrefixedName);
         const aspectBinding = (0, combi_1.seq)(_1.CDSPrefixedName, "=", ">", aspectValue);
         const bindAspect = (0, combi_1.seq)("BIND", "ASPECT", _1.CDSName, "(", aspectBinding, (0, combi_1.starPrio)((0, combi_1.seq)(",", aspectBinding)), ")", (0, combi_1.optPrio)((0, combi_1.seq)("AS", _1.CDSName)));
         const parenSelect = (0, combi_1.seq)("(", CDSSelect, ")");

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

@@ -3,16 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSTableField = void 0;
 const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
-// A single field or association/composition inside a `define table entity { ... }`
-// inline body. Wraps annotations + name + type together so tooling can iterate
-// per-field with associated field-level annotations (matches the CDSElement
-// shape used for select-list elements).
 class CDSTableField extends combi_1.Expression {
     getRunnable() {
         const nullability = (0, combi_1.optPrio)((0, combi_1.alt)("NOT NULL", "NULL"));
+        const excludingNames = (0, combi_1.seq)(_1.CDSName, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSName)));
+        const excluding = (0, combi_1.seq)("EXCLUDING", "{", excludingNames, "}");
+        const includeField = (0, combi_1.seq)("INCLUDE", _1.CDSPrefixedName, (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.str)("SIGNATURE ONLY"), (0, combi_1.optPrio)(excluding)), (0, combi_1.seq)(excluding, (0, combi_1.optPrio)((0, combi_1.str)("SIGNATURE ONLY"))))));
         const field = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.str)("KEY")), _1.CDSName, ":", _1.CDSType, nullability);
         const assocOrComp = (0, combi_1.seq)(_1.CDSName, ":", (0, combi_1.alt)(_1.CDSComposition, _1.CDSAssociation));
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.alt)(field, assocOrComp), ";");
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.altPrio)(includeField, assocOrComp, field), ";");
     }
 }
 exports.CDSTableField = CDSTableField;

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

@@ -5,7 +5,9 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSWithParameters extends combi_1.Expression {
     getRunnable() {
-        const param = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), _1.CDSName, ":", _1.CDSType, (0, combi_1.star)(_1.CDSAnnotation));
+        const extNameValue = (0, combi_1.altPrio)(_1.CDSName, (0, combi_1.regex)(/^"(?:[^"]|"")*"$/));
+        const externalName = (0, combi_1.seq)("EXTERNAL", "NAME", extNameValue);
+        const param = (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), _1.CDSName, ":", _1.CDSType, (0, combi_1.opt)(externalName), (0, combi_1.star)(_1.CDSAnnotation));
         return (0, combi_1.seq)("WITH PARAMETERS", param, (0, combi_1.star)((0, combi_1.seq)(",", param)));
     }
 }

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

@@ -36,6 +36,7 @@ __exportStar(require("./cds_define_hierarchy"), exports);
 __exportStar(require("./cds_define_projection"), exports);
 __exportStar(require("./cds_define_table_entity"), exports);
 __exportStar(require("./cds_define_table_function"), exports);
+__exportStar(require("./cds_paren_select"), exports);
 __exportStar(require("./cds_define_view"), exports);
 __exportStar(require("./cds_element"), exports);
 __exportStar(require("./cds_extend_view"), exports);

package/build/src/registry.js

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

package/build/src/rules/unused_variables.js

@@ -59,35 +59,38 @@ class UnusedVariablesConf extends _basic_rule_config_1.BasicRuleConfig {
 exports.UnusedVariablesConf = UnusedVariablesConf;
 class WorkArea {
     constructor() {
-        this.workarea = [];
+        // keyed by filename + start position, this equals Identifier.equals()
+        this.workarea = new Map();
     }
     push(id, count = 1) {
-        for (const w of this.workarea) {
-            if (id.equals(w.id)) {
-                return;
-            }
+        const key = this.buildKey(id);
+        if (this.workarea.has(key)) {
+            return;
         }
-        this.workarea.push({ id, count });
+        this.workarea.set(key, { id, count });
     }
     removeIfExists(id) {
         if (id === undefined) {
             return;
         }
-        for (let i = 0; i < this.workarea.length; i++) {
-            if (id.equals(this.workarea[i].id)) {
-                this.workarea[i].count--;
-                if (this.workarea[i].count === 0) {
-                    this.workarea.splice(i, 1);
-                }
-                return;
+        const key = this.buildKey(id);
+        const found = this.workarea.get(key);
+        if (found !== undefined) {
+            found.count--;
+            if (found.count === 0) {
+                this.workarea.delete(key);
             }
         }
     }
     get() {
-        return this.workarea;
+        return [...this.workarea.values()];
     }
     count() {
-        return this.workarea.length;
+        return this.workarea.size;
+    }
+    buildKey(id) {
+        const start = id.getStart();
+        return id.getFilename() + "," + start.getRow() + "," + start.getCol();
     }
 }
 class UnusedVariables {
@@ -221,6 +224,9 @@ Errors found in INCLUDES are reported for the main program.`,
     }
     buildIssues(obj) {
         const ret = [];
+        const metadata = this.getMetadata();
+        const pragma = metadata.pragma + "";
+        const files = new Map();
         for (const w of this.workarea.get()) {
             const filename = w.id.getFilename();
             if (this.reg.isFileDependency(filename) === true) {
@@ -229,41 +235,51 @@ Errors found in INCLUDES are reported for the main program.`,
             else if (obj instanceof objects_1.Program === false && obj.containsFile(filename) === false) {
                 continue;
             }
-            const statement = this.findStatement(w.id);
-            if (statement === null || statement === void 0 ? void 0 : statement.getPragmas().map(t => t.getStr()).includes(this.getMetadata().pragma + "")) {
-                continue;
+            if (files.has(filename) === false) {
+                files.set(filename, this.findFile(filename));
             }
-            else if (this.suppressedbyPseudo(statement, w.id, obj)) {
-                continue;
+            const file = files.get(filename);
+            let statement = undefined;
+            let statementIndex = -1;
+            if (file !== undefined) {
+                const statements = file.getStatements();
+                const token = w.id.getToken();
+                for (let i = 0; i < statements.length; i++) {
+                    if (statements[i].includesToken(token)) {
+                        statement = statements[i];
+                        statementIndex = i;
+                        break;
+                    }
+                }
+            }
+            if (statement !== undefined && file !== undefined) {
+                if (statement.getPragmas().some(t => t.getStr() === pragma)) {
+                    continue;
+                }
+                else if (this.suppressedbyPseudo(file, statementIndex, w.id, obj)) {
+                    continue;
+                }
             }
             const name = w.id.getName();
             const message = "Variable \"" + name.toLowerCase() + "\" not used";
-            const fix = this.buildFix(w.id, obj);
-            ret.push(issue_1.Issue.atIdentifier(w.id, message, this.getMetadata().key, this.conf.severity, fix));
+            const fix = this.buildFix(w.id, obj, statement);
+            ret.push(issue_1.Issue.atIdentifier(w.id, message, metadata.key, this.conf.severity, fix));
         }
         return ret;
     }
-    suppressedbyPseudo(statement, v, obj) {
-        if (statement === undefined) {
+    suppressedbyPseudo(file, statementIndex, v, obj) {
+        // pseudo comments are only found in files belonging to the object itself, not in eg. includes
+        if (obj.getABAPFileByName(v.getFilename()) === undefined) {
             return false;
         }
-        const file = obj.getABAPFileByName(v.getFilename());
-        if (file === undefined) {
-            return false;
-        }
-        let next = false;
-        for (const s of file.getStatements()) {
-            if (next === true && s.get() instanceof _statement_1.Comment) {
-                return s.concatTokens().includes(this.getMetadata().pseudoComment + "");
-            }
-            if (s === statement) {
-                next = true;
-            }
-        }
+        const statements = file.getStatements();
+        const next = statements[statementIndex + 1];
+        return (next === null || next === void 0 ? void 0 : next.get()) instanceof _statement_1.Comment
+            && next.concatTokens().includes(this.getMetadata().pseudoComment + "");
         return false;
     }
-    findStatement(v) {
-        const file = this.reg.getFileByName(v.getFilename());
+    findFile(filename) {
+        const file = this.reg.getFileByName(filename);
         if (file === undefined) {
             return undefined;
         }
@@ -271,26 +287,17 @@ Errors found in INCLUDES are reported for the main program.`,
         if (!(object instanceof _abap_object_1.ABAPObject)) {
             return undefined;
         }
-        const abapfile = object.getABAPFileByName(v.getFilename());
-        if (abapfile === undefined) {
+        return object.getABAPFileByName(filename);
+    }
+    buildFix(v, obj, statement) {
+        if (statement === undefined || !(statement.get() instanceof Statements.Data)) {
             return undefined;
         }
-        const statement = edit_helper_1.EditHelper.findStatement(v.getToken(), abapfile);
-        return statement;
-    }
-    buildFix(v, obj) {
         const file = obj.getABAPFileByName(v.getFilename());
         if (file === undefined) {
             return undefined;
         }
-        const statement = edit_helper_1.EditHelper.findStatement(v.getToken(), file);
-        if (statement === undefined) {
-            return undefined;
-        }
-        else if (statement.get() instanceof Statements.Data) {
-            return edit_helper_1.EditHelper.deleteStatement(file, statement);
-        }
-        return undefined;
+        return edit_helper_1.EditHelper.deleteStatement(file, statement);
     }
 }
 exports.UnusedVariables = UnusedVariables;

package/package.json

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