Composants mis dans le meme ordre que dans ctype.ml

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

typing/ctype.mli

@@ -16,6 +16,12 @@
 open Asttypes
 open Types
 
+exception Unify of (type_expr * type_expr) list
+exception Subtype of
+        (type_expr * type_expr) list * (type_expr * type_expr) list
+exception Cannot_expand
+exception Recursive_abbrev
+
 val generic_level: int
 val init_def: int -> unit
         (* Set the initial variable level *)
@@ -24,6 +30,7 @@ val begin_def: unit -> unit
 val end_def: unit -> unit
         (* Lower the variable level by one at the end of a definition *)
 val reset_global_level: unit -> unit
+
 val newty: type_desc -> type_expr
 val newgenty: type_desc -> type_expr
 val newvar: unit -> type_expr
@@ -32,90 +39,95 @@ val new_global_var: unit -> type_expr
         (* Return a fresh variable, bound at toplevel
            (as type variables ['a] in type constraints). *)
 val newobj: type_expr -> type_expr
+val none: type_expr
+        (* A dummy type expression *)
+
 val repr: type_expr -> type_expr
         (* Return the canonical representative of a type. *)
+
 val flatten_fields : type_expr -> (string * type_expr) list * type_expr
       	(* Transform a field type into a list of pairs label-type *)
+val opened_object: type_expr -> bool
+val close_object: type_expr -> unit
+val set_object_name:
+      	type_expr -> type_expr list -> Ident.t -> unit
+val remove_object_name: type_expr -> unit
+
 val generalize: type_expr -> unit
         (* Generalize in-place the given type *)
 val make_nongen: type_expr -> unit
         (* Make non-generalizable the given type *)
+
 val instance: type_expr -> type_expr
         (* Take an instance of a type scheme *)
 val instance_list: type_expr list -> type_expr list
         (* Take an instance of a list of type schemes *)
-val instance_parameterized_type:
-      	type_expr list -> type_expr -> type_expr list * type_expr
-val instance_parameterized_type_2:
-      	type_expr list -> type_expr list -> type_expr ->
-        type_expr list * type_expr list * type_expr
 val instance_constructor:
         constructor_description -> type_expr list * type_expr
         (* Same, for a constructor *)
 val instance_label: label_description -> type_expr * type_expr
         (* Same, for a label *)
+val instance_parameterized_type:
+      	type_expr list -> type_expr -> type_expr list * type_expr
+val instance_parameterized_type_2:
+      	type_expr list -> type_expr list -> type_expr ->
+        type_expr list * type_expr list * type_expr
 val instance_class:
       	class_type ->
         type_expr list * type_expr list *
         (mutable_flag * type_expr) Vars.t * type_expr
+val substitute:
+        Env.t -> type_expr list -> type_expr list -> type_expr -> type_expr
+        (* [substitute [v1...vN] [t1...tN] t]
+           returns a copy of [t] where the [vi] are replaced
+           by the [ti]. *)
+
 val expand_abbrev:
         Env.t -> Path.t -> type_expr list -> Types.abbrev_memo ref ->
 	int -> type_expr
 	(* Expand an abbreviation *)
-val full_expand: Env.t -> type_expr -> type_expr
 val expand_head: Env.t -> type_expr -> type_expr
-val occur: Env.t -> type_expr -> type_expr -> unit
-        (* [occur env var ty] Raise [Unify] if [var] occurs in [ty] *)
+val full_expand: Env.t -> type_expr -> type_expr
+
 val unify: Env.t -> type_expr -> type_expr -> unit
         (* Unify the two types given. Raise [Unify] if not possible. *)
 val filter_arrow: Env.t -> type_expr -> type_expr * type_expr
         (* A special case of unification (with 'a -> 'b). *)
 val filter_method: Env.t -> string -> type_expr -> type_expr
       	(* A special case of unification (with {m : 'a; 'b}). *)
+
 val moregeneral: Env.t -> type_expr -> type_expr -> bool
         (* Check if the first type scheme is more general than the second. *)
+
 val equal: Env.t -> bool -> type_expr list -> type_expr list -> bool
         (* [equal env [x1...xn] tau [y1...yn] sigma]
            checks whether the parameterized types
            [/\x1.../\xn.tau] and [/\y1.../\yn.sigma] are equivalent. *)
-val opened_object: type_expr -> bool
+
 val enlarge_type: Env.t -> type_expr -> type_expr
       	(* Make a type larger *)
 val subtype : Env.t -> type_expr -> type_expr -> unit -> unit
         (* [subtype env t1 t2] checks that [t1] is a subtype of [t2].
            It accumulates the constraints the type variables must
            enforce and returns a function that inforce this
            constraints. *)
-val closed_schema: bool -> type_expr -> bool
-type closed_schema_result = Var of type_expr | Row_var of type_expr
-val closed_schema_verbose: type_expr -> closed_schema_result option
-        (* Check whether the given type scheme contains no non-generic
-           type variables *)
+
 val nondep_type: Env.t -> Ident.t -> type_expr -> type_expr
         (* Return a type equivalent to the given type but without
            references to the given module identifier. Raise [Not_found]
            if no such type exists. *)
 val nondep_class_type: Env.t -> Ident.t -> class_type -> class_type
         (* Same for class types. *)
-val substitute:
-        Env.t -> type_expr list -> type_expr list -> type_expr -> type_expr
-        (* [substitute [v1...vN] [t1...tN] t]
-           returns a copy of [t] where the [vi] are replaced
-           by the [ti]. *)
-val close_object: type_expr -> unit
-val set_object_name:
-      	type_expr -> type_expr list -> Ident.t -> unit
-val remove_object_name: type_expr -> unit
+
 val correct_abbrev: Env.t -> Ident.t -> type_expr list -> type_expr -> unit
+
+type closed_schema_result = Var of type_expr | Row_var of type_expr
+val closed_schema: bool -> type_expr -> bool
+val closed_schema_verbose: type_expr -> closed_schema_result option
+        (* Check whether the given type scheme contains no non-generic
+           type variables *)
+
 val unalias: type_expr -> type_expr
 val unroll_abbrev: Ident.t -> type_expr list -> type_expr -> type_expr
 val arity: type_expr -> int
         (* Return the arity (as for curried functions) of the given type. *)
-val none: type_expr
-        (* A dummy type expression *)
-
-exception Unify of (type_expr * type_expr) list
-exception Subtype of
-        (type_expr * type_expr) list * (type_expr * type_expr) list
-exception Cannot_expand
-exception Recursive_abbrev