Remove suffix_ml* and dependencies.

Author: cristianoc

jscomp/bsb/bsb_db_util.ml

@@ -39,13 +39,12 @@ let sanity_check (map : t) =
 (* invariant check:
    ml and mli should have the same case, same path
 *)
-let check (x : module_info) name_sans_extension case syntax_kind
+let check (x : module_info) name_sans_extension case
     (module_info : Bsb_db.info) =
   let x_ml_info = x.info in
   if
     x.name_sans_extension <> name_sans_extension
     || x.case <> case
-    || x.syntax_kind <> syntax_kind
     || x_ml_info = module_info || x_ml_info = Impl_intf
   then
     Bsb_exception.invalid_spec
@@ -75,19 +74,14 @@ let add_basename ~(dir : string) (map : t) ?error_on_invalid_suffix basename : t
   if is_editor_temporary_files basename then map
   else
     let info = ref Bsb_db.Impl in
-    let syntax_kind = ref Bsb_db.Ml in
     let invalid_suffix = ref false in
     let file_suffix = Ext_filename.get_extension_maybe basename in
     (match () with
-    | _ when file_suffix = Literals.suffix_ml -> ()
-    | _ when file_suffix = Literals.suffix_res -> syntax_kind := Res
-    | _ when file_suffix = Literals.suffix_mli -> info := Intf
+    | _ when file_suffix = Literals.suffix_res -> ()
     | _ when file_suffix = Literals.suffix_resi ->
-        info := Intf;
-        syntax_kind := Res
+        info := Intf
     | _ -> invalid_suffix := true);
     let info = !info in
-    let syntax_kind = !syntax_kind in
     let invalid_suffix = !invalid_suffix in
     if invalid_suffix then
       match error_on_invalid_suffix with
@@ -105,5 +99,5 @@ let add_basename ~(dir : string) (map : t) ?error_on_invalid_suffix basename : t
           let dir = Filename.dirname name_sans_extension in
           Map_string.adjust map module_name (fun opt_module_info ->
               match opt_module_info with
-              | None -> { dir; name_sans_extension; info; syntax_kind; case }
-              | Some x -> check x name_sans_extension case syntax_kind info)
+              | None -> { dir; name_sans_extension; info; case }
+              | Some x -> check x name_sans_extension case info)

jscomp/bsb/bsb_ninja_file_groups.ml

@@ -40,20 +40,13 @@ let handle_generators oc (group : Bsb_file_groups.file_group) custom_rules =
 
 type suffixes = { impl : string; intf : string }
 
-let ml_suffixes = { impl = Literals.suffix_ml; intf = Literals.suffix_mli }
-
 let res_suffixes = { impl = Literals.suffix_res; intf = Literals.suffix_resi }
 
 let emit_module_build (rules : Bsb_ninja_rule.builtin)
     (package_specs : Bsb_package_specs.t) (is_dev : bool) oc namespace
     (module_info : Bsb_db.module_info) : unit =
   let has_intf_file = module_info.info = Impl_intf in
-  let config, ast_rule =
-    match module_info.syntax_kind with
-    | Ml -> (ml_suffixes, rules.build_ast)
-    | Res -> (res_suffixes, rules.build_ast_from_re)
-    (* FIXME: better names *)
-  in
+  let config, ast_rule = (res_suffixes, rules.build_ast_from_re) in
   let filename_sans_extension = module_info.name_sans_extension in
   let input_impl =
     Bsb_config.proj_rel (filename_sans_extension ^ config.impl)

jscomp/bsb/bsb_ninja_gen.ml

@@ -94,7 +94,7 @@ let output_installation_file cwd_lib_bs namespace files_to_install =
   let essentials = Ext_buffer.create 1_000 in
   files_to_install
   |> Queue.iter
