@abaplint/core 2.120.69 → 2.120.71

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

@@ -28,7 +28,7 @@ class StringTemplateFormatting extends combi_1.Expression {
         const alpha = (0, combi_1.ver)(version_1.Release.v740sp02, (0, combi_1.seq)("ALPHA =", alphaOptions), { also: combi_1.AlsoIn.OpenABAP });
         const xsd = (0, combi_1.ver)(version_1.Release.v740sp02, (0, combi_1.seq)("XSD =", zeroXSDOptions));
         const country = (0, combi_1.seq)("COUNTRY =", _1.Source);
-        const formatting = (0, combi_1.altPrio)((0, combi_1.seq)("TIME =", dateTimeOptions), (0, combi_1.seq)("DATE =", dateTimeOptions), (0, combi_1.seq)("CASE =", caseOptions), (0, combi_1.seq)("EXPONENT", _1.Source), (0, combi_1.seq)("ZERO =", zeroXSDOptions), xsd, (0, combi_1.seq)("STYLE =", styleOptions), (0, combi_1.seq)("CURRENCY =", _1.Source), (0, combi_1.per)(sign, number, decimals, width, pad, alpha, align, country), (0, combi_1.per)(timezone, timestamp));
+        const formatting = (0, combi_1.altPrio)((0, combi_1.seq)("TIME =", dateTimeOptions), (0, combi_1.seq)("DATE =", dateTimeOptions), (0, combi_1.seq)("CASE =", caseOptions), (0, combi_1.seq)("ZERO =", zeroXSDOptions), xsd, (0, combi_1.seq)("STYLE =", styleOptions), (0, combi_1.seq)("CURRENCY =", _1.Source), (0, combi_1.per)(sign, number, decimals, width, pad, alpha, align, country, (0, combi_1.seq)("EXPONENT =", _1.Source)), (0, combi_1.per)(timezone, timestamp));
         return formatting;
     }
 }

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

@@ -35,12 +35,15 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Compare = void 0;
 const Expressions = __importStar(require("../../2_statements/expressions"));
+const nodes_1 = require("../../nodes");
 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");
