X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FhsSyn%2FHsTypes.lhs;h=a4ac86549c3a506456944c71d5bb15e9881e18b9;hp=1ec096671f11f3bff136651fbc751001e5c8b825;hb=654a1ba16e47d3ddabeb74b809ee6097c0770d35;hpb=ae52214482136fdeaaf9d741cf1211cf3cdce5c6 diff --git a/compiler/hsSyn/HsTypes.lhs b/compiler/hsSyn/HsTypes.lhs index 1ec0966..a4ac865 100644 --- a/compiler/hsSyn/HsTypes.lhs +++ b/compiler/hsSyn/HsTypes.lhs @@ -102,7 +102,8 @@ type HsContext name = [LHsPred name] type LHsPred name = Located (HsPred name) -data HsPred name = HsClassP name [LHsType name] +data HsPred name = HsClassP name [LHsType name] -- class constraint + | HsEqualP (LHsType name) (LHsType name)-- equality constraint | HsIParam (IPName name) (LHsType name) type LHsType name = Located (HsType name) @@ -268,9 +269,6 @@ splitHsFunType other = ([], other) %* * %************************************************************************ -NB: these types get printed into interface files, so - don't change the printing format lightly - \begin{code} instance (OutputableBndr name) => Outputable (HsType name) where ppr ty = pprHsType ty @@ -280,8 +278,13 @@ instance (Outputable name) => Outputable (HsTyVarBndr name) where ppr (KindedTyVar name kind) = pprHsTyVarBndr name kind instance OutputableBndr name => Outputable (HsPred name) where - ppr (HsClassP clas tys) = ppr clas <+> hsep (map (pprParendHsType.unLoc) tys) - ppr (HsIParam n ty) = hsep [ppr n, dcolon, ppr ty] + ppr (HsClassP clas tys) = ppr clas <+> hsep (map pprLHsType tys) + ppr (HsEqualP t1 t2) = hsep [pprLHsType t1, ptext SLIT("~"), + pprLHsType t2] + ppr (HsIParam n ty) = hsep [ppr n, dcolon, ppr ty] + +pprLHsType :: OutputableBndr name => LHsType name -> SDoc +pprLHsType = pprParendHsType . unLoc pprHsTyVarBndr :: Outputable name => name -> Kind -> SDoc pprHsTyVarBndr name kind | isLiftedTypeKind kind = ppr name