factor out replacement

lib/comby.ml

@@ -1,5 +1,6 @@
 module Language = Language
 module Matchers = Matchers
 module Match = Match
+module Replacement = Replacement
 module Rewriter = Rewriter
 module Statistics = Statistics

lib/comby.mli

@@ -1,5 +1,6 @@
 module Language = Language
 module Matchers = Matchers
 module Match = Match
+module Replacement = Replacement
 module Rewriter = Rewriter
 module Statistics = Statistics

lib/dune

@@ -8,6 +8,7 @@
    mparser 
    mparser.pcre 
    comby.matchers
+   comby.replacement
    comby.rewriter
    comby.match
    comby.language

lib/matchers/matchers.ml

@@ -1,5 +1,4 @@
-include Languages
-
 module Configuration = Configuration
-
 module type Matcher = Types.Matcher.S
+
+include Languages

lib/matchers/matchers.mli

@@ -1,5 +1,4 @@
-include module type of Languages
-
 module Configuration = Configuration
-
 module type Matcher = Types.Matcher.S
+
+include module type of Languages

lib/replacement/dune

@@ -0,0 +1,5 @@
+(library
+  (name replacement)
+  (public_name comby.replacement)
+  (preprocess (pps ppx_deriving.show ppx_deriving.eq ppx_sexp_conv ppx_sexp_message ppx_deriving_yojson bisect_ppx -conditional -no-comment-parsing))
+  (libraries comby.parsers comby.match ppxlib core mparser mparser.pcre yojson ppx_deriving_yojson ppx_deriving_yojson.runtime))

lib/rewriter/dune

@@ -2,4 +2,4 @@
   (name rewriter)
   (public_name comby.rewriter)
   (preprocess (pps ppx_deriving.show ppx_sexp_conv ppx_deriving_yojson bisect_ppx -conditional -no-comment-parsing))
-  (libraries comby.matchers ppxlib core core.uuid))
+  (libraries comby.matchers comby.replacement ppxlib core core.uuid))

lib/rewriter/rewriter.ml

@@ -1,3 +1,2 @@
-module Replacement = Replacement
 module Rewrite = Rewrite
 module Rewrite_template = Rewrite_template

lib/rewriter/rewriter.mli

@@ -1,3 +1,2 @@
-module Replacement = Replacement
 module Rewrite = Rewrite
 module Rewrite_template = Rewrite_template

src/command_configuration.ml

@@ -113,7 +113,7 @@ module Printer = struct
         }
     | Replacements of
         { source_path : string option
-        ; replacements : Rewriter.Replacement.t list
+        ; replacements : Replacement.t list
         ; result : string
         ; source_content : string
         }
@@ -168,7 +168,7 @@ module Printer = struct
     val convert : output_options -> replacement_output
 
 
-    val print : replacement_output -> string option -> Rewriter.Replacement.t list -> string -> string -> unit
+    val print : replacement_output -> string option -> Replacement.t list -> string -> string -> unit
 
   end = struct
 
@@ -181,13 +181,13 @@ module Printer = struct
 
     (* only used in rewrite *)
     let get_json_rewrites replacements result =
-      let value = `List (List.map ~f:Rewriter.Replacement.to_yojson replacements) in
+      let value = `List (List.map ~f:Replacement.to_yojson replacements) in
       `Assoc [("uri", `Null); ("rewritten_source", `String result); ("in_place_substitutions", value)]
 
     (* only used in rewrite *)
     let json_rewrites replacements (path: string) (diff: string) result =
       let value =
-        `List (List.map ~f:Rewriter.Replacement.to_yojson replacements) in
+        `List (List.map ~f:Replacement.to_yojson replacements) in
       `Assoc
         [ ("uri", `String path)
         ; ("rewritten_source", `String result)

src/command_configuration.mli

@@ -8,7 +8,7 @@ module Printer : sig
         }
     | Replacements of
         { source_path : string option
-        ; replacements : Rewriter.Replacement.t list
+        ; replacements : Replacement.t list
         ; result : string
         ; source_content : string
         }

src/main.ml

@@ -19,7 +19,7 @@ type json_result =
 
 type processed_source_result =
   | Matches of (Match.t list * int)
-  | Replacement of (Rewriter.Replacement.t list * string * int)
+  | Replacement of (Replacement.t list * string * int)
   | Nothing
 
 let verbose_out_file = "/tmp/comby.out"
@@ -93,7 +93,7 @@ let process_single_source
             |> fun matches ->
             if matches = [] then
               (* If there are no matches, return the original source (for editor support). *)
-              Some (Some (Rewriter.Replacement.{ rewritten_source = input_text; in_place_substitutions = [] }), [])
+              Some (Some (Replacement.{ rewritten_source = input_text; in_place_substitutions = [] }), [])
             else
               Some (rewrite rewrite_template rewrite_rule input_text matches, matches)
           in

src/server.ml

@@ -47,7 +47,7 @@ type json_match_result =
 
 type json_rewrite_result =
   { rewritten_source : string
-  ; in_place_substitutions : Rewriter.Replacement.t list
+  ; in_place_substitutions : Replacement.t list
   ; id : int
   }
 [@@deriving yojson]
@@ -108,7 +108,7 @@ let perform_match request =
     if debug then Format.printf "Result (400) %s@." error;
     respond ~code:(`Code 400) (`String error)
 
-let rewrite_to_json id ({ rewritten_source; in_place_substitutions } : Rewriter.Replacement.result) =
+let rewrite_to_json id ({ rewritten_source; in_place_substitutions } : Replacement.result) =
   Format.sprintf "%s"
     (Yojson.Safe.pretty_to_string
        (json_rewrite_result_to_yojson

test/test_rewrite_parts.ml

@@ -51,7 +51,7 @@ let%expect_test "comments_in_string_literals_should_not_be_treated_as_comments_b
   all match_template source
   |> Rewrite.all ~source ~rewrite_template
   |> (function
-      | Some rewrite_result -> print_string (Yojson.Safe.pretty_to_string (Rewriter.Replacement.result_to_yojson rewrite_result))
+      | Some rewrite_result -> print_string (Yojson.Safe.pretty_to_string (Replacement.result_to_yojson rewrite_result))
       | None -> print_string "BROKEN EXPECT");
   [%expect_exact {|{
   "rewritten_source": "123433312343331122",
@@ -99,7 +99,7 @@ let%expect_test "comments_in_string_literals_should_not_be_treated_as_comments_b
   all match_template source
   |> Rewrite.all ~source ~rewrite_template
   |> (function
-      | Some rewrite_result -> print_string (Yojson.Safe.pretty_to_string (Rewriter.Replacement.result_to_yojson rewrite_result))
+      | Some rewrite_result -> print_string (Yojson.Safe.pretty_to_string (Replacement.result_to_yojson rewrite_result))
       | None -> print_string "BROKEN EXPECT");
   [%expect_exact {|{
   "rewritten_source": "123433312343331122;123433312343331122;",
@@ -180,7 +180,7 @@ let%expect_test "multiple_contextual_substitutions" =
   all match_template source
   |> Rewrite.all ~source ~rewrite_template
   |> (function
-      | Some rewrite_result -> print_string (Yojson.Safe.pretty_to_string (Rewriter.Replacement.result_to_yojson rewrite_result))
+      | Some rewrite_result -> print_string (Yojson.Safe.pretty_to_string (Replacement.result_to_yojson rewrite_result))
       | None -> print_string "BROKEN EXPECT");
   [%expect_exact {|{
   "rewritten_source": "xxxx bar xxxx",