@abaplint/core 2.95.38 → 2.95.40

package/build/abaplint.d.ts

@@ -5819,7 +5819,7 @@ export { Structures }
 declare class StructureType extends AbstractType {
     private readonly indexed;
     private readonly components;
-    constructor(components: IStructureComponent[], qualifiedName?: string);
+    constructor(components: IStructureComponent[], qualifiedName?: string, ddicName?: string);
     getComponents(): IStructureComponent[];
     getComponentByName(name: string): AbstractType | undefined;
     toText(level: number): string;

package/build/src/abap/1_lexer/lexer.js

@@ -330,7 +330,10 @@ class Lexer {
             const ahead = this.stream.nextChar();
             const aahead = this.stream.nextNextChar();
             if (this.m === this.ModeNormal) {
-                if (ahead === "'") {
+                if (splits[ahead]) {
+                    this.add();
+                }
+                else if (ahead === "'") {
                     // start string
                     this.add();
                     this.m = this.ModeStr;
@@ -356,9 +359,6 @@ class Lexer {
                     this.add();
                     this.m = this.ModeComment;
                 }
-                else if (splits[ahead]) {
-                    this.add();
-                }
                 else if (ahead === "@" && buf.trim().length === 0) {
                     this.add();
                 }

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

@@ -10,6 +10,9 @@ const _reference_1 = require("../_reference");
 const _object_oriented_1 = require("../_object_oriented");
 class ComponentChain {
     runSyntax(context, node, scope, filename) {
+        if (context === undefined) {
+            return undefined;
+        }
         const children = node.getChildren();
         for (let i = 0; i < children.length; i++) {
             if (context instanceof void_type_1.VoidType || context instanceof basic_1.UnknownType) {
@@ -72,7 +75,7 @@ class ComponentChain {
                     }
                 }
                 else {
-                    throw new Error("ComponentChain, not a structure");
+                    throw new Error("ComponentChain, not a structure, " + (context === null || context === void 0 ? void 0 : context.constructor.name));
                 }
             }
         }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentCompare = void 0;
 const Expressions = require("../../2_statements/expressions");
-const basic_1 = require("../../types/basic");
+const component_chain_1 = require("./component_chain");
 const source_1 = require("./source");
 class ComponentCompare {
     runSyntax(node, scope, filename, type) {
@@ -10,23 +10,7 @@ class ComponentCompare {
         if (chain === undefined) {
             throw new Error("ComponentCompare, chain not found");
         }
-        // todo, handle deep chain
-        if (chain.getChildren().length === 1
-            && type !== undefined
-            && !(type instanceof basic_1.VoidType)
-            && !(type instanceof basic_1.UnknownType)
-            && !(type instanceof basic_1.AnyType)) {
-            const fieldName = chain.concatTokens();
-            if (fieldName.toLowerCase() !== "table_line") {
-                if (!(type instanceof basic_1.StructureType)) {
-                    throw new Error("ComponentCompare, source not structured");
-                }
-                if (type.getComponentByName(fieldName) === undefined) {
-                    throw new Error("Component \"" + fieldName + "\" not part of structure");
-                }
-                // todo, check type compatibility
-            }
-        }
+        new component_chain_1.ComponentChain().runSyntax(type, chain, scope, filename);
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }

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

@@ -6,12 +6,14 @@ const target_1 = require("../expressions/target");
 const source_1 = require("../expressions/source");
 const component_compare_1 = require("../expressions/component_compare");
 const component_cond_1 = require("../expressions/component_cond");
+const basic_1 = require("../../types/basic");
 class DeleteInternal {
     runSyntax(node, scope, filename) {
         var _a;
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
+        let targetType = undefined;
         const target = node.findDirectExpression(Expressions.Target);
         if (target) {
             let tabl = undefined;
@@ -23,14 +25,17 @@ class DeleteInternal {
                 }
             }
             if (tabl === undefined) {
-                new target_1.Target().runSyntax(target, scope, filename);
+                targetType = new target_1.Target().runSyntax(target, scope, filename);
+                if (targetType instanceof basic_1.TableType) {
+                    targetType = targetType.getRowType();
+                }
             }
         }
         for (const t of node.findDirectExpressions(Expressions.ComponentCompare)) {
-            new component_compare_1.ComponentCompare().runSyntax(t, scope, filename);
+            new component_compare_1.ComponentCompare().runSyntax(t, scope, filename, targetType);
         }
         for (const t of node.findDirectExpressions(Expressions.ComponentCond)) {
-            new component_cond_1.ComponentCond().runSyntax(t, scope, filename);
+            new component_cond_1.ComponentCond().runSyntax(t, scope, filename, targetType);
         }
     }
 }

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

@@ -3,8 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StructureType = void 0;
 const _abstract_type_1 = require("./_abstract_type");
 class StructureType extends _abstract_type_1.AbstractType {
-    constructor(components, qualifiedName) {
-        super({ qualifiedName: qualifiedName });
+    constructor(components, qualifiedName, ddicName) {
+        super({
+            qualifiedName: qualifiedName,
+            ddicName: ddicName,
+        });
         if (components.length === 0) {
             throw new Error("Structure does not contain any components");
         }

package/build/src/objects/table.js

@@ -231,7 +231,7 @@ class Table extends _abstract_object_1.AbstractObject {
             return new Types.UnknownType("Table/Structure " + this.getName() + " does not contain any components");
         }
         reg.getDDICReferences().setUsing(this, references);
-        return new Types.StructureType(components, this.getName());
+        return new Types.StructureType(components, this.getName(), this.getName());
     }
     getTableCategory() {
         var _a;

package/build/src/position.js

@@ -31,7 +31,6 @@ exports.Position = Position;
 class VirtualPosition extends Position {
     constructor(virtual, row, col) {
         super(virtual.getRow(), virtual.getCol());
-        //    this.virtual = virtual;
         this.vrow = row;
         this.vcol = col;
     }
@@ -39,7 +38,8 @@ class VirtualPosition extends Position {
         if (!(p instanceof VirtualPosition)) {
             return false;
         }
-        return super.equals(this) && this.vrow === p.vrow && this.vcol === p.vcol;
+        const casted = p;
+        return super.equals(this) && this.vrow === casted.vrow && this.vcol === casted.vcol;
     }
 }
 exports.VirtualPosition = VirtualPosition;

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -25,6 +25,7 @@ const include_graph_1 = require("../utils/include_graph");
 const objects_1 = require("../objects");
 const _builtin_1 = require("../abap/5_syntax/_builtin");
 const _scope_type_1 = require("../abap/5_syntax/_scope_type");
+const statements_1 = require("../abap/2_statements/statements");
 // todo: refactor each sub-rule to new classes?
 // todo: add configuration
 class DownportConf extends _basic_rule_config_1.BasicRuleConfig {
@@ -430,7 +431,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.replaceLineFunctions(high, lowFile, highSyntax);
+        found = this.replaceLineFunctions(high, lowFile, highSyntax, highFile);
         if (found) {
             return found;
         }
@@ -2471,7 +2472,7 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
-    replaceLineFunctions(node, lowFile, highSyntax) {
+    replaceLineFunctions(node, lowFile, highSyntax, highFile) {
         var _a, _b;
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
         for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
@@ -2506,16 +2507,31 @@ ${indentation}    output = ${topTarget}.`;
                     indentation + `READ TABLE ${tableName} ${condition}TRANSPORTING NO FIELDS.\n` +
                     indentation + uniqueName + ` = ${sy}.\n` +
                     indentation;
-                const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
+                let insertAt = node.getFirstToken().getStart();
+                if (node.get() instanceof statements_1.ElseIf) {
+                    // assumption: no side effects in IF conditions
+                    insertAt = this.findStartOfIf(node, highFile);
+                }
+                const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, insertAt, code);
                 const start = expression.getFirstToken().getStart();
                 const end = expression.getLastToken().getEnd();
                 const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, uniqueName + (func === "LINE_EXISTS" ? " = 0" : ""));
                 const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
-                return issue_1.Issue.atToken(lowFile, token, "Use BOOLC", this.getMetadata().key, this.conf.severity, fix);
+                return issue_1.Issue.atToken(lowFile, token, "Replace line function", this.getMetadata().key, this.conf.severity, fix);
             }
         }
         return undefined;
     }
+    findStartOfIf(node, highFile) {
+        var _a;
+        const structure = highFile.getStructure();
+        for (const c of (structure === null || structure === void 0 ? void 0 : structure.findAllStructuresRecursive(Structures.If)) || []) {
+            if (((_a = c.findDirectStructure(Structures.ElseIf)) === null || _a === void 0 ? void 0 : _a.getFirstStatement()) === node) {
+                return c.getFirstToken().getStart();
+            }
+        }
+        return node.getFirstToken().getStart();
+    }
     newToCreateObject(low, high, lowFile, highSyntax) {
         if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.95.38",
+    "version": "2.95.40",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -52,7 +52,7 @@
         "@types/mocha": "^10.0.1",
         "@types/node": "^18.15.0",
         "chai": "^4.3.7",
-        "eslint": "^8.35.0",
+        "eslint": "^8.36.0",
         "mocha": "^10.2.0",
         "c8": "^7.13.0",
         "source-map-support": "^0.5.21",