make parser pluggable

Author: bobzhang

jscomp/core/js_implementation.ml

@@ -101,9 +101,9 @@ let after_parsing_sig ppf  outputprefix ast  =
 
 
 
-let interface ppf fname outputprefix =
+let interface ~parser ppf fname outputprefix =
   Compmisc.init_path false;
-  Pparse_driver.parse_interface  ppf fname
+  parser 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
@@ -200,9 +200,9 @@ let after_parsing_impl ppf  outputprefix (ast : Parsetree.structure) =
       end;
       process_with_gentype (outputprefix ^ ".cmt")        
     end
-let implementation ppf fname outputprefix =
+let implementation ~parser ppf fname outputprefix  =
   Compmisc.init_path false;  
-  Pparse_driver.parse_implementation  ppf fname
+  parser 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

jscomp/core/js_implementation.mli

@@ -35,7 +35,12 @@
     given [filename] and [outputprefix], 
     it will be useful if we don't care about bytecode output(generating js only).
  *)
-val interface : Format.formatter -> string -> string -> unit
+val interface : 
+  parser:(Format.formatter -> string -> Parsetree.signature) ->
+  Format.formatter -> 
+  string -> 
+  string -> 
+  unit
 
 val interface_mliast : Format.formatter -> string -> string  -> unit
 
@@ -51,7 +56,12 @@ val interface_mliast : Format.formatter -> string -> string  -> unit
     Used in eval
 *)
 
-val implementation : Format.formatter -> string -> string -> unit
+val implementation : 
+  parser:(Format.formatter -> string -> Parsetree.structure) ->
+  Format.formatter -> 
+  string -> 
+  string -> 
+  unit
 (** [implementation ppf sourcefile outprefix] compiles to JS directly *) 
 
 val implementation_mlast : Format.formatter -> string -> string -> unit

jscomp/core/pparse_driver.ml

@@ -22,9 +22,8 @@ let preprocess sourcefile =
 
 
 let remove_preprocessed inputfile =
-  match !Clflags.preprocessor with
-    None -> ()
-  | Some _ -> Misc.remove_file inputfile
+  if !Clflags.preprocessor <> None then  
+    Misc.remove_file inputfile
 
 
 
@@ -89,8 +88,7 @@ let parse_file (type a) (kind  : a Ml_binary.kind) (ppf : Format.formatter) (sou
 
 
 let parse_implementation ppf  sourcefile =  
-  (parse_file 
-       Ml ppf sourcefile)
+  parse_file Ml ppf sourcefile
 
 let parse_interface ppf  sourcefile =
   parse_file Mli ppf sourcefile

jscomp/main/js_main.ml

@@ -12,15 +12,17 @@
 
 
 let process_interface_file ppf name =
-  Js_implementation.interface ppf name (Compenv.output_prefix name)
+  Js_implementation.interface ppf name 
+  ~parser:Pparse_driver.parse_interface
+  (Compenv.output_prefix name)
 let process_implementation_file ppf name =
-  Js_implementation.implementation ppf name (Compenv.output_prefix name)
+  Js_implementation.implementation ppf name 
+  ~parser:Pparse_driver.parse_implementation
+  (Compenv.output_prefix name)
 
 
 let setup_reason_context () = 
   Js_config.is_reason := true;
-  Clflags.preprocessor := None ; 
-  (* FIX #3988 - Don't run pp-flags on Reason files to make napkin easier*)
   Lazy.force Super_main.setup;  
   Lazy.force Reason_outcome_printer_main.setup
 
@@ -81,12 +83,24 @@ let process_file ppf sourcefile =
   | Re ->     
     setup_reason_context ();
     let tmpfile = reason_pp ~sourcefile in 
-    Js_implementation.implementation ppf tmpfile opref ;  
+    Js_implementation.implementation 
+      ~parser:(fun _ file_in -> 
+          let in_chan = open_in_bin file_in in   
+          let ast = Ml_binary.read_ast Ml in_chan in 
+          close_in in_chan; ast 
+        )
+      ppf tmpfile opref ;  
     Ast_reason_pp.clean tmpfile
   | Rei ->
     setup_reason_context ();
-    let tmpfile = (reason_pp ~sourcefile) in 
-    Js_implementation.interface ppf  tmpfile opref ;
+    let tmpfile = reason_pp ~sourcefile in 
+    Js_implementation.interface 
+      ~parser:(fun _ file_in -> 
+          let in_chan = open_in_bin file_in in 
+          let ast = Ml_binary.read_ast Mli in_chan in 
+          close_in in_chan; ast 
+        )
+      ppf  tmpfile opref ;    
     Ast_reason_pp.clean tmpfile
   | Reiast 
     -> 
@@ -97,9 +111,13 @@ let process_file ppf sourcefile =
     setup_reason_context ();
     Js_implementation.implementation_mlast ppf sourcefile opref
   | Ml ->
-    Js_implementation.implementation ppf sourcefile opref 
+    Js_implementation.implementation 
+    ~parser:Pparse_driver.parse_implementation
+    ppf sourcefile opref 
   | Mli  ->   
-    Js_implementation.interface ppf sourcefile opref   
+    Js_implementation.interface 
+    ~parser:Pparse_driver.parse_interface
+    ppf sourcefile opref   
   | Mliast 
     -> Js_implementation.interface_mliast ppf sourcefile opref 
   | Mlast