@abaplint/core 2.120.29 → 2.120.31

package/build/src/abap/2_statements/expressions/color.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Color = void 0;
 const combi_1 = require("../combi");
-const source_1 = require("./source");
+const simple_source3_1 = require("./simple_source3");
 class Color extends combi_1.Expression {
     getRunnable() {
-        const eq = (0, combi_1.seq)("=", source_1.Source);
+        const eq = (0, combi_1.seq)("=", simple_source3_1.SimpleSource3);
         const integers = (0, combi_1.altPrio)("1", "2", "3", "4", "5", "6", "7");
         const texts = (0, combi_1.altPrio)("COL_BACKGROUND", "COL_HEADING", "COL_NORMAL", "COL_TOTAL", "COL_KEY", "COL_POSITIVE", "COL_NEGATIVE", "COL_GROUP");
         const value = (0, combi_1.alt)(eq, (0, combi_1.altPrio)("ON", "OFF", "COLOR OFF", (0, combi_1.altPrio)(integers, texts)));

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

@@ -50,6 +50,7 @@ const types_1 = require("../types");
 const expressions_1 = require("../2_statements/expressions");
 const _builtin_1 = require("./_builtin");
 const position_1 = require("../../position");
+const _syntax_input_1 = require("./_syntax_input");
 class BasicTypes {
     constructor(input) {
         this.input = input;
@@ -990,6 +991,13 @@ class BasicTypes {
         }
         const chain = val.findFirstExpression(Expressions.SimpleFieldChain);
         if (chain) {
+            // todo, hardcoded for now, should be a generic check that the chain is a constant
+            const concat = chain.concatTokens().toUpperCase();
+            if (concat === "SY-DATUM" || concat === "SY-UZEIT") {
+                const message = "VALUE, " + concat.toLowerCase() + " is not a constant";
+                this.input.issues.push((0, _syntax_input_1.syntaxIssue)(this.input, chain.getFirstToken(), message));
+                return undefined;
+            }
             return this.resolveConstantValue(chain);
         }
         throw new Error("findValue, unexpected");

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

@@ -7,13 +7,17 @@ const expressions_1 = require("../../2_statements/expressions");
 const _syntax_input_1 = require("../_syntax_input");
 class Form {
     runSyntax(node, input) {
-        var _a;
-        const name = (_a = node.findDirectExpression(expressions_1.FormName)) === null || _a === void 0 ? void 0 : _a.concatTokens();
-        if (name === undefined) {
+        const nameExpression = node.findDirectExpression(expressions_1.FormName);
+        const name = nameExpression === null || nameExpression === void 0 ? void 0 : nameExpression.concatTokens();
+        if (nameExpression === undefined || name === undefined) {
             const message = "Form, could not find name";
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return;
         }
+        if (name.length > 30) {
+            const message = "FORM name longer than 30 characters";
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, nameExpression.getFirstToken(), message));
+        }
         input.scope.push(_scope_type_1.ScopeType.Form, name, node.getFirstToken().getStart(), input.filename);
         const form = new form_definition_1.FormDefinition(node, input);
         input.scope.addList(form.getUsingParameters());

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

@@ -38,7 +38,7 @@ const Expressions = __importStar(require("../../2_statements/expressions"));
 const source_1 = require("../expressions/source");
 class Format {
     runSyntax(node, input) {
-        for (const s of node.findAllExpressions(Expressions.Source)) {
+        for (const s of node.findAllExpressionsMulti([Expressions.Source, Expressions.SimpleSource3])) {
             source_1.Source.runSyntax(s, input);
         }
     }

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

@@ -62,6 +62,16 @@ 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));
+            return;
+        }
         const bfound = new basic_types_1.BasicTypes(input).parseType(node);
         if (bfound) {
             input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, input.filename, bfound));
@@ -73,6 +83,30 @@ class Parameter {
         const magicToken = new tokens_1.Identifier(nameToken.getStart(), magicName);
         input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(magicToken, input.filename, basic_1.VoidType.get("PARAMETER-MAGIC")));
     }
+    // "USER-COMMAND" is lexed as three tokens
+    hasUserCommand(node) {
+        const tokens = node.getTokens();
+        for (let i = 0; i < tokens.length - 2; i++) {
+            if (tokens[i].getStr().toUpperCase() === "USER"
+                && tokens[i + 1].getStr() === "-"
+                && tokens[i + 2].getStr().toUpperCase() === "COMMAND") {
+                return true;
+            }
+        }
+        return false;
+    }
+    // "VISIBLE LENGTH" is not the same as "LENGTH"
+    hasLength(node) {
+        var _a;
+        const tokens = node.getTokens();
+        for (let i = 0; i < tokens.length; i++) {
+            if (tokens[i].getStr().toUpperCase() === "LENGTH"
+                && ((_a = tokens[i - 1]) === null || _a === void 0 ? void 0 : _a.getStr().toUpperCase()) !== "VISIBLE") {
+                return true;
+            }
+        }
+        return false;
+    }
 }
 exports.Parameter = Parameter;
 //# sourceMappingURL=parameter.js.map

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.29";
+        return "2.120.31";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/cloud_types.js

@@ -83,6 +83,7 @@ class CloudTypes {
             || obj instanceof Objects.BehaviorDefinition
             || obj instanceof Objects.BusinessCatalog
             || obj instanceof Objects.BusinessCatalogAppAssignment
+            || obj instanceof Objects.BusinessConfigurationMaintenanceObject
             || obj instanceof Objects.CDSMetadataExtension
             || obj instanceof Objects.Class
             || obj instanceof Objects.CDSType
@@ -99,11 +100,13 @@ class CloudTypes {
             || obj instanceof Objects.EventBinding
             || obj instanceof Objects.EventConsumer
             || obj instanceof Objects.FunctionGroup
+            || obj instanceof Objects.GatewayODataGroupAndAssignment
             || obj instanceof Objects.HttpService
             || obj instanceof Objects.IAMApp
             || obj instanceof Objects.InboundService
             || obj instanceof Objects.Interface
             || obj instanceof Objects.LockObject
+            || obj instanceof Objects.MaintenanceAndTransportObject
             || obj instanceof Objects.MessageClass
             || obj instanceof Objects.NumberRange
             || obj instanceof Objects.OutboundService

package/package.json

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