accept

Author: hhugo

compiler/tests-compiler/effects_continuations.ml

@@ -103,17 +103,10 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
     {|
 
     function exceptions(s, cont){
-<<<<<<< HEAD
      try{var _z_ = runtime.caml_int_of_string(s), n = _z_;}
      catch(_D_){
       var _u_ = caml_wrap_exception(_D_);
-      if(_u_[1] !== Stdlib[7]){
-=======
-     try{var _C_ = runtime.caml_int_of_string(s), n = _C_;}
-     catch(_G_){
-      var _v_ = caml_wrap_exception(_G_);
-      if(! Object.is(_v_[1], Stdlib[7])){
->>>>>>> c650ced771 (promote)
+      if(! Object.is(_u_[1], Stdlib[7])){
        var raise$1 = caml_pop_trap();
        return raise$1(caml_maybe_attach_backtrace(_u_, 0));
       }
@@ -124,28 +117,17 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
        throw caml_maybe_attach_backtrace(Stdlib[8], 1);
       var _y_ = 7, m = _y_;
      }
-<<<<<<< HEAD
      catch(_C_){
       var _v_ = caml_wrap_exception(_C_);
-      if(_v_ !== Stdlib[8]){
-=======
-     catch(_F_){
-      var _x_ = caml_wrap_exception(_F_);
-      if(! Object.is(_x_, Stdlib[8])){
->>>>>>> c650ced771 (promote)
+      if(! Object.is(_v_, Stdlib[8])){
        var raise$0 = caml_pop_trap();
        return raise$0(caml_maybe_attach_backtrace(_v_, 0));
       }
       var m = 0;
      }
      runtime.caml_push_trap
-<<<<<<< HEAD
       (function(_B_){
-        if(_B_ === Stdlib[8]) return cont(0);
-=======
-      (function(_E_){
-        if(Object.is(_E_, Stdlib[8])) return cont(0);
->>>>>>> c650ced771 (promote)
+        if(Object.is(_B_, Stdlib[8])) return cont(0);
         var raise = caml_pop_trap();
         return raise(caml_maybe_attach_backtrace(_B_, 0));
        });

compiler/tests-compiler/effects_exceptions.ml

@@ -57,17 +57,10 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
     {|
 
     function exceptions(s, cont){
-<<<<<<< HEAD
      try{var _n_ = runtime.caml_int_of_string(s), n = _n_;}
      catch(_r_){
       var _i_ = caml_wrap_exception(_r_);
-      if(_i_[1] !== Stdlib[7]){
-=======
-     try{var _p_ = runtime.caml_int_of_string(s), n = _p_;}
-     catch(_t_){
-      var _i_ = caml_wrap_exception(_t_);
       if(! Object.is(_i_[1], Stdlib[7])){
->>>>>>> c650ced771 (promote)
        var raise$1 = caml_pop_trap();
        return raise$1(caml_maybe_attach_backtrace(_i_, 0));
       }
@@ -78,28 +71,17 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
        throw caml_maybe_attach_backtrace(Stdlib[8], 1);
       var _m_ = 7, m = _m_;
      }
-<<<<<<< HEAD
      catch(_q_){
       var _j_ = caml_wrap_exception(_q_);
-      if(_j_ !== Stdlib[8]){
-=======
-     catch(_s_){
-      var _k_ = caml_wrap_exception(_s_);
-      if(! Object.is(_k_, Stdlib[8])){
->>>>>>> c650ced771 (promote)
+      if(! Object.is(_j_, Stdlib[8])){
        var raise$0 = caml_pop_trap();
        return raise$0(caml_maybe_attach_backtrace(_j_, 0));
       }
       var m = 0;
      }
      caml_push_trap
-<<<<<<< HEAD
       (function(_p_){
-        if(_p_ === Stdlib[8]) return cont(0);
-=======
-      (function(_r_){
-        if(Object.is(_r_, Stdlib[8])) return cont(0);
->>>>>>> c650ced771 (promote)
+        if(Object.is(_p_, Stdlib[8])) return cont(0);
         var raise = caml_pop_trap();
         return raise(caml_maybe_attach_backtrace(_p_, 0));
        });

compiler/tests-compiler/gh747.ml

@@ -353,7 +353,7 @@ end
     128:         (Stdlib_Printf[1], outchan, _c_, str);
     129:       }
     130:        /*<<test.ml:69:6>>*/  /*<<test.ml:69:6>>*/ var _g_ = i + 1 | 0;
-    131:       if(_f_ === i) break;
+    131:       if(Object.is(_f_, i)) break;
     132:       var i = _g_;
     133:      }
     134:     }

compiler/tests-compiler/global_deadcode.ml

@@ -69,9 +69,9 @@ let%expect_test "Eliminates unused functions from functor" =
      if(! t) return [0, 0, x, 0, 1];
      var r = t[3], v = t[2], l = t[1], c = caml_call2(Ord[1], x, v);
      if(0 === c) return t;
-     if(0 <= c){var rr = add(x, r); return r === rr ? t : bal(l, v, rr);}
+     if(0 <= c){var rr = add(x, r); return Object.is(r, rr) ? t : bal(l, v, rr);}
      var ll = add(x, l);
-     return l === ll ? t : bal(ll, v, r);
+     return Object.is(l, ll) ? t : bal(ll, v, r);
     }
     function singleton(x){return [0, 0, x, 0, 1];}
     var empty = 0;

compiler/tests-compiler/loops.ml

@@ -259,27 +259,16 @@ let f t x =
      if(val$0 && ! val$0[2]){
       var x$1 = val$0[1], x$0 = x$1;
       for(;;){
-<<<<<<< HEAD
        a:
        {
         try{var val = caml_call2(Stdlib_Hashtbl[6], t, x$0);}
         catch(_e_){
          var _a_ = caml_wrap_exception(_e_);
-         if(_a_ !== Stdlib[3]) throw caml_maybe_attach_backtrace(_a_, 0);
+         if(! Object.is(_a_, Stdlib[3]))
+          throw caml_maybe_attach_backtrace(_a_, 0);
          var _d_ = 0;
          break a;
         }
-=======
-       var switch$0 = 0;
-       try{var val = caml_call2(Stdlib_Hashtbl[6], t, x$0); switch$0 = 1;}
-       catch(_e_){
-        var _a_ = caml_wrap_exception(_e_);
-        if(! Object.is(_a_, Stdlib[3])) throw caml_maybe_attach_backtrace(_a_, 0);
-        var _d_ = 0;
-       }
-       if(switch$0){
-        var switch$1 = 0;
->>>>>>> c650ced771 (promote)
         if(val && ! val[2]){
          var y = val[1], _b_ = y === (x$0 + 1 | 0) ? 1 : 0;
          if(_b_){var _d_ = _b_; break a;}
@@ -507,9 +496,9 @@ let add_substitute =
          var lim = caml_ml_string_length(s), k = k$2, stop = new_start;
          for(;;){
           if(lim <= stop) throw caml_maybe_attach_backtrace(Stdlib[8], 1);
-          if(caml_string_get(s, stop) === opening)
+          if(Object.is(caml_string_get(s, stop), opening))
            var i = stop + 1 | 0, k$0 = k + 1 | 0, k = k$0, stop = i;
-          else if(caml_string_get(s, stop) === closing){
+          else if(Object.is(caml_string_get(s, stop), closing)){
            if(0 === k) break;
            var i$0 = stop + 1 | 0, k$1 = k - 1 | 0, k = k$1, stop = i$0;
           }
@@ -537,79 +526,6 @@ let add_substitute =
        caml_call2(add_char, b, previous$0);
        var i$8 = i$4 + 1 | 0, previous = previous$0, i$4 = i$8;
       }
-<<<<<<< HEAD
-=======
-      if(92 === previous){
-       caml_call2(add_char, b, previous$0);
-       var i$5 = i$4 + 1 | 0, previous = 32, i$4 = i$5;
-       continue;
-      }
-      var start$0 = i$4 + 1 | 0;
-      if(lim$1 <= start$0) throw caml_maybe_attach_backtrace(Stdlib[8], 1);
-      var opening = caml_string_get(s, start$0), switch$0 = 0;
-      if(40 !== opening && 123 !== opening){
-       var start = start$0 + 1 | 0, lim$0 = caml_ml_string_length(s), i$2 = start;
-       for(;;){
-        if(lim$0 <= i$2)
-         var stop$0 = lim$0;
-        else{
-         var match = caml_string_get(s, i$2), switch$1 = 0;
-         if(91 <= match){
-          if(97 <= match){
-           if(123 > match) switch$1 = 1;
-          }
-          else if(95 === match) switch$1 = 1;
-         }
-         else if(58 <= match){
-          if(65 <= match) switch$1 = 1;
-         }
-         else if(48 <= match) switch$1 = 1;
-         if(switch$1){var i$3 = i$2 + 1 | 0, i$2 = i$3; continue;}
-         var stop$0 = i$2;
-        }
-        var
-         match$0 =
-           [0,
-            caml_call3(Stdlib_String[15], s, start$0, stop$0 - start$0 | 0),
-            stop$0];
-        switch$0 = 1;
-        break;
-       }
-      }
-      if(! switch$0){
-       var new_start = start$0 + 1 | 0, k$2 = 0;
-       if(40 === opening)
-        var closing = 41;
-       else{
-        if(123 !== opening)
-         throw caml_maybe_attach_backtrace([0, Assert_failure, _a_], 1);
-        var closing = 125;
-       }
-       var lim = caml_ml_string_length(s), k = k$2, stop = new_start;
-       for(;;){
-        if(lim <= stop) throw caml_maybe_attach_backtrace(Stdlib[8], 1);
-        if(Object.is(caml_string_get(s, stop), opening)){
-         var i = stop + 1 | 0, k$0 = k + 1 | 0, k = k$0, stop = i;
-         continue;
-        }
-        if(! Object.is(caml_string_get(s, stop), closing)){var i$1 = stop + 1 | 0, stop = i$1; continue;}
-        if(0 !== k){
-         var i$0 = stop + 1 | 0, k$1 = k - 1 | 0, k = k$1, stop = i$0;
-         continue;
-        }
-        var
-         match$0 =
-           [0,
-            caml_call3
-             (Stdlib_String[15], s, new_start, (stop - start$0 | 0) - 1 | 0),
-            stop + 1 | 0];
-        break;
-       }
-      }
-      var next_i = match$0[2], ident = match$0[1];
-      caml_call2(add_string, b, caml_call1(f, ident));
-      var previous = 32, i$4 = next_i;
->>>>>>> c650ced771 (promote)
      }
     }
     //end |}]

compiler/tests-compiler/match_with_exn.ml

@@ -73,53 +73,34 @@ let fun2 () =
   [%expect
     {|
     function fun1(param){
-<<<<<<< HEAD
      a:
      {
       try{var i$1 = caml_call1(Stdlib_Random[5], 2);}
       catch(_e_){
        var _d_ = caml_wrap_exception(_e_);
-       if(_d_[1] !== A) throw caml_maybe_attach_backtrace(_d_, 0);
+       if(! Object.is(_d_[1], A)) throw caml_maybe_attach_backtrace(_d_, 0);
        var i = _d_[2];
        if(2 !== i) return i + 2 | 0;
        var i$0 = i;
        break a;
       }
       if(0 !== i$1) return i$1 + 1 | 0;
       var i$0 = i$1;
-=======
-     var switch$0 = 0;
-     try{var i$1 = caml_call1(Stdlib_Random[5], 2);}
-     catch(_e_){
-      var _d_ = caml_wrap_exception(_e_);
-      if(! Object.is(_d_[1], A)) throw caml_maybe_attach_backtrace(_d_, 0);
-      var i = _d_[2];
-      if(2 !== i) return i + 2 | 0;
-      var i$0 = i;
-      switch$0 = 1;
->>>>>>> c650ced771 (promote)
      }
      return i$0;
     }
     //end
     function fun2(param){
-<<<<<<< HEAD
      a:
      {
       try{var i$0 = caml_call1(Stdlib_Random[5], 2);}
       catch(_c_){
        var _a_ = caml_wrap_exception(_c_);
-       if(_a_[1] === A){var _b_ = _a_[2]; if(2 === _b_){var i = _b_; break a;}}
+       if(Object.is(_a_[1], A)){
+        var _b_ = _a_[2];
+        if(2 === _b_){var i = _b_; break a;}
+       }
        throw caml_maybe_attach_backtrace(_a_, 0);
-=======
-     var switch$0 = 0;
-     try{var i$0 = caml_call1(Stdlib_Random[5], 2);}
-     catch(_c_){
-      var _a_ = caml_wrap_exception(_c_), switch$1 = 0;
-      if(Object.is(_a_[1], A)){
-       var _b_ = _a_[2];
-       if(2 === _b_){var i = _b_; switch$0 = 1;} else switch$1 = 1;
->>>>>>> c650ced771 (promote)
       }
       if(0 !== i$0) return i$0 + 1 | 0;
       var i = i$0;