@abaplint/cli 2.102.29 → 2.102.31

package/build/cli.js

@@ -9613,7 +9613,7 @@ class CallFunction {
         const update = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.str)("IN UPDATE TASK"));
         const unit = (0, combi_1.seq)("UNIT", expressions_1.Source);
         const background = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.seq)("IN BACKGROUND", (0, combi_1.altPrio)("TASK", unit)));
-        const calling = (0, combi_1.seq)("CALLING", expressions_1.MethodName, "ON END OF TASK");
+        const calling = (0, combi_1.seq)("CALLING", expressions_1.MethodSource, "ON END OF TASK");
         const performing = (0, combi_1.seq)("PERFORMING", expressions_1.FormName, "ON END OF TASK");
         const separate = (0, combi_1.str)("AS SEPARATE UNIT");
         const keeping = (0, combi_1.str)("KEEPING LOGICAL UNIT OF WORK");
@@ -20516,6 +20516,9 @@ class CurrentScope {
         if (this.current.getData().types[upper] !== undefined) {
             throw new Error(`Type name "${name}" already defined`);
         }
+        else if (this.isOO() && this.current.getData().vars[upper] !== undefined) {
+            throw new Error(`"${name}" already defined`);
+        }
         this.current.getData().types[upper] = type;
     }
     addExtraLikeType(type) {
@@ -20565,6 +20568,9 @@ class CurrentScope {
         if (this.current.getData().vars[upper] !== undefined) {
             throw new Error(`Variable name "${name}" already defined`);
         }
+        else if (this.isOO() && this.current.getData().types[upper] !== undefined) {
+            throw new Error(`"${name}" already defined`);
+        }
         this.current.getData().vars[upper] = identifier;
     }
     addIdentifier(identifier) {
@@ -20831,7 +20837,7 @@ class CurrentScope {
         while (curr !== undefined) {
             const stype = curr.getIdentifier().stype;
             if (stype === _scope_type_1.ScopeType.ClassDefinition
-                || stype === _scope_type_1.ScopeType.ClassImplementation
+                //          || stype === ScopeType.ClassImplementation
                 || stype === _scope_type_1.ScopeType.Interface) {
                 return true;
             }
@@ -21475,6 +21481,7 @@ exports.TypeUtils = void 0;
 const types_1 = __webpack_require__(/*! ../types */ "./node_modules/@abaplint/core/build/src/abap/types/index.js");
 const basic_1 = __webpack_require__(/*! ../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const cgeneric_type_1 = __webpack_require__(/*! ../types/basic/cgeneric_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/cgeneric_type.js");
+// todo: refactor to static? for performance
 class TypeUtils {
     constructor(scope) {
         this.scope = scope;
@@ -21769,6 +21776,11 @@ class TypeUtils {
                 return false;
             }
         }
+        else if (source instanceof basic_1.IntegerType) {
+            if (target instanceof basic_1.StringType || target instanceof basic_1.Integer8Type) {
+                return false;
+            }
+        }
         else if (source instanceof basic_1.FloatType) {
             if (target instanceof basic_1.IntegerType) {
                 return false;
@@ -29315,6 +29327,7 @@ const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_module
 const fstarget_1 = __webpack_require__(/*! ../expressions/fstarget */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/fstarget.js");
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const inline_data_1 = __webpack_require__(/*! ../expressions/inline_data */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/inline_data.js");
+const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 class InsertInternal {
     runSyntax(node, scope, filename) {
         let targetType;
@@ -29322,7 +29335,7 @@ class InsertInternal {
         if (t) {
             targetType = new target_1.Target().runSyntax(t, scope, filename);
         }
-        if (targetType instanceof basic_1.TableType) {
+        if (targetType instanceof basic_1.TableType && node.findDirectTokenByText("LINES") === undefined) {
             targetType = targetType.getRowType();
         }
         let source = node.findDirectExpression(Expressions.SimpleSource4);
@@ -29340,6 +29353,9 @@ class InsertInternal {
                 new fstarget_1.FSTarget().runSyntax(afterAssigning, scope, filename, sourceType);
             }
         }
+        if (new _type_utils_1.TypeUtils(scope).isAssignableStrict(sourceType, targetType) === false) {
+            throw new Error("Types not compatible");
+        }
         const afterInto = node.findExpressionAfterToken("INTO");
         if ((afterInto === null || afterInto === void 0 ? void 0 : afterInto.get()) instanceof Expressions.Target && sourceType) {
             const inline = afterInto.findDirectExpression(Expressions.InlineData);
@@ -48743,7 +48759,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.29";
+        return "2.102.31";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.102.29",
+    "version": "2.102.31",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.102.29",
+        "@abaplint/core": "^2.102.31",
         "@types/chai": "^4.3.5",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",