X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypes%2FInstEnv.lhs;h=774808d4fea8b6018ad795d69cfeea4375a1d5e5;hb=8ad973aef4ff86b5a3e2aa6276d9dd8c99732eca;hp=2d1589ca6213eac7350e3f454901b099645d9971;hpb=5aa6d2287415c3b356e1ca18a05be95add08b2dd;p=ghc-hetmet.git diff --git a/compiler/types/InstEnv.lhs b/compiler/types/InstEnv.lhs index 2d1589c..774808d 100644 --- a/compiler/types/InstEnv.lhs +++ b/compiler/types/InstEnv.lhs @@ -27,12 +27,12 @@ import VarSet import Name import TcType import TyCon -import TcGadt import Unify import Outputable import BasicTypes import UniqFM import Id +import FastString import Data.Maybe ( isJust, isNothing ) \end{code} @@ -133,13 +133,13 @@ pprInstance :: Instance -> SDoc -- Prints the Instance as an instance declaration pprInstance ispec = hang (pprInstanceHdr ispec) - 2 (ptext SLIT("--") <+> pprNameLoc (getName ispec)) + 2 (ptext (sLit "--") <+> pprNameLoc (getName ispec)) -- * pprInstanceHdr is used in VStudio to populate the ClassView tree pprInstanceHdr :: Instance -> SDoc -- Prints the Instance as an instance declaration pprInstanceHdr ispec@(Instance { is_flag = flag }) - = ptext SLIT("instance") <+> ppr flag + = ptext (sLit "instance") <+> ppr flag <+> sep [pprThetaArrow theta, pprClassPred clas tys] where (_, theta, clas, tys) = instanceHead ispec @@ -370,7 +370,7 @@ extendInstEnv inst_env ins_item@(Instance { is_cls = cls_nm, is_tcs = mb_tcs }) add (ClsIE cur_insts cur_tyvar) _ = ClsIE (ins_item : cur_insts) (ins_tyvar || cur_tyvar) ins_tyvar = not (any isJust mb_tcs) -\end{code} +\end{code} %************************************************************************ @@ -483,7 +483,7 @@ lookupInstEnv (pkg_ie, home_ie) cls tys -- They shouldn't because we allocate separate uniques for them case tcUnifyTys bind_fn tpl_tys tys of Just _ -> find ms (item:us) rest - Nothing -> find ms us rest + Nothing -> find ms us rest --------------- bind_fn :: TyVar -> BindFlag