summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2003-03-20 07:34:48 +0000
committerJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2003-03-20 07:34:48 +0000
commit33c042b21682cff0697dace286888bfa295be24e (patch)
tree8e6fdea3b8d8329977724ce19f5827a3bb609e6f
parent66838ed0bc172e8143e4f8eb1cea08b18758ff72 (diff)
output format changes
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5441 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--testlabl/poly.exp32
-rw-r--r--testlabl/poly.exp232
2 files changed, 32 insertions, 32 deletions
diff --git a/testlabl/poly.exp b/testlabl/poly.exp
index 93c682c62..c4391600f 100644
--- a/testlabl/poly.exp
+++ b/testlabl/poly.exp
@@ -1,4 +1,4 @@
- Objective Caml version 3.06+19 (2002-12-03)
+ Objective Caml version 3.06+24 (2003-02-28)
# * * * # type 'a t = { t : 'a; }
# type 'a fold = { fold : 'b. f:('b -> 'a -> 'b) -> init:'b -> 'b; }
@@ -84,14 +84,14 @@
method hd : 'a
method tl : 'b
end
-# class vari : object method m : [< `A | `B | `C] -> int end
-# class vari : object method m : [< `A | `B | `C] -> int end
-# module V : sig type v = [ `A | `B | `C] val m : [< v] -> int end
-# class varj : object method m : [< V.v] -> int end
+# class vari : object method m : [< `A | `B | `C ] -> int end
+# class vari : object method m : [< `A | `B | `C ] -> int end
+# module V : sig type v = [ `A | `B | `C ] val m : [< v ] -> int end
+# class varj : object method m : [< V.v ] -> int end
# module type T =
- sig class vari : object method m : [< `A | `B | `C] -> int end end
+ sig class vari : object method m : [< `A | `B | `C ] -> int end end
# module M0 :
- sig class vari : object method m : [< `A | `B | `C] -> int end end
+ sig class vari : object method m : [< `A | `B | `C ] -> int end end
# module M : T
# val v : M.vari = <obj>
# - : int = 1
@@ -118,7 +118,7 @@
val p1 : point = <obj>
val cp : color_point = <obj>
val c : circle = <obj>
-val d : float = 11.45362404707371
+val d : float = 11.4536240470737098
# val f : < m : 'a. 'a -> 'a > -> < m : 'a. 'a -> 'a > = <fun>
# Characters 41-42:
This expression has type < m : 'a. 'a -> 'a list > but is here used with type
@@ -193,7 +193,7 @@ The type abbreviation foo is cyclic
# val count : 'a #olist -> int = <fun>
# val append : 'a #olist -> ('a #olist as 'b) -> 'b = <fun>
# type 'a t = unit
-# class o : object method x : [> `A] t -> unit end
+# class o : object method x : [> `A ] t -> unit end
# class c : object method m : d end
class d : ?x:int -> unit -> object end
# class d : ?x:int -> unit -> object end
@@ -201,9 +201,9 @@ class c : object method m : d end
# class type numeral = object method fold : ('a -> 'a) -> 'a -> 'a end
class zero : object method fold : ('a -> 'a) -> 'a -> 'a end
class next : #numeral -> object method fold : ('a -> 'a) -> 'a -> 'a end
-# class type node_type = object method as_variant : [> `Node of node_type] end
+# class type node_type = object method as_variant : [> `Node of node_type ] end
# class node : node_type
-# class node : object method as_variant : [> `Node of node_type] end
+# class node : object method as_variant : [> `Node of node_type ] end
# type bad = { bad : 'a. 'a option ref; }
# Characters 17-25:
This field value has type 'a option ref which is less general than
@@ -213,9 +213,9 @@ This field value has type 'a option ref which is less general than
# Characters 13-28:
This field value has type 'a option ref option which is less general than
'b. 'b option ref option
-# type 'a t = [ `A of 'a]
-# class c : object method m : ([> 'a t] as 'a) -> unit end
-# class c : object method m : ([> 'a t] as 'a) -> unit end
-# class c : object method m : ([> 'a t] as 'a) -> 'a end
-# class c : object method m : ([> `A] as 'a) option -> 'a end
+# type 'a t = [ `A of 'a ]
+# class c : object method m : ([> 'a t ] as 'a) -> unit end
+# class c : object method m : ([> 'a t ] as 'a) -> unit end
+# class c : object method m : ([> 'a t ] as 'a) -> 'a end
+# class c : object method m : ([> `A ] as 'a) option -> 'a end
#
diff --git a/testlabl/poly.exp2 b/testlabl/poly.exp2
index 7021301a7..804b8ee0c 100644
--- a/testlabl/poly.exp2
+++ b/testlabl/poly.exp2
@@ -1,4 +1,4 @@
- Objective Caml version 3.06+19 (2002-12-03)
+ Objective Caml version 3.06+24 (2003-02-28)
# * * * # type 'a t = { t : 'a; }
# type 'a fold = { fold : 'b. f:('b -> 'a -> 'b) -> init:'b -> 'b; }
@@ -84,14 +84,14 @@
method hd : 'a
method tl : 'b
end
-# class vari : object method m : [< `A | `B | `C] -> int end
-# class vari : object method m : [< `A | `B | `C] -> int end
-# module V : sig type v = [ `A | `B | `C] val m : [< v] -> int end
-# class varj : object method m : [< V.v] -> int end
+# class vari : object method m : [< `A | `B | `C ] -> int end
+# class vari : object method m : [< `A | `B | `C ] -> int end
+# module V : sig type v = [ `A | `B | `C ] val m : [< v ] -> int end
+# class varj : object method m : [< V.v ] -> int end
# module type T =
- sig class vari : object method m : [< `A | `B | `C] -> int end end
+ sig class vari : object method m : [< `A | `B | `C ] -> int end end
# module M0 :
- sig class vari : object method m : [< `A | `B | `C] -> int end end
+ sig class vari : object method m : [< `A | `B | `C ] -> int end end
# module M : T
# val v : M.vari = <obj>
# - : int = 1
@@ -118,7 +118,7 @@
val p1 : point = <obj>
val cp : color_point = <obj>
val c : circle = <obj>
-val d : float = 11.45362404707371
+val d : float = 11.4536240470737098
# val f : < m : 'a. 'a -> 'a > -> < m : 'b. 'b -> 'b > = <fun>
# Characters 41-42:
This expression has type < m : 'a. 'a -> 'a list > but is here used with type
@@ -200,7 +200,7 @@ The type abbreviation foo is cyclic
# val count : 'a #olist -> int = <fun>
# val append : 'a #olist -> ('a #olist as 'b) -> 'b = <fun>
# type 'a t = unit
-# class o : object method x : [> `A] t -> unit end
+# class o : object method x : [> `A ] t -> unit end
# class c : object method m : d end
class d : ?x:int -> unit -> object end
# class d : ?x:int -> unit -> object end
@@ -208,9 +208,9 @@ class c : object method m : d end
# class type numeral = object method fold : ('a -> 'a) -> 'a -> 'a end
class zero : object method fold : ('a -> 'a) -> 'a -> 'a end
class next : #numeral -> object method fold : ('a -> 'a) -> 'a -> 'a end
-# class type node_type = object method as_variant : [> `Node of node_type] end
+# class type node_type = object method as_variant : [> `Node of node_type ] end
# class node : node_type
-# class node : object method as_variant : [> `Node of node_type] end
+# class node : object method as_variant : [> `Node of node_type ] end
# type bad = { bad : 'a. 'a option ref; }
# Characters 17-25:
This field value has type 'a option ref which is less general than
@@ -220,9 +220,9 @@ This field value has type 'a option ref which is less general than
# Characters 13-28:
This field value has type 'a option ref option which is less general than
'b. 'b option ref option
-# type 'a t = [ `A of 'a]
-# class c : object method m : ([> 'a t] as 'a) -> unit end
-# class c : object method m : ([> 'a t] as 'a) -> unit end
-# class c : object method m : ([> 'a t] as 'a) -> 'a end
-# class c : object method m : ([> `A] as 'a) option -> 'a end
+# type 'a t = [ `A of 'a ]
+# class c : object method m : ([> 'a t ] as 'a) -> unit end
+# class c : object method m : ([> 'a t ] as 'a) -> unit end
+# class c : object method m : ([> 'a t ] as 'a) -> 'a end
+# class c : object method m : ([> `A ] as 'a) option -> 'a end
#