diff --git a/src/compilation_context.ml b/src/compilation_context.ml index 9f572dc4..d71550a8 100644 --- a/src/compilation_context.ml +++ b/src/compilation_context.ml @@ -106,7 +106,7 @@ let for_alias_module t = ; alias_module = None } -let for_deprecated t modules = +let for_wrapped_compat t modules = { t with flags = Ocaml_flags.default ~profile:(SC.profile t.super_context) ; includes = Includes.empty diff --git a/src/compilation_context.mli b/src/compilation_context.mli index a4bf2dc4..4460f90e 100644 --- a/src/compilation_context.mli +++ b/src/compilation_context.mli @@ -49,4 +49,4 @@ val preprocessing : t -> Preprocessing.t val no_keep_locs : t -> bool val opaque : t -> bool -val for_deprecated : t -> Module.t Module.Name.Map.t -> t +val for_wrapped_compat : t -> Module.t Module.Name.Map.t -> t diff --git a/src/dir_contents.ml b/src/dir_contents.ml index 3aaf9742..5401b8a3 100644 --- a/src/dir_contents.ml +++ b/src/dir_contents.ml @@ -168,7 +168,7 @@ module Library_modules : sig { modules : Module.t Module.Name.Map.t ; alias_module : Module.t option ; main_module_name : Module.Name.t - ; deprecated : Module.t Module.Name.Map.t + ; wrapped_compat : Module.t Module.Name.Map.t } val make : Library.t -> dir:Path.t -> Module.t Module.Name.Map.t -> t @@ -177,13 +177,13 @@ end = struct { modules : Module.t Module.Name.Map.t ; alias_module : Module.t option ; main_module_name : Module.Name.t - ; deprecated : Module.t Module.Name.Map.t + ; wrapped_compat : Module.t Module.Name.Map.t } let make (lib : Library.t) ~dir (modules : Module.t Module.Name.Map.t) = let main_module_name = Module.Name.of_string (Lib_name.Local.to_string lib.name) in - let (modules, deprecated) = + let (modules, wrapped_compat) = let wrap_modules modules = let open Module.Name.Infix in Module.Name.Map.map modules ~f:(fun (m : Module.t) -> @@ -223,7 +223,11 @@ end = struct (Path.relative dir (lib_name ^ ".ml-gen"))) ~obj_name:lib_name) in - { modules; alias_module; main_module_name; deprecated } + { modules + ; alias_module + ; main_module_name + ; wrapped_compat + } end module Executables_modules = struct diff --git a/src/dir_contents.mli b/src/dir_contents.mli index ca96ce43..3430d239 100644 --- a/src/dir_contents.mli +++ b/src/dir_contents.mli @@ -21,7 +21,7 @@ module Library_modules : sig { modules : Module.t Module.Name.Map.t ; alias_module : Module.t option ; main_module_name : Module.Name.t - ; deprecated : Module.t Module.Name.Map.t + ; wrapped_compat : Module.t Module.Name.Map.t } end diff --git a/src/install_rules.ml b/src/install_rules.ml index 31620633..d7cdf09e 100644 --- a/src/install_rules.ml +++ b/src/install_rules.ml @@ -138,7 +138,10 @@ module Gen(P : Params) = struct let if_ cond l = if cond then l else [] in let files = let modules = - let { Dir_contents.Library_modules.modules; alias_module; deprecated + let { Dir_contents.Library_modules. + modules + ; alias_module + ; wrapped_compat ; main_module_name = _ } = Dir_contents.modules_of_library dir_contents ~name:(Library.best_name lib) @@ -150,7 +153,7 @@ module Gen(P : Params) = struct in List.rev_append (Module.Name.Map.values modules) - (Module.Name.Map.values deprecated) + (Module.Name.Map.values wrapped_compat) in let virtual_library = Library.is_virtual lib in List.concat diff --git a/src/lib_rules.ml b/src/lib_rules.ml index 8f71bd7c..c35bfc44 100644 --- a/src/lib_rules.ml +++ b/src/lib_rules.ml @@ -120,19 +120,19 @@ module Gen (P : Install_rules.Params) = struct ~sandbox:alias_module_build_sandbox ~dep_graphs:(Ocamldep.Dep_graphs.dummy m) - let build_deprecated_modules (lib : Library.t) + let build_wrapped_compat_modules (lib : Library.t) cctx ~modules ~js_of_ocaml ~dynlink - ~(deprecated : Module.t Module.Name.Map.t) = + ~(wrapped_compat : Module.t Module.Name.Map.t) = let lib_name = String.capitalize (Lib_name.Local.to_string lib.name) in let transition_message = match lib.wrapped with | Simple _ -> "" (* will never be accessed anyway *) | Yes_with_transition r -> r in - Module.Name.Map.iteri deprecated ~f:(fun name m -> + Module.Name.Map.iteri wrapped_compat ~f:(fun name m -> let contents = let name = Module.Name.to_string name in let hidden_name = sprintf "%s__%s" lib_name name in @@ -146,8 +146,8 @@ module Gen (P : Install_rules.Params) = struct |> SC.add_rule sctx ); let dep_graphs = - Ocamldep.Dep_graphs.deprecated ~modules ~deprecated in - let cctx = Compilation_context.for_deprecated cctx deprecated in + Ocamldep.Dep_graphs.wrapped_compat ~modules ~wrapped_compat in + let cctx = Compilation_context.for_wrapped_compat cctx wrapped_compat in Module_compilation.build_modules cctx ~js_of_ocaml ~dynlink ~dep_graphs let build_c_file (lib : Library.t) ~scope ~dir ~includes (src, dst) = @@ -323,7 +323,7 @@ module Gen (P : Install_rules.Params) = struct in let flags = SC.ocaml_flags sctx ~scope ~dir lib.buildable in let { Dir_contents.Library_modules. - modules; main_module_name; alias_module ; deprecated } = + modules; main_module_name; alias_module ; wrapped_compat } = Dir_contents.modules_of_library dir_contents ~name:(Library.best_name lib) in let source_modules = modules in @@ -375,8 +375,8 @@ module Gen (P : Install_rules.Params) = struct in let js_of_ocaml = lib.buildable.js_of_ocaml in - build_deprecated_modules lib cctx ~dynlink ~js_of_ocaml - ~deprecated ~modules; + build_wrapped_compat_modules lib cctx ~dynlink ~js_of_ocaml + ~wrapped_compat ~modules; let dep_graphs = Ocamldep.rules cctx in @@ -396,7 +396,7 @@ module Gen (P : Install_rules.Params) = struct in List.iter Cm_kind.all ~f:(fun cm_kind -> let files = add_cms ~cm_kind ~init:Path.Set.empty modules in - let files = add_cms ~cm_kind ~init:files deprecated in + let files = add_cms ~cm_kind ~init:files wrapped_compat in SC.Libs.setup_file_deps_alias sctx ~dir lib ~ext:(Cm_kind.ext cm_kind) files); @@ -413,7 +413,7 @@ module Gen (P : Install_rules.Params) = struct else acc) in - let deprecated_modules = Module.Name.Map.values deprecated in + let deprecated_modules = Module.Name.Map.values wrapped_compat in (* deprecated modules have implementations so we can just append them *) let top_sorted_modules = Ocamldep.Dep_graph.top_closed_implementations dep_graphs.impl modules diff --git a/src/ocamldep.ml b/src/ocamldep.ml index 1a5d134d..268c75d7 100644 --- a/src/ocamldep.ml +++ b/src/ocamldep.ml @@ -52,14 +52,14 @@ module Dep_graph = struct ; per_module = Module.Name.Map.singleton m.name (Build.return []) } - let deprecated ~modules ~deprecated = + let wrapped_compat ~modules ~wrapped_compat = { dir = Path.root - ; per_module = Module.Name.Map.merge deprecated modules ~f:(fun _ d m -> + ; per_module = Module.Name.Map.merge wrapped_compat modules ~f:(fun _ d m -> match d, m with | None, None -> assert false - | Some deprecated, None -> + | Some wrapped_compat, None -> Exn.code_error "deprecated module needs counterpart" - [ "deprecated", Module.to_sexp deprecated + [ "deprecated", Module.to_sexp wrapped_compat ] | None, Some _ -> None | Some _, Some m -> Some (Build.return [m]) @@ -73,8 +73,8 @@ module Dep_graphs = struct let dummy m = Ml_kind.Dict.make_both (Dep_graph.dummy m) - let deprecated ~modules ~deprecated = - Ml_kind.Dict.make_both (Dep_graph.deprecated ~modules ~deprecated) + let wrapped_compat ~modules ~wrapped_compat = + Ml_kind.Dict.make_both (Dep_graph.wrapped_compat ~modules ~wrapped_compat) end let parse_module_names ~(unit : Module.t) ~modules words = diff --git a/src/ocamldep.mli b/src/ocamldep.mli index 83028590..184da31d 100644 --- a/src/ocamldep.mli +++ b/src/ocamldep.mli @@ -19,9 +19,9 @@ module Dep_graphs : sig val dummy : Module.t -> t - val deprecated + val wrapped_compat : modules:Module.t Module.Name.Map.t - -> deprecated:Module.t Module.Name.Map.t + -> wrapped_compat:Module.t Module.Name.Map.t -> t end