X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypes%2FClass.lhs;h=fb7cab135edc0598ff75d14ce4b55bb293440cb4;hb=35fb5c6ff0861be5ab72df799df536982d3966b8;hp=dd02cc76e414e80e3a36c6941a49a8b4668fe550;hpb=ad94d40948668032189ad22a0ad741ac1f645f50;p=ghc-hetmet.git diff --git a/compiler/types/Class.lhs b/compiler/types/Class.lhs index dd02cc7..fb7cab1 100644 --- a/compiler/types/Class.lhs +++ b/compiler/types/Class.lhs @@ -6,13 +6,6 @@ The @Class@ datatype \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/CodingStyle#Warnings --- for details - module Class ( Class, ClassOpItem, DefMeth (..), @@ -24,8 +17,6 @@ module Class ( classBigSig, classExtraBigSig, classTvsFds, classSCTheta ) where -#include "HsVersions.h" - import {-# SOURCE #-} TyCon ( TyCon ) import {-# SOURCE #-} TypeRep ( PredType ) @@ -34,6 +25,7 @@ import Name import BasicTypes import Unique import Outputable +import FastString \end{code} %************************************************************************ @@ -124,12 +116,16 @@ classMethods :: Class -> [Id] classMethods (Class {classOpStuff = op_stuff}) = [op_sel | (op_sel, _) <- op_stuff] +classTvsFds :: Class -> ([TyVar], [FunDep TyVar]) classTvsFds c = (classTyVars c, classFunDeps c) +classBigSig :: Class -> ([TyVar], [PredType], [Id], [ClassOpItem]) classBigSig (Class {classTyVars = tyvars, classSCTheta = sc_theta, classSCSels = sc_sels, classOpStuff = op_stuff}) = (tyvars, sc_theta, sc_sels, op_stuff) + +classExtraBigSig :: Class -> ([TyVar], [FunDep TyVar], [PredType], [Id], [TyCon], [ClassOpItem]) classExtraBigSig (Class {classTyVars = tyvars, classFunDeps = fundeps, classSCTheta = sc_theta, classSCSels = sc_sels, classATs = ats, classOpStuff = op_stuff}) @@ -178,9 +174,9 @@ instance Outputable DefMeth where pprFundeps :: Outputable a => [FunDep a] -> SDoc pprFundeps [] = empty -pprFundeps fds = hsep (ptext SLIT("|") : punctuate comma (map ppr_fd fds)) +pprFundeps fds = hsep (ptext (sLit "|") : punctuate comma (map ppr_fd fds)) where - ppr_fd (us, vs) = hsep [interppSP us, ptext SLIT("->"), + ppr_fd (us, vs) = hsep [interppSP us, ptext (sLit "->"), interppSP vs] \end{code}