@abaplint/core 2.85.20 → 2.85.21

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

@@ -166,11 +166,7 @@ class CurrentScope {
         if (name === undefined) {
             return { found: false };
         }
-        const def = (_a = this.current) === null || _a === void 0 ? void 0 : _a.findDeferred(name);
-        if (def !== undefined) {
-            return { found: true, id: def };
-        }
-        const findLocalClass = (_b = this.current) === null || _b === void 0 ? void 0 : _b.findClassDefinition(name);
+        const findLocalClass = (_a = this.current) === null || _a === void 0 ? void 0 : _a.findClassDefinition(name);
         if (findLocalClass) {
             return { found: true, id: findLocalClass, type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "CLAS" };
         }
@@ -178,7 +174,7 @@ class CurrentScope {
         if (globalClas) {
             return { found: true, id: globalClas.getIdentifier(), type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "CLAS" };
         }
-        const findLocalInterface = (_c = this.current) === null || _c === void 0 ? void 0 : _c.findInterfaceDefinition(name);
+        const findLocalInterface = (_b = this.current) === null || _b === void 0 ? void 0 : _b.findInterfaceDefinition(name);
         if (findLocalInterface) {
             return { found: true, id: findLocalInterface, type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "INTF" };
         }
@@ -186,6 +182,10 @@ class CurrentScope {
         if (globalIntf) {
             return { found: true, id: globalIntf.getIdentifier(), type: _reference_1.ReferenceType.ObjectOrientedReference, ooType: "INTF" };
         }
+        const def = (_c = this.current) === null || _c === void 0 ? void 0 : _c.findDeferred(name);
+        if (def !== undefined) {
+            return { found: true, id: def };
+        }
         return { found: false };
     }
     ///////////////////////////

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

@@ -1,9 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeUtils = void 0;
+const types_1 = require("../types");
 const basic_1 = require("../types/basic");
 class TypeUtils {
-    static isCharLike(type) {
+    constructor(scope) {
+        this.scope = scope;
+    }
+    isCharLike(type) {
         if (type === undefined) {
             return false;
         }
@@ -40,7 +44,7 @@ class TypeUtils {
         }
         return false;
     }
-    static isHexLike(type) {
+    isHexLike(type) {
         if (type === undefined) {
             return false;
         }
@@ -61,7 +65,96 @@ class TypeUtils {
         }
         return false;
     }
-    static isAssignable(source, target) {
+    isOOAssignable(source, target) {
+        let sid = source.getIdentifier();
+        if (!(sid instanceof types_1.ClassDefinition || sid instanceof types_1.InterfaceDefinition)) {
+            const found = this.scope.findObjectDefinition(sid.getName());
+            if (found) {
+                sid = found;
+            }
+            else {
+                return false;
+            }
+        }
+        let tid = target.getIdentifier();
+        if (!(tid instanceof types_1.ClassDefinition || tid instanceof types_1.InterfaceDefinition)) {
+            const found = this.scope.findObjectDefinition(tid.getName());
+            if (found) {
+                tid = found;
+            }
+            else {
+                return false;
+            }
+        }
+        const tname = tid.getName().toUpperCase();
+        if (sid instanceof types_1.ClassDefinition && tid instanceof types_1.ClassDefinition) {
+            if (sid.getName().toUpperCase() === tname) {
+                return true;
+            }
+            const slist = this.listAllSupers(sid);
+            if (slist.indexOf(tname) >= 0) {
+                return true;
+            }
+        }
+        else if (sid instanceof types_1.ClassDefinition && tid instanceof types_1.InterfaceDefinition) {
+            if (sid.getImplementing().some(i => i.name === tname)) {
+                return true;
+            }
+            const slist = this.listAllInterfaces(sid);
+            if (slist.indexOf(tname) >= 0) {
+                return true;
+            }
+        }
+        else if (sid instanceof types_1.InterfaceDefinition && tid instanceof types_1.InterfaceDefinition) {
+            if (sid.getName().toUpperCase() === tname) {
+                return true;
+            }
+            if (sid.getImplementing().some(i => i.name === tname)) {
+                return true;
+            }
+            const slist = this.listAllInterfaces(sid);
+            if (slist.indexOf(tname) >= 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+    listAllInterfaces(cdef) {
+        var _a;
+        const ret = new Set();
+        const stack = [];
+        // initialize
+        cdef.getImplementing().forEach(i => stack.push(i.name));
+        if (cdef instanceof types_1.ClassDefinition) {
+            const supers = this.listAllSupers(cdef);
+            for (const s of supers) {
+                (_a = this.scope.findClassDefinition(s)) === null || _a === void 0 ? void 0 : _a.getImplementing().forEach(i => stack.push(i.name));
+            }
+        }
+        // main loop
+        while (stack.length > 0) {
+            const intf = stack.pop().toUpperCase();
+            ret.add(intf);
+            const idef = this.scope.findInterfaceDefinition(intf);
+            idef === null || idef === void 0 ? void 0 : idef.getImplementing().forEach(i => stack.push(i.name));
+        }
+        return Array.from(ret.values());
+    }
+    listAllSupers(cdef) {
+        var _a, _b;
+        const ret = [];
+        let sup = cdef.getSuperClass();
+        while (sup !== undefined) {
+            ret.push(sup === null || sup === void 0 ? void 0 : sup.toUpperCase());
+            sup = (_b = (_a = this.scope.findClassDefinition(sup)) === null || _a === void 0 ? void 0 : _a.getSuperClass()) === null || _b === void 0 ? void 0 : _b.toUpperCase();
+        }
+        return ret;
+    }
+    isCastable(_source, _target) {
+        // todo
+        return true;
+    }
+    isAssignable(source, target) {
         /*
             console.dir(source);
             console.dir(target);
@@ -78,6 +171,9 @@ class TypeUtils {
             }
             return false;
         }
+        else if (target instanceof basic_1.ObjectReferenceType && source instanceof basic_1.ObjectReferenceType) {
+            return this.isOOAssignable(source, target);
+        }
         else if (target instanceof basic_1.ObjectReferenceType
             || target instanceof basic_1.GenericObjectReferenceType) {
             if (source instanceof basic_1.ObjectReferenceType

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

@@ -4,30 +4,42 @@ exports.Cast = void 0;
 const basic_1 = require("../../types/basic");
 const Expressions = require("../../2_statements/expressions");
 const source_1 = require("./source");
+const _type_utils_1 = require("../_type_utils");
 class Cast {
     runSyntax(node, scope, targetType, filename) {
         var _a;
-        for (const s of node.findAllExpressions(Expressions.Source)) {
-            new source_1.Source().runSyntax(s, scope, filename);
+        const sourceNode = node.findDirectExpression(Expressions.Source);
+        if (sourceNode === undefined) {
+            throw new Error("Cast, source node not found");
         }
+        const sourceType = new source_1.Source().runSyntax(sourceNode, scope, filename);
+        let tt = undefined;
         const typeName = (_a = node.findDirectExpression(Expressions.TypeNameOrInfer)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr();
         if (typeName === undefined) {
             throw new Error("Cast, child TypeNameOrInfer not found");
         }
         else if (typeName === "#" && targetType) {
-            return targetType;
+            tt = targetType;
         }
         else if (typeName === "#") {
             throw new Error("Cast, todo, infer type");
         }
-        const found = scope.findObjectDefinition(typeName);
-        if (found === undefined && scope.getDDIC().inErrorNamespace(typeName) === false) {
-            return new basic_1.VoidType(typeName);
+        if (tt === undefined) {
+            const found = scope.findObjectDefinition(typeName);
+            if (found === undefined && scope.getDDIC().inErrorNamespace(typeName) === false) {
+                tt = new basic_1.VoidType(typeName);
+            }
+            else if (found === undefined) {
+                throw new Error("Type \"" + typeName + "\" not found in scope, Cast");
+            }
+            else {
+                tt = new basic_1.ObjectReferenceType(found);
+            }
         }
-        else if (found === undefined) {
-            throw new Error("Type \"" + typeName + "\" not found in scope, Cast");
+        if (new _type_utils_1.TypeUtils(scope).isCastable(sourceType, tt) === false) {
+            throw new Error("Cast, incompatible types");
         }
-        return new basic_1.ObjectReferenceType(found);
+        return tt;
     }
 }
 exports.Cast = Cast;

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

@@ -50,7 +50,7 @@ class MethodCallParam {
             if (sourceType === undefined) {
                 throw new Error("No source type determined, method source");
             }
-            else if (_type_utils_1.TypeUtils.isAssignable(sourceType, targetType) === false) {
+            else if (new _type_utils_1.TypeUtils(scope).isAssignable(sourceType, targetType) === false) {
                 throw new Error("Method parameter type not compatible");
             }
         }

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

@@ -65,7 +65,7 @@ class MethodParameters {
         }
         else if (target) {
             const targetType = new target_1.Target().runSyntax(target, scope, filename);
-            if (targetType && _type_utils_1.TypeUtils.isAssignable(type, targetType) === false) {
+            if (targetType && new _type_utils_1.TypeUtils(scope).isAssignable(type, targetType) === false) {
                 throw new Error("Method returning value not type compatible");
             }
         }
@@ -90,7 +90,7 @@ class MethodParameters {
             else if (item.targetType === undefined) {
                 throw new Error("Could not determine target type");
             }
-            else if (item.targetType && _type_utils_1.TypeUtils.isAssignable(parameterType, item.targetType) === false) {
+            else if (item.targetType && new _type_utils_1.TypeUtils(scope).isAssignable(parameterType, item.targetType) === false) {
                 throw new Error("Method parameter type not compatible, " + item.name);
             }
         }
@@ -109,7 +109,7 @@ class MethodParameters {
                 }
                 parameterType = parameter.getType();
             }
-            if (item.targetType && _type_utils_1.TypeUtils.isAssignable(parameterType, item.targetType) === false) {
+            if (item.targetType && new _type_utils_1.TypeUtils(scope).isAssignable(parameterType, item.targetType) === false) {
                 throw new Error("Method parameter type not compatible, " + item.name);
             }
             (_a = this.requiredParameters) === null || _a === void 0 ? void 0 : _a.delete(item.name);
@@ -129,7 +129,7 @@ class MethodParameters {
             if (parameter === undefined) {
                 throw new Error("Method importing parameter \"" + item.name + "\" does not exist");
             }
-            else if (_type_utils_1.TypeUtils.isAssignable(parameter.getType(), item.sourceType) === false) {
+            else if (new _type_utils_1.TypeUtils(scope).isAssignable(item.sourceType, parameter.getType()) === false) {
                 throw new Error("Method parameter type not compatible, " + item.name);
             }
             this.requiredParameters.delete(item.name);

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

@@ -30,7 +30,12 @@ class Move {
             new inline_data_1.InlineData().runSyntax(inline, scope, filename, sourceType);
             targetType = sourceType;
         }
-        if (_type_utils_1.TypeUtils.isAssignable(sourceType, targetType) === false) {
+        if (node.findDirectTokenByText("?=")) {
+            if (new _type_utils_1.TypeUtils(scope).isCastable(sourceType, targetType) === false) {
+                throw new Error("Incompatible types");
+            }
+        }
+        else if (new _type_utils_1.TypeUtils(scope).isAssignable(sourceType, targetType) === false) {
             throw new Error("Incompatible types");
         }
     }

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

@@ -35,14 +35,14 @@ class ReadTable {
         const indexSource = node.findExpressionAfterToken("INDEX");
         if (indexSource) {
             const indexType = new source_1.Source().runSyntax(indexSource, scope, filename);
-            if (_type_utils_1.TypeUtils.isAssignable(indexType, new basic_1.IntegerType()) === false) {
+            if (new _type_utils_1.TypeUtils(scope).isAssignable(indexType, new basic_1.IntegerType()) === false) {
                 throw new Error("READ TABLE, INDEX must be simple");
             }
         }
         const fromSource = node.findExpressionAfterToken("FROM");
         if (fromSource) {
             const fromType = new source_1.Source().runSyntax(fromSource, scope, filename);
-            if (_type_utils_1.TypeUtils.isAssignable(fromType, new basic_1.IntegerType()) === false) {
+            if (new _type_utils_1.TypeUtils(scope).isAssignable(fromType, new basic_1.IntegerType()) === false) {
                 throw new Error("READ TABLE, FROM must be simple");
             }
         }
@@ -77,7 +77,7 @@ class ReadTable {
             const t = target.findFirstExpression(Expressions.Target);
             if (t) {
                 const targetType = new target_1.Target().runSyntax(t, scope, filename);
-                if (_type_utils_1.TypeUtils.isAssignable(rowType, targetType) === false) {
+                if (new _type_utils_1.TypeUtils(scope).isAssignable(rowType, targetType) === false) {
                     throw new Error("Incompatible types");
                 }
                 return;

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

@@ -16,12 +16,12 @@ class Shift {
         }
         const targetType = new target_1.Target().runSyntax(target, scope, filename);
         if (node.concatTokens().toUpperCase().includes(" IN BYTE MODE")) {
-            if (_type_utils_1.TypeUtils.isHexLike(targetType) === false) {
+            if (new _type_utils_1.TypeUtils(scope).isHexLike(targetType) === false) {
                 throw new Error("Shift, Target not hex like");
             }
         }
         else {
-            if (_type_utils_1.TypeUtils.isCharLike(targetType) === false) {
+            if (new _type_utils_1.TypeUtils(scope).isCharLike(targetType) === false) {
                 throw new Error("Shift, Target not char like");
             }
         }

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

@@ -13,8 +13,8 @@ class Write {
         for (const s of node.findAllExpressions(Expressions.Source)) {
             const type = new source_1.Source().runSyntax(s, scope, filename);
             if (s === second
-                && _type_utils_1.TypeUtils.isCharLike(type) === false
-                && _type_utils_1.TypeUtils.isHexLike(type) === false) {
+                && new _type_utils_1.TypeUtils(scope).isCharLike(type) === false
+                && new _type_utils_1.TypeUtils(scope).isHexLike(type) === false) {
                 throw new Error("Source not character like");
             }
         }

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.85.20",
+    "version": "2.85.21",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,7 +48,7 @@
         "@microsoft/api-extractor": "^7.19.4",
         "@types/chai": "^4.3.0",
         "@types/mocha": "^9.1.0",
-        "@types/node": "^17.0.18",
+        "@types/node": "^17.0.19",
         "chai": "^4.3.6",
         "eslint": "^8.9.0",
         "mocha": "^9.2.1",