-       (fun ({ name_sans_extension; syntax_kind; info } : Bsb_db.module_info) ->
+       (fun ({ name_sans_extension; info } : Bsb_db.module_info) ->
          let base = Filename.basename name_sans_extension in
          let dest = Ext_namespace_encode.make ?ns:namespace base in
          let ns_origin =
@@ -110,22 +110,14 @@ let output_installation_file cwd_lib_bs namespace files_to_install =
          Ext_buffer.add_string essentials dest;
          Ext_buffer.add_string_char essentials Literals.suffix_cmj ' ';
 
-         let suffix =
-           match syntax_kind with
-           | Ml -> Literals.suffix_ml
-           | Res -> Literals.suffix_res
-         in
-         oo suffix ~dest:base ~src:(sb // name_sans_extension);
+         let suffix_impl = Literals.suffix_res in
+         oo suffix_impl ~dest:base ~src:(sb // name_sans_extension);
          match info with
          | Intf -> assert false
          | Impl -> ()
          | Impl_intf ->
-             let suffix_b =
-               match syntax_kind with
-               | Ml -> Literals.suffix_mli
-               | Res -> Literals.suffix_resi
-             in
-             oo suffix_b ~dest:base ~src:(sb // name_sans_extension);
+             let suffix_intf = Literals.suffix_resi in
+             oo suffix_intf ~dest:base ~src:(sb // name_sans_extension);
              oo Literals.suffix_cmti ~dest ~src);
   (match namespace with
   | None -> ()

jscomp/bsb/bsb_ninja_rule.ml

@@ -67,7 +67,6 @@ let define ~command ?dyndep ?restat rule_name : t =
 type command = string
 
 type builtin = {
-  build_ast : t;  (** TODO: Implement it on top of pp_flags *)
   build_ast_from_re : t;
   (* build_ast_from_rei : t ; *)
   (* platform dependent, on Win32,
@@ -179,7 +178,6 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
     Ext_buffer.add_string buf " -absname -bs-ast -o $out $i";
     Ext_buffer.contents buf
   in
-  let build_ast = define ~command:mk_ast "ast" in
   let build_ast_from_re = define ~command:mk_ast "astj" in
 
   let copy_resources =
@@ -223,7 +221,6 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
       ~restat:() "build_package"
   in
   {
-    build_ast;
     build_ast_from_re;
     (* platform dependent, on Win32,
         invoking cmd.exe

jscomp/bsb/bsb_ninja_rule.mli

@@ -32,7 +32,6 @@ val get_name : t -> out_channel -> string
 (***********************************************************)
 
 type builtin = {
-  build_ast : t;
   build_ast_from_re : t;
   (* platform dependent, on Win32,
       invoking cmd.exe

jscomp/bsb_exe/rescript_main.ml

@@ -197,14 +197,12 @@ let info_subcommand ~start argv =
         | Some { file_groups = { files } } ->
             Ext_list.iter files (fun { sources } ->
                 Map_string.iter sources
-                  (fun _ { info; syntax_kind; name_sans_extension } ->
+                  (fun _ { info; name_sans_extension } ->
                     let extensions =
-                      match (syntax_kind, info) with
-                      | _, Intf -> assert false
-                      | Ml, Impl -> [ ".ml" ]
-                      | Ml, Impl_intf -> [ ".ml"; ".mli" ]
-                      | Res, Impl -> [ ".res" ]
-                      | Res, Impl_intf -> [ ".res"; ".resi" ]
+                      match info with
+                      | Intf -> assert false
+                      | Impl -> [ ".res" ]
+                      | Impl_intf -> [ ".res"; ".resi" ]
                     in
                     Ext_list.iter extensions (fun x ->
                         print_endline (name_sans_extension ^ x)))))

jscomp/ext/bsb_db.ml

@@ -31,12 +31,10 @@ type info =
   | Impl
   | Impl_intf
 
-type syntax_kind = Ml | Res
 
 type module_info = {
   mutable info : info;
   dir : string;
-  syntax_kind : syntax_kind;
   case : bool;
   name_sans_extension : string;
 }

jscomp/ext/bsb_db.mli

@@ -37,16 +37,10 @@ type info =
   | Impl
   | Impl_intf
 
-type syntax_kind = Ml | Res
 
 type module_info = {
   mutable info : info;
   dir : string;
-  syntax_kind : syntax_kind;
-  (* This is actually not stored in bsbuild meta info
-     since creating .d file only emit .cmj/.cmi dependencies, so it does not
-     need know which syntax it is written
-  *)
   case : bool;
   name_sans_extension : string;
 }

jscomp/ext/literals.ml

@@ -99,10 +99,6 @@ let suffix_cmxa = ".cmxa"
 
 let suffix_mll = ".mll"
 
-let suffix_ml = ".ml"
-
-let suffix_mli = ".mli"
-
 let suffix_res = ".res"
 
 let suffix_resi = ".resi"

jscomp/ounit_tests/ounit_bsb_pkg_tests.ml

@@ -34,12 +34,12 @@ let s_test1 s a =
 
 let group0 = Map_string.of_list [
   "Liba", 
-  {Bsb_db.info = Impl_intf; dir= "a";syntax_kind=Ml;case = false;
+  {Bsb_db.info = Impl_intf; dir= "a";case = false;
   name_sans_extension = "liba"}
 ]
 let group1 =  Map_string.of_list [
   "Ciba", 
-  {Bsb_db.info = Impl_intf; dir= "b";syntax_kind=Ml;case = false;
+  {Bsb_db.info = Impl_intf; dir= "b";case = false;
   name_sans_extension = "liba"}
 ]