@abaplint/core 2.91.29 → 2.91.32

package/build/abaplint.d.ts

@@ -209,6 +209,10 @@ declare class AssignmentServiceToAuthorizationGroup extends AbstractObject {
     getDescription(): string | undefined;
 }
 
+declare class AssignSource extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class AssociationName extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -701,6 +705,7 @@ declare class ChapterOfBookStructure extends AbstractObject {
 declare class CharacterType extends AbstractType {
     private readonly length;
     constructor(length: number, qualifiedName?: string);
+    cloneType(qualifiedName?: string): CharacterType;
     getLength(): number;
     toText(): string;
     toABAP(): string;
@@ -1799,6 +1804,7 @@ declare namespace Expressions {
         Cast,
         ClassFinal,
         ClassFriends,
+        AssignSource,
         ClassGlobal_2 as ClassGlobal,
         ClassName,
         Color,

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

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AssignSource = void 0;
+const combi_1 = require("../combi");
+const tokens_1 = require("../../1_lexer/tokens");
+const source_1 = require("./source");
+const dynamic_1 = require("./dynamic");
+const field_1 = require("./field");
+class AssignSource extends combi_1.Expression {
+    getRunnable() {
+        const component = (0, combi_1.seq)("COMPONENT", source_1.Source, "OF STRUCTURE", source_1.Source);
+        const tableField = (0, combi_1.seq)("TABLE FIELD", (0, combi_1.alt)(source_1.Source, dynamic_1.Dynamic));
+        const arrow = (0, combi_1.alt)((0, combi_1.tok)(tokens_1.InstanceArrow), (0, combi_1.tok)(tokens_1.StaticArrow));
+        const source = (0, combi_1.alt)((0, combi_1.seq)(source_1.Source, (0, combi_1.opt)((0, combi_1.seq)(arrow, dynamic_1.Dynamic))), component, tableField, (0, combi_1.seq)(dynamic_1.Dynamic, (0, combi_1.opt)((0, combi_1.seq)(arrow, (0, combi_1.alt)(field_1.Field, dynamic_1.Dynamic)))));
+        return source;
+    }
+}
+exports.AssignSource = AssignSource;
+//# sourceMappingURL=assign_source.js.map

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

@@ -29,6 +29,7 @@ __exportStar(require("./call_transformation_parameters"), exports);
 __exportStar(require("./cast"), exports);
 __exportStar(require("./class_final"), exports);
 __exportStar(require("./class_friends"), exports);
+__exportStar(require("./assign_source"), exports);
 __exportStar(require("./class_global"), exports);
 __exportStar(require("./class_name"), exports);
 __exportStar(require("./color"), exports);

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

@@ -2,14 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Assign = void 0;
 const combi_1 = require("../combi");
-const tokens_1 = require("../../1_lexer/tokens");
 const expressions_1 = require("../expressions");
 class Assign {
     getMatcher() {
-        const component = (0, combi_1.seq)("COMPONENT", expressions_1.Source, "OF STRUCTURE", expressions_1.Source);
-        const tableField = (0, combi_1.seq)("TABLE FIELD", (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic));
-        const arrow = (0, combi_1.alt)((0, combi_1.tok)(tokens_1.InstanceArrow), (0, combi_1.tok)(tokens_1.StaticArrow));
-        const source = (0, combi_1.alt)((0, combi_1.seq)(expressions_1.Source, (0, combi_1.opt)((0, combi_1.seq)(arrow, expressions_1.Dynamic))), component, tableField, (0, combi_1.seq)(expressions_1.Dynamic, (0, combi_1.opt)((0, combi_1.seq)(arrow, (0, combi_1.alt)(expressions_1.Field, expressions_1.Dynamic)))));
         const type = (0, combi_1.seq)("TYPE", (0, combi_1.alt)(expressions_1.Dynamic, expressions_1.TypeName));
         const like = (0, combi_1.seq)("LIKE", (0, combi_1.alt)(expressions_1.Dynamic, expressions_1.Source));
         const handle = (0, combi_1.seq)("TYPE HANDLE", expressions_1.Source);
@@ -17,7 +12,7 @@ class Assign {
         const decimals = (0, combi_1.seq)("DECIMALS", expressions_1.Source);
         const casting = (0, combi_1.seq)("CASTING", (0, combi_1.opt)((0, combi_1.alt)(like, handle, (0, combi_1.per)(type, decimals))));
         const obsoleteType = (0, combi_1.seq)("TYPE", expressions_1.Source, (0, combi_1.optPrio)(decimals));
-        const ret = (0, combi_1.seq)("ASSIGN", (0, combi_1.opt)((0, combi_1.seq)(expressions_1.Target, "INCREMENT")), source, "TO", expressions_1.FSTarget, (0, combi_1.opt)((0, combi_1.altPrio)(casting, obsoleteType)), (0, combi_1.opt)(range));
+        const ret = (0, combi_1.seq)("ASSIGN", (0, combi_1.opt)((0, combi_1.seq)(expressions_1.Target, "INCREMENT")), expressions_1.AssignSource, "TO", expressions_1.FSTarget, (0, combi_1.opt)((0, combi_1.altPrio)(casting, obsoleteType)), (0, combi_1.opt)(range));
         return ret;
     }
 }

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

@@ -164,17 +164,20 @@ class BasicTypes {
         }
         return type;
     }
-    resolveTypeName(typeName, length, decimals, name) {
+    resolveTypeName(typeName, length, decimals, qualifiedName) {
         var _a;
         if (typeName === undefined) {
             return undefined;
         }
-        const chain = this.resolveTypeChain(typeName);
+        let chain = this.resolveTypeChain(typeName);
         if (chain) {
+            if (chain instanceof basic_1.CharacterType && qualifiedName) {
+                chain = chain.cloneType(qualifiedName);
+            }
             return chain;
         }
         const chainText = typeName.concatTokens().toUpperCase();
-        const f = this.scope.getDDIC().lookupBuiltinType(chainText, length, decimals, name);
+        const f = this.scope.getDDIC().lookupBuiltinType(chainText, length, decimals, qualifiedName);
         if (f !== undefined) {
             return f;
         }

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

@@ -8,13 +8,14 @@ const dynamic_1 = require("../expressions/dynamic");
 const basic_1 = require("../../types/basic");
 class Assign {
     runSyntax(node, scope, filename) {
-        const sources = node.findDirectExpressions(Expressions.Source);
+        var _a, _b;
+        const sources = node.findAllExpressions(Expressions.Source);
         const firstSource = sources[0];
         let sourceType = new source_1.Source().runSyntax(firstSource, scope, filename);
-        if (sourceType === undefined || node.findDirectExpression(Expressions.Dynamic)) {
+        if (sourceType === undefined || ((_a = node.findDirectExpression(Expressions.AssignSource)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Dynamic))) {
             sourceType = new basic_1.VoidType("DynamicAssign");
         }
-        for (const d of node.findAllExpressions(Expressions.Dynamic)) {
+        for (const d of ((_b = node.findDirectExpression(Expressions.AssignSource)) === null || _b === void 0 ? void 0 : _b.findAllExpressions(Expressions.Dynamic)) || []) {
             new dynamic_1.Dynamic().runSyntax(d, scope, filename);
         }
         const target = node.findDirectExpression(Expressions.FSTarget);

package/build/src/abap/types/basic/character_type.js

@@ -10,6 +10,9 @@ class CharacterType extends _abstract_type_1.AbstractType {
         }
         this.length = length;
     }
+    cloneType(qualifiedName) {
+        return new CharacterType(this.length, qualifiedName);
+    }
     getLength() {
         return this.length;
     }

package/build/src/registry.js

@@ -68,7 +68,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.91.29";
+        return "2.91.32";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/downport.js

@@ -969,12 +969,14 @@ LOOP AT ${groupTargetName}tab ${groupTarget}.`;
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, REF", this.getMetadata().key, this.conf.severity, fix);
     }
     assignWithTable(high, lowFile) {
-        var _a;
-        if (!(high.get() instanceof Statements.Assign)
-            || high.getChildren().length !== 5) {
+        var _a, _b;
+        if (!(high.get() instanceof Statements.Assign)) {
+            return undefined;
+        }
+        else if (high.getChildren().length !== 5) {
             return undefined;
         }
-        const fieldChain = (_a = high.findDirectExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.FieldChain);
+        const fieldChain = (_b = (_a = high.findDirectExpression(Expressions.AssignSource)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Source)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(Expressions.FieldChain);
         if ((fieldChain === null || fieldChain === void 0 ? void 0 : fieldChain.getChildren().length) !== 2) {
             return undefined;
         }
@@ -983,12 +985,22 @@ LOOP AT ${groupTargetName}tab ${groupTarget}.`;
             || !(tableExpression instanceof nodes_1.ExpressionNode)) {
             return undefined;
         }
-        const index = tableExpression.findDirectExpression(Expressions.Source);
-        if (index === undefined) {
-            return undefined;
+        let condition = "";
+        if (tableExpression.getChildren().length === 3) {
+            const index = tableExpression.findDirectExpression(Expressions.Source);
+            if (index === undefined) {
+                return undefined;
+            }
+            condition = `INDEX ${index.concatTokens()}`;
+        }
+        else {
+            let concat = tableExpression.concatTokens();
+            concat = concat.substring(2);
+            concat = concat.substring(0, concat.length - 2);
+            condition = `WITH KEY ${concat}`;
         }
         const fsTarget = high.findDirectExpression(Expressions.FSTarget);
-        const code = `READ TABLE ${fieldChain === null || fieldChain === void 0 ? void 0 : fieldChain.getChildren()[0].concatTokens()} INDEX ${index.concatTokens()} ASSIGNING ${fsTarget === null || fsTarget === void 0 ? void 0 : fsTarget.concatTokens()}.`;
+        const code = `READ TABLE ${fieldChain === null || fieldChain === void 0 ? void 0 : fieldChain.getChildren()[0].concatTokens()} ${condition} ASSIGNING ${fsTarget === null || fsTarget === void 0 ? void 0 : fsTarget.concatTokens()}.`;
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, high.getFirstToken().getStart(), high.getLastToken().getEnd(), code);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, ASSIGN table expr", this.getMetadata().key, this.conf.severity, fix);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.91.29",
+    "version": "2.91.32",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,9 +48,9 @@
         "@microsoft/api-extractor": "^7.29.2",
         "@types/chai": "^4.3.3",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^18.7.2",
+        "@types/node": "^18.7.3",
         "chai": "^4.3.6",
-        "eslint": "^8.21.0",
+        "eslint": "^8.22.0",
         "mocha": "^10.0.0",
         "c8": "^7.12.0",
         "source-map-support": "^0.5.21",