diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout b/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout index c1e1667abee6bdd1e6eeb80cad27061e4b815151..303d0e202ff033949aae9710147fc7cf17ba9413 100644 --- a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout +++ b/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout @@ -118,10 +118,10 @@ Testing Enum (): (toEnum 0)::() = () (toEnum 1)::() = error "Prelude.Enum.().toEnum: bad argument" (fromEnum ()) = 0 - ([()..]) = [()] - ([(),()..]) = [()] - ([()..()]) = [()] - ([(),()..()]) = [()] + (take 7 [()..]) = [()] + (take 7 [(),()..]) = [()] + (take 7 [()..()]) = [()] + (take 7 [(),()..()]) = [()] Testing Enum Ordering (derived): (succ LT) = EQ (succ (minBound::Ordering)) = EQ diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-alpha-dec-osf3 b/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-alpha-dec-osf3 index fc1b80e96983a3b2232e5ea7f9c94ec1e6af43df..78714d80b25be862797b51d9651cb359697619d1 100644 --- a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-alpha-dec-osf3 +++ b/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-alpha-dec-osf3 @@ -102,10 +102,10 @@ Testing Enum (): (toEnum 0)::() = () (toEnum 1)::() = error "Prelude.Enum.().toEnum: bad argument" (fromEnum ()) = 0 - ([()..]) = [()] - ([(),()..]) = [()] - ([()..()]) = [()] - ([(),()..()]) = [()] + (take 7 [()..]) = [()] + (take 7 [(),()..]) = [()] + (take 7 [()..()]) = [()] + (take 7 [(),()..()]) = [()] Testing Enum Ordering (derived): (succ LT) = EQ (succ (minBound::Ordering)) = EQ @@ -171,60 +171,60 @@ Testing Enum Bool: take 7 ([True,True .. False]) = [] take 7 ([True,True .. True]) = [True,True,True,True,True,True,True] Testing Enum Rational: - (succ (0::Rational)) = 1 % 1 - (succ ((-1)::Rational)) = 0 % 1 - pred (1::Rational) = 0 % 1 - pred (0::Rational) = (-1) % 1 - (map (toEnum::Int->Rational) [1,minBound,maxBound]) = [1 % 1,(-9223372036854775808) % 1,9223372036854775807 % 1] + (succ (0::Rational)) = 1%1 + (succ ((-1)::Rational)) = 0%1 + pred (1::Rational) = 0%1 + pred (0::Rational) = (-1)%1 + (map (toEnum::Int->Rational) [1,minBound,maxBound]) = [1%1,(-9223372036854775808)%1,9223372036854775807%1] (map fromEnum [(1::Rational),42,45]) = [1,42,45] - (take 7 [(1::Rational)..]) = [1 % 1,2 % 1,3 % 1,4 % 1,5 % 1,6 % 1,7 % 1] - (take 7 [(-5::Rational)..]) = [(-5) % 1,(-4) % 1,(-3) % 1,(-2) % 1,(-1) % 1,0 % 1,1 % 1] - (take 7 [(1::Rational),2..]) = [1 % 1,2 % 1,3 % 1,4 % 1,5 % 1,6 % 1,7 % 1] - (take 7 [(1::Rational),7..]) = [1 % 1,7 % 1,13 % 1,19 % 1,25 % 1,31 % 1,37 % 1] - (take 7 [(1::Rational),1..]) = [1 % 1,1 % 1,1 % 1,1 % 1,1 % 1,1 % 1,1 % 1] - (take 7 [(1::Rational),0..]) = [1 % 1,0 % 1,(-1) % 1,(-2) % 1,(-3) % 1,(-4) % 1,(-5) % 1] - (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)..]) = [1%1,2%1,3%1,4%1,5%1,6%1,7%1] + (take 7 [(-5::Rational)..]) = [(-5)%1,(-4)%1,(-3)%1,(-2)%1,(-1)%1,0%1,1%1] + (take 7 [(1::Rational),2..]) = [1%1,2%1,3%1,4%1,5%1,6%1,7%1] + (take 7 [(1::Rational),7..]) = [1%1,7%1,13%1,19%1,25%1,31%1,37%1] + (take 7 [(1::Rational),1..]) = [1%1,1%1,1%1,1%1,1%1,1%1,1%1] + (take 7 [(1::Rational),0..]) = [1%1,0%1,(-1)%1,(-2)%1,(-3)%1,(-4)%1,(-5)%1] + (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])) = [] (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,1 % 1] - (take 7 [(1::Rational),2..1]) = [1 % 1] - (take 7 [(2::Rational),1..2]) = [2 % 1] - (take 7 [(2::Rational),1..1]) = [2 % 1,1 % 1] + (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,1%1] + (take 7 [(1::Rational),2..1]) = [1%1] + (take 7 [(2::Rational),1..2]) = [2%1] + (take 7 [(2::Rational),1..1]) = [2%1,1%1] (take 7 [(2::Rational),3..1]) = [] Testing Enum (Ratio Int): - (succ (0::Ratio Int)) = 1 % 1 - (succ ((-1)::Ratio Int)) = 0 % 1 - pred (1::Ratio Int) = 0 % 1 - pred (0::Ratio Int) = (-1) % 1 - (map (toEnum::Int->Ratio Int) [1,minBound,maxBound]) = [1 % 1,(-9223372036854775808) % 1,9223372036854775807 % 1] + (succ (0::Ratio Int)) = 1%1 + (succ ((-1)::Ratio Int)) = 0%1 + pred (1::Ratio Int) = 0%1 + pred (0::Ratio Int) = (-1)%1 + (map (toEnum::Int->Ratio Int) [1,minBound,maxBound]) = [1%1,(-9223372036854775808)%1,9223372036854775807%1] (map fromEnum [(1::Ratio Int),42,45]) = [1,42,45] - (take 7 [(1::Ratio Int)..]) = [1 % 1,2 % 1,3 % 1,4 % 1,5 % 1,6 % 1,7 % 1] - (take 7 [(-5::Ratio Int)..]) = [(-5) % 1,(-4) % 1,(-3) % 1,(-2) % 1,(-1) % 1,0 % 1,1 % 1] - (take 7 [((toEnum ((maxBound::Int)-5))::Ratio Int)..]) = [9223372036854775802 % 1,9223372036854775803 % 1,9223372036854775804 % 1,9223372036854775805 % 1,9223372036854775806 % 1,9223372036854775807 % 1,(-9223372036854775808) % 1] - (take 7 [(1::Ratio Int),2..]) = [1 % 1,2 % 1,3 % 1,4 % 1,5 % 1,6 % 1,7 % 1] - (take 7 [(1::Ratio Int),7..]) = [1 % 1,7 % 1,13 % 1,19 % 1,25 % 1,31 % 1,37 % 1] - (take 7 [(1::Ratio Int),1..]) = [1 % 1,1 % 1,1 % 1,1 % 1,1 % 1,1 % 1,1 % 1] - (take 7 [(1::Ratio Int),0..]) = [1 % 1,0 % 1,(-1) % 1,(-2) % 1,(-3) % 1,(-4) % 1,(-5) % 1] - (take 7 [(5::Ratio Int),2..]) = [5 % 1,2 % 1,(-1) % 1,(-4) % 1,(-7) % 1,(-10) % 1,(-13) % 1] - (take 7 [x, x-1 ..]) = [(-9223372036854775807) % 1,(-9223372036854775808) % 1,9223372036854775807 % 1,9223372036854775806 % 1,9223372036854775805 % 1,9223372036854775804 % 1,9223372036854775803 % 1] - (take 7 [x, x-1 ..]) = [(-9223372036854775803) % 1,(-9223372036854775804) % 1,(-9223372036854775805) % 1,(-9223372036854775806) % 1,(-9223372036854775807) % 1,(-9223372036854775808) % 1,9223372036854775807 % 1] - (take 7 [x, (x+1) ..]) = [9223372036854775802 % 1,9223372036854775803 % 1,9223372036854775804 % 1,9223372036854775805 % 1,9223372036854775806 % 1,9223372036854775807 % 1,(-9223372036854775808) % 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)..]) = [1%1,2%1,3%1,4%1,5%1,6%1,7%1] + (take 7 [(-5::Ratio Int)..]) = [(-5)%1,(-4)%1,(-3)%1,(-2)%1,(-1)%1,0%1,1%1] + (take 7 [((toEnum ((maxBound::Int)-5))::Ratio Int)..]) = [9223372036854775802%1,9223372036854775803%1,9223372036854775804%1,9223372036854775805%1,9223372036854775806%1,9223372036854775807%1,(-9223372036854775808)%1] + (take 7 [(1::Ratio Int),2..]) = [1%1,2%1,3%1,4%1,5%1,6%1,7%1] + (take 7 [(1::Ratio Int),7..]) = [1%1,7%1,13%1,19%1,25%1,31%1,37%1] + (take 7 [(1::Ratio Int),1..]) = [1%1,1%1,1%1,1%1,1%1,1%1,1%1] + (take 7 [(1::Ratio Int),0..]) = [1%1,0%1,(-1)%1,(-2)%1,(-3)%1,(-4)%1,(-5)%1] + (take 7 [(5::Ratio Int),2..]) = [5%1,2%1,(-1)%1,(-4)%1,(-7)%1,(-10)%1,(-13)%1] + (take 7 [x, x-1 ..]) = [(-9223372036854775807)%1,(-9223372036854775808)%1,9223372036854775807%1,9223372036854775806%1,9223372036854775805%1,9223372036854775804%1,9223372036854775803%1] + (take 7 [x, x-1 ..]) = [(-9223372036854775803)%1,(-9223372036854775804)%1,(-9223372036854775805)%1,(-9223372036854775806)%1,(-9223372036854775807)%1,(-9223372036854775808)%1,9223372036854775807%1] + (take 7 [x, (x+1) ..]) = [9223372036854775802%1,9223372036854775803%1,9223372036854775804%1,9223372036854775805%1,9223372036854775806%1,9223372036854775807%1,(-9223372036854775808)%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])) = [] (take 7 ([(5::Ratio Int) .. 0])) = [] - (take 7 ([x..y])) = [9223372036854775802 % 1,9223372036854775803 % 1,9223372036854775804 % 1,9223372036854775805 % 1,9223372036854775806 % 1,9223372036854775807 % 1] + (take 7 ([x..y])) = [9223372036854775802%1,9223372036854775803%1,9223372036854775804%1,9223372036854775805%1,9223372036854775806%1,9223372036854775807%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,1 % 1] - (take 7 [(1::Ratio Int),2..1]) = [1 % 1] - (take 7 [(2::Ratio Int),1..2]) = [2 % 1] - (take 7 [(2::Ratio Int),1..1]) = [2 % 1,1 % 1] + (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,1%1] + (take 7 [(1::Ratio Int),2..1]) = [1%1] + (take 7 [(2::Ratio Int),1..2]) = [2%1] + (take 7 [(2::Ratio Int),1..1]) = [2%1,1%1] (take 7 [(2::Ratio Int),3..1]) = [] - (take 7 [x,(x+1)..y]) = [9223372036854775803 % 1,9223372036854775804 % 1,9223372036854775805 % 1,9223372036854775806 % 1,9223372036854775807 % 1] - (take 7 [x,(x-1)..y]) = [(-9223372036854775803) % 1,(-9223372036854775804) % 1,(-9223372036854775805) % 1,(-9223372036854775806) % 1,(-9223372036854775807) % 1,(-9223372036854775808) % 1] + (take 7 [x,(x+1)..y]) = [9223372036854775803%1,9223372036854775804%1,9223372036854775805%1,9223372036854775806%1,9223372036854775807%1] + (take 7 [x,(x-1)..y]) = [(-9223372036854775803)%1,(-9223372036854775804)%1,(-9223372036854775805)%1,(-9223372036854775806)%1,(-9223372036854775807)%1,(-9223372036854775808)%1] diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-ws-64 b/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-ws-64 index 4b2db7fee80a7a5702a2aac6e67977956d94bc22..78714d80b25be862797b51d9651cb359697619d1 100644 --- a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-ws-64 +++ b/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-ws-64 @@ -102,10 +102,10 @@ Testing Enum (): (toEnum 0)::() = () (toEnum 1)::() = error "Prelude.Enum.().toEnum: bad argument" (fromEnum ()) = 0 - ([()..]) = [()] - ([(),()..]) = [()] - ([()..()]) = [()] - ([(),()..()]) = [()] + (take 7 [()..]) = [()] + (take 7 [(),()..]) = [()] + (take 7 [()..()]) = [()] + (take 7 [(),()..()]) = [()] Testing Enum Ordering (derived): (succ LT) = EQ (succ (minBound::Ordering)) = EQ