@abaplint/cli 2.120.36 → 2.120.37

package/build/cli.js

@@ -27903,6 +27903,29 @@ class TypeUtils {
         }
         return this.isAssignable(source, target);
     }
+    // Typing with the classic STRUCTURE addition, ie. "FORM foo USING bar STRUCTURE zkey",
+    // is not a compatibility check: ABAP only checks the fragment view up to the end of the
+    // formal structure, so the actual parameter is allowed to be longer. For TABLES parameters
+    // the table key is not part of the check at all.
+    isAssignableStructureTyping(source, target, node) {
+        if (source instanceof basic_1.StructureType && target instanceof basic_1.StructureType) {
+            const sourceComponents = source.getComponents();
+            const targetComponents = target.getComponents();
+            if (sourceComponents.length < targetComponents.length) {
+                return false;
+            }
+            for (let i = 0; i < targetComponents.length; i++) {
+                if (this.isAssignableStrict(sourceComponents[i].type, targetComponents[i].type) === false) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        else if (source instanceof basic_1.TableType && target instanceof basic_1.TableType) {
+            return this.isAssignableStructureTyping(source.getRowType(), target.getRowType());
+        }
+        return this.isAssignableStrict(source, target, node);
+    }
     isAssignable(source, target) {
         if (source === undefined || target === undefined) {
             return true;
@@ -31505,7 +31528,7 @@ class FormParam {
             else {
                 type = new basic_1.UnknownType("todo, FORM STRUCTURES typing");
             }
-            return new _typed_identifier_1.TypedIdentifier(nameToken, input.filename, type, ["form_parameter" /* IdentifierMeta.FormParameter */]);
+            return new _typed_identifier_1.TypedIdentifier(nameToken, input.filename, type, ["form_parameter" /* IdentifierMeta.FormParameter */, "form_parameter_structure" /* IdentifierMeta.FormParameterStructure */]);
         }
         if (node.getChildren().length === 1 && nameToken) {
             // untyped FORM parameter
@@ -43725,7 +43748,11 @@ class Perform {
                 continue;
             }
             const parameter = formal[i];
-            if (typeUtils.isAssignableStrict(type, parameter.getType(), source) === false) {
+            const structureTyping = parameter.getMeta().includes("form_parameter_structure" /* IdentifierMeta.FormParameterStructure */);
+            const assignable = structureTyping
+                ? typeUtils.isAssignableStructureTyping(type, parameter.getType(), source)
+                : typeUtils.isAssignableStrict(type, parameter.getType(), source);
+            if (assignable === false) {
                 const message = `PERFORM parameter type not compatible, ${parameter.getName()}`;
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, source.getFirstToken(), message));
                 return false;
@@ -52608,7 +52635,8 @@ class FormDefinition extends _identifier_1.Identifier {
                 else if (!(type instanceof basic_1.UnknownType) && !(type instanceof basic_1.VoidType)) {
                     type = new basic_1.UnknownType("FORM TABLES type must be table type");
                 }
-                ret.push(new _typed_identifier_1.TypedIdentifier(p.getToken(), input.filename, type, ["form_parameter" /* IdentifierMeta.FormParameter */]));
+                // keep the meta from FormParam, so STRUCTURE typing can be recognized later
+                ret.push(new _typed_identifier_1.TypedIdentifier(p.getToken(), input.filename, type, p.getMeta()));
             }
         }
         return ret;
@@ -70119,7 +70147,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.36";
+        return "2.120.37";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.120.36",
+    "version": "2.120.37",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -39,7 +39,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.120.36",
+        "@abaplint/core": "^2.120.37",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",