From 23dbc7c8dce8b48f80621914a04494ec64368886 Mon Sep 17 00:00:00 2001 From: simonm Date: Fri, 7 May 1999 14:52:53 +0000 Subject: [PATCH] [project @ 1999-05-07 14:52:49 by simonm] some test updates --- ghc/tests/deSugar/should_compile/ds020.stderr | 1 + ghc/tests/deriving/should_fail/drvfail004.stderr | 8 +++--- ghc/tests/deriving/should_fail/drvfail007.stderr | 1 - ghc/tests/lib/should_run/dynamic001.hs | 4 +-- ghc/tests/lib/should_run/dynamic001.stdout | 4 +-- ghc/tests/lib/should_run/enum01.hs | 1 + ghc/tests/lib/should_run/enum01.stdout | 32 +++++++++++----------- ghc/tests/lib/should_run/enum02.stdout | 24 ++++++++-------- ghc/tests/lib/should_run/enum03.stdout | 24 ++++++++-------- 9 files changed, 50 insertions(+), 49 deletions(-) diff --git a/ghc/tests/deSugar/should_compile/ds020.stderr b/ghc/tests/deSugar/should_compile/ds020.stderr index 719bd5e..87ecde2 100644 --- a/ghc/tests/deSugar/should_compile/ds020.stderr +++ b/ghc/tests/deSugar/should_compile/ds020.stderr @@ -11,3 +11,4 @@ ds020.hs:13: Pattern match(es) are overlapped in the definition of function `d': ds020.hs:19: Pattern match(es) are overlapped in the definition of function `f': f (x@~[]) = ... +NOTE: Simplifier still going after 4 iterations; bailing out. diff --git a/ghc/tests/deriving/should_fail/drvfail004.stderr b/ghc/tests/deriving/should_fail/drvfail004.stderr index ca2270e..81978e9 100644 --- a/ghc/tests/deriving/should_fail/drvfail004.stderr +++ b/ghc/tests/deriving/should_fail/drvfail004.stderr @@ -1,11 +1,11 @@ - + drvfail004.hs:5: Could not deduce `Eq (Foo a b)' (arising from an instance declaration at drvfail004.hs:5) - from the context (Ord a, Ord b) - Probable cause: missing `Eq (Foo a b)' in instance declaration context + from the context: (Ord a1, Ord b1) + Probable cause: missing `Eq (Foo a b)' + in instance declaration context or missing instance declaration for `Eq (Foo a b)' When checking the superclasses of an instance declaration - Compilation had errors diff --git a/ghc/tests/deriving/should_fail/drvfail007.stderr b/ghc/tests/deriving/should_fail/drvfail007.stderr index ae4b9bf..d8ee804 100644 --- a/ghc/tests/deriving/should_fail/drvfail007.stderr +++ b/ghc/tests/deriving/should_fail/drvfail007.stderr @@ -4,4 +4,3 @@ drvfail007.hs:2: When deriving classes for `Foo' Compilation had errors - diff --git a/ghc/tests/lib/should_run/dynamic001.hs b/ghc/tests/lib/should_run/dynamic001.hs index 9da1bb5..286b3ae 100644 --- a/ghc/tests/lib/should_run/dynamic001.hs +++ b/ghc/tests/lib/should_run/dynamic001.hs @@ -52,8 +52,8 @@ fromDyn_test = do print (fromDyn (toDyn (Left True::Either Bool Bool)) (Right False :: Either Bool Bool)) print (fromDyn (toDyn LT) GT) print (fromDyn (toDyn ((+1)::Int->Int)) False) - print (fromDyn (toDyn ((+1)::Int->Int)) ((+2)::Int->Int)) - print (fromDyn (toDyn ((++)::[Int]->[Int]->[Int])) ((undefined)::[Int]->[Int]->[Int])) + print ((fromDyn (toDyn ((+1)::Int->Int)) ((+2)::Int->Int)) 3) + print ((fromDyn (toDyn ((++)::[Int]->[Int]->[Int])) ((undefined)::[Int]->[Int]->[Int])) [1] [2]) -- Misc test utilities: diff --git a/ghc/tests/lib/should_run/dynamic001.stdout b/ghc/tests/lib/should_run/dynamic001.stdout index 6116074..0ac7b99 100644 --- a/ghc/tests/lib/should_run/dynamic001.stdout +++ b/ghc/tests/lib/should_run/dynamic001.stdout @@ -38,5 +38,5 @@ Just True Left True LT False -<> -<> +4 +[1,2] diff --git a/ghc/tests/lib/should_run/enum01.hs b/ghc/tests/lib/should_run/enum01.hs index e983986..9254b40 100644 --- a/ghc/tests/lib/should_run/enum01.hs +++ b/ghc/tests/lib/should_run/enum01.hs @@ -3,6 +3,7 @@ module Main(main) where import Exception import Char +import Ratio main = do -- Enum Int diff --git a/ghc/tests/lib/should_run/enum01.stdout b/ghc/tests/lib/should_run/enum01.stdout index 79f5f2a..6b4538e 100644 --- a/ghc/tests/lib/should_run/enum01.stdout +++ b/ghc/tests/lib/should_run/enum01.stdout @@ -19,10 +19,10 @@ Testing Enum Int: (take 7 [x, (x+1) ..]) = [2147483642,2147483643,2147483644,2147483645,2147483646,2147483647] (take 7 ([(1::Int) .. 5])) = [1,2,3,4,5] (take 4 ([(1::Int) .. 1])) = [1] - (take 7 ([(1::Int) .. 0])) = [1,0] - (take 7 ([(5::Int) .. 0])) = [5,4,3,2,1,0] + (take 7 ([(1::Int) .. 0])) = [] + (take 7 ([(5::Int) .. 0])) = [] (take 7 ([(maxBound-(5::Int)) .. maxBound])) = [2147483642,2147483643,2147483644,2147483645,2147483646,2147483647] - (take 7 ([(minBound+(5::Int)) .. minBound])) = [-2147483643,-2147483644,-2147483645,-2147483646,-2147483647,-2147483648] + (take 7 ([(minBound+(5::Int)) .. minBound])) = [] (take 7 [(5::Int),4..1]) = [5,4,3,2,1] (take 7 [(5::Int),3..1]) = [5,3,1] (take 7 [(5::Int),3..2]) = [5,3] @@ -48,8 +48,8 @@ Testing Enum Integer: (take 7 [(5::Integer),2..]) = [5,2,-1,-4,-7,-10,-13] (take 7 ([(1::Integer) .. 5])) = [1,2,3,4,5] (take 4 ([(1::Integer) .. 1])) = [1] - (take 7 ([(1::Integer) .. 0])) = [1,0] - (take 7 ([(5::Integer) .. 0])) = [5,4,3,2,1,0] + (take 7 ([(1::Integer) .. 0])) = [] + (take 7 ([(5::Integer) .. 0])) = [] (take 7 [(5::Integer),4..1]) = [5,4,3,2,1] (take 7 [(5::Integer),3..1]) = [5,3,1] (take 7 [(5::Integer),3..2]) = [5,3] @@ -79,10 +79,10 @@ Testing Enum Char: (take 7 ['\250', '\251' ..]) = "\250\251\252\253\254\255" (take 7 (['a' .. 'e'])) = "abcde" (take 4 (['a' .. 'a'])) = "a" - (take 7 (['b' .. 'a'])) = "ba" - (take 7 (['e' .. 'a'])) = "edcba" + (take 7 (['b' .. 'a'])) = "" + (take 7 (['e' .. 'a'])) = "" (take 7 (['\250' .. '\255'])) = "\250\251\252\253\254\255" - (take 7 (['\5' .. '\0'])) = "\ENQ\EOT\ETX\STX\SOH\NUL" + (take 7 (['\5' .. '\0'])) = "" (take 7 ['f','e' .. 'b']) = "fedcb" (take 7 ['g','e' .. 'b']) = "gec" (take 7 ['g','d' .. 'c']) = "gd" @@ -131,8 +131,8 @@ Testing Enum Ordering (derived): ([LT .. GT]) = [LT,EQ,GT] ([LT .. EQ]) = [LT,EQ] ([LT .. LT]) = [LT] - ([GT .. LT]) = [GT,EQ,LT] - ([GT .. EQ]) = [GT,EQ] + ([GT .. LT]) = [] + ([GT .. EQ]) = [] ([GT .. GT]) = [GT] ([LT,EQ .. GT]) = [LT,EQ,GT] ([GT,EQ .. LT]) = [GT,EQ,LT] @@ -161,7 +161,7 @@ Testing Enum Bool: (take 7 ([False,False ..])) = [False,False,False,False,False,False,False] (take 7 ([True,True ..])) = [True,True,True,True,True,True,True] ([False .. True]) = [False,True] - ([True .. False]) = [True,False] + ([True .. False]) = [] take 7 ([False,False .. False]) = [False,False,False,False,False,False,False] take 7 ([False,False .. True]) = [False,False,False,False,False,False,False] take 7 ([False,True .. False]) = [False] @@ -186,8 +186,8 @@ Testing Enum Rational: (take 7 [(5::Rational),2..]) = [5 % 1,2 % 1,-1 % 1,-4 % 1,-7 % 1,-10 % 1,-13 % 1] (take 7 ([(1::Rational) .. 5])) = [1 % 1,2 % 1,3 % 1,4 % 1,5 % 1] (take 4 ([(1::Rational) .. 1])) = [1 % 1] - (take 7 ([(1::Rational) .. 0])) = [1 % 1,0 % 1] - (take 7 ([(5::Rational) .. 0])) = [5 % 1,4 % 1,3 % 1,2 % 1,1 % 1,0 % 1] + (take 7 ([(1::Rational) .. 0])) = [] + (take 7 ([(5::Rational) .. 0])) = [] (take 7 [(5::Rational),4..1]) = [5 % 1,4 % 1,3 % 1,2 % 1,1 % 1] (take 7 [(5::Rational),3..1]) = [5 % 1,3 % 1,1 % 1] (take 7 [(5::Rational),3..2]) = [5 % 1,3 % 1] @@ -215,10 +215,10 @@ Testing Enum (Ratio Int): (take 7 [x, (x+1) ..]) = [2147483642 % 1,2147483643 % 1,2147483644 % 1,2147483645 % 1,2147483646 % 1,2147483647 % 1] (take 7 ([(1::Ratio Int) .. 5])) = [1 % 1,2 % 1,3 % 1,4 % 1,5 % 1] (take 4 ([(1::Ratio Int) .. 1])) = [1 % 1] - (take 7 ([(1::Ratio Int) .. 0])) = [1 % 1,0 % 1] - (take 7 ([(5::Ratio Int) .. 0])) = [5 % 1,4 % 1,3 % 1,2 % 1,1 % 1,0 % 1] + (take 7 ([(1::Ratio Int) .. 0])) = [] + (take 7 ([(5::Ratio Int) .. 0])) = [] (take 7 ([x..y])) = [2147483642 % 1,2147483643 % 1,2147483644 % 1,2147483645 % 1,2147483646 % 1,2147483647 % 1] - (take 7 ([x..y])) = [-2147483643 % 1,-2147483644 % 1,-2147483645 % 1,-2147483646 % 1,-2147483647 % 1,-2147483648 % 1] + (take 7 ([x..y])) = [] (take 7 [(5::Ratio Int),4..1]) = [5 % 1,4 % 1,3 % 1,2 % 1,1 % 1] (take 7 [(5::Ratio Int),3..1]) = [5 % 1,3 % 1,1 % 1] (take 7 [(5::Ratio Int),3..2]) = [5 % 1,3 % 1] diff --git a/ghc/tests/lib/should_run/enum02.stdout b/ghc/tests/lib/should_run/enum02.stdout index d0d8e33..60f8268 100644 --- a/ghc/tests/lib/should_run/enum02.stdout +++ b/ghc/tests/lib/should_run/enum02.stdout @@ -20,10 +20,10 @@ Testing Enum Int8: (take 7 [x, (x+1) ..]) = [122,123,124,125,126,127] (take 7 ([(1::Int8) .. 5])) = [1,2,3,4,5] (take 4 ([(1::Int8) .. 1])) = [1] - (take 7 ([(1::Int8) .. 0])) = [1,0] - (take 7 ([(5::Int8) .. 0])) = [5,4,3,2,1,0] + (take 7 ([(1::Int8) .. 0])) = [] + (take 7 ([(5::Int8) .. 0])) = [] (take 7 ([(maxBound-(5::Int8)) .. maxBound])) = [122,123,124,125,126,127] - (take 7 ([(minBound+(5::Int8)) .. minBound])) = [-123,-124,-125,-126,-127,-128] + (take 7 ([(minBound+(5::Int8)) .. minBound])) = [] (take 7 [(5::Int8),4..1]) = [5,4,3,2,1] (take 7 [(5::Int8),3..1]) = [5,3,1] (take 7 [(5::Int8),3..2]) = [5,3] @@ -55,10 +55,10 @@ Testing Enum Int16: (take 7 [x, (x+1) ..]) = [32762,32763,32764,32765,32766,32767] (take 7 ([(1::Int16) .. 5])) = [1,2,3,4,5] (take 4 ([(1::Int16) .. 1])) = [1] - (take 7 ([(1::Int16) .. 0])) = [1,0] - (take 7 ([(5::Int16) .. 0])) = [5,4,3,2,1,0] + (take 7 ([(1::Int16) .. 0])) = [] + (take 7 ([(5::Int16) .. 0])) = [] (take 7 ([(maxBound-(5::Int16)) .. maxBound])) = [32762,32763,32764,32765,32766,32767] - (take 7 ([(minBound+(5::Int16)) .. minBound])) = [-32763,-32764,-32765,-32766,-32767,-32768] + (take 7 ([(minBound+(5::Int16)) .. minBound])) = [] (take 7 [(5::Int16),4..1]) = [5,4,3,2,1] (take 7 [(5::Int16),3..1]) = [5,3,1] (take 7 [(5::Int16),3..2]) = [5,3] @@ -90,10 +90,10 @@ Testing Enum Int32: (take 7 [x, (x+1) ..]) = [2147483642,2147483643,2147483644,2147483645,2147483646,2147483647] (take 7 ([(1::Int32) .. 5])) = [1,2,3,4,5] (take 4 ([(1::Int32) .. 1])) = [1] - (take 7 ([(1::Int32) .. 0])) = [1,0] - (take 7 ([(5::Int32) .. 0])) = [5,4,3,2,1,0] + (take 7 ([(1::Int32) .. 0])) = [] + (take 7 ([(5::Int32) .. 0])) = [] (take 7 ([(maxBound-(5::Int32)) .. maxBound])) = [2147483642,2147483643,2147483644,2147483645,2147483646,2147483647] - (take 7 ([(minBound+(5::Int32)) .. minBound])) = [-2147483643,-2147483644,-2147483645,-2147483646,-2147483647,-2147483648] + (take 7 ([(minBound+(5::Int32)) .. minBound])) = [] (take 7 [(5::Int32),4..1]) = [5,4,3,2,1] (take 7 [(5::Int32),3..1]) = [5,3,1] (take 7 [(5::Int32),3..2]) = [5,3] @@ -126,10 +126,10 @@ Testing Enum Int64: (take 7 [x, (x+1) ..]) = [9223372036854775802,9223372036854775803,9223372036854775804,9223372036854775805,9223372036854775806,9223372036854775807] (take 7 ([(1::Int64) .. 5])) = [1,2,3,4,5] (take 4 ([(1::Int64) .. 1])) = [1] - (take 7 ([(1::Int64) .. 0])) = [1,0] - (take 7 ([(5::Int64) .. 0])) = [5,4,3,2,1,0] + (take 7 ([(1::Int64) .. 0])) = [] + (take 7 ([(5::Int64) .. 0])) = [] (take 7 ([(maxBound-(5::Int64)) .. maxBound])) = [9223372036854775802,9223372036854775803,9223372036854775804,9223372036854775805,9223372036854775806,9223372036854775807] - (take 7 ([(minBound+(5::Int64)) .. minBound])) = [-9223372036854775803,-9223372036854775804,-9223372036854775805,-9223372036854775806,-9223372036854775807,-9223372036854775808] + (take 7 ([(minBound+(5::Int64)) .. minBound])) = [] (take 7 [(5::Int64),4..1]) = [5,4,3,2,1] (take 7 [(5::Int64),3..1]) = [5,3,1] (take 7 [(5::Int64),3..2]) = [5,3] diff --git a/ghc/tests/lib/should_run/enum03.stdout b/ghc/tests/lib/should_run/enum03.stdout index 2b93de1..0f99033 100644 --- a/ghc/tests/lib/should_run/enum03.stdout +++ b/ghc/tests/lib/should_run/enum03.stdout @@ -20,10 +20,10 @@ Testing Enum Word8: (take 7 [x, (x+1) ..]) = [250,251,252,253,254,255] (take 7 ([(1::Word8) .. 5])) = [1,2,3,4,5] (take 4 ([(1::Word8) .. 1])) = [1] - (take 7 ([(1::Word8) .. 0])) = [1,0] - (take 7 ([(5::Word8) .. 0])) = [5,4,3,2,1,0] + (take 7 ([(1::Word8) .. 0])) = [] + (take 7 ([(5::Word8) .. 0])) = [] (take 7 ([(maxBound-(5::Word8)) .. maxBound])) = [250,251,252,253,254,255] - (take 7 ([(minBound+(5::Word8)) .. minBound])) = [5,4,3,2,1,0] + (take 7 ([(minBound+(5::Word8)) .. minBound])) = [] (take 7 [(5::Word8),4..1]) = [5,4,3,2,1] (take 7 [(5::Word8),3..1]) = [5,3,1] (take 7 [(5::Word8),3..2]) = [5,3] @@ -55,10 +55,10 @@ Testing Enum Word16: (take 7 [x, (x+1) ..]) = [65530,65531,65532,65533,65534,65535] (take 7 ([(1::Word16) .. 5])) = [1,2,3,4,5] (take 4 ([(1::Word16) .. 1])) = [1] - (take 7 ([(1::Word16) .. 0])) = [1,0] - (take 7 ([(5::Word16) .. 0])) = [5,4,3,2,1,0] + (take 7 ([(1::Word16) .. 0])) = [] + (take 7 ([(5::Word16) .. 0])) = [] (take 7 ([(maxBound-(5::Word16)) .. maxBound])) = [65530,65531,65532,65533,65534,65535] - (take 7 ([(minBound+(5::Word16)) .. minBound])) = [5,4,3,2,1,0] + (take 7 ([(minBound+(5::Word16)) .. minBound])) = [] (take 7 [(5::Word16),4..1]) = [5,4,3,2,1] (take 7 [(5::Word16),3..1]) = [5,3,1] (take 7 [(5::Word16),3..2]) = [5,3] @@ -91,10 +91,10 @@ Testing Enum Word32: (take 7 [x, (x+1) ..]) = [4294967290,4294967291,4294967292,4294967293,4294967294,4294967295] (take 7 ([(1::Word32) .. 5])) = [1,2,3,4,5] (take 4 ([(1::Word32) .. 1])) = [1] - (take 7 ([(1::Word32) .. 0])) = [1,0] - (take 7 ([(5::Word32) .. 0])) = [5,4,3,2,1,0] + (take 7 ([(1::Word32) .. 0])) = [] + (take 7 ([(5::Word32) .. 0])) = [] (take 7 ([(maxBound-(5::Word32)) .. maxBound])) = [4294967290,4294967291,4294967292,4294967293,4294967294,4294967295] - (take 7 ([(minBound+(5::Word32)) .. minBound])) = [5,4,3,2,1,0] + (take 7 ([(minBound+(5::Word32)) .. minBound])) = [] (take 7 [(5::Word32),4..1]) = [5,4,3,2,1] (take 7 [(5::Word32),3..1]) = [5,3,1] (take 7 [(5::Word32),3..2]) = [5,3] @@ -127,10 +127,10 @@ Testing Enum Word64: (take 7 [x, (x+1) ..]) = [18446744073709551610,18446744073709551611,18446744073709551612,18446744073709551613,18446744073709551614,18446744073709551615] (take 7 ([(1::Word64) .. 5])) = [1,2,3,4,5] (take 4 ([(1::Word64) .. 1])) = [1] - (take 7 ([(1::Word64) .. 0])) = [1,0] - (take 7 ([(5::Word64) .. 0])) = [5,4,3,2,1,0] + (take 7 ([(1::Word64) .. 0])) = [] + (take 7 ([(5::Word64) .. 0])) = [] (take 7 ([(maxBound-(5::Word64)) .. maxBound])) = [18446744073709551610,18446744073709551611,18446744073709551612,18446744073709551613,18446744073709551614,18446744073709551615] - (take 7 ([(minBound+(5::Word64)) .. minBound])) = [5,4,3,2,1,0] + (take 7 ([(minBound+(5::Word64)) .. minBound])) = [] (take 7 [(5::Word64),4..1]) = [5,4,3,2,1] (take 7 [(5::Word64),3..1]) = [5,3,1] (take 7 [(5::Word64),3..2]) = [5,3] -- 1.7.10.4