add shims with dune magic for 4.08 compat

qtest/Makefile

@@ -1,6 +1,6 @@
 
 QTEST_PREAMBLE=''
-DONTTEST=../src/iterLabels.ml ../src/mkflags.ml
+DONTTEST=../src/iterLabels.ml ../src/mkflags.ml ../src/mkshims.ml ../src/bigarray/mkshims.ml
 QTESTABLE=$(filter-out $(DONTTEST), \
 	$(wildcard ../src/*.ml) \
 	$(wildcard ../src/*.mli) \

src/Iter.ml

@@ -3,6 +3,8 @@
 
 (** {1 Simple and Efficient Iterators} *)
 
+open Iter_shims_
+
 (** Iter abstract iterator type *)
 type 'a t = ('a -> unit) -> unit
 

src/bigarray/IterBigarray.ml

@@ -3,7 +3,7 @@
 
 (** {1 Interface and Helpers for bigarrays} *)
 
-open! Bigarray
+open! IterBigarrayShims_
 
 let of_bigarray b yield =
   let len = Bigarray.Array1.dim b in
@@ -16,7 +16,7 @@ let mmap filename =
     let fd = Unix.openfile filename [Unix.O_RDONLY] 0 in
     let len = Unix.lseek fd 0 Unix.SEEK_END in
     let _ = Unix.lseek fd 0 Unix.SEEK_SET in
-    let b = Bigarray.Array1.map_file fd Bigarray.char Bigarray.c_layout false len in
+    let b = bigarray_map_file fd Bigarray.char Bigarray.c_layout false len in
     try
       of_bigarray b yield;
       Unix.close fd

src/bigarray/dune

@@ -3,8 +3,18 @@
   (name iter_bigarray)
   (public_name iter.bigarray)
   (libraries iter bigarray)
+  (modules IterBigarray IterBigarrayShims_)
   (wrapped false)
   (optional)
   (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
-  (ocamlopt_flags :standard (:include ../flambda.flags))
+  (ocamlopt_flags :standard (:include ../flambda.flags)))
-  )
+
+(executable
+  (name mkshims)
+  (modules mkshims)
+  (libraries dune.configurator))
+
+(rule
+  (targets IterBigarrayShims_.ml)
+  (deps mkshims.exe)
+  (action (with-stdout-to %{targets} (run ./mkshims.exe))))

src/bigarray/mkshims.ml

@@ -0,0 +1,17 @@
+
+module C = Configurator.V1
+
+let shims_pre_408 = "
+open! Bigarray
+let bigarray_map_file = Bigarray.Array1.map_file
+"
+let shims_post_408 = "
+let bigarray_map_file fd ty lay b len =
+  Unix.map_file fd ty lay b [| len |] |> Bigarray.array1_of_genarray
+"
+
+let () =
+  C.main ~name:"mkshims" (fun c ->
+    let version = C.ocaml_config_var_exn c "version" in
+    let major, minor = Scanf.sscanf version "%u.%u" (fun maj min -> maj, min) in
+    print_endline (if (major, minor) >= (4,8) then shims_post_408 else shims_post_408))

src/dune

@@ -2,17 +2,24 @@
   (targets flambda.flags)
   (deps mkflags.ml)
   (mode fallback)
-  (action
+  (action (run ocaml ./mkflags.ml)))
-    (run ocaml ./mkflags.ml))
+
-  )
+(executable
+  (name mkshims)
+  (modules mkshims)
+  (libraries dune.configurator))
+
+(rule
+  (targets Iter_shims_.ml)
+  (deps mkshims.exe)
+  (action (with-stdout-to %{targets} (run ./mkshims.exe))))
 
 (library
   (name iter)
   (public_name iter)
   (wrapped false)
-  (modules Iter IterLabels)
+  (modules Iter IterLabels Iter_shims_)
   (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -nolabels)
   (ocamlopt_flags :standard (:include flambda.flags))
-  (libraries bytes result)
+  (libraries bytes result))
-  )
 

src/mkshims.ml

@@ -0,0 +1,11 @@
+
+module C = Configurator.V1
+
+let shims_pre_408 = "module Pervasives = Pervasives"
+let shims_post_408 = "module Pervasives = Stdlib"
+
+let () =
+  C.main ~name:"mkshims" (fun c ->
+    let version = C.ocaml_config_var_exn c "version" in
+    let major, minor = Scanf.sscanf version "%u.%u" (fun maj min -> maj, min) in
+    print_endline (if (major, minor) >= (4,8) then shims_post_408 else shims_post_408))