diff options
| author | Alain Frisch <alain@frisch.fr> | 2013-08-30 14:31:27 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2013-08-30 14:31:27 +0000 |
| commit | bc05874f5d66777191d35960516387045a1d6877 (patch) | |
| tree | aaccc524f8b12c8062aa230ecf16ad171659aa99 | |
| parent | bbb30a93b2aa3860456b411d5099f8320ed940c3 (diff) | |
| download | ocaml-bc05874f5d66777191d35960516387045a1d6877.tar.gz | |
Accept changes.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14049 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | testsuite/tests/typing-gadts/pr5985.ml.reference | 12 | ||||
| -rw-r--r-- | testsuite/tests/typing-gadts/unify_mb.ml.principal.reference | 2 | ||||
| -rw-r--r-- | testsuite/tests/typing-gadts/unify_mb.ml.reference | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/testsuite/tests/typing-gadts/pr5985.ml.reference b/testsuite/tests/typing-gadts/pr5985.ml.reference index fc7d792a88..e9fa3461e4 100644 --- a/testsuite/tests/typing-gadts/pr5985.ml.reference +++ b/testsuite/tests/typing-gadts/pr5985.ml.reference @@ -4,10 +4,10 @@ ^^^^^^^^^^^^^^^^^^^^^^^ Error: In this definition, a type variable cannot be deduced from the type parameters. -# * * * Characters 131-134: +# * * * Characters 140-141: module F (S : sig type #'a s end) = struct - ^^^ -Syntax error: 'end' expected, the highlighted 'sig' might be unmatched + ^ +Error: Syntax error # * * * * * Characters 296-374: ........['a] c x = object constraint 'a = 'b T.t val x' : 'b = x method x = x' end @@ -31,10 +31,10 @@ Error: In this definition, a type variable cannot be deduced ^ Error: Unbound module type S # * * module M : sig type 'a t = 'a -> unit end -# Characters 11-14: +# Characters 20-21: module F(X:sig type #'a t end) = - ^^^ -Syntax error: 'end' expected, the highlighted 'sig' might be unmatched + ^ +Error: Syntax error # * * * * type 'a q = Q # Characters 5-36: type +'a t = 'b constraint 'a = 'b q;; diff --git a/testsuite/tests/typing-gadts/unify_mb.ml.principal.reference b/testsuite/tests/typing-gadts/unify_mb.ml.principal.reference index 62e1d1fc89..90e69dc0f6 100644 --- a/testsuite/tests/typing-gadts/unify_mb.ml.principal.reference +++ b/testsuite/tests/typing-gadts/unify_mb.ml.principal.reference @@ -30,7 +30,7 @@ val weaken_term : 'a term -> 'a succ term = <fun> val weaken_alist : ('m, 'n) alist -> ('m succ, 'n succ) alist = <fun> val sub' : 'm ealist -> 'm fin -> 'm term = <fun> val subst' : 'a ealist -> 'a term -> 'a term = <fun> -# val flex_flex : 'a succ fin -> 'a succ fin -> 'a succ ealist = <fun> +# val flex_flex : 'a succ fin -> 'a succ fin -> 'a succ ealist = <fun> val flex_rigid : 'a succ fin -> 'a succ term -> 'a succ ealist option = <fun> val amgu : 'm term -> 'm term -> 'm ealist -> 'm ealist option = <fun> val mgu : 'a term -> 'a term -> 'a ealist option = <fun> diff --git a/testsuite/tests/typing-gadts/unify_mb.ml.reference b/testsuite/tests/typing-gadts/unify_mb.ml.reference index 62e1d1fc89..90e69dc0f6 100644 --- a/testsuite/tests/typing-gadts/unify_mb.ml.reference +++ b/testsuite/tests/typing-gadts/unify_mb.ml.reference @@ -30,7 +30,7 @@ val weaken_term : 'a term -> 'a succ term = <fun> val weaken_alist : ('m, 'n) alist -> ('m succ, 'n succ) alist = <fun> val sub' : 'm ealist -> 'm fin -> 'm term = <fun> val subst' : 'a ealist -> 'a term -> 'a term = <fun> -# val flex_flex : 'a succ fin -> 'a succ fin -> 'a succ ealist = <fun> +# val flex_flex : 'a succ fin -> 'a succ fin -> 'a succ ealist = <fun> val flex_rigid : 'a succ fin -> 'a succ term -> 'a succ ealist option = <fun> val amgu : 'm term -> 'm term -> 'm ealist -> 'm ealist option = <fun> val mgu : 'a term -> 'a term -> 'a ealist option = <fun> |