Remove env as an argument

Author: bobzhang

jscomp/core/lam_compile_env.ml

@@ -161,33 +161,33 @@ type _ t =
 let query_and_add_if_not_exist 
     (type u)
     (oid : Lam_module_ident.t) 
-     ~(found: bool -> _) =
+     =
   match Lam_module_ident.Hash.find_opt cached_tbl oid with 
   | None -> 
     begin match oid.kind with
       | Runtime  -> 
         let (cmj_path, cmj_table) as cmj_info = 
           Js_cmj_load.find_cmj_exn (Lam_module_ident.name oid ^ Literals.suffix_cmj) in           
         oid +> Runtime {cmj_path;cmj_table} ; 
-        found (Js_cmj_format.is_pure cmj_table)
+        Js_cmj_format.is_pure cmj_table
       | Ml 
         -> 
         let (cmj_path, cmj_table) as cmj_info = 
           Js_cmj_load.find_cmj_exn (Lam_module_ident.name oid ^ Literals.suffix_cmj) in           
         oid +> Ml {cmj_table;cmj_path } ;
-        found (Js_cmj_format.is_pure cmj_table)
+        Js_cmj_format.is_pure cmj_table
       | External _  -> 
         oid +> External;
         (** This might be wrong, if we happen to expand  an js module
             we should assert false (but this in general should not happen)
             FIXME: #154, it come from External, should be okay
         *)
-        found false
+        false
     end
   | Some (Ml { cmj_table }) 
   | Some (Runtime {cmj_table}) -> 
-    found (Js_cmj_format.is_pure cmj_table) 
-  | Some External -> found false
+    Js_cmj_format.is_pure cmj_table
+  | Some External -> false
 
 
 
@@ -228,7 +228,7 @@ let add = Lam_module_ident.Hash_set.add
 let is_pure_module (id : Lam_module_ident.t)  = 
   id.kind = Runtime ||
   query_and_add_if_not_exist id 
-    ~found:(fun x ->  x)
+    
 
 let get_required_modules 
     extras 

jscomp/core/lam_compile_main.ml

@@ -117,9 +117,9 @@ let no_side_effects (rest : Lam_group.t list) : string option =
         else None (* TODO :*))
 
 
-let _d  = fun env s lam -> 
+let _d  = fun  s lam -> 
 #if undefined BS_RELEASE_BUILD then 
-    Lam_util.dump env s lam ;
+    Lam_util.dump  s lam ;
     Ext_log.dwarn ~__POS__ "START CHECKING PASS %s@." s;
     ignore @@ Lam_check.check !Location.input_name lam;
     Ext_log.dwarn ~__POS__ "FINISH CHECKING PASS %s@." s;
@@ -146,23 +146,23 @@ let compile
   let lam, may_required_modules = Lam_convert.convert export_ident_sets lam in 
 
   let _j = Js_pass_debug.dump in
-  let lam = _d env "initial"  lam in
+  let lam = _d "initial"  lam in
   let lam  = Lam_pass_deep_flatten.deep_flatten lam in
-  let lam = _d  env "flatten0" lam in
+  let lam = _d  "flatten0" lam in
   let meta = 
-    Lam_pass_collect.count_alias_globals env 
+    Lam_pass_collect.count_alias_globals 
       export_idents export_ident_sets lam in
   let lam = 
     let lam =  
       lam
-      |> _d env "flattern1"
+      |> _d "flattern1"
       |>  Lam_pass_exits.simplify_exits
-      |> _d env "simplyf_exits"
+      |> _d "simplyf_exits"
       |> (fun lam -> Lam_pass_collect.collect_helper meta lam; lam)
       |>  Lam_pass_remove_alias.simplify_alias  meta
-      |> _d env "simplify_alias"
+      |> _d "simplify_alias"
       |> Lam_pass_deep_flatten.deep_flatten
-      |> _d env "flatten2"
+      |> _d  "flatten2"
     in  (* Inling happens*)
 
     let ()  = Lam_pass_collect.collect_helper meta lam in
@@ -171,29 +171,29 @@ let compile
     let ()  = Lam_pass_collect.collect_helper meta lam in
     let lam = 
       lam
-      |> _d env "alpha_before"
+      |> _d "alpha_before"
       |> Lam_pass_alpha_conversion.alpha_conversion meta
-      |> _d env "alpha_after"
+      |> _d "alpha_after"
       |> Lam_pass_exits.simplify_exits in    
     let () = Lam_pass_collect.collect_helper meta lam in
 
 
     lam
-    |> _d env "simplify_alias_before"
+    |> _d "simplify_alias_before"
     |>  Lam_pass_remove_alias.simplify_alias meta 
-    |> _d env "alpha_conversion"
+    |> _d "alpha_conversion"
     |>  Lam_pass_alpha_conversion.alpha_conversion meta
