Merge pull request #3792 from BuckleScript/simplify_global_module_compilation

Simplify global module compilation

Author: bobzhang

jscomp/core/js_exp_make.ml

@@ -106,8 +106,8 @@ let external_var_dot ?comment  ~external_name:name ?dot (id : Ident.t) : t =
   {expression_desc = Var (Qualified(id, External name,  dot)); comment }
 
 
-(* let ml_var ?comment (id : Ident.t) : t  = 
-  {expression_desc = Var (Qualified (id, Ml, None)); comment} *)
+let ml_module_as_var ?comment (id : Ident.t) : t  = 
+  {expression_desc = Var (Qualified (id, Ml, None)); comment}
 
 (* Static_index .....................**)        
 let runtime_call ?comment module_name fn_name args = 

jscomp/core/js_exp_make.mli

@@ -75,6 +75,11 @@ val external_var_dot :
   Ident.t ->
   t
 
+val ml_module_as_var :  
+  ?comment:string -> 
+  Ident.t -> 
+  t
+
 val runtime_call : 
   ?comment:string -> 
   string -> (* module_name *)

jscomp/core/js_fold_basic.ml

@@ -58,7 +58,8 @@ class count_hard_dependencies =
       match vid with 
       | Qualified (id,kind,_) ->
           add_lam_module_ident  hard_dependencies (Lam_module_ident.mk kind id); self
-      | Id id -> self
+      | Id id -> 
+        self
     method! expression x : 'self_type  = 
       (* check {!Js_pass_scope} when making changes *)
       (match  Js_block_runtime.check_additional_id x with

jscomp/core/lam_beta_reduce.ml

@@ -79,13 +79,7 @@ let propogate_beta_reduce
              | Some ident_info -> 
                Ident_hashtbl.add meta.ident_tbl param ident_info 
            end;
-           arg 
-         | Lglobal_module ident   
-         -> 
-           (* It's not completeness, its to make it sound.. 
-              Pass global module as an argument
-           *)
-           Lam_compile_global.expand_global_module_as_lam ident meta.env 
+           arg          
          (* alias meta param ident (Module (Global ident)) Strict *)
          | Lprim {primitive = Pmakeblock (_, _, Immutable) ;args ; _} -> 
 
@@ -143,10 +137,6 @@ let propogate_beta_reduce_with_map
                Ident_hashtbl.add meta.ident_tbl param ident_info 
            end;
            arg 
-          | Lglobal_module ident 
-          -> 
-           (* It's not completeness, its to make it sound.. *)
-           Lam_compile_global.expand_global_module_as_lam ident meta.env 
          (* alias meta param ident (Module (Global ident)) Strict *)
          | Lprim {primitive = Pmakeblock (_, _, Immutable ) ; args} -> 
            Ident_hashtbl.replace meta.ident_tbl param 

jscomp/core/lam_compile.ml

@@ -1565,9 +1565,9 @@ and compile_lambda
       (* introduced by
          1. {[ include Array --> let include  = Array  ]}
          2. inline functor application
-      *)
-      let exp = Lam_compile_global.expand_global_module i lambda_cxt.meta.env  in
-      Js_output.output_of_block_and_expression lambda_cxt.continuation [] exp
+      *)      
+      Js_output.output_of_block_and_expression lambda_cxt.continuation [] 
+        (E.ml_module_as_var i )
 
     | Lprim prim_info -> 
         compile_prim prim_info lambda_cxt

jscomp/core/lam_compile_global.ml

@@ -36,7 +36,7 @@
 type t
 
 val empty : t 
-val length : t -> int 
+
 
 
 
@@ -47,4 +47,4 @@ val find_serializable_signatures_by_path :
 
 val get_name : t -> int -> string
 
-val map : (string -> 'a) -> t -> 'a list 
+

jscomp/core/lam_compile_global.mli

@@ -27,13 +27,9 @@ function eq(loc, x, y) {
   return /* () */0;
 }
 
-var Y0 = Functor_def.Make(/* Functor_inst */{
-      say: Functor_inst.say
-    });
+var Y0 = Functor_def.Make(Functor_inst);
 
-var Y1 = Functor_def.Make(/* Functor_inst */{
-      say: Functor_inst.say
-    });
+var Y1 = Functor_def.Make(Functor_inst);
 
 eq("File \"functor_app_test.ml\", line 23, characters 6-13", Curry._2(Y0.h, 1, 2), 4);
 

jscomp/core/ocaml_types.mli

@@ -27,52 +27,7 @@ function eq(loc, x, y) {
 }
 
 function f(x) {
-  var L = /* List */{
-    length: List.length,
-    hd: List.hd,
-    tl: List.tl,
-    nth: List.nth,
-    rev: List.rev,
-    append: List.append,
-    rev_append: List.rev_append,
-    concat: List.concat,
-    flatten: List.flatten,
-    iter: List.iter,
-    iteri: List.iteri,
-    map: List.map,
-    mapi: List.mapi,
-    rev_map: List.rev_map,
-    fold_left: List.fold_left,
-    fold_right: List.fold_right,
-    iter2: List.iter2,
-    map2: List.map2,
-    rev_map2: List.rev_map2,
-    fold_left2: List.fold_left2,
-    fold_right2: List.fold_right2,
-    for_all: List.for_all,
-    exists: List.exists,
-    for_all2: List.for_all2,
-    exists2: List.exists2,
-    mem: List.mem,
-    memq: List.memq,
-    find: List.find,
-    filter: List.filter,
-    find_all: List.find_all,
-    partition: List.partition,
-    assoc: List.assoc,
-    assq: List.assq,
-    mem_assoc: List.mem_assoc,
-    mem_assq: List.mem_assq,
-    remove_assoc: List.remove_assoc,
-    remove_assq: List.remove_assq,
-    split: List.split,
-    combine: List.combine,
-    sort: List.sort,
-    stable_sort: List.stable_sort,
-    fast_sort: List.fast_sort,
-    sort_uniq: List.sort_uniq,
-    merge: List.merge
-  };
+  var L = List;
   console.log(x);
   console.log(List.length(x));
   return L;