Format from / to all supported syntaxes (rescript-lang#86)

* add an option to `-format`

* format from/to multiple syntaxes

* better interface

Author: anmonteiro

jscomp/common/js_config.ml

@@ -38,7 +38,7 @@ let cross_module_inline = ref false
 
 
 let diagnose = ref false
-let get_diagnose () = 
+let get_diagnose () =
     !diagnose
 #if undefined BS_RELEASE_BUILD then
   || Sys.getenv_opt "RES_DEBUG_FILE" <> None
@@ -67,7 +67,7 @@ let binary_ast = ref false
 
 let debug = ref false
 
-let cmi_only = ref false  
+let cmi_only = ref false
 let cmj_only = ref false
 
 let force_cmi = ref false
@@ -86,10 +86,10 @@ let no_stdlib = ref false
 
 let no_export = ref false
 
-
+let format = ref None
 
 let as_ppx = ref false
 
 let mono_empty_array = ref true
 
-let customize_runtime = ref None 
+let customize_runtime = ref None

jscomp/common/js_config.mli

@@ -1,5 +1,5 @@
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -17,7 +17,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
@@ -31,41 +31,41 @@
 
 
 (** set/get header *)
-val no_version_header : bool ref 
+val no_version_header : bool ref
 
 
-(** return [package_name] and [path] 
-    when in script mode: 
+(** return [package_name] and [path]
+    when in script mode:
 *)
 
-(* val get_current_package_name_and_path : 
-  Js_packages_info.module_system -> 
+(* val get_current_package_name_and_path :
+  Js_packages_info.module_system ->
   Js_packages_info.info_query *)
 
 
-(* val set_package_name : string -> unit  
+(* val set_package_name : string -> unit
 val get_package_name : unit -> string option *)
 
 (** cross module inline option *)
 val cross_module_inline : bool ref
-  
+
 (** diagnose option *)
-val diagnose : bool ref 
-val get_diagnose : unit -> bool 
+val diagnose : bool ref
+val get_diagnose : unit -> bool
 (* val set_diagnose : bool -> unit  *)
 
 
 (** options for builtin ppx *)
-val no_builtin_ppx : bool ref 
+val no_builtin_ppx : bool ref
 
 
 
 
 
 
 (** check-div-by-zero option *)
-val check_div_by_zero : bool ref 
-val get_check_div_by_zero : unit -> bool 
+val check_div_by_zero : bool ref
+val get_check_div_by_zero : unit -> bool
 
 
 
@@ -81,23 +81,24 @@ val binary_ast : bool ref
 val debug : bool ref
 
 val cmi_only  : bool ref
-val cmj_only : bool ref 
+val cmj_only : bool ref
 (* stopped after generating cmj *)
-val force_cmi : bool ref 
+val force_cmi : bool ref
 val force_cmj : bool ref
 
 val jsx_version : int ref
 val refmt : string option ref
 
 
-val js_stdout : bool ref 
+val js_stdout : bool ref
 
-val all_module_aliases : bool ref 
+val all_module_aliases : bool ref
 
 val no_stdlib: bool ref
 val no_export: bool ref
 
-val as_ppx : bool ref 
+val format : Ext_file_extensions.syntax_kind option ref
+val as_ppx : bool ref
 
 val mono_empty_array : bool ref
-val customize_runtime : string option ref 
+val customize_runtime : string option ref

jscomp/ext/ext_file_extensions.ml

@@ -1,5 +1,10 @@
-type valid_input = 
-  | Ml 
+type syntax_kind =
+  | Ml
+  | Reason
+  | Res
+
+type valid_input =
+  | Ml
   | Mli
   | Re
   | Rei
@@ -12,32 +17,32 @@ type valid_input =
   | Unknown
 
 
-(** This is per-file based, 
-    when [ocamlc] [-c -o another_dir/xx.cmi] 
+(** This is per-file based,
+    when [ocamlc] [-c -o another_dir/xx.cmi]
     it will return (another_dir/xx)
-*)    
+*)
 
-let classify_input ext = 
+let classify_input ext =
 
-  match () with 
-  | _ when ext = Literals.suffix_ml ->   
+  match () with
+  | _ when ext = Literals.suffix_ml ->
     Ml
   | _ when ext = Literals.suffix_re ->
     Re
   | _ when ext = !Config.interface_suffix ->
-    Mli  
+    Mli
   | _ when ext = Literals.suffix_rei ->
     Rei
   | _ when ext =  Literals.suffix_ast ->
-    Impl_ast 
+    Impl_ast
   | _ when ext = Literals.suffix_iast ->
     Intf_ast
   | _ when ext =  Literals.suffix_mlmap ->
-    Mlmap 
+    Mlmap
   | _ when ext =  Literals.suffix_cmi ->
     Cmi
-  | _ when ext = Literals.suffix_res -> 
+  | _ when ext = Literals.suffix_res ->
     Res
-  | _ when ext = Literals.suffix_resi -> 
-    Resi    
-  | _ -> Unknown  
+  | _ when ext = Literals.suffix_resi ->
+    Resi
+  | _ -> Unknown

jscomp/frontend/ast_reason_pp.ml

@@ -26,8 +26,7 @@
 
 exception Pp_error
 
- module RE = Reason_toolchain.RE
-
+module Make(T: Reason_toolchain_conf.Toolchain) = struct
  let setup_lexbuf ~parser filename =
   try
    let file_chan = open_in filename in
@@ -38,12 +37,14 @@ exception Pp_error
   with
   | Reason_errors.Reason_error _ as rexn ->
     raise rexn
-  | _ ->
-      raise Pp_error
+  | Sys_error _ as exn ->
+    (* file doesn't exist *)
+    raise exn
+  | _ -> raise Pp_error
 
  let parse_implementation filename =
    let omp_ast = setup_lexbuf
-     ~parser:RE.implementation
+     ~parser:T.implementation
      filename
    in
    let omp_ast =
@@ -53,11 +54,36 @@ exception Pp_error
 
  let parse_interface filename =
    let omp_ast = setup_lexbuf
-     ~parser:RE.interface
+     ~parser:T.interface
      filename
    in
    Reason_toolchain.To_current.copy_signature omp_ast
 
+ let parse_implementation_with_comments filename =
+   let omp_ast, comments = setup_lexbuf
+     ~parser:T.implementation_with_comments
+     filename
+   in
+   let omp_ast =
+     Reason_syntax_util.(apply_mapper_to_structure omp_ast (backport_letopt_mapper remove_stylistic_attrs_mapper))
+   in
+   Reason_toolchain.To_current.copy_structure omp_ast, comments
+
+ let parse_interface_with_comments filename =
+   let omp_ast, comments = setup_lexbuf
+     ~parser:T.interface_with_comments
+     filename
+   in
+   Reason_toolchain.To_current.copy_signature omp_ast, comments
+
+ let format_implementation_with_comments fmt ~comments ast =
+  let ast = Reason_toolchain.From_current.copy_structure ast in
+  T.print_implementation_with_comments fmt (ast, comments)
+
+ let format_interface_with_comments fmt ~comments ast =
+  let ast = Reason_toolchain.From_current.copy_signature ast in
+  T.print_interface_with_comments fmt (ast, comments)
+
  let format ~parser ~printer filename =
    let parse_result = setup_lexbuf ~parser filename in
    let buf = Buffer.create 0x1000 in
@@ -67,15 +93,19 @@ exception Pp_error
 
  let format_implementation filename =
    format
-     ~parser:RE.implementation_with_comments
-     ~printer:RE.print_implementation_with_comments
+     ~parser:T.implementation_with_comments
+     ~printer:T.print_implementation_with_comments
      filename
 
  let format_interface filename =
    format
-     ~parser:RE.interface_with_comments
-     ~printer:RE.print_interface_with_comments
+     ~parser:T.interface_with_comments
+     ~printer:T.print_interface_with_comments
      filename
+end
+
+ module RE = Make(Reason_toolchain.RE)
+ module ML = Make(Reason_toolchain.ML)
 
 let clean tmpfile =
   (if not !Clflags.verbose then try Sys.remove tmpfile with _ -> () )

jscomp/frontend/ast_reason_pp.mli

@@ -25,10 +25,27 @@
 
 exception Pp_error
 
-val parse_implementation : string -> Parsetree.structure
-val parse_interface : string -> Parsetree.signature
-val format_implementation : string -> string
-val format_interface : string -> string
+module ML : sig
+  val parse_implementation : string -> Parsetree.structure
+  val parse_interface : string -> Parsetree.signature
+  val parse_implementation_with_comments : string -> Parsetree.structure * Reason_comment.t list
+  val parse_interface_with_comments : string -> Parsetree.signature * Reason_comment.t list
+  val format_implementation_with_comments : Format.formatter -> comments:Reason_comment.t list -> Parsetree.structure -> unit
+  val format_interface_with_comments : Format.formatter -> comments:Reason_comment.t list -> Parsetree.signature -> unit
+  val format_implementation : string -> string
+  val format_interface : string -> string
+end
+
+module RE : sig
+  val parse_implementation : string -> Parsetree.structure
+  val parse_interface : string -> Parsetree.signature
+  val parse_implementation_with_comments : string -> Parsetree.structure * Reason_comment.t list
+  val parse_interface_with_comments : string -> Parsetree.signature * Reason_comment.t list
+  val format_implementation_with_comments : Format.formatter -> comments:Reason_comment.t list -> Parsetree.structure -> unit
+  val format_interface_with_comments : Format.formatter -> comments:Reason_comment.t list -> Parsetree.signature -> unit
+  val format_implementation : string -> string
+  val format_interface : string -> string
+end
 
 val clean:
   string ->