diff options
| author | Xavier Clerc <xavier.clerc@inria.fr> | 2010-05-03 09:36:13 +0000 |
|---|---|---|
| committer | Xavier Clerc <xavier.clerc@inria.fr> | 2010-05-03 09:36:13 +0000 |
| commit | 5dad1ef1618c32af4ecef25c75e3055d91584ac9 (patch) | |
| tree | 96bf47440c508a75a74c77b92df0cab3dc2e5901 | |
| parent | b443ee91ff92ffcbb21d0dce9b9cc35f32cb466e (diff) | |
The warning related to method overriding is now disabled.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10349 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | testsuite/tests/typing-poly/poly.ml.principal.reference | 19 | ||||
| -rw-r--r-- | testsuite/tests/typing-poly/poly.ml.reference | 19 |
2 files changed, 4 insertions, 34 deletions
diff --git a/testsuite/tests/typing-poly/poly.ml.principal.reference b/testsuite/tests/typing-poly/poly.ml.principal.reference index 9187c7122..8b1b45a66 100644 --- a/testsuite/tests/typing-poly/poly.ml.principal.reference +++ b/testsuite/tests/typing-poly/poly.ml.principal.reference @@ -218,23 +218,8 @@ val f4 : id -> int * bool = <fun> end # val id : 'a -> 'a = <fun> # class c : object method id : 'a -> 'a end -# [A[A[A[A[A# class c' = object - inherit c - [4mmethod id = id[m - end - ;; -[mWarning 7: the method id is overridden. -class c' : object method id : 'a -> 'a end -# [A[A[A[A[A[A[A[A# class d = object - inherit c as c - val mutable count = 0 - [4mmethod id x = count <- count+1; x[m - method count = count - method old : 'a. 'a -> 'a = c#id - end - ;; -[mWarning 7: the method id is overridden. -class d : +# class c' : object method id : 'a -> 'a end +# class d : object val mutable count : int method count : int diff --git a/testsuite/tests/typing-poly/poly.ml.reference b/testsuite/tests/typing-poly/poly.ml.reference index 48b47f3c8..e599b19c1 100644 --- a/testsuite/tests/typing-poly/poly.ml.reference +++ b/testsuite/tests/typing-poly/poly.ml.reference @@ -204,23 +204,8 @@ and b : object method id : 'a -> 'a end end # val id : 'a -> 'a = <fun> # class c : object method id : 'a -> 'a end -# [A[A[A[A[A# class c' = object - inherit c - [4mmethod id = id[m - end - ;; -[mWarning 7: the method id is overridden. -class c' : object method id : 'a -> 'a end -# [A[A[A[A[A[A[A[A# class d = object - inherit c as c - val mutable count = 0 - [4mmethod id x = count <- count+1; x[m - method count = count - method old : 'a. 'a -> 'a = c#id - end - ;; -[mWarning 7: the method id is overridden. -class d : +# class c' : object method id : 'a -> 'a end +# class d : object val mutable count : int method count : int |