X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypes%2FClass.lhs;h=dc7cd9150ac272a87b17ef8fe1580d876779e697;hb=b4bf17afb2cf8b6e361cb8715f0de989e939ed1b;hp=2f946d8592a226f5b9104bf2a7545f28f83839bc;hpb=30c122df62ec75f9ed7f392f24c2925675bf1d06;p=ghc-hetmet.git

diff --git a/compiler/types/Class.lhs b/compiler/types/Class.lhs
index 2f946d8..dc7cd91 100644
--- a/compiler/types/Class.lhs
+++ b/compiler/types/Class.lhs
@@ -10,14 +10,14 @@ module Class (
 	Class, ClassOpItem, 
 	DefMeth (..),
 
-	FunDep,	pprFundeps,
+	FunDep,	pprFundeps, pprFunDep,
 
 	mkClass, classTyVars, classArity,
 	classKey, className, classATs, classSelIds, classTyCon, classMethods,
-	classBigSig, classExtraBigSig, classTvsFds, classSCTheta
+	classOpItems,classBigSig, classExtraBigSig, classTvsFds, classSCTheta
     ) where
 
-#include "HsVersions.h"
+#include "Typeable.h"
 
 import {-# SOURCE #-} TyCon	( TyCon )
 import {-# SOURCE #-} TypeRep	( PredType )
@@ -26,8 +26,11 @@ import Var
 import Name
 import BasicTypes
 import Unique
+import Util
 import Outputable
 import FastString
+
+import qualified Data.Data as Data
 \end{code}
 
 %************************************************************************
@@ -68,7 +71,7 @@ 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  
 \end{code}
@@ -118,6 +121,9 @@ 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)
@@ -170,15 +176,24 @@ 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
 pprFundeps []  = empty
-pprFundeps fds = hsep (ptext SLIT("|") : punctuate comma (map ppr_fd fds))
-	       where
-		 ppr_fd (us, vs) = hsep [interppSP us, ptext SLIT("->"), 
-					 interppSP vs]
+pprFundeps fds = hsep (ptext (sLit "|") : punctuate comma (map pprFunDep fds))
+
+pprFunDep :: Outputable a => FunDep a -> SDoc
+pprFunDep (us, vs) = hsep [interppSP us, ptext (sLit "->"), interppSP vs]
+
+instance Data.Typeable Class where
+    typeOf _ = Data.mkTyConApp (Data.mkTyCon "Class") []
+
+instance Data.Data Class where
+    -- don't traverse?
+    toConstr _   = abstractConstr "Class"
+    gunfold _ _  = error "gunfold"
+    dataTypeOf _ = mkNoRepType "Class"
 \end{code}