From 598b2974f90c68a658509c3cd04c08470d88b7e6 Mon Sep 17 00:00:00 2001 From: simonmar Date: Wed, 8 Aug 2001 14:25:15 +0000 Subject: [PATCH] [project @ 2001-08-08 14:23:09 by simonmar] update expected output --- ghc/tests/reader/should_compile/read014.stderr | 10 +++++----- ghc/tests/reader/should_fail/read003.stderr | 2 +- ghc/tests/reader/should_fail/read007.stderr | 6 +++++- ghc/tests/rename/should_fail/rnfail001.stderr | 2 +- ghc/tests/rename/should_fail/rnfail004.stderr | 4 ++-- ghc/tests/rename/should_fail/rnfail014.stderr | 20 +++----------------- ghc/tests/rename/should_fail/rnfail019.stderr | 2 +- ghc/tests/rename/should_fail/rnfail020.stderr | 7 ++++--- 8 files changed, 22 insertions(+), 31 deletions(-) diff --git a/ghc/tests/reader/should_compile/read014.stderr b/ghc/tests/reader/should_compile/read014.stderr index 302d505..9430e68 100644 --- a/ghc/tests/reader/should_compile/read014.stderr +++ b/ghc/tests/reader/should_compile/read014.stderr @@ -7,20 +7,20 @@ read014.hs:8: Warning: Defined but not used: x read014.hs:6: Warning: No explicit method nor default method for `*' - in an instance declaration for `Num' + In the instance declaration for `Num (a, b)' read014.hs:6: Warning: No explicit method nor default method for `+' - in an instance declaration for `Num' + In the instance declaration for `Num (a, b)' read014.hs:6: Warning: No explicit method nor default method for `signum' - in an instance declaration for `Num' + In the instance declaration for `Num (a, b)' read014.hs:6: Warning: No explicit method nor default method for `abs' - in an instance declaration for `Num' + In the instance declaration for `Num (a, b)' read014.hs:6: Warning: No explicit method nor default method for `fromInteger' - in an instance declaration for `Num' + In the instance declaration for `Num (a, b)' diff --git a/ghc/tests/reader/should_fail/read003.stderr b/ghc/tests/reader/should_fail/read003.stderr index 2b3f3bd..13f34c5 100644 --- a/ghc/tests/reader/should_fail/read003.stderr +++ b/ghc/tests/reader/should_fail/read003.stderr @@ -3,4 +3,4 @@ read003.hs:4: Occurs check: cannot construct the infinite type: t = (t, [a], t1) Expected type: (t, [a], t1) Inferred type: t - in a pattern binding: a + In a pattern binding: a diff --git a/ghc/tests/reader/should_fail/read007.stderr b/ghc/tests/reader/should_fail/read007.stderr index f78aa2a..72470b1 100644 --- a/ghc/tests/reader/should_fail/read007.stderr +++ b/ghc/tests/reader/should_fail/read007.stderr @@ -2,4 +2,8 @@ read007.hs:6: `+' is not a data constructor In the pattern: 2 + 2 - in a `do' expression pattern binding: (2 + 2) <- 2 + In a 'do' expression pattern binding: (2 + 2) <- 2 + In the definition of `f': + do + (2 + 2) <- 2 + return x diff --git a/ghc/tests/rename/should_fail/rnfail001.stderr b/ghc/tests/rename/should_fail/rnfail001.stderr index 193391f..c640624 100644 --- a/ghc/tests/rename/should_fail/rnfail001.stderr +++ b/ghc/tests/rename/should_fail/rnfail001.stderr @@ -1,4 +1,4 @@ rnfail001.hs:3: Conflicting definitions for `x' - in a pattern match + In the definition of `f' diff --git a/ghc/tests/rename/should_fail/rnfail004.stderr b/ghc/tests/rename/should_fail/rnfail004.stderr index d4d3a9a..73100a7 100644 --- a/ghc/tests/rename/should_fail/rnfail004.stderr +++ b/ghc/tests/rename/should_fail/rnfail004.stderr @@ -1,8 +1,8 @@ rnfail004.hs:7: Conflicting definitions for `a' - in a binding group + In a binding group rnfail004.hs:8: Conflicting definitions for `b' - in a binding group + In a binding group diff --git a/ghc/tests/rename/should_fail/rnfail014.stderr b/ghc/tests/rename/should_fail/rnfail014.stderr index efa87ae..2c87641 100644 --- a/ghc/tests/rename/should_fail/rnfail014.stderr +++ b/ghc/tests/rename/should_fail/rnfail014.stderr @@ -1,20 +1,6 @@ -rnfail014.hs:8: - Ambiguous constraint `Eq a' - in the type: Eq Bool - Each forall-d type variable mentioned by the constraint must appear after the =>. - In the type signature for an instance decl - -rnfail014.hs:12: - Ambiguous constraint `Eq a' - in the type: Int -> Int - Each forall-d type variable mentioned by the constraint must appear after the =>. - In the type signature for `f' - rnfail014.hs:17: - All of the type variable(s) in the constraint `Eq a' are already in scope + All of the type variables in the constraint `Eq a' are already in scope At least one must be universally quantified here - In the type signature for `op' - -Compilation had errors - + In the type `(Eq a) => a -> a' + In the class declaration for `Foo' diff --git a/ghc/tests/rename/should_fail/rnfail019.stderr b/ghc/tests/rename/should_fail/rnfail019.stderr index e2305c3..f47d357 100644 --- a/ghc/tests/rename/should_fail/rnfail019.stderr +++ b/ghc/tests/rename/should_fail/rnfail019.stderr @@ -2,4 +2,4 @@ rnfail019.hs:5: The operator `:' [infixr 5] of a section must have lower precedence than the operand `(:)' [infixr 5] - In the section: `((x : y) :)' + in the section: `((x : y) :)' diff --git a/ghc/tests/rename/should_fail/rnfail020.stderr b/ghc/tests/rename/should_fail/rnfail020.stderr index 461dc6d..a2298c0 100644 --- a/ghc/tests/rename/should_fail/rnfail020.stderr +++ b/ghc/tests/rename/should_fail/rnfail020.stderr @@ -1,9 +1,10 @@ rnfail020.hs:12: - The constraint `Eq a' does not mention any of the universally quantified type variables - in the type `(Eq a) => Set a -> Set a -> Set a' + All of the type variables in the constraint `Eq a' are already in scope + At least one must be universally quantified here + In the type `(Eq a) => Set a -> Set a -> Set a' In a type signature for `unionSets' - In an equation for function `unionSetB': + In the definition of `unionSetB': unionSetB (s1 :: Set a) s2 = unionSets s1 s2 where -- 1.7.10.4