remove js_program_loader

Author: bobzhang

jscomp/Makefile

@@ -284,7 +284,8 @@ CORE_SRCS= js_runtime_modules \
 	lam_pass_deep_flatten\
 	js_stmt_make js_pass_flatten\
 	js_pass_tailcall_inline js_of_lam_variant js_pass_flatten_and_mark_dead js_ast_util lam_dce lam_group_pass lam_compile_env lam_stats_util\
-	lam_stats_export lam_pass_alpha_conversion lam_pass_collect js_program_loader js_dump js_pass_debug\
+	lam_stats_export lam_pass_alpha_conversion lam_pass_collect\
+	js_dump js_pass_debug\
 	js_of_lam_option js_output lam_compile_global \
 	lam_dispatch_primitive \
 	lam_bounded_vars\

jscomp/all.depend

@@ -333,8 +333,6 @@ core/lam_stats_export.cmi : core/lam_stats.cmi core/lam_module_ident.cmi \
 core/lam_pass_alpha_conversion.cmi : core/lam_stats.cmi core/lam.cmi
 core/lam_pass_collect.cmi : core/lam_stats.cmi core/lam.cmi \
     ext/ident_set.cmi
-core/js_program_loader.cmi : core/lam_module_ident.cmi \
-    core/js_packages_info.cmi
 core/js_dump.cmi : core/js_packages_info.cmi core/j.cmx ext/ext_pp.cmi
 core/js_pass_debug.cmi : core/j.cmx
 core/js_of_lam_option.cmi : core/j.cmx
@@ -511,11 +509,9 @@ core/lam_pass_alpha_conversion.cmx : core/lam_stats_util.cmx \
 core/lam_pass_collect.cmx : core/lam_util.cmx core/lam_stats_util.cmx \
     core/lam_stats.cmx core/lam_arity.cmx core/lam.cmx ext/ident_set.cmx \
     ext/ident_hashtbl.cmx core/lam_pass_collect.cmi
-core/js_program_loader.cmx : core/lam_compile_env.cmx \
-    core/js_packages_info.cmx core/js_program_loader.cmi
 core/js_dump.cmx : ext/literals.cmx core/lam_module_ident.cmx \
-    core/js_stmt_make.cmx core/js_runtime_modules.cmx \
-    core/js_program_loader.cmx core/js_packages_state.cmx \
+    core/lam_compile_env.cmx core/js_stmt_make.cmx \
+    core/js_runtime_modules.cmx core/js_packages_state.cmx \
     core/js_packages_info.cmx core/js_op_util.cmx core/js_op.cmx \
     core/js_number.cmx core/js_fun_env.cmx core/js_exp_make.cmx \
     common/js_config.cmx core/js_closure.cmx core/j.cmx ext/ident_set.cmx \

jscomp/core/js_cmj_format.ml

@@ -123,7 +123,7 @@ let find_cmj file : string * t =
                 "@[%s corrupted in database, when looking %s while compiling %s please update @]"           file target (Js_config.get_current_file ())  ;
               Js_cmj_format.no_pure_dummy; (* FIXME *)
             | v ->  v 
-            (* see {!Js_program_loader.string_of_module_id} *)
+            (* see {!Js_packages_info.string_of_module_id} *)
           end
         | exception Not_found 
           ->     

jscomp/core/js_dump.ml

@@ -20,7 +20,16 @@
 *)
 (* Authors: Jérôme Vouillon, Hongbo Zhang  *)
 
-
+let string_of_module_id 
+    ~hint_output_dir 
+    module_system
+    id
+  = 
+  Js_packages_info.string_of_module_id
+    ~hint_output_dir  module_system
+    (Js_packages_state.get_packages_info ())
+    Lam_compile_env.get_package_path_from_cmj
+    id
 
 (*
   http://stackoverflow.com/questions/2846283/what-are-the-rules-for-javascripts-automatic-semicolon-insertion-asi
@@ -1103,7 +1112,7 @@ and
     let action () = 
       let cxt = expression 15 cxt f e in
       property_access f s ;
-      (* See [Js_program_loader.obj_of_exports] 
+      (* See [ .obj_of_exports] 
          maybe in the ast level we should have 
          refer and export
       *)
@@ -1792,12 +1801,11 @@ let goog_program ~output_prefix f goog_package (x : J.deps_program)  =
       (List.map 
          (fun x -> 
             Lam_module_ident.id x,
-            Js_program_loader.string_of_module_id
+            string_of_module_id
               ~hint_output_dir:(Filename.dirname output_prefix) 
               Goog 
-              (Js_packages_state.get_packages_info())
               x)
-              
+
          x.modules) 
   in
   program f cxt x.program  
@@ -1811,10 +1819,9 @@ let node_program ~output_prefix f ( x : J.deps_program) =
       (List.map 
          (fun x -> 
             Lam_module_ident.id x,
-            Js_program_loader.string_of_module_id
+            string_of_module_id
               ~hint_output_dir:(Filename.dirname output_prefix)
               NodeJS 
-              (Js_packages_state.get_packages_info ())
               x)
          x.modules)
   in
@@ -1831,10 +1838,9 @@ let amd_program ~output_prefix kind f (  x : J.deps_program) =
 
   List.iter (fun x ->
       let s : string = 
-        Js_program_loader.string_of_module_id
+        string_of_module_id
           ~hint_output_dir:(Filename.dirname output_prefix) 
           kind 
-          (Js_packages_state.get_packages_info ())
           x in
       P.string f L.comma ;
       P.space f; 
@@ -1872,10 +1878,9 @@ let es6_program  ~output_prefix fmt f (  x : J.deps_program) =
       (List.map 
          (fun x -> 
             Lam_module_ident.id x,
-            Js_program_loader.string_of_module_id
+            string_of_module_id
               ~hint_output_dir:(Filename.dirname output_prefix)
               fmt 
-              (Js_packages_state.get_packages_info())
               x)
          x.modules)
   in

jscomp/core/js_packages_info.mli

@@ -50,6 +50,14 @@ val add_npm_package_path :
   string -> t -> t  
 
 
+
+(**
+  generate the mdoule path so that it can be spliced here:
+  {[
+    var Xx = require("package/path/to/xx.js")
+  ]}
+  Note that it has to be consistent to how it is generated
+*)  
 val string_of_module_id :
   hint_output_dir:string ->
   module_system ->

jscomp/core/js_program_loader.ml

@@ -247,7 +247,7 @@ let query_and_add_if_not_exist (type u)
             found {signature = []; pure = false}
           | No_env -> 
             found (Ext_string.empty, Js_cmj_format.no_pure_dummy)
-            (* FIXME: {!Js_program_loader} #154, it come from External, should be okay *)
+            (* FIXME: #154, it come from External, should be okay *)
         end
 
     end