Update tests

Author: vouillon

compiler/tests-compiler/direct_calls.ml

@@ -56,46 +56,22 @@ let%expect_test "direct calls without --effects=cps" =
   print_fun_decl code (Some "test4");
   [%expect
     {|
-    function test1(param){
-     function f(g, x){
-      try{caml_call1(g, x); return;}
-      catch(e$0){
-       var e = caml_wrap_exception(e$0);
-       throw caml_maybe_attach_backtrace(e, 0);
-      }
-     }
-     f(function(x){return x + 1 | 0;}, 7);
-     f(function(x){return x * 2.;}, 4.);
-     return 0;
-    }
+    function test1(param){return 0;}
     //end
     function test2(param){
-     function f(g, x){
-      try{caml_call1(g, x); return;}
-      catch(e$0){
-       var e = caml_wrap_exception(e$0);
-       throw caml_maybe_attach_backtrace(e, 0);
-      }
+     try{caml_call2(Stdlib[28], x, cst_a);}
+     catch(e$0){
+      var e = caml_wrap_exception(e$0);
+      throw caml_maybe_attach_backtrace(e, 0);
      }
-     f(function(x){return x + 1 | 0;}, 7);
-     f(function(x){return caml_call2(Stdlib[28], x, cst_a$0);}, cst_a);
      return 0;
     }
     //end
-    function test3(x){
-     function F(symbol){function f(x){return x + 1 | 0;} return [0, f];}
-     var M1 = F([0]), M2 = F([0]), _b_ = M2[1].call(null, 2);
-     return [0, M1[1].call(null, 1), _b_];
-    }
+    function test3(x){return [0, 2, 3];}
     //end
     function test4(x){
-     function F(symbol){
-      function f(x){return caml_call2(Stdlib_Printf[2], _a_, x);}
-      return [0, f];
-     }
-     var M1 = F([0]), M2 = F([0]);
-     M1[1].call(null, 1);
-     return M2[1].call(null, 2);
+     caml_call2(Stdlib_Printf[2], _a_, 1);
+     return caml_call2(Stdlib_Printf[2], _a_, 2);
     }
     //end |}]
 
@@ -138,64 +114,30 @@ let%expect_test "direct calls with --effects=cps" =
   print_fun_decl code (Some "test4");
   [%expect
     {|
-    function test1(param, cont){
-     function f(g, x){
-      try{g(); return;}
-      catch(e$0){
-       var e = caml_wrap_exception(e$0);
-       throw caml_maybe_attach_backtrace(e, 0);
-      }
-     }
-     f(function(x){});
-     f(function(x){});
-     return cont(0);
-    }
+    function test1(param, cont){return cont(0);}
     //end
     function test2(param, cont){
-     function f(g, x, cont){
-      runtime.caml_push_trap
-       (function(e){
-         var raise = caml_pop_trap(), e$0 = caml_maybe_attach_backtrace(e, 0);
-         return raise(e$0);
-        });
-      return caml_exact_trampoline_cps_call
-              (g, x, function(_t_){caml_pop_trap(); return cont();});
-     }
-     return caml_exact_trampoline_cps_call$0
-             (f,
-              function(x, cont){return cont();},
-              7,
-              function(_r_){
-               return caml_exact_trampoline_cps_call$0
-                       (f,
-                        function(x, cont){
-                         return caml_trampoline_cps_call3
-                                 (Stdlib[28], x, cst_a$0, cont);
-                        },
-                        cst_a,
-                        function(_s_){return cont(0);});
-              });
+     runtime.caml_push_trap
+      (function(e){
+        var raise = caml_pop_trap(), e$0 = caml_maybe_attach_backtrace(e, 0);
+        return raise(e$0);
+       });
+     return caml_trampoline_cps_call3
+             (Stdlib[28],
+              x,
+              cst_a,
+              function(_g_){caml_pop_trap(); return cont(0);});
     }
     //end
-    function test3(x, cont){
-     function F(symbol){function f(x){return x + 1 | 0;} return [0, f];}
-     var M1 = F(), M2 = F(), _q_ = M2[1].call(null, 2);
-     return cont([0, M1[1].call(null, 1), _q_]);
-    }
+    function test3(x, cont){return cont([0, 2, 3]);}
     //end
     function test4(x, cont){
-     function F(symbol){
-      function f(x, cont){
-       return caml_trampoline_cps_call3(Stdlib_Printf[2], _o_, x, cont);
-      }
-      return [0, f];
-     }
-     var M1 = F(), M2 = F();
-     return caml_exact_trampoline_cps_call
-             (M1[1],
+     return caml_trampoline_cps_call3
+             (Stdlib_Printf[2],
+              _e_,
               1,
-              function(_p_){
-               return caml_exact_trampoline_cps_call(M2[1], 2, cont);
+              function(_f_){
+               return caml_trampoline_cps_call3(Stdlib_Printf[2], _e_, 2, cont);
               });
     }
     //end

compiler/tests-compiler/double-translation/direct_calls.ml

@@ -121,103 +121,47 @@ let%expect_test "direct calls with --effects=double-translation" =
                       : runtime.caml_call_gen(f, [a0, a1]))
                 : runtime.caml_trampoline_return(f, [a0, a1, a2], 0);
        }
-       function caml_exact_trampoline_cps_call$0(f, a0, a1, a2){
-        return runtime.caml_stack_check_depth()
-                ? f.cps ? f.cps.call(null, a0, a1, a2) : a2(f(a0, a1))
-                : runtime.caml_trampoline_return(f, [a0, a1, a2], 0);
-       }
        var
-        dummy = 0,
         global_data = runtime.caml_get_global_data(),
-        _z_ = [0, [4, 0, 0, 0, 0], caml_string_of_jsbytes("%d")],
-        cst_a$0 = caml_string_of_jsbytes("a"),
+        _k_ = [0, [4, 0, 0, 0, 0], caml_string_of_jsbytes("%d")],
         cst_a = caml_string_of_jsbytes("a"),
+        x = caml_string_of_jsbytes("a"),
         Stdlib = global_data.Stdlib,
         Stdlib_Printf = global_data.Stdlib__Printf;
-       function test1(param){
-        function f(g, x){
-         try{caml_call1(g, dummy); return;}
-         catch(e$0){
-          var e = caml_wrap_exception(e$0);
-          throw caml_maybe_attach_backtrace(e, 0);
-         }
-        }
-        f(function(x){});
-        f(function(x){});
-        return 0;
-       }
-       function f$0(){
-        function f$0(g, x){
-         try{caml_call1(g, x); return;}
-         catch(e$0){
-          var e = caml_wrap_exception(e$0);
-          throw caml_maybe_attach_backtrace(e, 0);
-         }
-        }
-        function f$1(g, x, cont){
-         runtime.caml_push_trap
-          (function(e$0){
-            var raise = caml_pop_trap(), e = caml_maybe_attach_backtrace(e$0, 0);
-            return raise(e);
-           });
-         return caml_exact_trampoline_cps_call
-                 (g, x, function(_K_){caml_pop_trap(); return cont();});
-        }
-        var f = caml_cps_closure(f$0, f$1);
-        return f;
-       }
-       function _h_(){return function(x){};}
-       function _j_(){
-        return caml_cps_closure
-                (function(x){return caml_call2(Stdlib[28], x, cst_a$0);},
-                 function(x, cont){
-                  return caml_trampoline_cps_call3(Stdlib[28], x, cst_a$0, cont);
-                 });
-       }
+       function test1(param){return 0;}
        function test2$0(param){
-        var f = f$0();
-        f(_h_(), 7);
-        f(_j_(), cst_a);
+        try{caml_call2(Stdlib[28], x, cst_a);}
+        catch(e$0){
+         var e = caml_wrap_exception(e$0);
+         throw caml_maybe_attach_backtrace(e, 0);
+        }
         return 0;
        }
        function test2$1(param, cont){
-        var f = f$0();
-        return caml_exact_trampoline_cps_call$0
-                (f,
-                 _h_(),
-                 7,
-                 function(_I_){
-                  return caml_exact_trampoline_cps_call$0
-                          (f, _j_(), cst_a, function(_J_){return cont(0);});
-                 });
+        runtime.caml_push_trap
+         (function(e$0){
+           var raise = caml_pop_trap(), e = caml_maybe_attach_backtrace(e$0, 0);
+           return raise(e);
+          });
+        return caml_trampoline_cps_call3
+                (Stdlib[28],
+                 x,
+                 cst_a,
+                 function(_s_){caml_pop_trap(); return cont(0);});
        }
        var test2 = caml_cps_closure(test2$0, test2$1);
-       function test3(x){
-        function F(symbol){function f(x){return x + 1 | 0;} return [0, f];}
-        var M1 = F(), M2 = F(), _H_ = caml_call1(M2[1], 2);
-        return [0, caml_call1(M1[1], 1), _H_];
-       }
-       function f(){
-        function f$0(x){return caml_call2(Stdlib_Printf[2], _z_, x);}
-        function f$1(x, cont){
-         return caml_trampoline_cps_call3(Stdlib_Printf[2], _z_, x, cont);
-        }
-        var f = caml_cps_closure(f$0, f$1);
-        return f;
-       }
-       function F(){function F(symbol){var f$0 = f(); return [0, f$0];} return F;}
+       function test3(x){return [0, 2, 3];}
        function test4$0(x){
-        var F$0 = F(), M1 = F$0(), M2 = F$0();
-        caml_call1(M1[1], 1);
-        return caml_call1(M2[1], 2);
+        caml_call2(Stdlib_Printf[2], _k_, 1);
+        return caml_call2(Stdlib_Printf[2], _k_, 2);
        }
        function test4$1(x, cont){
-        var F$0 = F(), M1 = F$0(), M2 = F$0();
-        return caml_exact_trampoline_cps_call
-                (M1[1],
+        return caml_trampoline_cps_call3
+                (Stdlib_Printf[2],
+                 _k_,
                  1,
-                 function(_G_){
-                  return caml_exact_trampoline_cps_call(M2[1], 2, cont);
+                 function(_r_){
+                  return caml_trampoline_cps_call3(Stdlib_Printf[2], _k_, 2, cont);
                  });
        }
        var test4 = caml_cps_closure(test4$0, test4$1);
@@ -233,18 +177,18 @@ let%expect_test "direct calls with --effects=double-translation" =
           tuple = recfuncs(x),
           f = tuple[2],
           h = tuple[1],
-          _E_ = h(100),
-          _F_ = f(12) + _E_ | 0;
-         return caml_call1(Stdlib[44], _F_);
+          _p_ = h(100),
+          _q_ = f(12) + _p_ | 0;
+         return caml_call1(Stdlib[44], _q_);
         }
         function g$1(x, cont){
          var
           tuple = recfuncs(x),
           f = tuple[2],
           h = tuple[1],
-          _C_ = h(100),
-          _D_ = f(12) + _C_ | 0;
-         return caml_trampoline_cps_call2(Stdlib[44], _D_, cont);
+          _n_ = h(100),
+          _o_ = f(12) + _n_ | 0;
+         return caml_trampoline_cps_call2(Stdlib[44], _o_, cont);
         }
         var g = caml_cps_closure(g$0, g$1);
         return g;
@@ -255,9 +199,9 @@ let%expect_test "direct calls with --effects=double-translation" =
         return caml_exact_trampoline_cps_call
                 (g$0,
                  42,
-                 function(_A_){
+                 function(_l_){
                   return caml_exact_trampoline_cps_call
-                          (g$0, - 5, function(_B_){return cont(0);});
+                          (g$0, - 5, function(_m_){return cont(0);});
                  });
        }
        var

compiler/tests-compiler/double-translation/effects_toplevel.ml

@@ -38,12 +38,18 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
        "use strict";
        var
         runtime = globalThis.jsoo_runtime,
+        caml_cps_closure = runtime.caml_cps_closure,
         caml_string_of_jsbytes = runtime.caml_string_of_jsbytes;
        function caml_call1(f, a0){
         return (f.l >= 0 ? f.l : f.l = f.length) === 1
                 ? f(a0)
                 : runtime.caml_call_gen(f, [a0]);
        }
+       function caml_exact_trampoline_call1(f, a0){
+        return runtime.caml_stack_check_depth()
+                ? f(a0)
+                : runtime.caml_trampoline_return(f, [a0], 1);
+       }
        function caml_trampoline_cps_call2(f, a0, a1){
         return runtime.caml_stack_check_depth()
                 ? f.cps
@@ -60,32 +66,47 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
                       : runtime.caml_call_gen(f, [a0]))
                 : runtime.caml_trampoline_return(f, [a0, a1], 0);
        }
+       function caml_exact_trampoline_cps_call(f, a0, a1){
+        return runtime.caml_stack_check_depth()
+                ? f.cps ? f.cps.call(null, a0, a1) : a1(f(a0))
+                : runtime.caml_trampoline_return(f, [a0, a1], 0);
+       }
        var
         dummy = 0,
         global_data = runtime.caml_get_global_data(),
-        _b_ =
+        _c_ =
           [0,
            [11, caml_string_of_jsbytes("abc"), 0],
            caml_string_of_jsbytes("abc")],
         Stdlib_Printf = global_data.Stdlib__Printf;
-       function g$0(param){return caml_call1(Stdlib_Printf[2], _b_);}
+       function g$0(param){return caml_call1(Stdlib_Printf[2], _c_);}
        function g$1(param, cont){
-        return caml_trampoline_cps_call2(Stdlib_Printf[2], _b_, cont);
+        return caml_trampoline_cps_call2(Stdlib_Printf[2], _c_, cont);
        }
-       var g = runtime.caml_cps_closure(g$0, g$1);
-       g();
-       var i = 1;
-       for(;;){
-        g();
-        var _c_ = i + 1 | 0;
-        if(5 === i){
-         g();
-         var Test = [0];
-         runtime.caml_register_global(2, Test, "Test");
-         return;
+       var g = caml_cps_closure(g$0, g$1);
+       function f$0(param){
+        var i = 1;
+        for(;;){g(); var _g_ = i + 1 | 0; if(5 === i) return; i = _g_;}
+       }
+       function f$1(param, cont){
+        function _d_(i){
+         return caml_exact_trampoline_cps_call
+                 (g,
+                  dummy,
+                  function(_f_){
+                   var _e_ = i + 1 | 0;
+                   return 5 !== i ? caml_exact_trampoline_call1(_d_, _e_) : cont();
+                  });
         }
-        i = _c_;
+        return _d_(1);
        }
+       var f = caml_cps_closure(f$0, f$1);
+       g();
+       f();
+       g();
+       var Test = [0];
+       runtime.caml_register_global(2, Test, "Test");
+       return;
       }
       (globalThis));
     //end