From b799e5ca9ce7ce939ea96a1647b86a4500533e21 Mon Sep 17 00:00:00 2001 From: panne Date: Mon, 3 Jul 2000 21:04:44 +0000 Subject: [PATCH] [project @ 2000-07-03 21:04:44 by panne] Removed foralls in expected output --- ghc/tests/reader/should_fail/read001.stdout | 32 +++++++++------------------ ghc/tests/reader/should_fail/read007.stdout | 2 +- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/ghc/tests/reader/should_fail/read001.stdout b/ghc/tests/reader/should_fail/read001.stdout index 54141df..a4589a9 100644 --- a/ghc/tests/reader/should_fail/read001.stdout +++ b/ghc/tests/reader/should_fail/read001.stdout @@ -9,12 +9,8 @@ import Prelude import IO (putStr) import System hiding (getArgs) import Monad -bindwith :: - {- implicit forall -} (OrdClass a, OrdClass b) => a -> b -> b -g :: - {- implicit forall -} - (Num a, Eq b) => - Foo a -> [b] -> (a, a, a) -> b +bindwith :: (OrdClass a, OrdClass b) => a -> b -> b +g :: (Num a, Eq b) => Foo a -> [b] -> (a, a, a) -> b g x y z = head y f _ x @@ -44,8 +40,7 @@ expr a b c d + ([z | z <- c, isSpace z])) + (let y = foo in - (((((((y + [1, 2, 3, 4]) + (4, 3, 2, 1)) - + (4 :: {- implicit forall -} (Num a) => a)) + (((((((y + [1, 2, 3, 4]) + (4, 3, 2, 1)) + (4 :: (Num a) => a)) + (if 42 == 42.0 then 1 else 4)) + ([1 .. ])) + ([2, 4 .. ])) @@ -73,21 +68,14 @@ fixn x y = x infix 6 fixn infixl 7 +# infixr 8 fixr -type Pair a b = {- implicit forall -} (a, b) -data FooData = forall. FooCon Int -data FooDataB = forall. FooConB Double -data (Eq a) => EqTree a = - forall. EqLeaf a | forall. EqBranch (EqLeaf a) (EqLeaf a) -class (Eq a) => EqClass a where { - eqc :: {- implicit forall -} a -> Char; - eqc x = '?' - } +type Pair a b = (a, b) +data FooData = FooCon Int +data FooDataB = FooConB Double +data (Eq a) => EqTree a = EqLeaf a | EqBranch (EqLeaf a) (EqLeaf a) +class (Eq a) => EqClass a where { eqc :: a -> Char; eqc x = '?' } class (Ord a) => OrdClass a where { - orda :: {- implicit forall -} a -> Char; - ordb :: {- implicit forall -} a -> Char; - ordc :: {- implicit forall -} a -> Char; - } -instance {- implicit forall -} (Eq a) => EqClass (EqTree a) where + orda :: a -> Char; ordb :: a -> Char; ordc :: a -> Char; } +instance (Eq a) => {EqClass (EqTree a)} where [] eqc x = 'a' default (Rational, Integer) diff --git a/ghc/tests/reader/should_fail/read007.stdout b/ghc/tests/reader/should_fail/read007.stdout index 47db6c8..c91365d 100644 --- a/ghc/tests/reader/should_fail/read007.stdout +++ b/ghc/tests/reader/should_fail/read007.stdout @@ -1,7 +1,7 @@ ==================== Parser ==================== module ShouldFail where -f :: {- implicit forall -} Int -> IO Int +f :: Int -> IO Int f x = do (2 + 2) <- 2 return x -- 1.7.10.4