X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FIfaceSyn.lhs;h=470a5ea06d7391f1634496244cab5ffb9c222c38;hb=0e3d5132699d278ffd1aad10db16fe0c8495cfbd;hp=78b925f9e2cd99ff5225894088648e36048110f7;hpb=9ffadf219cbc4f8ec57264786df936a3cee88aec;p=ghc-hetmet.git

diff --git a/compiler/iface/IfaceSyn.lhs b/compiler/iface/IfaceSyn.lhs
index 78b925f..470a5ea 100644
--- a/compiler/iface/IfaceSyn.lhs
+++ b/compiler/iface/IfaceSyn.lhs
@@ -41,9 +41,6 @@ import Outputable
 import FastString
 import Module
 
-import Data.List
-import Data.Maybe
-
 infixl 3 &&&
 \end{code}
 
@@ -183,7 +180,7 @@ type IfaceAnnTarget = AnnTarget OccName
 
 data IfaceIdDetails
   = IfVanillaId
-  | IfRecSelId Bool
+  | IfRecSelId IfaceTyCon Bool
   | IfDFunId
 
 data IfaceIdInfo
@@ -203,7 +200,7 @@ data IfaceIdInfo
 data IfaceInfoItem
   = HsArity	 Arity
   | HsStrictness StrictSig
-  | HsInline     Activation
+  | HsInline     InlinePragma
   | HsUnfold	 IfaceExpr
   | HsNoCafRefs
   | HsWorker	 Name Arity	-- Worker, if any see IdInfo.WorkerInfo
@@ -384,7 +381,6 @@ ifaceDeclSubBndrs (IfaceData {ifName = tc_occ,
 	  con_occ  = ifConOcc con_decl			-- DataCon namespace
 	  wrap_occ = mkDataConWrapperOcc con_occ	-- Id namespace
 	  work_occ = mkDataConWorkerOcc con_occ		-- Id namespace
-	  strs     = ifConStricts con_decl
 	  has_wrapper = ifConWrapper con_decl		-- This is the reason for
 	  	      		     			-- having the ifConWrapper field!
 
@@ -650,8 +646,8 @@ instance Outputable IfaceConAlt where
 ------------------
 instance Outputable IfaceIdDetails where
   ppr IfVanillaId    = empty
-  ppr (IfRecSelId b) = ptext (sLit "RecSel")
-      		       <> if b then ptext (sLit "<naughty>") else empty
+  ppr (IfRecSelId tc b) = ptext (sLit "RecSel") <+> ppr tc
+      		          <+> if b then ptext (sLit "<naughty>") else empty
   ppr IfDFunId       = ptext (sLit "DFunId")
 
 instance Outputable IfaceIdInfo where
@@ -661,7 +657,7 @@ instance Outputable IfaceIdInfo where
 instance Outputable IfaceInfoItem where
   ppr (HsUnfold unf)  	 = ptext (sLit "Unfolding:") <+>
 				  	parens (pprIfaceExpr noParens unf)
-  ppr (HsInline act)     = ptext (sLit "Inline:") <+> ppr act
+  ppr (HsInline prag)    = ptext (sLit "Inline:") <+> ppr prag
   ppr (HsArity arity)    = ptext (sLit "Arity:") <+> int arity
   ppr (HsStrictness str) = ptext (sLit "Strictness:") <+> pprIfaceStrictSig str
   ppr HsNoCafRefs	 = ptext (sLit "HasNoCafRefs")