@abaplint/runtime 2.13.99 → 2.14.0

package/build/src/builtin/substring_after.js

@@ -39,7 +39,7 @@ function substring_after(input) {
     else if (input?.sub) {
         reg = abap_regex_1.ABAPRegExp.escapeRegExp(input.sub.get());
     }
-    const r = new RegExp(reg + "(.*)");
+    const r = new RegExp(reg + "([\\s\\S]*)");
     const res = val.match(r);
     let ret = "";
     if (res && res[1]) {

package/build/src/builtin/substring_before.js

@@ -39,7 +39,7 @@ function substring_before(input) {
     else if (input?.sub) {
         reg = abap_regex_1.ABAPRegExp.escapeRegExp(input.sub.get());
     }
-    const r = new RegExp("(.*?)" + reg);
+    const r = new RegExp("([\\s\\S]*?)" + reg);
     const res = val.match(r);
     let ret = "";
     if (res && res[1]) {

package/build/src/compare/instance_of.js

@@ -2,6 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.instance_of = instance_of;
 function instance_of(val, cname) {
-    return val.get() instanceof cname;
+    const obj = val.get();
+    if (obj === undefined) {
+        const name = val.getQualifiedName()?.toUpperCase();
+        if (name === undefined || name === "OBJECT") {
+            return cname === "OBJECT";
+        }
+        else if (cname === "OBJECT") {
+            return true;
+        }
+        const seen = new Set();
+        const matches = (source) => {
+            if (source == null || seen.has(source)) {
+                return false;
+            }
+            else if (source === cname) {
+                return true;
+            }
+            seen.add(source);
+            const internalName = source.INTERNAL_NAME || "";
+            const prefix = internalName.substring(0, internalName.lastIndexOf("-") + 1);
+            const interfaces = source.IMPLEMENTED_INTERFACES || [];
+            return interfaces.some(i => matches(abap.Classes[prefix + i] || abap.Classes[i]))
+                || matches(Object.getPrototypeOf(source));
+        };
+        // Local qualified names are short; RTTI carries the declaring program or class pool.
+        const scope = val.getRTTIName()?.toUpperCase().match(/^\\(PROGRAM|CLASS-POOL)=([^\\]+)/);
+        const prefix = scope ? (scope[1] === "PROGRAM" ? "PROG" : "CLAS") + "-" + scope[2] + "-" : "";
+        return matches(abap.Classes[prefix + name] || abap.Classes[name]);
+    }
+    else if (cname === "OBJECT") {
+        return true;
+    }
+    return obj instanceof cname;
 }
 //# sourceMappingURL=instance_of.js.map

package/build/src/statements/assign.d.ts

@@ -8,5 +8,6 @@ export interface IAssignInput {
     dynamicSource?: ICharacter;
     casting?: boolean;
     component?: string | ICharacter;
+    keepSubrc?: boolean;
 }
 export declare function assign(input: IAssignInput): void;

package/build/src/statements/assign.js

@@ -187,7 +187,9 @@ function assign(input) {
                 }
                 input.target.assign(input.source);
             }
-            abap.builtin.sy.get().subrc.set(0);
+            if (input.keepSubrc !== true) {
+                abap.builtin.sy.get().subrc.set(0);
+            }
         }
     }
 }

package/build/src/statements/cast.js

@@ -4,7 +4,6 @@ exports.cast = cast;
 const throw_error_1 = require("../throw_error");
 const types_1 = require("../types");
 // todo, field symbols as input?
-// todo, local classes?
 // check with javascript instanceof?
 // handling interfaces?
 // todo: remove the "async"
@@ -34,6 +33,14 @@ async function cast(target, source) {
         // todo, for unit testing,
         targetClass = abap.Classes["PROG-ZFOOBAR-" + targetName];
     }
+    if (targetClass === undefined && target instanceof types_1.ABAPObject) {
+        // local class, RTTI name "\CLASS-POOL=ZCL_FOO\CLASS=LCL_BAR" is registered as "CLAS-ZCL_FOO-LCL_BAR"
+        const match = /^\\(CLASS-POOL|PROGRAM)=([^\\]+)\\CLASS=(.+)$/.exec(target.getRTTIName()?.toUpperCase() || "");
+        if (match) {
+            const prefix = match[1] === "PROGRAM" ? "PROG" : "CLAS";
+            targetClass = abap.Classes[prefix + "-" + match[2] + "-" + match[3]];
+        }
+    }
     if (targetClass?.INTERNAL_TYPE === "CLAS") {
         // using "instanceof" is probably wrong in some cases,
         // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/instanceof

package/build/src/types/field_symbol.d.ts

@@ -13,6 +13,7 @@ export declare class FieldSymbol {
     constructor(type?: PointerType);
     clone(): void;
     getQualifiedName(): any;
+    getRTTIName(): string | undefined;
     assign(pointer: PointerType): void;
     getType(): PointerType;
     setCasting(): void;

package/build/src/types/field_symbol.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldSymbol = void 0;
+const abap_object_1 = require("./abap_object");
 const table_1 = require("./table");
 const string_1 = require("./string");
 const hex_1 = require("./hex");
@@ -24,6 +25,9 @@ class FieldSymbol {
         // @ts-ignore
         return this.type.getQualifiedName();
     }
+    getRTTIName() {
+        return this.type instanceof abap_object_1.ABAPObject ? this.type.getRTTIName() : undefined;
+    }
     assign(pointer) {
         this.pointer = pointer;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "2.13.99",
+  "version": "2.14.0",
   "description": "Transpiler - Runtime",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",