Merge pull request #4068 from BuckleScript/unify_name

bobzhang · web-flow · commit 63933394ac59 · 2019-12-26T20:40:30.000+08:00
unify names with Lambda.apply_info
diff --git a/jscomp/core/lam.ml b/jscomp/core/lam.ml
@@ -75,10 +75,10 @@ module Types = struct
       loc : Location.t;
     }
   and apply_info =
-    { fn : t ;
-      args : t list ;
-      loc : Location.t;
-      status : apply_status
+    { ap_func : t ;
+      ap_args : t list ;
+      ap_loc : Location.t;
+      ap_status : apply_status
     }
 
   and t =
@@ -127,10 +127,10 @@ module X = struct
   and apply_info
     = Types.apply_info
     =
-      { fn : t ;
-        args : t list ;
-        loc : Location.t;
-        status : apply_status
+      { ap_func : t ;
+        ap_args : t list ;
+        ap_loc : Location.t;
+        ap_status : apply_status
       }
   and t
     = Types.t
@@ -171,10 +171,10 @@ let inner_map
   | Lvar (_ : ident)
   | Lconst (_ : Lam_constant.t) ->
     ( (* Obj.magic *) l : X.t)
-  | Lapply ({fn; args; loc; status} )  ->
-    let fn = f fn in
-    let args = Ext_list.map args f in
-    Lapply { fn ; args; loc; status }
+  | Lapply ({ap_func; ap_args; ap_loc; ap_status} )  ->
+    let ap_func = f ap_func in
+    let ap_args = Ext_list.map ap_args f in
+    Lapply { ap_func ; ap_args; ap_loc; ap_status }
   | Lfunction({body; arity;  params } ) ->
     let body = f body in
     Lfunction {body; arity;  params}
@@ -294,7 +294,7 @@ let apply fn args loc status : t =
         ->
         Lprim {primitive = wrap ; args = [Lprim { primitive_call with args ; loc = loc }] ; loc }
       | exception Not_simple_form ->
-        Lapply { fn; args; loc; status }
+        Lapply { ap_func = fn; ap_args = args; ap_loc = loc; ap_status = status }
     end
   | Lfunction {
                params;
@@ -305,7 +305,7 @@ let apply fn args loc status : t =
         ->
         Lprim { primitive_call with args ; loc = loc }
       | exception _ ->
-        Lapply { fn; args;  loc;    status }
+        Lapply { ap_func = fn; ap_args = args;  ap_loc = loc;   ap_status = status }
     end
   | Lfunction {
                params;
@@ -316,14 +316,14 @@ let apply fn args loc status : t =
         ->
         Lsequence(Lprim { primitive_call with args ; loc = loc }, const)
       | exception _ ->
-        Lapply { fn; args;  loc;    status }
+        Lapply { ap_func = fn; ap_args = args;  ap_loc = loc;  ap_status = status }
     end
   (* | Lfunction {params;body} when Ext_list.same_length params args ->
       Ext_list.fold_right2 (fun p arg acc ->
         Llet(Strict,p,arg,acc)
       ) params args body *) (* TODO: more rigirous analysis on [let_kind] *)
   | _ ->
-    Lapply { fn; args;  loc  ; status }
+    Lapply { ap_func = fn; ap_args = args;  ap_loc = loc  ; ap_status = status }
 
 
 let rec 
@@ -337,7 +337,7 @@ let rec
     (match l2 with  Lconst c2 -> Lam_constant.eq_approx c1 c2  | _ -> false)
   | Lapply app1 -> 
     (match l2 with Lapply app2 ->
-    eq_approx app1.fn app2.fn  && eq_approx_list app1.args app2.args
+    eq_approx app1.ap_func app2.ap_func  && eq_approx_list app1.ap_args app2.ap_args
     |_ -> false)
   | Lifthenelse (a,b,c) -> 
     (match l2 with  
diff --git a/jscomp/core/lam.mli b/jscomp/core/lam.mli
@@ -40,10 +40,10 @@ and apply_status =
   | App_ml_full
   | App_js_full      
 and apply_info = private
-  { fn : t ; 
-    args : t list ; 
-    loc : Location.t;
-    status : apply_status
+  { ap_func : t ; 
+    ap_args : t list ; 
+    ap_loc : Location.t;
+    ap_status : apply_status
   }
 
 and prim_info = private
diff --git a/jscomp/core/lam_analysis.ml b/jscomp/core/lam_analysis.ml
@@ -297,8 +297,8 @@ let rec size (lam : Lam.t) =
         {var $$let=Make(funarg);
         return [0, $$let[5],... $$let[16]]}
      *)      
-    | Lapply{ fn;
-             args; _} -> size_lams (size fn) args
+    | Lapply{ ap_func;
+             ap_args; _} -> size_lams (size ap_func) ap_args
     (* | Lfunction(_, params, l) -> really_big () *)
     | Lfunction {body} -> size body 
     | Lswitch _ -> really_big ()
diff --git a/jscomp/core/lam_arity_analysis.ml b/jscomp/core/lam_arity_analysis.ml
@@ -80,7 +80,7 @@ let rec get_arity (meta : Lam_stats.t) (lam : Lam.t) :  Lam_arity.t =
   *)
   | Lletrec(_, body) ->  get_arity meta body
 
-  | Lapply{fn = app;  args; _ } -> (* detect functor application *)
+  | Lapply{ap_func = app;  ap_args = args ; _ } -> (* detect functor application *)
     let fn = get_arity meta app in 
     begin match fn with 
       | Arity_na -> Lam_arity.na
diff --git a/jscomp/core/lam_beta_reduce_util.ml b/jscomp/core/lam_beta_reduce_util.ml
@@ -87,7 +87,7 @@ let simple_beta_reduce params body args =
       Hash_ident.clear param_hash ;
       None
     end
-  | Lapply { fn = Lvar fn_name as f ; args =  args';  loc; status}
+  | Lapply { ap_func = Lvar fn_name as f ; ap_args =  args';  ap_loc = loc ; ap_status = status}
     ->  
     let () = 
       List.iter2 (fun p a -> Hash_ident.add param_hash p {lambda = a; used = false }) params args  
diff --git a/jscomp/core/lam_bounded_vars.ml b/jscomp/core/lam_bounded_vars.ml
@@ -111,10 +111,10 @@ let rewrite (map :   _ Hash_ident.t)
       (* here it makes sure that global vars are not rebound *)      
       Lam.prim ~primitive ~args:(Ext_list.map args aux) loc
     | Lglobal_module _ -> lam 
-    | Lapply {fn;  args; loc;  status } ->
-      let fn = aux fn in       
-      let args = Ext_list.map args aux in 
-      Lam.apply fn  args loc status
+    | Lapply {ap_func;  ap_args; ap_loc;  ap_status } ->
+      let fn = aux ap_func in       
+      let args = Ext_list.map ap_args aux in 
+      Lam.apply fn  args ap_loc ap_status
     | Lswitch(l, {sw_failaction; 
                   sw_consts; 
                   sw_blocks;
diff --git a/jscomp/core/lam_check.ml b/jscomp/core/lam_check.ml
@@ -58,8 +58,8 @@ let check file lam =
       | Lglobal_module _ -> ()
       | Lprim {args; _} ->
         check_list args cxt       
-      | Lapply{fn; args; _} ->
-        check_list (fn::args) cxt
+      | Lapply{ap_func; ap_args; _} ->
+        check_list (ap_func::ap_args) cxt
         (* check invariant that staticfaill does not cross function/while/for loop*)
       | Lfunction{body;params} ->        
         check_staticfails body Set_int.empty
@@ -113,8 +113,8 @@ let check file lam =
       | Lprim {args; _} ->
         iter_list args
       | Lconst _ -> ()
-      | Lapply{fn; args; _} ->
-        iter fn; iter_list args
+      | Lapply{ap_func; ap_args; _} ->
+        iter ap_func; iter_list ap_args
       | Lfunction{body;params} ->
         List.iter def params;
         iter body
diff --git a/jscomp/core/lam_closure.ml b/jscomp/core/lam_closure.ml
@@ -78,10 +78,10 @@ let free_variables
     match lam with 
     | Lvar v -> used top v 
     | Lconst _ -> ()
-    | Lapply {fn; args; _} ->
-      iter top  fn; 
-      let top = Lam_var_stats.new_position_after_lam fn top in
-      Ext_list.iter args (fun lam -> iter top lam ) 
+    | Lapply {ap_func; ap_args; _} ->
+      iter top  ap_func; 
+      let top = Lam_var_stats.new_position_after_lam ap_func top in
+      Ext_list.iter ap_args (fun lam -> iter top lam ) 
     | Lprim {args ; _} -> 
       (* Check: can top be propoaged for all primitives *)
       Ext_list.iter args (iter top) 
diff --git a/jscomp/core/lam_compile.ml b/jscomp/core/lam_compile.ml
@@ -1316,20 +1316,20 @@ and compile_apply
   (lambda_cxt : Lam_compile_context.t) = 
     match appinfo with 
     | {
-      fn = Lapply{ fn; args =  fn_args; status = App_na ; };
-      args;
-      status = App_na; loc }
+      ap_func = Lapply{ ap_func=fn; ap_args =  fn_args; ap_status = App_na ; };
+      ap_args = args;
+      ap_status = App_na; ap_loc = loc}
       ->
       (* After inlining we can generate such code,
          see {!Ari_regress_test}
       *)
       compile_lambda  lambda_cxt (Lam.apply fn (Ext_list.append fn_args  args)  loc  App_na )
     (* External function calll *)
-    | { fn =
+    | { ap_func = 
           Lprim{primitive = Pfield (_, fld_info);
                 args = [  Lglobal_module id];_};
-        args ;
-        status = App_na | App_ml_full} ->
+        ap_args = args ;
+        ap_status = App_na | App_ml_full} ->
       (* Note we skip [App_js_full] since [get_exp_with_args] dont carry
          this information, we should fix [get_exp_with_args]
       *)
@@ -1338,7 +1338,7 @@ and compile_apply
           compile_external_field_apply  args id fld_name  lambda_cxt
         | _ -> assert false
       end     
-    | { fn; args = args_lambda;   status} ->
+    | { ap_func = fn; ap_args = args_lambda;   ap_status = status} ->
       (* TODO: ---
          1. check arity, can be simplified for pure expression
          2. no need create names
diff --git a/jscomp/core/lam_convert.ml b/jscomp/core/lam_convert.ml
@@ -92,8 +92,8 @@ let exception_id_destructed (l : Lam.t) (fv : Ident.t): bool  =
     | Lfor(v, e1, e2, dir, e3) ->
       hit e1 || hit e2 || hit e3
     | Lconst _ -> false
-    | Lapply{fn; args; _} ->
-      hit fn || hit_list args
+    | Lapply{ap_func; ap_args; _} ->
+      hit ap_func || hit_list ap_args
     | Lglobal_module _  (* global persistent module, play safe *)
       -> false
     | Lswitch(arg, sw) ->
@@ -712,13 +712,13 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) : Lam.t * Lam_module_i
       | Lfunction {params = [param]; body = Lprim{primitive; args = [Lvar inner_arg]; loc }}
         when Ident.same param inner_arg -> 
         Lam.prim ~primitive ~args:[x] outer_loc
-      | Lapply {fn = Lfunction{params; body = Lprim{primitive; args = inner_args}}; args}
+      | Lapply {ap_func = Lfunction{params; body = Lprim{primitive; args = inner_args}}; ap_args=args}
         when Ext_list.for_all2_no_exn inner_args params lam_is_var &&
              Ext_list.length_larger_than_n inner_args args 1 
         ->
         Lam.prim ~primitive ~args:(Ext_list.append_one args x) outer_loc
-      | Lapply{fn;args} ->
-        Lam.apply fn (Ext_list.append_one args x) outer_loc App_na
+      | Lapply{ap_func;ap_args} ->
+        Lam.apply ap_func (Ext_list.append_one ap_args x) outer_loc App_na
       | _ ->
         Lam.apply f [x] outer_loc App_na
     and convert_switch (e : Lambda.lambda) (s : Lambda.lambda_switch) = 
diff --git a/jscomp/core/lam_exit_count.ml b/jscomp/core/lam_exit_count.ml
@@ -66,7 +66,7 @@ let count_helper  (lam : Lam.t) : collection =
       Ext_option.iter d count
     | Lglobal_module _
     | Lvar _| Lconst _ -> ()
-    | Lapply{fn ; args; _} -> count fn; Ext_list.iter args count
+    | Lapply{ap_func ; ap_args; _} -> count ap_func; Ext_list.iter ap_args count
     | Lfunction {body} -> count body
     | Llet(_, _, l1, l2) ->
       count l2; count l1
diff --git a/jscomp/core/lam_free_variables.ml b/jscomp/core/lam_free_variables.ml
@@ -56,8 +56,8 @@
       free e1; free e2; free e3;
       fv := Set_ident.remove !fv v 
     | Lconst _ -> ()
-    | Lapply{fn; args; _} ->
-      free fn; free_list args
+    | Lapply{ap_func; ap_args; _} ->
+      free ap_func; free_list ap_args
     | Lglobal_module _ -> ()
     (* according to the existing semantics:
        [primitive] is not counted
diff --git a/jscomp/core/lam_hit.ml b/jscomp/core/lam_hit.ml
@@ -55,8 +55,8 @@ let hit_variables (fv : Set_ident.t) (l : t) : bool  =
       | Lfor(v, e1, e2, dir, e3) ->
         hit e1 || hit e2 || hit e3
       | Lconst _ -> false
-      | Lapply{fn; args; _} ->
-        hit fn || hit_list args
+      | Lapply{ap_func; ap_args; _} ->
+        hit ap_func || hit_list ap_args
       | Lglobal_module _  (* global persistent module, play safe *)
         -> false
       | Lprim {args; _} ->
@@ -114,8 +114,8 @@ let hit_variable (fv : Ident.t) (l : t) : bool  =
       | Lfor(v, e1, e2, dir, e3) ->
         hit e1 || hit e2 || hit e3
       | Lconst _ -> false
-      | Lapply{fn; args; _} ->
-        hit fn || hit_list args
+      | Lapply{ap_func; ap_args; _} ->
+        hit ap_func || hit_list ap_args
       | Lglobal_module _  (* global persistent module, play safe *)
         -> false
       | Lprim {args; _} ->
diff --git a/jscomp/core/lam_iter.ml b/jscomp/core/lam_iter.ml
@@ -30,9 +30,9 @@ let inner_iter (l : t) (f : t -> unit ) : unit =
   match l  with
   | Lvar (_ : ident)
   | Lconst (_ : Lam_constant.t) -> ()
-  | Lapply ({fn; args; loc; status} )  ->
-    f fn;
-    List.iter f args
+  | Lapply ({ap_func; ap_args; ap_loc=_; ap_status=_} )  ->
+    f ap_func;
+    List.iter f ap_args
   | Lfunction({body; arity;  params } ) ->
     f body
   | Llet(str, id, arg, body) ->
@@ -82,9 +82,9 @@ let inner_exists (l : t) (f : t -> bool) : bool =
   | Lvar (_ : ident)
   | Lglobal_module (_ )
   | Lconst (_ : Lam_constant.t) -> false
-  | Lapply ({fn; args; loc; status} )  ->
-    f fn ||
-    Ext_list.exists args f 
+  | Lapply ({ap_func; ap_args; ap_loc=_; ap_status=_} )  ->
+    f ap_func ||
+    Ext_list.exists ap_args f 
   | Lfunction({body; arity;  params } ) ->
     f body
   | Llet(str, id, arg, body) ->
diff --git a/jscomp/core/lam_pass_alpha_conversion.ml b/jscomp/core/lam_pass_alpha_conversion.ml
@@ -58,7 +58,7 @@ let alpha_conversion (meta : Lam_stats.t) (lam : Lam.t) : Lam.t =
     match lam with 
     | Lconst _ -> lam
     | Lvar _ -> lam 
-    | Lapply {fn = l1; args =  ll;  loc ; status} 
+    | Lapply {ap_func = l1; ap_args =  ll;  ap_loc = loc ; ap_status = status} 
       -> (* detect functor application *)
       let args_arity =  Lam_arity.extract_arity (Lam_arity_analysis.get_arity meta l1) in
       let len = List.length ll in         
diff --git a/jscomp/core/lam_pass_collect.ml b/jscomp/core/lam_pass_collect.ml
@@ -130,7 +130,7 @@ let collect_info  (meta : Lam_stats.t) (lam : Lam.t)  =
     match lam with 
     | Lconst _ -> ()
     | Lvar _ -> ()
-    | Lapply{fn = l1; args =  ll; _} ->
+    | Lapply{ap_func = l1; ap_args =  ll; _} ->
       collect  l1; List.iter collect  ll
     | Lfunction { params; body =  l} -> (* functor ? *)
       List.iter (fun p -> Hash_ident.add meta.ident_tbl p Parameter ) params;
diff --git a/jscomp/core/lam_pass_count.ml b/jscomp/core/lam_pass_count.ml
@@ -138,14 +138,14 @@ let collect_occurs  lam : occ_tbl =
       List.iter (fun (v, l) -> count bv l) bindings;
       count bv body
         (** Note there is a difference here when do beta reduction for *)
-    | Lapply{fn = Lfunction{params; body};  args; _}
+    | Lapply{ap_func = Lfunction{params; body};  ap_args = args; _}
       when  Ext_list.same_length params args ->
       count bv (Lam_beta_reduce.beta_reduce  params body args)
     (* | Lapply{fn = Lfunction{function_kind = Tupled; params; body}; *)
     (*          args = [Lprim {primitive = Pmakeblock _;  args; _}]; _} *)
     (*   when  Ext_list.same_length params  args -> *)
     (*   count bv (Lam_beta_reduce.beta_reduce   params body args) *)
-    | Lapply{fn = l1; args= ll; _} ->
+    | Lapply{ap_func = l1; ap_args= ll; _} ->
       count bv l1; List.iter (count bv) ll 
     | Lconst cst -> ()
     | Lswitch(l, sw) ->
diff --git a/jscomp/core/lam_pass_deep_flatten.ml b/jscomp/core/lam_pass_deep_flatten.ml
@@ -239,7 +239,7 @@ let deep_flatten
     (*   when  List.length params = List.length args -> *)
     (*       aux (beta_reduce params body args) *)
 
-    | Lapply{fn = l1; args  = ll; loc; status} ->
+    | Lapply{ap_func = l1; ap_args  = ll; ap_loc = loc; ap_status = status} ->
       Lam.apply (aux l1) (Ext_list.map ll aux) loc status
 
     (* This kind of simple optimizations should be done each time
diff --git a/jscomp/core/lam_pass_eliminate_ref.ml b/jscomp/core/lam_pass_eliminate_ref.ml
@@ -56,7 +56,7 @@ let rec eliminate_ref id (lam : Lam.t) =
            args =  [Lvar v]; loc } when Ident.same v id ->
     Lam.assign id (Lam.prim ~primitive:(Poffsetint delta) ~args:[Lam.var id] loc)
   | Lconst _  -> lam
-  | Lapply{fn = e1; args =  el;  loc; status} ->
+  | Lapply{ap_func = e1; ap_args =  el;  ap_loc = loc; ap_status = status} ->
     Lam.apply 
       (eliminate_ref id e1)
       (Ext_list.map  el (eliminate_ref id))
diff --git a/jscomp/core/lam_pass_exits.ml b/jscomp/core/lam_pass_exits.ml
@@ -34,8 +34,8 @@ let rec
   | Lconst _ -> true
   | Lassign(_id, e) ->
     no_bounded_variables e
-  | Lapply{fn; args; _} ->
-    no_bounded_variables fn && no_list args
+  | Lapply{ap_func; ap_args; _} ->
+    no_bounded_variables ap_func && no_list ap_args
   | Lglobal_module _ -> true
   | Lprim {args; primitive = _ ; } ->
     no_list args
@@ -215,8 +215,8 @@ let subst_helper (subst : subst_tbl) (query : int -> int) (lam : Lam.t) : Lam.t
        | None -> Lam.staticraise i ls
       )
     | Lvar _|Lconst _  -> lam
-    | Lapply {fn; args;  loc; status } -> 
-      Lam.apply (simplif fn) (Ext_list.map args simplif) loc status
+    | Lapply {ap_func; ap_args;  ap_loc; ap_status } -> 
+      Lam.apply (simplif ap_func) (Ext_list.map ap_args simplif) ap_loc ap_status
     | Lfunction {arity; params; body} -> 
       Lam.function_ ~arity  ~params ~body:(simplif body)
     | Llet (kind, v, l1, l2) -> 
diff --git a/jscomp/core/lam_pass_lets_dce.ml b/jscomp/core/lam_pass_lets_dce.ml
diff --git a/jscomp/core/lam_pass_remove_alias.ml b/jscomp/core/lam_pass_remove_alias.ml
diff --git a/jscomp/core/lam_print.ml b/jscomp/core/lam_print.ml
diff --git a/jscomp/core/lam_scc.ml b/jscomp/core/lam_scc.ml
diff --git a/jscomp/core/lam_subst.ml b/jscomp/core/lam_subst.ml
diff --git a/jscomp/core/lam_util.ml b/jscomp/core/lam_util.ml
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
diff --git a/lib/4.06.1/unstable/js_refmt_compiler.ml b/lib/4.06.1/unstable/js_refmt_compiler.ml
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
