compat

Signed-off-by: Paul-Elliot <peada@free.fr>

Author: panglesd

src/document/generator.ml

@@ -21,6 +21,12 @@ open Types
 module O = Codefmt
 open O.Infix
 
+let filter_map f x =
+  List.rev
+  @@ List.fold_left
+       (fun acc x -> match f x with Some x -> x :: acc | None -> acc)
+       [] x
+
 let label t =
   match t with
   | Odoc_model.Lang.TypeExpr.Label s -> O.txt s
@@ -293,7 +299,7 @@ module Make (Syntax : SYNTAX) = struct
         | Some info -> Some (info, loc)
         | None -> None
       in
-      let infos = List.filter_map mapper infos in
+      let infos = filter_map mapper infos in
       let contents = Impl.impl ~infos source_code in
       { Source_page.url; contents }
   end

src/loader/compat.cppo.ml

@@ -4,13 +4,56 @@ let get_type_desc = Types.get_desc
 let get_type_desc t = t.Types.desc
 #endif
 
+type 'a pattern =
+#if OCAML_VERSION >= (4,11,0)
+  'a Typedtree.general_pattern
+#else
+  Typedtree.pattern
+#endif
+
+type 'a pattern_desc =
+#if OCAML_VERSION >= (4,11,0)
+  'a Typedtree.pattern_desc
+#else
+  Typedtree.pattern_desc
+#endif
+
 (** Extract longident and constructor description from a pattern construct,
     when it is one. *)
-let get_pattern_construct_info (type a) : a Typedtree.pattern_desc -> _ = function
+let get_pattern_construct_info (type a) : a pattern_desc -> _ = function
 #if OCAML_VERSION >= (4,13,0)
-        Typedtree.Tpat_construct (l, { cstr_res; _ }, _, _)
+  | Typedtree.Tpat_construct (l, { cstr_res; _ }, _, _)
 #else
-        Tpat_construct (l, { cstr_res; _ }, _)
+  | Tpat_construct (l, { cstr_res; _ }, _)
 #endif
     -> Some (l, cstr_res)
   | _ -> None
+
+
+module Tast_iterator = struct
+#if OCAML_VERSION >= (4,09,0)
+  include Tast_iterator
+#else
+  open Asttypes
+  open Typedtree
+
+  type iterator =
+    {
+      expr: iterator -> expression -> unit;
+      module_expr: iterator -> module_expr -> unit;
+      class_type: iterator -> class_type -> unit;
+      module_type: iterator -> module_type -> unit;
+      pat: iterator -> pattern -> unit;
+      typ: iterator -> core_type -> unit;
+    }
+
+  let default_iterator = {
+    expr = fun _ _ -> () ;
+    module_expr = fun _ _ -> () ;
+    class_type = fun _ _ -> () ;
+    module_type = fun _ _ -> () ;
+    pat = fun _ _ -> () ;
+    typ = fun _ _ -> () ;
+}
+#endif
+end

src/loader/occurrences.ml

@@ -56,7 +56,7 @@ module Global_analysis = struct
         | _ -> ())
     | _ -> ()
 
-  let pat poses (type a) : a Typedtree.general_pattern -> unit = function
+  let pat poses : _ Compat.pattern -> unit = function
     | { Typedtree.pat_desc; pat_loc; _ } -> (
         match Compat.get_pattern_construct_info pat_desc with
         | Some (l, cstr_res) -> (
@@ -113,31 +113,31 @@ let of_cmt (cmt : Cmt_format.cmt_infos) =
       let poses = ref [] in
       let module_expr iterator mod_expr =
         Global_analysis.module_expr poses mod_expr;
-        Tast_iterator.default_iterator.module_expr iterator mod_expr
+        Compat.Tast_iterator.default_iterator.module_expr iterator mod_expr
       in
       let expr iterator e =
         Global_analysis.expr poses e;
-        Tast_iterator.default_iterator.expr iterator e
+        Compat.Tast_iterator.default_iterator.expr iterator e
       in
       let pat iterator e =
         Global_analysis.pat poses e;
-        Tast_iterator.default_iterator.pat iterator e
+        Compat.Tast_iterator.default_iterator.pat iterator e
       in
       let typ iterator ctyp_expr =
         Global_analysis.core_type poses ctyp_expr;
-        Tast_iterator.default_iterator.typ iterator ctyp_expr
+        Compat.Tast_iterator.default_iterator.typ iterator ctyp_expr
       in
       let module_type iterator mty =
         Global_analysis.module_type poses mty;
-        Tast_iterator.default_iterator.module_type iterator mty
+        Compat.Tast_iterator.default_iterator.module_type iterator mty
       in
       let class_type iterator cl_type =
         Global_analysis.class_type poses cl_type;
-        Tast_iterator.default_iterator.class_type iterator cl_type
+        Compat.Tast_iterator.default_iterator.class_type iterator cl_type
       in
       let iterator =
         {
-          Tast_iterator.default_iterator with
+          Compat.Tast_iterator.default_iterator with
           expr;
           pat;
           module_expr;