Merge pull request #4161 from BuckleScript/loading_cmj

[refactor] meaningful names & save cmj size further

Author: bobzhang

jscomp/core/bs_cmi_load.ml

@@ -2,10 +2,10 @@
 
 (* TODO: provide native load*)
 let browse_load ~unit_name : Env.Persistent_signature.t option=
-  match Ext_string_array.find_sorted Builtin_cmi_datasets.module_sets unit_name with
-  | Some index ->
+  match Ext_string_array.find_sorted_assoc Builtin_cmi_datasets.module_sets_cmi unit_name with
+  | Some cmi ->
     (* Format.fprintf Format.err_formatter "reading %s@." unit_name; *)
     Some {filename = Sys.executable_name ; 
           cmi = 
-            Lazy.force Builtin_cmi_datasets.module_sets_cmi.(index)}
+            Lazy.force cmi}
   | None -> assert false

jscomp/core/builtin_cmi_datasets.ml

@@ -1,8 +1,6 @@
 
 
 
-(* TODO: we can hide some 
-  more internal units
-*)
-val module_sets : string array
-val module_sets_cmi : Cmi_format.cmi_infos Lazy.t array
+
+val module_sets_cmi : 
+  (string * Cmi_format.cmi_infos Lazy.t) array

jscomp/core/builtin_cmi_datasets.mli

@@ -1,3 +1,4 @@
-val module_sets : string array
-val module_sets_cmj : Js_cmj_format.t Lazy.t array
-val query_by_name : string -> Js_cmj_format.t option
+
+
+val module_sets : 
+  (string * Js_cmj_format.t Lazy.t ) array

jscomp/core/builtin_cmj_datasets.ml

@@ -42,8 +42,6 @@ type effect = string option
 
 
 let single_na = Single Lam_arity.na
