@abaplint/core 2.89.7 → 2.89.10

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

@@ -249,9 +249,9 @@ class BasicTypes {
             }
         }
         const options = {
-            withHeader: text.includes("WITH HEADER LINE"),
+            withHeader: text.includes(" WITH HEADER LINE"),
             type: type,
-            isUnique: text.includes("WITH UNIQUE"),
+            isUnique: text.includes(" WITH UNIQUE"),
             keyFields: keyFields,
         };
         let found = undefined;
@@ -387,7 +387,7 @@ class BasicTypes {
                 sub = node.findFirstExpression(Expressions.FieldChain);
             }
             found = this.resolveLikeName(sub);
-            if (found && text.includes(" OCCURS ")) {
+            if (found && this.isOccurs(node)) {
                 found = new Types.TableType(found, { withHeader: text.includes("WITH HEADER LINE") }, qualifiedName);
             }
         }
@@ -416,10 +416,10 @@ class BasicTypes {
         else if (text.startsWith("TYPE")) {
             found = this.resolveTypeName(typeName, this.findLength(node), this.findDecimals(node), qualifiedName);
             const concat = node.concatTokens().toUpperCase();
-            if (found && concat.includes(" OCCURS ")) {
-                found = new Types.TableType(found, { withHeader: concat.includes("WITH HEADER LINE") }, qualifiedName);
+            if (found && this.isOccurs(node)) {
+                found = new Types.TableType(found, { withHeader: concat.includes(" WITH HEADER LINE") }, qualifiedName);
             }
-            else if (found && concat.includes("WITH HEADER LINE")) {
+            else if (found && concat.includes(" WITH HEADER LINE")) {
                 if (found instanceof Types.VoidType) {
                     found = new Types.TableType(found, { withHeader: true });
                 }
@@ -440,14 +440,24 @@ class BasicTypes {
                     }
                 }
                 found = new Types.CharacterType(length, qualifiedName); // fallback
-                if (concat.includes(" OCCURS ")) {
-                    found = new Types.TableType(found, { withHeader: concat.includes("WITH HEADER LINE") }, qualifiedName);
+                if (this.isOccurs(node)) {
+                    found = new Types.TableType(found, { withHeader: concat.includes(" WITH HEADER LINE") }, qualifiedName);
                 }
             }
         }
         return found;
     }
     /////////////////////
+    isOccurs(node) {
+        var _a;
+        if (node.findDirectTokenByText("OCCURS")) {
+            return true;
+        }
+        else if ((_a = node.findFirstExpression(Expressions.TypeTable)) === null || _a === void 0 ? void 0 : _a.findDirectTokenByText("OCCURS")) {
+            return true;
+        }
+        return false;
+    }
     // todo, rewrite this method
     resolveTypeChain(expr) {
         var _a;

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

@@ -4,11 +4,15 @@ exports.Compare = void 0;
 const Expressions = require("../../2_statements/expressions");
 const source_1 = require("./source");
 const method_call_chain_1 = require("./method_call_chain");
+const source_field_symbol_1 = require("./source_field_symbol");
 class Compare {
     runSyntax(node, scope, filename) {
         for (const t of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(t, scope, filename);
         }
+        for (const t of node.findDirectExpressions(Expressions.SourceFieldSymbol)) {
+            new source_field_symbol_1.SourceFieldSymbol().runSyntax(t, scope, filename);
+        }
         for (const t of node.findDirectExpressions(Expressions.MethodCallChain)) {
             new method_call_chain_1.MethodCallChain().runSyntax(t, scope, filename);
         }

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

@@ -13,6 +13,7 @@ const field_length_1 = require("./field_length");
 const table_expression_1 = require("./table_expression");
 const expressions_1 = require("../../2_statements/expressions");
 const dereference_1 = require("./dereference");
+const source_field_symbol_1 = require("./source_field_symbol");
 class FieldChain {
     runSyntax(node, scope, filename, refType) {
         const concat = node.concatTokens();
@@ -102,8 +103,11 @@ class FieldChain {
         if (node === undefined) {
             return undefined;
         }
-        if (node.get() instanceof Expressions.SourceField
-            || node.get() instanceof Expressions.SourceFieldSymbol) {
+        if (node instanceof nodes_1.ExpressionNode
+            && node.get() instanceof Expressions.SourceFieldSymbol) {
+            return new source_field_symbol_1.SourceFieldSymbol().runSyntax(node, scope, filename);
+        }
+        else if (node.get() instanceof Expressions.SourceField) {
             const token = node.getFirstToken();
             const name = token.getStr();
             const found = scope.findVariable(name);
@@ -121,7 +125,7 @@ class FieldChain {
             }
             return found.getType();
         }
-        if (node.get() instanceof Expressions.ClassName) {
+        else if (node.get() instanceof Expressions.ClassName) {
             const classTok = node.getFirstToken();
             const classNam = classTok.getStr();
             if (classNam.toUpperCase() === "OBJECT") {

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldLength = void 0;
 const Expressions = require("../../2_statements/expressions");
 const _reference_1 = require("../_reference");
+const source_field_symbol_1 = require("./source_field_symbol");
 class FieldLength {
     runSyntax(node, scope, filename) {
         const field = node.findDirectExpression(Expressions.SourceField);
@@ -16,12 +17,7 @@ class FieldLength {
         }
         const symbol = node.findDirectExpression(Expressions.SourceFieldSymbol);
         if (symbol) {
-            const token = symbol.getFirstToken();
-            const found = scope.findVariable(token.getStr());
-            if (found === undefined) {
-                throw new Error("\"" + symbol.getFirstToken().getStr() + "\" not found, FieldLength");
-            }
-            scope.addReference(token, found, _reference_1.ReferenceType.DataReadReference, filename);
+            new source_field_symbol_1.SourceFieldSymbol().runSyntax(symbol, scope, filename);
         }
     }
 }

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldOffset = void 0;
 const Expressions = require("../../2_statements/expressions");
 const _reference_1 = require("../_reference");
+const source_field_symbol_1 = require("./source_field_symbol");
 class FieldOffset {
     runSyntax(node, scope, filename) {
         const field = node.findDirectExpression(Expressions.SourceField);
@@ -16,12 +17,7 @@ class FieldOffset {
         }
         const symbol = node.findDirectExpression(Expressions.SourceFieldSymbol);
         if (symbol) {
-            const token = symbol.getFirstToken();
-            const found = scope.findVariable(token.getStr());
-            if (found === undefined) {
-                throw new Error("\"" + symbol.getFirstToken().getStr() + "\" not found, FieldOffset");
-            }
-            scope.addReference(token, found, _reference_1.ReferenceType.DataReadReference, filename);
+            new source_field_symbol_1.SourceFieldSymbol().runSyntax(symbol, scope, filename);
         }
     }
 }

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

@@ -4,7 +4,9 @@ exports.LoopGroupBy = void 0;
 const Expressions = require("../../2_statements/expressions");
 const basic_1 = require("../../types/basic");
 const component_compare_1 = require("./component_compare");
+const inline_data_1 = require("./inline_data");
 const inline_fs_1 = require("./inline_fs");
+const target_1 = require("./target");
 class LoopGroupBy {
     runSyntax(node, scope, filename) {
         const components = [];
@@ -17,6 +19,15 @@ class LoopGroupBy {
             return;
         }
         const sourceType = new basic_1.StructureType(components);
+        for (const t of node.findAllExpressions(Expressions.Target)) {
+            const inline = t.findDirectExpression(Expressions.InlineData);
+            if (inline) {
+                new inline_data_1.InlineData().runSyntax(inline, scope, filename, new basic_1.VoidType("todoGroupBy"));
+            }
+            else {
+                new target_1.Target().runSyntax(t, scope, filename);
+            }
+        }
         const inlinefs = node.findFirstExpression(Expressions.InlineFS);
         if (inlinefs) {
             new inline_fs_1.InlineFS().runSyntax(inlinefs, scope, filename, sourceType);

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

@@ -167,6 +167,9 @@ class Source {
                 break;
             }
         }
+        if (node.findDirectTokenByText("&&")) {
+            return new basic_1.StringType();
+        }
         return context;
     }
     ////////////////////////////////

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SourceFieldSymbol = void 0;
+const _reference_1 = require("../_reference");
+class SourceFieldSymbol {
+    runSyntax(node, scope, filename) {
+        const token = node.getFirstToken();
+        const found = scope.findVariable(token.getStr());
+        if (found === undefined) {
+            throw new Error("\"" + node.getFirstToken().getStr() + "\" not found, SourceFieldSymbol");
+        }
+        scope.addReference(token, found, _reference_1.ReferenceType.DataReadReference, filename);
+        return found.getType();
+    }
+}
+exports.SourceFieldSymbol = SourceFieldSymbol;
+//# sourceMappingURL=source_field_symbol.js.map

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -690,36 +690,46 @@ ${indentation}CATCH ${className} INTO ${targetName}.`;
         bar->if_t100_dyn_msg~msgv4 = 'abc'.
         RAISE EXCEPTION bar.
         */
-        var _a;
-        if (node.get() instanceof Statements.Raise) {
-            const startToken = node.findDirectTokenByText("ID");
-            if (startToken === undefined) {
-                return undefined;
-            }
+        var _a, _b, _c;
+        if (!(node.get() instanceof Statements.Raise)) {
+            return undefined;
+        }
+        let id = undefined;
+        let number = undefined;
+        let startToken = node.findDirectTokenByText("ID");
+        if (startToken) {
             const sources = node.findDirectExpressions(Expressions.Source);
-            const id = sources[0].concatTokens();
+            id = sources[0].concatTokens();
             const numberExpression = node.findExpressionAfterToken("NUMBER");
             if (numberExpression === undefined) {
                 throw "downport raiseException, could not find number";
             }
-            let number = numberExpression.concatTokens();
+            number = numberExpression.concatTokens();
             if (numberExpression.get() instanceof Expressions.MessageNumber) {
                 number = "'" + number + "'";
             }
-            const className = ((_a = node.findDirectExpression(Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "ERROR";
-            const uniqueName1 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
-            const uniqueName2 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
-            const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
-            const abap = `DATA ${uniqueName1} LIKE if_t100_message=>t100key.
-${indentation}${uniqueName1}-msgid = ${id}.
+        }
+        else {
+            const s = node.findDirectExpression(Expressions.MessageSource);
+            if (s === undefined) {
+                return undefined;
+            }
+            id = "'" + ((_a = s.findDirectExpression(Expressions.MessageClass)) === null || _a === void 0 ? void 0 : _a.concatTokens()) + "'";
+            number = "'" + ((_b = s.findDirectExpression(Expressions.MessageTypeAndNumber)) === null || _b === void 0 ? void 0 : _b.concatTokens().substring(1)) + "'";
+            startToken = node.getFirstToken();
+        }
+        const className = ((_c = node.findDirectExpression(Expressions.ClassName)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "ERROR";
+        const uniqueName1 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const uniqueName2 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+        const abap = `DATA ${uniqueName1} LIKE if_t100_message=>t100key.
+${indentation}${uniqueName1}-msgid = ${id === null || id === void 0 ? void 0 : id.toUpperCase()}.
 ${indentation}${uniqueName1}-msgno = ${number}.
 ${indentation}DATA ${uniqueName2} TYPE REF TO ${className}.
 ${indentation}CREATE OBJECT ${uniqueName2} EXPORTING textid = ${uniqueName1}.
 ${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 undefined;
+        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);
     }
     emptyKey(node, lowFile) {
         for (let i of node.findAllExpressions(Expressions.TypeTable)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.89.7",
+    "version": "2.89.10",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -45,12 +45,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.22.2",
+        "@microsoft/api-extractor": "^7.23.0",
         "@types/chai": "^4.3.1",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^17.0.25",
+        "@types/node": "^17.0.27",
         "chai": "^4.3.6",
-        "eslint": "^8.13.0",
+        "eslint": "^8.14.0",
         "mocha": "^9.2.2",
         "c8": "^7.11.2",
         "source-map-support": "^0.5.21",