Merge fb28037 into 53f9188

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/match/match.mli

@@ -65,3 +65,9 @@ type t =
 [@@deriving yojson]
 
 val create : unit -> t
+
+val pp_json_pretty : Format.formatter -> string option * t list -> unit
+
+val pp_json_lines : Format.formatter -> string option * t list -> unit
+
+val pp_match_result : Format.formatter -> string option * t list -> unit

lib/match/match_context.ml

@@ -1,3 +1,5 @@
+open Core
+
 type t =
   { range : Range.t
   ; environment : Environment.t
@@ -10,3 +12,33 @@ let create () =
   ; environment = Environment.create ()
   ; matched = ""
   }
+
+let to_json source_path matches =
+  let json_matches matches = `List (List.map ~f:(fun x -> to_yojson x) matches) in
+  match source_path with
+  | None -> `Assoc [("uri", `Null); ("matches", json_matches matches)]
+  | Some path -> `Assoc [("uri", `String path); ("matches", json_matches matches)]
+
+let pp_json_pretty ppf (source_path, matches) =
+  let f = Yojson.Safe.pretty_to_string in
+  let json_string = f @@ to_json source_path matches in
+  Format.fprintf ppf "%s" json_string
+
+let pp_json_lines ppf (source_path, matches) =
+  let f = Yojson.Safe.to_string in
+  let json_string = f @@ to_json source_path matches in
+  Format.fprintf ppf "%s" json_string
+
+let pp_match_result ppf (source_path, matches) =
+  let pp_source_path ppf source_path =
+    match source_path with
+    | Some path -> Format.fprintf ppf " in %s " path
+    | None -> Format.fprintf ppf "%s" " "
+  in
+  (* FIXME *)
+  let spec_number = 0 in
+  Format.fprintf ppf
+    "%d matches%afor spec %d (use -json-pretty for json format)\n"
+    (List.length matches)
+    pp_source_path source_path
+    (spec_number + 1)

lib/matchers/languages.ml

@@ -348,3 +348,30 @@ module C_nested_comments = struct
 
   include Matcher.Make(Syntax)
 end
+
+let select_with_extension extension : (module Types.Matcher.S) =
+  match extension with
+  | ".c" | ".h" | ".cc" | ".cpp" | ".hpp" -> (module C)
+  | ".clj" -> (module Clojure)
+  | ".css" -> (module CSS)
+  | ".dart" -> (module Dart)
+  | ".elm" -> (module Elm)
+  | ".erl" -> (module Erlang)
+  | ".ex" -> (module Elixir)
+  | ".html" | ".xml" -> (module Html)
+  | ".hs" -> (module Haskell)
+  | ".go" -> (module Go)
+  | ".java" -> (module Java)
+  | ".js" | ".ts" -> (module Javascript)
+  | ".ml" | ".mli" -> (module OCaml)
+  | ".php" -> (module Php)
+  | ".py" -> (module Python)
+  | ".rb" -> (module Ruby)
+  | ".rs" -> (module Rust)
+  | ".s" | ".asm" -> (module Assembly)
+  | ".scala" -> (module Scala)
+  | ".sql" -> (module SQL)
+  | ".sh" -> (module Bash)
+  | ".swift" -> (module Swift)
+  | ".tex" | ".bib" -> (module Latex)
+  | _ -> (module Generic)

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/replacement/replacement.ml

@@ -0,0 +1,20 @@
+open Match
+
+type t =
+  { range : range
+  ; replacement_content : string
+  ; environment : environment
+  }
+[@@deriving yojson]
+
+type result =
+  { rewritten_source : string
+  ; in_place_substitutions : t list
+  }
+[@@deriving yojson]
+
+let empty_result =
+  { rewritten_source = ""
+  ; in_place_substitutions = []
+  }
+[@@deriving yojson]

lib/replacement/replacement.mli

@@ -0,0 +1,16 @@
+open Match
+
+type t =
+  { range : range
+  ; replacement_content : string
+  ; environment : environment
+  }
+[@@deriving yojson]
+
+type result =
+  { rewritten_source : string
+  ; in_place_substitutions : t list
+  }
+[@@deriving yojson]
+
+val empty_result : result

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/rewrite.ml

@@ -1,25 +1,7 @@
 open Core
 
 open Match
-
-type match_context_replacement =
-  { range : range
-  ; replacement_content : string
-  ; environment : environment
-  }
-[@@deriving yojson]
-
-type result =
-  { rewritten_source : string
-  ; in_place_substitutions : match_context_replacement list
-  }
-[@@deriving yojson]
-
-let empty_result =
-  { rewritten_source = ""
-  ; in_place_substitutions = []
-  }
-[@@deriving yojson]
+open Replacement
 
 let substitute_match_contexts (matches: Match.t list) source replacements =
   let rewrite_template, environment =

lib/rewriter/rewrite.mli

@@ -1,22 +1,7 @@
-open Match
-
-type match_context_replacement =
-  { range : range
-  ; replacement_content : string
-  ; environment : environment
-  }
-[@@deriving yojson]
-
-type result =
-  { rewritten_source : string
-  ; in_place_substitutions : match_context_replacement list
-  }
-[@@deriving yojson]
-
 (** if [source] is given, substitute in-place. If not,
     emit result separated by newlines *)
 val all
   :  ?source:string
   -> rewrite_template:string
   -> Match.t list
-  -> result option
+  -> Replacement.result option

lib/rewriter/rewriter.ml

@@ -0,0 +1,2 @@
+module Rewrite = Rewrite
+module Rewrite_template = Rewrite_template

lib/rewriter/rewriter.mli

@@ -0,0 +1,2 @@
+module Rewrite = Rewrite
+module Rewrite_template = Rewrite_template