Remove .ml support from the compiler and clean up.

Author: cristianoc

jscomp/bsc/rescript_compiler_main.ml

@@ -18,18 +18,8 @@ let set_abs_input_name sourcefile =
     else sourcefile in 
   Location.set_input_name sourcefile;
   sourcefile  
-
-type syntax_kind = [`ml | `rescript]
-let setup_compiler_printer (syntax_kind : [ syntax_kind | `default])= 
-  (match syntax_kind with 
-   | `default -> ()  
-   | #syntax_kind as k -> Config.syntax_kind := k);   
-  let syntax_kind = !Config.syntax_kind in
-  if syntax_kind = `rescript then begin
-    Lazy.force Res_outcome_printer.setup  
-  end  
-
-
+let setup_outcome_printer () =
+  Lazy.force Res_outcome_printer.setup  
 
 let setup_runtime_path path = 
   let u0 = Filename.dirname path in 
@@ -51,53 +41,37 @@ let process_file sourcefile ?(kind ) ppf =
      properly
   *)
   let uncurried = !Config.uncurried in
+  setup_outcome_printer ();
   let kind =
     match kind with 
     | None -> Ext_file_extensions.classify_input (Ext_filename.get_extension_maybe sourcefile)  
     | Some kind -> kind in 
   let res = match kind with 
-  | Ml ->
-    let sourcefile = set_abs_input_name  sourcefile in     
-    setup_compiler_printer `ml;
-    Js_implementation.implementation 
-      ~parser:Pparse_driver.parse_implementation
-      ppf sourcefile 
-  | Mli  ->   
-    let sourcefile = set_abs_input_name  sourcefile in   
-    setup_compiler_printer `ml;
-    Js_implementation.interface 
-      ~parser:Pparse_driver.parse_interface
-      ppf sourcefile 
   | Res -> 
     let sourcefile = set_abs_input_name  sourcefile in     
-    setup_compiler_printer `rescript;
     Js_implementation.implementation 
       ~parser:(Res_driver.parse_implementation ~ignore_parse_errors:!Clflags.ignore_parse_errors)
       ppf sourcefile 
   | Resi ->   
     let sourcefile = set_abs_input_name  sourcefile in 
-    setup_compiler_printer `rescript;
     Js_implementation.interface 
       ~parser:(Res_driver.parse_interface ~ignore_parse_errors:!Clflags.ignore_parse_errors)
       ppf sourcefile      
   | Intf_ast 
     ->     
     Js_implementation.interface_mliast ppf sourcefile
-      setup_compiler_printer 
   (* The printer setup is done in the runtime depends on
      the content of ast
   *)  
   | Impl_ast 
     -> 
-    Js_implementation.implementation_mlast ppf sourcefile 
-      setup_compiler_printer
+    Js_implementation.implementation_mlast ppf sourcefile
   | Mlmap 
     -> 
     Location.set_input_name  sourcefile;    
     Js_implementation.implementation_map ppf sourcefile 
   | Cmi
     ->
-    setup_compiler_printer `default;
     let cmi_sign = (Cmi_format.read_cmi sourcefile).cmi_sign in 
     Printtyp.signature Format.std_formatter cmi_sign ; 
     Format.pp_print_newline Format.std_formatter ()      
@@ -182,22 +156,12 @@ let anonymous ~(rev_args : string list) =
           Bsc_args.bad_arg "can not handle multiple files"
     end
 
-(** used by -impl -intf *)
-let impl filename =
-  Js_config.js_stdout := false;  
-  process_file filename ~kind:Ml ppf ;;
-let intf filename =
-  Js_config.js_stdout := false ;  
-  process_file filename ~kind:Mli ppf;;
-
-
 let format_file input =  
   let ext = Ext_file_extensions.classify_input (Ext_filename.get_extension_maybe input) in 
-  let syntax = 
-    match ext with 
-    | Res | Resi -> `res 
-    | _ -> Bsc_args.bad_arg ("don't know what to do with " ^ input) in   
-  let formatted = Res_multi_printer.print ~ignore_parse_errors:!Clflags.ignore_parse_errors syntax ~input in 
+  ( match ext with 
+    | Res | Resi -> ()
+    | _ -> Bsc_args.bad_arg ("don't know what to do with " ^ input) ); 
+  let formatted = Res_multi_printer.print ~ignore_parse_errors:!Clflags.ignore_parse_errors input in 
   match !Clflags.output_name with 
   | None ->
     output_string stdout formatted
@@ -407,12 +371,6 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
     "-bs-loc", set Clflags.dump_location, 
     "*internal*  dont display location with -dtypedtree, -dparsetree";
 
-    "-impl",  string_call impl,
-    "*internal* <file>  Compile <file> as a .ml file";
-
-    "-intf", string_call intf,
-    "*internal* <file>  Compile <file> as a .mli file";
-
     "-dtypedtree", set Clflags.dump_typedtree, 
     "*internal* debug typedtree";
 

jscomp/core/bs_conditional_initial.ml

@@ -32,7 +32,6 @@ let setup_env () =
   Matching.call_switcher_variant_constr := Polyvar_pattern_match.call_switcher_variant_constr;
   Ctype.variant_is_subtype := Matching_polyfill.variant_is_subtype;
   Clflags.dump_location := false;  
-  Config.syntax_kind := `rescript;
   Parmatch.print_res_pat := Pattern_printer.print_pattern;
   (* default true
      otherwise [bsc -I sc src/hello.ml ] will include current directory to search path

jscomp/core/js_implementation.ml

@@ -96,9 +96,9 @@ let interface ~parser ppf ?outputprefix fname =
   |> print_if_pipe ppf Clflags.dump_source Pprintast.signature
   |> after_parsing_sig ppf outputprefix
 
-let interface_mliast ppf fname setup =
+let interface_mliast ppf fname =
   Res_compmisc.init_path ();
-  Binary_ast.read_ast_exn ~fname Mli setup
+  Binary_ast.read_ast_exn ~fname Mli
   |> print_if_pipe ppf Clflags.dump_parsetree Printast.interface
   |> print_if_pipe ppf Clflags.dump_source Pprintast.signature
   |> after_parsing_sig ppf (Config_util.output_prefix fname)
@@ -187,9 +187,9 @@ let implementation ~parser ppf ?outputprefix fname =
   |> print_if_pipe ppf Clflags.dump_source Pprintast.structure
   |> after_parsing_impl ppf outputprefix
 
-let implementation_mlast ppf fname setup =
+let implementation_mlast ppf fname =
   Res_compmisc.init_path ();
-  Binary_ast.read_ast_exn ~fname Ml setup
+  Binary_ast.read_ast_exn ~fname Ml
   |> print_if_pipe ppf Clflags.dump_parsetree Printast.implementation
   |> print_if_pipe ppf Clflags.dump_source Pprintast.structure
   |> after_parsing_impl ppf (Config_util.output_prefix fname)

jscomp/core/js_implementation.mli

@@ -36,7 +36,7 @@ val interface :
 *)
 
 val interface_mliast :
-  Format.formatter -> string -> ([ `ml | `rescript | `default ] -> unit) -> unit
+  Format.formatter -> string -> unit
 
 (* val after_parsing_impl :
    Format.formatter ->
@@ -57,6 +57,6 @@ val implementation :
 (** [implementation ppf sourcefile outprefix] compiles to JS directly *)
 
 val implementation_mlast :
-  Format.formatter -> string -> ([ `ml | `rescript | `default ] -> unit) -> unit
+  Format.formatter -> string -> unit
 
 val implementation_map : Format.formatter -> string -> unit

jscomp/core/pparse_driver.ml

@@ -29,20 +29,14 @@ type 'a kind = 'a Ml_binary.kind =
   | Ml : Parsetree.structure kind
   | Mli : Parsetree.signature kind
 
-let read_ast_exn (type t) ~fname (_ : t kind) setup : t =
+let read_ast_exn (type t) ~fname (_ : t kind) : t =
   let ic = open_in_bin fname in
   let dep_size = input_binary_int ic in
   seek_in ic (pos_in ic + dep_size);
   let sourcefile = input_line ic in
   Location.set_input_name sourcefile;
   let ast = input_value ic in
   close_in ic;
-  (match
-     Ext_file_extensions.classify_input
-       (Ext_filename.get_extension_maybe sourcefile)
-   with
-  | Res | Resi -> setup `rescript
-  | _ -> ());
   ast
 
 let magic_sep_char = '\n'

jscomp/core/pparse_driver.mli

@@ -25,7 +25,7 @@
 type _ kind = Ml : Parsetree.structure kind | Mli : Parsetree.signature kind
 
 val read_ast_exn :
-  fname:string -> 'a kind -> ([ `ml | `rescript | `default ] -> unit) -> 'a
+  fname:string -> 'a kind -> 'a
 
 val magic_sep_char : char
 

jscomp/depends/binary_ast.ml

@@ -1,6 +1,4 @@
 type valid_input =
-  | Ml
-  | Mli
   | Res
   | Resi
   | Intf_ast
@@ -16,8 +14,6 @@ type valid_input =
 
 let classify_input ext =
   match () with
-  | _ when ext = Literals.suffix_ml -> Ml
-  | _ when ext = Literals.suffix_mli -> Mli
   | _ when ext = Literals.suffix_ast -> Impl_ast
   | _ when ext = Literals.suffix_iast -> Intf_ast
   | _ when ext = Literals.suffix_mlmap -> Mlmap

jscomp/depends/binary_ast.mli

@@ -367,13 +367,8 @@ let message = function
       "this statement never returns (or has an unsound type.)"
   | Preprocessor s -> s
   | Useless_record_with -> (
-      match !Config.syntax_kind with
-      | `ml ->
-          "all the fields are explicitly listed in this record:\n\
-           the 'with' clause is useless."
-      | `rescript ->
-          "All the fields are already explicitly listed in this record. You \
-           can remove the `...` spread.")
+      "All the fields are already explicitly listed in this record. You \
+        can remove the `...` spread.")
   | Bad_module_name modname ->
       "This file's name is potentially invalid. The build systems \
        conventionally turn a file name into a module name by upper-casing the \

