@abaplint/core 2.113.172 → 2.113.174

package/build/abaplint.d.ts

@@ -1453,6 +1453,10 @@ declare class CorrespondingBody extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class CorrespondingBodyBase extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class CreateData implements IStatement {
     getMatcher(): IStatementRunnable;
 }
@@ -2308,6 +2312,7 @@ declare namespace Expressions {
         ComponentCompareSimple,
         ValueBase,
         ComponentCompareSingle,
+        CorrespondingBodyBase,
         ComponentCompare,
         ComponentCondSub,
         ComponentCond,

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

@@ -10,7 +10,7 @@ class Cast extends combi_1.Expression {
     getRunnable() {
         const rparen = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.WParenRight));
         const cast = (0, combi_1.seq)("CAST", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.optPrio)(let_1.Let), _1.Source, rparen);
-        return (0, combi_1.ver)(version_1.Version.v740sp02, cast);
+        return (0, combi_1.ver)(version_1.Version.v740sp02, cast, version_1.Version.OpenABAP);
     }
 }
 exports.Cast = Cast;

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

@@ -2,16 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CorrespondingBody = void 0;
 const combi_1 = require("../combi");
-const tokens_1 = require("../../1_lexer/tokens");
 const _1 = require(".");
 const version_1 = require("../../../version");
 const component_chain_1 = require("./component_chain");
 class CorrespondingBody extends combi_1.Expression {
     getRunnable() {
         const mapping = (0, combi_1.seq)("MAPPING", (0, combi_1.plus)((0, combi_1.seq)(_1.ComponentName, "=", component_chain_1.ComponentChain)));
-        const baseParen = (0, combi_1.seq)("BASE", (0, combi_1.tok)(tokens_1.WParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
         const discarding = (0, combi_1.ver)(version_1.Version.v751, "DISCARDING DUPLICATES");
-        return (0, combi_1.seq)((0, combi_1.optPrio)("DEEP"), (0, combi_1.optPrio)(baseParen), _1.Source, (0, combi_1.optPrio)(discarding), (0, combi_1.optPrio)(mapping), (0, combi_1.optPrio)("CHANGING CONTROL"), (0, combi_1.optPrio)((0, combi_1.seq)("MAPPING FROM ENTITY", (0, combi_1.optPrio)("USING CONTROL"))), // todo, version something?
+        return (0, combi_1.seq)((0, combi_1.optPrio)("DEEP"), (0, combi_1.optPrio)(_1.CorrespondingBodyBase), _1.Source, (0, combi_1.optPrio)(discarding), (0, combi_1.optPrio)(mapping), (0, combi_1.optPrio)("CHANGING CONTROL"), (0, combi_1.optPrio)((0, combi_1.seq)("MAPPING FROM ENTITY", (0, combi_1.optPrio)("USING CONTROL"))), // todo, version something?
         (0, combi_1.optPrio)((0, combi_1.seq)("EXCEPT", (0, combi_1.alt)((0, combi_1.plus)(_1.Field), "*"))));
     }
 }

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CorrespondingBodyBase = void 0;
+const combi_1 = require("../combi");
+const tokens_1 = require("../../1_lexer/tokens");
+const _1 = require(".");
+class CorrespondingBodyBase extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.seq)("BASE", (0, combi_1.tok)(tokens_1.WParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
+    }
+}
+exports.CorrespondingBodyBase = CorrespondingBodyBase;
+//# sourceMappingURL=corresponding_body_base.js.map

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

@@ -41,6 +41,7 @@ __exportStar(require("./component_chain"), exports);
 __exportStar(require("./component_compare_simple"), exports);
 __exportStar(require("./value_base"), exports);
 __exportStar(require("./component_compare_single"), exports);
+__exportStar(require("./corresponding_body_base"), exports);
 __exportStar(require("./component_compare"), exports);
 __exportStar(require("./component_cond_sub"), exports);
 __exportStar(require("./component_cond"), exports);

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

@@ -25,7 +25,7 @@ class Source extends combi_1.Expression {
         const bool = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v702, (0, combi_1.regex)(/^BOOLC$/i), version_1.Version.OpenABAP), (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.regex)(/^XSDBOOL$/i), version_1.Version.OpenABAP)), (0, combi_1.tok)(tokens_1.ParenLeftW), _1.Cond, ")");
         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 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)), version_1.Version.OpenABAP);
         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)), version_1.Version.OpenABAP);

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

