Merge pull request #4858 from rescript-lang/compiler_changes

fix #4856, more comments around pattern match compilation

Author: bobzhang

jscomp/core/js_exp_make.ml

@@ -799,16 +799,16 @@ let rec float_equal ?comment (e0 : t) (e1 : t) : t =
   | Number (Int {i = i0 ; _}), Number (Int {i = i1; }) -> 
     bool (i0 = i1)
   | Undefined , Undefined -> true_  
-  | (Bin(Bor, 
+  (* | (Bin(Bor, 
          {expression_desc = Number(Int {i = 0l; _})}, 
          ({expression_desc = Caml_block_tag _; _} as a ))
     |
       Bin(Bor, 
           ({expression_desc = Caml_block_tag _; _} as a),
           {expression_desc = Number (Int {i = 0l; _})})), 
-    Number (Int {i = 0l; _})
+    Number (Int {i = 0l;}) when e1.comment = None
     ->  (** (x.tag | 0) === 0  *)
-    not  a     
+    not  a      *)
   | (Bin(Bor, 
          {expression_desc = Number(Int {i = 0l; _})}, 
          ({expression_desc = Caml_block_tag _; _} as a ))

jscomp/core/lam_print.ml

@@ -383,12 +383,12 @@ let lambda ppf v  =
         List.iter
           (fun (n, l) ->
              if !spc then fprintf ppf "@ " else spc := true;
-             fprintf ppf "@[<hv 1>case int %i:@ %a@]" n lam l)
+             fprintf ppf "@[<hv 1>case int %i %S:@ %a@]" n (match sw.sw_names with None -> "" | Some x -> x.consts.(n)) lam l)
           sw.sw_consts;
         List.iter
           (fun (n, l) ->
              if !spc then fprintf ppf "@ " else spc := true;
-             fprintf ppf "@[<hv 1>case tag %i:@ %a@]" n lam l)
+             fprintf ppf "@[<hv 1>case tag %i %S:@ %a@]" n (match sw.sw_names with None -> "" | Some x -> x.blocks.(n)) lam l)
           sw.sw_blocks ;
         begin match sw.sw_failaction with
           | None  -> ()

jscomp/test/adt_optimize_test.js

@@ -153,7 +153,7 @@ function f11(x) {
   if (typeof x === "number") {
     return 2;
   }
-  if (!x.TAG) {
+  if (x.TAG === /* D */0) {
     return 1;
   }
   throw {