-    |> _d env "before-simplify_lets"
+    |> _d  "before-simplify_lets"
     (* we should investigate a better way to put different passes : )*)
     |> Lam_pass_lets_dce.simplify_lets 
 
-    |> _d env "before-simplify-exits"
+    |> _d "before-simplify-exits"
     (* |> (fun lam -> Lam_pass_collect.collect_helper meta lam 
        ; Lam_pass_remove_alias.simplify_alias meta lam) *)
     (* |> Lam_group_pass.scc_pass
        |> _d "scc" *)
     |> Lam_pass_exits.simplify_exits
-    |> _d env "simplify_lets"
+    |> _d "simplify_lets"
 #if undefined BS_RELEASE_BUILD then    
     |> (fun lam -> 
        let () = 

jscomp/core/lam_pass_collect.ml

@@ -180,16 +180,13 @@ let collect_helper  (meta : Lam_stats.t) (lam : Lam.t)  =
 
 
 let count_alias_globals 
-    env 
     (export_idents : Ident.t list)
     (export_sets  : Ident_set.t)
     (lam : Lam.t) : Lam_stats.t =
   let meta : Lam_stats.t = 
     {alias_tbl = Ident_hashtbl.create 31 ; 
      ident_tbl = Ident_hashtbl.create 31;
-
      exports =  export_idents;
-     env;
      export_idents = export_sets;
     } in 
   collect_helper  meta lam ; 

jscomp/core/lam_pass_collect.mli

@@ -81,7 +81,6 @@ val collect_helper : Lam_stats.t -> Lam.t -> unit
 
 (** return a new [meta] *)
 val count_alias_globals : 
-  Env.t -> 
   Ident.t list -> 
   Ident_set.t -> 
   Lam.t -> 

jscomp/core/lam_print.ml

@@ -595,7 +595,7 @@ let lambda_as_module env  ppf (lam : Lam.t) =
     env_lambda env ppf lam;
     fprintf ppf "; lambda-failure"
 
-let seriaize env (filename : string) (lam : Lam.t) : unit =
+let seriaize (filename : string) (lam : Lam.t) : unit =
   let ou = open_out filename  in
   let old = Format.get_margin () in
   let () = Format.set_margin 10000 in

jscomp/core/lam_print.mli

@@ -30,7 +30,7 @@ val primitive: Format.formatter -> Lam_primitive.t -> unit
 
 val env_lambda : Env.t -> Format.formatter -> Lam.t -> unit
 
-val seriaize : 'a -> string -> Lam.t -> unit
+val seriaize :  string -> Lam.t -> unit
 
 val lambda_to_string : Lam.t -> string 
 

jscomp/core/lam_stats.ml

@@ -54,10 +54,8 @@ type ident_tbl = Lam_id_kind.t Ident_hashtbl.t
 
 
 type t = {
-  env : Env.t;
   export_idents : Ident_set.t ;
   exports : Ident.t list ; (*It is kept since order matters? *)
-
   alias_tbl : alias_tbl; 
   ident_tbl : ident_tbl;
   (** we don't need count arities for all identifiers, for identifiers

jscomp/core/lam_stats.mli

@@ -43,12 +43,9 @@ type ident_tbl = Lam_id_kind.t Ident_hashtbl.t
 
 
 type t = {
-  env : Env.t;
   export_idents : Ident_set.t ;
   exports : Ident.t list ;
-  alias_tbl : alias_tbl; 
-  
-
+  alias_tbl : alias_tbl;   
   ident_tbl : ident_tbl;
   (** we don't need count arities for all identifiers, for identifiers
       for sure it's not a function, there is no need to count them

jscomp/core/lam_util.ml

@@ -224,7 +224,7 @@ let generate_label ?(name="") ()  =
 let log_counter = ref 0
 
 
-let dump env ext  lam = 
+let dump ext  lam = 
 #if BS_COMPILER_IN_BROWSER || BS_RELEASE_BUILD then
       ()
 #else
@@ -234,7 +234,7 @@ let dump env ext  lam =
       begin 
         incr log_counter;
         Ext_log.dwarn ~__POS__ "\n@[[TIME:]%s: %f@]@." ext (Sys.time () *. 1000.);
-        Lam_print.seriaize env 
+        Lam_print.seriaize  
           (Ext_filename.new_extension
              !Location.input_name
            (Printf.sprintf ".%02d%s.lam" !log_counter ext)

jscomp/core/lam_util.mli

@@ -71,7 +71,10 @@ val generate_label : ?name:string -> unit -> J.label
 
 
 (** [dump] when {!Js_config.is_same_file}*)
-val dump : Env.t   -> string -> Lam.t -> unit
+val dump : 
+  string -> 
+  Lam.t -> 
+  unit
 
 
 val not_function : Lam.t -> bool