diff options
author | Damien Doligez <damien.doligez-inria.fr> | 2012-07-30 18:04:46 +0000 |
---|---|---|
committer | Damien Doligez <damien.doligez-inria.fr> | 2012-07-30 18:04:46 +0000 |
commit | 997a678d5ee774930288bfec23d4b145ce45c078 (patch) | |
tree | ef26b1b6992733f6ee00a1f760ab1da89eaef315 /testsuite/tests/typing-recmod | |
parent | b7271628a25d208c90e77dce62ff0244a1c2fcdd (diff) | |
download | ocaml-997a678d5ee774930288bfec23d4b145ce45c078.tar.gz |
clean up TABs and whitespace
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12799 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'testsuite/tests/typing-recmod')
-rw-r--r-- | testsuite/tests/typing-recmod/t02bad.ml | 1 | ||||
-rw-r--r-- | testsuite/tests/typing-recmod/t08bad.ml | 1 | ||||
-rw-r--r-- | testsuite/tests/typing-recmod/t13ok.ml | 2 | ||||
-rw-r--r-- | testsuite/tests/typing-recmod/t14bad.ml | 2 | ||||
-rw-r--r-- | testsuite/tests/typing-recmod/t16ok.ml | 1 | ||||
-rw-r--r-- | testsuite/tests/typing-recmod/t17ok.ml | 5 | ||||
-rw-r--r-- | testsuite/tests/typing-recmod/t18ok.ml | 3 | ||||
-rw-r--r-- | testsuite/tests/typing-recmod/t19ok.ml | 1 | ||||
-rw-r--r-- | testsuite/tests/typing-recmod/t22ok.ml | 20 |
9 files changed, 15 insertions, 21 deletions
diff --git a/testsuite/tests/typing-recmod/t02bad.ml b/testsuite/tests/typing-recmod/t02bad.ml index ac9d6390c2..b4301a417e 100644 --- a/testsuite/tests/typing-recmod/t02bad.ml +++ b/testsuite/tests/typing-recmod/t02bad.ml @@ -1,4 +1,3 @@ (* Bad (t = t) *) module rec A : sig type t = B.t end = struct type t = B.t end and B : sig type t = A.t end = struct type t = A.t end;; - diff --git a/testsuite/tests/typing-recmod/t08bad.ml b/testsuite/tests/typing-recmod/t08bad.ml index 7df3d47609..5ebafd11ab 100644 --- a/testsuite/tests/typing-recmod/t08bad.ml +++ b/testsuite/tests/typing-recmod/t08bad.ml @@ -2,4 +2,3 @@ module rec A : sig type 'a t = <m: 'a list B.t; n: 'a array B.t> end = struct type 'a t = <m: 'a list B.t; n: 'a array B.t> end and B : sig type 'a t = 'a A.t end = struct type 'a t = 'a A.t end;; - diff --git a/testsuite/tests/typing-recmod/t13ok.ml b/testsuite/tests/typing-recmod/t13ok.ml index 729afd516a..4fea6e1faf 100644 --- a/testsuite/tests/typing-recmod/t13ok.ml +++ b/testsuite/tests/typing-recmod/t13ok.ml @@ -1,5 +1,5 @@ (* OK *) class type [ 'node ] extension = object method node : 'node end -class type [ 'ext ] node = object constraint 'ext = 'ext node #extension end +class type [ 'ext ] node = object constraint 'ext = 'ext node #extension end class x = object method node : x node = assert false end type t = x node;; diff --git a/testsuite/tests/typing-recmod/t14bad.ml b/testsuite/tests/typing-recmod/t14bad.ml index 5c665368e8..1b92a28c5c 100644 --- a/testsuite/tests/typing-recmod/t14bad.ml +++ b/testsuite/tests/typing-recmod/t14bad.ml @@ -13,5 +13,5 @@ module PR_4261 = struct end module rec U : T with module D = U' = U - and U' : S with type t = U'.t = U + and U' : S with type t = U'.t = U end;; diff --git a/testsuite/tests/typing-recmod/t16ok.ml b/testsuite/tests/typing-recmod/t16ok.ml index f42de7b7a6..583b69bb52 100644 --- a/testsuite/tests/typing-recmod/t16ok.ml +++ b/testsuite/tests/typing-recmod/t16ok.ml @@ -28,4 +28,3 @@ module PR_4450_2 = struct let create l = new c l end end;; - diff --git a/testsuite/tests/typing-recmod/t17ok.ml b/testsuite/tests/typing-recmod/t17ok.ml index a2ea895adb..4521b66cfa 100644 --- a/testsuite/tests/typing-recmod/t17ok.ml +++ b/testsuite/tests/typing-recmod/t17ok.ml @@ -25,18 +25,17 @@ struct type t = I of int * int | D of int * Diet.t * int val compare : t -> t -> int val iter : (int -> unit) -> t -> unit - end = + end = struct type t = I of int * int | D of int * Diet.t * int let compare x1 x2 = 0 let rec iter f = function | I (l, r) -> for i = l to r do f i done | D (_, d, _) -> Diet.iter (iter f) d - end + end and Diet : SET with type t = Elt.t tree and type elt = Elt.t = MakeDiet(Elt) type t = Diet.t let iter f = Diet.iter (Elt.iter f) end - diff --git a/testsuite/tests/typing-recmod/t18ok.ml b/testsuite/tests/typing-recmod/t18ok.ml index 4f5814deb2..64fcf6aba8 100644 --- a/testsuite/tests/typing-recmod/t18ok.ml +++ b/testsuite/tests/typing-recmod/t18ok.ml @@ -22,5 +22,4 @@ and DirHash end = struct type t = DirCompare.t list - end - + end diff --git a/testsuite/tests/typing-recmod/t19ok.ml b/testsuite/tests/typing-recmod/t19ok.ml index cd2dde8ec2..62e5f45486 100644 --- a/testsuite/tests/typing-recmod/t19ok.ml +++ b/testsuite/tests/typing-recmod/t19ok.ml @@ -10,4 +10,3 @@ module PR_4758 = struct module Other = A end end - diff --git a/testsuite/tests/typing-recmod/t22ok.ml b/testsuite/tests/typing-recmod/t22ok.ml index 0aa63afdd6..de96eced55 100644 --- a/testsuite/tests/typing-recmod/t22ok.ml +++ b/testsuite/tests/typing-recmod/t22ok.ml @@ -112,7 +112,7 @@ module rec Strengthen ;; module rec Strengthen2 - : sig type t + : sig type t val f : t -> t module M : sig type u end module R : sig type v end @@ -150,7 +150,7 @@ module rec PolyRec | Node(l,r) -> 1 + max (PolyRec.depth l) (PolyRec.depth r) end ;; - + (* Wrong LHS signatures (PR#4336) *) (* @@ -212,7 +212,7 @@ and Binding : sig type t = (string * Expr.t) list val fv: t -> StringSet.t - val bv: t -> StringSet.t + val bv: t -> StringSet.t val simpl: t -> t end = struct @@ -258,7 +258,7 @@ module type HEAP = val deleteMin: heap -> heap end -module Bootstrap (MakeH: functor (Element:ORDERED) -> +module Bootstrap (MakeH: functor (Element:ORDERED) -> HEAP with module Elem = Element) (Element: ORDERED) : HEAP with module Elem = Element = struct @@ -268,7 +268,7 @@ module Bootstrap (MakeH: functor (Element:ORDERED) -> val eq: t -> t -> bool val lt: t -> t -> bool val leq: t -> t -> bool - end + end = struct type t = E | H of Elem.t * PrimH.heap let leq t1 t2 = @@ -432,7 +432,7 @@ module rec Coerce1 module A = (Coerce1: sig val f: int -> int end) let g x = x let f x = if x <= 0 then 1 else A.f (x-1) * x - end + end ;; let _ = @@ -461,7 +461,7 @@ module Coerce4(A : sig val f : int -> int end) = struct end module rec Coerce5 - : sig val blabla: int -> int val f: int -> int end + : sig val blabla: int -> int val f: int -> int end = struct let blabla x = 0 let f x = 5 end and Coerce6 : sig val at: int -> int end @@ -473,16 +473,16 @@ let _ = (* Miscellaneous bug reports *) -module rec F +module rec F : sig type t = X of int | Y of int val f: t -> bool end = struct - type t = X of int | Y of int + type t = X of int | Y of int let f = function | X _ -> false | _ -> true - end;; + end;; let _ = test 100 (F.f (F.X 1)) false; |