@abaplint/core 2.85.16 → 2.85.17

package/build/abaplint.d.ts

@@ -4547,6 +4547,7 @@ export declare enum ScopeType {
     Method = "method",
     MethodInstance = "method_instance",
     For = "for",
+    Let = "let",
     OpenSQL = "open_sql"
 }
 

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

@@ -887,14 +887,14 @@ BuiltIn.methods = [
     {
         name: "STRLEN",
         mandatory: {
-            "val": new basic_1.StringType(),
+            "val": new basic_1.CLikeType(),
         },
         return: new basic_1.IntegerType(),
     },
     {
         name: "SUBSTRING",
         mandatory: {
-            "val": new basic_1.StringType(),
+            "val": new basic_1.CLikeType(),
         },
         optional: {
             "off": new basic_1.IntegerType(),
@@ -906,7 +906,7 @@ BuiltIn.methods = [
     {
         name: "SUBSTRING_AFTER",
         mandatory: {
-            "val": new basic_1.StringType(),
+            "val": new basic_1.CLikeType(),
         },
         optional: {
             "sub": new basic_1.StringType(),
@@ -922,7 +922,7 @@ BuiltIn.methods = [
     {
         name: "SUBSTRING_BEFORE",
         mandatory: {
-            "val": new basic_1.StringType(),
+            "val": new basic_1.CLikeType(),
         },
         optional: {
             "sub": new basic_1.StringType(),
@@ -938,7 +938,7 @@ BuiltIn.methods = [
     {
         name: "SUBSTRING_FROM",
         mandatory: {
-            "val": new basic_1.StringType(),
+            "val": new basic_1.CLikeType(),
         },
         optional: {
             "sub": new basic_1.StringType(),
@@ -954,7 +954,7 @@ BuiltIn.methods = [
     {
         name: "SUBSTRING_TO",
         mandatory: {
-            "val": new basic_1.StringType(),
+            "val": new basic_1.CLikeType(),
         },
         optional: {
             "sub": new basic_1.StringType(),

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

@@ -17,6 +17,7 @@ var ScopeType;
     ScopeType["Method"] = "method";
     ScopeType["MethodInstance"] = "method_instance";
     ScopeType["For"] = "for";
+    ScopeType["Let"] = "let";
     ScopeType["OpenSQL"] = "open_sql";
 })(ScopeType = exports.ScopeType || (exports.ScopeType = {}));
 //# sourceMappingURL=_scope_type.js.map

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

@@ -78,7 +78,8 @@ class TypeUtils {
             }
             return false;
         }
-        else if (target instanceof basic_1.ObjectReferenceType || target instanceof basic_1.GenericObjectReferenceType) {
+        else if (target instanceof basic_1.ObjectReferenceType
+            || target instanceof basic_1.GenericObjectReferenceType) {
             if (source instanceof basic_1.ObjectReferenceType
                 || source instanceof basic_1.GenericObjectReferenceType
                 || source instanceof basic_1.VoidType
@@ -120,10 +121,12 @@ class TypeUtils {
         }
         else if (target instanceof basic_1.IntegerType
             || target instanceof basic_1.StringType) {
-            if (source instanceof basic_1.DataReference
+            if (source instanceof basic_1.TableType && source.isWithHeader() === false) {
+                return false;
+            }
+            else if (source instanceof basic_1.DataReference
                 || source instanceof basic_1.ObjectReferenceType
-                || source instanceof basic_1.GenericObjectReferenceType
-                || source instanceof basic_1.TableType) {
+                || source instanceof basic_1.GenericObjectReferenceType) {
                 return false;
             }
             return true;

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

@@ -10,9 +10,10 @@ class CondBody {
         if (node === undefined) {
             return targetType;
         }
+        let scoped = false;
         const l = node.findDirectExpression(Expressions.Let);
         if (l) {
-            new let_1.Let().runSyntax(l, scope, filename);
+            scoped = new let_1.Let().runSyntax(l, scope, filename);
         }
         for (const s of node.findDirectExpressions(Expressions.Cond)) {
             new cond_1.Cond().runSyntax(s, scope, filename);
@@ -26,6 +27,9 @@ class CondBody {
                 new source_1.Source().runSyntax(s, scope, filename);
             }
         }
+        if (scoped === true) {
+            scope.pop(node.getLastToken().getEnd());
+        }
         return targetType ? targetType : type;
     }
 }

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

@@ -9,13 +9,17 @@ class ConvBody {
         if (node === undefined) {
             return;
         }
+        let scoped = false;
         const l = node.findDirectExpression(Expressions.Let);
         if (l) {
-            new let_1.Let().runSyntax(l, scope, filename);
+            scoped = new let_1.Let().runSyntax(l, scope, filename);
         }
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
+        if (scoped === true) {
+            scope.pop(node.getLastToken().getEnd());
+        }
     }
 }
 exports.ConvBody = ConvBody;

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

@@ -7,12 +7,14 @@ const source_1 = require("./source");
 const inline_loop_definition_1 = require("./inline_loop_definition");
 const _scope_type_1 = require("../_scope_type");
 const component_cond_1 = require("./component_cond");
+const cond_1 = require("./cond");
 class For {
     runSyntax(node, scope, filename) {
         const inlineLoop = node.findDirectExpressions(Expressions.InlineLoopDefinition);
         const inlineField = node.findAllExpressions(Expressions.InlineFieldDefinition);
         const addScope = inlineLoop.length > 0 || inlineField.length > 0;
         if (addScope) {
+            // this scope is popped in parent expressions
             scope.push(_scope_type_1.ScopeType.For, "FOR", node.getFirstToken().getStart(), filename);
         }
         for (const s of inlineLoop) {
@@ -27,11 +29,9 @@ class For {
         for (const s of node.findDirectExpressions(Expressions.ComponentCond)) {
             new component_cond_1.ComponentCond().runSyntax(s, scope, filename);
         }
-        /*
-        if (addScope) {
-          scope.pop(node.getLastToken().getEnd());
+        for (const s of node.findDirectExpressions(Expressions.Cond)) {
+            new cond_1.Cond().runSyntax(s, scope, filename);
         }
-        */
     }
 }
 exports.For = For;

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

@@ -9,8 +9,9 @@ const unknown_type_1 = require("../../types/basic/unknown_type");
 const _reference_1 = require("../_reference");
 class InlineFieldDefinition {
     runSyntax(node, scope, filename) {
+        var _a;
         let type = undefined;
-        const field = node.findDirectExpression(Expressions.Field);
+        const field = (_a = node.findDirectExpression(Expressions.Field)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
         if (field === undefined) {
             return;
         }
@@ -25,8 +26,12 @@ class InlineFieldDefinition {
         if (type === undefined) {
             type = new unknown_type_1.UnknownType("InlineFieldDefinition, fallback");
         }
-        const identifier = new _typed_identifier_1.TypedIdentifier(field.getFirstToken(), filename, type, ["inline" /* InlineDefinition */]);
-        scope.addReference(field.getFirstToken(), identifier, _reference_1.ReferenceType.DataWriteReference, filename);
+        const name = field.getStr();
+        if (scope.findVariable(name) !== undefined) {
+            throw new Error(`Variable ${name} already defined`);
+        }
+        const identifier = new _typed_identifier_1.TypedIdentifier(field, filename, type, ["inline" /* InlineDefinition */]);
+        scope.addReference(field, identifier, _reference_1.ReferenceType.DataWriteReference, filename);
         scope.addIdentifier(identifier);
     }
 }

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

@@ -3,14 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Let = void 0;
 const Expressions = require("../../2_statements/expressions");
 const inline_field_definition_1 = require("./inline_field_definition");
+const _scope_type_1 = require("../_scope_type");
 class Let {
     runSyntax(node, scope, filename) {
         if (node === undefined) {
-            return;
+            return false;
         }
+        scope.push(_scope_type_1.ScopeType.Let, "LET", node.getFirstToken().getStart(), filename);
         for (const f of node.findDirectExpressions(Expressions.InlineFieldDefinition)) {
             new inline_field_definition_1.InlineFieldDefinition().runSyntax(f, scope, filename);
         }
+        return true;
     }
 }
 exports.Let = Let;

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

@@ -12,14 +12,15 @@ class ValueBody {
         if (node === undefined) {
             return targetType;
         }
-        const letNode = node.findDirectExpression(Expressions.Let);
-        if (letNode) {
-            new let_1.Let().runSyntax(letNode, scope, filename);
-        }
         const forNode = node.findDirectExpression(Expressions.For);
         if (forNode) {
             new for_1.For().runSyntax(forNode, scope, filename);
         }
+        let scoped = false;
+        const letNode = node.findDirectExpression(Expressions.Let);
+        if (letNode) {
+            scoped = new let_1.Let().runSyntax(letNode, scope, filename);
+        }
         for (const s of node.findDirectExpressions(Expressions.FieldAssignment)) {
             new field_assignment_1.FieldAssignment().runSyntax(s, scope, filename, targetType);
         }
@@ -27,6 +28,9 @@ class ValueBody {
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             type = new source_1.Source().runSyntax(s, scope, filename);
         }
+        if (scoped === true) {
+            scope.pop(node.getLastToken().getEnd());
+        }
         if (scope.getType() === _scope_type_1.ScopeType.For) {
             scope.pop(node.getLastToken().getEnd());
         }

package/build/src/registry.js

@@ -68,7 +68,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.85.16";
+        return "2.85.17";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/downport.js

@@ -913,7 +913,7 @@ ${indentation}    output = ${topTarget}.`;
             const uniqueName = this.uniqueName(i.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const type = this.findType(i, lowFile, highSyntax);
             const indent = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
-            const bodyCode = this.buildCondBody(body, uniqueName, indent);
+            const bodyCode = this.buildCondBody(body, uniqueName, indent, lowFile, highSyntax);
             const abap = `DATA ${uniqueName} TYPE ${type}.\n` + bodyCode;
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), abap);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, i.getFirstToken().getStart(), i.getLastToken().getEnd(), uniqueName);
@@ -922,13 +922,13 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
-    buildCondBody(body, uniqueName, indent) {
-        let code = indent;
+    buildCondBody(body, uniqueName, indent, lowFile, highSyntax) {
+        let code = "";
         for (const c of body.getChildren()) {
             if (c instanceof nodes_1.TokenNode) {
                 switch (c.getFirstToken().getStr().toUpperCase()) {
                     case "WHEN":
-                        code += "IF ";
+                        code += indent + "IF ";
                         break;
                     case "THEN":
                         code += ".\n";
@@ -943,11 +943,14 @@ ${indentation}    output = ${topTarget}.`;
             else if (c.get() instanceof Expressions.Cond) {
                 code += c.concatTokens();
             }
+            else if (c.get() instanceof Expressions.Let) {
+                code += this.outlineLet(c, indent, highSyntax, lowFile);
+            }
             else if (c.get() instanceof Expressions.Source) {
                 code += indent + "  " + uniqueName + " = " + c.concatTokens() + ".\n";
             }
             else {
-                throw "buildCondBody, unexpected expression";
+                throw "buildCondBody, unexpected expression, " + c.get().constructor.name;
             }
         }
         code += indent + "ENDIF.\n";

package/build/src/rules/use_new.js

@@ -25,7 +25,9 @@ class UseNew extends _abap_rule_1.ABAPRule {
             shortDescription: `Checks for deprecated CREATE OBJECT statements.`,
             extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#prefer-new-to-create-object
 
-If the target variable is referenced in the CREATE OBJECT statement, no errors are issued`,
+If the target variable is referenced in the CREATE OBJECT statement, no errors are issued
+
+Applicable from v740sp02 and up`,
             badExample: `CREATE OBJECT ref.`,
             goodExample: `ref = NEW #( ).`,
             tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Styleguide, _irule_1.RuleTag.Quickfix, _irule_1.RuleTag.SingleFile],

package/package.json

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