@abaplint/core 2.120.23 → 2.120.25

package/build/abaplint.d.ts

@@ -1260,7 +1260,7 @@ declare class ClassDefinition_3 extends Identifier implements IClassDefinition {
     private checkClassNameLength;
     private findSuper;
     private checkMethodNameLength;
-    private checkClassConstructorStatic;
+    private checkClassConstructor;
     private checkInterfaceVisibility;
     private checkMethodsFromSuperClasses;
     private checkMethodNameConflicts;
@@ -4897,6 +4897,7 @@ declare class MethodParameters_2 implements IMethodParameters {
     getParameterDefault(parameter: string): ExpressionNode;
     private parse;
     private checkDuplicateNames;
+    private checkNameLengths;
     private workaroundRAP;
     private add;
     private isPassByValue;

package/build/src/abap/2_statements/statements/class_definition.js

@@ -11,7 +11,7 @@ class ClassDefinition {
         const risk = (0, combi_1.seq)("RISK LEVEL", level);
         const time = (0, combi_1.altPrio)("LONG", "MEDIUM", "SHORT");
         const duration = (0, combi_1.seq)("DURATION", time);
-        const blah = (0, combi_1.per)(expressions_1.ClassGlobal, expressions_1.ClassFinal, "ABSTRACT", (0, combi_1.seq)("INHERITING FROM", expressions_1.SuperClassName), create, "FOR TESTING", risk, "SHARED MEMORY ENABLED", duration, (0, combi_1.ver)(version_1.Release.v754, (0, combi_1.seq)("FOR BEHAVIOR OF", expressions_1.BehaviorDefinitionName), { also: combi_1.AlsoIn.OpenABAP }), expressions_1.ClassFriends);
+        const blah = (0, combi_1.per)(expressions_1.ClassGlobal, expressions_1.ClassFinal, "ABSTRACT", (0, combi_1.seq)("INHERITING FROM", expressions_1.SuperClassName), create, "FOR TESTING", risk, "SHARED MEMORY ENABLED", duration, (0, combi_1.ver)(version_1.Release.v754, (0, combi_1.seq)("FOR BEHAVIOR OF", expressions_1.BehaviorDefinitionName), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v758, (0, combi_1.seq)("FOR EVENTS OF", expressions_1.BehaviorDefinitionName)), expressions_1.ClassFriends);
         const def = (0, combi_1.seq)("DEFINITION", (0, combi_1.optPrio)(blah));
         return (0, combi_1.seq)("CLASS", expressions_1.ClassName, def);
     }

package/build/src/abap/2_statements/statements/method_def.js

@@ -4,6 +4,7 @@ exports.MethodDef = void 0;
 const version_1 = require("../../../version");
 const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
+const tokens_1 = require("../../1_lexer/tokens");
 class MethodDef {
     getMatcher() {
         const def = (0, combi_1.ver)(version_1.Release.v740sp08, (0, combi_1.seq)("DEFAULT", (0, combi_1.altPrio)("FAIL", "IGNORE")), { also: combi_1.AlsoIn.OpenABAP });
@@ -17,6 +18,9 @@ class MethodDef {
         const modify = (0, combi_1.alt)((0, combi_1.seq)("FOR ACTION", expressions_1.TypeName, (0, combi_1.optPrio)(result)), (0, combi_1.seq)("FOR CREATE", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation)), (0, combi_1.seq)("FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("FOR UPDATE", expressions_1.TypeName));
         const forRead = (0, combi_1.seq)("FOR READ", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation), (0, combi_1.optPrio)(full), result, (0, combi_1.optPrio)(link));
         const forfunction = (0, combi_1.seq)("FOR FUNCTION", expressions_1.TypeName, result);
+        const entityEventReference = (0, combi_1.seq)("REFERENCE", (0, combi_1.tok)(tokens_1.ParenLeft), expressions_1.MethodParamName, (0, combi_1.tok)(tokens_1.ParenRightW));
+        const entityEventParameter = (0, combi_1.seq)((0, combi_1.altPrio)(entityEventReference, expressions_1.MethodParamName), "FOR", expressions_1.TypeName);
+        const entityEvent = (0, combi_1.seq)((0, combi_1.optPrio)("FINAL"), "FOR ENTITY EVENT", (0, combi_1.optPrio)("IMPORTING"), (0, combi_1.plus)(entityEventParameter));
         const behavior = (0, combi_1.altPrio)("DDL OBJECT OPTIONS CDS SESSION CLIENT REQUIRED", // todo, this is only from version something
         (0, combi_1.seq)("TABLE FUNCTION", expressions_1.NamespaceSimpleName), // todo, this is only from version something
         (0, combi_1.seq)("VALIDATE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("MODIFY", (0, combi_1.opt)("IMPORTING"), (0, combi_1.plus)((0, combi_1.seq)(expressions_1.MethodParamName, modify))), (0, combi_1.seq)("PRECHECK IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("DETERMINATION", expressions_1.TypeName, "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("VALIDATION", expressions_1.TypeName, "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("NUMBERING IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("READ IMPORTING", expressions_1.MethodParamName, (0, combi_1.altPrio)(forRead, forfunction)), (0, combi_1.seq)("FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.NamespaceSimpleName, "FOR", expressions_1.NamespaceSimpleName, result), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR CREATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR UPDATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR READ", expressions_1.TypeName, result), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR UPDATE", expressions_1.TypeName), (0, combi_1.seq)((0, combi_1.alt)("BEHAVIOR", "LOCK"), "IMPORTING", expressions_1.MethodParamName, "FOR LOCK", expressions_1.TypeName), (0, combi_1.seq)("DETERMINE", (0, combi_1.alt)("ON MODIFY", "ON SAVE"), "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("GLOBAL AUTHORIZATION IMPORTING REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)("GLOBAL FEATURES IMPORTING REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)((0, combi_1.seq)((0, combi_1.opt)("INSTANCE"), "AUTHORIZATION IMPORTING"), expressions_1.MethodParamName, "REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)("INSTANCE FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result));
@@ -24,7 +28,9 @@ class MethodDef {
         // AMDP OPTIONS clause blocked in KeyUser
         const amdp = (0, combi_1.verNotLang)(version_1.LanguageVersion.KeyUser, (0, combi_1.seq)("AMDP OPTIONS", (0, combi_1.optPrio)("READ-ONLY"), "CDS SESSION CLIENT", (0, combi_1.alt)("CURRENT", "DEPENDENT"), (0, combi_1.optPrio)(expressions_1.MethodDefImporting), (0, combi_1.optPrio)(expressions_1.MethodDefExporting), (0, combi_1.optPrio)(expressions_1.MethodDefRaising)));
         // FOR DDL OBJECT / FOR TABLE FUNCTION / FOR SCALAR FUNCTION blocked in KeyUser
-        const ret = (0, combi_1.seq)((0, combi_1.altPrio)("CLASS-METHODS", "METHODS"), expressions_1.MethodName, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), (0, combi_1.optPrio)(def), expressions_1.EventHandler), parameters, testing, (0, combi_1.verNotLang)(version_1.LanguageVersion.KeyUser, (0, combi_1.seq)("FOR", behavior)), amdp, "NOT AT END OF MODE", (0, combi_1.optPrio)(expressions_1.Redefinition)));
+        const regular = (0, combi_1.seq)((0, combi_1.altPrio)("CLASS-METHODS", "METHODS"), expressions_1.MethodName, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), (0, combi_1.optPrio)(def), expressions_1.EventHandler), parameters, testing, (0, combi_1.verNotLang)(version_1.LanguageVersion.KeyUser, (0, combi_1.seq)("FOR", behavior)), amdp, "NOT AT END OF MODE", (0, combi_1.optPrio)(expressions_1.Redefinition)));
+        // RAP event handlers are instance methods; CLASS-METHODS is not allowed.
+        const ret = (0, combi_1.alt)((0, combi_1.seq)("METHODS", expressions_1.MethodName, (0, combi_1.verNotLang)(version_1.LanguageVersion.KeyUser, entityEvent)), regular);
         return ret;
     }
 }

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

@@ -281,6 +281,12 @@ class TypeUtils {
         if (source2 instanceof basic_1.HexType && this.isCalculated(node2) && source1 instanceof basic_1.IntegerType) {
             return false;
         }
+        if (source1 instanceof basic_1.DateType && this.isCalculated(node2) && source2 instanceof basic_1.IntegerType) {
+            return false;
+        }
+        if (source2 instanceof basic_1.DateType && this.isCalculated(node1) && source1 instanceof basic_1.IntegerType) {
+            return false;
+        }
         return true;
     }
     structureContainsString(structure) {

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

@@ -39,6 +39,7 @@ const source_1 = require("./source");
 const method_call_chain_1 = require("./method_call_chain");
 const source_field_symbol_1 = require("./source_field_symbol");
 const _syntax_input_1 = require("../_syntax_input");
+const basic_1 = require("../../types/basic");
 const _type_utils_1 = require("../_type_utils");
 class Compare {
     static runSyntax(node, input) {
@@ -56,7 +57,15 @@ class Compare {
         if (node.findDirectExpression(Expressions.CompareOperator)
             && new _type_utils_1.TypeUtils(input.scope).isCompareable(sourceTypes[0], sourceTypes[1], sources[0], sources[1]) === false
             && sourceTypes.length === 2) {
-            const message = "Incompatible types for comparison";
+            let message = "Incompatible types for comparison";
+            if ((sourceTypes[0] instanceof basic_1.DateType
+                && sourceTypes[1] instanceof basic_1.IntegerType
+                && sources[1].findFirstExpression(Expressions.ArithOperator))
+                || (sourceTypes[1] instanceof basic_1.DateType
+                    && sourceTypes[0] instanceof basic_1.IntegerType
+                    && sources[0].findFirstExpression(Expressions.ArithOperator))) {
+                message = "Date cannot be compared with arithmetic result of type Integer";
+            }
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
         }
     }

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

@@ -43,7 +43,12 @@ const _syntax_input_1 = require("../_syntax_input");
 const _type_utils_1 = require("../_type_utils");
 class Catch {
     runSyntax(node, input) {
-        var _a;
+        var _a, _b, _c;
+        const target = node.findDirectExpression(Expressions.Target);
+        const inlineTarget = (_b = (_a = target === null || target === void 0 ? void 0 : target.findDirectExpression(Expressions.InlineData)) === null || _a === void 0 ? void 0 : _a.findFirstExpression(Expressions.TargetField)) === null || _b === void 0 ? void 0 : _b.getFirstToken();
+        if (inlineTarget && inlineTarget.getStr().length > 30) {
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, inlineTarget, "Inline exception name longer than 30 characters"));
+        }
         const names = new Set();
         for (const c of node.findDirectExpressions(Expressions.ClassName)) {
             const token = c.getFirstToken();
@@ -67,9 +72,8 @@ class Catch {
             }
             names.add(className);
         }
-        const target = node.findDirectExpression(Expressions.Target);
         if (target === null || target === void 0 ? void 0 : target.findDirectExpression(Expressions.InlineData)) {
-            const token = (_a = target.findFirstExpression(Expressions.TargetField)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+            const token = (_c = target.findFirstExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.getFirstToken();
             if (token) {
                 const classNames = Array.from(names);
                 const unknownClass = classNames.find(name => input.scope.findClassDefinition(name) === undefined);

package/build/src/abap/5_syntax/structures/types.js

@@ -44,6 +44,7 @@ const include_type_1 = require("../statements/include_type");
 const type_1 = require("../statements/type");
 const Basic = __importStar(require("../../types/basic"));
 const _scope_type_1 = require("../_scope_type");
+const _syntax_input_1 = require("../_syntax_input");
 class Types {
     runSyntax(node, input, qualifiedNamePrefix) {
         const name = node.findFirstExpression(Expressions.NamespaceSimpleName).getFirstToken();
@@ -58,6 +59,9 @@ class Types {
                 if (ctyp instanceof Statements.Type) {
                     const found = new type_1.Type().runSyntax(c, input, qualifiedNamePrefix + name.getStr() + "-");
                     if (found) {
+                        if (found.getName().length > 30) {
+                            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, found.getToken(), "Structure field name longer than 30 characters"));
+                        }
                         components.push({ name: found.getName(), type: found.getType() });
                     }
                 }
@@ -74,6 +78,9 @@ class Types {
             else if (c instanceof nodes_1.StructureNode && ctyp instanceof Structures.Types) {
                 const found = new Types().runSyntax(c, input, qualifiedNamePrefix + name.getStr() + "-");
                 if (found) {
+                    if (found.getName().length > 30) {
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, found.getToken(), "Structure field name longer than 30 characters"));
+                    }
                     components.push({ name: found.getName(), type: found.getType() });
                 }
             }

package/build/src/abap/types/class_definition.js

@@ -101,7 +101,7 @@ class ClassDefinition extends _identifier_1.Identifier {
         this.checkEventNameConflicts(input);
         this.checkClassNameLength(input);
         this.checkMethodNameLength(input);
-        this.checkClassConstructorStatic(input);
+        this.checkClassConstructor(input);
     }
     getFriends() {
         return this.friends;
@@ -171,11 +171,17 @@ class ClassDefinition extends _identifier_1.Identifier {
             }
         }
     }
-    checkClassConstructorStatic(input) {
+    checkClassConstructor(input) {
         for (const m of this.methodDefs.getAll()) {
-            if (m.getName().toUpperCase() === "CLASS_CONSTRUCTOR" && m.isStatic() === false) {
+            if (m.getName().toUpperCase() !== "CLASS_CONSTRUCTOR") {
+                continue;
+            }
+            if (m.isStatic() === false) {
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, m.getToken(), "CLASS_CONSTRUCTOR must be static"));
             }
+            else if (m.getVisibility() !== visibility_1.Visibility.Public) {
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, m.getToken(), "CLASS_CONSTRUCTOR must be declared in the public section"));
+            }
         }
     }
     checkInterfaceVisibility(input, node) {

package/build/src/abap/types/method_parameters.js

@@ -45,6 +45,7 @@ const _object_oriented_1 = require("../5_syntax/_object_oriented");
 const _reference_1 = require("../5_syntax/_reference");
 const identifier_1 = require("../1_lexer/tokens/identifier");
 const _scope_type_1 = require("../5_syntax/_scope_type");
+const _syntax_input_1 = require("../5_syntax/_syntax_input");
 // todo:
 // this.exceptions = [];
 // also consider RAISING vs EXCEPTIONS
@@ -67,6 +68,7 @@ class MethodParameters {
         input.scope.push(_scope_type_1.ScopeType.MethodDefinition, "method definition", node.getStart(), input.filename);
         try {
             this.parse(node, input, parentName, abstractMethod);
+            this.checkNameLengths(input);
             this.checkDuplicateNames();
         }
         finally {
@@ -218,6 +220,13 @@ class MethodParameters {
             names.add(name);
         }
     }
+    checkNameLengths(input) {
+        for (const parameter of this.getAll()) {
+            if (parameter.getName().length > 30) {
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, parameter.getToken(), "Method parameter name longer than 30 characters"));
+            }
+        }
+    }
     workaroundRAP(node, input, parentName) {
         const resultName = node.findExpressionAfterToken("RESULT");
         const concat = node.concatTokens().toUpperCase();

package/build/src/registry.js

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

package/package.json

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