Extracted SC.PP as Preprocessing (#560)

src/build.ml

@@ -166,6 +166,10 @@ let fail ?targets x =
   | None -> Fail x
   | Some l -> Targets l >>> Fail x
 
+let of_result = function
+  | Ok    x -> return x
+  | Error e -> fail { fail = fun () -> raise e }
+
 let memoize name t =
   Memo { name; t; state = Unevaluated }
 

src/build.mli

@@ -78,6 +78,8 @@ val file_exists_opt : Path.t -> ('a, 'b) t -> ('a, 'b option) t
     backtrace *)
 val fail : ?targets:Path.t list -> fail -> (_, _) t
 
+val of_result : ('a, exn) Result.t -> (unit, 'a) t
+
 (** [memoize name t] is an arrow that behaves like [t] except that its
     result is computed only once. *)
 val memoize : string -> (unit, 'a) t -> (unit, 'a) t

src/gen_rules.ml

@@ -505,7 +505,7 @@ module Gen(P : Install_rules.Params) = struct
     (* Preprocess before adding the alias module as it doesn't need
        preprocessing *)
     let modules =
-      SC.PP.pp_and_lint_modules sctx ~dir ~dep_kind ~modules ~scope
+      Preprocessing.pp_and_lint_modules sctx ~dir ~dep_kind ~modules ~scope
         ~preprocess:lib.buildable.preprocess
         ~preprocessor_deps:
           (SC.Deps.interpret sctx ~scope ~dir
@@ -754,7 +754,7 @@ module Gen(P : Install_rules.Params) = struct
         SC.Deps.interpret sctx exes.buildable.preprocessor_deps
           ~scope ~dir
       in
-      SC.PP.pp_and_lint_modules sctx ~dir ~dep_kind:Required ~modules ~scope
+      Preprocessing.pp_and_lint_modules sctx ~dir ~dep_kind:Required ~modules ~scope
         ~preprocess:exes.buildable.preprocess
         ~preprocessor_deps
         ~lint:exes.buildable.lint
@@ -920,7 +920,7 @@ module Gen(P : Install_rules.Params) = struct
      | ".js"  :: rest -> Js_of_ocaml_rules.setup_separate_compilation_rules
                            sctx rest
      | "_doc" :: rest -> Odoc.gen_rules sctx rest ~dir
-     | ".ppx"  :: rest -> SC.PP.gen_rules sctx rest
+     | ".ppx"  :: rest -> Preprocessing.gen_rules sctx rest
      | _ ->
        match Path.Map.find stanzas_per_dir dir with
        | Some x -> gen_rules x

src/install_rules.ml

@@ -189,7 +189,7 @@ module Gen(P : Install_params) = struct
           else
             pps
         in
-        let ppx_exe = SC.PP.get_ppx_driver sctx ~scope pps in
+        let ppx_exe = Preprocessing.get_ppx_driver sctx ~scope pps in
         [ppx_exe]
     in
     List.concat

src/merlin.ml

@@ -16,11 +16,11 @@ type t =
 let ppx_flags sctx ~dir:_ ~scope ~src_dir:_ { preprocess; libname; _ } =
   match preprocess with
   | Pps { pps; flags } ->
-    let exe = SC.PP.get_ppx_driver sctx ~scope pps in
+    let exe = Preprocessing.get_ppx_driver sctx ~scope pps in
     let command =
       List.map (Path.to_absolute_filename exe
                 :: "--as-ppx"
-                :: SC.PP.cookie_library_name libname
+                :: Preprocessing.cookie_library_name libname
                 @ flags)
         ~f:quote_for_shell
       |> String.concat ~sep:" "