Factor out some code in an util module

Author: Chris00

_oasis

@@ -12,7 +12,7 @@ Plugins:     META (0.4), StdFiles (0.4)
 Library "cosmetrics"
   Path:         src/
   Modules:      Cosmetrics
-  InternalModules: Cosmetrics_html, Cosmetrics_opam
+  InternalModules: Cosmetrics_html, Cosmetrics_opam, Cosmetrics_utils
   BuildDepends: git (>= 1.7.1), zip, nocrypto, cohttp,
                 ocamlgraph, calendar,
                 opam-lib.client (>= 1.2 && < 1.3), str, bytes, unix

src/Cosmetrics.ml

@@ -1,6 +1,7 @@
 
 open Lwt
 open CalendarLib
+open Cosmetrics_utils
 
 module Store = Git_unix.FS
 module G = Git_unix.Sync.Make(Store)
@@ -22,41 +23,6 @@ let read_tree_exn t sha =
      fail(Failure "Cosmetrics.read_tree_exn: not a tree value")
 
 
-module String = struct
-  include String
-
-  let starting ~w:prefix s =
-    if String.length prefix <= String.length s then
-      try
-        for i = 0 to String.length prefix - 1 do
-          if unsafe_get prefix i <> unsafe_get s i then raise Exit
-        done;
-        true
-      with Exit -> false
-    else false
-
-  let ending ~w:postfix s =
-    let ofs = String.length s - String.length postfix in
-    if ofs >= 0 then
-      try
-        for i = 0 to String.length postfix - 1 do
-          if unsafe_get postfix i <> unsafe_get s (ofs + i) then raise Exit
-        done;
-        true
-      with Exit -> false
-    else false
-end
-
-module List = struct
-  include List
-
-  let rec remove_consecutive_duplicates equal = function
-    | ([] | [_]) as l -> l
-    | x :: ((y :: _) as tl) ->
-       if equal x y then remove_consecutive_duplicates equal tl
-       else x :: remove_consecutive_duplicates equal tl
-end
-
 (* Simple cache module. *)
 module Cache = struct
   type 'a t = { log: string -> unit Lwt.t;

src/Cosmetrics_utils.ml

@@ -0,0 +1,40 @@
+module String = struct
+  include String
+
+  let starting ~w:prefix s =
+    if String.length prefix <= String.length s then
+      try
+        for i = 0 to String.length prefix - 1 do
+          if unsafe_get prefix i <> unsafe_get s i then raise Exit
+        done;
+        true
+      with Exit -> false
+    else false
+
+  let ending ~w:postfix s =
+    let ofs = String.length s - String.length postfix in
+    if ofs >= 0 then
+      try
+        for i = 0 to String.length postfix - 1 do
+          if unsafe_get postfix i <> unsafe_get s (ofs + i) then raise Exit
+        done;
+        true
+      with Exit -> false
+    else false
+end
+
+module List = struct
+  include List
+
+  let rec remove_consecutive_duplicates equal = function
+    | ([] | [_]) as l -> l
+    | x :: ((y :: _) as tl) ->
+       if equal x y then remove_consecutive_duplicates equal tl
+       else x :: remove_consecutive_duplicates equal tl
+
+  let rec filter_map f = function
+    | [] -> []
+    | x :: tl -> match f x with
+                 | Some y -> y :: filter_map f tl
+                 | None -> filter_map f tl
+end

src/main.ml

@@ -3,6 +3,7 @@ open CalendarLib
 module C = Cosmetrics
 module T = C.Timeseries
 module H = Cosmetrics_html
+open Cosmetrics_utils
 
 let is_finite x = neg_infinity < x && x < infinity