@abaplint/core 2.113.152 → 2.113.154

package/build/abaplint.d.ts

@@ -2374,10 +2374,12 @@ declare namespace Expressions {
         LoopGroupByComponent,
         LoopGroupByTarget,
         LoopGroupBy,
+        LoopSource,
         LoopTarget,
         MacroName,
         MessageClass_2 as MessageClass,
         MessageNumber,
+        MessageSourceSource,
         MessageSource,
         MessageTypeAndNumber,
         MethodCallBody,
@@ -2412,6 +2414,7 @@ declare namespace Expressions {
         PerformChanging,
         PerformTables,
         PerformUsing,
+        ProvideFieldName,
         RadioGroupName,
         RaiseWith,
         ReadTableTarget,
@@ -2455,7 +2458,6 @@ declare namespace Expressions {
         SQLForAllEntries,
         SQLFromSource,
         SQLFrom,
-        ProvideFieldName,
         SQLFunctionInput,
         SQLFunction,
         SQLGroupBy,
@@ -4307,6 +4309,10 @@ declare class LoopGroupByTarget extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class LoopSource extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class LoopTarget extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -4394,6 +4400,10 @@ declare class MessageSource extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class MessageSourceSource extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class MessageTypeAndNumber extends Expression {
     getRunnable(): IStatementRunnable;
 }

package/build/src/abap/2_statements/expressions/index.js

@@ -108,10 +108,12 @@ __exportStar(require("./lob_handle"), exports);
 __exportStar(require("./loop_group_by_component"), exports);
 __exportStar(require("./loop_group_by_target"), exports);
 __exportStar(require("./loop_group_by"), exports);
+__exportStar(require("./loop_source"), exports);
 __exportStar(require("./loop_target"), exports);
 __exportStar(require("./macro_name"), exports);
 __exportStar(require("./message_class"), exports);
 __exportStar(require("./message_number"), exports);
+__exportStar(require("./message_source_source"), exports);
 __exportStar(require("./message_source"), exports);
 __exportStar(require("./message_type_and_number"), exports);
 __exportStar(require("./method_call_body"), exports);
@@ -146,6 +148,7 @@ __exportStar(require("./pass_by_value"), exports);
 __exportStar(require("./perform_changing"), exports);
 __exportStar(require("./perform_tables"), exports);
 __exportStar(require("./perform_using"), exports);
+__exportStar(require("./provide_field_name"), exports);
 __exportStar(require("./radio_group_name"), exports);
 __exportStar(require("./raise_with"), exports);
 __exportStar(require("./read_table_target"), exports);
@@ -189,7 +192,6 @@ __exportStar(require("./sql_fields"), exports);
 __exportStar(require("./sql_for_all_entries"), exports);
 __exportStar(require("./sql_from_source"), exports);
 __exportStar(require("./sql_from"), exports);
-__exportStar(require("./provide_field_name"), exports);
 __exportStar(require("./sql_function_input"), exports);
 __exportStar(require("./sql_function"), exports);
 __exportStar(require("./sql_group_by"), exports);

package/build/src/abap/2_statements/expressions/loop_source.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoopSource = void 0;
+const combi_1 = require("../combi");
+const _1 = require(".");
+const version_1 = require("../../../version");
+class LoopSource extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.alt)(_1.SimpleSource2, (0, combi_1.ver)(version_1.Version.v740sp02, _1.Source, version_1.Version.OpenABAP));
+    }
+}
+exports.LoopSource = LoopSource;
+//# sourceMappingURL=loop_source.js.map

package/build/src/abap/2_statements/expressions/message_source_source.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageSourceSource = void 0;
+const combi_1 = require("../combi");
+const _1 = require(".");
+const version_1 = require("../../../version");
+class MessageSourceSource extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp02, _1.Source), _1.SimpleSource3);
+    }
+}
+exports.MessageSourceSource = MessageSourceSource;
+//# sourceMappingURL=message_source_source.js.map

package/build/src/abap/2_statements/expressions/source.js

@@ -26,7 +26,7 @@ class Source extends combi_1.Expression {
         const prefix = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WPlus), "BIT-NOT");
         const old = (0, combi_1.seq)((0, combi_1.optPrio)(prefix), (0, combi_1.altPrio)(_1.Constant, _1.StringTemplate, text_element_1.TextElement, bool, method, (0, combi_1.seq)(_1.FieldChain, deref), paren), (0, combi_1.optPrio)(after));
         const corr = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("CORRESPONDING", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CorrespondingBody, rparen, (0, combi_1.optPrio)(after)));
