X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypes%2FFunDeps.lhs;h=ac5c0a0b1ee01ef031ae1733877ddc5f74c8b1aa;hb=fa1c8a7e7013b1e9a37326b80abadec737c9347e;hp=3d9012699e6cb843674f45b974ba6d73013db560;hpb=7fc749a43b4b6b85d234fa95d4928648259584f4;p=ghc-hetmet.git diff --git a/compiler/types/FunDeps.lhs b/compiler/types/FunDeps.lhs index 3d90126..ac5c0a0 100644 --- a/compiler/types/FunDeps.lhs +++ b/compiler/types/FunDeps.lhs @@ -8,13 +8,6 @@ FunDeps - functional dependencies It's better to read it as: "if we know these, then we're going to know these" \begin{code} -{-# OPTIONS -w #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and fix --- any warnings in the module. See --- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings --- for details - module FunDeps ( Equation, pprEquation, oclose, grow, improveOne, @@ -153,7 +146,7 @@ See also Note [Ambiguity] in TcSimplify \begin{code} grow :: [PredType] -> TyVarSet -> TyVarSet grow preds fixed_tvs - | null preds = real_fixed_tvs + | null preds = fixed_tvs | otherwise = loop real_fixed_tvs where -- Add the implicit parameters; @@ -204,6 +197,7 @@ type Equation = (TyVarSet, [(Type, Type)]) -- We usually act on an equation by instantiating the quantified type varaibles -- to fresh type variables, and then calling the standard unifier. +pprEquation :: Equation -> SDoc pprEquation (qtvs, pairs) = vcat [ptext SLIT("forall") <+> braces (pprWithCommas ppr (varSetElems qtvs)), nest 2 (vcat [ ppr t1 <+> ptext SLIT(":=:") <+> ppr t2 | (t1,t2) <- pairs])] @@ -250,7 +244,7 @@ improveOne :: (Class -> [Instance]) -- Gives instances for given class -- combined (for error messages) -- Just do improvement triggered by a single, distinguised predicate -improveOne inst_env pred@(IParam ip ty, _) preds +improveOne _inst_env pred@(IParam ip ty, _) preds = [ ((emptyVarSet, [(ty,ty2)]), pred, p2) | p2@(IParam ip2 ty2, _) <- preds , ip==ip2 @@ -301,7 +295,7 @@ improveOne inst_env pred@(ClassP cls tys, _) preds <+> ppr (getSrcLoc ispec)) ] -improveOne inst_env eq_pred preds +improveOne _ _ _ = []