delay command line ppx

Author: bobzhang

jscomp/core/js_implementation.ml

@@ -103,7 +103,8 @@ let after_parsing_sig ppf  outputprefix ast  =
 
 let interface ppf fname outputprefix =
   Compmisc.init_path false;
-  Pparse_driver.parse_interface ~tool_name:Js_config.tool_name ppf fname
+  Pparse_driver.parse_interface  ppf fname
+  |> Cmd_ppx_apply.apply_rewriters ~restore:false ~tool_name:Js_config.tool_name Mli 
   |> Ppx_entry.rewrite_signature
   |> print_if_pipe ppf Clflags.dump_parsetree Printast.interface
   |> print_if_pipe ppf Clflags.dump_source Pprintast.signature 
@@ -200,8 +201,9 @@ let after_parsing_impl ppf  outputprefix (ast : Parsetree.structure) =
       process_with_gentype (outputprefix ^ ".cmt")        
     end
 let implementation ppf fname outputprefix =
-  Compmisc.init_path false;
-  Pparse_driver.parse_implementation ~tool_name:Js_config.tool_name ppf fname
+  Compmisc.init_path false;  
+  Pparse_driver.parse_implementation  ppf fname
+  |> Cmd_ppx_apply.apply_rewriters ~restore:false ~tool_name:Js_config.tool_name Ml  
   |> Ppx_entry.rewrite_implementation
   |> print_if_pipe ppf Clflags.dump_parsetree Printast.implementation
   |> print_if_pipe ppf Clflags.dump_source Pprintast.structure

jscomp/core/pparse_driver.ml

@@ -73,7 +73,7 @@ let file_aux ppf  inputfile (type a) (parse_fun  : _ -> a)
 
 
 
-let parse_file kind ppf sourcefile =
+let parse_file (type a) (kind  : a Ml_binary.kind) (ppf : Format.formatter) (sourcefile : string) : a =
   Location.set_input_name  sourcefile;
   let inputfile = preprocess sourcefile in
   let ast =
@@ -88,9 +88,9 @@ let parse_file kind ppf sourcefile =
 
 
 
-let parse_implementation ppf ~tool_name sourcefile =  
-  Cmd_ppx_apply.apply_rewriters ~restore:false ~tool_name Ml  (parse_file 
+let parse_implementation ppf  sourcefile =  
+  (parse_file 
        Ml ppf sourcefile)
-let parse_interface ppf ~tool_name sourcefile =
-  Cmd_ppx_apply.apply_rewriters ~restore:false ~tool_name Mli (parse_file 
-       Mli ppf sourcefile)
+
+let parse_interface ppf  sourcefile =
+  parse_file Mli ppf sourcefile

jscomp/core/pparse_driver.mli

@@ -2,11 +2,10 @@
 
 val parse_implementation:
   Format.formatter ->
-  tool_name:string ->    
   string -> Parsetree.structure
 
 
 val parse_interface:   
   Format.formatter ->
-  tool_name:string ->    
+
   string -> Parsetree.signature