@abaplint/runtime 2.11.53 → 2.11.55

package/build/src/abap_eventing.js

@@ -4,10 +4,7 @@ exports.ABAPEventing = void 0;
 class ABAPEventing {
     registrations = {};
     setHandler(event, methods, forObject, activation) {
-        if (activation === false) {
-            throw new Error("ABAPEventing.setHandler: deactivation not supported, todo");
-        }
-        else if (methods.length === 0) {
+        if (methods.length === 0) {
             throw new Error("ABAPEventing.setHandler: no methods provided");
         }
         if (!this.registrations[event.EVENT_CLASS]) {
@@ -18,11 +15,23 @@ class ABAPEventing {
         }
         const ref = forObject === "ALL" ? "ALL" : new WeakRef(forObject);
         const handlers = this.registrations[event.EVENT_CLASS][event.EVENT_NAME];
-        // todo: tackle duplicates
-        handlers.push({
-            handlers: methods,
-            forObject: ref,
-        });
+        if (activation === true) {
+            // todo: tackle duplicates
+            handlers.push({
+                handlers: methods,
+                forObject: ref,
+            });
+        }
+        else {
+            if (methods.length > 1) {
+                throw new Error("ABAPEventing.setHandler: deactivation of multiple methods not supported, todo");
+            }
+            // todo: comparing the functions via toString might give the wrong result
+            const index = handlers.findIndex(handler => handler.forObject === ref && handler.handlers[0].toString() === methods[0].toString());
+            if (index !== -1) {
+                handlers.splice(index, 1);
+            }
+        }
     }
     // todo: cleanup of dead WeakRefs
     async raiseEvent(event, me, parameters) {

package/build/src/statements/loop.js

@@ -28,24 +28,32 @@ function dynamicToWhere(condition, evaluate) {
     //  console.dir(condition);
     let text = condition.replace(/ AND /gi, " && ").replace(/ OR /gi, " || ").replace(/ = /gi, " EQ ").replace(/ <> /gi, " NE ");
     //  console.dir(text);
-    let regex = /([\w-]+)\s+(\w+)\s+([<>\w-]+)/gi;
-    let matches = text.matchAll(regex);
+    if (evaluate === undefined) {
+        throw new Error("Dynamic WHERE evaluation function is not defined");
+    }
+    const matches = text.matchAll(/([\w-]+)\s+(\w+)\s+([<>\w-]+)/gi);
     for (const match of matches) {
         const left = match[1];
         const comparator = match[2].toLowerCase();
-        const right = match[3];
+        let right = "";
         //    console.dir({left, right});
         const cleft = "i." + left.toLowerCase().replace(/-/g, ".get().");
-        const cright = right;
-        const cnew = `abap.compare.${comparator}(${cleft}, ${cright})`;
-        text = text.replace(match[0], cnew);
-    }
-    regex = / <(\w+)>-(\w+)/gi;
-    matches = text.matchAll(regex);
-    for (const match of matches) {
-        const name = "fs_" + match[1].toLowerCase() + "_";
-        const value = evaluate(name)?.get()?.[match[2].toLowerCase()]?.get();
-        text = text.replace(match[0], " '" + value + "'");
+        const rightMatches = match[3].matchAll(/<(\w+)>-(\w+)/gi);
+        for (const rightMatch of rightMatches) {
+            const name = "fs_" + rightMatch[1].toLowerCase() + "_";
+            right = `evaluate("${name}").get()["${rightMatch[2].toLowerCase()}"]`;
+        }
+        if (right === "") {
+            right = `evaluate("${match[3]}")`;
+        }
+        if (comparator === "in") {
+            const cnew = `abap.compare.in(${cleft}, ${right})`;
+            text = text.replace(match[0], cnew);
+        }
+        else {
+            const cnew = `abap.compare.${comparator}(${cleft}, ${right})`;
+            text = text.replace(match[0], cnew);
+        }
     }
     //  console.dir(text);
     // @ts-ignore

package/build/src/statements/set_handler.js

@@ -6,7 +6,7 @@ function setHandler(eventReference, methods, forObject, activation) {
     if (forObject instanceof types_1.FieldSymbol) {
         const pointer = forObject.getPointer();
         if (pointer === undefined) {
-            throw new Error("CX_SY_ SOMETHING TODO");
+            throw new Error("CX_SY SOMETHING TODO");
         }
         return setHandler(eventReference, methods, pointer, activation);
     }

package/package.json

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