-        const conv = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("CONV", _1.TypeNameOrInfer, lparenNoSpace, _1.ConvBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
+        const conv = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("CONV", _1.TypeNameOrInfer, lparenNoSpace, _1.ConvBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const swit = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("SWITCH", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.SwitchBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
         const value = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("VALUE", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.ValueBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
         const cond = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("COND", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CondBody, rparenNoSpace, (0, combi_1.optPrio)(after)));

package/build/src/abap/2_statements/expressions/type_table_key.js

@@ -8,7 +8,7 @@ class TypeTableKey extends combi_1.Expression {
     getRunnable() {
         const uniqueness = (0, combi_1.alt)("NON-UNIQUE", "UNIQUE");
         const defaultKey = "DEFAULT KEY";
-        const emptyKey = (0, combi_1.ver)(version_1.Version.v740sp02, "EMPTY KEY");
+        const emptyKey = (0, combi_1.ver)(version_1.Version.v740sp02, "EMPTY KEY", version_1.Version.OpenABAP);
         const components = (0, combi_1.plus)((0, combi_1.alt)((0, combi_1.seq)("WITH", (0, combi_1.failStar)()), _1.FieldSub));
         const further = (0, combi_1.seq)((0, combi_1.alt)("WITHOUT", "WITH"), "FURTHER SECONDARY KEYS");
         const alias = (0, combi_1.seq)("ALIAS", _1.Field);

package/build/src/abap/2_statements/statements/loop.js

@@ -4,7 +4,6 @@ exports.Loop = void 0;
 const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
 const version_1 = require("../../../version");
-const simple_source2_1 = require("../expressions/simple_source2");
 const loop_group_by_1 = require("../expressions/loop_group_by");
 class Loop {
     getMatcher() {
@@ -15,7 +14,7 @@ class Loop {
         const to = (0, combi_1.seq)("TO", expressions_1.Source);
         const usingKey = (0, combi_1.seq)("USING KEY", (0, combi_1.altPrio)(expressions_1.SimpleName, expressions_1.Dynamic));
         const options = (0, combi_1.per)(expressions_1.LoopTarget, from, to, where, usingKey, group, step);
-        const at = (0, combi_1.seq)("AT", (0, combi_1.opt)((0, combi_1.seq)("SCREEN", (0, combi_1.failCombinator)())), (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp08, "GROUP")), (0, combi_1.alt)(simple_source2_1.SimpleSource2, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source)), (0, combi_1.opt)(options));
+        const at = (0, combi_1.seq)("AT", (0, combi_1.opt)((0, combi_1.seq)("SCREEN", (0, combi_1.failCombinator)())), (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp08, "GROUP")), expressions_1.LoopSource, (0, combi_1.opt)(options));
         return (0, combi_1.seq)("LOOP", (0, combi_1.opt)(at));
     }
 }

package/build/src/abap/2_statements/statements/message.js

@@ -6,17 +6,16 @@ const expressions_1 = require("../expressions");
 const version_1 = require("../../../version");
 class Message {
     getMatcher() {
-        const s = (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source), expressions_1.SimpleSource3);
         const like = (0, combi_1.seq)("DISPLAY LIKE", expressions_1.Source);
         const into = (0, combi_1.seq)("INTO", expressions_1.Target);
         const raising = (0, combi_1.seq)("RAISING", expressions_1.ExceptionName);
         const options = (0, combi_1.per)(like, into, raising);
         const type = (0, combi_1.seq)("TYPE", expressions_1.Source);
-        const sou = (0, combi_1.altPrio)(options, s);
-        const sourc = (0, combi_1.alt)(sou, (0, combi_1.seq)(s, sou), (0, combi_1.seq)(s, s, sou), (0, combi_1.seq)(s, s, s, options));
-        const mwith = (0, combi_1.seq)("WITH", s, (0, combi_1.opt)(sourc));
+        const sou = (0, combi_1.altPrio)(options, expressions_1.MessageSourceSource);
+        const sourc = (0, combi_1.alt)(sou, (0, combi_1.seq)(expressions_1.MessageSourceSource, sou), (0, combi_1.seq)(expressions_1.MessageSourceSource, expressions_1.MessageSourceSource, sou), (0, combi_1.seq)(expressions_1.MessageSourceSource, expressions_1.MessageSourceSource, expressions_1.MessageSourceSource, options));
+        const mwith = (0, combi_1.seq)("WITH", expressions_1.MessageSourceSource, (0, combi_1.opt)(sourc));
         const foo = (0, combi_1.seq)(expressions_1.MessageSource, (0, combi_1.opt)(options), (0, combi_1.opt)(mwith));
-        const text = (0, combi_1.seq)(s, type, (0, combi_1.optPrio)(like), (0, combi_1.optPrio)(raising));
+        const text = (0, combi_1.seq)(expressions_1.MessageSourceSource, type, (0, combi_1.optPrio)(like), (0, combi_1.optPrio)(raising));
         const cloud1 = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.seq)("WITH", expressions_1.Source, (0, combi_1.opt)(expressions_1.Source), (0, combi_1.opt)(expressions_1.Source), (0, combi_1.opt)(expressions_1.Source))), (0, combi_1.altPrio)(into, raising));
         const cloud2 = (0, combi_1.seq)((0, combi_1.altPrio)(into, raising), (0, combi_1.opt)((0, combi_1.seq)("WITH", expressions_1.Source, (0, combi_1.opt)(expressions_1.Source), (0, combi_1.opt)(expressions_1.Source), (0, combi_1.opt)(expressions_1.Source))));
         const cloud = (0, combi_1.seq)(expressions_1.MessageSource, (0, combi_1.alt)(cloud1, cloud2));

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

@@ -14,6 +14,7 @@ const loop_group_by_1 = require("../expressions/loop_group_by");
 const _syntax_input_1 = require("../_syntax_input");
 class Loop {
     runSyntax(node, input) {
+        var _a;
         const loopTarget = node.findDirectExpression(Expressions.LoopTarget);
         let target = loopTarget === null || loopTarget === void 0 ? void 0 : loopTarget.findDirectExpression(Expressions.Target);
         const targetType = target ? target_1.Target.runSyntax(target, input) : undefined;
@@ -22,7 +23,7 @@ class Loop {
         }
         const write = (loopTarget === null || loopTarget === void 0 ? void 0 : loopTarget.findDirectTokenByText("ASSIGNING")) !== undefined;
         const sources = node.findDirectExpressions(Expressions.Source);
-        let firstSource = node.findDirectExpression(Expressions.SimpleSource2);
+        let firstSource = (_a = node.findDirectExpression(Expressions.LoopSource)) === null || _a === void 0 ? void 0 : _a.getFirstChild();
         if (firstSource === undefined) {
             firstSource = sources[0];
         }

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

@@ -17,6 +17,14 @@ class Message {
         else if (found) {
             target_1.Target.runSyntax(found, input);
         }
+        for (const mss of node.findDirectExpressions(Expressions.MessageSourceSource)) {
+            for (const s of mss.findDirectExpressions(Expressions.Source)) {
+                source_1.Source.runSyntax(s, input);
+            }
+            for (const s of mss.findDirectExpressions(Expressions.SimpleSource3)) {
+                source_1.Source.runSyntax(s, input);
+            }
+        }
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             source_1.Source.runSyntax(s, input);
         }

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.152";
+        return "2.113.154";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/downport.js

@@ -932,11 +932,14 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
         return undefined;
     }
     downportMessageSource(high, lowFile, highSyntax) {
+        var _a;
         if (!(high.get() instanceof Statements.Message)) {
             return undefined;
         }
         const source = high.findExpressionAfterToken("MESSAGE");
-        if ((source === null || source === void 0 ? void 0 : source.get()) instanceof Expressions.Source) {
+        if ((source === null || source === void 0 ? void 0 : source.get()) instanceof Expressions.MessageSourceSource
+            && ((_a = source.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.Source) {
+            ;
             const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             const firstToken = high.getFirstToken();
@@ -1251,7 +1254,7 @@ ${indentation}${uniqueName2}->if_t100_message~t100key = ${uniqueName1}.\n`;
         }
         abap += `${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, node.getStart(), node.getEnd(), abap);
-        return issue_1.Issue.atToken(lowFile, startToken, "Downport RAISE MESSAGE", this.getMetadata().key, this.conf.severity, fix);
+        return issue_1.Issue.atToken(lowFile, startToken, "Downport RAISE EXCEPTION MESSAGE", this.getMetadata().key, this.conf.severity, fix);
     }
     emptyKey(low, node, lowFile) {
         if (!(low.get() instanceof _statement_1.Unknown)) {
@@ -1795,17 +1798,18 @@ ${indentation}    output = ${uniqueName}.\n`;
         return undefined;
     }
     outlineLoopInput(low, high, lowFile, highSyntax) {
+        var _a, _b;
         if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;
         }
         else if (!(high.get() instanceof Statements.Loop)) {
             return undefined;
         }
-        else if (high.findDirectExpression(Expressions.SimpleSource2)) {
+        else if ((_a = high.findDirectExpression(Expressions.LoopSource)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.SimpleSource2)) {
             return undefined;
         }
         // the first Source must be outlined
-        const s = high.findDirectExpression(Expressions.Source);
+        const s = (_b = high.findDirectExpression(Expressions.LoopSource)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(Expressions.Source);
         if (s === undefined) {
             return undefined;
         }
@@ -1818,12 +1822,12 @@ ${indentation}    output = ${uniqueName}.\n`;
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Outline LOOP input", this.getMetadata().key, this.conf.severity, fix);
     }
     outlineLoopTarget(node, lowFile, highSyntax) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         // also allows outlining of voided types
         if (!(node.get() instanceof Statements.Loop)) {
             return undefined;
         }
-        const source = node.findDirectExpression(Expressions.SimpleSource2);
+        const source = (_a = node.findDirectExpression(Expressions.LoopSource)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.SimpleSource2);
         if (source === undefined) {
             return undefined;
         }
@@ -1842,9 +1846,9 @@ ${indentation}    output = ${uniqueName}.\n`;
         }
         const isReference = concat.includes(" REFERENCE INTO ");
         const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
-        const dataTarget = (_b = (_a = node.findDirectExpression(Expressions.LoopTarget)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Target)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(Expressions.InlineData);
+        const dataTarget = (_c = (_b = node.findDirectExpression(Expressions.LoopTarget)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(Expressions.Target)) === null || _c === void 0 ? void 0 : _c.findDirectExpression(Expressions.InlineData);
         if (dataTarget) {
-            const targetName = ((_c = dataTarget.findDirectExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "DOWNPORT_ERROR";
+            const targetName = ((_d = dataTarget.findDirectExpression(Expressions.TargetField)) === null || _d === void 0 ? void 0 : _d.concatTokens()) || "DOWNPORT_ERROR";
             let code = `DATA ${targetName} LIKE LINE OF ${sourceName}.\n${indentation}`;
             if (isReference) {
                 const likeName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
@@ -1855,9 +1859,9 @@ ${indentation}    output = ${uniqueName}.\n`;
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
             return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Outline LOOP data target", this.getMetadata().key, this.conf.severity, fix);
         }
-        const fsTarget = (_e = (_d = node.findDirectExpression(Expressions.LoopTarget)) === null || _d === void 0 ? void 0 : _d.findDirectExpression(Expressions.FSTarget)) === null || _e === void 0 ? void 0 : _e.findDirectExpression(Expressions.InlineFS);
+        const fsTarget = (_f = (_e = node.findDirectExpression(Expressions.LoopTarget)) === null || _e === void 0 ? void 0 : _e.findDirectExpression(Expressions.FSTarget)) === null || _f === void 0 ? void 0 : _f.findDirectExpression(Expressions.InlineFS);
         if (fsTarget) {
-            const targetName = ((_f = fsTarget.findDirectExpression(Expressions.TargetFieldSymbol)) === null || _f === void 0 ? void 0 : _f.concatTokens()) || "DOWNPORT_ERROR";
+            const targetName = ((_g = fsTarget.findDirectExpression(Expressions.TargetFieldSymbol)) === null || _g === void 0 ? void 0 : _g.concatTokens()) || "DOWNPORT_ERROR";
             let type = `LIKE LINE OF ${sourceName}`;
             const f = foundType === null || foundType === void 0 ? void 0 : foundType.getType();
             if (f instanceof basic_1.TableType && f.getRowType() instanceof basic_1.AnyType) {

package/package.json

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