wip

Author: hhugo

compiler/lib/generate.ml

@@ -1060,9 +1060,10 @@ let maybe_zero_or_nan = function
   | J.ENum n -> (
       match J.Num.to_string n with
       | "NaN" -> true
-      | "-0." | "0." | "0" | "0." -> true
-      | J.EBin ((J.Bor | J.Lsr), _, _) -> false
-      | _ -> true)
+      | "-0." | "0." | "0" | "-0" -> true
+      | _ -> false)
+  | J.EBin ((J.Bor | J.Lsr), _, _) -> false
+  | _ -> true
 
 let rec translate_expr ctx queue loc x e level : _ * J.statement_list =
   match e with

compiler/tests-compiler/effects_toplevel.ml

@@ -81,13 +81,8 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
                            dummy,
                            function(_c_){
                             var _d_ = i + 1 | 0;
-<<<<<<< HEAD
-                            if(! Object.is(5, i)) return caml_cps_exact_call1(_b_, _d_);
-                            caml_callback(g, [dummy]);
-=======
                             if(5 !== i) return caml_cps_exact_call1(_b_, _d_);
-                            caml_callback(g, [undef]);
->>>>>>> 21ff3c88d1 (fix)
+                            caml_callback(g, [dummy]);
                             var Test = [0];
                             runtime.caml_register_global(2, Test, "Test");
                            });