X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypes%2FClass.lhs;h=566f1832469a554d671b95e2a38fb53fd9b61b23;hb=628c40615eaa124605ad8f380296059bd71182ce;hp=5e8a4d4bddd7c7a6f7a13fff43622349b04fa0d1;hpb=f278f0676579f67075033a4f9857715909c4b71e;p=ghc-hetmet.git

diff --git a/compiler/types/Class.lhs b/compiler/types/Class.lhs
index 5e8a4d4..566f183 100644
--- a/compiler/types/Class.lhs
+++ b/compiler/types/Class.lhs
@@ -9,11 +9,12 @@ The @Class@ datatype
 module Class (
 	Class, ClassOpItem, 
 	DefMeth (..),
+	defMethSpecOfDefMeth,
 
 	FunDep,	pprFundeps, pprFunDep,
 
 	mkClass, classTyVars, classArity,
-	classKey, className, classATs, classSelIds, classTyCon, classMethods,
+	classKey, className, classATs, classSelIds, classTyCon, classMethods, classOpItems,
 	classBigSig, classExtraBigSig, classTvsFds, classSCTheta
     ) where
 
@@ -71,9 +72,19 @@ type ClassOpItem = (Id, DefMeth)
 	-- Default-method info
 
 data DefMeth = NoDefMeth 		-- No default method
-	     | DefMeth  		-- A polymorphic default method
+	     | DefMeth Name  		-- A polymorphic default method
 	     | GenDefMeth 		-- A generic default method
              deriving Eq  
+
+-- | Convert a `DefMethSpec` to a `DefMeth`, which discards the name field in
+--   the `DefMeth` constructor of the `DefMeth`.
+defMethSpecOfDefMeth :: DefMeth -> DefMethSpec
+defMethSpecOfDefMeth meth
+ = case meth of
+	NoDefMeth	-> NoDM
+	DefMeth _	-> VanillaDM
+	GenDefMeth	-> GenericDM
+
 \end{code}
 
 The @mkClass@ function fills in the indirect superclasses.
@@ -121,6 +132,10 @@ classMethods :: Class -> [Id]
 classMethods (Class {classOpStuff = op_stuff})
   = [op_sel | (op_sel, _) <- op_stuff]
 
+classOpItems :: Class -> [ClassOpItem]
+classOpItems (Class { classOpStuff = op_stuff})
+  = op_stuff
+
 classTvsFds :: Class -> ([TyVar], [FunDep TyVar])
 classTvsFds c
   = (classTyVars c, classFunDeps c)
@@ -173,8 +188,8 @@ instance Show Class where
     showsPrec p c = showsPrecSDoc p (ppr c)
 
 instance Outputable DefMeth where
-    ppr DefMeth     =  text "{- has default method -}"
-    ppr GenDefMeth  =  text "{- has generic method -}"
+    ppr (DefMeth n) =  ptext (sLit "Default method") <+> ppr n
+    ppr GenDefMeth  =  ptext (sLit "Generic default method")
     ppr NoDefMeth   =  empty   -- No default method
 
 pprFundeps :: Outputable a => [FunDep a] -> SDoc