@abaplint/core 2.89.8 → 2.89.9

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/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/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.89.8",
+    "version": "2.89.9",
     "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.26",
         "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",