Handler runtime improvements

hkmc2/shared/src/test/mlscript-compile/Predef.mjs

@@ -1,4 +1,5 @@
 import runtime from "./Runtime.mjs";
+import Runtime from "./Runtime.mjs";
 let Predef1;
 Predef1 = class Predef {
   static {
@@ -388,6 +389,9 @@ Predef1 = class Predef {
     } else {
       return runtime.Unit
     }
+  } 
+  static enterHandleBlock(handler, body) {
+    return Runtime.enterHandleBlock(handler, body)
   }
   static toString() { return "Predef"; }
 };

hkmc2/shared/src/test/mlscript-compile/Predef.mls

@@ -1,4 +1,6 @@
 
+import "./Runtime.mls"
+
 module Predef with ...
 
 fun id(x) = x
@@ -158,3 +160,9 @@ module TraceLogger with
 class Test with
   print("Test")
   val y = 1
+
+// This binds the handler in body, which means body can raise effects in handler
+fun enterHandleBlock(handler, body) =
+  // This is a simple wrapper of a handler runtime function, which must not be instrumented so cannot be directly implemented here.
+  // It also calls other internal runtime functions as well.
+  Runtime.enterHandleBlock(handler, body)

hkmc2/shared/src/test/mlscript-compile/Runtime.mls

@@ -22,7 +22,6 @@ fun deboundMethod(mtdName, clsName) =
 
 // Private definitions for algebraic effects
 
-// completed is used to detect tail call
 abstract class FunctionContFrame(next) with
   fun resume(value)
 class HandlerContFrame(next, nextHandler, handler)

hkmc2/shared/src/test/mlscript/handlers/ManualEffectBinding.mls

@@ -1,9 +1,6 @@
 :js
 :effectHandlers
 
-import "../../mlscript-compile/Runtime.mls"
-open Runtime { enterHandleBlock }
-
 abstract class Effect with
   fun perform(): ()
 

hkmc2/shared/src/test/mlscript/handlers/RecursiveHandlers.mls

@@ -1,8 +1,6 @@
 :js
 :effectHandlers
 
-import "../../mlscript-compile/Runtime.mls"
-open Runtime { enterHandleBlock }
 
 abstract class Effect[A] with
   fun perform(arg: A): A
@@ -21,13 +19,13 @@ h1.perform("hello")
 :e
 h1
 //│ ╔══[ERROR] Name not found: h1
-//│ ║  l.22: 	h1
+//│ ║  l.20: 	h1
 //│ ╙──      	^^
 
 :e
 h1.perform("oops")
 //│ ╔══[ERROR] Name not found: h1
-//│ ║  l.28: 	h1.perform("oops")
+//│ ║  l.26: 	h1.perform("oops")
 //│ ╙──      	^^
 
 :re
@@ -73,7 +71,7 @@ handle h2 = Effect with
   h2.perform(3)
 ]
 //│ ╔══[ERROR] Name not found: h2
-//│ ║  l.67: 	      then h2.perform(arg - 1) + " " + arg
+//│ ║  l.65: 	      then h2.perform(arg - 1) + " " + arg
 //│ ╙──      	           ^^
 //│ > –––
 //│ > performing 2
@@ -167,9 +165,9 @@ str
 //│       }
 //│       perform(arg) {
 //│         return runtime.mkEffect(h1, (k) => {
-//│           let tmp12, tmp13, tmp14, Cont$handler$h1$RecursiveHandlers$_mls_L141_58_1301;
-//│           Cont$handler$h1$RecursiveHandlers$_mls_L141_58_1301 = function Cont$handler$h1$RecursiveHandlers$_mls_L141_58_130(pc1) { return new Cont$handler$h1$RecursiveHandlers$_mls_L141_58_130.class(pc1); };
-//│           Cont$handler$h1$RecursiveHandlers$_mls_L141_58_1301.class = class Cont$handler$h1$RecursiveHandlers$_mls_L141_58_130 extends runtime.FunctionContFrame.class {
+//│           let tmp12, tmp13, tmp14, Cont$handler$h1$RecursiveHandlers$_mls_L139_58_1301;
+//│           Cont$handler$h1$RecursiveHandlers$_mls_L139_58_1301 = function Cont$handler$h1$RecursiveHandlers$_mls_L139_58_130(pc1) { return new Cont$handler$h1$RecursiveHandlers$_mls_L139_58_130.class(pc1); };
+//│           Cont$handler$h1$RecursiveHandlers$_mls_L139_58_1301.class = class Cont$handler$h1$RecursiveHandlers$_mls_L139_58_130 extends runtime.FunctionContFrame.class {
 //│             constructor(pc) {
 //│               let tmp15;
 //│               tmp15 = super(null);
@@ -194,13 +192,13 @@ str
 //│                 break;
 //│               }
 //│             }
-//│             toString() { return "Cont$handler$h1$RecursiveHandlers$_mls_L141_58_130(" + globalThis.Predef.render(this.pc) + ")"; }
+//│             toString() { return "Cont$handler$h1$RecursiveHandlers$_mls_L139_58_130(" + globalThis.Predef.render(this.pc) + ")"; }
 //│           };
 //│           tmp12 = str + "A";
 //│           str = tmp12;
 //│           tmp13 = runtime.safeCall(k(arg));
 //│           if (tmp13 instanceof runtime.EffectSig.class) {