-(** we don't force people to use package *)
-type cmj_case = Ext_namespace.file_kind
 
 type keyed_cmj_value = { name : string ; arity : arity ; persistent_closed_lambda : Lam.t option}
 type keyed_cmj_values 
@@ -52,20 +50,20 @@ type keyed_cmj_values
 type t = {
   values : keyed_cmj_values ;
   pure : bool;
-  npm_package_path : Js_packages_info.t ;
-  cmj_case : cmj_case; 
+  package_spec : Js_packages_info.t ;
+  js_file_kind : Ext_js_file_kind.t; 
 }
 
-let make ~(values:cmj_value Map_string.t) ~effect ~npm_package_path ~cmj_case : t = 
+let make ~(values:cmj_value Map_string.t) ~effect ~package_spec ~js_file_kind : t = 
   {
     values = Map_string.to_sorted_array_with_f values (fun k v -> {
       name = k ; 
       arity = v.arity;
       persistent_closed_lambda = v.persistent_closed_lambda
     }); 
     pure = effect = None ; 
-    npm_package_path;
-    cmj_case
+    package_spec;
+    js_file_kind
   }
 
 
@@ -178,70 +176,9 @@ let query_by_name (cmj_table : t ) name  : keyed_cmj_value =
   let values = cmj_table.values in    
   binarySearch values name 
 
-let is_pure (cmj_table : t ) = 
-  cmj_table.pure
-
-let get_npm_package_path (cmj_table : t) = 
-  cmj_table.npm_package_path
-
-let get_cmj_case (cmj_table : t) =  
-  cmj_table.cmj_case
-
-
-(* start dumping *)
-
-let f fmt = Printf.fprintf stdout fmt 
-
-let pp_cmj_case  (cmj_case : cmj_case) : unit = 
-  match cmj_case with 
-  | Little_js -> 
-    f  "case : little, .js \n"
-  | Little_bs -> 
-    f  "case : little, .bs.js \n"    
-  | Upper_js -> 
-    f  "case: upper, .js  \n"
-  | Upper_bs -> 
-    f  "case: upper, .bs.js  \n"    
-
-let pp_cmj 
-    ({ values ; pure; npm_package_path ; cmj_case} : t) = 
-  f  "package info: %s\n"  
-    (Format.asprintf "%a" Js_packages_info.dump_packages_info npm_package_path)        
-  ;
-  pp_cmj_case  cmj_case;
-
-  f "effect: %s\n"
-      (if pure then "pure" else "not pure");
-   Ext_array.iter values 
-    (fun ({name = k ; arity; persistent_closed_lambda}) -> 
-       match arity with             
-       | Single arity ->
-         f "%s: %s\n" k (Format.asprintf "%a" Lam_arity.print arity);
-         (match persistent_closed_lambda with 
-          | None -> 
-            f "%s: not saved\n" k 
-          | Some lam -> 
-            begin 
-              f "%s: ======[start]\n" k ;
-              f "%s\n" (Lam_print.lambda_to_string lam);
-              f "%s: ======[finish]\n" k
-            end )         
-       | Submodule xs -> 
-         (match persistent_closed_lambda with 
-          | None -> f "%s: not saved\n" k 
-          | Some lam -> 
-            begin 
-              f "%s: ======[start]\n" k ;
-              f "%s" (Lam_print.lambda_to_string lam);
-              f "%s: ======[finish]\n" k
-            end 
-         );
-         Array.iteri 
-         (fun i arity -> f "%s[%i] : %s \n" 
-          k i 
-          (Format.asprintf "%a" Lam_arity.print arity ))
-         xs
-    )    
+
+
+
 
 type path = string  
 type cmj_load_info = {

jscomp/core/builtin_cmj_datasets.mli

@@ -64,37 +64,34 @@ type cmj_value = {
 
 type effect = string option
 
-type cmj_case = Ext_namespace.file_kind 
+type keyed_cmj_value = { 
+  name : string ;
+  arity : arity ; 
+  persistent_closed_lambda : Lam.t option
+}
 
-type t 
+type t = private {
+  values : keyed_cmj_value array ;
+  pure : bool;
+  package_spec : Js_packages_info.t ;
+  js_file_kind : Ext_js_file_kind.t; 
+}
 
 
 val make:
   values: cmj_value Map_string.t -> 
   effect: effect -> 
-  npm_package_path: Js_packages_info.t ->
-  cmj_case:cmj_case -> 
+  package_spec: Js_packages_info.t ->
+  js_file_kind:Ext_js_file_kind.t -> 
   t
 
-type keyed_cmj_value = 
-  { name : string ;
-     arity : arity ; 
-     persistent_closed_lambda : Lam.t option}
+
 val query_by_name : 
   t ->
   string -> 
   keyed_cmj_value
 
-val is_pure : 
-  t -> bool 
 
-val get_npm_package_path :  
-  t -> 
-  Js_packages_info.t  
-
-val get_cmj_case :   
-  t ->
-  cmj_case 
 
 val single_na : arity
 
@@ -107,12 +104,13 @@ 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
 
-val pp_cmj: t -> unit 
+
 
 
 type path = string  

jscomp/core/js_cmj_format.ml

@@ -32,10 +32,13 @@
 
 #if BS_BROWSER  then 
 let load_unit_exn unit_name : Js_cmj_format.cmj_load_info = 
-  match Builtin_cmj_datasets.query_by_name unit_name with
-  | Some v
+  match Ext_string_array.find_sorted_assoc 
+          Builtin_cmj_datasets.module_sets
+          unit_name with
+  | Some cmj_table
     -> 
-    {package_path = "BROWSER"; cmj_table = v}
+    let lazy cmj_table = cmj_table in   
+    {package_path = "BROWSER"; cmj_table}
   | None
     ->     
     Bs_exception.error (Cmj_not_found unit_name)

jscomp/core/js_cmj_format.mli

@@ -38,18 +38,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 ->

jscomp/core/js_cmj_load.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