@abaplint/core 2.120.30 → 2.120.31

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

@@ -38,11 +38,20 @@ class FormParam {
             return new _typed_identifier_1.TypedIdentifier(nameToken, input.filename, basic_1.AnyType.get(), ["form_parameter" /* IdentifierMeta.FormParameter */]);
         }
         let bfound = new basic_types_1.BasicTypes(input).parseType(node);
-        const isTypeC = ((_c = node.findFirstExpression(expressions_1.TypeName)) === null || _c === void 0 ? void 0 : _c.concatTokens().toUpperCase()) === "C";
+        const typeName = (_c = node.findFirstExpression(expressions_1.TypeName)) === null || _c === void 0 ? void 0 : _c.concatTokens().toUpperCase();
         const hasExplicitLength = node.findFirstExpression(expressions_1.Length) !== undefined
             || node.findFirstExpression(expressions_1.ConstantFieldLength) !== undefined;
-        if (isTypeC && hasExplicitLength === false && bfound instanceof basic_1.CharacterType) {
-            bfound = basic_1.CGenericType.get();
+        // the length cannot be specified for FORM parameters, so these types are generic
+        if (hasExplicitLength === false) {
+            if (typeName === "C" && bfound instanceof basic_1.CharacterType) {
+                bfound = basic_1.CGenericType.get();
+            }
+            else if (typeName === "X" && bfound instanceof basic_1.HexType) {
+                bfound = basic_1.XGenericType.get();
+            }
+            else if (typeName === "P" && bfound instanceof basic_1.PackedType) {
+                bfound = basic_1.PGenericType.get();
+            }
         }
         if (nameToken && bfound) {
             return new _typed_identifier_1.TypedIdentifier(nameToken, input.filename, bfound, ["form_parameter" /* IdentifierMeta.FormParameter */]);

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

@@ -62,6 +62,11 @@ class Parameter {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return;
         }
+        const radioGroup = node.findFirstExpression(Expressions.RadioGroupName);
+        if (radioGroup && radioGroup.concatTokens().length > 4) {
+            const message = "Radio button group name too long, " + radioGroup.concatTokens();
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, radioGroup.getFirstToken(), message));
+        }
         if (this.hasUserCommand(node) && this.hasLength(node)) {
             const message = "USER-COMMAND and LENGTH not possible together";
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));

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

@@ -42,6 +42,7 @@ const target_1 = require("../expressions/target");
 const _syntax_input_1 = require("../_syntax_input");
 const assert_error_1 = require("../assert_error");
 const dynamic_1 = require("../expressions/dynamic");
+const _type_utils_1 = require("../_type_utils");
 class Perform {
     runSyntax(node, input) {
         if (!(node.get() instanceof Statements.Perform)) {
@@ -49,19 +50,22 @@ class Perform {
         }
         ////////////////////////////
         // check parameters are defined
+        const changing = [];
         for (const c of node.findDirectExpressions(Expressions.PerformChanging)) {
             for (const s of c.findDirectExpressions(Expressions.Target)) {
-                target_1.Target.runSyntax(s, input);
+                changing.push({ node: s, type: target_1.Target.runSyntax(s, input) });
             }
         }
+        const tables = [];
         for (const t of node.findDirectExpressions(Expressions.PerformTables)) {
             for (const s of t.findDirectExpressions(Expressions.Source)) {
-                source_1.Source.runSyntax(s, input);
+                tables.push({ node: s, type: source_1.Source.runSyntax(s, input) });
             }
         }
+        const using = [];
         for (const u of node.findDirectExpressions(Expressions.PerformUsing)) {
             for (const s of u.findDirectExpressions(Expressions.SimpleSource3)) {
-                source_1.Source.runSyntax(s, input);
+                using.push({ node: s, type: source_1.Source.runSyntax(s, input) });
             }
         }
         ////////////////////////////
@@ -86,7 +90,36 @@ class Perform {
             return;
         }
         input.scope.addReference(expr.getFirstToken(), found, _reference_1.ReferenceType.FormReference, input.filename);
-        // todo, also check parameters match
+        ////////////////////////////
+        // check parameters match
+        // USING and CHANGING are interchangeable, the actual parameters form a single positional list
+        if (this.checkParameters(node, tables, found.getTablesParameters(), "TABLES", input) === false) {
+            return;
+        }
+        const formal = found.getUsingParameters().concat(found.getChangingParameters());
+        this.checkParameters(node, using.concat(changing), formal, "USING/CHANGING", input);
+    }
+    // returns false if an issue was reported
+    checkParameters(node, actual, formal, kind, input) {
+        if (actual.length !== formal.length) {
+            const message = `PERFORM, expected ${formal.length} ${kind} parameters, found ${actual.length}`;
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+            return false;
+        }
+        const typeUtils = new _type_utils_1.TypeUtils(input.scope);
+        for (let i = 0; i < actual.length; i++) {
+            const { node: source, type } = actual[i];
+            if (type === undefined) {
+                continue;
+            }
+            const parameter = formal[i];
+            if (typeUtils.isAssignableStrict(type, parameter.getType(), source) === false) {
+                const message = `PERFORM parameter type not compatible, ${parameter.getName()}`;
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, source.getFirstToken(), message));
+                return false;
+            }
+        }
+        return true;
     }
 }
 exports.Perform = Perform;

package/build/src/registry.js

@@ -75,7 +75,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.30";
+        return "2.120.31";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.120.30",
+    "version": "2.120.31",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",