Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/e415777cc4efadaba4c4fe80f86f53e8b2b77e8c >--------------------------------------------------------------- commit e415777cc4efadaba4c4fe80f86f53e8b2b77e8c Author: Jose Pedro Magalhaes <j...@cs.ox.ac.uk> Date: Fri Dec 7 08:55:41 2012 +0000 Detabbing >--------------------------------------------------------------- compiler/typecheck/TcGenGenerics.lhs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/typecheck/TcGenGenerics.lhs b/compiler/typecheck/TcGenGenerics.lhs index fbb600c..d1746fe 100644 --- a/compiler/typecheck/TcGenGenerics.lhs +++ b/compiler/typecheck/TcGenGenerics.lhs @@ -294,7 +294,7 @@ canDoGenerics1_w rep_tc check_vanilla :: DataCon -> Maybe SDoc check_vanilla con | isVanillaDataCon con = Nothing - | otherwise = Just (bad con existential) + | otherwise = Just (bad con existential) -- the Bool is if the parameter occurs in the type ft_check :: DataCon -> FFoldType (Bool, S.State [Name] (Maybe SDoc)) @@ -306,7 +306,7 @@ canDoGenerics1_w rep_tc -- applications, so we must compensate with extra logic -- to ensure that the variable only occurs as the last -- argument. - , ft_fun = \x y -> if fst x then (True, return $ Just $ bad con wrong_arg) + , ft_fun = \x y -> if fst x then (True, return $ Just $ bad con wrong_arg) else x `bmplus` y , ft_tup = \_ xs -> if not (null xs) && any fst (init xs) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
