summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérôme Vouillon <Jerome.Vouillon@pps.jussieu.fr>1997-03-07 22:29:31 +0000
committerJérôme Vouillon <Jerome.Vouillon@pps.jussieu.fr>1997-03-07 22:29:31 +0000
commit7dbe12f98b6e21ad12481f9f783683783be60b9a (patch)
tree93017de3ac14f75a60d53c42c91c4c03cc1dd79e
parent3a88e177ede85f96f73c085091beca30b54923eb (diff)
Un test supplementaire.
Utilisation de ../ocaml. L'en-tete ("Objective Caml version xxx") est ignoree. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1332 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--testobjects/Exemples.exp2
-rw-r--r--testobjects/Makefile4
-rw-r--r--testobjects/Tests.exp10
-rw-r--r--testobjects/Tests.ml7
4 files changed, 16 insertions, 7 deletions
diff --git a/testobjects/Exemples.exp b/testobjects/Exemples.exp
index ed2e204c3..82bd956c1 100644
--- a/testobjects/Exemples.exp
+++ b/testobjects/Exemples.exp
@@ -1,5 +1,3 @@
- Objective Caml version 1.04-3
-
# class point (int) =
val mutable x : int
method get_x : int
diff --git a/testobjects/Makefile b/testobjects/Makefile
index fea7f6046..fb8efdb91 100644
--- a/testobjects/Makefile
+++ b/testobjects/Makefile
@@ -3,9 +3,9 @@
test: Tests Exemples
Tests:
- TERM=dumb ocaml < Tests.ml > Tests.proc
+ TERM=dumb ../ocaml < Tests.ml | tail +3 > Tests.proc
- diff Tests.exp Tests.proc
Exemples:
- TERM=dumb ocaml < Exemples.ml > Exemples.proc
+ TERM=dumb ../ocaml < Exemples.ml | tail +3 > Exemples.proc
- diff Exemples.exp Exemples.proc
diff --git a/testobjects/Tests.exp b/testobjects/Tests.exp
index 39d938c56..95cfb8a64 100644
--- a/testobjects/Tests.exp
+++ b/testobjects/Tests.exp
@@ -1,5 +1,3 @@
- Objective Caml version 1.04-3
-
# - : < x : int > ->
< x : int > -> < x : int > -> < x : int > * < x : int > * < x : int >
= <fun>
@@ -201,7 +199,7 @@ is not included in
Multiple definition of the type name t.
Names must be unique in a given structure.
# - : (< m : (< m : 'b -> 'b > as 'b) -> 'a; .. > as 'a) ->
- < m : 'c -> 'c > as 'c
+ (< m : 'c -> 'c > as 'c)
= <fun>
# Characters 10-39:
Type int -> bool is not a subtype of type int -> int
@@ -214,4 +212,10 @@ Type bool is not a subtype of type int
# val x : '_a list ref = {contents=[]}
# module F : functor(X : sig end) -> sig type t = int end
# - : < m : int > list ref = {contents=[]}
+# type 'a t
+# - : ('a t as 'a) -> unit = <fun>
+# - : ('a t as 'a) -> unit = <fun>
+# type 'a t = < x : 'a >
+# - : (< x : 'a > as 'a) t -> unit = <fun>
+# - : (< x : 'a > as 'a) t -> unit = <fun>
#
diff --git a/testobjects/Tests.ml b/testobjects/Tests.ml
index 74fd26ee5..5daee409c 100644
--- a/testobjects/Tests.ml
+++ b/testobjects/Tests.ml
@@ -282,3 +282,10 @@ let x = ref [];;
module F(X : sig end) =
struct type t = int let _ = (x : < m : t> list ref) end;;
x;;
+
+type 'a t;;
+fun (x : 'a t as 'a) -> ();;
+fun (x : 'a t) -> (x : 'a); ();;
+type 'a t = < x : 'a >;;
+fun (x : 'a t as 'a) -> ();;
+fun (x : 'a t) -> (x : 'a); ();;