diff options
Diffstat (limited to 'testsuite/tests')
29 files changed, 57 insertions, 55 deletions
diff --git a/testsuite/tests/ghci.debugger/scripts/break001.stdout b/testsuite/tests/ghci.debugger/scripts/break001.stdout index 09deeb7c1d..c3146e2351 100644 --- a/testsuite/tests/ghci.debugger/scripts/break001.stdout +++ b/testsuite/tests/ghci.debugger/scripts/break001.stdout @@ -10,8 +10,8 @@ _result :: t = _ Stopped at ../Test2.hs:5:7 _result :: Integer = _ y :: Integer = 1 -_result :: Integer = _ y :: Integer = 1 +_result :: Integer = _ 1 y = 1 () diff --git a/testsuite/tests/ghci.debugger/scripts/break003.stderr b/testsuite/tests/ghci.debugger/scripts/break003.stderr index f640cb0fab..f5944094e7 100644 --- a/testsuite/tests/ghci.debugger/scripts/break003.stderr +++ b/testsuite/tests/ghci.debugger/scripts/break003.stderr @@ -1,5 +1,5 @@ -<interactive>:1:1: +<interactive>:5:1: No instance for (Show (t -> a)) arising from a use of `print' Possible fix: add an instance declaration for (Show (t -> a)) diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stderr b/testsuite/tests/ghci.debugger/scripts/break006.stderr index 31c3f94f1b..40bb7861e0 100644 --- a/testsuite/tests/ghci.debugger/scripts/break006.stderr +++ b/testsuite/tests/ghci.debugger/scripts/break006.stderr @@ -1,12 +1,12 @@ -<interactive>:1:1: +<interactive>:6:1: Ambiguous type variable `a' in the constraint: (Show a) arising from a use of `print' Cannot resolve unknown runtime types: a Use :print or :force to determine these types In a stmt of an interactive GHCi command: print it -<interactive>:1:1: +<interactive>:8:1: Ambiguous type variable `a' in the constraint: (Show a) arising from a use of `print' Cannot resolve unknown runtime types: a diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stdout b/testsuite/tests/ghci.debugger/scripts/break006.stdout index 0f8c8915b1..b78f4f365b 100644 --- a/testsuite/tests/ghci.debugger/scripts/break006.stdout +++ b/testsuite/tests/ghci.debugger/scripts/break006.stdout @@ -5,16 +5,16 @@ _result :: [a] = _ f :: Integer -> a = _ x :: Integer = 1 xs :: [Integer] = [2,3] -_result :: [a] = _ -f :: Integer -> a = _ -x :: Integer = 1 xs :: [Integer] = [2,3] +x :: Integer = 1 +f :: Integer -> a = _ +_result :: [a] = _ y = (_t1::a) y = 2 -_result :: [Integer] = _ -_t1 :: Integer = 2 -f :: Integer -> Integer = _ -x :: Integer = 1 xs :: [Integer] = [2,3] +x :: Integer = 1 +f :: Integer -> Integer = _ +_result :: [Integer] = _ y :: Integer = 2 +_t1 :: Integer = 2 2 diff --git a/testsuite/tests/ghci.debugger/scripts/break011.stdout b/testsuite/tests/ghci.debugger/scripts/break011.stdout index 7ca63b686a..afaa1fd438 100644 --- a/testsuite/tests/ghci.debugger/scripts/break011.stdout +++ b/testsuite/tests/ghci.debugger/scripts/break011.stdout @@ -17,7 +17,7 @@ Stopped at <exception thrown> _exception :: e already at the beginning of the history _exception = SomeException (ErrorCall "foo") -_exception :: SomeException = SomeException (ErrorCall "foo") _result :: a = _ +_exception :: SomeException = SomeException (ErrorCall "foo") *** Exception: foo *** Exception: foo diff --git a/testsuite/tests/ghci.debugger/scripts/break013.stdout b/testsuite/tests/ghci.debugger/scripts/break013.stdout index 9daa2db266..4c3d5f3d76 100644 --- a/testsuite/tests/ghci.debugger/scripts/break013.stdout +++ b/testsuite/tests/ghci.debugger/scripts/break013.stdout @@ -5,7 +5,7 @@ _result :: (Bool, Bool, ()) = _ a :: Bool = _ b :: Bool = _ c :: () = _ -_result :: (Bool, Bool, ()) = _ -a :: Bool = _ -b :: Bool = _ c :: () = _ +b :: Bool = _ +a :: Bool = _ +_result :: (Bool, Bool, ()) = _ diff --git a/testsuite/tests/ghci.debugger/scripts/hist001.stdout b/testsuite/tests/ghci.debugger/scripts/hist001.stdout index 68e05cc076..74cb483995 100644 --- a/testsuite/tests/ghci.debugger/scripts/hist001.stdout +++ b/testsuite/tests/ghci.debugger/scripts/hist001.stdout @@ -18,9 +18,9 @@ Logged breakpoint at ../Test3.hs:2:22-31 _result :: [a] f :: t -> a xs :: [t] -_result :: [a] = _ -f :: t -> a = _ xs :: [t] = [] +f :: t -> a = _ +_result :: [a] = _ *** Ignoring breakpoint _result = [] Logged breakpoint at ../Test3.hs:2:18-20 diff --git a/testsuite/tests/ghci.debugger/scripts/print003.stdout b/testsuite/tests/ghci.debugger/scripts/print003.stdout index e53860eeeb..74f18d264b 100644 --- a/testsuite/tests/ghci.debugger/scripts/print003.stdout +++ b/testsuite/tests/ghci.debugger/scripts/print003.stdout @@ -1,13 +1,13 @@ t = O (_t1::a) -_t1 :: a = _ t :: Opaque = O _ +_t1 :: a = _ () t = O ((_t2::a1) : (_t3::[a1])) +t :: Opaque = O (_ : _) _t1 :: [a] = _ : _ -_t2 :: a1 = _ -_t3 :: [a1] = _ it :: () = () -t :: Opaque = O (_ : _) +_t3 :: [a1] = _ +_t2 :: a1 = _ () t = O (Just [1,1] : (_t4::[Maybe [Integer]])) () diff --git a/testsuite/tests/ghci.debugger/scripts/print019.stderr b/testsuite/tests/ghci.debugger/scripts/print019.stderr index dcf63dd07e..5cc34662fe 100644 --- a/testsuite/tests/ghci.debugger/scripts/print019.stderr +++ b/testsuite/tests/ghci.debugger/scripts/print019.stderr @@ -1,5 +1,5 @@ -<interactive>:1:1: +<interactive>:11:1: Ambiguous type variable `a1' in the constraint: (Show a1) arising from a use of `print' Cannot resolve unknown runtime types: a1 diff --git a/testsuite/tests/ghci.debugger/scripts/print019.stdout b/testsuite/tests/ghci.debugger/scripts/print019.stdout index 9c48d11d8d..aea474019d 100644 --- a/testsuite/tests/ghci.debugger/scripts/print019.stdout +++ b/testsuite/tests/ghci.debugger/scripts/print019.stdout @@ -2,8 +2,8 @@ a = O (_t1::a) b = O (_t2::a1) () _t1 = 'a' -_t1 :: Char = 'a' -_t2 :: a1 = _ a :: Opaque = O 'a' b :: Opaque = O _ +_t1 :: Char = 'a' +_t2 :: a1 = _ it :: () = () diff --git a/testsuite/tests/ghci/scripts/ghci051.stdout b/testsuite/tests/ghci/scripts/ghci051.stdout index 1098275ab8..7ddd1c9b73 100644 --- a/testsuite/tests/ghci/scripts/ghci051.stdout +++ b/testsuite/tests/ghci/scripts/ghci051.stdout @@ -1,9 +1,11 @@ -data T = C | D -- Defined at <interactive>:0:10 -type T' = :Interactive.T -- Defined at <interactive>:0:6-7 -data :Interactive.T = A | ... -- Defined at <interactive>:0:10 -data :Interactive.T = B | ... -- Defined at <interactive>:0:12 -data T = C | ... -- Defined at <interactive>:0:14 -data T = ... | D -- Defined at <interactive>:0:18 -b :: T' -- Defined at <interactive>:0:5 -c :: :Interactive.T -- Defined at <interactive>:0:5 -d :: T -- Defined at <interactive>:0:5 +data T = C | D -- Defined at <interactive>:9:10 +type T' = main::Interactive.T -- Defined at <interactive>:4:6 +data main::Interactive.T = A | ... + -- Defined at <interactive>:3:10 +data main::Interactive.T = B | ... + -- Defined at <interactive>:6:12 +data T = C | ... -- Defined at <interactive>:9:14 +data T = ... | D -- Defined at <interactive>:9:18 +b :: T' -- Defined at <interactive>:5:5 +c :: main::Interactive.T -- Defined at <interactive>:8:5 +d :: T -- Defined at <interactive>:10:5 diff --git a/testsuite/tests/ghci/scripts/ghci053.stdout b/testsuite/tests/ghci/scripts/ghci053.stdout index 0244e7b587..796d204ecf 100644 --- a/testsuite/tests/ghci/scripts/ghci053.stdout +++ b/testsuite/tests/ghci/scripts/ghci053.stdout @@ -1,4 +1,4 @@ False True False -True
\ No newline at end of file +True diff --git a/testsuite/tests/ghci/scripts/ghci055.stdout b/testsuite/tests/ghci/scripts/ghci055.stdout index fa2acbec06..7b75a67818 100644 --- a/testsuite/tests/ghci/scripts/ghci055.stdout +++ b/testsuite/tests/ghci/scripts/ghci055.stdout @@ -1,3 +1,3 @@ *** Exception: Prelude.undefined -y :: Integer = _ x :: a = *** Exception: Prelude.undefined +y :: Integer = 3 diff --git a/testsuite/tests/module/mod18.stderr b/testsuite/tests/module/mod18.stderr index 2b9a800bc6..5f8ba3457b 100644 --- a/testsuite/tests/module/mod18.stderr +++ b/testsuite/tests/module/mod18.stderr @@ -1,5 +1,5 @@ mod18.hs:3:6: - Multiple declarations of `Main.T' + Multiple declarations of `T' Declared at: mod18.hs:2:6 mod18.hs:3:6 diff --git a/testsuite/tests/module/mod19.stderr b/testsuite/tests/module/mod19.stderr index a988040291..9178ceba40 100644 --- a/testsuite/tests/module/mod19.stderr +++ b/testsuite/tests/module/mod19.stderr @@ -1,10 +1,10 @@ mod19.hs:3:7: - Multiple declarations of `Main.C' + Multiple declarations of `C' Declared at: mod19.hs:2:7 mod19.hs:3:7 mod19.hs:3:17: - Multiple declarations of `Main.m' + Multiple declarations of `m' Declared at: mod19.hs:2:17 mod19.hs:3:17 diff --git a/testsuite/tests/module/mod20.stderr b/testsuite/tests/module/mod20.stderr index 355fe1c038..123564201a 100644 --- a/testsuite/tests/module/mod20.stderr +++ b/testsuite/tests/module/mod20.stderr @@ -1,5 +1,5 @@ mod20.hs:3:18: - Multiple declarations of `Main.m' + Multiple declarations of `m' Declared at: mod20.hs:2:18 mod20.hs:3:18 diff --git a/testsuite/tests/module/mod21.stderr b/testsuite/tests/module/mod21.stderr index 4a6a8edec7..b5a86c0749 100644 --- a/testsuite/tests/module/mod21.stderr +++ b/testsuite/tests/module/mod21.stderr @@ -1,5 +1,5 @@ mod21.hs:3:6: - Multiple declarations of `Main.T' + Multiple declarations of `T' Declared at: mod21.hs:2:6 mod21.hs:3:6 diff --git a/testsuite/tests/module/mod22.stderr b/testsuite/tests/module/mod22.stderr index 9cf3f768d2..786043d4f2 100644 --- a/testsuite/tests/module/mod22.stderr +++ b/testsuite/tests/module/mod22.stderr @@ -1,5 +1,5 @@ mod22.hs:3:11: - Multiple declarations of `Main.K' + Multiple declarations of `K' Declared at: mod22.hs:2:11 mod22.hs:3:11 diff --git a/testsuite/tests/module/mod38.stderr b/testsuite/tests/module/mod38.stderr index 2b124d5f6c..b04dd77f4b 100644 --- a/testsuite/tests/module/mod38.stderr +++ b/testsuite/tests/module/mod38.stderr @@ -1,5 +1,5 @@ mod38.hs:4:7: - Multiple declarations of `M.C' + Multiple declarations of `C' Declared at: mod38.hs:3:6 mod38.hs:4:7 diff --git a/testsuite/tests/module/mod66.stderr b/testsuite/tests/module/mod66.stderr index 7949ae3ec0..a1bf5a2af7 100644 --- a/testsuite/tests/module/mod66.stderr +++ b/testsuite/tests/module/mod66.stderr @@ -1,5 +1,5 @@ mod66.hs:5:1: - Multiple declarations of `M.f' + Multiple declarations of `f' Declared at: mod66.hs:3:1 mod66.hs:5:1 diff --git a/testsuite/tests/rename/should_fail/rn_dup.stderr b/testsuite/tests/rename/should_fail/rn_dup.stderr index 88e2f86413..e7859ea82c 100644 --- a/testsuite/tests/rename/should_fail/rn_dup.stderr +++ b/testsuite/tests/rename/should_fail/rn_dup.stderr @@ -1,22 +1,22 @@ rn_dup.hs:9:10: - Multiple declarations of `Dup.MkT' + Multiple declarations of `MkT' Declared at: rn_dup.hs:7:10 rn_dup.hs:7:16 rn_dup.hs:9:10 rn_dup.hs:12:16: - Multiple declarations of `Dup.rf' + Multiple declarations of `rf' Declared at: rn_dup.hs:11:16 rn_dup.hs:11:27 rn_dup.hs:12:16 rn_dup.hs:17:8: - Multiple declarations of `Dup.CT' + Multiple declarations of `CT' Declared at: rn_dup.hs:15:8 rn_dup.hs:17:8 rn_dup.hs:18:3: - Multiple declarations of `Dup.f' + Multiple declarations of `f' Declared at: rn_dup.hs:16:3 rn_dup.hs:18:3 diff --git a/testsuite/tests/rename/should_fail/rnfail002.stderr b/testsuite/tests/rename/should_fail/rnfail002.stderr index db236f3073..6f73137748 100644 --- a/testsuite/tests/rename/should_fail/rnfail002.stderr +++ b/testsuite/tests/rename/should_fail/rnfail002.stderr @@ -1,5 +1,5 @@ rnfail002.hs:6:1: - Multiple declarations of `Main.y' + Multiple declarations of `y' Declared at: rnfail002.hs:5:1 rnfail002.hs:6:1 diff --git a/testsuite/tests/rename/should_fail/rnfail003.stderr b/testsuite/tests/rename/should_fail/rnfail003.stderr index 0398a4d9c7..aab5911412 100644 --- a/testsuite/tests/rename/should_fail/rnfail003.stderr +++ b/testsuite/tests/rename/should_fail/rnfail003.stderr @@ -1,5 +1,5 @@ rnfail003.hs:4:1: - Multiple declarations of `Main.f' + Multiple declarations of `f' Declared at: rnfail003.hs:2:1 rnfail003.hs:4:1 diff --git a/testsuite/tests/rename/should_fail/rnfail009.stderr b/testsuite/tests/rename/should_fail/rnfail009.stderr index 9cddc115d6..358c17afe0 100644 --- a/testsuite/tests/rename/should_fail/rnfail009.stderr +++ b/testsuite/tests/rename/should_fail/rnfail009.stderr @@ -1,5 +1,5 @@ rnfail009.hs:5:10: - Multiple declarations of `Foo.A' + Multiple declarations of `A' Declared at: rnfail009.hs:3:10 rnfail009.hs:5:10 diff --git a/testsuite/tests/rename/should_fail/rnfail010.stderr b/testsuite/tests/rename/should_fail/rnfail010.stderr index 0855b4b731..d0e7c835ac 100644 --- a/testsuite/tests/rename/should_fail/rnfail010.stderr +++ b/testsuite/tests/rename/should_fail/rnfail010.stderr @@ -1,5 +1,5 @@ rnfail010.hs:6:1: - Multiple declarations of `Main.f' + Multiple declarations of `f' Declared at: rnfail010.hs:2:1 rnfail010.hs:6:1 diff --git a/testsuite/tests/rename/should_fail/rnfail011.stderr b/testsuite/tests/rename/should_fail/rnfail011.stderr index d76a63a410..7e7d02abf0 100644 --- a/testsuite/tests/rename/should_fail/rnfail011.stderr +++ b/testsuite/tests/rename/should_fail/rnfail011.stderr @@ -1,5 +1,5 @@ rnfail011.hs:6:6: - Multiple declarations of `Main.A' + Multiple declarations of `A' Declared at: rnfail011.hs:2:6 rnfail011.hs:6:6 diff --git a/testsuite/tests/rename/should_fail/rnfail012.stderr b/testsuite/tests/rename/should_fail/rnfail012.stderr index 93bfec9346..82dbd3a76f 100644 --- a/testsuite/tests/rename/should_fail/rnfail012.stderr +++ b/testsuite/tests/rename/should_fail/rnfail012.stderr @@ -1,5 +1,5 @@ rnfail012.hs:8:7: - Multiple declarations of `Main.A' + Multiple declarations of `A' Declared at: rnfail012.hs:2:7 rnfail012.hs:8:7 diff --git a/testsuite/tests/rename/should_fail/rnfail013.stderr b/testsuite/tests/rename/should_fail/rnfail013.stderr index 761f2f0a0e..3ec4f43cb0 100644 --- a/testsuite/tests/rename/should_fail/rnfail013.stderr +++ b/testsuite/tests/rename/should_fail/rnfail013.stderr @@ -1,5 +1,5 @@ rnfail013.hs:7:11: - Multiple declarations of `Foo.MkT' + Multiple declarations of `MkT' Declared at: rnfail013.hs:5:11 rnfail013.hs:7:11 diff --git a/testsuite/tests/rename/should_fail/rnfail015.stderr b/testsuite/tests/rename/should_fail/rnfail015.stderr index bf1e382f6c..dcb54f5b9e 100644 --- a/testsuite/tests/rename/should_fail/rnfail015.stderr +++ b/testsuite/tests/rename/should_fail/rnfail015.stderr @@ -1,5 +1,5 @@ rnfail015.hs:14:9: - Multiple declarations of `ShouldFail.TokLiteral' + Multiple declarations of `TokLiteral' Declared at: rnfail015.hs:8:9 rnfail015.hs:14:9 |