clean up Js_exp for bigint operations

Author: mununki

jscomp/core/js_exp_make.ml

@@ -1260,17 +1260,7 @@ let rec int32_band ?comment (e1 : J.expression) (e2 : J.expression) :
 (* let int32_bin ?comment op e1 e2 : J.expression =  *)
 (*   {expression_desc = Int32_bin(op,e1, e2); comment} *)
 
-let bigint_add ?comment (e1: t) (e2:t) = bin ?comment Plus e1 e2
-
-let bigint_minus ?comment (e1: t) (e2: t) = bin ?comment Minus e1 e2
-
-let bigint_mul ?comment (e1: t) (e2: t) = bin ?comment Mul e1 e2
-
-let bigint_div ?comment (e1: t) (e2: t) = bin ?comment Div e1 e2
-
-let bigint_mod ?comment (e1: t) (e2: t) = bin ?comment Mod e1 e2
-
-let bigint_pow ?comment (e1: t) (e2: t) = bin ?comment Pow e1 e2
+let bigint_op ?comment op (e1: t) (e2: t) = bin ?comment op e1 e2
 
 let bigint_comp (cmp : Lam_compat.comparison) ?comment (e0: t) (e1: t) =
   match (cmp, e0.expression_desc, e1.expression_desc) with

jscomp/core/js_exp_make.mli

@@ -276,17 +276,7 @@ val string_comp : Js_op.binop -> ?comment:string -> t -> t -> t
 
 val float_comp : Lam_compat.comparison -> ?comment:string -> t -> t -> t
 
-val bigint_add : ?comment: string -> t -> t -> t
-
-val bigint_minus : ?comment: string -> t-> t -> t
-
-val bigint_mul : ?comment: string -> t -> t -> t
-
-val bigint_div : ?comment: string -> t -> t -> t
-
-val bigint_mod : ?comment: string -> t -> t -> t
-
-val bigint_pow : ?comment: string -> t -> t -> t
+val bigint_op : ?comment: string -> Js_op.binop -> t -> t -> t
 
 val bigint_comp : Lam_compat.comparison -> ?comment:string -> t -> t -> t
 

jscomp/core/lam_compile_primitive.ml

@@ -183,7 +183,7 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
       E.int32_minus E.zero_int_literal (Ext_list.singleton_exn args)
   | Pnegint64 -> Js_long.neg args
   | Pnegfloat -> E.float_minus E.zero_float_lit (Ext_list.singleton_exn args)
-  | Pnegbigint -> E.bigint_minus E.zero_bigint_literal (Ext_list.singleton_exn args)
+  | Pnegbigint -> E.bigint_op Minus E.zero_bigint_literal (Ext_list.singleton_exn args)
   (* Negate boxed int end*)
   (* Int addition and subtraction *)
   | Paddint -> (
@@ -192,36 +192,36 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
   | Paddfloat -> (
       match args with [ e1; e2 ] -> E.float_add e1 e2 | _ -> assert false)
   | Paddbigint -> (
-    match args with [ e1; e2 ] -> E.bigint_add e1 e2 | _ -> assert false)
+    match args with [ e1; e2 ] -> E.bigint_op Plus e1 e2 | _ -> assert false)
   | Psubint -> (
       match args with [ e1; e2 ] -> E.int32_minus e1 e2 | _ -> assert false)
   | Psubint64 -> Js_long.sub args
   | Psubfloat -> (
       match args with [ e1; e2 ] -> E.float_minus e1 e2 | _ -> assert false)
   | Psubbigint -> (
-      match args with [ e1; e2 ] -> E.bigint_minus e1 e2 | _ -> assert false)
+      match args with [ e1; e2 ] -> E.bigint_op Minus e1 e2 | _ -> assert false)
   | Pmulint -> (
       match args with [ e1; e2 ] -> E.int32_mul e1 e2 | _ -> assert false)
   | Pmulint64 -> Js_long.mul args
   | Pmulfloat -> (
       match args with [ e1; e2 ] -> E.float_mul e1 e2 | _ -> assert false)
   | Pmulbigint -> (
-      match args with [ e1; e2 ] -> E.bigint_mul e1 e2 | _ -> assert false)
+      match args with [ e1; e2 ] -> E.bigint_op Mul e1 e2 | _ -> assert false)
   | Pdivfloat -> (
       match args with [ e1; e2 ] -> E.float_div e1 e2 | _ -> assert false)
   | Pdivint -> (
       match args with
       | [ e1; e2 ] -> E.int32_div ~checked:!Js_config.check_div_by_zero e1 e2
       | _ -> assert false)
   | Pdivint64 -> Js_long.div args
-  | Pdivbigint -> (match args with [ e1; e2 ] -> E.bigint_div e1 e2 | _ -> assert false)
+  | Pdivbigint -> (match args with [ e1; e2 ] -> E.bigint_op Div e1 e2 | _ -> assert false)
   | Pmodint -> (
       match args with
       | [ e1; e2 ] -> E.int32_mod ~checked:!Js_config.check_div_by_zero e1 e2
       | _ -> assert false)
   | Pmodint64 -> Js_long.mod_ args
-  | Pmodbigint -> (match args with [ e1; e2 ] -> E.bigint_mod e1 e2 | _ -> assert false)
-  | Ppowbigint -> (match args with [ e1; e2 ] -> E.bigint_pow e1 e2 | _ -> assert false)
+  | Pmodbigint -> (match args with [ e1; e2 ] -> E.bigint_op Mod e1 e2 | _ -> assert false)
+  | Ppowbigint -> (match args with [ e1; e2 ] -> E.bigint_op Pow e1 e2 | _ -> assert false)
   | Plslint -> (
       match args with [ e1; e2 ] -> E.int32_lsl e1 e2 | _ -> assert false)
   | Plslint64 -> Js_long.lsl_ args