From 09d0e7d9ca9213c9c51f733dbda38cf8507dfa8d Mon Sep 17 00:00:00 2001 From: "simonpj@microsoft.com" Date: Wed, 2 May 2007 10:36:32 +0000 Subject: [PATCH] Use pprSourceTyCon; delete unused tyConOrigHead --- compiler/typecheck/TcDeriv.lhs | 2 +- compiler/types/Type.lhs | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/compiler/typecheck/TcDeriv.lhs b/compiler/typecheck/TcDeriv.lhs index 58db618..f9be61f 100644 --- a/compiler/typecheck/TcDeriv.lhs +++ b/compiler/typecheck/TcDeriv.lhs @@ -543,7 +543,7 @@ cond_isProduct (gla_exts, rep_tc) | isProductTyCon rep_tc = Nothing | otherwise = Just why where - why = (pprSourceTyCon rep_tc) <+> + why = quotes (pprSourceTyCon rep_tc) <+> ptext SLIT("has more than one constructor") cond_typeableOK :: Condition diff --git a/compiler/types/Type.lhs b/compiler/types/Type.lhs index 7d42d8c..25c5968 100644 --- a/compiler/types/Type.lhs +++ b/compiler/types/Type.lhs @@ -54,8 +54,7 @@ module Type ( applyTy, applyTys, isForAllTy, dropForAlls, -- Source types - predTypeRep, mkPredTy, mkPredTys, - tyConOrigHead, pprSourceTyCon, + predTypeRep, mkPredTy, mkPredTys, pprSourceTyCon, -- Newtypes splitRecNewType_maybe, newTyConInstRhs, @@ -604,13 +603,6 @@ predTypeRep (ClassP clas tys) = mkTyConApp (classTyCon clas) tys -- look through that too if necessary predTypeRep (EqPred ty1 ty2) = pprPanic "predTypeRep" (ppr (EqPred ty1 ty2)) --- The original head is the tycon and its variables for a vanilla tycon and it --- is the family tycon and its type indexes for a family instance. -tyConOrigHead :: TyCon -> (TyCon, [Type]) -tyConOrigHead tycon = case tyConFamInst_maybe tycon of - Nothing -> (tycon, mkTyVarTys (tyConTyVars tycon)) - Just famInst -> famInst - -- Pretty prints a tycon, using the family instance in case of a -- representation tycon. For example -- e.g. data T [a] = ... -- 1.7.10.4