-//│             tmp13.contTrace.last.next = new Cont$handler$h1$RecursiveHandlers$_mls_L141_58_1301.class(6);
+//│             tmp13.contTrace.last.next = new Cont$handler$h1$RecursiveHandlers$_mls_L139_58_1301.class(6);
 //│             tmp13.contTrace.last = tmp13.contTrace.last.next;
 //│             return tmp13
 //│           }
@@ -250,9 +248,9 @@ str
 //│         }
 //│         perform(arg) {
 //│           return runtime.mkEffect(h2, (k) => {
-//│             let tmp13, tmp14, tmp15, tmp16, tmp17, Cont$handler$h2$RecursiveHandlers$_mls_L141_165_2491;
-//│             Cont$handler$h2$RecursiveHandlers$_mls_L141_165_2491 = function Cont$handler$h2$RecursiveHandlers$_mls_L141_165_249(pc1) { return new Cont$handler$h2$RecursiveHandlers$_mls_L141_165_249.class(pc1); };
-//│             Cont$handler$h2$RecursiveHandlers$_mls_L141_165_2491.class = class Cont$handler$h2$RecursiveHandlers$_mls_L141_165_249 extends runtime.FunctionContFrame.class {
+//│             let tmp13, tmp14, tmp15, tmp16, tmp17, Cont$handler$h2$RecursiveHandlers$_mls_L139_165_2491;
+//│             Cont$handler$h2$RecursiveHandlers$_mls_L139_165_2491 = function Cont$handler$h2$RecursiveHandlers$_mls_L139_165_249(pc1) { return new Cont$handler$h2$RecursiveHandlers$_mls_L139_165_249.class(pc1); };
+//│             Cont$handler$h2$RecursiveHandlers$_mls_L139_165_2491.class = class Cont$handler$h2$RecursiveHandlers$_mls_L139_165_249 extends runtime.FunctionContFrame.class {
 //│               constructor(pc) {
 //│                 let tmp18;
 //│                 tmp18 = super(null);
@@ -278,14 +276,14 @@ str
 //│                   break;
 //│                 }
 //│               }
-//│               toString() { return "Cont$handler$h2$RecursiveHandlers$_mls_L141_165_249(" + globalThis.Predef.render(this.pc) + ")"; }
+//│               toString() { return "Cont$handler$h2$RecursiveHandlers$_mls_L139_165_249(" + globalThis.Predef.render(this.pc) + ")"; }
 //│             };
 //│             tmp13 = str + "B";
 //│             tmp14 = str + tmp13;
 //│             str = tmp14;
 //│             tmp15 = runtime.safeCall(k(arg));
 //│             if (tmp15 instanceof runtime.EffectSig.class) {
-//│               tmp15.contTrace.last.next = new Cont$handler$h2$RecursiveHandlers$_mls_L141_165_2491.class(2);
+//│               tmp15.contTrace.last.next = new Cont$handler$h2$RecursiveHandlers$_mls_L139_165_2491.class(2);
 //│               tmp15.contTrace.last = tmp15.contTrace.last.next;
 //│               return tmp15
 //│             }

hkmc2/shared/src/test/mlscript/handlers/StackSafety.mls

@@ -406,8 +406,6 @@ bad()
 :effectHandlers
 :stackSafe 100
 :expect 0
-import "../../mlscript-compile/Runtime.mls"
-open Runtime { enterHandleBlock }
 let depth = 0
 handle h = Object with
   fun whoops()(k) =

hkmc2/shared/src/test/mlscript/handlers/UserThreads.mls

@@ -1,8 +1,6 @@
 :js
 :effectHandlers
 
-import "../../mlscript-compile/Runtime.mls"
-open Runtime { enterHandleBlock }
 
 abstract class ThreadEffect with
   val tasks = []
@@ -151,33 +149,32 @@ abstract class ThreadEffect with
   fun xchg(x: Int): Int
 
 val tasks = []
-fun enqueue(k) =
-  tasks.push(k)
+fun enqueue(k, x) =
+  tasks.push(k.bind(null, x))
 fun dequeue() =
   if tasks.length != 0 do
     tasks.shift()()
 //│ tasks = []
 
-class Tuple2(a, b)
 let exchanger = None
 //│ exchanger = None
 
 fun start(thread: ThreadEffect -> ()) =
   handle h = ThreadEffect with
     fun fork(new_thread)(k) =
-      enqueue(k)
+      enqueue(k, ())
       start(new_thread)
     fun yld()(k) =
-      enqueue(k)
+      enqueue(k, ())
       dequeue()
     fun xchg(x)(k) =
       if exchanger is
-        Some(Tuple2(y, k1)) then
+        Some([y, k1]) then
           set exchanger = None
-          enqueue(k1.bind(null, x))
+          enqueue(k1, x)
           k(y)
         None then
-          set exchanger = Some(Tuple2(x, k))
+          set exchanger = Some([x, k])
           dequeue()
   in
     thread(h)