WIP

Author: hhugo

compiler/lib/js_traverse.ml

@@ -1707,13 +1707,13 @@ class simpl =
           match e1, e2 with
           | _, ENum n when Num.is_neg n -> EBin (Minus, e1, ENum (Num.neg n))
           | ENum n, _ when Num.is_neg n -> EBin (Minus, e2, ENum (Num.neg n))
-          | ENum zero, (ENum _ as x) when is_zero zero -> x
-          | (ENum _ as x), ENum zero when is_zero zero -> x
+          | ENum zero, (ENum _ as x) when Num.is_zero zero -> x
+          | (ENum _ as x), ENum zero when Num.is_zero zero -> x
           | _ -> e)
       | EBin (Minus, e1, e2) -> (
           match e1, e2 with
           | _, ENum n when Num.is_neg n -> EBin (Plus, e1, ENum (Num.neg n))
-          | (ENum _ as x), ENum zero when is_zero zero -> x
+          | (ENum _ as x), ENum zero when Num.is_zero zero -> x
           | _ -> e)
       | EFun
           (None, (({ generator = false; async = true | false }, _, body, _) as fun_decl))

compiler/tests-compiler/array_access.ml

@@ -33,8 +33,9 @@ let%expect_test "array_set" =
   print_fun_decl program (Some "some_name");
   [%expect
     {|
-    function some_name(a, n){runtime.caml_check_bound(a, n)[1 + n] = n; return 1;}
-    //end |}]
+    function some_name(a, n){runtime.caml_check_bound(a, n)[n + 1] = n; return 1;}
+    //end
+    |}]
 
 let%expect_test "array_set" =
   compile_and_run array_set;

compiler/tests-compiler/gh1354.ml

@@ -67,7 +67,7 @@ with Exit ->
        catch(_e_){
         var _c_ = caml_wrap_exception(_e_);
         if(_c_ !== Stdlib[3]) throw caml_maybe_attach_backtrace(_c_, 0);
-        caml_call2(Stdlib_Printf[3], _d_, _b_ | 0);
+        caml_call2(Stdlib_Printf[3], _d_, _b_ + 0 | 0);
         var Test = [0];
         runtime.caml_register_global(3, Test, "Test");
         0;
@@ -148,14 +148,14 @@ with Exit ->
          throw caml_maybe_attach_backtrace(Stdlib[3], 1);
         }
         catch(_k_){
-         caml_call3(Stdlib_Printf[3], _h_, _g_ | 0, _b_);
+         caml_call3(Stdlib_Printf[3], _h_, _g_ + 0 | 0, _b_);
          throw caml_maybe_attach_backtrace(Stdlib[3], 1);
         }
        }
        catch(_j_){
         var _d_ = caml_wrap_exception(_j_);
         if(_d_ !== Stdlib[3]) throw caml_maybe_attach_backtrace(_d_, 0);
-        caml_call3(Stdlib_Printf[3], _e_, _c_ | 0, _b_);
+        caml_call3(Stdlib_Printf[3], _e_, _c_ + 0 | 0, _b_);
         var Test = [0];
         runtime.caml_register_global(4, Test, "Test");
         0;

compiler/tests-compiler/gh1768.ml

@@ -56,7 +56,7 @@ let () =
         Assert_failure = global_data.Assert_failure,
         _a_ = [0, caml_string_of_jsbytes("test.ml"), 4, 27],
         _b_ = [0, caml_string_of_jsbytes("test.ml"), 8, 2];
-       function h(x){x[1] = function(x, y){return x + y | 0;};}
+       function h(x){x[1] = runtime.caml_add;}
        function f(param){
         return [0,
                 function(param){
@@ -73,4 +73,5 @@ let () =
        return;
       }
       (globalThis));
-    //end |}]
+    //end
+    |}]

compiler/tests-compiler/gh747.ml

@@ -334,7 +334,7 @@ end
     114:       /*<<test.ml:66:6>>*/ return caml_call2(Stdlib_Printf[1], outchan, _d_) /*<<test.ml:73:10>>*/ ;
     115:     var
     116:      a =  /*<<test.ml:64:2>>*/ backtrace[1],
-    117:      _f_ =  /*<<test.ml:69:6>>*/ a.length - 2 | 0,
+    117:      _f_ =  /*<<test.ml:69:6>>*/ a.length - 1 - 1 | 0,
     118:      _e_ = 0;
     119:     if(_f_ >= 0){
     120:      var i = _e_;

compiler/tests-compiler/obj.ml

@@ -52,11 +52,11 @@ let%expect_test "static eval of string get" =
     //end
     function my_size(x){return x.length - 1;}
     //end
-    function my_field(x, i){return x[1 + i];}
-    //end
-    function my_set_field(x, i, o){x[1 + i] = o; return 0;}
+    not found
+    function my_set_field(x, i, o){x[i + 1] = o; return 0;}
     //end
     function my_new_block(x, l){return runtime.caml_obj_block(x + 1 | 0, 3);}
     //end
     function my_dup(t){return runtime.caml_obj_dup([0, t, 0]);}
-    //end |}]
+    //end
+    |}]