@abaplint/core 2.102.29 → 2.102.31

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

@@ -10,7 +10,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");

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

@@ -58,6 +58,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) {
@@ -107,6 +110,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) {
@@ -373,7 +379,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;
             }

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

@@ -4,6 +4,7 @@ exports.TypeUtils = void 0;
 const types_1 = require("../types");
 const basic_1 = require("../types/basic");
 const cgeneric_type_1 = require("../types/basic/cgeneric_type");
+// todo: refactor to static? for performance
 class TypeUtils {
     constructor(scope) {
         this.scope = scope;
@@ -298,6 +299,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;

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

@@ -8,6 +8,7 @@ const target_1 = require("../expressions/target");
 const fstarget_1 = require("../expressions/fstarget");
 const basic_1 = require("../../types/basic");
 const inline_data_1 = require("../expressions/inline_data");
+const _type_utils_1 = require("../_type_utils");
 class InsertInternal {
     runSyntax(node, scope, filename) {
         let targetType;
@@ -15,7 +16,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);
@@ -33,6 +34,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);

package/build/src/registry.js

@@ -65,7 +65,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/core",
-    "version": "2.102.29",
+    "version": "2.102.31",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",