tweak

Author: bobzhang

Diff for: jscomp/bin/bsppx.ml

@@ -5876,6 +5876,12 @@ val fold_right : ('a -> 'b -> 'b) -> 'a list -> 'b -> 'b
 
 val fold_right2 : ('a -> 'b -> 'c -> 'c) -> 'a list -> 'b list -> 'c -> 'c
 
+val map2 : 
+  ('a -> 'b -> 'c) ->
+  'a list ->
+  'b list ->
+  'c list
+
 val fold_left_with_offset : 
   (int -> 'acc -> 'a -> 'acc) -> 
   int -> 
@@ -6146,6 +6152,41 @@ let rec fold_right2 f l r acc =
     f a0 b0 (f a1 b1 (f a2 b2 (f a3 b3 (f a4 b4 (fold_right2 f arest brest acc)))))  
   | _, _ -> invalid_arg "Ext_list.fold_right2"
 
+let rec map2 f l r = 
+  match l,r  with  
+  | [],[] -> []
+  | [a0],[b0] -> [f a0 b0]
+  | [a0;a1],[b0;b1] -> 
+    let c0 = f a0 b0 in 
+    let c1 = f a1 b1 in 
+    [c0; c1]
+  | [a0;a1;a2],[b0;b1;b2] -> 
+    let c0 = f a0 b0 in 
+    let c1 = f a1 b1 in 
+    let c2 = f a2 b2 in 
+    [c0;c1;c2]
+  | [a0;a1;a2;a3],[b0;b1;b2;b3] ->
+    let c0 = f a0 b0 in 
+    let c1 = f a1 b1 in 
+    let c2 = f a2 b2 in 
+    let c3 = f a3 b3 in 
+    [c0;c1;c2;c3]
+  | [a0;a1;a2;a3;a4], [b0;b1;b2;b3;b4] -> 
+    let c0 = f a0 b0 in 
+    let c1 = f a1 b1 in 
+    let c2 = f a2 b2 in 
+    let c3 = f a3 b3 in 
+    let c4 = f a4 b4 in 
+    [c0;c1;c2;c3;c4]
+  | a0::a1::a2::a3::a4::arest, b0::b1::b2::b3::b4::brest -> 
+    let c0 = f a0 b0 in 
+    let c1 = f a1 b1 in 
+    let c2 = f a2 b2 in 
+    let c3 = f a3 b3 in 
+    let c4 = f a4 b4 in 
+    c0::c1::c2::c3::c4::map2 f arest brest
+  | _, _ -> invalid_arg "Ext_list.map2"
+
 let rec fold_left_with_offset f i accu l =
   match l with
   | [] -> accu
@@ -9159,7 +9200,7 @@ let from_labels ~loc arity labels
   let result_type =
     Ast_comb.to_js_type loc  
       (Typ.object_ ~loc
-         (List.map2 (fun x y -> x.Asttypes.txt ,[], y) labels tyvars) Closed)
+         (Ext_list.map2 (fun x y -> x.Asttypes.txt ,[], y) labels tyvars) Closed)
   in 
   Ext_list.fold_right2 
     (fun {Asttypes.loc ; txt = label }
@@ -16822,7 +16863,7 @@ let ocaml_obj_as_js_object
     ~pval_prim:(Ast_external_attributes.pval_prim_of_labels labels)
     (fun e ->
        Exp.apply ~loc e
-         (List.map2 (fun l expr -> l.Asttypes.txt, expr) labels exprs) )
+         (Ext_list.map2 (fun l expr -> l.Asttypes.txt, expr) labels exprs) )
     ~pval_type
 
 

Diff for: jscomp/core/js_exp_make.ml

@@ -130,7 +130,7 @@ let make_block ?comment tag tag_info es mutable_flag : t =
       List.mapi (fun i (e : t) -> merge_outer_comment des.(i) e) es
     (* TODO: may overriden its previous comments *)
     | Blk_module (Some des) 
-      ->  List.map2  merge_outer_comment 
+      ->  Ext_list.map2  merge_outer_comment 
             des es
     | _ -> es 
   in

Diff for: jscomp/core/lam_bounded_vars.ml

@@ -88,7 +88,7 @@ let rewrite (map :   _ Ident_hashtbl.t)
     | Lletrec(bindings, body) ->
       (*order matters see GPR #405*)
       let vars = Ext_list.map (fun (k, _) -> rebind k) bindings in 
-      let bindings = List.map2 (fun var (_,l) -> var, aux l) vars bindings in 
+      let bindings = Ext_list.map2 (fun var (_,l) -> var, aux l) vars bindings in 
       let body = aux body in       
       Lam.letrec bindings body
     | Lfunction{arity; function_kind; params; body} -> 

Diff for: jscomp/core/lam_compile.ml

@@ -1181,7 +1181,7 @@ and
         match Lam_compile_context.find_exn i cxt  with 
         | {exit_id; args ; order_id} -> 
           let args_code  =
-            (Js_output.concat @@ List.map2 (
+            (Js_output.concat @@ Ext_list.map2 (
                 fun (x : Lam.t) (arg : Ident.t) ->
                   match x with
                   | Lvar id -> 

Diff for: jscomp/ext/ext_list.ml

@@ -129,6 +129,41 @@ let rec fold_right2 f l r acc =
     f a0 b0 (f a1 b1 (f a2 b2 (f a3 b3 (f a4 b4 (fold_right2 f arest brest acc)))))  
   | _, _ -> invalid_arg "Ext_list.fold_right2"
 
+let rec map2 f l r = 
+  match l,r  with  
+  | [],[] -> []
+  | [a0],[b0] -> [f a0 b0]
+  | [a0;a1],[b0;b1] -> 
+    let c0 = f a0 b0 in 
+    let c1 = f a1 b1 in 
+    [c0; c1]
+  | [a0;a1;a2],[b0;b1;b2] -> 
+    let c0 = f a0 b0 in 
+    let c1 = f a1 b1 in 
+    let c2 = f a2 b2 in 
+    [c0;c1;c2]
+  | [a0;a1;a2;a3],[b0;b1;b2;b3] ->
+    let c0 = f a0 b0 in 
+    let c1 = f a1 b1 in 
+    let c2 = f a2 b2 in 
+    let c3 = f a3 b3 in 
+    [c0;c1;c2;c3]
+  | [a0;a1;a2;a3;a4], [b0;b1;b2;b3;b4] -> 
+    let c0 = f a0 b0 in 
+    let c1 = f a1 b1 in 
+    let c2 = f a2 b2 in 
+    let c3 = f a3 b3 in 
+    let c4 = f a4 b4 in 
+    [c0;c1;c2;c3;c4]
+  | a0::a1::a2::a3::a4::arest, b0::b1::b2::b3::b4::brest -> 
+    let c0 = f a0 b0 in 
+    let c1 = f a1 b1 in 
+    let c2 = f a2 b2 in 
+    let c3 = f a3 b3 in 
+    let c4 = f a4 b4 in 
+    c0::c1::c2::c3::c4::map2 f arest brest
+  | _, _ -> invalid_arg "Ext_list.map2"
+
 let rec fold_left_with_offset f i accu l =
   match l with
   | [] -> accu

Diff for: jscomp/ext/ext_list.mli

@@ -33,6 +33,12 @@ val fold_right : ('a -> 'b -> 'b) -> 'a list -> 'b -> 'b
 
 val fold_right2 : ('a -> 'b -> 'c -> 'c) -> 'a list -> 'b list -> 'c -> 'c
 
+val map2 : 
+  ('a -> 'b -> 'c) ->
+  'a list ->
+  'b list ->
+  'c list
+
 val fold_left_with_offset : 
   (int -> 'acc -> 'a -> 'acc) -> 
   int -> 

Diff for: jscomp/syntax/ast_core_type.ml

@@ -122,7 +122,7 @@ let from_labels ~loc arity labels
   let result_type =
     Ast_comb.to_js_type loc  
       (Typ.object_ ~loc
-         (List.map2 (fun x y -> x.Asttypes.txt ,[], y) labels tyvars) Closed)
+         (Ext_list.map2 (fun x y -> x.Asttypes.txt ,[], y) labels tyvars) Closed)
   in 
   Ext_list.fold_right2 
     (fun {Asttypes.loc ; txt = label }

Diff for: jscomp/syntax/ast_util.ml

@@ -607,7 +607,7 @@ let ocaml_obj_as_js_object
     ~pval_prim:(Ast_external_attributes.pval_prim_of_labels labels)
     (fun e ->
        Exp.apply ~loc e
-         (List.map2 (fun l expr -> l.Asttypes.txt, expr) labels exprs) )
+         (Ext_list.map2 (fun l expr -> l.Asttypes.txt, expr) labels exprs) )
     ~pval_type