@abaplint/core 2.97.10 → 2.97.12

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

@@ -199,16 +199,24 @@ class TypeUtils {
         return false;
     }
     isAssignableStrict(source, target) {
-        var _a;
+        var _a, _b;
         /*
             console.dir(source);
             console.dir(target);
         */
-        if (source instanceof basic_1.CharacterType && target instanceof basic_1.CharacterType) {
-            if (((_a = source.getAbstractTypeData()) === null || _a === void 0 ? void 0 : _a.derivedFromConstant) === true) {
-                return source.getLength() <= target.getLength();
+        if (source instanceof basic_1.CharacterType) {
+            if (target instanceof basic_1.CharacterType) {
+                if (((_a = source.getAbstractTypeData()) === null || _a === void 0 ? void 0 : _a.derivedFromConstant) === true) {
+                    return source.getLength() <= target.getLength();
+                }
+                return source.getLength() === target.getLength();
+            }
+            else if (target instanceof basic_1.IntegerType) {
+                if (((_b = source.getAbstractTypeData()) === null || _b === void 0 ? void 0 : _b.derivedFromConstant) === true) {
+                    return true;
+                }
+                return false;
             }
-            return source.getLength() === target.getLength();
         }
         else if (source instanceof basic_1.StringType && target instanceof basic_1.StructureType) {
             if (this.structureContainsString(target)) {
@@ -216,6 +224,19 @@ class TypeUtils {
             }
             return true;
         }
+        else if (source instanceof basic_1.StructureType && target instanceof basic_1.StructureType) {
+            const sourceComponents = source.getComponents();
+            const targetComponents = target.getComponents();
+            if (sourceComponents.length !== targetComponents.length) {
+                return false;
+            }
+            for (let i = 0; i < sourceComponents.length; i++) {
+                if (this.isAssignableStrict(sourceComponents[i].type, targetComponents[i].type) === false) {
+                    return false;
+                }
+            }
+            return true;
+        }
         return this.isAssignable(source, target);
     }
     isAssignable(source, target) {
@@ -233,7 +254,31 @@ class TypeUtils {
                 return true;
             }
             else if (source instanceof basic_1.TableType) {
-                return this.isAssignableStrict(source.getRowType(), target.getRowType());
+                const targetRowType = target.getRowType();
+                const sourceRowType = source.getRowType();
+                if (targetRowType instanceof basic_1.VoidType || targetRowType instanceof basic_1.AnyType || targetRowType instanceof basic_1.UnknownType) {
+                    return true;
+                }
+                else if (sourceRowType instanceof basic_1.VoidType || sourceRowType instanceof basic_1.AnyType || sourceRowType instanceof basic_1.UnknownType) {
+                    return true;
+                }
+                if (targetRowType instanceof basic_1.StructureType && this.structureContainsString(targetRowType)) {
+                    if (!(sourceRowType instanceof basic_1.StructureType)) {
+                        return false;
+                    }
+                    else if (!(this.structureContainsString(sourceRowType))) {
+                        return false;
+                    }
+                }
+                if (sourceRowType instanceof basic_1.StructureType && this.structureContainsString(sourceRowType)) {
+                    if (!(targetRowType instanceof basic_1.StructureType)) {
+                        return false;
+                    }
+                    else if (!(this.structureContainsString(targetRowType))) {
+                        return false;
+                    }
+                }
+                return true;
             }
             return false;
         }

package/build/src/registry.js

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

package/package.json

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