not saving empty submodule's arity

bobzhang · bobzhang · commit d7a9e1cfa28f · 2020-02-12T11:47:06.000+08:00
it is not useful in general
diff --git a/jscomp/core/builtin_cmj_datasets.ml b/jscomp/core/builtin_cmj_datasets.ml
diff --git a/jscomp/core/lam_arity_analysis.ml b/jscomp/core/lam_arity_analysis.ml
@@ -44,17 +44,17 @@ let rec get_arity (meta : Lam_stats.t) (lam : Lam.t) :  Lam_arity.t =
   | Lvar v -> arity_of_var meta v 
   | Lconst _ -> Lam_arity.non_function_arity_info
   | Llet(_,_,_, l ) -> get_arity meta l 
-  | Lprim {primitive = Pfield (_, Fld_module {name = fld_name}); 
+  | Lprim {primitive = Pfield (_, Fld_module {name }); 
            args =  [ Lglobal_module id  ]; _} -> 
-    begin match (Lam_compile_env.query_external_id_info id fld_name).arity with 
+    begin match (Lam_compile_env.query_external_id_info id name).arity with 
       | Single x -> x 
       | Submodule _ -> Lam_arity.na
     end
   | Lprim {primitive = Pfield (m,_); 
-           args =  [ Lprim{primitive = Pfield(n,Fld_module {name = fld_name}); 
+           args =  [ Lprim{primitive = Pfield(_,Fld_module {name }); 
                            args = [ Lglobal_module id]}  ]
           ; _} ->
-    begin match (Lam_compile_env.query_external_id_info id fld_name ).arity with 
+    begin match (Lam_compile_env.query_external_id_info id name).arity with 
       | Submodule subs -> subs.(m) (* TODO: shall we store it as array?*)
       | Single _ -> Lam_arity.na
     end
diff --git a/jscomp/core/lam_compile.ml b/jscomp/core/lam_compile.ml
@@ -177,14 +177,14 @@ let rec
   compile_external_field (* Like [List.empty]*)
     (lamba_cxt : Lam_compile_context.t)
     (id : Ident.t)
-    pos
+    name
   : Js_output.t =  
-  match Lam_compile_env.query_external_id_info id pos  with      
+  match Lam_compile_env.query_external_id_info id name  with      
   | {  persistent_closed_lambda = Some lam}
       when Lam_util.not_function lam
       ->
       compile_lambda lamba_cxt lam     
-  | { name} ->
+  | _ ->
       Js_output.output_of_expression lamba_cxt.continuation  
       ~no_effects:no_effects_const
       (E.ml_var_dot id name )
@@ -254,7 +254,9 @@ and compile_external_field_apply
         E.call ~info:(call_info_of_ap_status ap_status) fn args 
       | App_na ->   
         match ident_info.arity with 
-        | Submodule _ -> E.call ~info:Js_call_info.dummy fn args 
+        | Submodule _ 
+        | Single Arity_na 
+          -> E.call ~info:Js_call_info.dummy fn args 
         | Single x -> 
           apply_with_arity
             fn ~arity:(Lam_arity.extract_arity x) args         
diff --git a/jscomp/core/lam_pass_remove_alias.ml b/jscomp/core/lam_pass_remove_alias.ml
@@ -135,9 +135,8 @@ let simplify_alias
                   end
                 |  _ -> true 
               ) -> 
-          simpl @@
-          Lam_beta_reduce.propogate_beta_reduce
-            meta params body args
+          simpl (Lam_beta_reduce.propogate_beta_reduce
+                   meta params body args)
         | _ -> 
           Lam.apply (simpl l1) (Ext_list.map args simpl) loc status
 
diff --git a/jscomp/core/lam_stats_export.ml b/jscomp/core/lam_stats_export.ml
@@ -99,9 +99,7 @@ let values_of_export
        match arity, persistent_closed_lambda with 
        | Single Arity_na, 
         (None | Some (Lconst (Const_pointer (_, Pt_module_alias)))) -> acc
-        (* TODO: empty module can be saved too
-           This is common since we have a module of externals quite common      
-         *)
+       | Submodule [||], None -> acc          
        | _ ->  
          let cmj_value : Js_cmj_format.cmj_value =  
            {arity ; persistent_closed_lambda } in  
diff --git a/lib/4.06.1/bsb.ml b/lib/4.06.1/bsb.ml
@@ -6522,7 +6522,9 @@ type file_kind =
   | Upper_bs
   | Little_js 
   | Little_bs 
-  (** [js_name_of_modulename ~little A-Ns]
+  
+  
+(** [js_name_of_modulename ~little A-Ns]
   *)
 val js_name_of_modulename : 
   string -> 
diff --git a/lib/4.06.1/bsb_helper.ml b/lib/4.06.1/bsb_helper.ml
@@ -3760,7 +3760,9 @@ type file_kind =
   | Upper_bs
   | Little_js 
   | Little_bs 
-  (** [js_name_of_modulename ~little A-Ns]
+  
+  
+(** [js_name_of_modulename ~little A-Ns]
   *)
 val js_name_of_modulename : 
   string -> 
diff --git a/lib/4.06.1/unstable/all_ounit_tests.ml b/lib/4.06.1/unstable/all_ounit_tests.ml
@@ -16393,7 +16393,9 @@ type file_kind =
   | Upper_bs
   | Little_js 
   | Little_bs 
-  (** [js_name_of_modulename ~little A-Ns]
+  
+  
+(** [js_name_of_modulename ~little A-Ns]
   *)
 val js_name_of_modulename : 
   string -> 
diff --git a/lib/4.06.1/unstable/bsb_native.ml b/lib/4.06.1/unstable/bsb_native.ml
@@ -6522,7 +6522,9 @@ type file_kind =
   | Upper_bs
   | Little_js 
   | Little_bs 
-  (** [js_name_of_modulename ~little A-Ns]
+  
+  
+(** [js_name_of_modulename ~little A-Ns]
   *)
 val js_name_of_modulename : 
   string -> 
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
@@ -61650,7 +61650,9 @@ type file_kind =
   | Upper_bs
   | Little_js 
   | Little_bs 
-  (** [js_name_of_modulename ~little A-Ns]
+  
+  
+(** [js_name_of_modulename ~little A-Ns]
   *)
 val js_name_of_modulename : 
   string -> 
@@ -83656,18 +83658,18 @@ val runtime_package_path:
   string ->
   string
 
-type package_info 
-  = 
-  { 
-    module_system : module_system ;
-    path :  string 
-  }
+type package_info = { 
+  module_system : module_system ;
+  path :  string 
+}
 
 type t 
 
 val is_runtime_package:
   t ->
   bool
+  
+  
 
 val same_package_by_name :   
   t ->
@@ -86913,10 +86915,12 @@ val make:
   cmj_case:cmj_case -> 
   t
   
-type keyed_cmj_value = 
-  { name : string ;
-     arity : arity ; 
-     persistent_closed_lambda : Lam.t option}
+type keyed_cmj_value = { 
+  name : string ;
+  arity : arity ; 
+  persistent_closed_lambda : Lam.t option
+}
+
 val query_by_name : 
   t ->
   string -> 
@@ -86944,7 +86948,8 @@ val from_file_with_digest :
 
 val from_string : string -> t
 
-(* Note writing the file if its content is not chnaged  
+(* 
+  Note writing the file if its content is not changed  
 *)
 val to_file : 
   string -> check_exists:bool -> t -> unit
@@ -106647,17 +106652,17 @@ let rec get_arity (meta : Lam_stats.t) (lam : Lam.t) :  Lam_arity.t =
   | Lvar v -> arity_of_var meta v 
   | Lconst _ -> Lam_arity.non_function_arity_info
   | Llet(_,_,_, l ) -> get_arity meta l 
-  | Lprim {primitive = Pfield (_, Fld_module {name = fld_name}); 
+  | Lprim {primitive = Pfield (_, Fld_module {name }); 
            args =  [ Lglobal_module id  ]; _} -> 
-    begin match (Lam_compile_env.query_external_id_info id fld_name).arity with 
+    begin match (Lam_compile_env.query_external_id_info id name).arity with 
       | Single x -> x 
       | Submodule _ -> Lam_arity.na
     end
   | Lprim {primitive = Pfield (m,_); 
-           args =  [ Lprim{primitive = Pfield(n,Fld_module {name = fld_name}); 
+           args =  [ Lprim{primitive = Pfield(_,Fld_module {name }); 
                            args = [ Lglobal_module id]}  ]
           ; _} ->
-    begin match (Lam_compile_env.query_external_id_info id fld_name ).arity with 
+    begin match (Lam_compile_env.query_external_id_info id name).arity with 
       | Submodule subs -> subs.(m) (* TODO: shall we store it as array?*)
       | Single _ -> Lam_arity.na
     end
@@ -115973,14 +115978,14 @@ let rec
   compile_external_field (* Like [List.empty]*)
     (lamba_cxt : Lam_compile_context.t)
     (id : Ident.t)
-    pos
+    name
   : Js_output.t =  
-  match Lam_compile_env.query_external_id_info id pos  with      
+  match Lam_compile_env.query_external_id_info id name  with      
   | {  persistent_closed_lambda = Some lam}
       when Lam_util.not_function lam
       ->
       compile_lambda lamba_cxt lam     
-  | { name} ->
+  | _ ->
       Js_output.output_of_expression lamba_cxt.continuation  
       ~no_effects:no_effects_const
       (E.ml_var_dot id name )
@@ -116050,7 +116055,9 @@ and compile_external_field_apply
         E.call ~info:(call_info_of_ap_status ap_status) fn args 
       | App_na ->   
         match ident_info.arity with 
-        | Submodule _ -> E.call ~info:Js_call_info.dummy fn args 
+        | Submodule _ 
+        | Single Arity_na 
+          -> E.call ~info:Js_call_info.dummy fn args 
         | Single x -> 
           apply_with_arity
             fn ~arity:(Lam_arity.extract_arity x) args         
@@ -403421,9 +403428,8 @@ let simplify_alias
                   end
                 |  _ -> true 
               ) -> 
-          simpl @@
-          Lam_beta_reduce.propogate_beta_reduce
-            meta params body args
+          simpl (Lam_beta_reduce.propogate_beta_reduce
+                   meta params body args)
         | _ -> 
           Lam.apply (simpl l1) (Ext_list.map args simpl) loc status
 
@@ -403703,9 +403709,7 @@ let values_of_export
        match arity, persistent_closed_lambda with 
        | Single Arity_na, 
         (None | Some (Lconst (Const_pointer (_, Pt_module_alias)))) -> acc
-        (* TODO: empty module can be saved too
-           This is common since we have a module of externals quite common      
-         *)
+       | Submodule [||], None -> acc          
        | _ ->  
          let cmj_value : Js_cmj_format.cmj_value =  
            {arity ; persistent_closed_lambda } in  