+const _builtin_1 = require("../_builtin");
+const _object_oriented_1 = require("../_object_oriented");
 class Compare {
     static runSyntax(node, input) {
         var _a;
@@ -55,6 +58,11 @@ class Compare {
         for (const t of node.findDirectExpressions(Expressions.MethodCallChain)) {
             method_call_chain_1.MethodCallChain.runSyntax(t, input);
         }
+        const initialMessage = this.checkInitialOperand(node, input);
+        if (initialMessage !== undefined) {
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), initialMessage));
+            return;
+        }
         const typeUtils = new _type_utils_1.TypeUtils(input.scope);
         const compareOperator = (_a = node.findDirectExpression(Expressions.CompareOperator)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
         if (compareOperator === "CS"
@@ -78,6 +86,46 @@ class Compare {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
         }
     }
+    // a built-in function with a character-like result cannot be the operand of IS [NOT] INITIAL,
+    // "Unexpected operator IS" on a system, while one with a numeric result, lines( ), can
+    static checkInitialOperand(node, input) {
+        var _a, _b, _c, _d;
+        if (input.scope.getOpenABAP()) {
+            return undefined;
+        }
+        const tokens = node.getChildren().filter(c => c instanceof nodes_1.TokenNode).map(c => c.getFirstToken().getStr().toUpperCase());
+        if (tokens.includes("IS") === false || tokens[tokens.length - 1] !== "INITIAL") {
+            return undefined;
+        }
+        const chain = (_a = node.findDirectExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.getChildren();
+        // xsdbool( ) and boolc( ) are their own form in the Source grammar, a condition in parentheses
+        const first = (_b = chain === null || chain === void 0 ? void 0 : chain[0]) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr().toUpperCase();
+        if ((chain === null || chain === void 0 ? void 0 : chain.length) === 4 && chain[0] instanceof nodes_1.TokenNode && (first === "XSDBOOL" || first === "BOOLC")) {
+            return `Built-in function "${chain[0].getFirstToken().getStr()}" cannot be the operand of IS INITIAL`;
+        }
+        if ((chain === null || chain === void 0 ? void 0 : chain.length) !== 1 || !(chain[0] instanceof nodes_1.ExpressionNode) || !(chain[0].get() instanceof Expressions.MethodCallChain)) {
+            return undefined;
+        }
+        const calls = chain[0].getChildren();
+        if (calls.length !== 1 || !(calls[0] instanceof nodes_1.ExpressionNode) || !(calls[0].get() instanceof Expressions.MethodCall)) {
+            return undefined;
+        }
+        const name = (_c = calls[0].findDirectExpression(Expressions.MethodName)) === null || _c === void 0 ? void 0 : _c.concatTokens();
+        const builtin = _builtin_1.BuiltIn.searchBuiltin(name);
+        if (name === undefined || builtin === undefined) {
+            return undefined;
+        }
+        // a method of the same name hides the built-in function
+        const enclosing = input.scope.findClassDefinition(input.scope.getEnclosingClassName());
+        if (enclosing !== undefined && new _object_oriented_1.ObjectOriented(input.scope).searchMethodName(enclosing, name).method !== undefined) {
+            return undefined;
+        }
+        const returning = (_d = builtin.getParameters().getReturning()) === null || _d === void 0 ? void 0 : _d.getType();
+        if (returning instanceof basic_1.StringType || returning instanceof basic_1.CharacterType) {
+            return `Built-in function "${name}" cannot be the operand of IS INITIAL`;
+        }
+        return undefined;
+    }
 }
 exports.Compare = Compare;
 //# sourceMappingURL=compare.js.map

package/build/src/registry.js

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

package/build/src/rules/cds_check_syntax.js

@@ -15,7 +15,7 @@ exports.CDSCheckSyntaxConf = CDSCheckSyntaxConf;
 const KNOWN_QUAN_DATA_ELEMENTS = ["MENGE_D"];
 const KNOWN_CURR_DATA_ELEMENTS = ["BWERT", "DZWERT"];
 // Reserved names, cannot be used as element names, see DDIC table TRESE
-const RESERVED_ELEMENT_NAMES = ["BEGIN", "NUMBER", "POSITION"];
+const RESERVED_ELEMENT_NAMES = ["BEGIN", "NUMBER", "POSITION", "ZONE", "HANDLER", "SECTION"];
 const MAX_LABEL_LENGTH = 40;
 // Annotations which are not supported in CDS view entities
 const VIEW_ENTITY_FORBIDDEN_ANNOTATIONS = ["Semantics.unitOfMeasure", "Semantics.currencyCode"];

package/build/src/rules/redundant_conversion.js

@@ -60,7 +60,8 @@ class RedundantConversion {
             key: "redundant_conversion",
             title: "Redundant Conversion",
             shortDescription: `Find redundant CONV expressions`,
-            extendedInformation: `Reports CONV expressions whose operand already has the conversion's target type.`,
+            extendedInformation: `Reports CONV expressions whose operand already has the conversion's target type,
+including the result of a built-in function with a fixed result type, like to_upper( ) or strlen( ).`,
             tags: [_irule_1.RuleTag.Quickfix],
             badExample: `DATA text TYPE string.
 text = CONV string( text ).`,
@@ -97,7 +98,8 @@ text = text.`,
             if (structure === undefined) {
                 continue;
             }
-            for (const source of structure.findAllExpressions(Expressions.Source)) {
+            // recursive, a CONV can be the argument of a built-in function, which is itself a Source
+            for (const source of structure.findAllExpressionsRecursive(Expressions.Source)) {
                 if (source.getFirstToken().getStr().toUpperCase() !== "CONV") {
                     continue;
                 }
@@ -156,6 +158,15 @@ text = text.`,
     }
     sourceType(source, scope) {
         let context;
+        // boolc( <condition> ) is not a MethodCallChain, xsdbool( ) has the same shape but is not reported
+        const first = source.getFirstToken();
+        if (first.getStr().toUpperCase() === "BOOLC"
+            && source.findDirectExpression(Expressions.Cond) !== undefined
+            && source.getChildren().length === 4
+            && scope.getData().references.some(reference => reference.referenceType === _reference_1.ReferenceType.BuiltinMethodReference
+                && reference.position.getStart().equals(first.getStart()))) {
+            return basic_1.StringType.get();
+        }
         for (const child of source.getChildren()) {
             if (!(child instanceof nodes_1.ExpressionNode)) {
                 continue;
@@ -166,6 +177,15 @@ text = text.`,
                     return undefined;
                 }
             }
+            else if (child.get() instanceof Expressions.MethodCallChain) {
+                if (source.getChildren().length !== 1) {
+                    return undefined;
+                }
+                context = this.builtinResultType(child, scope);
+                if (context === undefined) {
+                    return undefined;
+                }
+            }
             else if (child.get() instanceof Expressions.Constant) {
                 context = this.infer(context, constant_1.Constant.runSyntax(child));
             }
@@ -186,6 +206,32 @@ text = text.`,
         }
         return context;
     }
+    /** The result type of a call to a built-in function whose result type does not depend on its arguments,
+     *  undefined for anything else, e.g. abs( ) or xsdbool( ), or a method of the same name */
+    builtinResultType(chain, scope) {
+        var _a;
+        const children = chain.getChildren();
+        if (children.length !== 1 || !(children[0].get() instanceof Expressions.MethodCall)) {
+            return undefined;
+        }
+        const name = (_a = children[0].findDirectExpression(Expressions.MethodName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+        if (name === undefined) {
+            return undefined;
+        }
+        const isBuiltin = scope.getData().references.some(reference => reference.referenceType === _reference_1.ReferenceType.BuiltinMethodReference
+            && reference.position.getStart().equals(name.getStart()));
+        if (isBuiltin === false) {
+            return undefined;
+        }
+        const upper = name.getStr().toUpperCase();
+        if (RedundantConversion.stringResult.has(upper)) {
+            return basic_1.StringType.get();
+        }
+        else if (RedundantConversion.integerResult.has(upper)) {
+            return basic_1.IntegerType.get();
+        }
+        return undefined;
+    }
     fieldChainType(fieldChain, scope) {
         var _a;
         const operand = (_a = scope.getData().references.find(reference => reference.referenceType === _reference_1.ReferenceType.DataReadReference
@@ -250,4 +296,15 @@ text = text.`,
     }
 }
 exports.RedundantConversion = RedundantConversion;
+// built-in functions that always return a string, whatever their arguments
+RedundantConversion.stringResult = new Set([
+    "BOOLC", "CONCAT_LINES_OF", "CONDENSE", "ESCAPE", "FROM_MIXED", "INSERT", "REPEAT", "REPLACE",
+    "REVERSE", "SEGMENT", "SHIFT_LEFT", "SHIFT_RIGHT", "SUBSTRING", "SUBSTRING_AFTER", "SUBSTRING_BEFORE",
+    "SUBSTRING_FROM", "SUBSTRING_TO", "TO_LOWER", "TO_MIXED", "TO_UPPER", "TRANSLATE"
+]);
+// built-in functions that always return an i
+RedundantConversion.integerResult = new Set([
+    "CHARLEN", "COUNT", "COUNT_ANY_NOT_OF", "COUNT_ANY_OF", "DBMAXLEN", "DISTANCE", "FIND", "FIND_ANY_NOT_OF",
+    "FIND_ANY_OF", "FIND_END", "LINES", "NUMOFCHAR", "STRLEN", "XSTRLEN"
+]);
 //# sourceMappingURL=redundant_conversion.js.map

package/build/src/rules/xml_consistency.js

@@ -326,7 +326,7 @@ class XMLConsistency {
     }
     runTable(obj, file) {
         var _a, _b, _c, _d;
-        var _e;
+        var _e, _f;
         const issues = [];
         for (const field of (_e = obj.getFields()) !== null && _e !== void 0 ? _e : []) {
             if (field.DATATYPE === "QUAN" && (!((_a = field.REFTABLE) === null || _a === void 0 ? void 0 : _a.trim()) || !((_b = field.REFFIELD) === null || _b === void 0 ? void 0 : _b.trim()))) {
@@ -335,6 +335,14 @@ class XMLConsistency {
             }
         }
         if (obj.getTableCategory() === Objects.TableCategory.Transparent) {
+            // Confirmed reserved database field names, see issue #4331, DAY and HOUR reported by activation.
+            // TRESE also contains names such as TEXT and LENGTH which are allowed here.
+            const reservedFieldNames = ["ZONE", "HANDLER", "SECTION", "PARAMETER", "DAY", "HOUR"];
+            for (const field of (_f = obj.getFields()) !== null && _f !== void 0 ? _f : []) {
+                if (reservedFieldNames.includes(field.FIELDNAME.toUpperCase())) {
+                    issues.push(issue_1.Issue.atRow(file, 1, `Table field name "${field.FIELDNAME}" is reserved`, this.getMetadata().key, this.conf.severity));
+                }
+            }
             if (!((_c = obj.getDeliveryClass()) === null || _c === void 0 ? void 0 : _c.trim())) {
                 const message = `Transparent table must have delivery class(CONTFLAG in DD02V) set`;
                 issues.push(issue_1.Issue.atRow(file, 1, message, this.getMetadata().key, this.conf.transparentTableSeverity));

package/package.json

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