[feature] #423 add an option which requires people to enable cross mo…

…dule options explicitly
rescript-lang · May 27, 2016 · 62aad0b · 62aad0b
1 parent 7b1c2ef
commit 62aad0b
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 10 deletions.
diff --git a/jscomp/js_config.ml b/jscomp/js_config.ml
@@ -92,6 +92,11 @@ let set_npm_package_path s =
 
 let get_npm_package_path () = !npm_package_path
 
+let cross_module_inline = ref false
+
+let get_cross_module_inline () = !cross_module_inline
+let set_cross_module_inline b = 
+  cross_module_inline := b
 
 let (//) = Filename.concat 
 (* for a single pass compilation, [output_dir] 

diff --git a/jscomp/js_config.mli b/jscomp/js_config.mli
@@ -44,6 +44,10 @@ val get_goog_package_name : unit -> string option
 val set_npm_package_path : string -> unit 
 val get_npm_package_path : unit -> (string * string) option
 
+val cross_module_inline : bool ref
+val set_cross_module_inline : bool -> unit
+val get_cross_module_inline : unit -> bool
+
 val set_env : env -> unit
 val cmd_set_module : string -> unit  
 val default_gen_tds : bool ref

diff --git a/jscomp/js_main.ml b/jscomp/js_main.ml
@@ -322,6 +322,8 @@ let buckle_script_flags =
       "disable built-in ppx for ml files (internal use)")
   :: ("-js-no-builtin-ppx-mli", Arg.Set Js_config.no_builtin_ppx_mli,
       "disable built-in ppx for mli files (internal use)")
+  :: ("-js-cross-module-opt", Arg.Set Js_config.cross_module_inline, 
+      "enable cross module inlining, default(false)")
   :: ("-js-gen-tds", Arg.Set Js_config.default_gen_tds, 
     " set will generate `.d.ts` file for typescript (experimental)")
   :: (

diff --git a/jscomp/lam_compile.ml b/jscomp/lam_compile.ml
@@ -90,7 +90,8 @@ let rec
               the compiler has to be the same running 
           *)
           ->  f (E.str Sys.os_type)
-        | _, _, Some lam when Lam_util.not_function lam
+        | _, _, Some lam 
+          when Lam_util.not_function lam
           (* since it's only for alias, there is no arguments, 
              we should not inline function definition here, even though
              it is very small             

diff --git a/jscomp/lam_compile_env.ml b/jscomp/lam_compile_env.ml
@@ -117,21 +117,28 @@ let find_and_add_if_not_exist (id, pos) env ~not_found ~found =
                name ;
                signatures = signature ;
                arity ;
-               closed_lambda
+               closed_lambda = 
+                 if Js_config.get_cross_module_inline () then
+                   closed_lambda
+                 else None
               }
       end
     | Visit { signatures = serializable_sigs ; cmj_table = { values ; _} }  -> 
       let name = (Type_util.get_name serializable_sigs pos ) in
       let arity , closed_lambda =  (
         match  String_map.find name values with
         | exception  Not_found -> (NA, None)
-        | {arity; closed_lambda;_} -> arity, closed_lambda 
+        | {arity; closed_lambda;_} -> 
+          arity, closed_lambda 
       ) in
       found { id;
               name; 
               signatures = serializable_sigs;
               arity;
-              closed_lambda
+              closed_lambda = 
+                if Js_config.get_cross_module_inline () then
+                  closed_lambda
+                else None
               (* TODO shall we cache the arity ?*) 
             } 
     | Runtime _ -> assert false

diff --git a/jscomp/lam_compile_group.ml b/jscomp/lam_compile_group.ml
@@ -419,7 +419,7 @@ let lambda_as_module
     (lam : Lambda.lambda) = 
   begin 
     Lam_current_unit.set_file filename ;  
-    Lam_current_unit.iset_debug_file "tuple_alloc.ml";
+    Lam_current_unit.set_debug_file "rand.ml";
     Ext_pervasives.with_file_as_chan 
       (Js_config.get_output_file filename)
       (fun chan -> Js_dump.dump_deps_program 

diff --git a/jscomp/lam_pass_remove_alias.ml b/jscomp/lam_pass_remove_alias.ml
@@ -148,7 +148,7 @@ let simplify_alias
                     _ }
           -> 
           let lam_size = Lam_analysis.size body in            
-          if Ext_list.same_length args params 
+          if Ext_list.same_length args params (* && false *)
           then               
             if Lam_inline_util.maybe_functor v.name  
               (* && (Ident_set.mem v meta.export_idents) && false *)

diff --git a/jscomp/runtime/Makefile b/jscomp/runtime/Makefile
@@ -21,7 +21,7 @@ $(addsuffix .cmj, $(OTHERS)): caml_builtin_exceptions.cmj  block.cmj js.cmj
 RUNTIME := $(addsuffix .cmj, $(SOURCE_LIST)) 
 
 
-COMPFLAGS += $(MODULE_FLAGS) -I ../stdlib -nostdlib -nopervasives -open Pervasives -w -40 -js-npm-output-path $(npm_package_name):lib/js 
+COMPFLAGS += $(MODULE_FLAGS) -I ../stdlib -nostdlib -nopervasives -open Pervasives -w -40 -js-npm-output-path $(npm_package_name):lib/js -js-cross-module-opt
 
 
 

diff --git a/jscomp/stdlib/Makefile.shared b/jscomp/stdlib/Makefile.shared
@@ -22,7 +22,7 @@ CAMLC=$(CAMLRUN) $(COMPILER)
 #COMPFLAGS=-strict-sequence -w +33..39 -g -warn-error A -bin-annot -nostdlib \
 #          -safe-string
 COMPFLAGS= $(MODULE_FLAGS) -strict-sequence -w +33..39 -g -warn-error A  -nostdlib \
-          -safe-string -I ../runtime -js-npm-output-path $(npm_package_name):lib/js -js-no-builtin-ppx-ml -js-no-builtin-ppx-mli
+          -safe-string -I ../runtime -js-npm-output-path $(npm_package_name):lib/js -js-no-builtin-ppx-ml -js-no-builtin-ppx-mli -js-cross-module-opt
 
 
 # OPTCOMPILER=ocamlopt.opt

diff --git a/jscomp/test/Makefile b/jscomp/test/Makefile
@@ -8,7 +8,7 @@ SOURCE_LIST := $(shell cat test.mllib)
 TESTS := $(addsuffix .cmj, $(SOURCE_LIST) )
 
 COMPFLAGS+=  $(MODULE_FLAGS) -w -40 
-COMPFLAGS+=  -js-npm-output-path $(npm_package_name):lib/js/test/
+COMPFLAGS+=  -js-cross-module-opt -js-npm-output-path $(npm_package_name):lib/js/test/
 
 
 $(TESTS): $(CAMLC)

diff --git a/jscomp/test/test.mllib b/jscomp/test/test.mllib
@@ -315,4 +315,9 @@ uncurry_glob_test
 nested_obj_test
 nested_obj_literal
 
-method_name_test
+method_name_test
+
+# sig
+# delaunay
+# rand
+# builder