tweak

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/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,

jscomp/core/ocaml_options.mli

@@ -24,8 +24,8 @@
 
 
 
-val mk_impl : (string -> unit) -> string * Arg.spec * string
-val mk_intf : (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 

jscomp/main/js_main.ml

@@ -152,7 +152,7 @@ let eval (s : string) ~suffix =
 let define_variable s =
   match Ext_string.split ~keep_empty:true s '=' with
   | [key; v] -> 
-    if not @@ Lexer.define_key_value key v  then 
+    if not (Lexer.define_key_value key v)  then 
       raise (Arg.Bad ("illegal definition: " ^ s))
   | _ -> raise (Arg.Bad ("illegal definition: " ^ s))
 
@@ -310,22 +310,17 @@ let buckle_script_flags : (string * Arg.spec * string) list =
     Js_packages_state.update_npm_package_path, 
    " set npm-output-path: [opt_module]:path, for example: 'lib/cjs', 'amdjs:lib/amdjs', 'es6:lib/es6' ")
   ::
-  ("-bs-no-warn-unimplemented-external",
-    Arg.Unit (fun _ -> ()),
-    " Deprecated: use warning 106"
-  )
-  ::
-  ("-bs-no-builtin-ppx-ml", 
-   Arg.Set Js_config.no_builtin_ppx_ml,
-   "disable built-in ppx for ml files (internal use)")
-  :: 
-  ("-bs-no-builtin-ppx-mli",
-   Arg.Set Js_config.no_builtin_ppx_mli,
-   "disable built-in ppx for mli files (internal use)")
+  ("-bs-no-builtin-ppx", 
+   Arg.Set Js_config.no_builtin_ppx,
+   "disable built-in ppx (internal use)")
   :: 
   ("-bs-cross-module-opt", 
    Arg.Set Js_config.cross_module_inline, 
    "enable cross module inlining(experimental), default(false)")
+   :: 
+   ("-bs-no-cross-module-opt", 
+    Arg.Clear Js_config.cross_module_inline, 
+    "enable cross module inlining(experimental), default(false)")  
   :: 
   ("-bs-diagnose",
    Arg.Set Js_config.diagnose, 
@@ -344,10 +339,15 @@ let buckle_script_flags : (string * Arg.spec * string) list =
     Arg.Set Clflags.dump_location, 
   " dont display location with -dtypedtree, -dparsetree"
   )
-  :: Ocaml_options.mk_impl (* [-impl] *)
-    (fun file  ->  Js_config.js_stdout := false;  impl file )  
-  :: Ocaml_options.mk_intf (* [-intf] *)
-    (fun file -> Js_config.js_stdout := false ; intf file)
+  :: 
+  ("-impl", Arg.String
+     (fun file  ->  Js_config.js_stdout := false;  impl file ),
+   "<file>  Compile <file> as a .ml file"
+  )  
+  ::
+  ("-intf", Arg.String 
+     (fun file -> Js_config.js_stdout := false ; intf file),
+   "<file>  Compile <file> as a .mli file")
   (* :: Ocaml_options.mk__ anonymous *)
   :: Ocaml_options.ocaml_options
 

jscomp/syntax/ppx_entry.ml

@@ -32,7 +32,7 @@ let rewrite_signature (ast : Parsetree.signature) : Parsetree.signature =
     (* react-jsx ppx relies on built-in ones like `##` *)
   in 
 
-  if !Js_config.no_builtin_ppx_mli then ast else 
+  if !Js_config.no_builtin_ppx then ast else 
     Bs_builtin_ppx.rewrite_signature ast 
 
 let rewrite_implementation (ast : Parsetree.structure) : Parsetree.structure =   
@@ -42,7 +42,7 @@ let rewrite_implementation (ast : Parsetree.structure) : Parsetree.structure =
     | 3 -> Reactjs_jsx_ppx_v3.rewrite_implementation ast 
     | _ -> ast 
   in 
-  if !Js_config.no_builtin_ppx_ml then ast else
+  if !Js_config.no_builtin_ppx then ast else
   begin
     Bs_builtin_ppx.rewrite_implementation ast 
   end

lib/4.06.1/bsdep.ml

@@ -5572,7 +5572,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 *)
@@ -5582,8 +5582,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 
+
 
 
 
@@ -5693,8 +5693,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
@@ -5705,8 +5705,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 ""
@@ -53845,7 +53845,7 @@ let rewrite_signature (ast : Parsetree.signature) : Parsetree.signature =
     (* react-jsx ppx relies on built-in ones like `##` *)
   in 
 
-  if !Js_config.no_builtin_ppx_mli then ast else 
+  if !Js_config.no_builtin_ppx then ast else 
     Bs_builtin_ppx.rewrite_signature ast 
 
 let rewrite_implementation (ast : Parsetree.structure) : Parsetree.structure =   
@@ -53855,7 +53855,7 @@ let rewrite_implementation (ast : Parsetree.structure) : Parsetree.structure =
     | 3 -> Reactjs_jsx_ppx_v3.rewrite_implementation ast 
     | _ -> ast 
   in 
-  if !Js_config.no_builtin_ppx_ml then ast else
+  if !Js_config.no_builtin_ppx then ast else
   begin
     Bs_builtin_ppx.rewrite_implementation ast 
   end

lib/4.06.1/unstable/all_ounit_tests.ml

@@ -7704,7 +7704,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 *)
@@ -7714,8 +7714,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 
+
 
 
 
@@ -7825,8 +7825,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
@@ -7837,8 +7837,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 ""

lib/4.06.1/unstable/bspack.ml

@@ -11279,7 +11279,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 *)
@@ -11289,8 +11289,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 
+
 
 
 
@@ -11400,8 +11400,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
@@ -11412,8 +11412,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 ""

lib/4.06.1/unstable/js_compiler.ml

@@ -296095,7 +296095,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 *)
@@ -296105,8 +296105,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 
+
 
 
 
@@ -296216,8 +296216,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
@@ -296228,8 +296228,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 ""