@@ -11,7 +11,7 @@ class TableExpression extends combi_1.Expression {
         const key = (0, combi_1.seq)("KEY", _1.SimpleName);
         const index = (0, combi_1.seq)("INDEX", _1.Source);
         const ret = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.BracketLeftW), (0, combi_1.alt)(_1.Source, (0, combi_1.seq)((0, combi_1.optPrio)(key), (0, combi_1.opt)("COMPONENTS"), (0, combi_1.altPrio)(fields, index))), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WBracketRight), (0, combi_1.tok)(tokens_1.WBracketRightW)));
-        return (0, combi_1.ver)(version_1.Version.v740sp02, ret);
+        return (0, combi_1.ver)(version_1.Version.v740sp02, ret, version_1.Version.OpenABAP);
     }
 }
 exports.TableExpression = TableExpression;

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

@@ -5,9 +5,14 @@ const Expressions = require("../../2_statements/expressions");
 const source_1 = require("./source");
 class CorrespondingBody {
     static runSyntax(node, input, targetType) {
+        var _a;
         if (node === undefined) {
             return targetType;
         }
+        const base = (_a = node.findDirectExpression(Expressions.CorrespondingBodyBase)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Source);
+        if (base) {
+            source_1.Source.runSyntax(base, input);
+        }
         let type = undefined;
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             if (type === undefined) {

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -1313,7 +1313,7 @@ ${indentation}${uniqueName2}->if_t100_message~t100key = ${uniqueName1}.\n`;
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, call function parameter", this.getMetadata().key, this.conf.severity, fix);
     }
     downportCorrespondingSimple(high, lowFile) {
-        var _a, _b;
+        var _a;
         if (!(high.get() instanceof Statements.Move)
             || high.getChildren().length !== 4
             || high.getChildren()[2].getFirstToken().getStr().toUpperCase() !== "CORRESPONDING") {
@@ -1331,9 +1331,10 @@ ${indentation}${uniqueName2}->if_t100_message~t100key = ${uniqueName1}.\n`;
             const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
             return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, simple CORRESPONDING move", this.getMetadata().key, this.conf.severity, fix);
         }
-        else if ((sourceRef === null || sourceRef === void 0 ? void 0 : sourceRef.getChildren().length) === 5 && ((_b = sourceRef.getFirstChild()) === null || _b === void 0 ? void 0 : _b.concatTokens().toUpperCase()) === "BASE") {
-            let code = `${target.concatTokens()} = ${sourceRef.getChildren()[2].concatTokens()}.\n`;
-            code += `MOVE-CORRESPONDING ${sourceRef.getChildren()[4].concatTokens()} TO ${target.concatTokens()}`;
+        else if ((sourceRef === null || sourceRef === void 0 ? void 0 : sourceRef.getChildren().length) === 2 && sourceRef.findDirectExpression(Expressions.CorrespondingBodyBase) !== undefined) {
+            const base = sourceRef.findDirectExpression(Expressions.CorrespondingBodyBase);
+            let code = `${target.concatTokens()} = ${base.getChildren()[2].concatTokens()}.\n`;
+            code += `MOVE-CORRESPONDING ${sourceRef.getChildren()[1].concatTokens()} TO ${target.concatTokens()}`;
             const start = high.getFirstToken().getStart();
             const end = high.getLastToken().getStart();
             const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);

package/package.json

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