Set officially the minimal OCaml requirement to 3.12.1

 Anyway, a few syntactic features of 3.12 were already used here and
 there (e.g. local opening via Foo.(...), or the record shortcut
 { field; ... }). Hence compiling with 3.11 wasn't working anymore.

 Already take advantage of the following 3.12.1 features :
 - "module type of ..." in CArray, CList, CString ...
 - "ocamldep -ml-synonym" : no need anymore to hack the ocamldep output
   via our coqdep to localize the .ml4 modules :-)

 The -ml-synonym option (+ various bugfixes) is the reason for asking
 3.12.1 directly and not just 3.12.0. After all, if debian stable is
 providing 3.12.1, then everybody has it ;-)

6 files changed, 6 insertions, 221 deletions

diff --git a/lib/cArray.ml b/lib/cArray.ml
index 77fb043227..ab3a4ba519 100644
--- a/lib/cArray.ml
+++ b/lib/cArray.ml
@@ -6,35 +6,7 @@
 (*         *       GNU Lesser General Public License Version 2.1       *)
 (***********************************************************************)
 
-module type S =
-sig
-  external length : 'a array -> int = "%array_length"
-  external get : 'a array -> int -> 'a = "%array_safe_get"
-  external set : 'a array -> int -> 'a -> unit = "%array_safe_set"
-  external make : int -> 'a -> 'a array = "caml_make_vect"
-  val init : int -> (int -> 'a) -> 'a array
-  val make_matrix : int -> int -> 'a -> 'a array array
-  val create_matrix : int -> int -> 'a -> 'a array array
-  val append : 'a array -> 'a array -> 'a array
-  val concat : 'a array list -> 'a array
-  val sub : 'a array -> int -> int -> 'a array
-  val copy : 'a array -> 'a array
-  val fill : 'a array -> int -> int -> 'a -> unit
-  val blit : 'a array -> int -> 'a array -> int -> int -> unit
-  val to_list : 'a array -> 'a list
-  val of_list : 'a list -> 'a array
-  val iter : ('a -> unit) -> 'a array -> unit
-  val map : ('a -> 'b) -> 'a array -> 'b array
-  val iteri : (int -> 'a -> unit) -> 'a array -> unit
-  val mapi : (int -> 'a -> 'b) -> 'a array -> 'b array
-  val fold_left : ('a -> 'b -> 'a) -> 'a -> 'b array -> 'a
-  val fold_right : ('b -> 'a -> 'a) -> 'b array -> 'a -> 'a
-  val sort : ('a -> 'a -> int) -> 'a array -> unit
-  val stable_sort : ('a -> 'a -> int) -> 'a array -> unit
-  val fast_sort : ('a -> 'a -> int) -> 'a array -> unit
-  external unsafe_get : 'a array -> int -> 'a = "%array_unsafe_get"
-  external unsafe_set : 'a array -> int -> 'a -> unit = "%array_unsafe_set"
-end
+module type S = module type of Array
 
 module type ExtS =
 sig
diff --git a/lib/cArray.mli b/lib/cArray.mli
index 83036e27ce..e3a3bd7f55 100644
--- a/lib/cArray.mli
+++ b/lib/cArray.mli
@@ -6,37 +6,7 @@
 (*         *       GNU Lesser General Public License Version 2.1       *)
 (***********************************************************************)
 
-(** FIXME: From OCaml 3.12 onwards, that would only be a [module type of] *)
-
-module type S =
-sig
-  external length : 'a array -> int = "%array_length"
-  external get : 'a array -> int -> 'a = "%array_safe_get"
-  external set : 'a array -> int -> 'a -> unit = "%array_safe_set"
-  external make : int -> 'a -> 'a array = "caml_make_vect"
-  val init : int -> (int -> 'a) -> 'a array
-  val make_matrix : int -> int -> 'a -> 'a array array
-  val create_matrix : int -> int -> 'a -> 'a array array
-  val append : 'a array -> 'a array -> 'a array
-  val concat : 'a array list -> 'a array
-  val sub : 'a array -> int -> int -> 'a array
-  val copy : 'a array -> 'a array
-  val fill : 'a array -> int -> int -> 'a -> unit
-  val blit : 'a array -> int -> 'a array -> int -> int -> unit
-  val to_list : 'a array -> 'a list
-  val of_list : 'a list -> 'a array
-  val iter : ('a -> unit) -> 'a array -> unit
-  val map : ('a -> 'b) -> 'a array -> 'b array
-  val iteri : (int -> 'a -> unit) -> 'a array -> unit
-  val mapi : (int -> 'a -> 'b) -> 'a array -> 'b array
-  val fold_left : ('a -> 'b -> 'a) -> 'a -> 'b array -> 'a
-  val fold_right : ('b -> 'a -> 'a) -> 'b array -> 'a -> 'a
-  val sort : ('a -> 'a -> int) -> 'a array -> unit
-  val stable_sort : ('a -> 'a -> int) -> 'a array -> unit
-  val fast_sort : ('a -> 'a -> int) -> 'a array -> unit
-  external unsafe_get : 'a array -> int -> 'a = "%array_unsafe_get"
-  external unsafe_set : 'a array -> int -> 'a -> unit = "%array_unsafe_set"
-end
+module type S = module type of Array
 
 module type ExtS =
 sig
diff --git a/lib/cList.ml b/lib/cList.ml
index 1a1993cd6f..385c80b62c 100644
--- a/lib/cList.ml
+++ b/lib/cList.ml
@@ -9,50 +9,7 @@
 type 'a cmp = 'a -> 'a -> int
 type 'a eq = 'a -> 'a -> bool
 
-module type S =
-sig
-  val length : 'a list -> int
-  val hd : 'a list -> 'a
-  val tl : 'a list -> 'a list
-  val nth : 'a list -> int -> 'a
-  val rev : 'a list -> 'a list
-  val append : 'a list -> 'a list -> 'a list
-  val rev_append : 'a list -> 'a list -> 'a list
-  val concat : 'a list list -> 'a list
-  val flatten : 'a list list -> 'a list
-  val iter : ('a -> unit) -> 'a list -> unit
-  val map : ('a -> 'b) -> 'a list -> 'b list
-  val rev_map : ('a -> 'b) -> 'a list -> 'b list
-  val fold_left : ('a -> 'b -> 'a) -> 'a -> 'b list -> 'a
-  val fold_right : ('a -> 'b -> 'b) -> 'a list -> 'b -> 'b
-  val iter2 : ('a -> 'b -> unit) -> 'a list -> 'b list -> unit
-  val map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
-  val rev_map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
-  val fold_left2 : ('a -> 'b -> 'c -> 'a) -> 'a -> 'b list -> 'c list -> 'a
-  val fold_right2 : ('a -> 'b -> 'c -> 'c) -> 'a list -> 'b list -> 'c -> 'c
-  val for_all : ('a -> bool) -> 'a list -> bool
-  val exists : ('a -> bool) -> 'a list -> bool
-  val for_all2 : ('a -> 'b -> bool) -> 'a list -> 'b list -> bool
-  val exists2 : ('a -> 'b -> bool) -> 'a list -> 'b list -> bool
-  val mem : 'a -> 'a list -> bool
-  val memq : 'a -> 'a list -> bool
-  val find : ('a -> bool) -> 'a list -> 'a
-  val filter : ('a -> bool) -> 'a list -> 'a list
-  val find_all : ('a -> bool) -> 'a list -> 'a list
-  val partition : ('a -> bool) -> 'a list -> 'a list * 'a list
-  val assoc : 'a -> ('a * 'b) list -> 'b
-  val assq : 'a -> ('a * 'b) list -> 'b
-  val mem_assoc : 'a -> ('a * 'b) list -> bool
-  val mem_assq : 'a -> ('a * 'b) list -> bool
-  val remove_assoc : 'a -> ('a * 'b) list -> ('a * 'b) list
-  val remove_assq : 'a -> ('a * 'b) list -> ('a * 'b) list
-  val split : ('a * 'b) list -> 'a list * 'b list
-  val combine : 'a list -> 'b list -> ('a * 'b) list
-  val sort : ('a -> 'a -> int) -> 'a list -> 'a list
-  val stable_sort : ('a -> 'a -> int) -> 'a list -> 'a list
-  val fast_sort : ('a -> 'a -> int) -> 'a list -> 'a list
-  val merge : ('a -> 'a -> int) -> 'a list -> 'a list -> 'a list
-end
+module type S = module type of List
 
 module type ExtS =
 sig
diff --git a/lib/cList.mli b/lib/cList.mli
index 6af32fdd0f..15900260ce 100644
--- a/lib/cList.mli
+++ b/lib/cList.mli
@@ -6,56 +6,11 @@
 (*         *       GNU Lesser General Public License Version 2.1       *)
 (***********************************************************************)
 
-(** FIXME: From OCaml 3.12 onwards, that would only be a [module type of] *)
-
 type 'a cmp = 'a -> 'a -> int
 type 'a eq = 'a -> 'a -> bool
 
 (** Module type [S] is the one from OCaml Stdlib. *)
-module type S =
-sig
-  val length : 'a list -> int
-  val hd : 'a list -> 'a
-  val tl : 'a list -> 'a list
-  val nth : 'a list -> int -> 'a
-  val rev : 'a list -> 'a list
-  val append : 'a list -> 'a list -> 'a list
-  val rev_append : 'a list -> 'a list -> 'a list
-  val concat : 'a list list -> 'a list
-  val flatten : 'a list list -> 'a list
-  val iter : ('a -> unit) -> 'a list -> unit
-  val map : ('a -> 'b) -> 'a list -> 'b list
-  val rev_map : ('a -> 'b) -> 'a list -> 'b list
-  val fold_left : ('a -> 'b -> 'a) -> 'a -> 'b list -> 'a
-  val fold_right : ('a -> 'b -> 'b) -> 'a list -> 'b -> 'b
-  val iter2 : ('a -> 'b -> unit) -> 'a list -> 'b list -> unit
-  val map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
-  val rev_map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
-  val fold_left2 : ('a -> 'b -> 'c -> 'a) -> 'a -> 'b list -> 'c list -> 'a
-  val fold_right2 : ('a -> 'b -> 'c -> 'c) -> 'a list -> 'b list -> 'c -> 'c
-  val for_all : ('a -> bool) -> 'a list -> bool
-  val exists : ('a -> bool) -> 'a list -> bool
-  val for_all2 : ('a -> 'b -> bool) -> 'a list -> 'b list -> bool
-  val exists2 : ('a -> 'b -> bool) -> 'a list -> 'b list -> bool
-  val mem : 'a -> 'a list -> bool
-  val memq : 'a -> 'a list -> bool
-  val find : ('a -> bool) -> 'a list -> 'a
-  val filter : ('a -> bool) -> 'a list -> 'a list
-  val find_all : ('a -> bool) -> 'a list -> 'a list
-  val partition : ('a -> bool) -> 'a list -> 'a list * 'a list
-  val assoc : 'a -> ('a * 'b) list -> 'b
-  val assq : 'a -> ('a * 'b) list -> 'b
-  val mem_assoc : 'a -> ('a * 'b) list -> bool
-  val mem_assq : 'a -> ('a * 'b) list -> bool
-  val remove_assoc : 'a -> ('a * 'b) list -> ('a * 'b) list
-  val remove_assq : 'a -> ('a * 'b) list -> ('a * 'b) list
-  val split : ('a * 'b) list -> 'a list * 'b list
-  val combine : 'a list -> 'b list -> ('a * 'b) list
-  val sort : ('a -> 'a -> int) -> 'a list -> 'a list
-  val stable_sort : ('a -> 'a -> int) -> 'a list -> 'a list
-  val fast_sort : ('a -> 'a -> int) -> 'a list -> 'a list
-  val merge : ('a -> 'a -> int) -> 'a list -> 'a list -> 'a list
-end
+module type S = module type of List
 
 module type ExtS =
 sig
diff --git a/lib/cString.ml b/lib/cString.ml
index 9be81bd3d8..5c857077a6 100644
--- a/lib/cString.ml
+++ b/lib/cString.ml
@@ -6,41 +6,7 @@
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(** FIXME: use module type of *)
-module type S =
-sig
-  external length : string -> int = "%string_length"
-  external get : string -> int -> char = "%string_safe_get"
-  external set : string -> int -> char -> unit = "%string_safe_set"
-  external create : int -> string = "caml_create_string"
-  val make : int -> char -> string
-  val copy : string -> string
-  val sub : string -> int -> int -> string
-  val fill : string -> int -> int -> char -> unit
-  val blit : string -> int -> string -> int -> int -> unit
-  val concat : string -> string list -> string
-  val iter : (char -> unit) -> string -> unit
-  val escaped : string -> string
-  val index : string -> char -> int
-  val rindex : string -> char -> int
-  val index_from : string -> int -> char -> int
-  val rindex_from : string -> int -> char -> int
-  val contains : string -> char -> bool
-  val contains_from : string -> int -> char -> bool
-  val rcontains_from : string -> int -> char -> bool
-  val uppercase : string -> string
-  val lowercase : string -> string
-  val capitalize : string -> string
-  val uncapitalize : string -> string
-  type t = string
-  val compare: t -> t -> int
-  external unsafe_get : string -> int -> char = "%string_unsafe_get"
-  external unsafe_set : string -> int -> char -> unit = "%string_unsafe_set"
-  external unsafe_blit :
-    string -> int -> string -> int -> int -> unit = "caml_blit_string" "noalloc"
-  external unsafe_fill :
-    string -> int -> int -> char -> unit = "caml_fill_string" "noalloc"
-end
+module type S = module type of String
 
 module type ExtS =
 sig
diff --git a/lib/cString.mli b/lib/cString.mli
index 5f36162312..6aa10875ca 100644
--- a/lib/cString.mli
+++ b/lib/cString.mli
@@ -6,43 +6,8 @@
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(** FIXME: From OCaml 3.12 onwards, that would only be a [module type of] *)
-
 (** Module type [S] is the one from OCaml Stdlib. *)
-module type S =
-sig
-  external length : string -> int = "%string_length"
-  external get : string -> int -> char = "%string_safe_get"
-  external set : string -> int -> char -> unit = "%string_safe_set"
-  external create : int -> string = "caml_create_string"
-  val make : int -> char -> string
-  val copy : string -> string
-  val sub : string -> int -> int -> string
-  val fill : string -> int -> int -> char -> unit
-  val blit : string -> int -> string -> int -> int -> unit
-  val concat : string -> string list -> string
-  val iter : (char -> unit) -> string -> unit
-  val escaped : string -> string
-  val index : string -> char -> int
-  val rindex : string -> char -> int
-  val index_from : string -> int -> char -> int
-  val rindex_from : string -> int -> char -> int
-  val contains : string -> char -> bool
-  val contains_from : string -> int -> char -> bool
-  val rcontains_from : string -> int -> char -> bool
-  val uppercase : string -> string
-  val lowercase : string -> string
-  val capitalize : string -> string
-  val uncapitalize : string -> string
-  type t = string
-  val compare: t -> t -> int
-  external unsafe_get : string -> int -> char = "%string_unsafe_get"
-  external unsafe_set : string -> int -> char -> unit = "%string_unsafe_set"
-  external unsafe_blit :
-    string -> int -> string -> int -> int -> unit = "caml_blit_string" "noalloc"
-  external unsafe_fill :
-    string -> int -> int -> char -> unit = "caml_fill_string" "noalloc"
-end
+module type S = module type of String
 
 module type ExtS =
 sig