Merge pull request #4180 from BuckleScript/bs_config

support [@@@bs.config {flags = [| .. |]}

Author: bobzhang

jscomp/common/js_config.ml

@@ -53,8 +53,8 @@ let no_version_header = ref false
 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 set_cross_module_inline b =
+  cross_module_inline := b *)
 
 
 let diagnose = ref false
@@ -65,8 +65,8 @@ let get_diagnose () = !diagnose
 
 (* let get_packages_info () = !packages_info *)
 
-let no_builtin_ppx_ml = ref false
-let no_builtin_ppx_mli = ref false
+let no_builtin_ppx = ref false
+
 
 
 let debug_file = ref ""

jscomp/common/js_config.mli

@@ -48,7 +48,7 @@ val get_package_name : unit -> string option *)
 
 (** cross module inline option *)
 val cross_module_inline : bool ref
-val set_cross_module_inline : bool -> unit
+(* val set_cross_module_inline : bool -> unit *)
 val get_cross_module_inline : unit -> bool
 
 (** diagnose option *)
@@ -58,8 +58,8 @@ val get_diagnose : unit -> bool
 
 
 (** options for builtin ppx *)
-val no_builtin_ppx_ml : bool ref 
-val no_builtin_ppx_mli : bool ref 
+val no_builtin_ppx : bool ref 
+
 
 
 

jscomp/core/js_cmj_format.ml

@@ -132,9 +132,13 @@ let not_found key = {name = key; arity = single_na; persistent_closed_lambda =
 
 
 let get_result  midVal =   
-  if midVal.persistent_closed_lambda = None || 
-    Js_config.get_cross_module_inline () then midVal
-  else {midVal with persistent_closed_lambda = None}  
+  match midVal.persistent_closed_lambda with   
+  | Some (Lconst (Const_js_null | Const_js_undefined | Const_js_true | Const_js_false ))
+  | None  ->
+    midVal
+  | Some _ -> 
+    if Js_config.get_cross_module_inline () then midVal
+    else {midVal with persistent_closed_lambda = None}  
 
 let rec binarySearchAux arr lo hi (key : string) = 
   let mid = (lo + hi)/2 in 

jscomp/core/js_long.ml

@@ -165,8 +165,8 @@ let of_float (args : J.expression list ) =
 let compare (args : J.expression list) = 
   int64_call "compare" args 
 
-let of_string (args : J.expression list) = 
-  int64_call "of_string" args 
+(* let of_string (args : J.expression list) = 
+  int64_call "of_string" args  *)
 let get64 = int64_call "get64"
 let float_of_bits  =  int64_call "float_of_bits" 
 let bits_of_float = int64_call "bits_of_float"

jscomp/core/js_long.mli

@@ -29,7 +29,7 @@
 
 type int64_call = J.expression list -> J.expression  
 
-val make_const : lo:Int32.t -> hi:Int32.t -> J.expression
+(* val make_const : lo:Int32.t -> hi:Int32.t -> J.expression *)
 
 val of_const : int64 -> J.expression
 
@@ -60,7 +60,7 @@ val equal_nullable : int64_call
 val to_float : int64_call
 val of_float : int64_call
 val compare : int64_call
-val of_string : int64_call
+(* val of_string : int64_call *)
 val float_of_bits : int64_call
 val bits_of_float : int64_call  
 val get64 : int64_call

jscomp/core/lam_convert.mli

@@ -23,8 +23,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-val happens_to_be_diff:  
-  (int * Lambda.lambda) list -> int option 
+(* val happens_to_be_diff:  
+  (int * Lambda.lambda) list -> int option  *)
 
 
 (** 

jscomp/core/lam_stats_export.ml

@@ -64,9 +64,11 @@ let values_of_export
            end
        in
        let persistent_closed_lambda = 
+          match Map_ident.find_opt export_map x with 
+         | Some Lconst (Const_js_null | Const_js_undefined | Const_js_true | Const_js_false ) | None  as optlam  -> optlam
+         | Some lambda as optlam ->
          if not !Js_config.cross_module_inline then None
-         else match Map_ident.find_opt export_map x with 
-         | Some lambda  -> 
+         else
            if Lam_analysis.safe_to_inline lambda
            (* when inlning a non function, we have to be very careful,
               only truly immutable values can be inlined
@@ -90,12 +92,12 @@ let values_of_export
                then 
                  begin
                    Ext_log.dwarn ~__POS__ "%s recorded for inlining @." x.name ;
-                   Some lambda
+                   optlam
                  end
                else None
            else
              None
-         | None -> None  in 
+         in 
        match arity, persistent_closed_lambda with 
        | Single Arity_na, 
         (None | Some (Lconst (Const_pointer (_, Pt_module_alias)))) -> acc

jscomp/core/ocaml_options.ml

@@ -44,13 +44,13 @@ let mk_I f =
   "-I", Arg.String f, "<dir>  Add <dir> to the list of include directories"
 ;;
 
-let mk_impl f =
+(* let mk_impl f =
   "-impl", Arg.String f, "<file>  Compile <file> as a .ml file"
-;;
+;; *)
 
-let mk_intf f =
+(* let mk_intf f =
   "-intf", Arg.String f, "<file>  Compile <file> as a .mli file"
-;;
+;; *)
 
 let mk_intf_suffix f =
   "-intf-suffix", Arg.String f,
@@ -244,10 +244,10 @@ let mk_strict_formats f =
   \      to detect and fix invalid formats.)"
 ;;
 
-let mk__ f =
+(* let mk__ f =
   "-", Arg.String f,
   "<file>  Treat <file> as a file name (even if it starts with `-')"
-;;
+;; *)
 
 let show_config () =
   Config.print_config stdout;

jscomp/core/ocaml_options.mli

@@ -24,9 +24,9 @@
 
 
 
-val mk_impl : (string -> unit) -> string * Arg.spec * string
-val mk_intf : (string -> unit) -> string * Arg.spec * string
-val mk__ : (string -> unit) -> string * Arg.spec * string
+(* val mk_impl : (string -> unit) -> string * Arg.spec * string *)
+(* val mk_intf : (string -> unit) -> string * Arg.spec * string *)
+(* val mk__ : (string -> unit) -> string * Arg.spec * string *)
 (**
    [ocaml_options] are command options inherited from ocaml 
    bytecode compiler except three options