jscomp/ext/ext_file_extensions.ml

@@ -84,8 +84,7 @@ let emit_external_warnings : iterator =
         match str_item.pstr_desc with
         | Pstr_type
             ( Nonrecursive,
-              [{ptype_kind = Ptype_variant ({pcd_res = Some _} :: _)}] )
-          when !Config.syntax_kind = `rescript ->
+              [{ptype_kind = Ptype_variant ({pcd_res = Some _} :: _)}] ) ->
           Location.raise_errorf ~loc:str_item.pstr_loc
             "GADT has to be recursive types, please try `type rec'"
         | Pstr_class _ ->

jscomp/ext/warnings.ml

@@ -785,7 +785,7 @@ let report_error env ppf = function
     (* modified *)
     Format.fprintf ppf "@[<v>This type constructor, `%a`, can't be found.@ "  Printtyp.longident lid;
     let has_candidate = super_spellcheck ppf Env.fold_types env lid in
-    if !Config.syntax_kind = `rescript && not has_candidate then 
+    if not has_candidate then 
       Format.fprintf ppf "If you wanted to write a recursive type, don't forget the `rec` in `type rec`@]"
   | Unbound_type_constructor_2 p ->
     fprintf ppf "The type constructor@ %a@ is not yet completely defined"

jscomp/frontend/bs_ast_invariant.ml

@@ -88,13 +88,12 @@ let print_res ~ignore_parse_errors ~is_interface ~filename =
 [@@raises exit]
 
 (* print the given file named input to from "language" to res, general interface exposed by the compiler *)
-let print ?(ignore_parse_errors = false) language ~input =
+let print ?(ignore_parse_errors = false) input =
   let is_interface =
     let len = String.length input in
     len > 0 && String.unsafe_get input (len - 1) = 'i'
   in
-  match language with
-  | `res -> print_res ~ignore_parse_errors ~is_interface ~filename:input
+  print_res ~ignore_parse_errors ~is_interface ~filename:input
 [@@raises exit]
 
 (* suppress unused optional arg *)

jscomp/ml/typetexp.ml

@@ -1,3 +1,3 @@
-(* Interface to print source code from different languages to res.
+(* Interface to print source code to res.
  * Takes a filename called "input" and returns the corresponding formatted res syntax *)
-val print : ?ignore_parse_errors:bool -> [`res] -> input:string -> string
+val print : ?ignore_parse_errors:bool -> string -> string

jscomp/syntax/src/res_multi_printer.ml

@@ -5,7 +5,7 @@ let data_dir = "jscomp/syntax/tests"
 (* test printing of .res file*)
 let () =
   let filename = Filename.concat data_dir "api/resSyntax.res" in
-  let pretty_source = Res_multi_printer.print `res ~input:filename in
+  let pretty_source = Res_multi_printer.print filename in
   assert (
     pretty_source
     = {|// test file
@@ -20,7 +20,7 @@ if true {
 (* test printing of .resi file*)
 let () =
   let filename = Filename.concat data_dir "api/resiSyntax.resi" in
-  let pretty_source = Res_multi_printer.print `res ~input:filename in
+  let pretty_source = Res_multi_printer.print filename in
   assert (pretty_source = {|// test interface file
 
 let x: int