Merge module-alias branch (cf. PR#6063)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14394 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

2 files changed, 4 insertions, 124 deletions

diff --git a/stdlib/Compflags b/stdlib/Compflags
index 707487fd0..d0938af89 100755
--- a/stdlib/Compflags
+++ b/stdlib/Compflags
@@ -20,9 +20,6 @@ case $1 in
                            # make sure add_char is inlined (PR#5872)
   buffer.cm[io]|printf.cm[io]|format.cm[io]|scanf.cm[io]) echo ' -w A';;
   scanf.cmx|scanf.p.cmx) echo ' -inline 9';;
-  arrayLabels.cm[ox]|arrayLabels.p.cmx) echo ' -nolabels';;
-  listLabels.cm[ox]|listLabels.p.cmx) echo ' -nolabels';;
-  stringLabels.cm[ox]|stringLabels.p.cmx) echo ' -nolabels';;
-  moreLabels.cm[ox]|moreLabels.p.cmx) echo ' -nolabels';;
+  *Labels.cm[ox]|*Labels.p.cmx) echo ' -nolabels -trans-mod';;
   *) echo ' ';;
 esac
diff --git a/stdlib/stdLabels.mli b/stdlib/stdLabels.mli
index bf9ef6547..144936f17 100644
--- a/stdlib/stdLabels.mli
+++ b/stdlib/stdLabels.mli
@@ -20,123 +20,6 @@
    in [arrayLabels.mli], [listLabels.mli] and [stringLabels.mli].
 *)
 
-module Array :
-  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"
-    external create : int -> 'a -> 'a array = "caml_make_vect"
-    val init : int -> f:(int -> 'a) -> 'a array
-    val make_matrix : dimx:int -> dimy:int -> 'a -> 'a array array
-    val create_matrix : dimx:int -> dimy:int -> 'a -> 'a array array
-    val append : 'a array -> 'a array -> 'a array
-    val concat : 'a array list -> 'a array
-    val sub : 'a array -> pos:int -> len:int -> 'a array
-    val copy : 'a array -> 'a array
-    val fill : 'a array -> pos:int -> len:int -> 'a -> unit
-    val blit :
-      src:'a array -> src_pos:int -> dst:'a array -> dst_pos:int -> len:int ->
-        unit
-    val to_list : 'a array -> 'a list
-    val of_list : 'a list -> 'a array
-    val iter : f:('a -> unit) -> 'a array -> unit
-    val map : f:('a -> 'b) -> 'a array -> 'b array
-    val iteri : f:(int -> 'a -> unit) -> 'a array -> unit
-    val mapi : f:(int -> 'a -> 'b) -> 'a array -> 'b array
-    val fold_left : f:('a -> 'b -> 'a) -> init:'a -> 'b array -> 'a
-    val fold_right : f:('a -> 'b -> 'b) -> 'a array -> init:'b -> 'b
-    val sort : cmp:('a -> 'a -> int) -> 'a array -> unit
-    val stable_sort : cmp:('a -> 'a -> int) -> 'a array -> unit
-    val fast_sort : cmp:('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 List :
-  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 : f:('a -> unit) -> 'a list -> unit
-    val map : f:('a -> 'b) -> 'a list -> 'b list
-    val rev_map : f:('a -> 'b) -> 'a list -> 'b list
-    val fold_left : f:('a -> 'b -> 'a) -> init:'a -> 'b list -> 'a
-    val fold_right : f:('a -> 'b -> 'b) -> 'a list -> init:'b -> 'b
-    val iter2 : f:('a -> 'b -> unit) -> 'a list -> 'b list -> unit
-    val map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
-    val rev_map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
-    val fold_left2 :
-      f:('a -> 'b -> 'c -> 'a) -> init:'a -> 'b list -> 'c list -> 'a
-    val fold_right2 :
-      f:('a -> 'b -> 'c -> 'c) -> 'a list -> 'b list -> init:'c -> 'c
-    val for_all : f:('a -> bool) -> 'a list -> bool
-    val exists : f:('a -> bool) -> 'a list -> bool
-    val for_all2 : f:('a -> 'b -> bool) -> 'a list -> 'b list -> bool
-    val exists2 : f:('a -> 'b -> bool) -> 'a list -> 'b list -> bool
-    val mem : 'a -> set:'a list -> bool
-    val memq : 'a -> set:'a list -> bool
-    val find : f:('a -> bool) -> 'a list -> 'a
-    val filter : f:('a -> bool) -> 'a list -> 'a list
-    val find_all : f:('a -> bool) -> 'a list -> 'a list
-    val partition : f:('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 -> map:('a * 'b) list -> bool
-    val mem_assq : 'a -> map:('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 : cmp:('a -> 'a -> int) -> 'a list -> 'a list
-    val stable_sort : cmp:('a -> 'a -> int) -> 'a list -> 'a list
-    val fast_sort : cmp:('a -> 'a -> int) -> 'a list -> 'a list
-    val merge : cmp:('a -> 'a -> int) -> 'a list -> 'a list -> 'a list
-  end
-
-module String :
-  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 -> pos:int -> len:int -> string
-    val fill : string -> pos:int -> len:int -> char -> unit
-    val blit :
-      src:string -> src_pos:int -> dst:string -> dst_pos:int -> len:int ->
-        unit
-    val concat : sep:string -> string list -> string
-    val iter : f:(char -> unit) -> string -> unit
-    val iteri : f:(int -> char -> unit) -> string -> unit
-    val map : f:(char -> char) -> string -> string
-    val trim : string -> string
-    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 :
-      src:string -> src_pos:int -> dst:string -> dst_pos:int -> len:int ->
-        unit = "caml_blit_string" "noalloc"
-    external unsafe_fill : string -> pos:int -> len:int -> char -> unit
-      = "caml_fill_string" "noalloc"
-  end
+module Array = ArrayLabels
+module List = ListLabels
+module String = StringLabels